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

This commit is contained in:
chicpro
2013-01-17 16:25:17 +09:00
4 changed files with 46 additions and 31 deletions

View File

@ -151,6 +151,7 @@ a {color:#000;text-decoration:none}
#poll_result_list dl,
#poll_result_list dt,
#poll_result_list dd {margin:0;padding:0}
#poll_result_list dl {padding-bottom:30px}
#poll_result_list dt {margin-right:5%;color:#ff4679;text-align:right}
#poll_result_list li {margin-top:10px}
#poll_result_list p {position:relative;margin:0;padding:5px 0}
@ -421,13 +422,17 @@ a {color:#000;text-decoration:none}
.reg_result_deco {text-align:center}
/* 회원 패스워드 확인 */
#member_confirm {padding:150px 0;text-align:center}
#member_confirm fieldset {margin:0 auto;width:400px;border:1px solid #ddd}
#member_confirm {padding:100px 0;text-align:center}
#member_confirm p {margin-bottom:20px}
#member_confirm strong {display:block;margin-bottom:1em;font-size:1.3em}
#member_confirm fieldset {margin:0 auto;width:400px;border:1px solid #ddd;background:#f5f5f5}
#member_confirm_id {display:inline-block;margin:0 30px 0 20px}
/* 비밀글 패스워드 확인 */
#password_confirm {padding:150px 0;text-align:center}
#password_confirm {padding:100px 0;text-align:center}
#password_confirm p {margin-bottom:20px}
#password_confirm strong {display:block;margin-bottom:1em;font-size:1.3em}
#password_confirm fieldset {margin:0 auto;width:400px;border:1px solid #ddd;background:#f5f5f5}
/* 최근게시물 */
#new_search {margin:0 0 10px;padding:0;border:0;text-align:right}

View File

@ -6,20 +6,24 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<div id="member_confirm">
<form name="fmemberconfirm" method="post" onsubmit="return fmemberconfirm_submit(this);">
<input type=hidden name="mb_id" value="<?=$member[mb_id]?>">
<input type=hidden name="w" value="u">
<p>
<strong>패스워드를 한번 더 입력해주세요.</strong>
회원님의 정보를 안전하게 보호하기 위해 패스워드를 한번 더 확인합니다.
</p>
<p>회원님의 정보를 안전하게 보호하기 위해 패스워드를 한번 더 확인합니다.</p>
<fieldset>
회원아이디
<span id="member_confirm_id"><?=$member[mb_id]?></span>
<form name="fmemberconfirm" method="post" onsubmit="return fmemberconfirm_submit(this);">
<input type=hidden name="mb_id" value="<?=$member[mb_id]?>">
<input type=hidden name="w" value="u">
<label for="confirm_mb_password">패스워드</label>
<input type="password" id="confirm_mb_password" name="mb_password" class="fieldset_input" maxLength="20" size="15" required onkeypress="check_capslock('confirm_mb_password');">
<input type="submit" id="btn_submit" class="fieldset_submit" value="확인">
</fieldset>
</form>
<fieldset>
회원아이디
<span id="member_confirm_id"><?=$member[mb_id]?></span>
<label for="confirm_mb_password">패스워드</label>
<input type="password" id="confirm_mb_password" name="mb_password" class="fieldset_input" maxLength="20" size="15" required onkeypress="check_capslock('confirm_mb_password');">
<input type="submit" id="btn_submit" class="fieldset_submit" value="확인">
</fieldset>
</form>
</div>

View File

@ -2,23 +2,29 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<form name="fboardpassword" method="post" action="<? echo $action; ?>">
<input type="hidden" name="w" value="<?=$w?>">
<input type="hidden" name="bo_table" value="<?=$bo_table?>">
<input type="hidden" name="wr_id" value="<?=$wr_id?>">
<input type="hidden" name="comment_id" value="<?=$comment_id?>">
<input type="hidden" name="sfl" value="<?=$sfl?>">
<input type="hidden" name="stx" value="<?=$stx?>">
<input type="hidden" name="page" value="<?=$page?>">
<div id="password_confirm">
<p>
<strong>비밀글 기능으로 보호된 글입니다.</strong>
작성자와 관리자만 열람하실 수 있습니다. 작성자 본인이시라면 패스워드를 입력하세요.
</p>
<fieldset id="password_confirm">
<p>비밀글 기능으로 보호된 글입니다. 작성자와 관리자만 열람하실 수 있습니다.<br>작성자 본인이시라면 패스워드를 입력하세요.</p>
<label for="password_wr_password">패스워드</label>
<input type="password" id="password_wr_password" name="wr_password" class="fieldset_input required" maxLength="20" size="15" required>
<input type="submit" class="fieldset_submit" value="확인">
</fieldset>
<form name="fboardpassword" method="post" action="<? echo $action; ?>">
<input type="hidden" name="w" value="<?=$w?>">
<input type="hidden" name="bo_table" value="<?=$bo_table?>">
<input type="hidden" name="wr_id" value="<?=$wr_id?>">
<input type="hidden" name="comment_id" value="<?=$comment_id?>">
<input type="hidden" name="sfl" value="<?=$sfl?>">
<input type="hidden" name="stx" value="<?=$stx?>">
<input type="hidden" name="page" value="<?=$page?>">
</form>
<fieldset>
<label for="password_wr_password">패스워드</label>
<input type="password" id="password_wr_password" name="wr_password" class="fieldset_input required" maxLength="20" size="15" required>
<input type="submit" class="fieldset_submit" value="확인">
</fieldset>
</form>
</div>
<script>
document.fboardpassword.wr_password.focus();

View File

@ -58,7 +58,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<p><?=$po_etc?></p>
<?
$comment_size = "";
if ($is_member) { $comment_size = 52; ?>
if ($is_member) { $comment_size = 50; ?>
<input type="hidden" name="pc_name" value="<?=cut_str($member['mb_nick'],255)?>">
<? } else { $comment_size = 32; ?>
<label for="pc_name">이름</label>