From f08e9f2c5716b2a3d5b4979a2532c82089dbd783 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Mon, 7 Jan 2013 13:15:22 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=A0=84?=
 =?UTF-8?q?=EC=B2=B4=EA=B2=80=EC=83=89=20=EB=B3=B4=EA=B0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/search.php                  |   2 +-
 css/def.css                     |   3 +
 skin/search/neo/search.skin.php | 137 +++++++++++++++++---------------
 3 files changed, 76 insertions(+), 66 deletions(-)

diff --git a/bbs/search.php b/bbs/search.php
index 3592d7def..a8b9623cf 100644
--- a/bbs/search.php
+++ b/bbs/search.php
@@ -3,7 +3,7 @@ include_once('./_common.php');
 
 //if (!$stx) alert("검색어가 없습니다."); 
 
-$g4['title'] = "검색어 &quot;".$stx."&quot; 검색결과";
+$g4['title'] = "전체검색 결과";
 include_once('./_head.php');
 
 if ($stx)
diff --git a/css/def.css b/css/def.css
index d80fe7103..f2744cc02 100644
--- a/css/def.css
+++ b/css/def.css
@@ -192,6 +192,9 @@ h6 {margin:0 0 20px}
 #current_connect_tbl .td_name {text-align:center}
 
 /* 전체검색 */
+#sch_result_hd {margin:0;border:1px solid #ddd;background:#fff}
+#sch_result_hd dt {padding:10px;background:#f5f5f2}
+#sch_result_hd dd {margin:0;padding:0}
 .sch_result {}
 .sch_result dt {font-weight:bold}
 .sch_result dd {margin-bottom:30px}
diff --git a/skin/search/neo/search.skin.php b/skin/search/neo/search.skin.php
index 47d176fb9..733726825 100644
--- a/skin/search/neo/search.skin.php
+++ b/skin/search/neo/search.skin.php
@@ -2,6 +2,78 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 
 ?>
 
+<? if ($stx) { ?>
+<? if ($board_count) { ?>
+<dl id="sch_result_hd">
+    <dt>검색어 <strong><?=$stx?></strong>에 대한 결과입니다.</dt>
+    <dd>
+        <ul>
+            <li><span class="span_highlight"><?=$board_count?></span>개의 게시판</li>
+            <li><span class="span_highlight"><?=number_format($total_count)?></span>개의 게시글</li>
+            <li>현재 <?=number_format($page)?>/<?=number_format($total_page)?> 페이지 열람 중</li>
+        </ul>
+    </dd>
+</dl>
+<? } ?>
+<? } ?>
+
+<? 
+if ($stx) {
+    if ($board_count) {
+?>
+<dl class="sch_result">
+    <dt>검색결과가 있는 게시판 목록</dt>
+    <dd>
+        <ul>
+            <? if ($onetable) { ?>
+            <li><a href="?<?=$search_query?>&amp;gr_id=<?=$gr_id?>">전체게시판 검색</a>
+            <? } ?>
+            <?=$str_board_list;?>
+        </ul>
+    </dd>
+</dl>
+<?
+    } else {
+?>
+<p>검색된 자료가 하나도 없습니다.</p>
+<? } } ?>
+
+<hr>
+
+<? if ($stx && $board_count) { ?><dl class="sch_result"><? } ?>
+<?
+$k=0;
+for ($idx=$table_index, $k=0; $idx<count($search_table) && $k<$rows; $idx++) {
+    $comment_href = "";
+?>
+    <dt><a href="./board.php?bo_table=<?=$search_table[$idx]?>&amp;<?=$search_query?>"><?=$bo_subject[$idx]?></a>에서의 검색결과</dt>
+    <dd>
+        <ul>
+        <?
+        for ($i=0; $i<count($list[$idx]) && $k<$rows; $i++, $k++) {
+            if ($list[$idx][$i][wr_is_comment]) 
+            {
+                echo "댓글 ";
+                $comment_href = "#c_".$list[$idx][$i][wr_id];
+            }
+        ?>
+            <li>
+                <a href="<?=$list[$idx][$i][href]?><?=$comment_href?>"><?=$list[$idx][$i][subject]?></a>
+                <a href="<?=$list[$idx][$i][href]?><?=$comment_href?>" target="_blank">새창</a>
+                <p><?=$list[$idx][$i][content]?></p>
+                <div class="sch_sideview"><?=$list[$idx][$i][name]?></div>
+                <span class="sch_datetime"><?=$list[$idx][$i][wr_datetime]?></span>
+            </li>
+        <? } ?>
+        </ul>
+    </dd>
+<? } ?>
+<? if ($stx && $board_count) { ?></dl><? } ?>
+
+<div class="pg">
+    <?=$write_pages?>
+</div>
+
 <form name="fsearch" method="get" onsubmit="return fsearch_submit(this);">
 <input type="hidden" name="srows" value="<?=$srows?>">
     <fieldset>
