diff --git a/adm/shop_admin/optionstocklist.php b/adm/shop_admin/optionstocklist.php
index 67597f9b2..bc2629a45 100644
--- a/adm/shop_admin/optionstocklist.php
+++ b/adm/shop_admin/optionstocklist.php
@@ -7,7 +7,7 @@ auth_check($auth[$sub_menu], "r");
$g4['title'] = '상품옵션재고관리';
include_once (G4_ADMIN_PATH.'/admin.head.php');
-$sql_search = " where 1 ";
+$sql_search = " where b.it_id is not NULL ";
if ($search != "") {
if ($sel_field != "") {
$sql_search .= " and $sel_field like '%$search%' ";
@@ -192,7 +192,7 @@ if ($search) // 검색 결과일 때만 처음 버튼을 보여줌
-
+
diff --git a/css/default.css b/css/default.css
index 16d8d82cd..8829ef8b4 100644
--- a/css/default.css
+++ b/css/default.css
@@ -60,7 +60,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
.gnb_js .gnb_1dli_on a {float:none;background:#333;color:#fff}
.gnb_js .gnb_2dul {display:none;position:absolute;top:35px}
.gnb_js .gnb_2da {display:inline-block;float:none !important;padding:0 10px;width:161px;text-align:left}
-.gnb_1dli_over .gnb_2dul {display:block;left:0;background:#fff}
+.gnb_1dli_over .gnb_2dul {display:block;left:0;width:180px;background:#fff}
.gnb_1dli_over2 .gnb_2dul {display:block;right:1px;width:180px;background:#fff}
.gnb_empty {width:100%;height:35px;text-align:center;line-height:2.95em}
diff --git a/css/default_shop.css b/css/default_shop.css
index 735650cbe..41c3c31bf 100644
--- a/css/default_shop.css
+++ b/css/default_shop.css
@@ -110,7 +110,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
#gnb {margin:0 0 5px;padding:0 0 10px;border:1px solid #d5d5d5;background:#f5f6fa}
#gnb h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
.gnb_1dul {margin:0;border:0;background:#fff;list-style:none}
-.gnb_1dli {position:relative;background:url('../img/shop/gnb_bg.gif') top right repeat-x}
+.gnb_1dli {position:relative;background:url('../shop/img/gnb_bg.gif') top right repeat-x}
.gnb_1dli_on {background-position:right -33px;color:#fff;text-decoration:none}
.gnb_1da {display:inline-block;padding:0 10px;width:128px;height:33px;border-bottom:1px solid #f4f4f4;font-weight:bold;text-decoration:none;line-height:2.9em !important;line-height:2.7em}
.gnb_1dli_on .gnb_1da {color:#fff !important;text-decoration:none !important}
@@ -340,7 +340,7 @@ td.empty_table {padding:85px 0;text-align:center}
#sct_location {margin:0 0 10px;border:1px solid #e9e9e9;background:#f5f6fa;letter-spacing:-4px}
#sct_location a {display:inline-block;padding:10px 10px 8px;text-decoration:none;letter-spacing:0 !important}
.sct_here {font-weight:bold}
-.sct_bg {padding-right:15px !important;background:url('../img/shop/sct_bg_toright.gif') right 11px no-repeat}
+.sct_bg {padding-right:15px !important;background:url('../shop/img/sct_bg_toright.gif') right 11px no-repeat}
/* 상품 목록 카테고리 목록 */
.sct_ct {}
diff --git a/css/mobile_shop.css b/css/mobile_shop.css
index 3362fd936..824a2cb56 100644
--- a/css/mobile_shop.css
+++ b/css/mobile_shop.css
@@ -64,7 +64,7 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none}
#sct_location {border:1px solid #e9e9e9;background:#f5f6fa;letter-spacing:-4px}
#sct_location a {display:inline-block;padding:0.7em 1em;text-decoration:none;letter-spacing:0 !important}
.sct_here {font-weight:bold}
-.sct_bg {padding-right:1.3em !important;background:url('../img/shop/sct_bg_toright.gif') right 0.9em no-repeat}
+.sct_bg {padding-right:1.3em !important;background:url('../shop/img/sct_bg_toright.gif') right 0.9em no-repeat}
/* 상품 목록 카테고리 목록 */
.sct_ct {}
@@ -114,7 +114,7 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none}
.sct_11 .sct_a:after {display:block;visibility:hidden;clear:both;content:""}
.sct_11 .sct_a:focus,
.sct_11 .sct_a:hover {text-decoration:none}
-.sct_11 .sct_arw_toleft {display:block;z-index:2;position:absolute;top:1.8em;left:2.8em;width:1em;height:1.8em;background:url('../../img/shop/icon_arw_toleft.gif') no-repeat}
+.sct_11 .sct_arw_toleft {display:block;z-index:2;position:absolute;top:1.8em;left:2.8em;width:1em;height:1.8em;background:url('../../shop/img/icon_arw_toleft.gif') no-repeat}
.sct_11 .sct_img {float:left;margin:0 1em 0 0}
.sct_11 b {display:block;margin:0 0 1em;font-size:1.2em;letter-spacing:-0.1em}
.sct_11 p {margin:0 0 1em;padding:0;line-height:1.5em}
diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php
index fdc1f5fe2..a7246f75c 100644
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@@ -401,6 +401,12 @@ if (!sql_query(" select de_mobile_type1_list_mod from {$g4['shop_default_table']
CHANGE `de_mobile_type5_list_row` `de_mobile_type5_list_mod` INT(11) NOT NULL DEFAULT '0' ", true);
}
+// 분류 모바일 필드명 수정
+if(!sql_query(" select ca_mobile_list_mod from {$g4['shop_category_table']} limit 1 ", false)) {
+ sql_query(" ALTER TABLE `{$g4['shop_category_table']}`
+ CHANGE `ca_mobile_list_row` `ca_mobile_list_mod` INT(11) NOT NULL DEFAULT '0' ", true);
+}
+
// 과세, 비과세 금액 필드 추가
if(!sql_query(" select od_tax_mny from {$g4['shop_order_table']} limit 1 ", false)) {
sql_query(" ALTER TABLE `{$g4['shop_order_table']}`
diff --git a/head.sub.php b/head.sub.php
index 9f757b1cc..a891a3182 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -48,8 +48,8 @@ if (defined('G4_IS_ADMIN')) {
if (defined('_SHOP_')) $shop_css = '_shop';
echo ''.PHP_EOL;
}
-// echo '';
-// echo '';
+echo '';
+echo '';
?>