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

This commit is contained in:
gnuboard
2013-03-05 09:55:51 +09:00
4 changed files with 23 additions and 19 deletions

View File

@ -52,9 +52,9 @@ h2 {font-size:1.2em}
#snb a {display:inline-block;padding:5px 0;color:#e0e0e0;font-size:0.9em;text-decoration:none}
/* gnb js off */
#gnb {margin-top:-1px}
#gnb {}
#gnb ul {z-index:10}
.gnb_1depth {position:relative;margin-top:-1px;margin-left:-1px;background:#383a3f;zoom:1}
.gnb_1depth {position:relative;margin-left:-1px;background:#383a3f;zoom:1}
.gnb_1depth:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_1depth a {display:block;float:left;width:90px;height:35px;color:#e0e0e0;font-weight:bold;line-height:2.95em !important;line-height:2.65em}
.gnb_1depth_air a,

View File

@ -33,7 +33,7 @@ pre {overflow-x:scroll;font-size:1.1em}
/* 상단 레이아웃 */
#hd {background:#fff;zoom:1}
#hd:after {display:block;visibility:hidden;clear:both;content:""}
#hd h1 {font-size:0;line-height:0;overflow:hidden}
#hd h1 {width:0;height:0;font-size:0;line-height:0;overflow:hidden}
#logo {float:left;padding:5px 0;margin-left:10px}
@ -64,8 +64,6 @@ pre {overflow-x:scroll;font-size:1.1em}
#wrapper:after {display:block;visibility:hidden;clear:both;content:""}
#wrapper_title {margin-bottom:20px;padding:0 10px;font-size:1.2em}
#lnb {display:none}
#container {position:relative;min-height:300px;zoom:1}
#container:after {display:block;visibility:hidden;clear:both;content:""}
@ -112,9 +110,7 @@ pre {overflow-x:scroll;font-size:1.1em}
.btn_cancel {display:inline-block;padding:0 1em;height:3em;border:1px solid #ccc;background:#fafafa;color:#000;font-size:1em;text-decoration:none;line-height:3em}
.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:1.4em} /* 우편번호검색버튼 등 */
.btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */
.btn_win a {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em;cursor:pointer}
.btn_win a:focus,
.btn_win a:hover {text-decoration:none}
.btn_win a {display:inline-block;padding:0 10px;height:2.5em;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;line-height:2.5em;cursor:pointer}
/* 게시판용 버튼 */
.btn_b01 {display:inline-block;padding:0 10px;height:25px;border:1px solid #eee !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:1.5em;vertical-align:middle}
.btn_b01:focus,
@ -173,6 +169,16 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#333;color:#fff;
.ad200200 {display:none}
.ad72890 {display:none}
/* 새창 기본 스타일 */
.new_win {}
.new_win h1 {margin-bottom:20px;padding:0 20px;height:3em;border-top:3px solid #4e5d60;border-bottom:1px solid #e9e9e9;font-size:1.2em;line-height:3.5em}
.new_win table {margin:0 auto 20px !important;width:100% !important}
.new_win_ul {margin:-20px 0 20px 0;padding:0 0 0 20px;border-bottom:1px solid #455255;background:#484848;list-style:none;zoom:1}
.new_win_ul:after {display:block;visibility:hidden;clear:both;content:""}
.new_win_ul li {float:left;margin-left:-1px}
.new_win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #455255;border-left:1px solid #455255;color:#fff;font-family:"dotum";font-weight:bold;text-decoration:none}
.new_win_desc {padding:1em}
/* 회원가입 약관 */
#fregister section {margin:0 0 20px;padding:20px;border-bottom:3px solid #eee}
#fregister h2 {margin:0 0 20px;text-align:center}
@ -194,8 +200,8 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#333;color:#fff;
#mb_login section div {text-align:right}
/* 쪽지 */
#memo_view section {margin:0 auto 20px;padding:20px;width:87%}
#memo_view section h2 {font-size:0;line-height:0;overflow:hidden}
#memo_view section {padding:1em}
#memo_view section h2 {width:0;height:0;font-size:0;line-height:0;overflow:hidden}
#memo_view_ul {margin:0;padding:0 0 10px;border-bottom:1px solid #eee;list-style:none}
.memo_view_li {position:relative;padding:5px 0}
.memo_view_subj {display:inline-block;width:65px}
@ -382,7 +388,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#333;color:#fff;
#bo_vc .sv_member,
#bo_vc .sv_guest {font-weight:bold}
.bo_vc_hdinfo {display:inline-block;margin:0 15px 0 5px}
#bo_vc h1 {font-size:0;line-height:0;overflow:hidden}
#bo_vc h1 {width:0;height:0;font-size:0;line-height:0;overflow:hidden}
#bo_vc a {color:#000;text-decoration:none}
#bo_vc p {padding:0 0 5px;line-height:1.8em}
#bo_vc p a {text-decoration:underline}

View File

@ -3,8 +3,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
include_once(G4_PATH.'/head.sub.php');
include_once(G4_LIB_PATH.'/latest.lib.php');
//include_once(G4_LIB_PATH.'/outlogin.lib.php');
//include_once(G4_LIB_PATH.'/poll.lib.php');
include_once(G4_LIB_PATH.'/outlogin.lib.php');
include_once(G4_LIB_PATH.'/poll.lib.php');
include_once(G4_LIB_PATH.'/visit.lib.php');
include_once(G4_LIB_PATH.'/connect.lib.php');
include_once(G4_LIB_PATH.'/popular.lib.php');
@ -106,8 +106,8 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
<div id="wrapper">
<div id="lnb">
<?//=outlogin('basic'); // 외부 로그인 ?>
<?//=poll('basic'); // 설문조사 ?>
<?=outlogin('basic'); // 외부 로그인 ?>
<?=poll('basic'); // 설문조사 ?>
</div>
<div id="container">
<? if ((!$bo_table || $w == 's' ) && !defined("_INDEX_")) {?><h1 id="wrapper_title"><?=$g4['title']?></h1><?}?>

View File

@ -8,10 +8,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<form name="foutlogin" method="post" action="<?=$outlogin_action_url?>" onsubmit="return fhead_submit(this);" autocomplete="off">
<fieldset>
<input type="hidden" name="url" value="<?=$outlogin_url?>">
<label for="ol_id" id="ol_idlabel">회원아이디<strong class="sound_only">필수</strong></label>
<input type="text" id="ol_id" name="mb_id" class="required" maxlength="20" required>
<label for="ol_pw" id="ol_pwlabel">패스워드<strong class="sound_only">필수</strong></label>
<input type="password" id="ol_pw" name="mb_password" class="required" maxlength="20" required>
<input type="text" id="ol_id" name="mb_id" class="required" maxlength="20" required placeholder="회원아이디(필수)" title="회원아이디(필수)">
<input type="password" id="ol_pw" name="mb_password" class="required" maxlength="20" required placeholder="패스워드(필수)" title="패스워드(필수)">
<input type="submit" id="ol_submit" value="로그인">
<div id="ol_svc">
<a href="<?=G4_BBS_URL?>/register.php"><b>회원가입</b></a>