From f8b3f6a972fca25c6e7fc21527a8eb31fd50dd5a Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Tue, 30 Apr 2013 19:06:18 +0900
Subject: [PATCH] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0:=20#107=20#108=20#1?=
 =?UTF-8?q?09=20=EC=B5=9C=EC=8B=A0=EA=B8=80=20=EC=84=A4=EB=AC=B8=EC=A1=B0?=
 =?UTF-8?q?=EC=82=AC=20=EC=A0=91=EC=86=8D=EC=9E=90=EC=A7=91=EA=B3=84=20?=
 =?UTF-8?q?=ED=91=9C=EC=A4=80=ED=99=94=20=EB=B0=8F=20=EC=8A=A4=ED=83=80?=
 =?UTF-8?q?=EC=9D=BC=20=EC=9E=91=EC=97=85=20=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/default_shop.css                          |  3 +
 shop/index.php                                | 22 +++----
 skin/latest/shop_basic/style.css              |  3 +-
 skin/poll/shop_basic/poll.skin.php            | 64 +++++++++++++++++++
 .../poll_result.skin.php                      |  0
 skin/poll/{shop_poll => shop_basic}/style.css |  0
 skin/poll/shop_poll/poll.skin.php             | 60 -----------------
 skin/visit/shop_basic/style.css               | 10 +++
 skin/visit/shop_basic/visit.skin.php          | 32 ++++++----
 9 files changed, 107 insertions(+), 87 deletions(-)
 create mode 100644 skin/poll/shop_basic/poll.skin.php
 rename skin/poll/{shop_poll => shop_basic}/poll_result.skin.php (100%)
 rename skin/poll/{shop_poll => shop_basic}/style.css (100%)
 delete mode 100644 skin/poll/shop_poll/poll.skin.php
 create mode 100644 skin/visit/shop_basic/style.css

