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

This commit is contained in:
chicpro
2013-01-23 17:43:06 +09:00
9 changed files with 69 additions and 38 deletions

View File

@ -36,7 +36,12 @@ hr {display:none}
#schall_stx {width:150px;height:21px;border:3px solid #484848;border-right:0;background:#fff}
#schall_submit {position:absolute;top:0;right:0}
#lnb {position:absolute;top:130px;right:0;width:220px}
/* 중간 레이아웃 */
#wrapper {margin:0 auto;padding-bottom:30px;width:980px;zoom:1}
#wrapper:after {display:block;visibility:hidden;clear:both;content:""}
#lnb {float:right;width:220px}
#container {float:left;width:730px;zoom:1}
#container:after {display:block;visibility:hidden;clear:both;content:""}
/* 하단 레이아웃 */
#ft {background:#484848}
@ -44,14 +49,28 @@ hr {display:none}
#popular {background:#515151}
#popular div {margin:0 auto;width:980px;zoom:1}
#popular div:after {display:block;visibility:hidden;clear:both;content:""}
#popular h2 {float:left;color:#fff}
#popular h2 {float:left;padding:15px 45px 15px 0;color:#fff}
#popular ul {float:left;list-style:none}
#popular li {float:left}
#popular a {color:#fff;text-decoration:none}
#popular li {float:left;padding:5px 0}
#popular a {display:inline-block;padding:10px;color:#fff;text-decoration:none}
#ft_catch {padding:30px 0;text-align:center}
#ft_copy {background:#414141}
#ft_copy p {margin:0 auto;width:980px;color:#4a9ab8}
#ft_copy b {color:#079cd3}
/* Contents 레이아웃 */
#wrapper {margin:0 auto;padding-right:250px;width:730px}
/* ///// 콘텐츠별 스타일 ///// */
/* PC 초기화면 */
#idx_catch {margin-bottom:10px;padding: 29px 0 30px}
/* ///// 스킨별 스타일 ///// */
/* 최근게시물 스킨 */
.lt {float:left;margin-bottom:20px;padding:20px;width:314px;height:149px;border-right:1px solid #ececec;border-bottom:1px solid #ececec;background:#fff}
.lt ul {margin:0;padding:0;list-style:none}
.lt li {padding:3px 0}
.lt a {color:#000;text-decoration:none}
.lt_title {display:block;margin-bottom:20px;text-align:center}
.lt_more {text-align:center}
.lt_more a {display:block}
/* paginate */
.pg {}

View File

@ -19,6 +19,8 @@ include_once($g4['path'].'/lib/popular.lib.php');
<h1><?=$config['cf_title']?></h1>
<ul id="snb">
<li><a href="<?=$g4['bbs_path']?>/current_connect.php">현재접속자</a></li>
<li><a href="<?=$g4['bbs_path']?>/new.php">최근게시물</a></li>
<? if ($is_member) { ?>
<? if ($is_admin) { ?><li><a href="<?=$g4['path']?>/adm">관리자</a></li><? } ?>
<li><a href="<?=$g4['bbs_path']?>/member_confirm.php?url=register_form.php">정보수정</a></li>
@ -27,8 +29,6 @@ include_once($g4['path'].'/lib/popular.lib.php');
<li><a href="<?=$g4['bbs_path']?>/register.php">회원가입</a></li>
<li><a href="<?=$g4['bbs_path']?>/login.php">로그인</a></li>
<? } ?>
<li><a href="<?=$g4['bbs_path']?>/current_connect.php">현재접속자</a></li>
<li><a href="<?=$g4['bbs_path']?>/new.php">최근게시물</a></li>
</ul>
<fieldset id="schall">
@ -40,16 +40,17 @@ include_once($g4['path'].'/lib/popular.lib.php');
<input type="image" id="schall_submit" src="<?=$g4['path']?>/img/btn_search.jpg" alt="검색">
</form>
</fieldset>
<div id="lnb">
<?=outlogin('neo'); // 외부 로그인 ?>
<?=poll('neo'); // 설문조사 ?>
<?=visit("neo"); // 방문자수 ?>
<?=connect(); // 현재 접속자수 ?>
</div>
</div>
</header>
<hr>
<div id="wrapper">
<? if ((!$bo_table || $w == 's' ) && !defined('_INDEX_')) {?><h1 id="wrapper_title"><?=$g4['title']?></h1><?}?>
<div id="lnb">
<?=outlogin('neo'); // 외부 로그인 ?>
<?=poll('neo'); // 설문조사 ?>
<?=visit("neo"); // 방문자수 ?>
<?=connect(); // 현재 접속자수 ?>
</div>
<div id="container">
<? if ((!$bo_table || $w == 's' ) && !defined("_INDEX_")) {?><h1 id="wrapper_title"><?=$g4['title']?></h1><?}?>

View File

@ -44,7 +44,6 @@ if (G4_IS_MOBILE) {
}
?>
<title><?=$g4['title']?></title>
<!-- <meta http-equiv='X-UA-Compatible' content='IE=Edge'> -->
<? if (isset($administrator)) { ?>
<link rel="stylesheet" href="<?=$g4['url']?>/css/adm.css?=<?=date("md")?>">
<? } else { ?>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

View File

@ -4,6 +4,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
include_once('./_head.php');
?>
<div id="idx_catch"><img src="<?=$g4['path']?>/img/idx_catch.jpg" alt="Sharing All Possibilities"></div>
<!-- 메인화면 최신글 시작 -->
<?
// 최신글
@ -15,10 +17,17 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
// 사용방법
// latest(스킨, 게시판아이디, 출력라인, 글자수);
echo latest("neo", $row['bo_table'], 10, 70);
if ($i==9) break;
echo latest("neo", $row['bo_table'], 5, 25);
//if ($i==9) break;
}
?>
<script>
$(function(){
var $lts = $('.lt:nth-child(odd)');
$lts.css("margin-left","20px");
});
</script>
<!-- 메인화면 최신글 끝 -->
<?

View File

@ -9,20 +9,20 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<section id="bo_v_info">
<h2>게시물 정보</h2>
<dl>
<div>
<? if ($is_category) { ?>
<dt>분류</dt>
<dd><?=($category_name ? "{$view['ca_name']} " : "");?></dd>
분류
<strong><?=($category_name ? "{$view['ca_name']} " : "");?></strong>
<? } ?>
<dt>작성자</dt>
<dd><div><?=$view['name']?><? if ($is_ip_view) { echo "&nbsp;($ip)"; } ?></div></dd>
<dt>작성일</dt>
<dd><?=date("y-m-d H:i", strtotime($view['wr_datetime']))?></dd>
<dt>조회</dt>
<dd><?=number_format($view['wr_hit'])?>회</dd>
<dt>댓글</dt>
<dd><?=number_format($view['wr_comment'])?>건</dd>
</dl>
작성자
<strong><?=$view['name']?><? if ($is_ip_view) { echo "&nbsp;($ip)"; } ?></strong>
작성일
<strong><?=date("y-m-d H:i", strtotime($view['wr_datetime']))?></strong>
조회
<strong><?=number_format($view['wr_hit'])?>회</strong>
댓글
<strong><?=number_format($view['wr_comment'])?>건</strong>
</div>
</section>
<?
@ -90,7 +90,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<? } ?>
<aside id="bo_v_top">
<h2>게시물 상단 링크</h2>
<h2>게시물 상단 버튼</h2>
<?
ob_start();
?>
@ -145,7 +145,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<aside id="bo_v_bot">
<h2>게시물 하단 링크</h2>
<h2>게시물 하단 버튼</h2>
<? if ($prev_href || $next_href) { ?>
<ul id="bo_v_nb">
<? if ($prev_href) { ?><li><a href="<?=$prev_href?>" class="btn02">이전</a></li><? } ?>

Binary file not shown.

After

Width:  |  Height:  |  Size: 210 B

View File

@ -1,9 +1,11 @@
<?
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
if ($lt_margin == 0) $lt_style = "style=\margin-left:20px\"";
?>
<div class="latest">
<strong class="latest_title"><a href="<?=$g4['bbs_path']?>/board.php?bo_table=<?=$bo_table?>"><?=$board['bo_subject']?></a></strong>
<div class="lt" <?=$lt_style?>>
<?=$lt_margin?>
<strong class="lt_title"><a href="<?=$g4['bbs_path']?>/board.php?bo_table=<?=$bo_table?>"><?=$board['bo_subject']?></a></strong>
<ul>
<? for ($i=0; $i<count($list); $i++) { ?>
<li>
@ -14,10 +16,11 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
echo "<strong>".$list[$i]['subject']."</strong>";
else
echo $list[$i]['subject'];
echo "</a>";
if ($list[$i]['comment_cnt'])
echo " <a href=\"{$list[$i]['comment_href']}\">".$list[$i]['comment_cnt']."</a>";
echo " <span class=\"cnt_cmt\">".$list[$i]['comment_cnt']."</span>";
echo "</a>";
// if ($list[$i]['link']['count']) { echo "[{$list[$i]['link']['count']}]"; }
// if ($list[$i]['file']['count']) { echo "<{$list[$i]['file']['count']}>"; }
@ -34,5 +37,5 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<? if (count($list) == 0) { //게시물이 없을 때 ?>
<p>게시물이 없습니다.</p>
<? } ?>
<div class="latest_more"><a href="<?=$g4['bbs_path']?>/board.php?bo_table=<?=$bo_table?>">더보기</a></div>
<div class="lt_more"><a href="<?=$g4['bbs_path']?>/board.php?bo_table=<?=$bo_table?>"><img src="<?=$latest_skin_path?>/img/icon_more.gif" alt=""></a></div>
</div>

View File

@ -1,7 +1,7 @@
<?
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
</div>
</div>
<hr>