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

This commit is contained in:
chicpro
2013-01-17 16:46:57 +09:00
7 changed files with 45 additions and 30 deletions

4
bbs/_head.sub.php Normal file
View File

@ -0,0 +1,4 @@
<?
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
include_once($g4['path'].'/head.sub.php');
?>

4
bbs/_tail.sub.php Normal file
View File

@ -0,0 +1,4 @@
<?
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
include_once($g4['path'].'/tail.sub.php');
?>

View File

@ -2,7 +2,7 @@
include_once('./_common.php');
$g4['title'] = '로그인';
include_once('./_head.php');
include_once('./_head.sub.php');
$p = parse_url($url);
if ((isset($p['scheme']) && $p['scheme']) ||
@ -52,5 +52,5 @@ $member_skin_path = $g4['path'].'/skin/member/'.$config['cf_member_skin'];
include_once($member_skin_path.'/login.skin.php');
include_once('./_tail.php');
include_once('./_tail.sub.php');
?>

View File

@ -407,6 +407,9 @@ a {color:#000;text-decoration:none}
#post_num li a {display:block;padding:5px 0}
#post_num p {margin:0 auto 30px;width:90%}
/* 로그인 */
#mb_login
/* 회원가입 약관 */
#fregister section {margin-bottom:20px}
#fregister textarea {display:block;margin-bottom:10px;padding:5px;width:98%;height:150px;border:1px solid #ddd;background:#f7f7f7}
@ -422,11 +425,11 @@ a {color:#000;text-decoration:none}
.reg_result_deco {text-align:center}
/* 회원 패스워드 확인 */
#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}
#mb_confirm {padding:100px 0;text-align:center}
#mb_confirm p {margin-bottom:20px}
#mb_confirm strong {display:block;margin-bottom:1em;font-size:1.3em}
#mb_confirm fieldset {margin:0 auto;width:400px;border:1px solid #ddd;background:#f5f5f5}
#mb_confirm_id {display:inline-block;margin:0 30px 0 20px}
/* 비밀글 패스워드 확인 */
#password_confirm {padding:100px 0;text-align:center}

View File

@ -2,30 +2,35 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<form name="flogin" method="post" action="<?=$login_action_url?>" onsubmit="return flogin_submit(this);">
<input type="hidden" name="url" value='<?=$login_url?>'>
<div id="mb_login">
<h1>로그인</h1>
<fieldset>
<label for="login_mb_id">회원아이디</label>
<input type="text" id="login_mb_id" name="mb_id" maxLength="20" size="15" required title="회원아이디">
<label for="login_mb_password">패스워드</label>
<input type="password" id="login_mb_password" name="mb_password" maxLength="20" size="15" required title="패스워드">
<input type="checkbox" id="login_auto_login" name="auto_login">
<label for="login_auto_login">자동로그인</label>
<input type="submit" value="로그인">
</fieldset>
<form name="flogin" method="post" action="<?=$login_action_url?>" onsubmit="return flogin_submit(this);">
<input type="hidden" name="url" value='<?=$login_url?>'>
<section>
<h2>회원로그인 안내</h2>
<p>
회원아이디 및 패스워드가 기억 안나실 때는 아이디/패스워드 찾기를 이용하십시오.<br>
아직 회원이 아니시라면 회원으로 가입 후 이용해 주십시오.
</p>
<a href="<?=$g4['bbs_url']?>/password_lost.php" id="login_password_lost" target="win_password_lost">아이디/패스워드 찾기</a>
<a href="./register.php">회원가입</a>
</section>
<fieldset>
<label for="login_mb_id">회원아이디</label>
<input type="text" id="login_mb_id" name="mb_id" maxLength="20" size="15" required title="회원아이디">
<label for="login_mb_password">패스워드</label>
<input type="password" id="login_mb_password" name="mb_password" maxLength="20" size="15" required title="패스워드">
<input type="checkbox" id="login_auto_login" name="auto_login">
<label for="login_auto_login">자동로그인</label>
<input type="submit" value="로그인">
</fieldset>
</form>
<section>
<h2>회원로그인 안내</h2>
<p>
회원아이디 및 패스워드가 기억 안나실 때는 아이디/패스워드 찾기를 이용하십시오.<br>
아직 회원이 아니시라면 회원으로 가입 후 이용해 주십시오.
</p>
<a href="<?=$g4['bbs_url']?>/password_lost.php" id="login_password_lost" target="win_password_lost">아이디/패스워드 찾기</a>
<a href="./register.php">회원가입</a>
</section>
</form>
</div>
<script>
$(function(){

View File

@ -4,7 +4,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<script src="<?=$g4[path]?>/js/capslock.js"></script>
<div id="member_confirm">
<div id="mb_confirm">
<p>
<strong>패스워드를 한번 더 입력해주세요.</strong>

View File

@ -13,7 +13,6 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<input type="hidden" name="frm_addr2" value="<?=$frm_addr2?>">
<fieldset>
<legend>우편번호 검색</legend>
<label for="addr1">동/읍/면/리 검색</label>
<input type="text" id="addr1" name="addr1" class="fieldset_input" value="<?=$addr1?>" required minlength=2>
<input type="submit" class="fieldset_submit" value="검색">