firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2014-01-17 14:50:17 +09:00
parent a58f0220ce adaca820b5
commit 06724ad172
4 changed files with 230 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mobile/skin/member/basic/style.css
View File

@ -179,12 +179,13 @@
#profile .sv_wrap a {margin:0 0 5px;padding:0;font-weight:bold;line-height:10px}
/* 우편번호 검색 */
#post_code p {margin:0 20px 10px}
#post_code #code_sch {margin:0 20px}
#post_code #code_sel {margin:0 20px 20px}
#post_code #code_sel label {display:inline-block;margin:0 15px 0 0}
#post_code p {margin:0 0 10px}
#post_code #zip_search_frm {margin:0 20px}
#post_code #code_sch #sch_q {position:relative;margin:5px 0 0}
#post_code #code_sch .frm_input {height:22px}
#post_code #code_sch .btn_submit {padding:0 8px;height:24px}
#post_code #result {margin:0 20px}
#post_code #result_b4 {display:block;padding:30px 0;border-bottom:1px solid #dde4e9;text-align:center}
#post_code #result .result_msg {padding:15px 0}
#post_code #result .result_fail {border:1px solid #dde4e9;background:#f0f5fc;color:#ff3061;text-align:center}
@ -192,4 +193,9 @@
#post_code #result li {padding:10px;border:1px solid #dde4e9;border-bottom:0}
#post_code #result li div {margin:4px 0 0;color:#738D94}
#post_code #result li div {color:#738D94}
#post_code #result li div:before {content:"▶ "}
#post_code #result li div:before {content:"▶ "}
#post_code #zip_direct_frm {display:none;margin:0 20px}
#post_code #zip_direct_frm .frm_input {margin:0 0 5px}
#post_code #zip_direct_frm .frm_addr {width:99%}
#post_code #zip_direct_frm #sch_dq {padding:10px 0 20px;text-align:center}

129
mobile/skin/member/basic/zip.skin.php
View File

