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

This commit is contained in:
chicpro
2013-01-17 14:16:25 +09:00
2 changed files with 9 additions and 6 deletions

View File

@ -142,7 +142,7 @@ a {color:#000;text-decoration:none}
#poll ul {padding:5px 10px;background:#fff}
#poll li {margin:7px 0}
#poll footer {padding:10px 10px 15px;background:#fff;text-align:center}
#poll .btn_submit {height:24px;line-height:1.9em}
#poll .btn_submit {height:24px;background:#494949;line-height:1.9em}
#poll .btn_cancel {height:22px;line-height:1.95em}
/* 설문조사 결과 (새창) */
#poll_result section {margin:0 auto 20px;padding:10px;width:90%}
@ -293,13 +293,15 @@ a {color:#000;text-decoration:none}
#sch_result_bo dt {margin:0;padding:0;height:0;border:0;overflow:hidden}
#sch_result_bo dd {margin:0}
#sch_result_bo li {position:relative;margin-top:-1px}
#sch_result_bo a {display:inline-block;padding:10px 0 10px 10px;width:160px;border:1px solid #ddd;background:#eee}
#sch_result_bo a {display:inline-block;padding:10px 0 10px 10px;width:160px;border:1px solid #ddd;background:#eee;font-size:1.2em}
#sch_result_bo .sch_on {width:161px;border-right:0;background:#fff;font-weight:bold}
#sch_result_bo .cnt_cmt {color:#000}
#sch_result_atc dt a {display:inline-block;margin-bottom:15px}
#sch_result_atc dt a {display:inline-block;margin-bottom:15px;font-size:1.2em;font-weight:bold}
#sch_result_atc dd {margin:0 0 30px;border-bottom:1px solid #ddd}
#sch_result_atc li {padding:10px 0}
#sch_result_atc p {margin-top:15px}
#sch_result_atc p {margin-top:10px}
#sch_result_atc b {display:inline-block;margin:0 10px 0 0}
#sch_result_atc b span {display:inline-block;margin:0 10px 0 0}
.sch_more {padding:10px 0 15px;text-align:right}
.sch_more a {color:#818385}
.sch_sideview {display:inline-block}

View File

@ -99,6 +99,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<?
$k=0;
for ($idx=$table_index, $k=0; $idx<count($search_table) && $k<$rows; $idx++) {
$comment_def = "";
$comment_href = "";
?>
<dt><a href="./board.php?bo_table=<?=$search_table[$idx]?>&amp;<?=$search_query?>"><?=$bo_subject[$idx]?>에서</a></dt>
@ -108,12 +109,12 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
for ($i=0; $i<count($list[$idx]) && $k<$rows; $i++, $k++) {
if ($list[$idx][$i][wr_is_comment])
{
echo "댓글 ";
$comment_def = "<span>댓글</span>";
$comment_href = "#c_".$list[$idx][$i][wr_id];
}
?>
<li>
<a href="<?=$list[$idx][$i][href]?><?=$comment_href?>"><b><?=$list[$idx][$i][subject]?></b></a>
<a href="<?=$list[$idx][$i][href]?><?=$comment_href?>"><b><?=$comment_def?><?=$list[$idx][$i][subject]?></b></a>
<span class="sch_datetime"><?=$list[$idx][$i][wr_datetime]?></span>
<a href="<?=$list[$idx][$i][href]?><?=$comment_href?>" target="_blank">새창</a>
<p><?=$list[$idx][$i][content]?></p>