From c0d2b4ca7d70f1f12ee3bb140f989cb2bdccb275 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 13 Jun 2013 11:30:11 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=ED=95=98=EA=B8=B0=20=EB=B2=84=ED=8A=BC=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=9E=91=EC=97=85=ED=95=9C=20=EA=B2=83=20=EC=9D=BC?= =?UTF-8?q?=EB=B0=98=20=ED=85=8D=EC=8A=A4=ED=8A=B8=EB=A1=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/board_list.php | 14 +++----------- adm/boardgroup_list.php | 11 ++--------- adm/member_list.php | 17 ++++++----------- adm/poll_list.php | 11 ++--------- adm/shop_admin/bannerlist.php | 11 +++-------- adm/shop_admin/categorylist.php | 23 +++++++++-------------- adm/shop_admin/contentlist.php | 13 ++++--------- adm/shop_admin/couponlist.php | 9 ++------- adm/shop_admin/deliverycodelist.php | 13 ++++--------- adm/shop_admin/faqlist.php | 11 +++-------- adm/shop_admin/faqmasterlist.php | 13 ++++--------- adm/shop_admin/itemlist.php | 15 +++++---------- adm/shop_admin/itempslist.php | 11 +++-------- adm/shop_admin/itemqalist.php | 11 +++-------- adm/shop_admin/itemstocklist.php | 9 +-------- adm/shop_admin/itemtypelist.php | 9 ++------- adm/shop_admin/newwinlist.php | 11 +++-------- adm/shop_admin/optionstocklist.php | 9 +-------- adm/shop_admin/orderlist.php | 11 +++-------- adm/shop_admin/orderstatuslist.php | 9 +-------- 20 files changed, 64 insertions(+), 177 deletions(-) diff --git a/adm/board_list.php b/adm/board_list.php index a8f821efc..c6c3e4144 100644 --- a/adm/board_list.php +++ b/adm/board_list.php @@ -115,8 +115,8 @@ $colspan = 15; 수정'; - $one_copy = '
  • 복사
  • '; + $one_update = '수정'; + $one_copy = '복사'; ?> @@ -156,15 +156,7 @@ $colspan = 15; - -
    - - -
    - + 수정'; + $s_upd = '수정'; ?> @@ -160,14 +160,7 @@ $colspan = 8; - -
    - - -
    - + 수정'; - //$s_del = '
  • 삭제
  • '; + $s_mod = '수정'; + //$s_del = '삭제'; } - $s_grp = '
  • 그룹
  • '; + $s_grp = '그룹'; $leave_date = $row['mb_leave_date'] ? $row['mb_leave_date'] : date('Ymd', G4_SERVER_TIME); $intercept_date = $row['mb_intercept_date'] ? $row['mb_intercept_date'] : date('Ymd', G4_SERVER_TIME); @@ -199,14 +199,9 @@ $colspan = 15; - -
    - - -
    + + + > diff --git a/adm/poll_list.php b/adm/poll_list.php index fad175aba..c0c341ce7 100644 --- a/adm/poll_list.php +++ b/adm/poll_list.php @@ -103,7 +103,7 @@ $colspan = 6; $row2 = sql_fetch($sql2); $po_etc = ($row['po_etc']) ? "사용" : "미사용"; - $s_mod = '
  • 수정
  • '; + $s_mod = '수정'; //$s_del = '삭제'; ?> @@ -116,14 +116,7 @@ $colspan = 6; - -
    - - -
    - + - -
    - - -
    + + 수정 + 삭제 diff --git a/adm/shop_admin/categorylist.php b/adm/shop_admin/categorylist.php index 036e05d1f..09fdfa6e0 100644 --- a/adm/shop_admin/categorylist.php +++ b/adm/shop_admin/categorylist.php @@ -137,13 +137,13 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌 $s_level = ''; $s_level_input_size = 40 - $level *5; // 하위 분류일 수록 입력칸 넓이 작아짐 - 지운아빠 2013-04-02 - if ($level+2 < 6) $s_add = '
  • '.($level+2).'단 추가
  • '; // 분류는 5단계까지만 가능 + if ($level+2 < 6) $s_add = '추가 '; // 분류는 5단계까지만 가능 else $s_add = ''; - $s_upd = '
  • '.get_text($row['ca_name']).' 수정
  • '; - $s_vie = '
  • '.get_text($row['ca_name']).' 이동
  • '; + $s_upd = ''.get_text($row['ca_name']).' 수정 '; + //$s_vie = ''.get_text($row['ca_name']).' 이동 '; if ($is_admin == 'super') - $s_del = '
  • '.get_text($row['ca_name']).' 삭제
  • '; + $s_del = ''.get_text($row['ca_name']).' 삭제 '; // 해당 분류에 속한 상품의 갯수 $sql1 = " select COUNT(*) as cnt from {$g4['shop_item_table']} @@ -170,16 +170,11 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌 > - -
    - - -
    + + + + + - -
    - - -
    + + 보기 + 수정 + 삭제
    ~ - -
    - - -
    + + 수정 diff --git a/adm/shop_admin/deliverycodelist.php b/adm/shop_admin/deliverycodelist.php index f0d0c3e1b..75694f56a 100644 --- a/adm/shop_admin/deliverycodelist.php +++ b/adm/shop_admin/deliverycodelist.php @@ -44,15 +44,10 @@ $result = sql_query($sql); - -
    - - -
    + + 홈페이지 + 수정 + 삭제 - -
    - - -
    + + 수정 + 삭제 diff --git a/adm/shop_admin/faqmasterlist.php b/adm/shop_admin/faqmasterlist.php index 08484a8c0..bb9106bc5 100644 --- a/adm/shop_admin/faqmasterlist.php +++ b/adm/shop_admin/faqmasterlist.php @@ -60,15 +60,10 @@ $result = sql_query($sql); - -
    - - -
    + + 보기 + 수정 + 삭제 value="1"> - -
    - - -
    + + 보기 + 복사 + 수정 + diff --git a/adm/shop_admin/itempslist.php b/adm/shop_admin/itempslist.php index 9f978b3bd..f526875e8 100644 --- a/adm/shop_admin/itempslist.php +++ b/adm/shop_admin/itempslist.php @@ -142,14 +142,9 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌 - -
    - - -
    + + 수정 + 삭제 diff --git a/adm/shop_admin/itemqalist.php b/adm/shop_admin/itemqalist.php index 25ed5600d..d99a6e4b8 100644 --- a/adm/shop_admin/itemqalist.php +++ b/adm/shop_admin/itemqalist.php @@ -136,14 +136,9 @@ if ($sfl || $stx) // 검색 결과일 때만 처음 버튼을 보여줌 - -
    - - -
    + + 수정 + 삭제 > - -
    - - -
    - + 수정 > > > - -
    - - -
    + + 수정 px px px - -
    - - -
    + + 수정 + 삭제 > - -
    - - -
    - + 수정 - -
    - - -
    + + 수정 + 삭제 - -
    - - -
    - + 주문수정 Date: Thu, 13 Jun 2013 11:31:56 +0900 Subject: [PATCH 2/5] =?UTF-8?q?merge=20=EC=B6=A9=EB=8F=8C=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/admin.head.php | 16 +-- adm/admin.menu400.shop_1of2.php | 2 +- adm/admin.menu500.shop_2of2.php | 2 +- adm/auth_list.php | 17 ++- adm/board_list.php | 40 ++++-- adm/boardgroup_list.php | 25 ++-- adm/boardgroupmember_list.php | 31 +++-- adm/mail_list.php | 2 +- adm/mail_select_list.php | 2 +- adm/member_list.php | 51 +++++--- adm/point_list.php | 27 ++-- adm/poll_list.php | 2 +- adm/shop_admin/itemformupdate.php | 2 +- adm/version.php | 38 +++--- css/admin.css | 6 +- lib/shop.lib.php | 20 +-- mobile/shop/cart.php | 15 ++- mobile/shop/kcp/order_approval_form.php | 124 +++++++++---------- mobile/shop/list.php | 2 +- mobile/shop/navigation1.inc.php | 4 +- mobile/shop/orderform.php | 78 +++++++----- mobile/skin/member/shop_basic/login.skin.php | 10 +- shop/cart.php | 20 +-- shop/content.php | 2 +- shop/item.php | 10 +- shop/itemuse.inc.php | 96 -------------- shop/list.php | 2 +- shop/navigation1.inc.php | 4 +- shop/ordercoupon.php | 3 - shop/orderform.php | 64 ++++++---- shop/orderitemcoupon.php | 3 - shop/ordersendcostcoupon.php | 3 - skin/member/shop_basic/login.skin.php | 10 +- skin/outlogin/shop_basic/outlogin.skin.1.php | 10 +- skin/outlogin/shop_basic/outlogin.skin.2.php | 20 +-- skin/poll/shop_basic/poll_result.skin.php | 34 ++--- 36 files changed, 399 insertions(+), 398 deletions(-) delete mode 100644 shop/itemuse.inc.php diff --git a/adm/admin.head.php b/adm/admin.head.php index cc381378f..fb3b2096e 100644 --- a/adm/admin.head.php +++ b/adm/admin.head.php @@ -118,26 +118,26 @@ function imageview(id, w, h)