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

This commit is contained in:
chicpro
2013-02-20 17:03:39 +09:00
4 changed files with 17 additions and 16 deletions

View File

@ -58,7 +58,7 @@ a:active {color:#000;text-decoration:underline}
#wrapper:after {display:block;visibility:hidden;clear:both;content:""}
#wrapper_title {margin-bottom:20px;font-size:1.2em}
#lnb {float:right;width:208px;border:1px solid #e7f1ed;background:#fff}
#container {float:left;padding:25px 15px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border:1px solid #e7f1ed;background:#fff;zoom:1}
#container {position:relative;float:left;padding:25px 15px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border:1px solid #e7f1ed;background:#fff;zoom:1}
#container:after {display:block;visibility:hidden;clear:both;content:""}
/* 하단 레이아웃 */
@ -210,10 +210,11 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#4e5d60;color:#f
#find_info #captcha input {margin-left:5px}
/* 아웃로그인 스킨 */
.ol {position:relative;padding:35px 14px 14px;border-bottom:1px solid #e7f1ed}
.ol h2 {position:absolute;top:0px;left:14px !important;left:0;margin:0;padding:0 5px;height:25px;background:#76a5a8;color:#fff;font-weight:bold;line-height:2.2em}
.ol {position:relative;border-bottom:1px solid #e7f1ed}
.ol h2 {position:absolute;top:0px;right:14px;margin:0;padding:0 5px;height:25px;background:#76a5a8;color:#fff;font-weight:bold;line-height:2.2em}
.ol ul {margin:0;padding:0;list-style:none}
#ol_before {padding:30px 14px 14px}
#ol_before fieldset {position:relative}
#ol_id {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:168px;height:22px;border:1px solid #b8c9c2;background:#f7f7f7;line-height:1.6em}
#ol_id:focus {border-color:#333;background:#21272e;color:#fff}
@ -231,12 +232,13 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#4e5d60;color:#f
#ol_before a {letter-spacing:-0.1em}
#ol_svc {padding-top:8px;text-align:right}
#ol_after_hd {margin:0 0 5px;padding:5px 0;border-bottom:1px solid #cfded8;text-align:center}
#ol_after_hd a {position:absolute;top:10px;right:14px;color:#e8180c}
#ol_after {padding:25px 14px 14px}
#ol_after_hd {margin:0 0 3px}
#ol_after_hd .btn_admin {margin-top:5px;width:158px;text-align:center}
#ol_after_private {margin:0 0 3px;zoom:1}
#ol_after_private:after {display:block;visibility:hidden;clear:both;content:""}
#ol_after_private li {float:left}
#ol_after_private a {display:block;padding-top:8px;height:37px;background:#fff;text-align:center}
#ol_after_private a {display:block;padding-top:8px;height:37px;background:#f7f7f7;text-align:center}
#ol_after_private a strong {display:block;padding-top:3px;color:#000;font-weight:normal}
#ol_after_private a:focus,
#ol_after_private a:hover {background:#4e5d60;color:#fff;text-decoration:none}
@ -300,9 +302,9 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#4e5d60;color:#f
/* 설문조사 스킨 */
#poll {}
#poll header {position:relative;padding:30px 14px 0}
#poll h2 {position:absolute;top:0px;left:14px !important;left:0;margin:0;padding:0 5px;height:25px;background:#76a5a8;color:#fff;font-weight:bold;line-height:2.2em}
#poll header a {position:absolute;top:10px;right:14px;color:#e8180c}
#poll header {position:relative;padding:25px 14px 0}
#poll h2 {position:absolute;top:0px;right:14px;margin:0;padding:0 5px;height:25px;background:#76a5a8;color:#fff;font-weight:bold;line-height:2.2em}
#poll header .btn_admin {margin-top:5px;width:158px;text-align:center}
#poll header p {padding:5px 0 10px}
#poll ul {margin:0 0 10px;padding:5px 14px;list-style:none}
#poll li {padding:3px 0}
@ -450,9 +452,9 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#4e5d60;color:#f
#bo_sch legend {width:0;height:0;overflow:hidden}
/* 게시판 읽기 */
#bo_v {position:relative;margin-bottom:20px;padding-bottom:20px}
#bo_v {margin-bottom:20px;padding-bottom:20px}
#bo_v_cate {position:absolute;top:-25px;right:0 !important;right:14px;margin:0;padding:0 5px;height:25px;background:#76a5a8;color:#fff;font-weight:bold;line-height:2.2em}
#bo_v_cate {position:absolute;top:0;right:14px;margin:0;padding:0 5px;height:25px;background:#76a5a8;color:#fff;font-weight:bold;line-height:2.2em}
#bo_v_h1 {padding:0 0 10px;font-size:1.2em}

View File

@ -8,7 +8,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<? for ($i=0; $i<count($list); $i++) { ?>
<li>
<?
echo $list[$i]['icon_reply']." ";
//echo $list[$i]['icon_reply']." ";
echo "<a href=\"".$list[$i]['href']."\" title=\"".$list[$i]['wr_subject']."\">";
if ($list[$i]['is_notice'])
echo "<strong>".$list[$i]['subject']."</strong>";

View File

@ -5,9 +5,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<!-- 로그인 후 외부로그인 시작 -->
<section id="ol_after" class="ol">
<header id="ol_after_hd">
<h2>내 회원정보</h2>
<strong><?=$nick?></strong>님
<? if ($is_admin == 'super' || $is_auth) { ?><a href="<?=G4_ADMIN_URL?>" id="ol_admin">관리자</a><? } ?>
<h2><?=$nick?>님</h2>
<? if ($is_admin == 'super' || $is_auth) { ?><a href="<?=G4_ADMIN_URL?>" class="btn_admin">관리자</a><? } ?>
</header>
<ul id="ol_after_private">
<li>

View File

@ -19,7 +19,7 @@ $po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
<section id="poll">
<header>
<h2>설문조사</h2>
<? if ($is_admin == "super") { ?><a href="<?=G4_ADMIN_URL?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문조사 관리</a><? } ?>
<? if ($is_admin == "super") { ?><a href="<?=G4_ADMIN_URL?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>" class="btn_admin">설문조사 관리</a><? } ?>
<p><?=$po['po_subject']?></p>
</header>
<ul>