@ -9,32 +9,63 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<div id="post_code" class="new_win mbskin">
<h1 id="win_title"><?php echo $g5['title'] ?></h1>
<p>
시도 및 시군구 선택없이 도로명, 읍/면/동, 건물명 등으로 검색하실 수 있습니다.<br>
만약 검색결과에 찾으시는 주소가 없을 때는 시도와 시군구를 선택하신 후 다시 검색해 주십시오.<br>
(검색결과는 최대 1,000건만 표시됩니다.)
</p>
<form name="fzip" method="get" onsubmit="search_call(); return false;" autocomplete="off">
<!-- 검색어 입력 시작 { -->
<div id="code_sch">
<label for="sido" class="sound_only">시도선택</label>
<select name="sido" id="sido">
<option value="">- 시도 선택 -</option>
</select>
<label for="gugun" class="sound_only">시군구</label>
<select name="gugun" id="gugun">
<option value="">- 시군구 선택 -</option>
</select>
<div id="sch_q">
<label for="q" class="sound_only">검색어</label>
<input type="text" name="q" value="" id="q" required class="required frm_input">
<input type="submit" value="검색" class="btn_submit">
</div>
<div id="code_sel">
<input type="radio" name="sch_sel" id="sch_sel_1" value="search" checked="checked">
<label for="sch_sel_1">주소검색</label>
<input type="radio" name="sch_sel" id="sch_sel_0" value="direct">
<label for="sch_sel_0">직접입력</label>
</div>
<!-- } 검색어 입력 끝 -->
<div id="result"><span id="result_b4">검색어를 입력해주세요.</span></div>
<div id="zip_search_frm" class="zip_frm">
<p>
시도 및 시군구 선택없이 도로명, 읍/면/동, 건물명 등으로 검색하실 수 있습니다.<br>
만약 검색결과에 찾으시는 주소가 없을 때는 시도와 시군구를 선택하신 후 다시 검색해 주십시오.<br>
(검색결과는 최대 1,000건만 표시됩니다.)
</p>
<form name="fzip" method="get" onsubmit="search_call(); return false;" autocomplete="off">
<!-- 검색어 입력 시작 { -->
<div id="code_sch">
<label for="sido" class="sound_only">시도선택</label>
<select name="sido" id="sido">
<option value="">- 시도 선택 -</option>
</select>
<label for="gugun" class="sound_only">시군구</label>
<select name="gugun" id="gugun">
<option value="">- 시군구 선택 -</option>
</select>
<div id="sch_q">
<label for="q" class="sound_only">검색어</label>
<input type="text" name="q" value="" id="q" required class="required frm_input">
<input type="submit" value="검색" class="btn_submit">
</div>
</div>
<!-- } 검색어 입력 끝 -->
<div id="result"><span id="result_b4">검색어를 입력해주세요.</span></div>
</div>
<div id="zip_direct_frm" class="zip_frm">
<p>직접 주소를 입력하실 경우 우편번호와 기본주소는 반드시 입력하셔야 합니다.</p>
<form name="fzip2">
우편번호
<label for="frm_zip1" class="sound_only">우편번호앞자리</label>
<input type="text" name="frm_zip1" id="frm_zip1" class="required frm_input" size="3" maxlength="3"> -
<label for="frm_zip2" class="sound_only">우편번호뒷자리</label>
<input type="text" name="frm_zip2" id="frm_zip2" class="required frm_input" size="3" maxlength="3"><br>
<label for="frm_addr1" class="sound_only">기본주소</label>
<input type="text" name="frm_addr1" placeholder="기본주소" id="frm_addr1" class="required frm_input frm_addr"><br>
<label for="frm_addr2" class="sound_only">상세주소</label>
<input type="text" name="frm_addr2" placeholder="상세주소" id="frm_addr2" class="frm_input frm_addr"><br>
<label for="frm_addr3" class="sound_only">참고항목</label>
<input type="text" name="frm_addr3" placeholder="참고항목" id="frm_addr3" class="frm_input frm_addr"><br>
<label for="frm_jibeon" class="sound_only">지번주소</label>
<input type="text" name="frm_jibeon" placeholder="지번주소" id="frm_jibeon" class="frm_input frm_addr">
<div id="sch_dq">
<button type="button" id="put_addr" class="btn_submit">주소입력</button>
</div>
</form>
</div>
<div class="win_btn">
<button type="button" onclick="window.close();">창닫기</button>
@ -44,6 +75,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<script>
$(function() {
$("input[name='sch_sel']").click(function() {
var val = $(this).val();
$(".zip_frm").hide();
$("#zip_"+val+"_frm").show();
});
var msg_alert = true;
$("input#q").bind("focusin", function() {
if(!msg_alert) {
@ -53,6 +91,32 @@ $(function() {
msg_alert = false;
}
});
$("#put_addr").click(function() {
var zip1 = $.trim($("#frm_zip1").val());
var zip2 = $.trim($("#frm_zip2").val());
var addr1 = $.trim($("#frm_addr1").val());
var addr2 = $.trim($("#frm_addr2").val());
var addr3 = $.trim($("#frm_addr3").val());
var jibeon = $.trim($("#frm_jibeon").val());
if(zip1.length < 1) {
alert("우편번호 앞자리를 입력해 주십시오.");
return false;
}
if(zip2.length < 1) {
alert("우편번호 뒷자리를 입력해 주십시오.");
return false;
}
if(addr1.length < 1) {
alert("기본주소를 입력해 주십시오.");
return false;
}
put_data2(zip1, zip2, addr1, addr2, addr3, jibeon);
});
});
function put_data(zip1, zip2, addr1, addr3, jibeon)
@ -72,5 +136,22 @@ function put_data(zip1, zip2, addr1, addr3, jibeon)
window.close();
}
function put_data2(zip1, zip2, addr1, addr2, addr3, jibeon)
{
var of = window.opener.document.<?php echo $frm_name; ?>;
of.<?php echo $frm_zip1; ?>.value = zip1;
of.<?php echo $frm_zip2; ?>.value = zip2;
of.<?php echo $frm_addr1; ?>.value = addr1;
of.<?php echo $frm_addr2; ?>.value = addr2;
of.<?php echo $frm_addr3; ?>.value = addr3;
window.opener.$("#<?php echo $frm_jibeon; ?>").text("지번주소 : "+jibeon);
if(of.<?php echo $frm_jibeon; ?> !== undefined)
of.<?php echo $frm_jibeon; ?>.value = jibeon;
window.close();
}
</script>
<!-- } 우편번호 찾기 끝 -->

15
skin/member/basic/style.css
View File

