From 2a9f144e0d963904dc0093144198445df3c09a86 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 7 Nov 2013 09:59:36 +0900 Subject: [PATCH 01/13] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=ED=96=89?= =?UTF-8?q?=EB=B0=B0=EA=B2=BD=EC=83=89=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/css/admin.css b/css/admin.css index 93b8ad061..6f2cc9982 100644 --- a/css/admin.css +++ b/css/admin.css @@ -245,9 +245,8 @@ tbody td {border:1px solid #ececec} tfoot th, tfoot td {padding:10px 0;border:1px solid #c1d1d5;background:#d7e0e2} tfoot th {} tfoot td {font-weight:bold;text-align:center} -table .tr_bg0 {background:#fff} -table .tr_bg1 {background:#f5fbe8} -table .tr_bg1 td {border-color:#e4f1c6} +table .tr_bg1 {background:#f5f0d6} +table .tr_bg1 td {border-color:#e9e3c4} .tbl_wrap {margin:0 0 10px;padding:0 20px} .tbl_wrap td.empty_table {padding:100px 0;text-align:center} @@ -384,6 +383,7 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center} .txt_true {color:#e8180c} .txt_false {color:#ccc} + .banner_or_img {margin:10px 0 0} .banner_or_img button {display:block;margin:5px 0 0} .txt_active {color:#5d910b} @@ -624,15 +624,15 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right} /* 새창 기본 스타일 */ .new_win {} -.new_win h1 {margin-bottom:20px;padding:0 20px;min-width:480px;height:60px;border-top:2px solid #484848;border-bottom:1px solid #e9e9e9;background:#fff;font-size:1.2em;line-height:5em} +.new_win h1 {margin-bottom:20px;padding:0 20px;min-width:320px/* 적정값으로 변경하여 사용하세요. */;height:60px;border-top:2px solid #484848;border-bottom:1px solid #e9e9e9;background:#fff;font-size:1.2em;line-height:5em} .new_win h2 {margin:0 20px 10px} .new_win_ul {margin:-20px 0 20px 0;padding:0 0 0 20px;border-bottom:1px solid #515151;background:#484848;list-style:none;zoom:1} .new_win_ul:after {display:block;visibility:hidden;clear:both;content:""} .new_win_ul li {float:left;margin-left:-1px} .new_win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #595959;border-left:1px solid #595959;color:#fff;font-family:dotum;font-weight:bold;text-decoration:none} -.new_win_desc {margin:0 20px} -.new_win .anchor {margin:0 20px 5px} +.new_win_desc {margin:0 auto;width:93%} +.new_win .anchor {margin:0 auto 5px;width:93%} .new_win .tbl_wrap {margin:0 20px 20px;padding:0} .new_win .local_sch, .new_win .local_cmd, .new_win .local_desc01, .new_win .local_desc02, .new_win .local_ov {min-width:480px} From fee3813b507fef86403b06f98fce22d8605f5bba Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 7 Nov 2013 10:30:48 +0900 Subject: [PATCH 02/13] =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20tr=5Fbg=20?= =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=20=EC=B2=98=EB=A6=AC=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EA=B0=84=EC=86=8C=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/auth_list.php | 4 ++-- adm/board_list.php | 4 ++-- adm/boardgroup_list.php | 4 ++-- adm/boardgroupmember_list.php | 4 ++-- adm/mail_list.php | 4 ++-- adm/mail_select_list.php | 4 ++-- adm/member_list.php | 4 ++-- adm/point_list.php | 4 ++-- adm/poll_list.php | 4 ++-- adm/popular_list.php | 4 ++-- adm/visit_browser.php | 4 ++-- adm/visit_date.php | 4 ++-- adm/visit_domain.php | 4 ++-- adm/visit_hour.php | 4 ++-- adm/visit_list.php | 6 +++--- adm/visit_month.php | 4 ++-- adm/visit_os.php | 4 ++-- adm/visit_week.php | 4 ++-- adm/visit_year.php | 4 ++-- 19 files changed, 39 insertions(+), 39 deletions(-) diff --git a/adm/auth_list.php b/adm/auth_list.php index dab3c51f7..9f5758b56 100644 --- a/adm/auth_list.php +++ b/adm/auth_list.php @@ -103,9 +103,9 @@ $colspan = 5; continue; } - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/board_list.php b/adm/board_list.php index a97f3b3cb..dd7ed5eb2 100644 --- a/adm/board_list.php +++ b/adm/board_list.php @@ -119,10 +119,10 @@ $colspan = 16; $one_update = '수정'; $one_copy = '복사'; - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/boardgroup_list.php b/adm/boardgroup_list.php index 2f727e233..673485eb3 100644 --- a/adm/boardgroup_list.php +++ b/adm/boardgroup_list.php @@ -125,10 +125,10 @@ $colspan = 11; $s_upd = '수정'; - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/boardgroupmember_list.php b/adm/boardgroupmember_list.php index a21918493..37549e711 100644 --- a/adm/boardgroupmember_list.php +++ b/adm/boardgroupmember_list.php @@ -110,9 +110,9 @@ $colspan = 7; $mb_nick = get_sideview($row['mb_id'], $row['mb_nick'], $row['mb_email'], $row['mb_homepage']); - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/mail_list.php b/adm/mail_list.php index dc1431731..2ac9d1237 100644 --- a/adm/mail_list.php +++ b/adm/mail_list.php @@ -57,10 +57,10 @@ $colspan = 7; $num = number_format($total_count - ($page - 1) * $config['cf_page_rows'] - $i); - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/mail_select_list.php b/adm/mail_select_list.php index 7cce2e4fd..e95ca52a7 100644 --- a/adm/mail_select_list.php +++ b/adm/mail_select_list.php @@ -96,9 +96,9 @@ include_once('./admin.head.php'); $ma_list .= $cr . $row['mb_email'] . "||" . $row['mb_id'] . "||" . $row['mb_name'] . "||" . $row['mb_nick'] . "||" . $row['mb_datetime']; $cr = "\n"; - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/member_list.php b/adm/member_list.php index b7ddc81e6..96bdd8fe9 100644 --- a/adm/member_list.php +++ b/adm/member_list.php @@ -187,7 +187,7 @@ $colspan = 15; $address = $row['mb_zip1'] ? $row['mb_addr1'].' '.$row['mb_addr2'] : ''; - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); switch($row['mb_certify']) { case 'hp': @@ -209,7 +209,7 @@ $colspan = 15; } ?> - > + diff --git a/adm/point_list.php b/adm/point_list.php index 7c6bde3b2..a6ea202ea 100644 --- a/adm/point_list.php +++ b/adm/point_list.php @@ -151,10 +151,10 @@ function point_clear() if($row['po_expired'] == 1) $expr = ' txt_expired'; - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/poll_list.php b/adm/poll_list.php index 5320f2307..40070ed9a 100644 --- a/adm/poll_list.php +++ b/adm/poll_list.php @@ -105,10 +105,10 @@ $colspan = 7; $s_mod = '수정'; //$s_del = '삭제'; - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/popular_list.php b/adm/popular_list.php index 26b5c9773..bf5b2feb4 100644 --- a/adm/popular_list.php +++ b/adm/popular_list.php @@ -112,10 +112,10 @@ var list_delete_php = 'popular_list.php'; for ($i=0; $row=sql_fetch_array($result); $i++) { $word = get_text($row['pp_word']); - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/visit_browser.php b/adm/visit_browser.php index d6496ab1f..3c1656a6a 100644 --- a/adm/visit_browser.php +++ b/adm/visit_browser.php @@ -65,10 +65,10 @@ while ($row=sql_fetch_array($result)) { $rate = ($count / $sum_count * 100); $s_rate = number_format($rate, 1); - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/visit_date.php b/adm/visit_date.php index 88bebbc7f..9f180df30 100644 --- a/adm/visit_date.php +++ b/adm/visit_date.php @@ -56,10 +56,10 @@ for ($i=0; $row=sql_fetch_array($result); $i++) { $rate = ($count / $sum_count * 100); $s_rate = number_format($rate, 1); - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > +
diff --git a/adm/visit_domain.php b/adm/visit_domain.php index eb5bb60b6..2c3f9c919 100644 --- a/adm/visit_domain.php +++ b/adm/visit_domain.php @@ -76,9 +76,9 @@ while ($row=sql_fetch_array($result)) { $rate = ($count / $sum_count * 100); $s_rate = number_format($rate, 1); - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/visit_hour.php b/adm/visit_hour.php index 83aef104f..5e6cb1922 100644 --- a/adm/visit_hour.php +++ b/adm/visit_hour.php @@ -55,9 +55,9 @@ for ($i=0; $row=sql_fetch_array($result); $i++) { $rate = ($count / $sum_count * 100); $s_rate = number_format($rate, 1); - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > +
diff --git a/adm/visit_list.php b/adm/visit_list.php index 090ded735..200cda1b5 100644 --- a/adm/visit_list.php +++ b/adm/visit_list.php @@ -78,9 +78,9 @@ $result = sql_query($sql); if ($brow == '기타') { $brow = ''.$brow.''; } if ($os == '기타') { $os = ''.$os.''; } - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + @@ -98,7 +98,7 @@ $result = sql_query($sql);
- > +
diff --git a/adm/visit_os.php b/adm/visit_os.php index a5752e494..936237a72 100644 --- a/adm/visit_os.php +++ b/adm/visit_os.php @@ -69,10 +69,10 @@ while ($row=sql_fetch_array($result)) { $rate = ($count / $sum_count * 100); $s_rate = number_format($rate, 1); - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/visit_week.php b/adm/visit_week.php index 917652ff1..d554d9be9 100644 --- a/adm/visit_week.php +++ b/adm/visit_week.php @@ -52,10 +52,10 @@ for ($i=0; $row=sql_fetch_array($result); $i++) { $rate = ($count / $sum_count * 100); $s_rate = number_format($rate, 1); - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > +
diff --git a/adm/visit_year.php b/adm/visit_year.php index 181948564..a176ad681 100644 --- a/adm/visit_year.php +++ b/adm/visit_year.php @@ -57,10 +57,10 @@ for ($i=0; $row=sql_fetch_array($result); $i++) { $rate = ($count / $sum_count * 100); $s_rate = number_format($rate, 1); - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > +
From a36680783c3ed9212fa19f662c50ead89626797d Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 7 Nov 2013 10:38:30 +0900 Subject: [PATCH 03/13] =?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=ED=96=89=EA=B5=AC=EB=B6=84=20=EB=B0=B0?= =?UTF-8?q?=EA=B2=BD=EC=83=89=20=EC=97=90=EC=8A=A4=ED=81=AC=EB=A1=9C=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderlist.php | 2 +- css/admin.css | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index fb75bb50b..496835b74 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -287,7 +287,7 @@ $listall = '전체목록 diff --git a/css/admin.css b/css/admin.css index 18f7a9d02..c21ed00fe 100644 --- a/css/admin.css +++ b/css/admin.css @@ -255,8 +255,12 @@ tfoot th, tfoot td {padding:10px 0;border:1px solid #c1d1d5;background:#d7e0e2} tfoot th {} tfoot td {font-weight:bold;text-align:center} table .tr_bg0 {background:#fff} -table .tr_bg1 {background:#f5fbe8} -table .tr_bg1 td {border-color:#e4f1c6} +table .tr_bg1 {background:#f0f3f7} + +table .tr_bg0escrow {background:#f3f7e7} +table .tr_bg0escrow td {border-color:#e4efbb} +table .tr_bg1escrow {background:#edf1e3} +table .tr_bg1escrow td {border-color:#dce9ad} .tbl_wrap {margin:0 0 10px;padding:0 20px} .tbl_wrap td.empty_table {padding:100px 0;text-align:center} From 848e9ff54fc97192bb4203ada62815d336f3c4ca Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 7 Nov 2013 10:38:51 +0900 Subject: [PATCH 04/13] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=ED=96=89?= =?UTF-8?q?=EA=B5=AC=EB=B6=84=20=EB=B0=B0=EA=B2=BD=EC=83=89=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/admin.css b/css/admin.css index 6f2cc9982..8ac3a4137 100644 --- a/css/admin.css +++ b/css/admin.css @@ -245,8 +245,8 @@ tbody td {border:1px solid #ececec} tfoot th, tfoot td {padding:10px 0;border:1px solid #c1d1d5;background:#d7e0e2} tfoot th {} tfoot td {font-weight:bold;text-align:center} -table .tr_bg1 {background:#f5f0d6} -table .tr_bg1 td {border-color:#e9e3c4} +table .tr_bg0 {background:#fff} +table .tr_bg1 {background:#f0f3f7} .tbl_wrap {margin:0 0 10px;padding:0 20px} .tbl_wrap td.empty_table {padding:100px 0;text-align:center} From 35a7ab09c1f20f8ed7881875d5d7cc694b8e2bf2 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 7 Nov 2013 10:41:54 +0900 Subject: [PATCH 05/13] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EA=B4=80=EB=A6=AC=20=EB=AA=A9=EB=A1=9D=20=ED=96=89?= =?UTF-8?q?=EA=B5=AC=EB=B6=84=20=EB=B0=B0=EA=B2=BD=EC=83=89=20=EB=A7=88?= =?UTF-8?q?=ED=81=AC=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/member_list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/member_list.php b/adm/member_list.php index 96bdd8fe9..63595fd2c 100644 --- a/adm/member_list.php +++ b/adm/member_list.php @@ -235,7 +235,7 @@ $colspan = 15; - > +
Yes':'No'; ?> value="1"> From 8cc75650acb2c5fe89524ad7bb3e7be1a9ab7dc5 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 7 Nov 2013 10:43:46 +0900 Subject: [PATCH 06/13] =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20tr=5Fbg=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=BD=94=EB=93=9C=20=EA=B0=84=EC=86=8C?= =?UTF-8?q?=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/bannerlist.php | 4 ++-- adm/shop_admin/categorylist.php | 4 ++-- adm/shop_admin/contentlist.php | 4 ++-- adm/shop_admin/couponlist.php | 4 ++-- adm/shop_admin/deliverylist.php | 4 ++-- adm/shop_admin/faqlist.php | 4 ++-- adm/shop_admin/faqmasterlist.php | 4 ++-- adm/shop_admin/itemeventlist.php | 4 ++-- adm/shop_admin/itemlist.php | 4 ++-- adm/shop_admin/itemqalist.php | 4 ++-- adm/shop_admin/itemsellrank.php | 4 ++-- adm/shop_admin/itemstocklist.php | 4 ++-- adm/shop_admin/itemtypelist.php | 4 ++-- adm/shop_admin/itemuselist.php | 4 ++-- adm/shop_admin/newwinlist.php | 4 ++-- adm/shop_admin/optionstocklist.php | 5 ++--- adm/shop_admin/orderstatuslist.php | 4 ++-- adm/shop_admin/personalpaylist.php | 4 ++-- adm/shop_admin/sendcostlist.php | 4 ++-- adm/shop_admin/wishlist.php | 4 ++-- 20 files changed, 40 insertions(+), 41 deletions(-) diff --git a/adm/shop_admin/bannerlist.php b/adm/shop_admin/bannerlist.php index 449bee24a..98fcaa736 100644 --- a/adm/shop_admin/bannerlist.php +++ b/adm/shop_admin/bannerlist.php @@ -74,10 +74,10 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함 $bn_begin_time = substr($row['bn_begin_time'], 2, 14); $bn_end_time = substr($row['bn_end_time'], 2, 14); - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/shop_admin/categorylist.php b/adm/shop_admin/categorylist.php index d9754d5b1..561135702 100644 --- a/adm/shop_admin/categorylist.php +++ b/adm/shop_admin/categorylist.php @@ -144,9 +144,9 @@ $listall = '
전체목록 - > + diff --git a/adm/shop_admin/contentlist.php b/adm/shop_admin/contentlist.php index e24e304b3..e0e41a40b 100644 --- a/adm/shop_admin/contentlist.php +++ b/adm/shop_admin/contentlist.php @@ -44,9 +44,9 @@ $result = sql_query($sql); - > + diff --git a/adm/shop_admin/couponlist.php b/adm/shop_admin/couponlist.php index e4b11ddce..d7914a7fa 100644 --- a/adm/shop_admin/couponlist.php +++ b/adm/shop_admin/couponlist.php @@ -127,10 +127,10 @@ $colspan = 8; $tmp = sql_fetch($sql); $used_count = $tmp['cnt']; - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/shop_admin/deliverylist.php b/adm/shop_admin/deliverylist.php index 44924c601..bb4da94ba 100644 --- a/adm/shop_admin/deliverylist.php +++ b/adm/shop_admin/deliverylist.php @@ -157,9 +157,9 @@ $listall = '전체목록 - > + diff --git a/adm/shop_admin/faqlist.php b/adm/shop_admin/faqlist.php index 45f2cfb4c..6748c29a0 100644 --- a/adm/shop_admin/faqlist.php +++ b/adm/shop_admin/faqlist.php @@ -60,10 +60,10 @@ $result = sql_query($sql); $num = $i + 1; - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/shop_admin/faqmasterlist.php b/adm/shop_admin/faqmasterlist.php index 9031f5ef2..75d882664 100644 --- a/adm/shop_admin/faqmasterlist.php +++ b/adm/shop_admin/faqmasterlist.php @@ -56,9 +56,9 @@ $result = sql_query($sql); $sql1 = " select COUNT(*) as cnt from {$g5['g5_shop_faq_table']} where fm_id = '{$row['fm_id']}' "; $row1 = sql_fetch($sql1); $cnt = $row1['cnt']; - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/shop_admin/itemeventlist.php b/adm/shop_admin/itemeventlist.php index 2fa2a2367..8633eb5cc 100644 --- a/adm/shop_admin/itemeventlist.php +++ b/adm/shop_admin/itemeventlist.php @@ -153,10 +153,10 @@ if (isset($ev_set)) { and ev_id = '$ev_id' "; $ev = sql_fetch($sql); - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/shop_admin/itemlist.php b/adm/shop_admin/itemlist.php index 64462751b..44db9154a 100644 --- a/adm/shop_admin/itemlist.php +++ b/adm/shop_admin/itemlist.php @@ -164,9 +164,9 @@ $listall = '전체목록 - > + diff --git a/adm/shop_admin/itemqalist.php b/adm/shop_admin/itemqalist.php index 0dd6e36e3..b43ba1be3 100644 --- a/adm/shop_admin/itemqalist.php +++ b/adm/shop_admin/itemqalist.php @@ -125,9 +125,9 @@ $listall = '전체목록 - > + diff --git a/adm/shop_admin/itemsellrank.php b/adm/shop_admin/itemsellrank.php index 7cb3c4cb1..5b794b314 100644 --- a/adm/shop_admin/itemsellrank.php +++ b/adm/shop_admin/itemsellrank.php @@ -126,9 +126,9 @@ $listall = '전체목록 - > + diff --git a/adm/shop_admin/itemstocklist.php b/adm/shop_admin/itemstocklist.php index 0fea56ebd..15b634e19 100644 --- a/adm/shop_admin/itemstocklist.php +++ b/adm/shop_admin/itemstocklist.php @@ -143,10 +143,10 @@ $listall = '전체목록 - > + diff --git a/adm/shop_admin/itemtypelist.php b/adm/shop_admin/itemtypelist.php index 096d0c5ca..1ebee007c 100644 --- a/adm/shop_admin/itemtypelist.php +++ b/adm/shop_admin/itemtypelist.php @@ -142,9 +142,9 @@ $listall = '전체목록 - > + diff --git a/adm/shop_admin/itemuselist.php b/adm/shop_admin/itemuselist.php index d85cff554..595442f12 100644 --- a/adm/shop_admin/itemuselist.php +++ b/adm/shop_admin/itemuselist.php @@ -125,10 +125,10 @@ $listall = '전체목록 - > + diff --git a/adm/shop_admin/newwinlist.php b/adm/shop_admin/newwinlist.php index 310d81022..efc800cc9 100644 --- a/adm/shop_admin/newwinlist.php +++ b/adm/shop_admin/newwinlist.php @@ -44,9 +44,9 @@ $result = sql_query($sql); - > + diff --git a/adm/shop_admin/optionstocklist.php b/adm/shop_admin/optionstocklist.php index fccd6828f..59e916faa 100644 --- a/adm/shop_admin/optionstocklist.php +++ b/adm/shop_admin/optionstocklist.php @@ -168,10 +168,9 @@ $listall = '전체목록 재고부족 '; } - $tr_bg = ''; - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/shop_admin/orderstatuslist.php b/adm/shop_admin/orderstatuslist.php index 61d1bcd13..6ea25bbeb 100644 --- a/adm/shop_admin/orderstatuslist.php +++ b/adm/shop_admin/orderstatuslist.php @@ -141,9 +141,9 @@ $listall = '전체목록 - > + diff --git a/adm/shop_admin/personalpaylist.php b/adm/shop_admin/personalpaylist.php index ee23cd2ca..8f1b447c0 100644 --- a/adm/shop_admin/personalpaylist.php +++ b/adm/shop_admin/personalpaylist.php @@ -111,10 +111,10 @@ $colspan = 8; else $od_id = ' '; - $tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"'; + $tr_bg = 'tr_bg'.($i%2); ?> - > + diff --git a/adm/shop_admin/sendcostlist.php b/adm/shop_admin/sendcostlist.php index 35641cbcb..b1be3a733 100644 --- a/adm/shop_admin/sendcostlist.php +++ b/adm/shop_admin/sendcostlist.php @@ -58,9 +58,9 @@ include_once (G5_ADMIN_PATH.'/admin.head.php'); - > + diff --git a/adm/shop_admin/wishlist.php b/adm/shop_admin/wishlist.php index 104d442ed..46665f357 100644 --- a/adm/shop_admin/wishlist.php +++ b/adm/shop_admin/wishlist.php @@ -103,9 +103,9 @@ $listall = '전체목록 - > + From d17fa482ed8e4230e842dff72f5ccd483114e724 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 7 Nov 2013 11:59:56 +0900 Subject: [PATCH 07/13] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EB=82=B4=EC=97=AD?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EB=B0=B0=EC=86=A1=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EC=8B=9C=20=EC=9E=AC=EA=B3=A0=20=EB=B0=98=EC=98=81=20=EB=90=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8D=98=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderlistupdate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/orderlistupdate.php b/adm/shop_admin/orderlistupdate.php index 353e9a429..72ea8af0b 100644 --- a/adm/shop_admin/orderlistupdate.php +++ b/adm/shop_admin/orderlistupdate.php @@ -111,7 +111,7 @@ function order_update_delivery($od_id, $mb_id, $change_status, $delivery) subtract_io_stock($row['it_id'], $row['ct_qty'], $row['io_id'], $row['io_type']); $stock_use = 1; - $sql = " update {$g5['g5_shop_cart_table']} set ct_stock_use = '$stock_use' where od_id = '{$row['ct_id']}' "; + $sql = " update {$g5['g5_shop_cart_table']} set ct_stock_use = '$stock_use' where ct_id = '{$row['ct_id']}' "; sql_query($sql); } } From 0f505298b701bd74fd2e2b33c703ce3b3de60f53 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 7 Nov 2013 13:13:59 +0900 Subject: [PATCH 08/13] =?UTF-8?q?=EC=97=90=EC=8A=A4=ED=81=AC=EB=A1=9C=20?= =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EB=A5=BC=20=EC=82=AC=EC=9A=A9=ED=95=A0=20?= =?UTF-8?q?=EB=95=8C=EB=A7=8C=20=EC=A3=BC=EB=AC=B8=EB=82=B4=EC=97=AD=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=97=90=20=EC=A0=81=EC=9A=A9?= =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index 496835b74..ef87ff8b6 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -185,8 +185,10 @@ $listall = '전체목록포인트주문 > + > +
@@ -286,7 +288,7 @@ $listall = '전체목록 From 5eb054b5b563d7a8f71ce75dca2862de109de02a Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 7 Nov 2013 13:39:29 +0900 Subject: [PATCH 09/13] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=A3=BC?= =?UTF-8?q?=EB=AC=B8=EC=83=81=EC=84=B8=20=EA=B2=B0=EC=A0=9C=EA=B8=88?= =?UTF-8?q?=EC=95=A1=20=EC=9E=85=EB=A0=A5=EC=8B=9C=20=EA=B2=B0=EC=A0=9C?= =?UTF-8?q?=EA=B8=88=EC=95=A1=EA=B3=BC=20=EB=AF=B8=EC=88=98=EA=B8=88?= =?UTF-8?q?=EC=9D=B4=20=EB=8D=94=ED=95=B4=EC=A7=80=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index e8acceddc..684c8dc80 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -927,7 +927,7 @@ function chk_receipt_price() { var chk = document.getElementById("od_receipt_chk"); var price = document.getElementById("od_receipt_price"); - price.value = chk.checked ? chk.value : price.defaultValue; + price.value = chk.checked ? (parseInt(chk.value) + parseInt(price.defaultValue)) : price.defaultValue; } From 0ed8745eff71154c7a5a4bb045544d7197dd65c3 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 7 Nov 2013 14:19:49 +0900 Subject: [PATCH 10/13] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=83=81?= =?UTF-8?q?=ED=92=88=EC=A0=95=EB=B3=B4=EC=97=90=EC=84=9C=20=EB=B6=80?= =?UTF-8?q?=EB=AA=A8=EC=B0=BD=20url=20=EB=B3=80=EA=B2=BD=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/skin/shop/basic/iteminfo.relation.skin.php | 3 ++- mobile/skin/shop/basic/itemqa.skin.php | 3 ++- mobile/skin/shop/basic/itemuse.skin.php | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mobile/skin/shop/basic/iteminfo.relation.skin.php b/mobile/skin/shop/basic/iteminfo.relation.skin.php index 681b0fe9e..48d3d01c7 100644 --- a/mobile/skin/shop/basic/iteminfo.relation.skin.php +++ b/mobile/skin/shop/basic/iteminfo.relation.skin.php @@ -22,8 +22,9 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 \ No newline at end of file diff --git a/mobile/skin/shop/basic/itemqa.skin.php b/mobile/skin/shop/basic/itemqa.skin.php index c48fbe95d..84fb0ef4e 100644 --- a/mobile/skin/shop/basic/itemqa.skin.php +++ b/mobile/skin/shop/basic/itemqa.skin.php @@ -126,8 +126,9 @@ $(function(){ }); $("a#itemqa_list").on("click", function() { - opener.location.href = this.href; + window.opener.location.href = this.href; self.close(); + return false; }); }); diff --git a/mobile/skin/shop/basic/itemuse.skin.php b/mobile/skin/shop/basic/itemuse.skin.php index 9acad155a..78fe63e1d 100644 --- a/mobile/skin/shop/basic/itemuse.skin.php +++ b/mobile/skin/shop/basic/itemuse.skin.php @@ -106,8 +106,9 @@ $(function(){ }); $("a#itemuse_list").on("click", function() { - opener.location.href = this.href; + window.opener.location.href = this.href; self.close(); + return false; }); }); From c128a86bf3bb0ecfccbad06ea5410b0b7dad4f37 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 7 Nov 2013 14:44:04 +0900 Subject: [PATCH 11/13] =?UTF-8?q?=EB=8C=80=EC=9A=A9=EB=9F=89=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/download.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bbs/download.php b/bbs/download.php index 38607c45c..92e7df1b3 100644 --- a/bbs/download.php +++ b/bbs/download.php @@ -1,6 +1,9 @@ Date: Thu, 7 Nov 2013 17:01:19 +0900 Subject: [PATCH 12/13] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=EC=87=BC?= =?UTF-8?q?=ED=95=91=EB=AA=B0:=20fancyalert=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/jquery.fancyalert.js | 4 ++-- mobile/skin/shop/basic/style.css | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/js/jquery.fancyalert.js b/js/jquery.fancyalert.js index 5220b905e..c90ddb558 100644 --- a/js/jquery.fancyalert.js +++ b/js/jquery.fancyalert.js @@ -11,10 +11,10 @@ function fancyalert(msg) } box = "
"; - box += "
"+msg; + box += "
"+msg; box += "
"; box += ""; - box += "
"; + box += "
"; box += "
"; $("body").append(box); diff --git a/mobile/skin/shop/basic/style.css b/mobile/skin/shop/basic/style.css index 9b0c81c0a..8486b0930 100644 --- a/mobile/skin/shop/basic/style.css +++ b/mobile/skin/shop/basic/style.css @@ -104,8 +104,9 @@ #loading_message img {position:relative;opacity:1.0} /* 알림 box */ -#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 {display:block;z-index:10000;position:absolute;top:0;left:0} +#fancyalert_inner {display:table;z-index:2;position:relative} +#fancyalert_inner div {display:table-cell;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 +#fancyalert_inner button {margin:15px 0 0;padding:10px 30px;border:0;background:#000;color:#fff} +#fancyalert_bg {z-index:0;position:absolute;top:0;left:0;width:100%;height:100%;vertical-align:middle;background:#000;text-align:center;opacity: 0.7} \ No newline at end of file From 1f352a9c0a2cc03213f42c3c2ca231e115bbbaca Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 7 Nov 2013 17:05:45 +0900 Subject: [PATCH 13/13] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=A3=BC?= =?UTF-8?q?=EB=AC=B8=EC=83=81=EC=84=B8=EC=97=90=EC=84=9C=20=ED=8F=AC?= =?UTF-8?q?=EC=9D=B8=ED=8A=B8=20=EC=B6=9C=EB=A0=A5=EB=90=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8D=98=20=EC=98=A4=EB=A5=98=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/orderform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 684c8dc80..b518c7f45 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -123,7 +123,7 @@ $result = sql_query($sql); $image = get_it_image($row['it_id'], 50, 50); // 상품의 옵션정보 - $sql = " select ct_id, it_id, ct_price, ct_qty, ct_option, ct_status, cp_price, ct_stock_use, ct_point_use, ct_send_cost, io_type, io_price + $sql = " select ct_id, it_id, ct_price, ct_point, ct_qty, ct_option, ct_status, cp_price, ct_stock_use, ct_point_use, ct_send_cost, io_type, io_price from {$g5['g5_shop_cart_table']} where od_id = '{$od['od_id']}' and it_id = '{$row['it_id']}'