firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

쇼핑몰: SNS 아이콘 위치 및 상품 목록 마크업 스타일 점검 중 merge 충돌 수정

Browse Source
This commit is contained in:
whitedot
2013-11-26 11:10:57 +09:00
parent 7fb441873d 9f7f604042
commit 0b61cd3058
19 changed files with 46 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
skin/shop/basic/list.10.skin.php
View File

@ -61,7 +61,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
echo "<div class=\"sct_cost\">\n";
if ($this->view_it_cust_price) {
if ($this->view_it_cust_price && $row['it_cust_price']) {
echo "<strike>".display_price($row['it_cust_price'])."</strike> &gt;\n";
}

4
skin/shop/basic/list.20.skin.php
View File

@ -57,7 +57,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
echo "<div class=\"sct_cost\">\n";
if ($this->view_it_cust_price) {
if ($this->view_it_cust_price && $row['it_cust_price']) {
echo "<strike>".display_price($row['it_cust_price'])."</strike> &gt;\n";
}
@ -88,4 +88,4 @@ if ($i > 1) echo "</ul>\n";
if($i == 1) echo "<p class=\"sct_noitem\">등록된 상품이 없습니다.</p>\n";
?>
<!-- } 상품진열 20 끝 -->
<!-- } 상품진열 20 끝 -->

2
skin/shop/basic/list.30.skin.php
View File

@ -44,7 +44,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
echo "<b>".stripslashes($row['it_name'])."</b>\n";
}
if ($this->view_it_cust_price) {
if ($this->view_it_cust_price && $row['it_cust_price']) {
echo "<span class=\"sct_cost\">".display_price($row['it_cust_price'])."</span>\n";
}

2
skin/shop/basic/list.40.skin.php
View File

@ -46,7 +46,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
echo "<b>".stripslashes($row['it_name'])."</b>\n";
}
if ($this->view_it_cust_price) {
if ($this->view_it_cust_price && $row['it_cust_price']) {
echo "<span class=\"sct_cost\">".display_price($row['it_cust_price'])."</span>\n";
}

8
skin/shop/basic/main.10.skin.php
View File

@ -26,11 +26,11 @@ 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->href) {
@ -42,7 +42,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
}
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_txt\">\n";
}
if ($this->view_it_name) {
@ -61,7 +61,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
echo "<div class=\"sct_cost\">\n";
if ($this->view_it_cust_price) {
if ($this->view_it_cust_price && $row['it_cust_price']) {
echo "<strike>".display_price($row['it_cust_price'])."</strike> &gt;\n";
}

2
skin/shop/basic/main.20.skin.php
View File

@ -55,7 +55,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
echo "<b>".stripslashes($row['it_name'])."</b>\n";
}
if ($this->view_it_cust_price) {
if ($this->view_it_cust_price && $row['it_cust_price']) {
echo "<span class=\"sct_cost\">".display_price($row['it_cust_price'])."</span>\n";
}

2
skin/shop/basic/main.30.skin.php
View File

@ -51,7 +51,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
echo "<b>".stripslashes($row['it_name'])."</b>\n";
}
if ($this->view_it_cust_price) {
if ($this->view_it_cust_price && $row['it_cust_price']) {
echo "<span class=\"sct_cost\">".display_price($row['it_cust_price'])."</span>\n";
}

2
skin/shop/basic/main.40.skin.php
View File

@ -55,7 +55,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
echo "<b>".stripslashes($row['it_name'])."</b>\n";
}
if ($this->view_it_cust_price) {
if ($this->view_it_cust_price && $row['it_cust_price']) {
echo "<span class=\"sct_cost\">".display_price($row['it_cust_price'])."</span>\n";
}

2
skin/shop/basic/main.50.skin.php
View File

@ -54,7 +54,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
echo "<b>".stripslashes($row['it_name'])."</b>\n";
}
if ($this->view_it_cust_price) {
if ($this->view_it_cust_price && $row['it_cust_price']) {
echo "<span class=\"sct_cost\">".display_price($row['it_cust_price'])."</span>\n";
}