Merge branch 'master' of github.com:gnuboard/g4s

css/default.css

@@ -147,6 +147,8 @@ a:active {color:#000;text-decoration:underline}
 .btn_submit {padding:0 10px;height:24px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer}
 button.btn_submit {height:22px !important;font-size:1em}
 .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em}
+.btn_cancel:focus,
+.btn_cancel:hover {text-decoration:none !important}
 .btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */
 button.btn_frmline {font-size:1em}
 .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */
@@ -260,10 +262,15 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#333;color:#fff;
 #reg_result .btn_confirm {margin:50px 0}
 
 /* 아이디/패스워드 찾기 */
-#find_info_fs {margin:0 auto 20px;padding:10px 20px 15px;width:87%;border-right:1px solid #eee;border-bottom:1px solid #eee;background:#fff}
 #find_info #mb_hp_label {display:inline-block;margin-left:10px}
 #find_info #captcha {margin:0 auto 20px;width:87%}
 #find_info #captcha input {margin-left:5px}
+#find_info_fs {margin:0 auto 20px;padding:10px 20px 15px;width:87%;border-right:1px solid #eee;border-bottom:1px solid #eee;background:#fff}
+
+#find_info_result li {margin:0 0 5px}
+#find_info_result span {display:inline-block;width:70px}
+#find_info_result strong {color:#ff3061}
+#find_info_result_wrap {margin:0 auto 20px;padding:10px 20px 15px;width:87%;border-right:1px solid #eee;border-bottom:1px solid #eee;background:#fff}
 
 /* 아웃로그인 스킨 */
 .ol {position:relative;padding:15px 15px 14px 14px}

head.php

@@ -75,7 +75,7 @@ if ($config['cf_include_head']) {
             <li>
                 <a href="<?=G4_BBS_URL?>/current_connect.php" id="snb_cnt">
                     <img src="<?=G4_IMG_URL?>/snb_cnt.jpg" alt="">
-                    현재접속자 <?=connect(); // 현재 접속자수 ?>
+                    접속자 <?=connect(); // 현재 접속자수 ?>
                 </a>
             </li>
             <li>

skin/member/kcpcert/password_lost.skin.php

@@ -1,8 +1,8 @@
 <?
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-if((int)get_cookie('ck_passwordlost_count') > 2)
-    alert_close('회원정보 찾기를 기준 횟수 이상 시도하였습니다.');
+//if((int)get_cookie('ck_passwordlost_count') > 2)
+//    alert_close('회원정보 찾기를 기준 횟수 이상 시도하였습니다.');
 ?>
 
 <div id="find_info" class="new_win">

skin/member/kcpcert/password_lost2.skin.php

@@ -5,12 +5,12 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 if(!(int)$pl_count = get_cookie('ck_passwordlost_count')) {
     set_cookie('ck_passwordlost_count', 1, 60*60*1);
 } else {
-    if($pl_count > 2) {
-        alert_close('아이디/패스워드 찾기를 기준회수이상 시도하였습니다.');
-    } else {
-        $pl_count++;
-        set_cookie('ck_passwordlost_count', $pl_count, 60*60*1);
-    }
+    //if($pl_count > 2) {
+    //    alert_close('아이디/패스워드 찾기를 기준 횟수 이상 시도하였습니다.');
+    //} else {
+    //    $pl_count++;
+    //    set_cookie('ck_passwordlost_count', $pl_count, 60*60*1);
+    //}
 }
 
 $mb_name = trim($_POST['mb_name']);
@@ -65,23 +65,23 @@ $g4['title'] = '회원정보 찾기 결과';
 include_once(G4_PATH.'/head.sub.php');
 ?>
 
-<div id="find_info" class="new_win">
+<div id="find_info_result" class="new_win">
     <h1>회원정보 찾기 결과</h1>
 
-    <form name="fpasswordlost" action="<?=$action_url?>" method="post" autocomplete="off" onsubmit="return fpasswordlost_submit(this);">
-    <fieldset id="find_info_fs">
+    <div id="find_info_result_wrap">
         <p>
             회원님의 아이디와 변경된 패스워드입니다.<br>
             로그인 후 패스워드를 변경해 주세요.
         </p>
-    <div>
-        <div> 아이디 : <?=$mb['mb_id']?></div>
-        <div> 패스워드 : <?=$change_password?></div>
+        <ul>
+            <li><span>아이디</span> <?=$mb['mb_id']?></li>
+            <li><span>패스워드</span> <strong><?=$change_password?></strong></li>
+        </ul>
     </div>
     <div class="btn_win">
         <a href="javascript:window.close();" class="btn_cancel">확인</a>
     </div>
-    </form>
+
 </div>
 
 <?php

skin/member/kcpcert/register_form.skin.php

@@ -210,7 +210,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 <div class="btn_confirm">
     <input type="submit" value="<?=$w==''?'회원가입':'정보수정';?>" class="btn_submit" accesskey="s">
-    <a href="<?=$g4['path']?>/" class="btn_cancel">취소</a>
+    <a href="<?=G4_URL?>/" class="btn_cancel">취소</a>
 </div>
 </form>