@ -158,6 +158,7 @@
#mb_confirm p {padding:20px;border:1px solid #dde4e9;border-bottom:0;background:#fff}
#mb_confirm p strong {display:block}
#mb_confirm fieldset {margin:0 0 30px;padding:30px 0;border:1px solid #e9e9e9;background:#f5f6fa;text-align:center}
#mb_confirm fieldset .frm_input {background-color:#fff !important}
#mb_confirm label {letter-spacing:-0.1em}
#mb_confirm_id {display:inline-block;margin-right:20px;font-weight:bold}
@ -167,6 +168,7 @@
#pw_confirm p {padding:20px;border:1px solid #dde4e9;border-bottom:0;background:#fff}
#pw_confirm p strong {display:block}
#pw_confirm fieldset {margin:0 0 30px;padding:30px 0;border:1px solid #e9e9e9;background:#f5f6fa;text-align:center}
#pw_confirm fieldset .frm_input {background-color:#fff !important}
#pw_confirm label {letter-spacing:-0.1em}
#pw_confirm_id {display:inline-block;margin-right:20px;font-weight:bold}
@ -180,13 +182,14 @@
#profile h2 {margin:0}
/* 우편번호 검색 */
#post_code p {margin:0 20px 10px}
#post_code #code_sch {margin:0 20px}
#post_code #code_sel {margin:0 20px 20px}
#post_code #code_sel label {display:inline-block;margin:0 15px 0 0}
#post_code p {margin:0 0 10px}
#post_code .btn_submit {padding:0 8px;height:24px}
#post_code #zip_search_frm {margin:0 20px}
#post_code #code_sch #sch_q {position:relative;margin:5px 0 0}
#post_code #code_sch #q_info {display:none;z-index:2;position:absolute;top:33px;left:0;padding:5px;background:#e4eaec}
#post_code #code_sch #q_info span {position:absolute;top:-6px;left:5px;width:11px;height:6px;background:url('img/zip_ico_up.gif')}
#post_code #code_sch .btn_submit {padding:0 8px;height:24px}
#post_code #result {margin:0 20px}
#post_code #result_b4 {display:block;padding:30px 0;border-bottom:1px solid #dde4e9;text-align:center}
#post_code #result .result_msg {padding:15px 0}
#post_code #result .result_fail {border:1px solid #dde4e9;background:#f0f5fc;color:#ff3061;text-align:center}
@ -194,4 +197,6 @@
#post_code #result li {padding:10px;border:1px solid #dde4e9;border-bottom:0}
#post_code #result li div {margin:4px 0 0;color:#738D94}
#post_code #result li div:before {content:"▶ "}
#post_code #result li div:before {content:"▶ "}
#post_code #zip_direct_frm {display:none;margin:0 20px}
#post_code #zip_direct_frm .frm_input, #post_code #zip_direct_frm .btn_submit {margin:0 0 5px}

131
skin/member/basic/zip.skin.php
View File

