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

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

Browse Source
This commit is contained in:
chicpro
2013-01-15 17:30:16 +09:00
parent ae253d1c11 009d1119fa
commit fb401eb278
5 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
adm/board_form.php
View File

@ -722,7 +722,7 @@ if (!preg_match("/([m|M])$/", $upload_max_filesize)) {
<tr> <tr>
<th scope="row"><label for="bo_read_point">글읽기 포인트</label></th> <th scope="row"><label for="bo_read_point">글읽기 포인트</label></th>
<td> <td>
<input type="text" id="bo_read_point" name="bo_read_point" class="required numeric" value="<?=$board['bo_read_point']?>" size="5"> <input type="text" id="bo_read_point" name="bo_read_point" class="required" value="<?=$board['bo_read_point']?>" size="5">
</td> </td>
<td class="group_setting"> <td class="group_setting">
<input type="checkbox" id="chk_read_point" name="chk_read_point" value="1"> <input type="checkbox" id="chk_read_point" name="chk_read_point" value="1">
@ -732,7 +732,7 @@ if (!preg_match("/([m|M])$/", $upload_max_filesize)) {
<tr> <tr>
<th scope="row"><label for="bo_write_point">글쓰기 포인트</label></th> <th scope="row"><label for="bo_write_point">글쓰기 포인트</label></th>
<td> <td>
<input type="text" id="bo_write_point" name="bo_write_point" class="required numeric" value="<?=$board['bo_write_point']?>" size="5"> <input type="text" id="bo_write_point" name="bo_write_point" class="required" value="<?=$board['bo_write_point']?>" size="5">
</td> </td>
<td class="group_setting"> <td class="group_setting">
<input type="checkbox" id="chk_write_point" name="chk_write_point" value="1"> <input type="checkbox" id="chk_write_point" name="chk_write_point" value="1">
@ -742,7 +742,7 @@ if (!preg_match("/([m|M])$/", $upload_max_filesize)) {
<tr> <tr>
<th scope="row"><label for="bo_comment_point">댓글쓰기 포인트</label></th> <th scope="row"><label for="bo_comment_point">댓글쓰기 포인트</label></th>
<td> <td>
<input type="text" id="bo_comment_point" name="bo_comment_point" class="required numeric" value="<?=$board['bo_comment_point']?>" size="5"> <input type="text" id="bo_comment_point" name="bo_comment_point" class="required" value="<?=$board['bo_comment_point']?>" size="5">
</td> </td>
<td class="group_setting"> <td class="group_setting">
<input type="checkbox" id="chk_comment_point" name="chk_comment_point" value="1"> <input type="checkbox" id="chk_comment_point" name="chk_comment_point" value="1">
@ -752,7 +752,7 @@ if (!preg_match("/([m|M])$/", $upload_max_filesize)) {
<tr> <tr>
<th scope="row"><label for="bo_download_point">다운로드 포인트</label></th> <th scope="row"><label for="bo_download_point">다운로드 포인트</label></th>
<td> <td>
<input type="text" id="bo_download_point" name="bo_download_point" class="required numeric" value="<?=$board['bo_download_point']?>" size="5"> <input type="text" id="bo_download_point" name="bo_download_point" class="required" value="<?=$board['bo_download_point']?>" size="5">
</td> </td>
<td class="group_setting"> <td class="group_setting">
<input type="checkbox" id="chk_download_point" name="chk_download_point" value="1"> <input type="checkbox" id="chk_download_point" name="chk_download_point" value="1">

12
adm/config_form.php
View File

@ -58,12 +58,12 @@ include_once ('./admin.head.php');
<th scope="row"><label for="cf_login_point">로그인시 포인트</label></th> <th scope="row"><label for="cf_login_point">로그인시 포인트</label></th>
<td> <td>
<?=help('회원에게 하루에 한번만 부여')?> <?=help('회원에게 하루에 한번만 부여')?>
<input type="text" id="cf_login_point" name="cf_login_point" class="required numeric" value="<?=$config['cf_login_point']?>" size="2"> 점 <input type="text" id="cf_login_point" name="cf_login_point" class="required" value="<?=$config['cf_login_point']?>" size="2"> 점
</td> </td>
<th scope="row"><label for="cf_memo_send_point">쪽지보낼시 차감 포인트</label></th> <th scope="row"><label for="cf_memo_send_point">쪽지보낼시 차감 포인트</label></th>
<td> <td>
<?=help('양수로 입력하십시오. 0점은 쪽지 보낼시 포인트를 차감하지 않습니다.')?> <?=help('양수로 입력하십시오. 0점은 쪽지 보낼시 포인트를 차감하지 않습니다.')?>
<input type="text" id="cf_memo_send_point" name="cf_memo_send_point" class="required numeric" value="<?=$config['cf_memo_send_point']?>" size="2"> 점 <input type="text" id="cf_memo_send_point" name="cf_memo_send_point" class="required" value="<?=$config['cf_memo_send_point']?>" size="2"> 점
</td> </td>
</tr> </tr>
<tr> <tr>
@ -186,15 +186,15 @@ include_once ('./admin.head.php');
<tbody> <tbody>
<tr> <tr>
<th scope="row"><label for="cf_read_point">글읽기 포인트</label></th> <th scope="row"><label for="cf_read_point">글읽기 포인트</label></th>
<td><input type="text" id="cf_read_point" name="cf_read_point" class="required numeric" value="<?=$config['cf_read_point']?>" size="2"> 점</td> <td><input type="text" id="cf_read_point" name="cf_read_point" class="required" value="<?=$config['cf_read_point']?>" size="2"> 점</td>
<th scope="row"><label for="cf_write_point">글쓰기 포인트</label></th> <th scope="row"><label for="cf_write_point">글쓰기 포인트</label></th>
<td><input type="text" id="cf_write_point" name="cf_write_point" class="required numeric" value="<?=$config['cf_write_point']?>" size="2"> 점</td> <td><input type="text" id="cf_write_point" name="cf_write_point" class="required" value="<?=$config['cf_write_point']?>" size="2"> 점</td>
</tr> </tr>
<tr> <tr>
<th scope="row"><label for="cf_comment_point">댓글쓰기 포인트</label></th> <th scope="row"><label for="cf_comment_point">댓글쓰기 포인트</label></th>
<td><input type="text" id="cf_comment_point" name="cf_comment_point" class="required numeric" value="<?=$config['cf_comment_point']?>" size="2"> 점</td> <td><input type="text" id="cf_comment_point" name="cf_comment_point" class="required" value="<?=$config['cf_comment_point']?>" size="2"> 점</td>
<th scope="row"><label for="cf_download_point">다운로드 포인트</label></th> <th scope="row"><label for="cf_download_point">다운로드 포인트</label></th>
<td><input type="text" id="cf_download_point" name="cf_download_point" class="required numeric" value="<?=$config['cf_download_point']?>" size="2"> 점</td> <td><input type="text" id="cf_download_point" name="cf_download_point" class="required" value="<?=$config['cf_download_point']?>" size="2"> 점</td>
</tr> </tr>
<tr> <tr>
<th scope="row"><label for="cf_link_target">새창 링크</label></th> <th scope="row"><label for="cf_link_target">새창 링크</label></th>

18
css/default.css
View File

@ -426,7 +426,7 @@ a {color:#000;text-decoration:none}
.new_win_ul a {display:block;padding:10px;border-right:1px solid #eee;border-left:1px solid #eee;color:#595959;font-family:"dotum";font-size:1em;font-weight:bold} .new_win_ul a {display:block;padding:10px;border-right:1px solid #eee;border-left:1px solid #eee;color:#595959;font-family:"dotum";font-size:1em;font-weight:bold}
.new_win_ul a:hover, .new_win_ul a:hover,
.new_win_ul a:focus {background:#faf9f5} .new_win_ul a:focus {background:#faf9f5}
.btn_win {margin-bottom:20px;text-align:center} /* 새창용 */ .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */
.btn_win a {display:inline-block;padding:0 10px;height:28px;border:1px solid #ccc;background:#fafafa;color:#000;font-size:0.75em;text-decoration:none;line-height:2.5em} .btn_win a {display:inline-block;padding:0 10px;height:28px;border:1px solid #ccc;background:#fafafa;color:#000;font-size:0.75em;text-decoration:none;line-height:2.5em}
/* 포인트 내역 */ /* 포인트 내역 */
@ -456,11 +456,21 @@ a {color:#000;text-decoration:none}
/* 쪽지 쓰기 */ /* 쪽지 쓰기 */
#memo_write textarea {height:100px} #memo_write textarea {height:100px}
/* 아이디/패스워드 찾기 */
#find_info fieldset {padding:0;border:0}
#find_info legend {margin:0;padding:0;width:0;height:0;border:0;overflow:hidden}
#find_info p {font-size:0.75em}
#find_info #captcha {padding-top:20px;border-top:1px solid #ddd}
#find_info #captcha input {margin-left:5px}
/* pagination */ /* pagination */
.pg {clear:both;margin:0 0 20px;padding-top:20px;font-size:0.75em;text-align:center} .pg {clear:both;margin:0 0 20px;padding-top:20px;font-size:0.75em;text-align:center}
.pg_wrap {display:inline-block;border:1px solid #ddd;letter-spacing:-4px} .pg_wrap {display:inline-block;border:1px solid #ddd;letter-spacing:-4px}
.pg_page, .pg_current {display:inline-block;padding:0 12px;height:30px;background:#fff;color:#000;letter-spacing:0;line-height:2.6em;vertical-align:middle} .pg_page,
.pg_current {display:inline-block;padding:0 12px;height:30px;background:#fff;color:#000;letter-spacing:0;line-height:2.6em;vertical-align:middle}
.pg_page {background:#f9f9f9;text-decoration:none} .pg_page {background:#f9f9f9;text-decoration:none}
.pg_start, .pg_prev {border-right:1px solid #ddd} .pg_start,
.pg_end, .pg_next {border-left:1px solid #ddd} .pg_prev {border-right:1px solid #ddd}
.pg_end,
.pg_next {border-left:1px solid #ddd}
.pg_current {background:#494949;color:#fff} .pg_current {background:#494949;color:#fff}

31
skin/member/neo/password_lost.skin.php
View File

@ -2,21 +2,26 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 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"> <form name="fpasswordlost" method="post" action="<?=$action_url?>" onsubmit="return fpasswordlost_submit(this);" autocomplete="off">
<fieldset> <fieldset>
<legend>이메일 주소 입력</legend> <legend>이메일 주소 입력</legend>
<p>회원가입 시 등록하신 이메일 주소를 입력해 주시면, 해당 이메일로 아이디와 패스워드 정보를 보내드립니다.</p> <p>
<label for="mb_email">E-mail 주소</label> 회원가입 시 등록하신 이메일 주소를 입력해 주세요.<br>
<input type="text" id="mb_email" name="mb_email" class="email" required size="45" title="E-mail 주소"> 해당 이메일로 아이디와 패스워드 정보를 보내드립니다.
</fieldset> </p>
<? echo captcha_html(); ?> <label for="mb_email">E-mail 주소</label>
<div class="btn_confirm"> <input type="text" id="mb_email" name="mb_email" class="fieldset_input email" required size="30" title="E-mail 주소">
<input type="submit" value="확인"> </fieldset>
<a href="javascript:window.close();">창닫기</a> <?=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> </div>
</form>
<script> <script>
function fpasswordlost_submit(f) function fpasswordlost_submit(f)

7
skin/member/neo/register_form.skin.php
View File

@ -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> <td><input type="text" id="reg_mb_recommend" name="mb_recommend" class="frm_input" title="추천인아이디"></td>
</tr> </tr>
<? } ?> <? } ?>
</table>
<?=$captcha_html?> <tr>
<th scope="row">자동등록방지</th>
<td><?=$captcha_html?></td>
</tr>
</table>
<div class="btn_confirm"> <div class="btn_confirm">
<input type="submit" class="btn_submit" value="회원가입" accesskey="s"> <input type="submit" class="btn_submit" value="회원가입" accesskey="s">