g5 merge 충돌수정

This commit is contained in:
chicpro
2014-01-03 14:35:35 +09:00
23 changed files with 101 additions and 61 deletions

View File

@ -154,6 +154,13 @@ $pg_anchor = '<ul class="anchor">
<li><a href="#anc_bo_point">포인트 설정</a></li>
<li><a href="#anc_bo_extra">여분필드</a></li>
</ul>';
$frm_submit = '<div class="btn_confirm01 btn_confirm">
<input type="submit" value="확인" class="btn_submit" accesskey="s">
<a href="./board_list.php?'.$qstr.'">목록</a>'.PHP_EOL;
if ($w == 'u') $frm_submit .= ' <a href="./board_copy.php?bo_table='.$bo_table.'" id="board_copy" target="win_board_copy">게시판복사</a>
<a href="'.G5_BBS_URL.'/board.php?bo_table='.$board['bo_table'].'" class="btn_frmline">게시판 바로가기</a>'.PHP_EOL;
$frm_submit .= '</div>';
?>
<form name="fboardform" id="fboardform" action="./board_form_update.php" onsubmit="return fboardform_submit(this)" method="post" enctype="multipart/form-data">
@ -255,6 +262,8 @@ $pg_anchor = '<ul class="anchor">
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_bo_auth">
<h2 class="h2_frm">게시판 권한 설정</h2>
<?php echo $pg_anchor ?>
@ -394,6 +403,8 @@ $pg_anchor = '<ul class="anchor">
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_bo_function">
<h2 class="h2_frm">게시판 기능 설정</h2>
<?php echo $pg_anchor ?>
@ -787,6 +798,8 @@ $pg_anchor = '<ul class="anchor">
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_bo_design">
<h2 class="h2_frm">게시판 디자인/양식</h2>
<?php echo $pg_anchor ?>
@ -1128,6 +1141,8 @@ $pg_anchor = '<ul class="anchor">
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_bo_point">
<h2 class="h2_frm">게시판 포인트 설정</h2>
<?php echo $pg_anchor ?>
@ -1201,6 +1216,8 @@ $pg_anchor = '<ul class="anchor">
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_bo_extra">
<h2 class="h2_frm">게시판 여분필드 설정</h2>
<?php echo $pg_anchor ?>
@ -1236,11 +1253,7 @@ $pg_anchor = '<ul class="anchor">
</div>
</section>
<div class="btn_confirm01 btn_confirm">
<input type="submit" value="확인" class="btn_submit" accesskey="s">
<a href="./board_list.php?<?php echo $qstr ?>">목록</a>
<?php if ($w == 'u') { ?><a href="./board_copy.php?bo_table=<?php echo $bo_table ?>" id="board_copy" target="win_board_copy">게시판복사</a><?php } ?>
</div>
<?php echo $frm_submit; ?>
</form>

View File

@ -1,28 +0,0 @@
<?
$sub_menu = "300100";
include_once("./_common.php");
check_demo();
if ($is_admin != "super")
alert("게시판 삭제는 최고관리자만 가능합니다.");
auth_check($auth[$sub_menu], "d");
check_token();
// _BOARD_DELETE_ 상수를 선언해야 board_delete.inc.php 가 정상 작동함
define("_BOARD_DELETE_", TRUE);
for ($i=0; $i<count($chk); $i++)
{
// 실제 번호를 넘김
$k = $chk[$i];
// include 전에 $bo_table 값을 반드시 넘겨야 함
$tmp_bo_table = mysql_real_escape_string(trim($_POST['board_table'][$k]));
include ("./board_delete.inc.php");
}
goto_url("./board_list.php?$qstr");
?>

View File

