From 2a7833bb0a2568c1f2cbd911c213f9379833aaf7 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Fri, 21 Dec 2012 16:52:41 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EB=AC=B8?=
 =?UTF-8?q?=EC=84=9C=20outline=20=EC=9E=AC=EA=B5=AC=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/board.php                         |   2 +-
 head.php                              |  17 +-
 skin/board/neo/list.skin.php          |   2 +
 skin/board/neo/view.skin.php          | 289 +++++++++++++-------------
 skin/board/neo/view_comment.skin.php  |   2 +-
 skin/board/neo/write.skin.php         |   2 +-
 skin/outlogin/neo/outlogin.skin.2.php |   2 +-
 skin/poll/neo/poll.skin.php           |   2 +-
 skin/poll/neo/poll_result.skin.php    |   4 +-
 skin/popular/neo/popular.skin.php     |   2 +-
 tail.php                              |   8 +-
 11 files changed, 168 insertions(+), 164 deletions(-)

diff --git a/bbs/board.php b/bbs/board.php
index da2d10137..015852b0c 100644
--- a/bbs/board.php
+++ b/bbs/board.php
@@ -148,7 +148,7 @@ if ($wr_id)
         set_session($ss_name, TRUE);
     }
 
-    $g4['title'] = strip_tags(conv_subject($write[wr_subject], 255).' &gt; '.$board[bo_subject].' &gt; '.$group[gr_subject]);
+    $g4['title'] = strip_tags(conv_subject($write[wr_subject], 255));
 }
 else
 {
diff --git a/head.php b/head.php
index c6d95bb2d..82b12274b 100644
--- a/head.php
+++ b/head.php
@@ -9,13 +9,11 @@ include_once($g4['path'].'/lib/connect.lib.php');
 include_once($g4['path'].'/lib/popular.lib.php');
 
 //print_r2(get_defined_constants());
-
-if ($config['cf_title'] == $g4['title']) $g4['title'] = '';
 ?>
 
-<p style="text-align:center">작업 중입니다. 일부 기능은 정상적으로 동작하지 않을 수 있습니다.</p>
+<p style="text-align:center">테스트 사이트입니다. 일부 기능은 정상적으로 동작하지 않을 수 있습니다.</p>
 
-<header>
+<div>
     <div id="to_content"><a href="#wrapper">본문 바로가기</a></div>
     <div id="logo"><a href="<?=$g4['path']?>/">초기화면</a></div>
 
@@ -41,13 +39,10 @@ if ($config['cf_title'] == $g4['title']) $g4['title'] = '';
         <input type="submit" value="검색">
     </fieldset>
     </form>
-        <h1><?=$g4['title']?> <?=$config['cf_title']?></h1>
-</header>
+    <?=outlogin('neo'); // 외부 로그인 ?>
 
-<?=outlogin('neo'); // 외부 로그인 ?>
-<?=poll('neo'); // 설문조사 ?>
-<?=visit('neo'); // 방문자수 ?>
-<?=popular('neo'); // 방문자수 ?>
-<?=connect(); // 현재 접속자수 ?>
+    <? if (!$bo_table) {?><h1><?=$g4['title']?></h1><? } ?>
+
+</div>
 
 <div id="wrapper">
diff --git a/skin/board/neo/list.skin.php b/skin/board/neo/list.skin.php
index fc8b29772..cedc76ec3 100644
--- a/skin/board/neo/list.skin.php
+++ b/skin/board/neo/list.skin.php
@@ -9,6 +9,8 @@ if ($is_good) $colspan++;
 if ($is_nogood) $colspan++;
 ?>
 
+<h1><?=$g4['title']?></h1>
+
 <? if ($admin_href) { ?><div id="bo_admin_btn"><a href="<?=$admin_href?>">관리자 바로가기</a></div><?}?>
 
 <div>
diff --git a/skin/board/neo/view.skin.php b/skin/board/neo/view.skin.php
index 04962799e..7e3628803 100644
--- a/skin/board/neo/view.skin.php
+++ b/skin/board/neo/view.skin.php
@@ -2,161 +2,164 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 ?>
 
-<!-- 링크 버튼 -->
-<? if ($update_href || $deleter_href) {?>
-<ul>
-<? if ($update_href) { ?>
-    <li><a href="<?=$update_href?>">수정</a></li>
-<? } ?>
-<? if ($delete_href) { ?>
-    <li><a href="<?=$delete_href?>">삭제</a></li>
-<? } ?>
-</ul>
-<? } ?>
+<h1><? if ($is_category) { echo ($category_name ? "[{$view['ca_name']}] " : ""); } ?><?=cut_hangul_last(get_text($view['wr_subject']))?></h1>
 
-<ul>
-<?
-ob_start();
-?>
-<? if ($copy_href) { ?>
-    <li><a href="<?=$copy_href?>">복사</a></li>
-<? } ?>
-<? if ($move_href) { ?>
-    <li><a href="<?=$move_href?>">이동</a></li>
-<? } ?>
-<? if ($search_href) { ?>
-    <li><a href="<?=$search_href?>">검색</a></li>
-<? } ?>
-    <li><a href="<?=$list_href?>">목록</a></li>
-<? if ($reply_href) { ?>
-    <li><a href="<?=$reply_href?>">답변</a></li>
-<? } ?>
-<? if ($write_href) { ?>
-    <li><a href="<?=$write_href?>">글쓰기</a></li>
-<? } ?>
-<?
-$link_buttons = ob_get_contents();
-ob_end_flush();
-?>
-</ul>
+<aside>
+    <h2>상단 링크</h2>
+    <!-- 링크 버튼 -->
+    <? if ($update_href || $deleter_href) {?>
+    <ul>
+    <? if ($update_href) { ?>
+        <li><a href="<?=$update_href?>">수정</a></li>
+    <? } ?>
+    <? if ($delete_href) { ?>
+        <li><a href="<?=$delete_href?>">삭제</a></li>
+    <? } ?>
+    </ul>
+    <? } ?>
+
+    <ul>
+    <?
+    ob_start();
+    ?>
+    <? if ($copy_href) { ?>
+        <li><a href="<?=$copy_href?>">복사</a></li>
+    <? } ?>
+    <? if ($move_href) { ?>
+        <li><a href="<?=$move_href?>">이동</a></li>
+    <? } ?>
+    <? if ($search_href) { ?>
+        <li><a href="<?=$search_href?>">검색</a></li>
+    <? } ?>
+        <li><a href="<?=$list_href?>">목록</a></li>
+    <? if ($reply_href) { ?>
+        <li><a href="<?=$reply_href?>">답변</a></li>
+    <? } ?>
+    <? if ($write_href) { ?>
+        <li><a href="<?=$write_href?>">글쓰기</a></li>
+    <? } ?>
+    <?
+    $link_buttons = ob_get_contents();
+    ob_end_flush();
+    ?>
+    </ul>
+</aside>
+
+<section>
+    <h2>게시물 정보</h2>
+    <dl>
+        <dt>작성자</dt>
+        <dd><?=$view[name]?><? if ($is_ip_view) { echo "&nbsp;($ip)"; } ?></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>
+        <? if ($is_good) { ?>
+        <dt>추천</dt>
+        <dd><?=number_format($view['wr_good'])?>회</dd>
+        <? } ?>
+        <? if ($is_nogood) { ?>
+        <dt>비추천</dt>
+        <dd><?=number_format($view['wr_nogood'])?></dd>
+        <? } ?>
+    </dl>
+</section>
+
+<section>
+    <h2>첨부파일</h2>
+    <ul>
+    <?
+    // 가변 파일
+    $cnt = 0;
+    for ($i=0; $i<count($view['file']); $i++) {
+        if ($view['file'][$i]['source'] && !$view['file'][$i]['view']) {
+            $cnt++;
+    ?>
+        <li>
+            <a href="javascript:file_download('<?=$view['file'][$i]['href']?>', '<?=urlencode($view['file'][$i]['source'])?>');">
+                <span><?=$view['file'][$i]['source']?> (<?=$view['file'][$i]['size']?>)</span>
+                <span><?=$view['file'][$i]['download']?></span>
+                <span>DATE : <?=$view['file'][$i]['datetime']?></span>
+            </a>
+        </li>
+    <?
+        }
+    }
+    ?>
+    </ul>
+</section>
+
+<section>
+    <h2>관련링크</h2>
+    <ul>
+    <?
+    // 링크
+    $cnt = 0;
+    for ($i=1; $i<=$g4['link_count']; $i++) {
+        if ($view['link'][$i]) {
+            $cnt++;
+            $link = cut_str($view['link'][$i], 70);
+    ?>
+        <li>
+            <a href="<?=$view['link_href'][$i]?>" target="_blank">
+                <span><?=$link?></span>
+                <span><?=$view['link_hit'][$i]?></span>
+            </a>
+        </li>
+    <?
+        }
+    }
+    ?>
+    </ul>
+</section>
 
 <article>
-
-    <header>
-        <h1><? if ($is_category) { echo ($category_name ? "[{$view['ca_name']}] " : ""); } ?><?=cut_hangul_last(get_text($view['wr_subject']))?></h1>
-        <dl>
-            <dt>작성자</dt>
-            <dd><?=$view[name]?><? if ($is_ip_view) { echo "&nbsp;($ip)"; } ?></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>
-            <? if ($is_good) { ?>
-            <dt>추천</dt>
-            <dd><?=number_format($view['wr_good'])?>회</dd>
-            <? } ?>
-            <? if ($is_nogood) { ?>
-            <dt>비추천</dt>
-            <dd><?=number_format($view['wr_nogood'])?></dd>
-            <? } ?>
-        </dl>
-    </header>
-
-    <section>
-        <h2>첨부파일</h2>
-        <ul>
+    <h1>본문</h1>
+    <div>
         <?
-        // 가변 파일
-        $cnt = 0;
-        for ($i=0; $i<count($view['file']); $i++) {
-            if ($view['file'][$i]['source'] && !$view['file'][$i]['view']) {
-                $cnt++;
-        ?>
-            <li>
-                <a href="javascript:file_download('<?=$view['file'][$i]['href']?>', '<?=urlencode($view['file'][$i]['source'])?>');">
-                    <span><?=$view['file'][$i]['source']?> (<?=$view['file'][$i]['size']?>)</span>
-                    <span><?=$view['file'][$i]['download']?></span>
-                    <span>DATE : <?=$view['file'][$i]['datetime']?></span>
-                </a>
-            </li>
-        <?
-            }
+        // 파일 출력
+        for ($i=0; $i<=count($view['file']); $i++) {
+            if ($view['file'][$i]['view'])
+                echo $view['file'][$i]['view'];
         }
         ?>
-        </ul>
-    </section>
+    </div>
 
-    <section>
-        <h2>관련링크</h2>
-        <ul>
-        <?
-        // 링크
-        $cnt = 0;
-        for ($i=1; $i<=$g4['link_count']; $i++) {
-            if ($view['link'][$i]) {
-                $cnt++;
-                $link = cut_str($view['link'][$i], 70);
-        ?>
-            <li>
-                <a href="<?=$view['link_href'][$i]?>" target="_blank">
-                    <span><?=$link?></span>
-                    <span><?=$view['link_hit'][$i]?></span>
-                </a>
-            </li>
-        <?
-            }
-        }
-        ?>
-        </ul>
-    </section>
+    <p><?=$view['content'];?></p>
+    <?//echo $view[rich_content]; // {이미지:0} 과 같은 코드를 사용할 경우?>
+    <!-- 테러 태그 방지용 --></xml></xmp><a href=""></a><a href=''></a>
 
-    <section>
-        <h2>본문</h2>
-        <div>
-            <?
-            // 파일 출력
-            for ($i=0; $i<=count($view['file']); $i++) {
-                if ($view['file'][$i]['view'])
-                    echo $view['file'][$i]['view'];
-            }
-            ?>
-        </div>
-
-        <p><?=$view['content'];?></p>
-        <?//echo $view[rich_content]; // {이미지:0} 과 같은 코드를 사용할 경우?>
-        <!-- 테러 태그 방지용 --></xml></xmp><a href=""></a><a href=''></a>
-
-        <? if ($is_signature) { ?><p><?=$signature?></p><? } ?>
-
-        <? if ($scrap_href || $trackback_url || $good_href || $nogood_href) { ?>
-        <ul>
-            <? if ($scrap_href) { ?><li><a href="javascript:;" onclick="win_scrap('<?=$scrap_href?>');">스크랩</a></li><? } ?>
-            <? if ($trackback_url) { ?><li><a href="javascript:trackback_send_server('<?=$trackback_url?>');">트랙백주소</a></li><?}?>
-            <? if ($good_href) {?><li>추천 <?=number_format($view['wr_good'])?> <a href="<?=$good_href?>" target="hiddenframe">추천</a></li><? } ?>
-            <? if ($nogood_href) {?><li>비추천 <?=number_format($view['wr_nogood'])?> <a href="<?=$nogood_href?>" target="hiddenframe">비추천</a></li><? } ?>
-        </ul>
-        <? } ?>
-
-    </section>
-
-    <?
-    // 코멘트 입출력
-    include_once('./view_comment.php');
-    ?>
+    <? if ($is_signature) { ?><p><?=$signature?></p><? } ?>
 
+    <? if ($scrap_href || $trackback_url || $good_href || $nogood_href) { ?>
+    <ul>
+        <? if ($scrap_href) { ?><li><a href="javascript:;" onclick="win_scrap('<?=$scrap_href?>');">스크랩</a></li><? } ?>
+        <? if ($trackback_url) { ?><li><a href="javascript:trackback_send_server('<?=$trackback_url?>');">트랙백주소</a></li><?}?>
+        <? if ($good_href) {?><li>추천 <?=number_format($view['wr_good'])?> <a href="<?=$good_href?>" target="hiddenframe">추천</a></li><? } ?>
+        <? if ($nogood_href) {?><li>비추천 <?=number_format($view['wr_nogood'])?> <a href="<?=$nogood_href?>" target="hiddenframe">비추천</a></li><? } ?>
+    </ul>
+    <? } ?>
 </article>
 
-<ul>
-    <? if ($prev_href) { ?><li><a href="<?=$prev_href?>">이전</a></li><? } ?>
-    <? if ($next_href) { ?><li><a href="<?=$next_href?>">다음</a></li><? } ?>
-</ul>
+<?
+// 코멘트 입출력
+include_once('./view_comment.php');
+?>
 
-<!-- 링크 버튼 -->
-<ul>
-    <?=$link_buttons?>
-</ul>
+<aside>
+    <h2>하단 링크</h2>
+    <ul>
+        <? if ($prev_href) { ?><li><a href="<?=$prev_href?>">이전</a></li><? } ?>
+        <? if ($next_href) { ?><li><a href="<?=$next_href?>">다음</a></li><? } ?>
+    </ul>
+
+    <!-- 링크 버튼 -->
+    <ul>
+        <?=$link_buttons?>
+    </ul>
+</aside>
 
 <script>
 function file_download(link, file) {
diff --git a/skin/board/neo/view_comment.skin.php b/skin/board/neo/view_comment.skin.php
index f4e784f64..9a2c55fcc 100644
--- a/skin/board/neo/view_comment.skin.php
+++ b/skin/board/neo/view_comment.skin.php
@@ -14,7 +14,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
 
 <!-- 댓글 리스트 -->
 <section id="commentContents">
-    <h2>이 글에 대한 댓글</h2>
+    <h2>댓글</h2>
     <?
     for ($i=0; $i<count($list); $i++) {
         $comment_id = $list[$i]['wr_id'];
diff --git a/skin/board/neo/write.skin.php b/skin/board/neo/write.skin.php
index ea4e62fd9..63e9fcf87 100644
--- a/skin/board/neo/write.skin.php
+++ b/skin/board/neo/write.skin.php
@@ -22,7 +22,7 @@ var char_max = parseInt(<?=$write_max?>); // 최대
 <input type="hidden" name="page" value="<?=$page?>">
 
 <table>
-<caption><?=$board['bo_subject']?> 글쓰기</caption>
+<caption><?=$board['bo_subject']?> <?=$title_msg?></caption>
 <tbody>
 <? if ($is_name) { ?>
 <tr>
diff --git a/skin/outlogin/neo/outlogin.skin.2.php b/skin/outlogin/neo/outlogin.skin.2.php
index 1e8b41b23..43d6cce4d 100644
--- a/skin/outlogin/neo/outlogin.skin.2.php
+++ b/skin/outlogin/neo/outlogin.skin.2.php
@@ -4,7 +4,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
 <!-- 로그인 후 외부로그인 시작 -->
 <section>
-    <h2>회원정보</h2>
+    <h2>내 정보</h2>
     <?=$nick?>님
     <? if ($is_admin == 'super' || $is_auth) { ?><a href="<?=$g4['admin_path']?>/">관리자</a><? } ?>
     <a href="javascript:win_point();">포인트 : <?=$point?>점</a>
diff --git a/skin/poll/neo/poll.skin.php b/skin/poll/neo/poll.skin.php
index d06f925a3..a53cc16d0 100644
--- a/skin/poll/neo/poll.skin.php
+++ b/skin/poll/neo/poll.skin.php
@@ -15,7 +15,7 @@ $po = sql_fetch(" select * from $g4[poll_table] where po_id = '$po_id' ");
 ?>
 
 <section>
-<h2>설문조사</h2>
+<h2>사이트 설문조사</h2>
 <form name="fpoll" method="post" action="<?=$g4[bbs_path]?>/poll_update.php" onsubmit="return fpoll_submit(this);" target="winPoll">
 <input type="hidden" name="po_id" value="<?=$po_id?>">
 <input type="hidden" name="skin_dir" value="<?=$skin_dir?>">
diff --git a/skin/poll/neo/poll_result.skin.php b/skin/poll/neo/poll_result.skin.php
index 4d299e2d0..588f51908 100644
--- a/skin/poll/neo/poll_result.skin.php
+++ b/skin/poll/neo/poll_result.skin.php
@@ -2,10 +2,10 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 
 ?>
 
-<h1>설문조사 결과 보기</h1>
+<h1>설문조사 결과</h1>
 
 <section>
-<h2><?=$po_subject?></h2>
+<h2><?=$po_subject?> 결과</h2>
 <span>전체 <?=$nf_total_po_cnt?>표</span>
 
 <ol>
diff --git a/skin/popular/neo/popular.skin.php b/skin/popular/neo/popular.skin.php
index 19f0b9cc8..9dbce75f5 100644
--- a/skin/popular/neo/popular.skin.php
+++ b/skin/popular/neo/popular.skin.php
@@ -3,7 +3,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 ?>
 
 <section>
-    <h2>인기검색어</h2>
+    <h2>사이트 인기검색어</h2>
     <ul>
     <? for ($i=0; $i<count($list); $i++) { ?>
         <li><a href="<?=$g4[bbs_path]?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?=urlencode($list[$i][pp_word])?>"><?=$list[$i][pp_word]?></a></li>
diff --git a/tail.php b/tail.php
index 493d6f788..1315d5cc6 100644
--- a/tail.php
+++ b/tail.php
@@ -4,9 +4,13 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
 </div>
 
-<footer>
+<div>
+    <?=visit('neo'); // 방문자수 ?>
+    <?=connect(); // 현재 접속자수 ?>
+    <?=poll('neo'); // 설문조사 ?>
+    <?=popular('neo'); // 인기검색어 ?>
     <p>Copyright &copy; 소유하신 도메인. All rights reserved.</p>
-</footer>
+</div>
 
 <script>
 function fsearchbox_submit(f)