From 7753b5e04d3107a0ad48f803cacab7e48486c53c Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 25 Sep 2013 09:27:44 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=EA=B3=B5=ED=86=B5:=20select=20font-size=20?= =?UTF-8?q?=EC=A7=80=EC=A0=95,=20=EC=82=AC=EB=85=B8=EB=9D=BC=EA=B0=80?= =?UTF-8?q?=EB=85=B8=EB=9D=BC=EB=8B=98=20=EA=B1=B4=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 2 ++ css/default.css | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/css/admin.css b/css/admin.css index 385f9397e..a237f67bc 100644 --- a/css/admin.css +++ b/css/admin.css @@ -9,6 +9,7 @@ h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:dotum} article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block} header ul, nav ul, aside ul, footer ul {margin:0;padding:0;list-style:none} label, input, select, img {vertical-align:middle} +select {font-size:1em} input {margin:0;padding:0;border-radius:0;font-family:dotum} input[type=text], input[type=password], input[type=submit], input[type=image] {-webkit-appearance:none} button {border-radius:0;font-size:1em;-webkit-appearance:none} @@ -17,6 +18,7 @@ hr {display:none} pre {overflow-x:scroll;font-size:1.1em} a {color:#000;text-decoration:none} a:focus, a:hover, a:active {text-decoration:underline} + /* 헤딩 */ h1 {margin-bottom:20px;color:#333;font-size:1.5em;font-family:dotum;letter-spacing:-0.1em} h2 {font-size:1.2em} diff --git a/css/default.css b/css/default.css index 7ea3df1db..ae9baa76c 100644 --- a/css/default.css +++ b/css/default.css @@ -9,8 +9,10 @@ h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:dotum} article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block} header ul, nav ul, footer ul {margin:0;padding:0;list-style:none} label, input, select, img {vertical-align:middle} +select {font-size:1em} input {margin:0;padding:0;border-radius:0;font-family:dotum} -button {border-radius:0;font-size:1em} +input[type=text], input[type=password], input[type=submit], input[type=image] {-webkit-appearance:none} +button {border-radius:0;font-size:1em;-webkit-appearance:none} p {margin:0;padding:10px 0;line-height:1.7em;word-break:break-all} hr {display:none} pre {overflow-x:scroll;font-size:1.1em} From da4769964217ae1cc408deb86cc3c6cc69a9eab8 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 25 Sep 2013 11:15:04 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=83=81?= =?UTF-8?q?=ED=92=88=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20margin=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/mobile_shop.css | 2 +- head.sub.php | 2 +- mobile/skin/shop/basic/list.10.skin.php | 61 +++++++++++++++++++------ mobile/skin/shop/basic/style.css | 2 +- 4 files changed, 50 insertions(+), 17 deletions(-) diff --git a/css/mobile_shop.css b/css/mobile_shop.css index af4b37c74..b6188dfad 100644 --- a/css/mobile_shop.css +++ b/css/mobile_shop.css @@ -120,7 +120,7 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} /* 상품 목록 스킨 10 */ .sct_10 {padding:1em 0 0} -.sct_10 .sct_li {display:inline-block;margin:0 0.8em 1em 0;width:230px} +.sct_10 .sct_li {display:inline-block;margin:0 0.8em 1em 0} .sct_10 .sct_a {display:block;position:relative;text-decoration:none} .sct_10 .sct_a:focus, .sct_10 .sct_a:hover {text-decoration:none} diff --git a/head.sub.php b/head.sub.php index 8658e6c50..af116e7bb 100644 --- a/head.sub.php +++ b/head.sub.php @@ -34,7 +34,7 @@ header("Pragma: no-cache"); // HTTP/1.0 '.PHP_EOL; + echo ''.PHP_EOL; echo ''.PHP_EOL; echo ''.PHP_EOL; } diff --git a/mobile/skin/shop/basic/list.10.skin.php b/mobile/skin/shop/basic/list.10.skin.php index 9ab35e8ba..a24a135b7 100644 --- a/mobile/skin/shop/basic/list.10.skin.php +++ b/mobile/skin/shop/basic/list.10.skin.php @@ -6,16 +6,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 list_mod >= 2) { // 1줄 이미지 : 2개 이상 - if ($i%$this->list_mod == 0) $sct_last = ' sct_last'; // 줄 마지막 - else if ($i%$this->list_mod == 1) $sct_last = ' sct_clear'; // 줄 첫번째 - else $sct_last = ''; - } else { // 1줄 이미지 : 1개 - $sct_last = 'sct_clear'; - } - - if ($i == 1) { +for ($i=0; $row=sql_fetch_array($result); $i++) { + if ($i == 0) { if ($this->css) { echo "\n"; +if ($i > 0) echo "\n"; -if($i == 1) echo "

등록된 상품이 없습니다.

\n"; +if($i == 0) echo "

등록된 상품이 없습니다.

\n"; ?> - \ No newline at end of file + + + \ No newline at end of file diff --git a/mobile/skin/shop/basic/style.css b/mobile/skin/shop/basic/style.css index 3a23f704d..350d3f5eb 100644 --- a/mobile/skin/shop/basic/style.css +++ b/mobile/skin/shop/basic/style.css @@ -9,7 +9,7 @@ .sct_wrap h2 a {text-decoration:none} .sct_wrap_hdesc {float:left;margin:0;padding:0;color:#777;line-height:1em} -.sct {margin:0;padding:0;list-style:none;zoom:1} +.sct {margin:0;padding:0;list-style:none;zoom:1;clear:both} .sct:after {display:block;visibility:hidden;clear:both;content:""} .sct_li {position:relative} .sct_noitem {padding:100px 0;text-align:center} From 964870a27d1de9683e148d906ca2fd38bddaa095 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 25 Sep 2013 11:26:53 +0900 Subject: [PATCH 3/8] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=83=81?= =?UTF-8?q?=ED=92=88=20=EC=A0=95=EB=A0=AC=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=20=ED=8C=A8=EB=94=A9=20=EB=B0=A9=EC=8B=9D=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/mobile_shop.css | 44 ------------------------- mobile/skin/shop/basic/list.10.skin.php | 28 ++++++++-------- mobile/skin/shop/basic/style.css | 2 +- 3 files changed, 16 insertions(+), 58 deletions(-) diff --git a/css/mobile_shop.css b/css/mobile_shop.css index b6188dfad..9519d301e 100644 --- a/css/mobile_shop.css +++ b/css/mobile_shop.css @@ -102,51 +102,7 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} #sct_lst button.sct_lst_gallery span {background-position:-30px 0} #sct_lst button.sct_lst_gallery span.sct_lst_on {background-position:-30px -30px} -/* ##### maintype(nn).inc.php, list.skin.(nn).php 공통 적용 시작 ##### */ -/* 공통 */ -.sct_wrap {margin:0 0 2em;zoom:1} -.sct_wrap:after {display:block;visibility:hidden;clear:both;content:""} -.sct_wrap header {margin:0 0 1.8em;zoom:1} -.sct_wrap header:after {display:block;visibility:hidden;clear:both;content:""} -.sct_wrap h2 {float:left;margin:0 1.8em 0 0;padding:0;line-height:1em} -.sct_wrap h2 a {text-decoration:none} -.sct_wrap_hdesc {float:left;margin:0;padding:0;color:#777;line-height:1em} -.sct {margin:0;padding:0;list-style:none;zoom:1} -.sct:after {display:block;visibility:hidden;clear:both;content:""} -.sct_li {position:relative} -.sct_noitem {padding:100px 0;text-align:center} -.sct_nofile {padding:100px 0;text-align:center} - -/* 상품 목록 스킨 10 */ -.sct_10 {padding:1em 0 0} -.sct_10 .sct_li {display:inline-block;margin:0 0.8em 1em 0} -.sct_10 .sct_a {display:block;position:relative;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 b {display:block;margin:0 0 0.8em;font-weight:normal} -.sct_10 s {display:block} -.sct_10 .sct_cost {display:block;margin:0 0 1em;font-weight:bold} -.sct_10 .sct_icon {position:absolute;top:10px;left:-5px;margin:0 !important} -.sct_10 .sct_icon img {display:block} -.sct_10 .sct_sns {position:absolute;top:190px;right:20px} - -.sct_11 .sct_li {width:100%;border-bottom:1px solid #e9e9e9} -.sct_11 .sct_a {display:block;position:relative;padding:1em;text-decoration:none;zoom:1} -.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('../../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} -.sct_11 s {display:block} -.sct_11 .sct_cost {display:block;margin:0 0 0.8em;font-weight:bold} -.sct_11 .sct_icon {position:absolute;bottom:2em;left:-5px;margin:0 !important} -.sct_11 .sct_icon img {display:block} -.sct_11 .sct_sns {position:absolute;top:2em;right:2em} -/* ##### maintype(nn).inc.php, list.skin.(nn).php 공통 적용 끝 ##### */ /* 상품 상세보기 */ #sit {margin:0.5em 0;border-top:1px solid #e9e9e9} diff --git a/mobile/skin/shop/basic/list.10.skin.php b/mobile/skin/shop/basic/list.10.skin.php index a24a135b7..067067a24 100644 --- a/mobile/skin/shop/basic/list.10.skin.php +++ b/mobile/skin/shop/basic/list.10.skin.php @@ -81,32 +81,34 @@ $(window).resize(function() { function set_list_margin() { - var li_margin = 0; - if($("li.sct_li:first").data("margin-right") == undefined) { - li_margin = parseInt($("li.sct_li:first").css("margin-right")); - $("li.sct_li:first").data("margin-right", li_margin); + var li_padding = 0; + if($("li.sct_li:first").data("padding-right") == undefined) { + li_padding = parseInt($("li.sct_li:first").css("padding-right")); + $("li.sct_li:first").data("padding-right", li_padding); } else - li_margin = $("li.sct_li:first").data("margin-right"); + li_padding = $("li.sct_li:first").data("padding-right"); - $("li.sct_li").css("margin-left", 0).css("margin-right", li_margin); + $("li.sct_li").css("padding-left", 0).css("padding-right", li_padding); + $("li.sct_clear").removeClass("sct_clear"); var ul_width = parseInt($("ul.sct").width()); - var li_width = parseInt($("li.sct_li:first").outerWidth(true)); - var li_count = parseInt((ul_width + li_margin) / li_width); + var li_width = parseInt($("li.sct_li:first").outerWidth()); + var li_count = parseInt((ul_width + li_padding) / li_width); if(li_count == 0) return; var space = parseInt(ul_width % li_width); - if((space + li_margin) < li_width) { - var new_margin = parseInt((space + li_margin) / (li_count * 2)); + if((space + li_padding) < li_width) { + var new_padding = parseInt((space + li_padding) / (li_count * 2)); - if(new_margin > li_margin) - $("li.sct_li").css("margin-left", new_margin+"px").css("margin-right", new_margin); + if(new_padding > li_padding) + $("li.sct_li").css("padding-left", new_padding+"px").css("padding-right", new_padding); } - $("li.sct_li:nth-child("+li_count+"n)").css("margin-right", 0); + $("li.sct_li:nth-child("+li_count+"n)").css("padding-right", 0); + $("li.sct_li:nth-child("+li_count+"n+1)").addClass("sct_clear"); } \ No newline at end of file diff --git a/mobile/skin/shop/basic/style.css b/mobile/skin/shop/basic/style.css index 350d3f5eb..067e3a654 100644 --- a/mobile/skin/shop/basic/style.css +++ b/mobile/skin/shop/basic/style.css @@ -15,7 +15,7 @@ .sct_noitem {padding:100px 0;text-align:center} /* 상품 목록 스킨 10 */ -.sct_10 .sct_li {float:left;margin:0 25px 15px 0;} +.sct_10 .sct_li {float:left;padding: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} From 69d6b7a0b55cb0545cf5f467aa74abddf5a3a358 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 25 Sep 2013 11:49:12 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20gnb=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=EB=AA=85=20=EC=A4=91=20=EC=BA=90=EC=89=AC?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20>=20=EC=BA=90=EC=8B=9C=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/admin.menu100.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/admin.menu100.php b/adm/admin.menu100.php index 1347f9567..cc91af050 100644 --- a/adm/admin.menu100.php +++ b/adm/admin.menu100.php @@ -6,7 +6,7 @@ $menu['menu100'] = array ( array('100300', '메일 테스트', G5_ADMIN_URL.'/sendmail_test.php', 'cf_mailtest'), //array('100400', '버전정보', G5_ADMIN_URL.'/version.php', 'cf_version'), array('100800', '세션파일 일괄삭제',G5_ADMIN_URL.'/session_file_delete.php', 'cf_session', 1), - array('100900', '캐쉬파일 일괄삭제',G5_ADMIN_URL.'/cache_file_delete.php', 'cf_cache', 1), + array('100900', '캐시파일 일괄삭제',G5_ADMIN_URL.'/cache_file_delete.php', 'cf_cache', 1), array('100910', '캡챠파일 일괄삭제',G5_ADMIN_URL.'/gcaptcha_file_delete.php', 'cf_captcha', 1), array('100920', '썸네일파일 일괄삭제',G5_ADMIN_URL.'/thumbnail_file_delete.php', 'cf_thumbnail', 1), array('100930', '네이버 신디케이션 핑',G5_SYNDI_URL.'/ping.php', 'cf_syndi_ping', 1), From 13925904f27160f8e6b6e81c24b2a043f79b93c0 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 25 Sep 2013 14:47:55 +0900 Subject: [PATCH 5/8] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=A0=84=ED=99=98=EC=97=90=20=EB=94=B0=EB=A5=B8=20?= =?UTF-8?q?=EC=83=81=ED=92=88=20=EC=A0=95=EB=A0=AC=20=ED=94=8C=EB=9F=AC?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/shop.mobile.list.js | 61 +++++++++++++++++++++++++ mobile/skin/shop/basic/list.10.skin.php | 44 ++---------------- mobile/skin/shop/basic/main.10.skin.php | 31 ++++++------- 3 files changed, 80 insertions(+), 56 deletions(-) create mode 100644 js/shop.mobile.list.js diff --git a/js/shop.mobile.list.js b/js/shop.mobile.list.js new file mode 100644 index 000000000..714bca62d --- /dev/null +++ b/js/shop.mobile.list.js @@ -0,0 +1,61 @@ +(function($) { + $.fn.itemList = function(element, clear) + { + var cfg = { + element: "li.sct_li", + clear: "sct_clear" + }; + + if(typeof element == "object") + cfg = $.extend( cfg, element ); + else { + if(element) + cfg = $.extend( cfg, { element: element } ); + if(clear) + cfg = $.extend( cfg, { clear: clear } ); + } + + var $element = this.find(cfg.element); + var $this = this; + + function item_arrange() + { + var $el = $element.filter(":first"); + var padding = 0; + if($el.data("padding-right") == undefined) { + padding = parseInt($el.css("padding-right")); + $el.data("padding-right", padding); + } + else + padding = $el.data("padding-right"); + + $element.css("padding-left", 0).css("padding-right", padding); + $element.filter("."+cfg.clear).removeClass(cfg.clear); + + var wrap_width = parseInt($this.width()); + var item_width = parseInt($el.outerWidth()); + var line_count = parseInt((wrap_width + padding) / item_width); + + if(line_count == 0) + return; + + var space = parseInt(wrap_width % item_width); + + if((space + padding) < item_width) { + var new_padding = parseInt((space + padding) / (line_count * 2)); + + if(new_padding > padding) + $element.css("padding-left", new_padding+"px").css("padding-right", new_padding); + } + + $element.filter(":nth-child("+line_count+"n)").css("padding-right", 0); + $element.filter(":nth-child("+line_count+"n+1)").addClass(cfg.clear); + } + + item_arrange(); + + $(window).resize(function() { + item_arrange(); + }); + } +}(jQuery)); \ No newline at end of file diff --git a/mobile/skin/shop/basic/list.10.skin.php b/mobile/skin/shop/basic/list.10.skin.php index 067067a24..c9efd9804 100644 --- a/mobile/skin/shop/basic/list.10.skin.php +++ b/mobile/skin/shop/basic/list.10.skin.php @@ -3,15 +3,16 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?> + css) { - echo "