diff --git a/css/default_shop.css b/css/default_shop.css
index 8eaabb89c..3a8ce38d0 100644
--- a/css/default_shop.css
+++ b/css/default_shop.css
@@ -177,6 +177,9 @@ a:active {color:#000;text-decoration:underline}
 .sidx_it_10 b {display:block;margin:0 0 5px;font-weight:normal}
 .sidx_it_10 .sidx_it_sns {position:absolute;top:190px;right:20px}
 
+/* 공지사항 및 커뮤니티 새글 */
+#sidx_lat {}
+
 /* 배너 인덱스 출력 */
 #sbn_idx {}
 #sbn_idx h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
diff --git a/shop/index.php b/shop/index.php
index e60e2f526..533a06766 100644
--- a/shop/index.php
+++ b/shop/index.php
@@ -89,26 +89,26 @@ include_once(G4_SHOP_PATH.'/shop.head.php');
     ?>
 </section>
 
-<section id="sidx_lat_poll">
-    <h2>커뮤니티 및 투표</h2>
-    <?php echo latest('shop_basic', 'qa', 5, 30); ?>
-    <?php echo latest('shop_basic', 'free', 5, 30); ?>
+<section id="sidx_lat">
+    <h2>공지사항 및 커뮤니티 새글</h2>
+    <?php echo latest('shop_basic', '1', 5, 30); ?>
+    <?php echo latest('shop_basic', '1', 5, 30); ?>
     <!-- 공지사항 -->
-    <?php //echo latest('basic', 'notice', 3, 25); ?>
-    <!-- 온라인 투표 -->
-    <?php echo poll('basic'); ?>
+    <?php echo latest('shop_basic', '1', 3, 25); ?>
 </section>
 
+<!-- 온라인 투표 -->
+<?php echo poll('basic'); ?>
+
+<!-- 방문자 수 -->
+<?php echo visit('basic'); ?>
+
 <section id="sbn_idx">
     <h2>쇼핑몰 메인 배너</h2>
     <!-- 메인 배너 -->
     <?php echo display_banner('메인'); ?>
 </section>
 
-<section id="sidx_visit">
-<!-- 방문자 수 -->
-<?php echo visit('basic'); ?>
-</section>
 
 <?php
 include_once(G4_SHOP_PATH.'/shop.tail.php');
diff --git a/skin/latest/shop_basic/style.css b/skin/latest/shop_basic/style.css
index b51b1f1fd..df43b1da1 100644
--- a/skin/latest/shop_basic/style.css
+++ b/skin/latest/shop_basic/style.css
@@ -1,6 +1,5 @@
 /* 새글 스킨 (latest) */
-.lat_pc {float:left;margin-left:20px}
-.lat {position:relative;float:left;margin-bottom:20px;padding-bottom:10px;width:354px;height:150px;border-bottom:1px solid #ddd}
+.lat {position:relative;margin-bottom:20px;padding-bottom:10px;border-bottom:1px solid #ddd}
 .lat ul {margin:0 0 10px;padding:0;list-style:none}
 .lat li {padding:3px 0}
 .lat_title {display:block;padding:10px 0 8px}
diff --git a/skin/poll/shop_basic/poll.skin.php b/skin/poll/shop_basic/poll.skin.php
new file mode 100644
index 000000000..5c7b051a7
--- /dev/null
+++ b/skin/poll/shop_basic/poll.skin.php
@@ -0,0 +1,64 @@
+<?php
+if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
+?>
+
+<link rel="stylesheet" href="<?php echo $poll_skin_url ?>/style.css">
+
+<form name="fpoll" action="<?php echo G4_BBS_URL ?>/poll_update.php" onsubmit="return fpoll_submit(this);" method="post">
+<input type="hidden" name="po_id" value="<?php echo $po_id ?>">
+<input type="hidden" name="skin_dir" value="<?php echo $skin_dir ?>">
+<section id="poll">
+    <header>
+        <h2>설문조사</h2>
+        <?php if ($is_admin == "super") {  ?><a href="<?php echo G4_ADMIN_URL ?>/poll_form.php?w=u&amp;po_id=<?php echo $po_id ?>" class="btn_admin">설문조사 관리</a><?php }  ?>
+        <p><?php echo $po['po_subject'] ?></p>
+    </header>
+    <ul>
+        <?php for ($i=1; $i<=9 && $po["po_poll{$i}"]; $i++) {  ?>
+        <li><input type="radio" name="gb_poll" value="<?php echo $i ?>" id="gb_poll_<?php echo $i ?>"> <label for="gb_poll_<?php echo $i ?>"><?php echo $po['po_poll'.$i] ?></label></li>
+        <?php }  ?>
+    </ul>
+    <footer>
+        <input type="submit" value="투표하기">
+        <a href="<?php echo G4_BBS_URL."/poll_result.php?po_id=$po_id&amp;skin_dir=$skin_dir" ?>" target="_blank" onclick="poll_result(this.href); return false;">결과보기</a>
+    </footer>
+</section>
+</form>
+
+<script>
+function fpoll_submit(f)
+{
+    <?php
+    if ($member['mb_level'] < $po['po_level'])
+        echo " alert('권한 {$po['po_level']} 이상의 회원만 투표에 참여하실 수 있습니다.'); return false; ";
+     ?>
+
+    var chk = false;
+    for (i=0; i<f.gb_poll.length;i ++) {
+        if (f.gb_poll[i].checked == true) {
+            chk = f.gb_poll[i].value;
+            break;
+        }
+    }
+
+    if (!chk) {
+        alert("투표하실 설문항목을 선택하세요");
+        return false;
+    }
+
+    var new_win = window.open("about:blank", "win_poll", "width=616,height=500,scrollbars=yes,resizable=yes"); 
+    f.target = "win_poll"; 
+
+    return true;
+}
+
+function poll_result(url)
+{
+    <?php
+    if ($member['mb_level'] < $po['po_level'])
+        echo " alert('권한 {$po['po_level']} 이상의 회원만 결과를 보실 수 있습니다.'); return false; ";
+     ?>
+
+    win_poll(url);
+}
+</script>
\ No newline at end of file
diff --git a/skin/poll/shop_poll/poll_result.skin.php b/skin/poll/shop_basic/poll_result.skin.php
similarity index 100%
rename from skin/poll/shop_poll/poll_result.skin.php
rename to skin/poll/shop_basic/poll_result.skin.php
diff --git a/skin/poll/shop_poll/style.css b/skin/poll/shop_basic/style.css
similarity index 100%
rename from skin/poll/shop_poll/style.css
rename to skin/poll/shop_basic/style.css
diff --git a/skin/poll/shop_poll/poll.skin.php b/skin/poll/shop_poll/poll.skin.php
deleted file mode 100644
index b1da218a4..000000000
--- a/skin/poll/shop_poll/poll.skin.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?
-if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
-?>
-
-<form name="fpoll" action="<?=G4_BBS_URL?>/poll_update.php" onsubmit="return fpoll_submit(this);" target="win_poll" method="post">
-<input type="hidden" name="po_id" value="<?=$po_id?>">
-<input type="hidden" name="skin_dir" value="<?=$skin_dir?>">
-<section id="poll">
-    <header>
-        <h2>설문조사</h2>
-        <? if ($is_admin == "super") { ?><a href="<?=G4_ADMIN_URL?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>" class="btn_admin">설문조사 관리</a><? } ?>
-        <p><?=$po['po_subject']?></p>
-    </header>
-    <ul>
-        <? for ($i=1; $i<=9 && $po["po_poll{$i}"]; $i++) { ?>
-        <li><input type="radio" name="gb_poll" value="<?=$i?>" id="gb_poll_<?=$i?>"> <label for="gb_poll_<?=$i?>"><?=$po['po_poll'.$i]?></label></li>
-        <? } ?>
-    </ul>
-    <footer>
-        <input type="submit" value="투표하기">
-        <a href="<?=G4_BBS_URL."/poll_result.php?po_id=$po_id&amp;skin_dir=$skin_dir"?>" target="_blank" onclick="poll_result(this.href); return false;">결과보기</a>
-    </footer>
-</section>
-</form>
-
-<script>
-function fpoll_submit(f)
-{
-    <?
-    if ($member['mb_level'] < $po['po_level'])
-        echo " alert('권한 {$po['po_level']} 이상의 회원만 투표에 참여하실 수 있습니다.'); return false; ";
-    ?>
-
-    var chk = false;
-    for (i=0; i<f.gb_poll.length;i ++) {
-        if (f.gb_poll[i].checked == true) {
-            chk = f.gb_poll[i].value;
-            break;
-        }
-    }
-
-    if (!chk) {
-        alert("투표하실 설문항목을 선택하세요");
-        return false;
-    }
-
-    win_poll(f.action);
-    return true;
-}
-
-function poll_result(url)
-{
-    <?
-    if ($member['mb_level'] < $po['po_level'])
-        echo " alert('권한 {$po['po_level']} 이상의 회원만 결과를 보실 수 있습니다.'); return false; ";
-    ?>
-
-    win_poll(url);
-}
-</script>
\ No newline at end of file
diff --git a/skin/visit/shop_basic/style.css b/skin/visit/shop_basic/style.css
new file mode 100644
index 000000000..412742205
--- /dev/null
+++ b/skin/visit/shop_basic/style.css
@@ -0,0 +1,10 @@
+/* 방문자 집계 */
+#visit {background:#444;zoom:1}
+#visit:after {display:block;visibility:hidden;clear:both;content:''}
+#visit h2 {float:left;padding:10px 45px 10px 0;color:#fff}
+#visit dl {float:left;margin:0 0 0 10px;padding:0}
+#visit dt {float:left;margin:0;padding:10px 0 10px;color:#fff}
+#visit dd {float:left;margin:0 30px 0 0;padding:10px;color:#fff}
+#visit a {display:inline-block;padding:10px;color:#fff;text-decoration:none}
+#visit a:focus,
+#visit a:hover {background:#333;color:#fff}
\ No newline at end of file
diff --git a/skin/visit/shop_basic/visit.skin.php b/skin/visit/shop_basic/visit.skin.php
index 6a83bf503..17c9ddee6 100644
--- a/skin/visit/shop_basic/visit.skin.php
+++ b/skin/visit/shop_basic/visit.skin.php
@@ -1,18 +1,22 @@
-<?
-if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 
+<?php
+if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
 global $is_admin;
 ?>
 
-<table background='<?=$visit_skin_path?>/img/bg_visit.gif' width=100%>
-<tr><td style='padding:4px' align=center><img src='<?=$visit_skin_path?>/img/bar_visit.gif'></td></tr>
-<tr><td align=center style='padding-bottom:4px'>
-    <table bgcolor=#FFFFFF width=165 cellpadding=3 cellspacing=0>
-    <tr><td height=4></td></tr>
-    <tr><td>&nbsp;· 오늘 : <?=number_format($visit[1])?> <? if ($is_admin == "super") { ?><a href="<?=$g4[admin_path]?>/visit_list.php"><img src="<?=$visit_skin_path?>/img/admin.gif" width="33" height="15" border="0" align="absmiddle"></a><?}?></td></tr>
-    <tr><td>&nbsp;· 어제 : <?=number_format($visit[2])?></td></tr>
-    <tr><td>&nbsp;· 최대 : <?=number_format($visit[3])?></td></tr>
-    <tr><td>&nbsp;· 전체 : <?=number_format($visit[4])?></td></tr>
-    </table>
-    </td></tr>
-</table>
+<link rel="stylesheet" href="<?php echo $visit_skin_url ?>/style.css">
+
+<section id="visit">
+    <h2>접속자집계</h2>
+    <dl>
+        <dt>오늘</dt>
+        <dd><?php echo number_format($visit[1]) ?></dd>
+        <dt>어제</dt>
+        <dd><?php echo number_format($visit[2]) ?></dd>
+        <dt>최대</dt>
+        <dd><?php echo number_format($visit[3]) ?></dd>
+        <dt>전체</dt>
+        <dd><?php echo number_format($visit[4]) ?></dd>
+    </dl>
+    <?php if ($is_admin == "super") {  ?><a href="<?php echo G4_ADMIN_URL ?>/visit_list.php">상세보기</a><?php } ?>
+</section>