From c35abd05bea8aa0d2dc85bd724c6a789ac2608a6 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 23 Oct 2013 11:58:06 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EC=97=90=EC=84=9C=20=EC=B6=9C=EB=A0=A5=ED=95=AD?= =?UTF-8?q?=EB=AA=A9=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderlist.php | 96 ++++++++++++++++++++++-------------- css/admin.css | 4 +- 2 files changed, 61 insertions(+), 39 deletions(-) diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index e959f8ccd..b708c1111 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -209,27 +209,33 @@ $listall = '전체목록주문 전체 - ">주문번호 - ">주문자 - 주문상태 - 결제수단 - ">주문합계 - ">입금합계 - ">주문취소 + + ">주문번호 + 주문자 + 주문자전화 + 받는분 + 주문합계 + 입금합계 + 주문취소 쿠폰 - ">미수금 + 미수금 관리 - 주문일시 - ">회원ID - ">주문건 - ">누적건 + + + + 회원ID + 주문상품수 + 누적주문수 - 배송일시 + + 주문상태 + 결제수단 + 운송장번호 배송회사 - 운송장번호 + 배송일시 @@ -280,19 +286,16 @@ $listall = '전체목록" class="sound_only">주문번호 - + + + + - - - - - - - - + + @@ -304,24 +307,46 @@ $listall = '전체목록 - 주문일시 - + + + + + + + + 비회원 + + 건 건 - + + + + + + + + + + + + - + - + - - + - + @@ -332,14 +357,11 @@ $listall = '전체목록 --> - - - - + - + - + - diff --git a/css/admin.css b/css/admin.css index fa3622620..220cd3567 100644 --- a/css/admin.css +++ b/css/admin.css @@ -429,8 +429,8 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center} .scf_sms_cnt {display:block} /* 주문내역 */ -#sodr_list .td_odrnum2 {text-align:left} -#sodr_list .td_odrnum2 a {text-decoration:underline} +#sodr_list .td_odrnum2 {text-align:center} +#sodr_list .td_odrnum2 a {text-decoration:none;} #sodr_list .list_delino {text-align:center} /* 주문내역 수정 */ From f3a21709327a88297a38f1660e7ac7fe7ea9d7dd Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 23 Oct 2013 13:04:55 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=EC=87=BC?= =?UTF-8?q?=ED=95=91=EB=AA=B0:=20=EC=83=81=ED=92=88=20=EC=83=81=EC=84=B8?= =?UTF-8?q?=EB=B3=B4=EA=B8=B0=20fancyalert=20=EC=8A=A4=ED=83=80=EC=9D=BC?= =?UTF-8?q?=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 | 6 ++++-- js/jquery.fancyalert.js | 2 +- mobile/shop/item.php | 4 ++-- mobile/skin/shop/basic/style.css | 11 ++++++----- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/css/mobile_shop.css b/css/mobile_shop.css index 1589972d4..d99f8d38c 100644 --- a/css/mobile_shop.css +++ b/css/mobile_shop.css @@ -190,7 +190,9 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} /* 상품 상세보기 - 다른 상품 보기 */ #sit_siblings {margin:0 0 10px;padding:10px 10px 20px;border-bottom:1px solid #e9e9e9;text-align:center} -#sit_siblings h2 {position:absolute;font-size:0;line-height:0;content:""} +#sit_siblings h2 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden} +#sit_siblings a {display:inline-block;margin:0 10px} +#sit_siblings a span {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden} /* 상품 상세보기 하단 버튼 */ #sit_more {padding:0 0 0 1px} @@ -201,7 +203,7 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} /* 상품 상세보기 - 상품정보 */ #sit_inf {margin:0 0 1em;padding:1em 1em 2em;border-bottom:1px solid #e9e9e9} #sit_inf h2 {margin:0 0 1em} -#sit_inf h3 {position:absolute;font-size:0;line-height:0;content:""} +#sit_inf h3 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden} #sit_inf_basic {margin:0 0 1em} #sit_inf_explan {margin:0 0 1em} diff --git a/js/jquery.fancyalert.js b/js/jquery.fancyalert.js index 448d52029..5220b905e 100644 --- a/js/jquery.fancyalert.js +++ b/js/jquery.fancyalert.js @@ -14,7 +14,7 @@ function fancyalert(msg) box += "
"+msg; box += "
"; box += ""; - box += "
"; + box += "
"; box += ""; $("body").append(box); diff --git a/mobile/shop/item.php b/mobile/shop/item.php index 444f96bfe..fc5549a50 100644 --- a/mobile/shop/item.php +++ b/mobile/shop/item.php @@ -79,7 +79,7 @@ $sql = " select it_id, it_name from {$g5['g5_shop_item_table']} limit 1 "; $row = sql_fetch($sql); if ($row['it_id']) { - $prev_title = '이전상품보기 '.$row['it_name']; + $prev_title = '이전상품 '.$row['it_name'].''; $prev_href = ''; $prev_href2 = ''; } else { @@ -97,7 +97,7 @@ $sql = " select it_id, it_name from {$g5['g5_shop_item_table']} limit 1 "; $row = sql_fetch($sql); if ($row['it_id']) { - $next_title = '다음 상품 '.$row['it_name']; + $next_title = '다음 상품 '.$row['it_name'].''; $next_href = ''; $next_href2 = ''; } else { diff --git a/mobile/skin/shop/basic/style.css b/mobile/skin/shop/basic/style.css index 0dd58f880..f0402df59 100644 --- a/mobile/skin/shop/basic/style.css +++ b/mobile/skin/shop/basic/style.css @@ -79,7 +79,7 @@ /* ##### maint.(nn).skin.php, list.(nn).skin.php 공통 적용 끝 ##### */ /* 상품상세 */ -#info_content {width:100%} +#info_content {width:100%;height:100%} #menu_button {position:fixed;left:0;bottom:0;width:100%;height:40px;text-align:center} #menu_list {position:fixed;left:0;bottom:0} .menu_hidden {display:none} @@ -89,7 +89,8 @@ #loading_message img {position:relative;opacity:1.0} /* 알림 box */ -#fancyalert {display:table;z-index:10000;position:absolute;top:0;left:0;background-color:#282828;text-align:center;opacity: 0.8} -#fancyalert_inner {display:table-cell;width:100px;height:100px;vertical-align:middle;opacity:1.0} -#fancyalert_inner span {display:block;margin:0 auto;padding:30px;width:200px;background:#000;color:#f0f1f2} -#fancyalert_inner button {margin:15px 0 0;padding:10px 30px;border:0;background:#282828;color:#fff} \ No newline at end of file +#fancyalert {display:table;z-index:10000;position:absolute;top:0;left:0} +#fancyalert_bg {position:absolute;top:0;left:0;width:100%;height:100%;vertical-align:middle;background:#000;text-align:center;opacity: 0.7} +#fancyalert_inner {display:table-cell;position:relative;z-index:2;vertical-align:middle;text-align:center} +#fancyalert_inner span {display:block;margin:0 auto;padding:30px;width:200px;background:#1f1f1f;color:#f0f1f2} +#fancyalert_inner button {margin:15px 0 0;padding:10px 30px;border:0;background:#000;color:#fff} \ No newline at end of file From 2d716eba5663eb57d493a5f3bc8d012e9cdfe77a Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 23 Oct 2013 13:22:55 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90:=20#313=20=EC=87=BC=ED=95=91=EB=AA=B0?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EC=A3=BC=EB=AC=B8=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EB=A7=88=ED=81=AC=EC=97=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderlist.php | 41 ++++++++++++++++++------------------ css/admin.css | 4 +--- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index b708c1111..8ed6ac6a8 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -212,8 +212,8 @@ $listall = '전체목록">주문번호 --> ">주문번호 주문자 - 주문자전화 - 받는분 + 주문자전화 + 받는분 주문합계 입금합계 주문취소 @@ -226,16 +226,16 @@ $listall = '전체목록결제수단 --> 회원ID - 주문상품수 - 누적주문수 + 주문상품수 + 누적주문수 - 주문상태 - 결제수단 - 운송장번호 - 배송회사 - 배송일시 + 주문상태 + 결제수단 + 운송장번호 + 배송회사 + 배송일시 @@ -291,11 +291,12 @@ $listall = '전체목록/orderinquiryview.php?od_id=&uid=">
--> + - + - - + + @@ -313,26 +314,26 @@ $listall = '전체목록 --> - + 비회원 - 건 - 건 + 건 + 건 - + - + - + @@ -344,7 +345,7 @@ $listall = '전체목록 - + @@ -357,7 +358,7 @@ $listall = '전체목록 --> - + diff --git a/css/admin.css b/css/admin.css index 220cd3567..3cf4c23b7 100644 --- a/css/admin.css +++ b/css/admin.css @@ -429,9 +429,7 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center} .scf_sms_cnt {display:block} /* 주문내역 */ -#sodr_list .td_odrnum2 {text-align:center} -#sodr_list .td_odrnum2 a {text-decoration:none;} -#sodr_list .list_delino {text-align:center} +#sodr_list td {text-align:center !important} /* 주문내역 수정 */ .sodr_nonpay {color:#ff6600}