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

2013-04-29 11:33:16 +09:00
parent 196ed3aa66 3e05e7c2d4
commit 0ad8ed8405
10 changed files with 104 additions and 91 deletions
--- a/adm/shop_admin/itemeventform.php
+++ b/adm/shop_admin/itemeventform.php
@ -99,7 +99,7 @@ include_once (G4_ADMIN_PATH.'/admin.head.php');
    <tr>
        <th scope="row"><label for="ev_use">사용</label></th>
        <td>
-            <?=help("사용하지 않으면 왼쪽의 이벤트 메뉴와 이벤트리스트 페이지에 접근할 수 없습니다.");?>
+            <?=help("사용하지 않으면 레이아웃의 이벤트 메뉴 및 이벤트 관련 페이지에 접근할 수 없습니다.");?>
            <select name="ev_use" id="ev_use">
                <option value="1" <?=get_selected($ev['ev_use'], 1)?>>사용</option>
                <option value="0" <?=get_selected($ev['ev_use'], 0)?>>사용안함</option>
@ -115,9 +115,9 @@ include_once (G4_ADMIN_PATH.'/admin.head.php');
        </td>
    </tr>
    <tr>
-        <th scope="row"><label for="ev_mimg">메뉴이미지</label></th>
+        <th scope="row"><label for="ev_mimg">배너이미지</label></th>
        <td>
-            <?=help("쇼핑몰 왼쪽 메뉴에 텍스트 메뉴 대신 이미지로 넣을 경우 사용합니다.");?>
+            <?=help("쇼핑몰 레이아웃에서 글자 대신 이미지로 출력할 경우 사용합니다.");?>
            <input type="file" name="ev_mimg" id="ev_mimg">
            <?
            $mimg_str = "";