@ -147,6 +147,11 @@ $pg_anchor = '<ul class="anchor">
<li><a href="#anc_cf_extra">여분필드</a></li>
</ul>';
$frm_submit = '<div class="btn_confirm01 btn_confirm">
<input type="submit" value="확인" class="btn_submit" accesskey="s">
<a href="'.G5_URL.'/">메인으로</a>
</div>';
if (!$config['cf_icode_server_ip']) $config['cf_icode_server_ip'] = '211.172.232.124';
if (!$config['cf_icode_server_port']) $config['cf_icode_server_port'] = '7295';
@ -418,6 +423,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_cf_board">
<h2 class="h2_frm">게시판 기본 설정</h2>
<?php echo $pg_anchor ?>
@ -498,6 +505,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_cf_join">
<h2 class="h2_frm">회원가입 설정</h2>
<?php echo $pg_anchor ?>
@ -643,6 +652,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_cf_cert">
<h2 class="h2_frm">본인확인 설정</h2>
<?php echo $pg_anchor ?>
@ -719,6 +730,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_cf_mail">
<h2 class="h2_frm">기본 메일 환경 설정</h2>
<?php echo $pg_anchor ?>
@ -756,6 +769,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_cf_article_mail">
<h2 class="h2_frm">게시판 글 작성 시 메일 설정</h2>
<?php echo $pg_anchor ?>
@ -808,6 +823,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_cf_join_mail">
<h2 class="h2_frm">회원가입 시 메일 설정</h2>
<?php echo $pg_anchor ?>
@ -839,6 +856,7 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_cf_vote_mail">
<h2 class="h2_frm">투표 기타의견 작성 시 메일 설정</h2>
@ -864,6 +882,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_cf_sns">
<h2 class="h2_frm">소셜네트워크서비스(SNS : Social Network Service)</h2>
<?php echo $pg_anchor ?>
@ -909,6 +929,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_cf_lay">
<h2 class="h2_frm">레이아웃 추가설정</h2>
<?php echo $pg_anchor; ?>
@ -957,6 +979,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_cf_sms">
<h2 class="h2_frm">SMS</h2>
<?php echo $pg_anchor ?>
@ -1037,6 +1061,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_cf_extra">
<h2 class="h2_frm">여분필드 기본 설정</h2>
<?php echo $pg_anchor ?>
@ -1068,9 +1094,7 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
</div>
</section>
<div class="btn_confirm01 btn_confirm">
<input type="submit" value="확인" class="btn_submit" accesskey="s">
</div>
<?php echo $frm_submit; ?>
</form>

View File

@ -205,9 +205,10 @@ include_once('./admin.head.php');
<td colspan="3" style="line-height:2em">
<input type="text" name="mb_zip1" value="<?php echo $mb['mb_zip1'] ?>" id="mb_zip1" title="우편번호 앞자리" class="frm_input readonly" size="3" maxlength="3"> -
<input type="text" name="mb_zip2" value="<?php echo $mb['mb_zip2'] ?>" id="mb_zip2" title="우편번호 뒷자리" class="frm_input readonly" size="3" maxlength="3">
<a href="<?php echo G5_BBS_URL ?>/zip.php?frm_name=fmember&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2&amp;frm_jibeon=mb_addr_jibeon" id="win_zip" class="win_zip_find btn_frmline" target="_blank">주소 검색</a><br>
<input type="text" name="mb_addr1" value="<?php echo $mb['mb_addr1'] ?>" id="mb_addr1" title="행정기본주소" class="frm_input readonly" size="70"><br>
<a href="<?php echo G5_BBS_URL ?>/zip.php?frm_name=fmember&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2&amp;frm_addr3=mb_addr3&amp;frm_jibeon=mb_addr_jibeon" id="win_zip" class="win_zip_find btn_frmline" target="_blank">주소 검색</a><br>
<input type="text" name="mb_addr1" value="<?php echo $mb['mb_addr1'] ?>" id="mb_addr1" title="행정기본주소" class="frm_input readonly" size="40"> <span id="mb_addr3"></span><br>
<input type="text" name="mb_addr2" value="<?php echo $mb['mb_addr2'] ?>" id="mb_addr2" title="상세주소" class="frm_input" size="70">
<input type="hidden" name="mb_addr3" value="">
<input type="hidden" name="mb_addr_jibeon" value="<?php echo $mb['mb_addr_jibeon']; ?>"><br>
<span id="mb_addr_jibeon">지번주소 : <?php echo $mb['mb_addr_jibeon']; ?></span>
</td>

View File

@ -29,6 +29,8 @@ if($_POST['mb_certify_case'] && $_POST['mb_certify']) {
$mb_adult = 0;
}
$mb_addr2 = get_address2($_POST['mb_addr2'], $_POST['mb_addr3']);
$sql_common = " mb_name = '{$_POST['mb_name']}',
mb_nick = '{$_POST['mb_nick']}',
mb_email = '{$_POST['mb_email']}',
@ -40,7 +42,7 @@ $sql_common = " mb_name = '{$_POST['mb_name']}',
mb_zip1 = '{$_POST['mb_zip1']}',
mb_zip2 = '{$_POST['mb_zip2']}',
mb_addr1 = '{$_POST['mb_addr1']}',
mb_addr2 = '{$_POST['mb_addr2']}',
mb_addr2 = '{$mb_addr2}',
mb_addr_jibeon = '{$_POST['mb_addr_jibeon']}',
mb_birth = '{$_POST['mb_birth']}',
mb_sex = '{$_POST['mb_sex']}',

