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

This commit is contained in:
chicpro
2013-02-04 14:01:16 +09:00
3 changed files with 43 additions and 43 deletions

View File

@ -28,7 +28,7 @@ pre {overflow-x:scroll;font-size:1.1em}
#captcha_wav img {border:1px solid #ddd;border-left:0;background:#494949}
/* 상단 레이아웃 */
#hd {margin-bottom:30px;height:100px;border-bottom:1px solid #eee;background:#fff}
#hd {margin-bottom:30px;height:100px}
#hd h1 {width:0;height:0;overflow:hidden}
#hd_wrapper {position:relative;margin:0 auto;width:980px}
@ -101,11 +101,11 @@ pre {overflow-x:scroll;font-size:1.1em}
/* 기본테이블 */
table {margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0}
caption {padding:0 0 10px;text-align:left}
th {padding:12px 0 8px;border-top:5px solid #ddd;background:#fff}
th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
thead th {padding:12px 0 8px;border-top:1px solid #e9e9e9}
thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff}
tfoot td {border-color:#666;background:#484848;color:#fff;font-weight:bold;text-align:center}
td {padding:10px 5px 7px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:#fff;line-height:1.5em;word-break:break-all}
td {padding:10px 5px 7px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;line-height:1.5em;word-break:break-all}
table a {color:#000;text-decoration:none}
.bo_sideview td {padding:7px 5px} /* 사이드뷰 사용하는 테이블 셀 패딩값 */
.empty_table {padding:85px 0;text-align:center}
@ -113,7 +113,7 @@ table a {color:#000;text-decoration:none}
/* 폼 테이블 */
.frm_tbl {}
.frm_tbl caption {padding-top:10px;font-size:1.2em;font-weight:bold}
.frm_tbl th {padding-left:10px;width:100px;border-top:1px solid #eee;border-bottom:1px solid #eee;background:transparent;text-align:left}
.frm_tbl th {padding-left:10px;width:100px;border-top:1px solid #eee;border-bottom:1px solid #eee;text-align:left}
.frm_tbl td {padding:7px 10px;border-color:#eee;background:transparent}
.frm_tbl textarea,
.frm_input {padding:2px 2px 3px;border:1px solid #d7d7d7;background:#fff;vertical-align:middle}
@ -386,10 +386,10 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
.btn_bo_adm input {padding:0 10px;height:26px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none}
#bo_cate {margin-bottom:15px}
#bo_cate h2 {width:0;height:0;overflow:hidden}
#bo_cate_ul {margin:0;padding:0 0 0 1px;zoom:1}
#bo_cate_ul {margin:0;padding:1px 0 0 1px;zoom:1}
#bo_cate_ul:after {display:block;visibility:hidden;clear:both;content:""}
#bo_cate_ul li {position:relative;float:left;margin-left:-1px}
#bo_cate_ul a {display:block;padding:8px 15px 6px;border:1px solid #333;background:#484848;color:#fff;text-decoration:none}
#bo_cate_ul li {position:relative;float:left;margin:-1px 0 0 -1px}
#bo_cate_ul a {display:block;padding:8px 15px 6px;border:1px solid #456380;background:#4c6e8d;color:#fff;text-decoration:none}
.bo_fx {margin-bottom:5px;zoom:1}
.bo_fx:after {display:block;visibility:hidden;clear:both;content:""}
.bo_fx ul {margin:0;padding:0;list-style:none}
@ -409,25 +409,25 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
.cnt_cmt {display:inline-block;margin:0 4px;color:#109ff1}
/* 게시판 읽기 */
#bo_v_title {}
#bo_v_title {padding:20px 20px 10px}
#bo_v {position:relative;margin-bottom:30px}
#bo_v a {color:#000;text-decoration:none}
#bo_v_h1 {padding:30px 20px 10px;font-size:1.2em;line-height:1.4em}
#bo_v_h1 {padding:0 20px 5px;font-size:1.2em;line-height:1.4em}
#bo_v_h1 span {display:inline-block;margin-right:5px;color:#109ff1}
#bo_v_info {padding:0 20px}
#bo_v_info {padding:0 20px 15px;border-bottom:1px solid #f0f0f0}
#bo_v_info h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_info strong {display:inline-block;margin:0 15px 0 5px;font-weight:normal}
#bo_v_top {padding:10px 20px 10px;border-bottom:10px solid #f0f0f0;zoom:1}
#bo_v_top {padding:10px 20px;zoom:1}
#bo_v_top:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_top h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_top ul {list-style:none}
#bo_v_file {background:#fff}
#bo_v_file {background:#f9f9f9}
#bo_v_file h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_file ul {margin:0;padding:0;list-style:none}
#bo_v_file li {padding:0 20px;border-bottom:1px solid #eee}
#bo_v_file a {display:inline-block;padding:8px 0 7px}
.bo_v_file_cnt {display:inline-block;margin:0 10px}
#bo_v_link {background:#fff}
#bo_v_link {background:#f9f9f9}
#bo_v_link h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_link ul {margin:0;padding:0;list-style:none}
#bo_v_link li {padding:0 20px;border-bottom:1px solid #eee}
@ -439,13 +439,13 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
#bo_v_img {margin:0 20px;width:688px;overflow:hidden}
#bo_v_img img {max-width:100%;height:auto}
#bo_v_con {padding:20px;width:688px;line-height:1.8em;word-break:break-all;overflow:hidden}
#bo_v_con {padding:20px 20px 10px;width:688px;line-height:1.8em;word-break:break-all;overflow:hidden}
#bo_v_con a {color:#109ff1;text-decoration:underline}
#bo_v_act {padding:20px 0;text-align:center}
#bo_v_act a {margin-right:5px;vertical-align:top}
#bo_v_act strong {color:#109ff1}
#bo_v form {padding-top:20px}
#bo_v_bot {border-top:1px solid #f7f7f2;padding:20px 20px;zoom:1}
#bo_v_bot {border-top:1px solid #eee;padding:10px 20px;zoom:1}
#bo_v_bot:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_bot h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_bot ul {margin:0;padding:0;list-style:none}
@ -455,10 +455,11 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
.bo_v_com li {float:left;margin-left:5px}
/* 게시판 댓글 */
#bo_vc {margin:0 0 10px;padding:10px 20px 0;border-top:10px solid #eee}
#bo_vc {margin:0 20px 10px;padding:10px 20px 20px 20px;border:1px solid #ddd;background:#fcfcfc}
#bo_vc h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_vc article {margin-bottom:5px;padding:0 0 10px;border-bottom:1px solid #ddd}
#bo_vc article {margin-bottom:5px;padding:0 0 10px;border-bottom:1px dotted #ccc}
#bo_vc header {position:relative;padding:8px 0}
#bo_vc .sv_wrap {margin-right:15px}
#bo_vc header .icon_reply {position:absolute;top:8px;left:-20px}
#bo_vc h1 {width:0;height:0;overflow:hidden}
#bo_vc a {color:#000;text-decoration:none}

View File

@ -2,9 +2,8 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<p id="bo_v_title"><strong><?=$board['bo_subject']?></strong></p>
<div id="bo_v" class="cbg">
<p id="bo_v_title"><strong><?=$board['bo_subject']?></strong></p>
<h1 id="bo_v_h1">
<? if ($category_name) { // 분류가 지정되었다면 ?><span><?=($category_name ? "{$view['ca_name']} " : "");?></span><? } // 분류 출력 끝 ?>
<?=cut_str(get_text($view['wr_subject']), 70) // 글제목 출력?>
@ -15,27 +14,6 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
작성자 <strong><?=$view['name']?><? if ($is_ip_view) { echo "&nbsp;($ip)"; } ?></strong><span class="sound_only">작성일</span><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>
</section>
<nav id="bo_v_top">
<h2>게시물 상단 버튼</h2>
<?
ob_start();
?>
<ul class="bo_v_com">
<? if ($update_href) { ?><li><a href="<?=$update_href?>" class="btn02">수정</a></li><? } ?>
<? if ($delete_href) { ?><li><a href="<?=$delete_href?>" onclick="del(this.href); return false;" class="btn02">삭제</a></li><? } ?>
<? if ($copy_href) { ?><li><a href="<?=$copy_href?>" onclick="board_move(this.href); return false;" class="btn03">복사</a></li><? } ?>
<? if ($move_href) { ?><li><a href="<?=$move_href?>" onclick="board_move(this.href); return false;" class="btn03">이동</a></li><? } ?>
<? if ($search_href) { ?><li><a href="<?=$search_href?>" class="btn02">검색</a></li><? } ?>
<li><a href="<?=$list_href?>" class="btn02">목록</a></li>
<? if ($reply_href) { ?><li><a href="<?=$reply_href?>" class="btn02">답변</a></li><? } ?>
<? if ($write_href) { ?><li><a href="<?=$write_href?>" class="btn01">글쓰기</a></li><? } ?>
</ul>
<?
$link_buttons = ob_get_contents();
ob_end_flush();
?>
</nav>
<?
if ($view['file']['count']) {
$cnt = 0;
@ -99,6 +77,27 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</section>
<? } ?>
<nav id="bo_v_top">
<h2>게시물 상단 버튼</h2>
<?
ob_start();
?>
<ul class="bo_v_com">
<? if ($update_href) { ?><li><a href="<?=$update_href?>" class="btn02">수정</a></li><? } ?>
<? if ($delete_href) { ?><li><a href="<?=$delete_href?>" onclick="del(this.href); return false;" class="btn02">삭제</a></li><? } ?>
<? if ($copy_href) { ?><li><a href="<?=$copy_href?>" onclick="board_move(this.href); return false;" class="btn03">복사</a></li><? } ?>
<? if ($move_href) { ?><li><a href="<?=$move_href?>" onclick="board_move(this.href); return false;" class="btn03">이동</a></li><? } ?>
<? if ($search_href) { ?><li><a href="<?=$search_href?>" class="btn02">검색</a></li><? } ?>
<li><a href="<?=$list_href?>" class="btn02">목록</a></li>
<? if ($reply_href) { ?><li><a href="<?=$reply_href?>" class="btn02">답변</a></li><? } ?>
<? if ($write_href) { ?><li><a href="<?=$write_href?>" class="btn01">글쓰기</a></li><? } ?>
</ul>
<?
$link_buttons = ob_get_contents();
ob_end_flush();
?>
</nav>
<article id="bo_v_atc">
<header>
<h1>본문</h1>

View File

@ -31,10 +31,10 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
<? if ($cmt_depth) {?><img src="<?=$board_skin_url?>/img/icon_reply.gif" class="icon_reply" alt="댓글의 댓글"><? } ?>
<? if ($is_ip_view) { ?>
아이피
<span><?=$list[$i]['ip'];?></span>
<span class="bo_vc_hdinfo"><?=$list[$i]['ip'];?></span>
<? } ?>
작성일
<span><time datetime="<?=date('Y-m-d\TH:i:s+09:00', strtotime($list[$i]['datetime']))?>"><?=$list[$i]['datetime']?></time></span>
<span class="bo_vc_hdinfo"><time datetime="<?=date('Y-m-d\TH:i:s+09:00', strtotime($list[$i]['datetime']))?>"><?=$list[$i]['datetime']?></time></span>
</header>
<!-- 댓글 출력 -->