@ -9,34 +9,63 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<div id="post_code" class="new_win mbskin">
<h1 id="win_title"><?php echo $g5['title'] ?></h1>
<p>
시도 및 시군구 선택없이 도로명, 읍/면/동, 건물명 등으로 검색하실 수 있습니다.<br>
만약 검색결과에 찾으시는 주소가 없을 때는 시도와 시군구를 선택하신 후 다시 검색해 주십시오.<br>
(검색결과는 최대 1,000건만 표시됩니다.)
</p>
<form name="fzip" method="get" onsubmit="search_call(); return false;" autocomplete="off">
<!-- 검색어 입력 시작 { -->
<div id="code_sch">
<label for="sido" class="sound_only">시도선택</label>
<select name="sido" id="sido">
<option value="">- 시도 선택 -</option>
</select>
<label for="gugun" class="sound_only">시군구</label>
<select name="gugun" id="gugun">
<option value="">- 시군구 선택 -</option>
</select>
<div id="sch_q">
<div id="q_info"><span></span>정확하고 빠른 검색을 위해 아래의 예시처럼 입력해 주세요.<br><br>입력예1) 강남대로37길 24-6<br>입력예2) 서초동 1362-19<br>입력예3) 서초2동 1362-19</div>
<label for="q" class="sound_only">검색어</label>
<input type="text" name="q" value="" id="q" required class="required frm_input">
<input type="submit" value="검색" class="btn_submit">
</div>
<div id="code_sel">
<input type="radio" name="sch_sel" id="sch_sel_1" value="search" checked="checked">
<label for="sch_sel_1">주소검색</label>
<input type="radio" name="sch_sel" id="sch_sel_0" value="direct">
<label for="sch_sel_0">직접입력</label>
</div>
<!-- } 검색어 입력 끝 -->
</form>
<div id="result"><span id="result_b4">검색어를 입력해주세요.</span></div>
<div id="zip_search_frm" class="zip_frm">
<p>
시도 및 시군구 선택없이 도로명, 읍/면/동, 건물명 등으로 검색하실 수 있습니다.<br>
만약 검색결과에 찾으시는 주소가 없을 때는 시도와 시군구를 선택하신 후 다시 검색해 주십시오.<br>
(검색결과는 최대 1,000건만 표시됩니다.)
</p>
<form name="fzip" method="get" onsubmit="search_call(); return false;" autocomplete="off">
<!-- 검색어 입력 시작 { -->
<div id="code_sch">
<label for="sido" class="sound_only">시도선택</label>
<select name="sido" id="sido">
<option value="">- 시도 선택 -</option>
</select>
<label for="gugun" class="sound_only">시군구</label>
<select name="gugun" id="gugun">
<option value="">- 시군구 선택 -</option>
</select>
<div id="sch_q">
<div id="q_info"><span></span>정확하고 빠른 검색을 위해 아래의 예시처럼 입력해 주세요.<br><br>입력예1) 강남대로37길 24-6<br>입력예2) 서초동 1362-19<br>입력예3) 서초2동 1362-19</div>
<label for="q" class="sound_only">검색어</label>
<input type="text" name="q" value="" id="q" required class="required frm_input">
<input type="submit" value="검색" class="btn_submit">
</div>
</div>
<!-- } 검색어 입력 끝 -->
</form>
<div id="result"><span id="result_b4">검색어를 입력해주세요.</span></div>
</div>
<div id="zip_direct_frm" class="zip_frm">
<p>직접 주소를 입력하실 경우 우편번호와 기본주소는 반드시 입력하셔야 합니다.</p>
<form name="fzip2">
우편번호
<label for="frm_zip1" class="sound_only">우편번호앞자리</label>
<input type="text" name="frm_zip1" id="frm_zip1" class="required frm_input" size="3" maxlength="3"> -
<label for="frm_zip2" class="sound_only">우편번호뒷자리</label>
<input type="text" name="frm_zip2" id="frm_zip2" class="required frm_input" size="3" maxlength="3"><br>
<label for="frm_addr1">기본주소</label>
<input type="text" name="frm_addr1" id="frm_addr1" class="required frm_input" size="70"><br>
<label for="frm_addr2">상세주소</label>
<input type="text" name="frm_addr2" id="frm_addr2" class="frm_input" size="70"><br>
<label for="frm_addr3">참고항목</label>
<input type="text" name="frm_addr3" id="frm_addr3" class="frm_input" size="70"><br>
<label for="frm_jibeon">지번주소</label>
<input type="text" name="frm_jibeon" id="frm_jibeon" class="frm_input" size="70">
<button type="button" id="put_addr" class="btn_submit">주소입력</button>
</form>
</div>
<div class="win_btn">
<button type="button" onclick="window.close();">창닫기</button>
@ -46,6 +75,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<script>
$(function() {
$("input[name='sch_sel']").click(function() {
var val = $(this).val();
$(".zip_frm").hide();
$("#zip_"+val+"_frm").show();
});
$("input#q").bind("focusin", function() {
$("#q_info").fadeIn(200);
});
@ -53,6 +89,32 @@ $(function() {
$("input#q").bind("focusout", function() {
$("#q_info").fadeOut(200);
});
$("#put_addr").click(function() {
var zip1 = $.trim($("#frm_zip1").val());
var zip2 = $.trim($("#frm_zip2").val());
var addr1 = $.trim($("#frm_addr1").val());
var addr2 = $.trim($("#frm_addr2").val());
var addr3 = $.trim($("#frm_addr3").val());
var jibeon = $.trim($("#frm_jibeon").val());
if(zip1.length < 1) {
alert("우편번호 앞자리를 입력해 주십시오.");
return false;
}
if(zip2.length < 1) {
alert("우편번호 뒷자리를 입력해 주십시오.");
return false;
}
if(addr1.length < 1) {
alert("기본주소를 입력해 주십시오.");
return false;
}
put_data2(zip1, zip2, addr1, addr2, addr3, jibeon);
});
});
function put_data(zip1, zip2, addr1, addr3, jibeon)
@ -72,5 +134,22 @@ function put_data(zip1, zip2, addr1, addr3, jibeon)
window.close();
}
function put_data2(zip1, zip2, addr1, addr2, addr3, jibeon)
{
var of = window.opener.document.<?php echo $frm_name; ?>;
of.<?php echo $frm_zip1; ?>.value = zip1;
of.<?php echo $frm_zip2; ?>.value = zip2;
of.<?php echo $frm_addr1; ?>.value = addr1;
of.<?php echo $frm_addr2; ?>.value = addr2;
of.<?php echo $frm_addr3; ?>.value = addr3;
window.opener.$("#<?php echo $frm_jibeon; ?>").text("지번주소 : "+jibeon);
if(of.<?php echo $frm_jibeon; ?> !== undefined)
of.<?php echo $frm_jibeon; ?>.value = jibeon;
window.close();
}
</script>
<!-- } 우편번호 찾기 끝 -->