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

css/admin.css

@@ -284,8 +284,8 @@ tfoot td {font-weight:bold;text-align:center}
 .ul_01 li {padding:10px 0;border-bottom:1px solid #e9e9e9}
 
 /* 자료 없는 목록 */
-.empty_table {padding:100px 0;text-align:center}
+.empty_table {padding:100px 0 !important;text-align:center}
-.empty_list {padding:20px 0;text-align:center}
+.empty_list {padding:20px 0 !important;text-align:center}
 
 /* 폼 테이블 */
 .tbl_frm01 th {padding:0;border-top:1px solid #ececec;border-bottom:1px solid #ececec;text-align:left}
@@ -617,7 +617,7 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
 
 .sit_option {margin:0 0 10px;padding:10px 10px 0;border:1px solid #e9e9e9;background:#f7f7f7}
 .sit_option .frm_input {background:#fff !important;color:#000}
-.sit_option_frm_wrapper {margin:0 0 10px;height:auto !important;height:500px;max-height:500px;border:1px solid #484848;overflow-y:scroll}
+.sit_option_frm_wrapper {margin:0 0 10px;height:auto !important;height:500px;max-height:500px;border:1px solid #ccc;overflow-y:scroll}
 .sit_option_frm_wrapper th {padding:5px 0 !important;text-align:center !important}
 
 #sit_option_frm .btn_list {margin:0 0 10px}

css/default_shop.css

@@ -401,7 +401,7 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7
 #sct_sort {float:left;margin:0 0 10px;width:80%;zoom:1}
 #sct_sort:after {display:block;visibility:hidden;clear:both;content:""}
 #sct_sort h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#sct_sort ul {margin:0;padding:0;list-style:none;zoom:1}
+#sct_sort ul {margin:0;padding:0 0 0 1px;list-style:none;zoom:1}
 #sct_sort ul:after {display:block;visibility:hidden;clear:both;content:""}
 #sct_sort li {float:left;position:relative;margin-left:-1px}
 

lib/shop.lib.php

@@ -392,7 +392,7 @@ function get_image($img, $width=0, $height=0, $img_id='')
 
 
 // 상품 이미지를 얻는다
-function get_it_image($it_id, $width, $height=0, $anchor=false, $img_id='')
+function get_it_image($it_id, $width, $height=0, $anchor=false, $img_id='', $img_alt='')
 {
     global $g5;
 
@@ -432,12 +432,12 @@ function get_it_image($it_id, $width, $height=0, $anchor=false, $img_id='')
 
     if($thumb) {
         $file_url = str_replace(G5_PATH, G5_URL, $filepath.'/'.$thumb);
-        $img = '<img src="'.$file_url.'" width="'.$width.'" height="'.$height.'" alt=""';
+        $img = '<img src="'.$file_url.'" width="'.$width.'" height="'.$height.'" alt="'.$img_alt.'"';
     } else {
         $img = '<img src="'.G5_SHOP_URL.'/img/no_image.gif" width="'.$width.'"';
         if($height)
             $img .= ' height="'.$height.'"';
-        $img .= ' alt=""';
+        $img .= ' alt="'.$img_alt.'"';
     }
 
     if($img_id)

shop/index.php

@@ -30,7 +30,7 @@ include_once(G5_SHOP_PATH.'/shop.head.php');
     $list = new item_list();
     $list->set_type(1);
     $list->set_view('it_img', true);
-    $list->set_view('it_id', false);
+    $list->set_view('it_id', true);
     $list->set_view('it_name', true);
     $list->set_view('it_basic', true);
     $list->set_view('it_cust_price', true);

skin/shop/basic/list.10.skin.php

@@ -23,46 +23,63 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
         }
     }
 
-    echo "<li class=\"sct_li{$sct_last}\" style=\"width:{$this->img_width}px\">\n";
+    echo "<li class=\"sct_li {$sct_last}\" style=\"width:{$this->img_width}px\">\n";
 
     if ($this->href) {
-        echo "<a href=\"{$this->href}{$row['it_id']}\" class=\"sct_a\">\n";
+        echo "<a href=\"{$this->href}{$row['it_id']}\" class=\"sct_a sct_img\">\n";
     }
 
     if ($this->view_it_img) {
-        echo "<span class=\"sct_img\">".get_it_image($row['it_id'], $this->img_width, $this->img_height)."</span>\n";
+        echo get_it_image($row['it_id'], $this->img_width, $this->img_height)."\n";
-    }
-
-    if ($this->view_it_id) {
-        echo "<b>".stripslashes($row['it_id'])."</b>\n";
-    }
-
-    if ($this->view_it_name) {
-        echo "<b>".stripslashes($row['it_name'])."</b>\n";
-    }
-
-    if ($this->view_it_basic) {
-        echo "<b>".stripslashes($row['it_basic'])."</b>\n";
-    }
-
-    if ($this->view_it_cust_price && $row['it_cust_price']) {
-        echo "<span class=\"sct_cost\">".display_price($row['it_cust_price'])."</span>\n";
-    }
-
-    if ($this->view_it_price) {
-        echo "<span class=\"sct_cost\">".display_price(get_price($row), $row['it_tel_inq'])."</span>\n";
-    }
-
-    if ($this->view_it_icon) {
-        echo "<span class=\"sct_icon\">".item_icon($row)."</span>\n";
     }
 
     if ($this->href) {
         echo "</a>\n";
     }
 
+    if ($this->view_it_id) {
+        echo "<span class=\"sct_id\">&lt;".stripslashes($row['it_id'])."&gt;</span>\n";
+    }
+
+    if ($this->href) {
+        echo "<a href=\"{$this->href}{$row['it_id']}\" class=\"sct_a sct_txt\">\n";
+    }
+
+    if ($this->view_it_name) {
+        echo stripslashes($row['it_name'])."\n";
+    }
+
+    if ($this->href) {
+        echo "</a>\n";
+    }
+
+    if ($this->view_it_basic) {
+        echo "<div class=\"sct_basic\">".stripslashes($row['it_basic'])."</div>\n";
+    }
+
+    if ($this->view_it_cust_price || $this->view_it_price) {
+
+        echo "<div class=\"sct_cost\">\n";
+
+        if ($this->view_it_cust_price && $row['it_cust_price']) {
+            echo "<strike>".display_price($row['it_cust_price'])."</strike> &gt;\n";
+        }
+
+        if ($this->view_it_price) {
+            echo display_price(get_price($row), $row['it_tel_inq'])."\n";
+        }
+
+        echo "</div>\n";
+
+    }
+
+    if ($this->view_it_icon) {
+        echo "<div class=\"sct_icon\">".item_icon($row)."</div>\n";
+    }
+
     if ($this->view_sns) {
-        echo "<div class=\"sct_sns\">";
+        $sns_top = $this->img_height + 10;
+        echo "<div class=\"sct_sns\" style=\"top:{$sns_top}px\">";
         echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_fb.png');
         echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_twt.png');
         echo get_sns_share_link('googleplus', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_goo.png');

skin/shop/basic/list.20.skin.php

@@ -26,37 +26,53 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
     echo "<li class=\"sct_li{$sct_last}\" style=\"width:{$this->img_width}px\">\n";
 
     if ($this->href) {
-        echo "<a href=\"{$this->href}{$row['it_id']}\" class=\"sct_a\">\n";
+        echo "<a href=\"{$this->href}{$row['it_id']}\" class=\"sct_a sct_img\">\n";
     }
 
     if ($this->view_it_img) {
-        echo "<span class=\"sct_img\">".get_it_image($row['it_id'], $this->img_width, $this->img_height)."</span>\n";
+        echo get_it_image($row['it_id'], $this->img_width, $this->img_height, '', '', stripslashes($row['it_name']))."\n";
-    }
-
-    if ($this->view_it_id) {
-        echo "<b>".stripslashes($row['it_id'])."</b>\n";
-    }
-
-    if ($this->view_it_name) {
-        echo "<b>".stripslashes($row['it_name'])."</b>\n";
-    }
-
-    if ($this->view_it_cust_price && $row['it_cust_price']) {
-        echo "<span class=\"sct_cost\">".display_price($row['it_cust_price'])."</span>\n";
-    }
-
-    if ($this->view_it_price) {
-        echo "<span class=\"sct_cost\">".display_price(get_price($row), $row['it_tel_inq'])."</span>\n";
-    }
-
-    if ($this->view_it_icon) {
-        echo "<span class=\"sct_icon\">".item_icon($row)."</span>\n";
     }
 
     if ($this->href) {
         echo "</a>\n";
     }
 
+    if ($this->view_it_id) {
+        echo "<span class=\"sct_id\">&lt;".stripslashes($row['it_id'])."&gt;</span>\n";
+    }
+
+    if ($this->href) {
+        echo "<a href=\"{$this->href}{$row['it_id']}\" class=\"sct_a sct_txt\">\n";
+    }
+
+    if ($this->view_it_name) {
+        echo stripslashes($row['it_name'])."\n";
+    }
+
+    if ($this->href) {
+        echo "</a>\n";
+    }
+
+    if ($this->view_it_cust_price || $this->view_it_price) {
+
+        echo "<div class=\"sct_cost\">\n";
+
+        if ($this->view_it_cust_price && $row['it_cust_price']) {
+            echo "<strike>".display_price($row['it_cust_price'])."</strike> &gt;\n";
+        }
+
+        if ($this->view_it_price) {
+            echo display_price(get_price($row), $row['it_tel_inq'])."\n";
+        }
+
+        echo "</div>\n";
+
+    }
+
+    if ($this->view_it_icon) {
+        echo "<span class=\"sct_icon\">".item_icon($row)."</span>\n";
+    }
+
     if ($this->view_sns) {
         echo "<div class=\"sct_sns\">";
         echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_fb.png');
@@ -72,4 +88,4 @@ if ($i > 1) echo "</ul>\n";
 
 if($i == 1) echo "<p class=\"sct_noitem\">등록된 상품이 없습니다.</p>\n";
 ?>
-<!-- } 상품진열 11 끝 -->
+<!-- } 상품진열 20 끝 -->

skin/shop/basic/main.10.skin.php

@@ -26,49 +26,66 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
     echo "<li class=\"sct_li {$sct_last}\" style=\"width:{$this->img_width}px\">\n";
 
     if ($this->href) {
-        echo "<a href=\"{$this->href}{$row['it_id']}\" class=\"sct_a\">\n";
+        echo "<a href=\"{$this->href}{$row['it_id']}\" class=\"sct_a sct_img\">\n";
     }
 
     if ($this->view_it_img) {
-        echo "<span class=\"sct_img\">".get_it_image($row['it_id'], $this->img_width, $this->img_height)."</span>\n";
+        echo get_it_image($row['it_id'], $this->img_width, $this->img_height)."\n";
-    }
-
-    if ($this->view_it_id) {
-        echo "<b>".stripslashes($row['it_id'])."</b>\n";
-    }
-
-    if ($this->view_it_name) {
-        echo "<b>".stripslashes($row['it_name'])."</b>\n";
-    }
-
-    if ($this->view_it_basic) {
-        echo "<b>".stripslashes($row['it_basic'])."</b>\n";
-    }
-
-    if ($this->view_it_cust_price && $row['it_cust_price']) {
-        echo "<span class=\"sct_cost\">".display_price($row['it_cust_price'])."</span>\n";
-    }
-
-    if ($this->view_it_price) {
-        echo "<span class=\"sct_cost\">".display_price(get_price($row), $row['it_tel_inq'])."</span>\n";
-    }
-
-    if ($this->view_it_icon) {
-        echo "<span class=\"sct_icon\">".item_icon($row)."</span>\n";
-    }
-
-    if ($this->view_sns) {
-        echo "<div class=\"sct_sns\">";
-        echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_fb.png');
-        echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_twt.png');
-        echo get_sns_share_link('googleplus', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_goo.png');
-        echo "</div>\n";
     }
 
     if ($this->href) {
         echo "</a>\n";
     }
 
+    if ($this->view_it_id) {
+        echo "<span class=\"sct_id\">&lt;".stripslashes($row['it_id'])."&gt;</span>\n";
+    }
+
+    if ($this->href) {
+        echo "<a href=\"{$this->href}{$row['it_id']}\" class=\"sct_a sct_txt\">\n";
+    }
+
+    if ($this->view_it_name) {
+        echo stripslashes($row['it_name'])."\n";
+    }
+
+    if ($this->href) {
+        echo "</a>\n";
+    }
+
+    if ($this->view_it_basic) {
+        echo "<div class=\"sct_basic\">".stripslashes($row['it_basic'])."</div>\n";
+    }
+
+    if ($this->view_it_cust_price || $this->view_it_price) {
+
+        echo "<div class=\"sct_cost\">\n";
+
+        if ($this->view_it_cust_price && $row['it_cust_price']) {
+            echo "<strike>".display_price($row['it_cust_price'])."</strike> &gt;\n";
+        }
+
+        if ($this->view_it_price) {
+            echo display_price(get_price($row), $row['it_tel_inq'])."\n";
+        }
+
+        echo "</div>\n";
+
+    }
+
+    if ($this->view_it_icon) {
+        echo "<div class=\"sct_icon\">".item_icon($row)."</div>\n";
+    }
+
+    if ($this->view_sns) {
+        $sns_top = $this->img_height + 10;
+        echo "<div class=\"sct_sns\" style=\"top:{$sns_top}px\">";
+        echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_fb.png');
+        echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_twt.png');
+        echo get_sns_share_link('googleplus', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_goo.png');
+        echo "</div>\n";
+    }
+
     echo "</li>\n";
 }
 

skin/shop/basic/style.css

@@ -26,26 +26,27 @@
 .sct_10 .sct_li {position:relative;float:left;margin:0 25px 15px 0}
 .sct_10 .sct_last {margin:0 0 15px !important}
 .sct_10 .sct_clear {clear:both}
-.sct_10 .sct_a {display:block;position:relative;text-decoration:none}
+.sct_10 .sct_a {display:inline-block;position:relative;margin:0 0 5px;text-decoration:none}
 .sct_10 .sct_a:focus, .sct_10 .sct_a:hover {text-decoration:none}
-.sct_10 .sct_img {display:block;margin:0 0 15px}
+.sct_10 .sct_img {margin:0 0 45px}
-.sct_10 b {display:block;margin:0 0 8px;font-weight:normal}
+.sct_10 .sct_id {display:block;margin:0 0 5px}
-.sct_10 s {display:block}
+.sct_10 .sct_basic {margin:0 0 10px}
 .sct_10 .sct_cost {display:block;margin:0 0 10px;font-weight:bold}
+.sct_10 .sct_cost strike {color:#999;font-weight:normal}
 .sct_10 .sct_icon {}
 .sct_10 .sct_icon img {}
-.sct_10 .sct_sns {position:absolute;top:190px;right:20px}
+.sct_10 .sct_sns {position:absolute;left:0;width:100%;text-align:center}
 
 /* 상품 목록 스킨 20 */
 .sct_20 .sct_li {position:relative;float:left;margin:0 25px 15px 0}
 .sct_20 .sct_last {margin:0 0 15px !important}
 .sct_20 .sct_clear {clear:both}
-.sct_20 .sct_a {display:block;position:relative;padding:0 0 5px;background:#f5f6fa;text-decoration:none}
+.sct_20 .sct_a {display:block;position:relative;text-decoration:none}
 .sct_20 .sct_a:focus, .sct_20 .sct_a:hover {text-decoration:none}
-.sct_20 .sct_img {display:block;margin:0 0 15px}
+.sct_20 .sct_img {}
-.sct_20 b {display:block;margin:0 0 8px;padding:0 5px;font-weight:normal}
+.sct_20 .sct_id {display:block;padding:5px 10px 0;background:#f2f5f9}
-.sct_20 s {display:block}
+.sct_20 .sct_txt {padding:10px;background:#f2f5f9}
-.sct_20 .sct_cost {display:block;margin:0 0 10px;padding:0 5px;font-weight:bold}
+.sct_20 .sct_cost {display:block;padding:0 10px 10px;background:#f2f5f9;font-weight:bold}
 .sct_20 .sct_icon {position:absolute;top:10px;left:-5px;margin:0 !important}
 .sct_20 .sct_icon img {display:block}
 .sct_20 .sct_sns {position:absolute;bottom:10px;right:10px}