--- a/css/default.css
+++ b/css/default.css
@ -126,7 +126,7 @@ a:active {color:#000;text-decoration:underline}
 #ft_copy a {position:absolute;top:10px;right:0;color:#fff}

 /* Mobile화면으로 */
-#g4s_cng {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;background:#fff;color:#000;font-size:2em;text-decoration:none;text-align:center}
+#device_change {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;background:#fff;color:#000;font-size:2em;text-decoration:none;text-align:center}

 /* 콘텐츠별 스타일 */
 .cnt_cmt {display:inline-block;margin:0 0 0 3px;font-weight:bold}
--- a/css/default_shop.css
+++ b/css/default_shop.css
@ -123,23 +123,38 @@ a:active {color:#000;text-decoration:underline}
 #container {z-index:4;position:relative;float:left;padding:25px 15px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border:1px solid #cfded8;background:#fff;zoom:1}
 #container:after {display:block;visibility:hidden;clear:both;content:""}

+#sev {margin:0 0 5px;padding:0 0 10px;border:1px solid #ecc9d6;background:#fff8fb}
+#sev h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#sev ul {margin:0;padding:10px 0 0;border:0;background:#fff;list-style:none}
+#sev .sev_img {display:block;border-bottom:1px solid #faedf2}
+#sev .sev_text {display:block;padding:7px 10px 5px;border-bottom:1px solid #faedf2;text-decoration:none}
+#sev strong {}
+#sev_empty {padding:15px 0;text-align:center}
+
+#scomm {margin:0 0 5px;padding:0 0 10px;border:1px solid #d5d5d5;background:#faf9f5}
+#scomm h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#scomm ul {margin:0;padding:10px 0 0;border:0;background:#fff;list-style:none}
+#scomm a {display:block;padding:7px 10px 5px;border-bottom:1px solid #f4f4f4;text-decoration:none}
+#scomm_empty {padding:15px 0;text-align:center}
+
 /* 텍스트 크기 조절 */
 #text_size {position:absolute;top:-31px;left:-1px}
 #text_size button {padding:0 10px;height:30px;border:1px solid #cfded8;border-bottom:0;background:#000;color:#fff;cursor:pointer}

 /* 하단 레이아웃 */
-#ft {background:#484848}
+#ft {padding:0 0 40px;border-top:1px solid #e9e9e9}
 #ft h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-
-#ft_catch {position:relative;margin:0 auto;padding:20px 0;width:980px;text-align:center}
-
-#ft_copy {background:#414141}
-#ft_copy p {position:relative;margin:0 auto;width:980px;color:#4a9ab8}
-#ft_copy b {color:#fff}
-#ft_copy a {position:absolute;top:10px;right:0;color:#fff}
+#ft div {position:relative;margin:0 auto;padding:0 0 0 160px;width:820px}
+#ft_logo {position:absolute;top:0;left:40px}
+#ft ul {margin:0 0 15px;padding:20px 0 0;zoom:1}
+#ft ul:after {display:block;visibility:hidden;clear:both;content:''}
+#ft li {float:left;margin:0 20px 0 0}
+#ft a {text-decoration:none}
+#ft p {margin:0;padding:0}
+#ft_totop {position:absolute;top:20px;right:0}

 /* Mobile화면으로 */
-#g4s_cng {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;background:#fff;color:#000;font-size:2em;text-decoration:none;text-align:center}
+#mobile_cng {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;background:#fff;color:#000;font-size:2em;text-decoration:none;text-align:center}

 /* 콘텐츠별 스타일 */
 .cnt_cmt {display:inline-block;margin:0 0 0 3px;font-weight:bold}
--- a/css/mobile.css
+++ b/css/mobile.css
@ -97,7 +97,7 @@ pre {overflow-x:scroll;font-size:1.1em}
 #ft_copy a {color:#fff;text-decoration:none}

 /* PC화면으로 */
-#g4s_cng {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;color:#000;font-size:1em;text-decoration:none;text-align:center}
+#device_change {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;color:#000;font-size:1em;text-decoration:none;text-align:center}

 /* 버튼 */
 .btn01 {display:inline-block;padding:0 0.5em;height:2em;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;font-size:1em;text-decoration:none !important;line-height:2em;vertical-align:middle}
--- a/mobile/tail.php
+++ b/mobile/tail.php
@ -40,7 +40,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    </div>
 </footer>

-<a href="<?php echo $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.$_SERVER['QUERY_STRING'].'&amp;':'?').'device=pc'; ?>" id="g4s_cng">PC 버전으로 보기</a>
+<a href="<?php echo $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.$_SERVER['QUERY_STRING'].'&amp;':'?').'device=pc'; ?>" id="device_change">PC 버전으로 보기</a>

 <?php
 include_once(G4_PATH."/tail.sub.php");
--- a/shop/boxcommunity.inc.php
+++ b/shop/boxcommunity.inc.php
@ -2,20 +2,22 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 ?>

-<table bgcolor=#FFFFFF width=100% cellpadding=0 cellspacing=0>
-<tr><td align=center valign=top height=50><img src='<?=G4_SHOP_URL?>/img/bar_community.gif'></td></tr>
-<?
-$hsql = " select bo_table, bo_subject from {$g4['board_table']} order by gr_id, bo_table ";
-$hresult = sql_query($hsql);
-for ($i=0; $row=sql_fetch_array($hresult); $i++)
-{
-    if ($i > 0)
-        echo "<tr><td align=center><img src='".G4_SHOP_URL."/img/dot_line.gif'></td></tr>\n";
+<section id="scomm">
+    <h2>쇼핑몰 커뮤니티</h2>

-    echo "<tr><td height=22>&nbsp;&nbsp;· <a href='".G4_BBS_URL."/board.php?bo_table={$row['bo_table']}'>{$row['bo_subject']}</a></td></tr>\n";
-}
+    <ul>

-if ($i==0)
-    echo "<tr><td height=50 align=center>등록된 게시판이 없습니다.</td></tr>\n";
-?>
-</table>
+    <?php
+    $hsql = " select bo_table, bo_subject from {$g4['board_table']} order by gr_id, bo_table ";
+    $hresult = sql_query($hsql);
+    for ($i=0; $row=sql_fetch_array($hresult); $i++)
+    {
+        echo '<li><a href="'.G4_BBS_URL.'/board.php?bo_table='.$row['bo_table'].'">'.$row['bo_subject'].'</a></li>'.PHP_EOL;
+    }
+
+    if ($i==0)
+        echo '<li id="scomm_empty">이벤트 없음</li>'.PHP_EOL;
+    ?>
+    </ul>
+
+</section>
--- a/shop/boxevent.inc.php
+++ b/shop/boxevent.inc.php
@ -2,29 +2,37 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 ?>

-<table bgcolor=#FFFFFF width=100% cellpadding=0 cellspacing=0>
-<tr><td align=center valign=top height=50><img src='<?=G4_SHOP_URL?>/img/bar_event.gif'></td></tr>
-<?
-$hsql = " select ev_id, ev_subject, ev_subject_strong from {$g4['shop_event_table']} where ev_use = '1' order by ev_id desc ";
-$hresult = sql_query($hsql);
-for ($i=0; $row=sql_fetch_array($hresult); $i++)
-{
-    if ($i > 0)
-        echo "<tr><td align=center><img src='".G4_SHOP_URL."/img/dot_line.gif'></td></tr>\n";
+<section id="sev">
+    <h2>쇼핑몰 이벤트</h2>

-    $href = G4_SHOP_URL."/event.php?ev_id={$row['ev_id']}";
+    <ul>
+    <?php
+    $hsql = " select ev_id, ev_subject, ev_subject_strong from {$g4['shop_event_table']} where ev_use = '1' order by ev_id desc ";
+    $hresult = sql_query($hsql);
+    for ($i=0; $row=sql_fetch_array($hresult); $i++)
+    {
+
+        echo '<li>';
+        $href = G4_SHOP_URL.'/event.php?ev_id='.$row['ev_id'];
+
+        $event_img = G4_DATA_PATH.'/event/'.$row['ev_id'].'_m'; // 이벤트 이미지
+
+        if (file_exists($event_img)) { // 이벤트 이미지가 있다면 이미지 출력
+            echo '<a href="'.$href.'" class="sev_img"><img src="'.G4_DATA_URL.'/event/'.$row['ev_id'].'_m" alt="'.$row['ev_subject'].'"></a>'.PHP_EOL;
+        } else { // 없다면 텍스트 출력
+            echo '<a href="'.$href.'" class="sev_text">';
+            if ($row['ev_subject_strong']) echo '<strong>';
+            echo $row['ev_subject'];
+            if ($row['ev_subject_strong']) echo '</strong>';
+            echo '</a>'.PHP_EOL;
+        }
+        echo '</li>'.PHP_EOL;

-    // 이벤트 메뉴이미지가 있다면
-    $event_img = G4_DATA_PATH."/event/{$row['ev_id']}_m";
-    if (file_exists($event_img)) {
-        echo "<tr><td><a href='$href'><img src='".G4_DATA_URL."/event/{$row['ev_id']}_m' border=0 align=absmiddle></a></td></tr>";
-    } else {
-        echo "<tr><td height=22>&nbsp;&nbsp;· <a href='$href'>{$row['ev_subject']}</a></td></tr>\n";;
    }

-}
+    if ($i==0)
+        echo '<li id="sev_empty">이벤트 없음</li>'.PHP_EOL;
+    ?>
+    </ul>

-if ($i==0)
-    echo "<tr><td height=50 align=center>등록된 자료가 없습니다.</td></tr>\n";
-?>
-</table>
+</section>
--- a/shop/shop.tail.php
+++ b/shop/shop.tail.php
@ -9,51 +9,39 @@ $admin = get_admin("super");

 </div>

+<footer id="ft">
+    <div>
+        <a href="<?php echo G4_SHOP_URL; ?>/" id="ft_logo"><img src="<?php echo G4_DATA_URL; ?>/common/logo_img" alt="처음으로"></a>
+        <ul>
+            <li><a href="<?=G4_SHOP_URL?>/content.php?co_id=company">회사소개</a></li>
+            <li><a href="<?=G4_SHOP_URL?>/content.php?co_id=provision">서비스이용약관</a></li>
+            <li><a href="<?=G4_SHOP_URL?>/content.php?co_id=privacy">개인정보 취급방침</a></li>
+        </ul>
+        <p>
+        <?=$default['de_admin_company_addr']?> /
+        전화 : <?=$default['de_admin_company_tel']?> /
+        팩스 : <?=$default['de_admin_company_fax']?> /
+        운영자 : <?=$admin['mb_name']?><br>
+        사업자 등록번호 : <?=$default['de_admin_company_saupja_no']?> /
+        대표 : <?=$default['de_admin_company_owner']?> /
+        개인정보관리책임자 : <?=$default['de_admin_info_name']?><br>
+        통신판매업신고번호 : <?=$default['de_admin_tongsin_no']?>
+        <? if ($default['de_admin_buga_no']) echo " / 부가통신사업신고번호 : {$default['de_admin_buga_no']}"; ?><br>
+        Copyright &copy; 2001-2013 <?=$default['de_admin_company_name']?>. All Rights Reserved.
+        </p>
+        <a href="#" id="ft_totop">상단으로</a>
+    </div>
+</footer>

-<!-- 하단 -->
-<table align=center width='<?=$table_width?>' cellpadding=0 cellspacing=0>
-<tr>
-    <td width=180 bgcolor=#EBEBEB><a href='<?=G4_SHOP_URL?>/'><img src='<?=G4_DATA_URL?>/common/logo_img' border=0 style="filter:gray();"></a></td>
-    <td><img src='<?=G4_SHOP_URL?>/img/tail_img01.gif'></td>
-    <td width=10></td>
-    <td><img src='<?=G4_SHOP_URL?>/img/tail_img02.gif'></td>
-    <td width=770 bgcolor=#EBEBEB style='padding-left:10px;'>
-        <table width=98% cellpadding=0 cellspacing=0 border=0>
-        <tr><td height=30>
-            <a href="<?=G4_SHOP_URL?>/content.php?co_id=company">회사소개</a> |
-            <a href="<?=G4_SHOP_URL?>/content.php?co_id=provision">서비스이용약관</a> |
-            <a href="<?=G4_SHOP_URL?>/content.php?co_id=privacy">개인정보 취급방침</a>
-            </td></tr>
-        <tr><td height=1 bgcolor=#CBCBCB></td></tr>
-        <tr><td height=60 style='line-height:150%'>
-            <FONT COLOR="#46808F">
-                <?=$default['de_admin_company_addr']?> /
-                전화 : <?=$default['de_admin_company_tel']?> /
-                팩스 : <?=$default['de_admin_company_fax']?> /
-                운영자 : <?=$admin['mb_name']?> <BR>
-                사업자 등록번호 : <?=$default['de_admin_company_saupja_no']?> /
-                대표 : <?=$default['de_admin_company_owner']?> /
-                개인정보관리책임자 : <?=$default['de_admin_info_name']?> <br>
-                통신판매업신고번호 : <?=$default['de_admin_tongsin_no']?>
-                <? if ($default['de_admin_buga_no']) echo " / 부가통신사업신고번호 : {$default['de_admin_buga_no']}"; ?>
-                <br>Copyright &copy; 2001-2013 <?=$default['de_admin_company_name']?>. All Rights Reserved. </FONT></td></tr></table>
-    </td>
-</tr>
-</table>
-<!-- 하단끝 -->
-
+<?php if(!G4_IS_MOBILE){ ?>
+<a href="<?php echo $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.$_SERVER['QUERY_STRING'].'&amp;':'?').'device=mobile'; ?>" id="device_change">모바일 버전으로 보기</a>
+<?php } ?>

 <?
 $sec = get_microtime() - $begin_time;
 $file = $_SERVER['PHP_SELF'];
 ?>

-</td>
-</tr>
-</table><br/>
-<!-- 전체끝 -->
-
-
 <?
 include_once(G4_PATH.'/tail.sub.php');
 ?>
--- a/skin/outlogin/shop_outlogin/outlogin.skin.2.php
+++ b/skin/outlogin/shop_outlogin/outlogin.skin.2.php
@ -9,7 +9,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
    <header id="ol_after_hd">
        <h2>나의 회원정보</h2>
        <strong><?=$nick?>님</strong>
-        <? if ($is_admin == 'super' || $is_auth) { ?><a href="<?=G4_ADMIN_URL?>" class="btn_admin">관리자 모드</a><? } ?>
+        <? if ($is_admin == 'super' || $is_auth) { ?><a href="<?=G4_ADMIN_URL?>/shop_admin" class="btn_admin">관리자 모드</a><? } ?>
    </header>
    <ul id="ol_after_private">
        <li>
--- a/tail.php
+++ b/tail.php
@ -33,7 +33,7 @@ if ($config['cf_include_tail']) {
 </footer>

 <?php if(!G4_IS_MOBILE){ ?>
-<a href="<?php echo $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.$_SERVER['QUERY_STRING'].'&amp;':'?').'device=mobile'; ?>" id="g4s_cng">모바일 버전으로 보기</a>
+<a href="<?php echo $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.$_SERVER['QUERY_STRING'].'&amp;':'?').'device=mobile'; ?>" id="device_change">모바일 버전으로 보기</a>
 <?php } ?>

 <?php