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-29 14:41:00 +09:00
parent 376ac5d78d 38d5be2c45
commit c1a12e72ce
4 changed files with 54 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bbs/password.php
View File

@ -26,13 +26,22 @@ switch ($w) {
include_once(G4_PATH.'/head.sub.php'); include_once(G4_PATH.'/head.sub.php');
if ($board['bo_include_head']) { @include ($board['bo_include_head']); } //if ($board['bo_include_head']) { @include ($board['bo_include_head']); }
if ($board['bo_content_head']) { echo stripslashes($board['bo_content_head']); } //if ($board['bo_content_head']) { echo stripslashes($board['bo_content_head']); }
/* 비밀글의 제목을 가져옴 지운아빠 2013-01-29 */
$sql = " select wr_subject from {$write_table}
where wr_num = '{$write['wr_num']}'
and wr_reply = ''
and wr_is_comment = 0 ";
$row = sql_fetch($sql);
$g4['title'] = $row['wr_subject'];
include_once($member_skin_path.'/password.skin.php'); include_once($member_skin_path.'/password.skin.php');
if ($board['bo_content_tail']) { echo stripslashes($board['bo_content_tail']); } //if ($board['bo_content_tail']) { echo stripslashes($board['bo_content_tail']); }
if ($board['bo_include_tail']) { @include ($board['bo_include_tail']); } //if ($board['bo_include_tail']) { @include ($board['bo_include_tail']); }
include_once(G4_PATH.'/tail.sub.php'); include_once(G4_PATH.'/tail.sub.php');
?> ?>

30
css/default.css
View File

@ -88,11 +88,11 @@ pre {overflow-x:scroll;font-size:1.1em}
#idx_catch {margin-bottom:10px;padding: 25px 0 25px} #idx_catch {margin-bottom:10px;padding: 25px 0 25px}
/* 버튼 */ /* 버튼 */
.btn01 {display:inline-block;padding:0 10px;height:24px;border:1px solid #239ce2 !important;background:#109ff1 !important;color:#fff !important;text-decoration:none;line-height:2.2em} .btn01 {display:inline-block;padding:0 10px;height:24px;border:1px solid #2292d3 !important;background:#109ff1 !important;color:#fff !important;text-decoration:none;line-height:2.2em}
.btn02 {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;text-decoration:none;line-height:2.2em} .btn02 {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;text-decoration:none;line-height:2.2em}
.btn03 {display:inline-block;padding:0 10px;height:24px;border:1px solid #494949 !important;background:#494949 !important;color:#fff !important;text-decoration:none;line-height:2.2em} .btn03 {display:inline-block;padding:0 10px;height:24px;border:1px solid #494949 !important;background:#494949 !important;color:#fff !important;text-decoration:none;line-height:2.2em}
.btn_confirm {text-align:center} /* 서식단계 진행 */ .btn_confirm {text-align:center} /* 서식단계 진행 */
.btn_submit {padding:0 10px;height:24px;border:0;background:#484848;color:#fff;letter-spacing:-0.1em;vertical-align:top} .btn_submit {padding:0 10px;height:24px;border:0;background:#109ff1;color:#fff;letter-spacing:-0.1em;vertical-align:top}
.btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;line-height:2em} .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;line-height:2em}
.btn_frmline {padding:0 7px 0 5px;height:22px;border:0;background:#109ff1;color:#fff;letter-spacing:-0.1em;vertical-align:top;line-height:2em} .btn_frmline {padding:0 7px 0 5px;height:22px;border:0;background:#109ff1;color:#fff;letter-spacing:-0.1em;vertical-align:top;line-height:2em}
.btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */ .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */
@ -159,6 +159,15 @@ fieldset textarea:focus {padding:4px 4px 5px;border:0;background:#494949;color:#
fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#fff;line-height:1.9em;vertical-align:middle;cursor:pointer} fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#fff;line-height:1.9em;vertical-align:middle;cursor:pointer}
/* ///// 스킨별 스타일 ///// */ /* ///// 스킨별 스타일 ///// */
/* 회원가입 약관 */
#fregister section {margin:0 0 20px;padding:20px}
#fregister h2 {margin:0 0 20px;text-align:center}
#fregister textarea {display:block;margin-bottom:10px;padding:5px;width:98%;height:150px;border:1px solid #ddd;background:#f7f7f7}
#fregister textarea:focus {background:#333;color:#fff}
.fregister_agree {padding:10px 0 0;text-align:right}
.fregister_agree label {display:inline-block;margin-right:5px}
#fregister p {text-align:center}
/* 아웃로그인 스킨 */ /* 아웃로그인 스킨 */
.ol {position:relative;margin-bottom:10px;padding:14px} .ol {position:relative;margin-bottom:10px;padding:14px}
.ol h2 {width:0;height:0;overflow:hidden} .ol h2 {width:0;height:0;overflow:hidden}
@ -172,7 +181,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
.ol_pwlabel {position:absolute;top:35px;left:5px;color:#696969;font-size:0.9em} .ol_pwlabel {position:absolute;top:35px;left:5px;color:#696969;font-size:0.9em}
#auto_login {} #auto_login {}
#auto_login_label {letter-spacing:-0.1em} #auto_login_label {letter-spacing:-0.1em}
#ol_submit {width:60px;height:24px;border:1px solid #383838;background:#484848;color:#fff;font-size:0.9em;font-weight:bold;vertical-align:top} #ol_submit {width:60px;height:24px;border:1px solid #2292d3;background:#109ff1;color:#fff;font-size:0.9em;font-weight:bold;vertical-align:top}
#ol_before ul {float:right;margin:7px 0 13px;zoom:1} #ol_before ul {float:right;margin:7px 0 13px;zoom:1}
#ol_before ul:after {display:block;visibility:hidden;clear:both;content:""} #ol_before ul:after {display:block;visibility:hidden;clear:both;content:""}
#ol_before li {float:left;margin-left:5px;padding-top:2px} #ol_before li {float:left;margin-left:5px;padding-top:2px}
@ -214,6 +223,15 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
#mb_confirm label {letter-spacing:-0.1em} #mb_confirm label {letter-spacing:-0.1em}
#mb_confirm_id {display:inline-block;margin-right:20px;font-weight:bold} #mb_confirm_id {display:inline-block;margin-right:20px;font-weight:bold}
/* 비밀글 패스워드 확인 */
#pw_confirm {margin:100px auto;width:500px}
#pw_confirm h1 {margin:0 0 20px;font-size:1.3em}
#pw_confirm p {padding:20px;border-bottom-color:#f7f7f2}
#pw_confirm p strong {display:block}
#pw_confirm fieldset {margin:0 0 30px;padding:30px 0;text-align:center}
#pw_confirm label {letter-spacing:-0.1em}
#pw_confirm_id {display:inline-block;margin-right:20px;font-weight:bold}
/* 설문조사 스킨 */ /* 설문조사 스킨 */
#poll {} #poll {}
#poll header {padding:14px 14px 0} #poll header {padding:14px 14px 0}
@ -250,7 +268,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
#sch_result_bo dd {margin:0;padding:0} #sch_result_bo dd {margin:0;padding:0}
#sch_result_bo ul {margin-top:1px} #sch_result_bo ul {margin-top:1px}
#sch_result_bo li {position:relative;margin-top:-1px;height:40px} #sch_result_bo li {position:relative;margin-top:-1px;height:40px}
#sch_result_bo a {position:absolute;padding:0 10px;width:149px;height:40px;border:1px solid #616161;border-right:0;background:#484848;color:#fff;text-decoration:none;line-height:3.4em} #sch_result_bo a {position:absolute;padding:0 10px;width:149px;height:40px;border:1px solid #2292d3;border-right:0;background:#109ff1;color:#fff;text-decoration:none;line-height:3.4em}
#sch_result_bo .sch_on {width:150px;border-color:#ddd;border-right:0;background:#fff;color:#000;font-weight:bold} #sch_result_bo .sch_on {width:150px;border-color:#ddd;border-right:0;background:#fff;color:#000;font-weight:bold}
#sch_result_bo .cnt_cmt {display:inline-block;margin-left:10px;color:#fff} #sch_result_bo .cnt_cmt {display:inline-block;margin-left:10px;color:#fff}
#sch_result_bo .sch_on .cnt_cmt {color:#000} #sch_result_bo .sch_on .cnt_cmt {color:#000}
@ -258,7 +276,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
#sch_result_atc dt a {display:inline-block;margin-bottom:15px;color:#000;font-size:1.2em;font-weight:bold;text-decoration:none} #sch_result_atc dt a {display:inline-block;margin-bottom:15px;color:#000;font-size:1.2em;font-weight:bold;text-decoration:none}
#sch_result_atc dd {margin:0 0 15px} #sch_result_atc dd {margin:0 0 15px}
#sch_result_atc dd a {color:#000;text-decoration:none} #sch_result_atc dd a {color:#000;text-decoration:none}
#sch_result_atc .sch_result_title {display:inline-block;margin-bottom:5px;font-size:1.2em;text-decoration:underline} #sch_result_atc .sch_result_title {display:inline-block;margin-bottom:5px;font-size:1.1em;font-weight:bold;text-decoration:underline}
#sch_result_atc li {padding:13px 0;border-bottom:1px solid #f0f0f0} #sch_result_atc li {padding:13px 0;border-bottom:1px solid #f0f0f0}
#sch_result_atc p {padding:0 0 5px} #sch_result_atc p {padding:0 0 5px}
#sch_result_atc a {display:inline-block;margin:0 10px 0 0} #sch_result_atc a {display:inline-block;margin:0 10px 0 0}
@ -385,6 +403,6 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
.pg_prev {border-right:1px solid #ddd} .pg_prev {border-right:1px solid #ddd}
.pg_end, .pg_end,
.pg_next {border-left:1px solid #ddd} .pg_next {border-left:1px solid #ddd}
.pg_current {background:#494949;color:#fff} .pg_current {background:#2292d3;color:#fff}
.pg_total {text-align:center} .pg_total {text-align:center}

19
skin/member/neo/password.skin.php
View File

@ -2,10 +2,11 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?> ?>
<div id="password_confirm"> <div id="pw_confirm">
<p> <h1><?=$g4['title']?></h1>
<p class="cbg">
<strong>비밀글 기능으로 보호된 글입니다.</strong> <strong>비밀글 기능으로 보호된 글입니다.</strong>
작성자와 관리자만 열람하실 수 있습니다. 작성자 본인이시라면 패스워드를 입력하세요. 작성자와 관리자만 열람하실 수 있습니다. 본인이라면 패스워드를 입력하세요.
</p> </p>
<form name="fboardpassword" method="post" action="<? echo $action; ?>"> <form name="fboardpassword" method="post" action="<? echo $action; ?>">
@ -17,13 +18,17 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<input type="hidden" name="stx" value="<?=$stx?>"> <input type="hidden" name="stx" value="<?=$stx?>">
<input type="hidden" name="page" value="<?=$page?>"> <input type="hidden" name="page" value="<?=$page?>">
<fieldset> <fieldset class="cbg">
<label for="password_wr_password">패스워드<strong class="sound_only">필수</strong></label> <label for="password_wr_password">패스워드<strong class="sound_only">필수</strong></label>
<input type="password" id="password_wr_password" name="wr_password" class="fieldset_input required" maxLength="20" size="15" required title="패스워드"> <input type="password" id="password_wr_password" name="wr_password" class="fs_input required" maxLength="20" size="15" required title="패스워드">
<input type="submit" class="fieldset_submit" value="확인"> <input type="submit" class="fs_submit" value="확인">
</fieldset> </fieldset>
</form> </form>
<div class="btn_confirm">
<a href="<?=$_SERVER['HTTP_REFERER']?>">돌아가기</a>
</div>
</div> </div>
<script> <script>

9
skin/member/neo/register.skin.php
View File

@ -4,25 +4,26 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<form id="fregister" name="fregister" method="POST" action="<?=$register_action_url?>" onsubmit="return fregister_submit(this);" autocomplete="off"> <form id="fregister" name="fregister" method="POST" action="<?=$register_action_url?>" onsubmit="return fregister_submit(this);" autocomplete="off">
<section id="fregister_term"> <section id="fregister_term" class="cbg">
<h2>회원가입약관</h2> <h2>회원가입약관</h2>
<textarea readonly><?=get_text($config['cf_stipulation'])?></textarea> <textarea readonly><?=get_text($config['cf_stipulation'])?></textarea>
<fieldset class="fregister_agree"> <fieldset class="fregister_agree">
<label for="agree11">회원가입약관의 내용에 동의합니다.</label>
<input type="checkbox" id="agree11" name="agree" value="1"> <input type="checkbox" id="agree11" name="agree" value="1">
<label for="agree11">회원가입약관의 내용에 동의합니다. (동의하셔야 회원가입가능)</label>
</fieldset> </fieldset>
</section> </section>
<section id="fregister_private"> <section id="fregister_private" class="cbg">
<h2>개인정보수집이용안내</h2> <h2>개인정보수집이용안내</h2>
<textarea readonly><?=get_text($config['cf_privacy'])?></textarea> <textarea readonly><?=get_text($config['cf_privacy'])?></textarea>
<fieldset class="fregister_agree"> <fieldset class="fregister_agree">
<label for="agree21">개인정보수집이용안내의 내용에 동의합니다.</label>
<input type="checkbox" id="agree21" name="agree2" value="1"> <input type="checkbox" id="agree21" name="agree2" value="1">
<label for="agree21">개인정보수집이용안내의 내용에 동의합니다. (동의하셔야 회원가입가능)</label>
</fieldset> </fieldset>
</section> </section>
<div class="btn_confirm"> <div class="btn_confirm">
<p>회원가입약관 및 개인정보수집이용안내의 내용에 동의하셔야 회원가입 하실 수 있습니다.</p>
<input type="submit" class="btn_submit" value="회원가입"> <input type="submit" class="btn_submit" value="회원가입">
</div> </div>