@@ -52,70 +124,5 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
         </script>
         <input type="radio" id="sop_or" name="sop" value="or" <?=($sop == "or") ? "checked" : "";?>> <label for="sop_or">OR</label>
         <input type="radio" id="sop_and" name="sop" value="and" <?=($sop == "and") ? "checked" : "";?>> <label for="sop_and">AND</label>
-        <? if ($stx) { ?>
-        <p>
-            <? if ($board_count) { ?>
-            검색결과 <span class="span_highlight"><?=$board_count?></span>개의 게시판, <span class="span_highlight"><?=number_format($total_count)?></span>개의 게시글, <?=number_format($page)?>/<?=number_format($total_page)?> 페이지
-            <? } else { ?>
-            <? } ?>
-        </p>
-        <? } ?>
     </fieldset>
 </form>
-
-<? 
-if ($stx) {
-    if ($board_count) {
-?>
-<dl class="sch_result">
-    <dt>검색어를 포함하고 있는 게시판 목록</dt>
-    <dd>
-        <ul>
-            <? if ($onetable) { ?>
-            <li><a href="?<?=$search_query?>&amp;gr_id=<?=$gr_id?>">전체게시판 검색</a>
-            <? } ?>
-            <?=$str_board_list;?>
-        </ul>
-    </dd>
-</dl>
-<?
-    } else {
-?>
-<p>검색된 자료가 하나도 없습니다.</p>
-<? } } ?>
-
-<hr>
-
-<? if ($stx && $board_count) { ?><dl class="sch_result"><? } ?>
-<?
-$k=0;
-for ($idx=$table_index, $k=0; $idx<count($search_table) && $k<$rows; $idx++) {
-    $comment_href = "";
-?>
-    <dt><a href="./board.php?bo_table=<?=$search_table[$idx]?>&amp;<?=$search_query?>"><?=$bo_subject[$idx]?></a>에서의 검색결과</dt>
-    <dd>
-        <ul>
-        <?
-        for ($i=0; $i<count($list[$idx]) && $k<$rows; $i++, $k++) {
-            if ($list[$idx][$i][wr_is_comment]) 
-            {
-                echo "댓글 ";
-                $comment_href = "#c_".$list[$idx][$i][wr_id];
-            }
-        ?>
-            <li>
-                <a href="<?=$list[$idx][$i][href]?><?=$comment_href?>"><?=$list[$idx][$i][subject]?></a>
-                <a href="<?=$list[$idx][$i][href]?><?=$comment_href?>" target="_blank">새창</a>
-                <p><?=$list[$idx][$i][content]?></p>
-                <div class="sch_sideview"><?=$list[$idx][$i][name]?></div>
-                <span class="sch_datetime"><?=$list[$idx][$i][wr_datetime]?></span>
-            </li>
-        <? } ?>
-        </ul>
-    </dd>
-<? } ?>
-<? if ($stx && $board_count) { ?></dl><? } ?>
-
-<div class="pg">
-    <?=$write_pages?>
-</div>