View File

@ -35,6 +35,7 @@ $mb_zip1 = isset($_POST['mb_zip1']) ? escape_trim($_POST['mb_zip
$mb_zip2 = isset($_POST['mb_zip2']) ? escape_trim($_POST['mb_zip2']) : "";
$mb_addr1 = isset($_POST['mb_addr1']) ? escape_trim($_POST['mb_addr1']) : "";
$mb_addr2 = isset($_POST['mb_addr2']) ? escape_trim($_POST['mb_addr2']) : "";
$mb_addr3 = isset($_POST['mb_addr3']) ? escape_trim($_POST['mb_addr3']) : "";
$mb_addr_jibeon = isset($_POST['mb_addr_jibeon']) ? escape_trim($_POST['mb_addr_jibeon']) : "";
$mb_signature = isset($_POST['mb_signature']) ? escape_trim($_POST['mb_signature']) : "";
$mb_profile = isset($_POST['mb_profile']) ? escape_trim($_POST['mb_profile']) : "";
@ -52,6 +53,8 @@ $mb_8 = isset($_POST['mb_8']) ? escape_trim($_POST['mb_8']
$mb_9 = isset($_POST['mb_9']) ? escape_trim($_POST['mb_9']) : "";
$mb_10 = isset($_POST['mb_10']) ? escape_trim($_POST['mb_10']) : "";
// 상세주소처리
$mb_addr2 = get_address2($mb_addr2, $mb_addr3);
if ($w == '' || $w == 'u') {

View File

@ -139,8 +139,10 @@ h3 {margin:0 20px}
.btn_confirm02 a {display:inline-block;padding:0 15px;height:30px;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}
.btn_confirm02 a:focus {background:#555}
.btn_confirm03 {clear:both;margin-top:10px;text-align:right}
.btn_submit {background:#ff3061;cursor:pointer}
.btn_confirm .btn_submit {padding:0 15px;border:0;height:30px;color:#fff}
.btn_cancel {display:inline-block;padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}

View File

@ -197,7 +197,6 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
.frm_input {height:22px}
.tbl_frm01 textarea {width:98%;height:100px}
.tbl_frm01 a {text-decoration:none}
.tbl_frm01 .frm_address {display:block;margin-top:5px}
.tbl_frm01 .frm_file {display:block;margin-bottom:5px}
.tbl_frm01 .frm_info {display:block;padding:0 0 5px;line-height:1.4em}

View File

@ -167,7 +167,6 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
.tbl_frm01 textarea, .frm_input {border:1px solid #e4eaec;background:#f7f7f7;vertical-align:middle;line-height:1.8em;-webkit-appearance:none}
.tbl_frm01 textarea {width:100%;height:100px}
.tbl_frm01 a {text-decoration:none}
.tbl_frm01 .frm_address {display:block;margin-top:5px}
.tbl_frm01 .frm_file {display:block;margin-bottom:5px;width:100%}
.tbl_frm01 .frm_info {display:block;padding:5px 0 0;color:#666;line-height:1.3em}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 873 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 881 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 860 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 847 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 859 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 884 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 733 B

View File

@ -2505,4 +2505,18 @@ function module_exec_check($exe, $type)
return $error;
}
// 도로명 상세 주소처리
function get_address2($addr2, $addr3)
{
if($addr3) {
if($addr2) {
$addr2 .= ' '.$addr3;
} else {
$addr2 = $addr3;
}
}
return $addr2;
}
?>

View File

@ -144,12 +144,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-
<label for="reg_mb_zip2" class="sound_only">우편번호 뒷자리<?php echo $config['cf_req_addr']?'<strong class="sound_only"> 필수</strong>':''; ?></label>
<input type="text" name="mb_zip2" value="<?php echo $member['mb_zip2'] ?>" id="reg_mb_zip2" <?php echo $config['cf_req_addr']?"required":""; ?> class="frm_input <?php echo $config['cf_req_addr']?"required":""; ?>" size="3" maxlength="3">
<a href="<?php echo G5_BBS_URL ?>/zip.php?frm_name=fregisterform&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2&amp;frm_jibeon=mb_addr_jibeon" id="reg_zip_find" class="btn_frmline win_zip_find" target="_blank">주소 검색</a>
<a href="<?php echo G5_BBS_URL ?>/zip.php?frm_name=fregisterform&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2&amp;frm_addr3=mb_addr3&amp;frm_jibeon=mb_addr_jibeon" id="reg_zip_find" class="btn_frmline win_zip_find" target="_blank">주소 검색</a><br>
<label for="reg_mb_addr1" class="sound_only">주소<?php echo $config['cf_req_addr']?'<strong class="sound_only"> 필수</strong>':''; ?></label>
<input type="text" name="mb_addr1" value="<?php echo $member['mb_addr1'] ?>" id="reg_mb_addr1" <?php echo $config['cf_req_addr']?"required":""; ?> class="frm_input frm_address <?php echo $config['cf_req_addr']?"required":""; ?>" size="50">
<label for="reg_mb_addr2" class="sound_only">상세주소<?php echo $config['cf_req_addr']?'<strong class="sound_only"> 필수</strong>':''; ?></label>
<input type="text" name="mb_addr2" value="<?php echo $member['mb_addr2'] ?>" id="reg_mb_addr2" <?php echo $config['cf_req_addr']?"required":""; ?> class="frm_input frm_address <?php echo $config['cf_req_addr']?"required":""; ?>" size="50">
<input type="hidden" name="mb_addr_jibeon" value="<?php echo $member['mb_addr_jibeon']; ?>">
<input type="text" name="mb_addr1" value="<?php echo $member['mb_addr1'] ?>" id="reg_mb_addr1" <?php echo $config['cf_req_addr']?"required":""; ?> class="frm_input frm_address <?php echo $config['cf_req_addr']?"required":""; ?>" size="50"><br>
<span id="mb_addr3"></span>
<input type="hidden" name="mb_addr3" value="">
<label for="reg_mb_addr2" class="sound_only">상세주소</label>
<input type="text" name="mb_addr2" value="<?php echo $member['mb_addr2'] ?>" id="reg_mb_addr2" class="frm_input frm_address" size="50">
<input type="hidden" name="mb_addr_jibeon" value="<?php echo $member['mb_addr_jibeon']; ?>"><br>
<span id="mb_addr_jibeon"><?php echo ($member['mb_addr_jibeon'] ? '지번주소 : '.$member['mb_addr_jibeon'] : ''); ?></span>
</td>
</tr>

View File

@ -41,7 +41,6 @@
.mb_skin table {}
.mb_skin caption {}
.mb_skin .frm_info {}
.mb_skin .frm_address {}
.mb_skin .frm_file {}
.mbskin .tbl_frm01 {}
@ -84,12 +83,15 @@
/* 회원가입 입력 */
#fregisterform #reg_mb_email, #fregisterform .frm_address {width:100%}
#fregisterform #mb_addr_jibeon {display:block;margin:5px 0 0}
#fregisterform textarea {width:100%;height:50px}
#fregisterform #msg_certify {margin:5px 0 0;padding:5px;border:1px solid #dbecff;background:#eaf4ff;text-align:center}
#fregisterform .frm_address {margin:5px 0 0}
#fregisterform #mb_addr3 {display:block;margin:5px 0 0}
#fregisterform #mb_addr_jibeon {display:block;margin:5px 0 0}
/* 회원가입 완료 */
#reg_result {padding:40px 10px 0}
#reg_result #result_logo {margin-bottom:50px;text-align:center}

View File

@ -55,16 +55,18 @@ $(function() {
});
});
function put_data(zip1, zip2, addr1, addr2, jibeon)
function put_data(zip1, zip2, addr1, 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_addr2; ?>.value = "";
of.<?php echo $frm_addr3; ?>.value = addr3;
window.opener.document.getElementById("<?php echo $frm_jibeon; ?>").innerText = "지번주소 : "+jibeon;
window.opener.$("#<?php echo $frm_addr3; ?>").text(addr3);
window.opener.$("#<?php echo $frm_jibeon; ?>").text("지번주소 : "+jibeon);
if(of.<?php echo $frm_jibeon; ?> !== undefined)
of.<?php echo $frm_jibeon; ?>.value = jibeon;

View File

@ -149,11 +149,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-
<label for="reg_mb_zip2" class="sound_only">우편번호 뒷자리<?php echo $config['cf_req_addr']?'<strong class="sound_only"> 필수</strong>':''; ?></label>
<input type="text" name="mb_zip2" value="<?php echo $member['mb_zip2'] ?>" id="reg_mb_zip2" <?php echo $config['cf_req_addr']?"required":""; ?> class="frm_input <?php echo $config['cf_req_addr']?"required":""; ?>" size="3" maxlength="3">
<a href="<?php echo G5_BBS_URL ?>/zip.php?frm_name=fregisterform&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2&amp;frm_jibeon=mb_addr_jibeon" id="reg_zip_find" class="btn_frmline win_zip_find" target="_blank">주소 검색</a>
<a href="<?php echo G5_BBS_URL ?>/zip.php?frm_name=fregisterform&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2&amp;frm_addr3=mb_addr3&amp;frm_jibeon=mb_addr_jibeon" id="reg_zip_find" class="btn_frmline win_zip_find" target="_blank">주소 검색</a><br>
<label for="reg_mb_addr1" class="sound_only">주소<?php echo $config['cf_req_addr']?'<strong class="sound_only"> 필수</strong>':''; ?></label>
<input type="text" name="mb_addr1" value="<?php echo $member['mb_addr1'] ?>" id="reg_mb_addr1" <?php echo $config['cf_req_addr']?"required":""; ?> class="frm_input frm_address <?php echo $config['cf_req_addr']?"required":""; ?>" size="70">
<label for="reg_mb_addr2" class="sound_only">상세주소<?php echo $config['cf_req_addr']?'<strong class="sound_only"> 필수</strong>':''; ?></label>
<input type="text" name="mb_addr2" value="<?php echo $member['mb_addr2'] ?>" id="reg_mb_addr2" <?php echo $config['cf_req_addr']?"required":""; ?> class="frm_input frm_address <?php echo $config['cf_req_addr']?"required":""; ?>" size="70">
<input type="text" name="mb_addr1" value="<?php echo $member['mb_addr1'] ?>" id="reg_mb_addr1" <?php echo $config['cf_req_addr']?"required":""; ?> class="frm_input frm_address <?php echo $config['cf_req_addr']?"required":""; ?>" size="40">
<span id="mb_addr3"></span>
<input type="hidden" name="mb_addr3" value=""><br>
<label for="reg_mb_addr2" class="sound_only">상세주소</label>
<input type="text" name="mb_addr2" value="<?php echo $member['mb_addr2'] ?>" id="reg_mb_addr2" class="frm_input frm_address" size="70">
<input type="hidden" name="mb_addr_jibeon" value="<?php echo $member['mb_addr_jibeon']; ?>">
<span id="mb_addr_jibeon"><?php echo ($member['mb_addr_jibeon'] ? '지번주소 : '.$member['mb_addr_jibeon'] : ''); ?></span>
</td>

View File

@ -47,7 +47,6 @@
.mbskin table {}
.mbskin caption {}
.mbskin .frm_info {}
.mbskin .frm_address {}
.mbskin .frm_file {}
.mbskin .tbl_frm01 {}
@ -92,12 +91,14 @@
#fregister .btn_confirm {margin-bottom:20px}
/* 회원가입 입력 */
#fregisterform #mb_addr_jibeon {display:block;margin:5px 0 0}
#fregisterform textarea {height:50px}
#fregisterform #msg_certify {margin:5px 0 0;padding:5px;border:1px solid #dbecff;background:#eaf4ff;text-align:center}
#fregisterform .frm_address {margin:5px 0 0}
#fregisterform #mb_addr3 {display:inline-block;margin:5px 0 0;vertical-align:middle}
#fregisterform #mb_addr_jibeon {display:block;margin:5px 0 0}
/* 회원가입 완료 */
#reg_result {padding:50px 0 0}
#reg_result #result_logo {margin-bottom:50px;text-align:center}

View File

@ -55,16 +55,18 @@ $(function() {
});
});
function put_data(zip1, zip2, addr1, addr2, jibeon)
function put_data(zip1, zip2, addr1, 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_addr2; ?>.value = "";
of.<?php echo $frm_addr3; ?>.value = addr3;
window.opener.document.getElementById("<?php echo $frm_jibeon; ?>").innerText = "지번주소 : "+jibeon;
window.opener.$("#<?php echo $frm_addr3; ?>").text(addr3);
window.opener.$("#<?php echo $frm_jibeon; ?>").text("지번주소 : "+jibeon);
if(of.<?php echo $frm_jibeon; ?> !== undefined)
of.<?php echo $frm_jibeon; ?>.value = jibeon;