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

Conflicts: skin/member/neo/memo_form.skin.php
2013-01-15 19:03:40 +09:00
parent 7a574f5077 41f59fa9ae
commit d4f56663fe
23 changed files with 359 additions and 340 deletions
--- a/skin/member/neo/formmail.skin.php
+++ b/skin/member/neo/formmail.skin.php
@ -50,18 +50,15 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
        <th scope="row"><label for="file2">첨부 2</label></th>
        <td><input type="file" id="file2" name="file2" class="frm_input"></td>
    </tr>
+    <tr>
+        <th scope="row">자동등록방지</th>
+        <td><?=captcha_html();?></td>
+    </tr>
    </tbody>
    </table>

-    <fieldset>
-        <legend>자동등록방지</legend>
-        <img id="kcaptcha_image" />
-        <input type="text" name="wr_key" class="fieldset_input required" title="자동등록방지" size="10" required>
-        왼쪽의 글자를 입력하세요.
-    </fieldset>
-
-    <div class="btn_confirm">
-        <input type="submit" id="btn_submit" value="메일발송">
+    <div class="btn_win">
+        <input type="submit" id="btn_submit" class="btn_submit" value="메일발송">
        <a href="javascript:window.close();">창닫기</a>
    </div>

--- a/skin/member/neo/memo.skin.php
+++ b/skin/member/neo/memo.skin.php
@ -37,7 +37,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
    </tbody>
    </table>

-    <div class="btn_window">
+    <div class="btn_win">
        <a href="javascript:window.close();">창닫기</a>
    </div>
 </div>
--- a/skin/member/neo/memo_form.skin.php
+++ b/skin/member/neo/memo_form.skin.php
@ -2,7 +2,6 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 
 ?>

-
 <div id="memo_write" class="new_win">
    <h1>쪽지보내기</h1>

@ -27,12 +26,22 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
        <th scope="row"><label for="me_memo">내용</label></th>
        <td><textarea id="me_memo" name="me_memo" required><?=$content?></textarea></td>
    </tr>
+    <tr>
+        <th scope="row">자동등록방지</th>
+        <td>
+            <?=captcha_html();?>
+        </td>
+    </tr>
    </tbody>
    </table>

+<<<<<<< HEAD
    <?=captcha_html();?>

    <div class="btn_window btn_confirm">
+=======
+    <div class="btn_win">
+>>>>>>> 41f59fa9ae589fc22660fde7d19293f195aede31
        <input type="submit" id="btn_submit" class="btn_submit" value="보내기">
        <a href="javascript:window.close();">창닫기</a>
    </div>
--- a/skin/member/neo/memo_view.skin.php
+++ b/skin/member/neo/memo_view.skin.php
@ -24,7 +24,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
            <?=conv_content($memo[me_memo], 0)?>
        </p>
    </section>
-    <div class="btn_window">
+    <div class="btn_win">
        <a href="<?=$prev_link?>">이전쪽지</a>
        <a href="<?=$next_link?>">다음쪽지</a>
        <? if ($kind == 'recv') { ?><a href="./memo_form.php?me_recv_mb_id=<?=$mb[mb_id]?>&amp;me_id=<?=$memo[me_id]?>">답장</a><? } ?>
--- a/skin/member/neo/password_lost.skin.php
+++ b/skin/member/neo/password_lost.skin.php
@ -2,21 +2,26 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 
 ?>

-<h1>아이디/패스워드 찾기</h1>
+<div id="find_info" class="new_win">
+    <h1>아이디/패스워드 찾기</h1>

-<form name="fpasswordlost" method="post" action="<?=$action_url?>" onsubmit="return fpasswordlost_submit(this);" autocomplete="off">
-<fieldset>
-    <legend>이메일 주소 입력</legend>
-    <p>회원가입 시 등록하신 이메일 주소를 입력해 주시면, 해당 이메일로 아이디와 패스워드 정보를 보내드립니다.</p>
-    <label for="mb_email">E-mail 주소</label>
-    <input type="text" id="mb_email" name="mb_email" class="email" required size="45" title="E-mail 주소">
-</fieldset>
-<? echo captcha_html(); ?>
-<div class="btn_confirm">
-    <input type="submit" value="확인">
-    <a href="javascript:window.close();">창닫기</a>
+    <form name="fpasswordlost" method="post" action="<?=$action_url?>" onsubmit="return fpasswordlost_submit(this);" autocomplete="off">
+    <fieldset>
+        <legend>이메일 주소 입력</legend>
+        <p>
+            회원가입 시 등록하신 이메일 주소를 입력해 주세요.<br>
+            해당 이메일로 아이디와 패스워드 정보를 보내드립니다.
+        </p>
+        <label for="mb_email">E-mail 주소</label>
+        <input type="text" id="mb_email" name="mb_email" class="fieldset_input email" required size="30" title="E-mail 주소">
+    </fieldset>
+    <?=captcha_html(); ?>
+    <div class="btn_win">
+        <input type="submit" class="btn_submit" value="확인">
+        <a href="javascript:window.close();" class="btn_cancel">창닫기</a>
+    </div>
+    </form>
 </div>
-</form>

 <script>
 function fpasswordlost_submit(f)
--- a/skin/member/neo/profile.skin.php
+++ b/skin/member/neo/profile.skin.php
@ -37,7 +37,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
        <p><?=$mb_profile?></p>
    </section>

-    <div class="btn_window">
+    <div class="btn_win">
        <a href="javascript:window.close();">창닫기</a>
    </div>
 </div>
--- a/skin/member/neo/register_form.skin.php
+++ b/skin/member/neo/register_form.skin.php
@ -193,9 +193,12 @@ var member_skin_path = "<?=$member_skin_path?>";
    <td><input type="text" id="reg_mb_recommend" name="mb_recommend" class="frm_input" title="추천인아이디"></td>
 </tr>
 <? } ?>
-</table>

-<?=$captcha_html?>
+<tr>
+    <th scope="row">자동등록방지</th>
+    <td><?=$captcha_html?></td>
+</tr>
+</table>

 <div class="btn_confirm">
    <input type="submit" class="btn_submit" value="회원가입" accesskey="s">
--- a/skin/member/neo/scrap.skin.php
+++ b/skin/member/neo/scrap.skin.php
@ -35,7 +35,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
        <?=get_paging($config[cf_write_pages], $page, $total_page, "?$qstr&amp;page=");?>
    </div>

-    <div class="btn_window">
+    <div class="btn_win">
        <a href="javascript:window.close();">창닫기</a>
    </div>
 </div>
--- a/skin/member/neo/scrap_popin.skin.php
+++ b/skin/member/neo/scrap_popin.skin.php
@ -29,7 +29,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
        스크랩을 하시면서 감사 혹은 격려의 댓글을 남기실 수 있습니다.
    </p>

-    <div class="btn_window">
+    <div class="btn_win">
        <input type="submit" value="스크랩">
    </div>
 </div>
--- a/skin/member/neo/zip.skin.php
+++ b/skin/member/neo/zip.skin.php
@ -40,7 +40,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가

    <p>검색결과가 끝났습니다.</p>

-    <div class="btn_window">
+    <div class="btn_win">
        <a href="javascript:window.close();">창닫기</a>
    </div>