From 6a3b81499a1f52d1ebc3c31ac1e0435f1afdb700 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 1 Nov 2013 13:01:47 +0900 Subject: [PATCH 01/28] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20poll=5Ffor?= =?UTF-8?q?m.php=20=EB=A7=88=ED=81=AC=EC=97=85=20=EC=98=A4=EB=A5=98=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/poll_form.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/adm/poll_form.php b/adm/poll_form.php index b384c3101..533596dcd 100644 --- a/adm/poll_form.php +++ b/adm/poll_form.php @@ -101,10 +101,12 @@ include_once('./admin.head.php'); -
- - 목록 -
+ + +
+ + 목록 +
From 1a0364ee62db896f3e1ab85f7b8e46dd8150a7e5 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 1 Nov 2013 15:19:31 +0900 Subject: [PATCH 02/28] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=84=9C?= =?UTF-8?q?=EC=8B=9D=20=EC=A7=84=ED=96=89=20=EB=8B=A8=EA=B3=84=20=EC=B7=A8?= =?UTF-8?q?=EC=86=8C=20=EB=B2=84=ED=8A=BC=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?=EC=96=B4=EA=B8=8B=EB=82=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20fm25=EB=8B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 2 +- css/mobile.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/default.css b/css/default.css index fa1a3ff25..ae5f3d7f1 100644 --- a/css/default.css +++ b/css/default.css @@ -144,7 +144,7 @@ input.btn_submit {padding:0 10px;height:24px;border:0;background:#333;color:#fff button.btn_submit {height:22px;font-size:1em} fieldset .btn_submit {height:22px;font-size:1em} -a.btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em} +a.btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em;vertical-align:middle} a.btn_cancel:focus, a.btn_cancel:hover {text-decoration:none} a.btn_frmline, button.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ diff --git a/css/mobile.css b/css/mobile.css index c65b98c4c..265234b36 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -113,7 +113,7 @@ a.btn02:focus, .btn02:hover {text-decoration:none} input.btn_submit {padding:0 10px;height:2.6em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;-webkit-appearance:none} fieldset .btn_submit {padding:0 10px;height:1.9em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;-webkit-appearance:none} -a.btn_cancel {display:inline-block;padding:0 10px;height:2.5em;border:1px solid #ccc;background:#fafafa;color:#000;font-size:1em;text-decoration:none;line-height:2.5em} +a.btn_cancel {display:inline-block;padding:0 10px;height:2.5em;border:1px solid #ccc;background:#fafafa;color:#000;font-size:1em;text-decoration:none;line-height:2.5em;vertical-align:top} a.btn_frmline, button.btn_frmline {display:inline-block;padding:0 5px;height:1.9em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:1.9em} /* 우편번호검색버튼 등 */ From b9961bf8beb7f2f42e5d88e178eee93e3a1f1386 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 1 Nov 2013 18:08:15 +0900 Subject: [PATCH 03/28] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EA=B2=80=EC=83=89=20stx=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=EC=97=90=20id=20=EC=A7=80=EC=A0=95=EB=90=98=EC=A7=80?= =?UTF-8?q?=20=EC=95=8A=EC=9D=80=20=EA=B2=83=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/skin/board/basic/list.skin.php | 2 +- mobile/skin/board/gallery/list.skin.php | 2 +- skin/board/basic/list.skin.php | 2 +- skin/board/gallery/list.skin.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mobile/skin/board/basic/list.skin.php b/mobile/skin/board/basic/list.skin.php index 208fdd3ec..9567e06b6 100644 --- a/mobile/skin/board/basic/list.skin.php +++ b/mobile/skin/board/basic/list.skin.php @@ -152,7 +152,7 @@ if ($is_nogood) $colspan++; - + diff --git a/mobile/skin/board/gallery/list.skin.php b/mobile/skin/board/gallery/list.skin.php index 01a1ff692..71d709dbe 100644 --- a/mobile/skin/board/gallery/list.skin.php +++ b/mobile/skin/board/gallery/list.skin.php @@ -176,7 +176,7 @@ $(window).on("load", function() { - + diff --git a/skin/board/basic/list.skin.php b/skin/board/basic/list.skin.php index 3f4e518b5..4793214f1 100644 --- a/skin/board/basic/list.skin.php +++ b/skin/board/basic/list.skin.php @@ -180,7 +180,7 @@ if ($is_nogood) $colspan++; - + diff --git a/skin/board/gallery/list.skin.php b/skin/board/gallery/list.skin.php index 9d1b7d417..b88a9771f 100644 --- a/skin/board/gallery/list.skin.php +++ b/skin/board/gallery/list.skin.php @@ -174,7 +174,7 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php'); - + From 2bde344099d1439659a70f602c148c37267fb5d2 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 4 Nov 2013 09:35:00 +0900 Subject: [PATCH 04/28] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=83=81?= =?UTF-8?q?=ED=92=88=EC=83=81=EC=84=B8=EC=97=90=EC=84=9C=20=EC=83=81?= =?UTF-8?q?=ED=92=88=EA=B4=80=EB=A6=AC=20=EB=A7=81=ED=81=AC=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/item.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/mobile/shop/item.php b/mobile/shop/item.php index fc5549a50..5f0094688 100644 --- a/mobile/shop/item.php +++ b/mobile/shop/item.php @@ -133,9 +133,6 @@ include_once(G5_MSHOP_PATH.'/_head.php'); $ca_id = $it['ca_id']; include G5_MSHOP_SKIN_PATH.'/navigation.skin.php'; -if ($is_admin) - echo ''; - // 상단 HTML echo '
'.stripslashes($it['it_mobile_head_html']).'
'; ?> From 0952b8718c772c9ee09d0e3b2c753dbc3ec2379f Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 4 Nov 2013 09:44:32 +0900 Subject: [PATCH 05/28] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=20ios=20?= =?UTF-8?q?=EC=9D=B8=ED=92=8B=20=EC=8A=A4=ED=83=80=EC=9D=BC=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 --- css/mobile_shop.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/mobile_shop.css b/css/mobile_shop.css index 305c7085d..430e745e7 100644 --- a/css/mobile_shop.css +++ b/css/mobile_shop.css @@ -9,7 +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, footer ul {margin:0;padding:0;list-style:none} label, input, select, img {vertical-align:middle} -input {margin:0;padding:0;border-radius:0;font-family:"dotum"} +input {margin:0;padding:0;border-radius:0;font-family:"dotum";-webkit-appearance:none} button {border-radius:0;font-size:1em;font-family:"dotum"} input[type=text], input[type=password], input[type=submit], input[type=image], button {border-radius:0 !important;font-size:1em} /* 모바일에서만 사용 */ p {margin:0;padding:10px 0;line-height:1.7em;word-break:break-all} From 372793cb7a51a4a70206c9401ae13c5cd92db3b9 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 4 Nov 2013 10:11:09 +0900 Subject: [PATCH 06/28] =?UTF-8?q?=EA=B3=B5=ED=86=B5=20wrp=20->=20wrap=20?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/move.php | 2 +- bbs/point.php | 2 +- css/default.css | 6 +++--- css/mobile.css | 7 ++++--- mobile/skin/board/basic/list.skin.php | 2 +- mobile/skin/board/basic/style.css | 2 +- mobile/skin/board/basic/view_comment.skin.php | 2 +- mobile/skin/board/basic/write.skin.php | 4 ++-- mobile/skin/board/gallery/style.css | 2 +- mobile/skin/board/gallery/view_comment.skin.php | 2 +- mobile/skin/board/gallery/write.skin.php | 4 ++-- mobile/skin/connect/basic/current_connect.skin.php | 2 +- mobile/skin/member/basic/formmail.skin.php | 2 +- mobile/skin/member/basic/memo.skin.php | 2 +- mobile/skin/member/basic/memo_form.skin.php | 2 +- mobile/skin/member/basic/profile.skin.php | 2 +- mobile/skin/member/basic/register_form.skin.php | 6 +++--- mobile/skin/member/basic/scrap.skin.php | 2 +- mobile/skin/member/basic/scrap_popin.skin.php | 2 +- mobile/skin/new/basic/new.skin.php | 2 +- mobile/skin/poll/basic/poll_result.skin.php | 2 +- skin/board/basic/list.skin.php | 2 +- skin/board/basic/style.css | 2 +- skin/board/basic/view_comment.skin.php | 2 +- skin/board/basic/write.skin.php | 4 ++-- skin/board/gallery/style.css | 2 +- skin/board/gallery/view_comment.skin.php | 2 +- skin/board/gallery/write.skin.php | 4 ++-- skin/connect/basic/current_connect.skin.php | 2 +- skin/member/basic/memo.skin.php | 2 +- skin/member/basic/memo_form.skin.php | 2 +- skin/member/basic/profile.skin.php | 2 +- skin/member/basic/register_form.skin.php | 6 +++--- skin/member/basic/scrap.skin.php | 2 +- skin/member/basic/scrap_popin.skin.php | 2 +- skin/new/basic/new.skin.php | 2 +- skin/poll/basic/poll_result.skin.php | 2 +- 37 files changed, 50 insertions(+), 49 deletions(-) diff --git a/bbs/move.php b/bbs/move.php index 5269d7cb3..7dcd73164 100644 --- a/bbs/move.php +++ b/bbs/move.php @@ -55,7 +55,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) -
+
diff --git a/bbs/point.php b/bbs/point.php index 8cc003e43..f0549bb14 100644 --- a/bbs/point.php +++ b/bbs/point.php @@ -25,7 +25,7 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함

-
+
할 게시판을 한개 이상 선택하여 주십시오.
diff --git a/css/default.css b/css/default.css index ae5f3d7f1..fa6fae924 100644 --- a/css/default.css +++ b/css/default.css @@ -162,8 +162,8 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} .cnt_cmt {display:inline-block;margin:0 0 0 3px;font-weight:bold} /* 기본테이블 */ -.tbl_wrp table {width:100%;border-collapse:collapse;border-spacing:0} -.tbl_wrp caption {padding:10px 0;font-weight:bold;text-align:left} +.tbl_wrap table {width:100%;border-collapse:collapse;border-spacing:0} +.tbl_wrap caption {padding:10px 0;font-weight:bold;text-align:left} .tbl_head01 {margin:0 0 10px} .tbl_head01 caption {padding:0;font-size:0;line-height:0;overflow:hidden} @@ -215,7 +215,7 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 /* 새창 기본 스타일 */ .new_win {} -.new_win .tbl_wrp {margin:0 20px} +.new_win .tbl_wrap {margin:0 20px} .new_win #win_title {margin:0 0 20px;padding:20px;border-top:3px solid #4e5d60;border-bottom:1px solid #e9e9e9;background:#fff;font-size:1.2em} .new_win #win_title .sv {font-size:0.75em;line-height:1.2em} .new_win .win_ul {margin:-20px 0 20px 0;padding:0 20px;border-bottom:1px solid #455255;background:#484848;list-style:none;zoom:1} diff --git a/css/mobile.css b/css/mobile.css index 265234b36..3f2ec667d 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -129,8 +129,9 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} .cnt_cmt {display:inline-block;margin:0 0 0 3px;font-weight:bold} /* 기본테이블 */ -.tbl_wrp table {width:100%;border-collapse:collapse;border-spacing:0} -.tbl_wrp caption {padding:10px 0;color:#4b8b99;font-weight:bold;text-align:left} +.tbl_wrap {margin:0 0 10px} +.tbl_wrap table {width:100%;border-collapse:collapse;border-spacing:0} +.tbl_wrap caption {padding:10px 0;color:#4b8b99;font-weight:bold;text-align:left} .tbl_head01 {margin:0 10px 10px} .tbl_head01 caption {padding:0 0 10px;color:#777;text-align:left} @@ -177,7 +178,7 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} /* 새창 기본 스타일 */ .new_win {} .new_win #win_title {margin:0 0 20px;padding:20px;border-top:3px solid #4e5d60;border-bottom:1px solid #e9e9e9;font-size:1.2em} -.new_win .tbl_wrp {margin:0 20px} +.new_win .tbl_wrap {margin:0 20px} .new_win .win_ul {margin:-20px 0 20px 0;padding:0 20px;border-bottom:1px solid #455255;background:#484848;list-style:none} .new_win .win_ul:after {display:block;visibility:hidden;clear:both;content:""} .new_win .win_ul li {float:left;margin-left:-1px} diff --git a/mobile/skin/board/basic/list.skin.php b/mobile/skin/board/basic/list.skin.php index 208fdd3ec..1674b5a03 100644 --- a/mobile/skin/board/basic/list.skin.php +++ b/mobile/skin/board/basic/list.skin.php @@ -48,7 +48,7 @@ if ($is_nogood) $colspan++; -
+
포인트 사용내역 목록
diff --git a/mobile/skin/board/basic/style.css b/mobile/skin/board/basic/style.css index 8d321398d..e08aeba56 100644 --- a/mobile/skin/board/basic/style.css +++ b/mobile/skin/board/basic/style.css @@ -137,7 +137,7 @@ #bo_w #wr_email, #bo_w #wr_homepage, #bo_w #wr_subject {width:100%} #char_count_desc {display:block;margin:0 0 5px;padding:0} -#char_count_wrp {margin:5px 0 0;text-align:right} +#char_count_wrap {margin:5px 0 0;text-align:right} #char_count {font-weight:bold} /* 게시판 읽기 */ diff --git a/mobile/skin/board/basic/view_comment.skin.php b/mobile/skin/board/basic/view_comment.skin.php index 72fa59d90..112623ca1 100644 --- a/mobile/skin/board/basic/view_comment.skin.php +++ b/mobile/skin/board/basic/view_comment.skin.php @@ -93,7 +93,7 @@ var char_max = parseInt(); // 최대 -
+
diff --git a/mobile/skin/board/basic/write.skin.php b/mobile/skin/board/basic/write.skin.php index 9e2ccc367..94206339a 100644 --- a/mobile/skin/board/basic/write.skin.php +++ b/mobile/skin/board/basic/write.skin.php @@ -50,7 +50,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 echo $option_hidden; ?> -
+
@@ -116,7 +116,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
글자
+
글자
diff --git a/mobile/skin/board/gallery/style.css b/mobile/skin/board/gallery/style.css index 6f2b903cb..6b99902be 100644 --- a/mobile/skin/board/gallery/style.css +++ b/mobile/skin/board/gallery/style.css @@ -119,7 +119,7 @@ /* 게시판 쓰기 */ #char_count_desc {display:block;margin:0 0 5px;padding:0} -#char_count_wrp {margin:5px 0 0;text-align:right} +#char_count_wrap {margin:5px 0 0;text-align:right} #char_count {font-weight:bold} /* 게시판 읽기 */ diff --git a/mobile/skin/board/gallery/view_comment.skin.php b/mobile/skin/board/gallery/view_comment.skin.php index 72fa59d90..112623ca1 100644 --- a/mobile/skin/board/gallery/view_comment.skin.php +++ b/mobile/skin/board/gallery/view_comment.skin.php @@ -93,7 +93,7 @@ var char_max = parseInt(); // 최대 -
+
diff --git a/mobile/skin/board/gallery/write.skin.php b/mobile/skin/board/gallery/write.skin.php index 9e2ccc367..94206339a 100644 --- a/mobile/skin/board/gallery/write.skin.php +++ b/mobile/skin/board/gallery/write.skin.php @@ -50,7 +50,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 echo $option_hidden; ?> -
+
@@ -116,7 +116,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
글자
+
글자
diff --git a/mobile/skin/connect/basic/current_connect.skin.php b/mobile/skin/connect/basic/current_connect.skin.php index 351b1bd89..344b6f9cc 100644 --- a/mobile/skin/connect/basic/current_connect.skin.php +++ b/mobile/skin/connect/basic/current_connect.skin.php @@ -4,7 +4,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
+
diff --git a/mobile/skin/member/basic/formmail.skin.php b/mobile/skin/member/basic/formmail.skin.php index 99d391710..439dce321 100644 --- a/mobile/skin/member/basic/formmail.skin.php +++ b/mobile/skin/member/basic/formmail.skin.php @@ -16,7 +16,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
+
diff --git a/mobile/skin/member/basic/memo.skin.php b/mobile/skin/member/basic/memo.skin.php index e74b90a05..ece3e6aca 100644 --- a/mobile/skin/member/basic/memo.skin.php +++ b/mobile/skin/member/basic/memo.skin.php @@ -13,7 +13,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
  • 쪽지쓰기
  • -
    +
    메일쓰기
    + + + + +
    전체 쪽지
    diff --git a/mobile/skin/member/basic/memo_form.skin.php b/mobile/skin/member/basic/memo_form.skin.php index c228ef2a0..2edb425ef 100644 --- a/mobile/skin/member/basic/memo_form.skin.php +++ b/mobile/skin/member/basic/memo_form.skin.php @@ -14,7 +14,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    -
    +
    diff --git a/mobile/skin/member/basic/profile.skin.php b/mobile/skin/member/basic/profile.skin.php index b3f3a35cb..a4879270c 100644 --- a/mobile/skin/member/basic/profile.skin.php +++ b/mobile/skin/member/basic/profile.skin.php @@ -7,7 +7,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

    님의 프로필

    -
    +
    쪽지쓰기
    diff --git a/mobile/skin/member/basic/register_form.skin.php b/mobile/skin/member/basic/register_form.skin.php index ab2217248..4491d88f7 100644 --- a/mobile/skin/member/basic/register_form.skin.php +++ b/mobile/skin/member/basic/register_form.skin.php @@ -22,7 +22,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
    +
    @@ -44,7 +44,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    사이트 이용정보 입력
    -
    +
    @@ -161,7 +161,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    개인정보 입력
    -
    +
    diff --git a/mobile/skin/member/basic/scrap.skin.php b/mobile/skin/member/basic/scrap.skin.php index 20558eb1e..b7c3d4fa7 100644 --- a/mobile/skin/member/basic/scrap.skin.php +++ b/mobile/skin/member/basic/scrap.skin.php @@ -7,7 +7,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

    -
    +
    기타 개인설정
    diff --git a/mobile/skin/member/basic/scrap_popin.skin.php b/mobile/skin/member/basic/scrap_popin.skin.php index 1f9d08097..833f1e128 100644 --- a/mobile/skin/member/basic/scrap_popin.skin.php +++ b/mobile/skin/member/basic/scrap_popin.skin.php @@ -11,7 +11,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
    +
    스크랩 목록
    diff --git a/mobile/skin/new/basic/new.skin.php b/mobile/skin/new/basic/new.skin.php index b9c900aed..120d71fd2 100644 --- a/mobile/skin/new/basic/new.skin.php +++ b/mobile/skin/new/basic/new.skin.php @@ -30,7 +30,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 -
    +
    제목 확인 및 댓글 쓰기
    diff --git a/mobile/skin/poll/basic/poll_result.skin.php b/mobile/skin/poll/basic/poll_result.skin.php index e1120c3c1..aa26c9de6 100644 --- a/mobile/skin/poll/basic/poll_result.skin.php +++ b/mobile/skin/poll/basic/poll_result.skin.php @@ -59,7 +59,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가

    -
    +
    diff --git a/skin/board/basic/list.skin.php b/skin/board/basic/list.skin.php index 3f4e518b5..d155f3e22 100644 --- a/skin/board/basic/list.skin.php +++ b/skin/board/basic/list.skin.php @@ -53,7 +53,7 @@ if ($is_nogood) $colspan++; -
    +
    diff --git a/skin/board/basic/style.css b/skin/board/basic/style.css index f26f0e6b1..5cfc64e3a 100644 --- a/skin/board/basic/style.css +++ b/skin/board/basic/style.css @@ -138,7 +138,7 @@ /* 게시판 쓰기 */ #char_count_desc {display:block;margin:0 0 5px;padding:0} -#char_count_wrp {margin:5px 0 0;text-align:right} +#char_count_wrap {margin:5px 0 0;text-align:right} #char_count {font-weight:bold} #autosave_wrapper {position:relative} diff --git a/skin/board/basic/view_comment.skin.php b/skin/board/basic/view_comment.skin.php index af113cc30..29abfd5a7 100644 --- a/skin/board/basic/view_comment.skin.php +++ b/skin/board/basic/view_comment.skin.php @@ -101,7 +101,7 @@ var char_max = parseInt(); // 최대 -
    +
    목록
    diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php index 4d362d33b..8b74c24a2 100644 --- a/skin/board/basic/write.skin.php +++ b/skin/board/basic/write.skin.php @@ -53,7 +53,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 echo $option_hidden; ?> -
    +
    @@ -132,7 +132,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
    글자
    +
    글자
    diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css index 642fce52d..364d1e5f1 100644 --- a/skin/board/gallery/style.css +++ b/skin/board/gallery/style.css @@ -131,7 +131,7 @@ /* 게시판 쓰기 */ #char_count_desc {display:block;margin:0 0 5px;padding:0} -#char_count_wrp {margin:5px 0 0;text-align:right} +#char_count_wrap {margin:5px 0 0;text-align:right} #char_count {font-weight:bold} #autosave_wrapper {position:relative} diff --git a/skin/board/gallery/view_comment.skin.php b/skin/board/gallery/view_comment.skin.php index af113cc30..29abfd5a7 100644 --- a/skin/board/gallery/view_comment.skin.php +++ b/skin/board/gallery/view_comment.skin.php @@ -101,7 +101,7 @@ var char_max = parseInt(); // 최대 -
    +
    diff --git a/skin/board/gallery/write.skin.php b/skin/board/gallery/write.skin.php index 4d362d33b..8b74c24a2 100644 --- a/skin/board/gallery/write.skin.php +++ b/skin/board/gallery/write.skin.php @@ -53,7 +53,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 echo $option_hidden; ?> -
    +
    @@ -132,7 +132,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
    글자
    +
    글자
    diff --git a/skin/connect/basic/current_connect.skin.php b/skin/connect/basic/current_connect.skin.php index 0e187429c..eb5ea2e74 100644 --- a/skin/connect/basic/current_connect.skin.php +++ b/skin/connect/basic/current_connect.skin.php @@ -5,7 +5,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
    +
    diff --git a/skin/member/basic/memo.skin.php b/skin/member/basic/memo.skin.php index a0d7e9536..3af10217e 100644 --- a/skin/member/basic/memo.skin.php +++ b/skin/member/basic/memo.skin.php @@ -14,7 +14,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
  • 쪽지쓰기
  • -
    +
    + + + + + +
    전체 쪽지
    diff --git a/skin/member/basic/memo_form.skin.php b/skin/member/basic/memo_form.skin.php index 88fbd8952..2394a0adf 100644 --- a/skin/member/basic/memo_form.skin.php +++ b/skin/member/basic/memo_form.skin.php @@ -15,7 +15,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
    +
    diff --git a/skin/member/basic/profile.skin.php b/skin/member/basic/profile.skin.php index d841c43d9..e520f82d4 100644 --- a/skin/member/basic/profile.skin.php +++ b/skin/member/basic/profile.skin.php @@ -8,7 +8,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

    님의 프로필

    -
    +
    쪽지쓰기
    diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php index b6af23600..f8bbc846e 100644 --- a/skin/member/basic/register_form.skin.php +++ b/skin/member/basic/register_form.skin.php @@ -24,7 +24,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
    +
    @@ -48,7 +48,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    사이트 이용정보 입력
    -
    +
    @@ -167,7 +167,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    개인정보 입력
    -
    +
    diff --git a/skin/member/basic/scrap.skin.php b/skin/member/basic/scrap.skin.php index beac44629..c5de56f66 100644 --- a/skin/member/basic/scrap.skin.php +++ b/skin/member/basic/scrap.skin.php @@ -8,7 +8,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

    -
    +
    기타 개인설정
    diff --git a/skin/member/basic/scrap_popin.skin.php b/skin/member/basic/scrap_popin.skin.php index 6598e2dac..e55c8148f 100644 --- a/skin/member/basic/scrap_popin.skin.php +++ b/skin/member/basic/scrap_popin.skin.php @@ -12,7 +12,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
    +
    스크랩 목록
    diff --git a/skin/new/basic/new.skin.php b/skin/new/basic/new.skin.php index 629ee8653..2d4e46196 100644 --- a/skin/new/basic/new.skin.php +++ b/skin/new/basic/new.skin.php @@ -33,7 +33,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 -
    +
    제목 확인 및 댓글 쓰기
    diff --git a/skin/poll/basic/poll_result.skin.php b/skin/poll/basic/poll_result.skin.php index 7cb2e8522..9de3d6a6c 100644 --- a/skin/poll/basic/poll_result.skin.php +++ b/skin/poll/basic/poll_result.skin.php @@ -63,7 +63,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가

    -
    +
    From 65c7ed8095d34b7e4eaf44678c52226413263f47 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 4 Nov 2013 11:12:15 +0900 Subject: [PATCH 07/28] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=20=EC=98=A8?= =?UTF-8?q?=EB=9D=BC=EC=9D=B8=20=EC=84=9C=EC=8B=9D=20=EB=84=88=EB=B9=84=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/mobile.css | 28 ++++++++++-------------- mobile/skin/board/basic/style.css | 2 ++ mobile/skin/board/basic/write.skin.php | 12 +++++----- mobile/skin/board/gallery/style.css | 2 ++ mobile/skin/board/gallery/write.skin.php | 14 ++++++------ mobile/skin/outlogin/basic/style.css | 5 ++--- mobile/skin/search/basic/search.skin.php | 2 +- plugin/editor/ckeditor4/editor.lib.php | 2 +- 8 files changed, 33 insertions(+), 34 deletions(-) diff --git a/css/mobile.css b/css/mobile.css index 3f2ec667d..3a2685750 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -10,8 +10,8 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, header ul, nav ul, footer ul {margin:0;padding:0;list-style:none} legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} label, input, select, img {vertical-align:middle} -input,button {margin:0;padding:0} -input[type=text], input[type=password], input[type=submit], input[type=image], button {border-radius:0;font-size:1em} +input,button {margin:0;padding:0;font-size:1em} +input[type=text], input[type=password], input[type=submit], input[type=image], button {border-radius:0;font-size:1em;-webkit-appearance:none} textarea, select {font-size:1em} textarea {border-radius:0;-webkit-appearance:none} p {margin:0;padding:1em 0;line-height:1.7em;word-break:break-all} @@ -32,10 +32,10 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} /* 캡챠 자동등록(입력)방지 기본 */ #captcha {display:inline-block;position:relative} #captcha legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} -#captcha audio {display:block;margin:0 0 5px;width:263px} -#captcha #captcha_img {width:100px;height:41px;border:1px solid #e9e9e9} -#captcha #captcha_reload {margin:0;padding:0;width:70px;height:43px;border:0;background:#e4eaec;vertical-align:middle;overflow:hidden;cursor:pointer} -#captcha #captcha_key {margin:0 0 0 4px;padding:0 5px;width:70px;height:41px;border:1px solid #b8c9c2;background:#f7f7f7;font-size:1.333em;font-weight:bold;text-align:center;line-height:2.8em} +#captcha audio {display:block;margin:0 0 5px;width:187px} +#captcha #captcha_img {width:60px;height:30px;border:1px solid #e9e9e9} +#captcha #captcha_reload {margin:0;padding:0 5px;height:32px;border:0;background:#e4eaec;vertical-align:middle;overflow:hidden;cursor:pointer} +#captcha #captcha_key {margin:0 0 0 4px;padding:0 5px;width:50px;height:30px;border:1px solid #b8c9c2;background:#f7f7f7;font-size:1.333em;font-weight:bold;text-align:center;line-height:2.8em} #captcha #captcha_info {display:block;margin:5px 0 0;font-size:0.95em;letter-spacing:-0.1em} /* 상단 레이아웃 */ @@ -113,7 +113,7 @@ a.btn02:focus, .btn02:hover {text-decoration:none} input.btn_submit {padding:0 10px;height:2.6em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;-webkit-appearance:none} fieldset .btn_submit {padding:0 10px;height:1.9em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;-webkit-appearance:none} -a.btn_cancel {display:inline-block;padding:0 10px;height:2.5em;border:1px solid #ccc;background:#fafafa;color:#000;font-size:1em;text-decoration:none;line-height:2.5em;vertical-align:top} +a.btn_cancel {display:inline-block;padding:0 10px;height:2.4em;border:1px solid #ccc;background:#fafafa;color:#000;font-size:1em;text-decoration:none;line-height:2.5em;vertical-align:top} a.btn_frmline, button.btn_frmline {display:inline-block;padding:0 5px;height:1.9em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:1.9em} /* 우편번호검색버튼 등 */ @@ -129,11 +129,11 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} .cnt_cmt {display:inline-block;margin:0 0 0 3px;font-weight:bold} /* 기본테이블 */ -.tbl_wrap {margin:0 0 10px} +.tbl_wrap {margin:0 10px 10px} .tbl_wrap table {width:100%;border-collapse:collapse;border-spacing:0} .tbl_wrap caption {padding:10px 0;color:#4b8b99;font-weight:bold;text-align:left} -.tbl_head01 {margin:0 10px 10px} +.tbl_head01 {} .tbl_head01 caption {padding:0 0 10px;color:#777;text-align:left} .tbl_head01 thead th {padding:12px 0;border-top:1px solid #d1dee2;border-bottom:1px solid #d1dee2;background:#e5ecef;color:#383838;font-size:0.95em;letter-spacing:-0.1em} .tbl_head01 thead a {color:#383838} @@ -145,18 +145,14 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} .tbl_head01 .empty_table {padding:10px 0;text-align:center} /* 폼 테이블 */ -.tbl_frm01 {margin:0 10px} +.tbl_frm01 {} .tbl_frm01 th {padding:10px 0;width:90px;border:1px solid #e9e9e9;border-left:0;text-align:left} .tbl_frm01 td {padding:10px 5px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent} .tbl_frm01 textarea, .frm_input {border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle;line-height:1.8em;-webkit-appearance:none} -.tbl_frm01 textarea {width:100%;height:150px} -/* -.tbl_frm01 #captcha {margin:0;padding:0;border:0;background:transparent} -.tbl_frm01 #captcha input {margin-left:0.3em;text-align:center} -*/ +.tbl_frm01 textarea {width:100%;height:100px} .tbl_frm01 a {text-decoration:none} .tbl_frm01 .frm_address {display:block;margin-top:5px} -.tbl_frm01 .frm_file {display:block;margin-bottom:5px} +.tbl_frm01 .frm_file {display:block;margin-bottom:5px;width:100%} .tbl_frm01 .frm_info {display:block;padding:5px 0 0;color:#666;line-height:1.3em} /* 필수입력 */ diff --git a/mobile/skin/board/basic/style.css b/mobile/skin/board/basic/style.css index e08aeba56..5c3370433 100644 --- a/mobile/skin/board/basic/style.css +++ b/mobile/skin/board/basic/style.css @@ -140,6 +140,8 @@ #char_count_wrap {margin:5px 0 0;text-align:right} #char_count {font-weight:bold} +#wr_email, #wr_homepage, #wr_subject, .wr_link {width:100%} + /* 게시판 읽기 */ #bo_v {margin-bottom:15px;padding-bottom:15px} diff --git a/mobile/skin/board/basic/write.skin.php b/mobile/skin/board/basic/write.skin.php index 94206339a..d87a18218 100644 --- a/mobile/skin/board/basic/write.skin.php +++ b/mobile/skin/board/basic/write.skin.php @@ -57,7 +57,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + @@ -71,14 +71,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + - + @@ -103,7 +103,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + @@ -124,7 +124,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + @@ -134,7 +134,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + - + - + - + @@ -103,7 +103,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + @@ -124,7 +124,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + @@ -134,7 +134,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - - - - - + + + + + + + + + + + + + + + + + - - - - - - - -
    " id="wr_link" class="frm_input" size="50">" id="wr_link" class="frm_input wr_link">
    - + diff --git a/mobile/skin/board/gallery/style.css b/mobile/skin/board/gallery/style.css index 6b99902be..2ea1ce968 100644 --- a/mobile/skin/board/gallery/style.css +++ b/mobile/skin/board/gallery/style.css @@ -122,6 +122,8 @@ #char_count_wrap {margin:5px 0 0;text-align:right} #char_count {font-weight:bold} +#wr_email, #wr_homepage, #wr_subject, .wr_link {width:100%} + /* 게시판 읽기 */ #bo_v {margin-bottom:15px;padding-bottom:15px} diff --git a/mobile/skin/board/gallery/write.skin.php b/mobile/skin/board/gallery/write.skin.php index 94206339a..8890b4f95 100644 --- a/mobile/skin/board/gallery/write.skin.php +++ b/mobile/skin/board/gallery/write.skin.php @@ -57,28 +57,28 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    class="frm_input " maxlength="20"> class="frm_input " size="15" maxlength="20">
    " id="wr_link" class="frm_input" size="50">" id="wr_link" class="frm_input wr_link">
    - + diff --git a/mobile/skin/outlogin/basic/style.css b/mobile/skin/outlogin/basic/style.css index 4060b4ef6..a72e8f800 100644 --- a/mobile/skin/outlogin/basic/style.css +++ b/mobile/skin/outlogin/basic/style.css @@ -8,9 +8,8 @@ .ol a.btn_admin {display:inline-block;margin:0 0 5px;padding:0 10px;border:1px solid #e8180c;background:#e8180c;color:#fff;text-decoration:none;line-height:2em;vertical-align:middle} /* 관리자 전용 버튼 */ .ol a.btn_admin:focus, .ol a.btn_admin:hover {text-decoration:none} -#ol_before input[type=text], -#ol_before input[type=password] {display:block;margin-bottom:5px;padding:0;width:80%;height:1.8em;border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle;line-height:1.8em;-webkit-appearance:none} -#ol_before input[type=submit] {position:absolute;top:0;right:5px;padding:0 !important;width:18%;height:4em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer;-webkit-appearance:none} +#ol_before input[type=text], #ol_before input[type=password] {display:block;margin-bottom:5px;padding:0;width:80%;height:1.8em;border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle;line-height:1.8em} +#ol_before input[type=submit] {position:absolute;top:0;right:5px;padding:0 !important;width:18%;height:4.3em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer} #ol_svc {margin:5px 0;text-align:right} #ol_svc a {display:inline-block;margin:0 0 0 5px;color:#000;text-decoration:none;vertical-align:middle} diff --git a/mobile/skin/search/basic/search.skin.php b/mobile/skin/search/basic/search.skin.php index 23d3c58b1..2e6c04507 100644 --- a/mobile/skin/search/basic/search.skin.php +++ b/mobile/skin/search/basic/search.skin.php @@ -23,7 +23,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
    - + -
    주소 + + + - + + + + + + + + +
    - - 이후로 배송 바랍니다. -
    + +
    + + 이후로 배송 바랍니다. +
    +

    받으시는 분

    - - - +
    + + '.PHP_EOL; - $addr_list .= ''.PHP_EOL; + // 주문자와 동일 + $addr_list .= ''.PHP_EOL; + $addr_list .= ''.PHP_EOL; - // 기본배송지 - $sql = " select * - from {$g5['g5_shop_order_address_table']} - where mb_id = '{$member['mb_id']}' - and ad_default = '1' "; - $row = sql_fetch($sql); - if($row['ad_id']) { - $val1 = $row['ad_name'].$sep.$row['ad_tel'].$sep.$row['ad_hp'].$sep.$row['ad_zip1'].$sep.$row['ad_zip2'].$sep.$row['ad_addr1'].$sep.$row['ad_addr2'].$sep.$row['ad_subject']; - $addr_list .= ''.PHP_EOL; - $addr_list .= ''.PHP_EOL; + // 기본배송지 + $sql = " select * + from {$g5['g5_shop_order_address_table']} + where mb_id = '{$member['mb_id']}' + and ad_default = '1' "; + $row = sql_fetch($sql); + if($row['ad_id']) { + $val1 = $row['ad_name'].$sep.$row['ad_tel'].$sep.$row['ad_hp'].$sep.$row['ad_zip1'].$sep.$row['ad_zip2'].$sep.$row['ad_addr1'].$sep.$row['ad_addr2'].$sep.$row['ad_subject']; + $addr_list .= ''.PHP_EOL; + $addr_list .= ''.PHP_EOL; + } + + // 최근배송지 + $sql = " select * + from {$g5['g5_shop_order_address_table']} + where mb_id = '{$member['mb_id']}' + and ad_default = '0' + order by ad_id desc + limit 2 "; + $result = sql_query($sql); + for($i=0; $row=sql_fetch_array($result); $i++) { + $val1 = $row['ad_name'].$sep.$row['ad_tel'].$sep.$row['ad_hp'].$sep.$row['ad_zip1'].$sep.$row['ad_zip2'].$sep.$row['ad_addr1'].$sep.$row['ad_addr2'].$sep.$row['ad_subject']; + $val2 = ''; + $addr_list .= ' '.PHP_EOL.$val2.PHP_EOL; + } + + $addr_list .= ''.PHP_EOL; + $addr_list .= ''.PHP_EOL; + ?> + + + + + + + + + 최근배송지('.($row['ad_subject'] ? $row['ad_subject'] : $row['ad_name']).')'; - $addr_list .= ' '.PHP_EOL.$val2.PHP_EOL; - } - - $addr_list .= ''.PHP_EOL; - $addr_list .= ''.PHP_EOL; - ?> - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - -
    배송지선택 + + 배송지목록 +
    + + + +
    배송지선택 - - 배송지목록 -
    - - - -
    주소 - - - - - - - - -
    -
    + ?> +
    주소 + + + - + + + + + - - - - - - - - - - -
    + + + + + + + + + + + +
    +

    결제정보 입력

    - - - 0) { ?> - - - - - - - - - - 0) { ?> - - - - - - - - - - - - - - - - - - -
    주문할인쿠폰 - - -
    주문할인금액0
    배송비할인쿠폰 - - -
    배송비할인금액0
    총 주문금액
    추가배송비0원 (지역에 따라 추가되는 도선료 등의 배송비입니다.)
    +
    + + + 0) { ?> + + + + + + + + + + 0) { ?> + + + + + + + + + + + + + + + + + + +
    주문할인쿠폰 + + +
    주문할인금액0
    배송비할인쿠폰 + + +
    배송비할인금액0
    총 주문금액
    추가배송비0원 (지역에 따라 추가되는 도선료 등의 배송비입니다.)
    +
    결제포인트 : 점 ('.$point_unit.'점 단위로 입력하세요.)
    '; + echo '
    결제포인트 : 점 ('.$point_unit.'점 단위로 입력하세요.)
    '; echo '
    회원님의 보유포인트('.display_point($member['mb_point']).')중 '.display_point($temp_point).'까지 사용 가능합니다.
    '; $multi_settle++; } diff --git a/mobile/shop/orderinquiry.sub.php b/mobile/shop/orderinquiry.sub.php index 0facac7f4..85d94204e 100644 --- a/mobile/shop/orderinquiry.sub.php +++ b/mobile/shop/orderinquiry.sub.php @@ -6,46 +6,48 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가 - - - - - - - - - - - - +
    +
    주문번호주문일시주문금액쿠폰입금액
    + + + + + + + + + + + - - - - - - - + + + + + + + -'; -?> - -
    주문번호주문일시주문금액쿠폰입금액
    - - - ()
    + + + ()
    주문 내역이 없습니다.
    + if ($i == 0) + echo '주문 내역이 없습니다.'; + ?> + + + \ No newline at end of file diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php index fc29a92fa..558b6007a 100644 --- a/mobile/shop/orderinquiryview.php +++ b/mobile/shop/orderinquiryview.php @@ -61,57 +61,59 @@ include_once(G5_MSHOP_PATH.'/_head.php');

    - - - - - - - - - - - - - +
    옵션항목수량판매가소계포인트상태
    + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - -
    옵션항목수량판매가소계포인트상태
    + $st_count1++; + if($opt['ct_status'] == '주문') + $st_count2++; + } + ?> + + +

    결제정보

    - - - - - - - - - - - - - - +
    +
    주문번호
    주문일시
    + + + + + + + + + + + + + - - - - - - - - - 0) - { - ?> - - - - - - - - - - - - - - - - - - - - - - - - 0) - { - ?> - - - - - - 0) - { - ?> - - - - - - - - + + + + + + + 0) { ?> - 현금영수증 확인하기 + + + + - 현금영수증을 발급하시려면 클릭하십시오. - - - - + + + + - -
    주문번호
    주문일시
    결제방식
    결제금액
    결제일시
    입금자명
    입금계좌
    영수증 - - 영수증 출력 - - 영수증 출력 - - -
    포인트사용
    취소/환불 금액
    현금영수증 +
    결제방식
    결제금액
    결제일시
    + + // 계좌정보 + if($disp_bank) + { + ?> + + 입금자명 + + + + 입금계좌 + + + + + 영수증 + + + 영수증 출력 + + 영수증 출력 + + + + + 0) + { + ?> + + 포인트사용 + + + + 0) + { + ?> + + 취소/환불 금액 + + + + + 현금영수증 + + + 현금영수증 확인하기 + + 현금영수증을 발급하시려면 클릭하십시오. + + + + + + +

    주문하신 분

    - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    이 름
    전화번호
    핸드폰
    주 소
    E-mail
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    이 름
    전화번호
    핸드폰
    주 소
    E-mail
    +
    +

    받으시는 분

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    이 름
    전화번호
    핸드폰
    주 소
    희망배송일 -
    전하실 말씀 -
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    이 름
    전화번호
    핸드폰
    주 소
    희망배송일 +
    전하실 말씀 +
    +

    배송정보

    - - - - - - - +
    + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - -
    배송회사 [배송조회하기]
    운송장번호
    배송일시
    고객센터 전화
    배송회사 [배송조회하기]
    운송장번호
    배송일시
    고객센터 전화
    아직 배송하지 않았거나 배송정보를 입력하지 못하였습니다.
    아직 배송하지 않았거나 배송정보를 입력하지 못하였습니다.
    + ?> + + +
    @@ -517,7 +531,7 @@ include_once(G5_MSHOP_PATH.'/_head.php'); - + @@ -538,10 +552,10 @@ include_once(G5_MSHOP_PATH.'/_head.php'); 모의입금처리

    관리자가 가상계좌 테스트를 한 경우에만 보입니다.

    -
    -
    -
    -

    +
    +
    +
    +

    diff --git a/mobile/shop/personalpayform.php b/mobile/shop/personalpayform.php index f73d4639d..e2b0e661a 100644 --- a/mobile/shop/personalpayform.php +++ b/mobile/shop/personalpayform.php @@ -106,26 +106,28 @@ if($default['de_escrow_use']) {

    개인결제정보

    - - - - - - - - - - - - - - - - - - - -
    결제금액
    +
    + + + + + + + + + + + + + + + + + + + +
    결제금액
    +

    결제정보

    - - - - - - - - - - - - - - - - - 0) { ?> - - - - - - - - - +
    주문번호
    결제방식
    결제금액
    결제일시
    + + + + + + + + + + + + + + + + 0) { ?> + + + + + + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - + + - - - -
    주문번호
    결제방식
    결제금액
    결제일시
    입금자명
    입금계좌
    입금자명
    입금계좌
    영수증 - - 영수증 출력 - +
    영수증 + + 영수증 출력 + - 영수증 출력 - - -
    + if($pp['pp_settle_case'] == '신용카드') + { + ?> + 영수증 출력 + + + + + + + +
    @@ -178,10 +180,10 @@ include_once(G5_MSHOP_PATH.'/_head.php'); 모의입금처리

    관리자가 가상계좌 테스트를 한 경우에만 보입니다.

    -
    -
    -
    -

    +
    +
    +
    +

    diff --git a/mobile/shop/wishlist.php b/mobile/shop/wishlist.php index 8b7b320e0..e7e2d825a 100644 --- a/mobile/shop/wishlist.php +++ b/mobile/shop/wishlist.php @@ -15,71 +15,73 @@ include_once(G5_MSHOP_PATH.'/_head.php'); - - - - - - - - - - - +
    이미지상품명선택삭제
    + + + + + + + + + + + $image = get_it_image($row['it_id'], 70, 70); + $it_point = get_item_point($row); + ?> - - - - - - - + + + + + + '; - ?> - -
    이미지상품명선택삭제
    - - 보관일시 - - - 품절 - - - - - - - - - 삭제
    + + 보관일시 + + + 품절 + + + + + + + + + 삭제
    보관함이 비었습니다.
    + if ($i == 0) + echo '보관함이 비었습니다.'; + ?> + + +
    diff --git a/mobile/skin/shop/basic/itemqaform.skin.php b/mobile/skin/shop/basic/itemqaform.skin.php index d091a5060..408d8f6c2 100644 --- a/mobile/skin/shop/basic/itemqaform.skin.php +++ b/mobile/skin/shop/basic/itemqaform.skin.php @@ -13,22 +13,24 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - - - - - - - - - - - - - - - -
    +
    + + + + + + + + + + + + + + + +
    +
    diff --git a/mobile/skin/shop/basic/itemuseform.skin.php b/mobile/skin/shop/basic/itemuseform.skin.php index c67fbcdf8..64471d026 100644 --- a/mobile/skin/shop/basic/itemuseform.skin.php +++ b/mobile/skin/shop/basic/itemuseform.skin.php @@ -13,54 +13,56 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - - - - - - - - - - - - - - - - - - - -
    평가 -
      -
    • - > - - -
    • -
    • - > - - -
    • -
    • - > - - -
    • -
    • - > - - -
    • -
    • - > - - -
    • -
    -
    +
    + + + + + + + + + + + + + + + + + + + +
    평가 +
      +
    • + > + + +
    • +
    • + > + + +
    • +
    • + > + + +
    • +
    • + > + + +
    • +
    • + > + + +
    • +
    +
    +
    diff --git a/shop/cart.php b/shop/cart.php index 52489a331..26cb091f3 100644 --- a/shop/cart.php +++ b/shop/cart.php @@ -26,111 +26,113 @@ include_once('./_head.php');
    - - - - - - - - - - - - - - +
    상품이미지상품명총수량판매가소계포인트 - - -
    + + + + + + + + + + + + + '$ctime' "; - } - $sql .= " group by a.it_id "; - $sql .= " order by a.ct_id "; - $result = sql_query($sql); - - $it_send_cost = 0; - - for ($i=0; $row=mysql_fetch_array($result); $i++) - { - // 합계금액 계산 - $sql = " select SUM(IF(io_type = 1, (io_price * ct_qty), ((ct_price + io_price) * ct_qty))) as price, - SUM(ct_point * ct_qty) as point, - SUM(ct_qty) as qty - from {$g5['g5_shop_cart_table']} - where it_id = '{$row['it_id']}' - and od_id = '$s_cart_id' "; - $sum = sql_fetch($sql); - - if ($i==0) { // 계속쇼핑 - $continue_ca_id = $row['ca_id']; + // $s_cart_id 로 현재 장바구니 자료 쿼리 + $sql = " select a.ct_id, + a.it_id, + a.it_name, + a.ct_price, + a.ct_point, + a.ct_qty, + a.ct_status, + a.ct_send_cost, + b.ca_id, + b.ca_id2, + b.ca_id3 + from {$g5['g5_shop_cart_table']} a left join {$g5['g5_shop_item_table']} b on ( a.it_id = b.it_id ) + where a.od_id = '$s_cart_id' "; + if($default['de_cart_keep_term']) { + $ctime = date('Y-m-d H:i:s', G5_SERVER_TIME - ($default['de_cart_keep_term'] * 86400)); + $sql .= " and a.ct_time > '$ctime' "; } + $sql .= " group by a.it_id "; + $sql .= " order by a.ct_id "; + $result = sql_query($sql); - $a1 = ''; - $a2 = ''; - $image = get_it_image($row['it_id'], 70, 70); + $it_send_cost = 0; - $it_name = $a1 . stripslashes($row['it_name']) . $a2; - $it_options = print_item_options($row['it_id'], $s_cart_id); - if($it_options) { - $mod_options = '
    '; - $it_name .= '
    '.$it_options.'
    '; + for ($i=0; $row=mysql_fetch_array($result); $i++) + { + // 합계금액 계산 + $sql = " select SUM(IF(io_type = 1, (io_price * ct_qty), ((ct_price + io_price) * ct_qty))) as price, + SUM(ct_point * ct_qty) as point, + SUM(ct_qty) as qty + from {$g5['g5_shop_cart_table']} + where it_id = '{$row['it_id']}' + and od_id = '$s_cart_id' "; + $sum = sql_fetch($sql); + + if ($i==0) { // 계속쇼핑 + $continue_ca_id = $row['ca_id']; + } + + $a1 = ''; + $a2 = ''; + $image = get_it_image($row['it_id'], 70, 70); + + $it_name = $a1 . stripslashes($row['it_name']) . $a2; + $it_options = print_item_options($row['it_id'], $s_cart_id); + if($it_options) { + $mod_options = '
    '; + $it_name .= '
    '.$it_options.'
    '; + } + + $point = $sum['point']; + $sell_price = $sum['price']; + ?> + + + + + + + + + + + + '; + } else { + // 배송비 계산 + $send_cost = get_sendcost($s_cart_id, 0); } - - $point = $sum['point']; - $sell_price = $sum['price']; - ?> - - - - - - - - - - - - '; - } else { - // 배송비 계산 - $send_cost = get_sendcost($s_cart_id, 0); - } - ?> - -
    상품이미지상품명총수량판매가소계포인트 + + +
    + + + + + + +
    장바구니에 담긴 상품이 없습니다.
    - - - - - - -
    장바구니에 담긴 상품이 없습니다.
    + ?> + + +

    - - - - - - - - - - - +
    쿠폰명적용대상할인금액사용기한
    + + + + + + + + + + + + + + + + + - - - - - - - '; - ?> - -
    쿠폰명적용대상할인금액사용기한
    ~
    ~
    사용할 수 있는 쿠폰이 없습니다.
    + if(!$cp_count) + echo '사용할 수 있는 쿠폰이 없습니다.'; + ?> + + +
    diff --git a/shop/itemrecommend.php b/shop/itemrecommend.php index c8439b09d..d82b5a5a5 100644 --- a/shop/itemrecommend.php +++ b/shop/itemrecommend.php @@ -21,11 +21,12 @@ include_once(G5_PATH.'/head.sub.php');

    -
    - - - - + + + + +
    +
    @@ -45,14 +46,14 @@ include_once(G5_PATH.'/head.sub.php');
    - -
    - - 창닫기 -
    -
    +
    + + 창닫기 +
    + +
    - - - - - - + + + + + + + + + + + 주소 + + + + - + + + + + + + + + + + + + + - - - - - - 이후로 배송 바랍니다. - - - - - + + + + + + 이후로 배송 바랍니다. + + + + + +
    @@ -693,105 +698,107 @@ function get_intall_file()

    받으시는 분

    - - - +
    + + '.PHP_EOL; - $addr_list .= ''.PHP_EOL; + // 주문자와 동일 + $addr_list .= ''.PHP_EOL; + $addr_list .= ''.PHP_EOL; - // 기본배송지 - $sql = " select * - from {$g5['g5_shop_order_address_table']} - where mb_id = '{$member['mb_id']}' - and ad_default = '1' "; - $row = sql_fetch($sql); - if($row['ad_id']) { - $val1 = $row['ad_name'].$sep.$row['ad_tel'].$sep.$row['ad_hp'].$sep.$row['ad_zip1'].$sep.$row['ad_zip2'].$sep.$row['ad_addr1'].$sep.$row['ad_addr2'].$sep.$row['ad_subject']; - $addr_list .= ''.PHP_EOL; - $addr_list .= ''.PHP_EOL; + // 기본배송지 + $sql = " select * + from {$g5['g5_shop_order_address_table']} + where mb_id = '{$member['mb_id']}' + and ad_default = '1' "; + $row = sql_fetch($sql); + if($row['ad_id']) { + $val1 = $row['ad_name'].$sep.$row['ad_tel'].$sep.$row['ad_hp'].$sep.$row['ad_zip1'].$sep.$row['ad_zip2'].$sep.$row['ad_addr1'].$sep.$row['ad_addr2'].$sep.$row['ad_subject']; + $addr_list .= ''.PHP_EOL; + $addr_list .= ''.PHP_EOL; + } + + // 최근배송지 + $sql = " select * + from {$g5['g5_shop_order_address_table']} + where mb_id = '{$member['mb_id']}' + and ad_default = '0' + order by ad_id desc + limit 2 "; + $result = sql_query($sql); + for($i=0; $row=sql_fetch_array($result); $i++) { + $val1 = $row['ad_name'].$sep.$row['ad_tel'].$sep.$row['ad_hp'].$sep.$row['ad_zip1'].$sep.$row['ad_zip2'].$sep.$row['ad_addr1'].$sep.$row['ad_addr2'].$sep.$row['ad_subject']; + $val2 = ''; + $addr_list .= ' '.PHP_EOL.$val2.PHP_EOL; + } + + $addr_list .= ''.PHP_EOL; + $addr_list .= ''.PHP_EOL; + ?> + + + + + + + + + 최근배송지('.($row['ad_subject'] ? $row['ad_subject'] : $row['ad_name']).')'; - $addr_list .= ' '.PHP_EOL.$val2.PHP_EOL; - } - - $addr_list .= ''.PHP_EOL; - $addr_list .= ''.PHP_EOL; - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    배송지선택 + + 배송지목록 +
    + + + +
    배송지선택 - - 배송지목록 -
    - - - -
    주소 - - - - - - - - - - - - -
    + ?> + + + + + + + + + + + + + + + 주소 + + + + - + + + + + + + + + + + + + + + + +
    @@ -838,44 +845,46 @@ function get_intall_file()

    결제정보

    - - - 0) { ?> - - - - - - - - - - 0) { ?> - - - - - - - - - - - - - - - - - - -
    주문할인쿠폰 - - -
    주문할인금액0
    배송비할인쿠폰 - - -
    배송비할인금액0
    총 주문금액
    추가배송비0원 (지역에 따라 추가되는 도선료 등의 배송비입니다.)
    +
    + + + 0) { ?> + + + + + + + + + + 0) { ?> + + + + + + + + + + + + + + + + + + +
    주문할인쿠폰 + + +
    주문할인금액0
    배송비할인쿠폰 + + +
    배송비할인금액0
    총 주문금액
    추가배송비0원 (지역에 따라 추가되는 도선료 등의 배송비입니다.)
    +
    - - - - - - - - - - - - - - +
    +
    주문서번호주문일시상품수주문금액쿠폰입금액미입금액
    + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + -'; -?> - -
    주문서번호주문일시상품수주문금액쿠폰입금액미입금액
    - - - ()
    + + + ()
    주문 내역이 없습니다.
    + if ($i == 0) + echo '주문 내역이 없습니다.'; + ?> + + + \ No newline at end of file diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php index fb7bb1d49..8690fc252 100644 --- a/shop/orderinquiryview.php +++ b/shop/orderinquiryview.php @@ -76,57 +76,59 @@ if(openwin != null) {

    - - - - - - - - - - - - - +
    옵션항목수량판매가소계포인트상태
    + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - -
    옵션항목수량판매가소계포인트상태
    + $st_count1++; + if($opt['ct_status'] == '주문') + $st_count2++; + } + ?> + + +

    결제정보

    - +
    +
    @@ -364,131 +367,140 @@ if(openwin != null) {

    주문하신 분

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    이 름
    전화번호
    핸드폰
    주 소
    E-mail
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    이 름
    전화번호
    핸드폰
    주 소
    E-mail
    +

    받으시는 분

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    이 름
    전화번호
    핸드폰
    주 소
    희망배송일 -
    전하실 말씀 -
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    이 름
    전화번호
    핸드폰
    주 소
    희망배송일 +
    전하실 말씀 +
    +

    배송정보

    - - - - - - - +
    + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - -
    배송회사 [배송조회하기]
    운송장번호
    배송일시
    고객센터 전화
    배송회사 [배송조회하기]
    운송장번호
    배송일시
    고객센터 전화
    아직 배송하지 않았거나 배송정보를 입력하지 못하였습니다.
    아직 배송하지 않았거나 배송정보를 입력하지 못하였습니다.
    + ?> + + +
    diff --git a/shop/orderitemcoupon.php b/shop/orderitemcoupon.php index 8f3736443..14a586a92 100644 --- a/shop/orderitemcoupon.php +++ b/shop/orderitemcoupon.php @@ -42,47 +42,49 @@ $count = mysql_num_rows($result);
    0) { ?> - - - - - - - - - - - +
    쿠폰 선택
    쿠폰명할인금액적용
    + + + + + + + + + + $row['cp_maximum']) + $dc = $row['cp_maximum']; + ?> + + + + + + $row['cp_maximum']) - $dc = $row['cp_maximum']; - ?> - - - - - - - -
    쿠폰 선택
    쿠폰명할인금액적용
    + + + + +
    - - - - -
    + ?> + + +
    사용할 수 있는 쿠폰이 없습니다.

    '; diff --git a/shop/ordersendcostcoupon.php b/shop/ordersendcostcoupon.php index 0eb6a146a..8dd972aa1 100644 --- a/shop/ordersendcostcoupon.php +++ b/shop/ordersendcostcoupon.php @@ -22,50 +22,52 @@ $count = mysql_num_rows($result);
    0) { ?> - - - - - - - - - - - +
    쿠폰 선택
    쿠폰명할인금액적용
    + + + + + + + + + + $row['cp_maximum']) + $dc = $row['cp_maximum']; + + if($dc > $send_cost) + $dc = $send_cost; + ?> + + + + + + $row['cp_maximum']) - $dc = $row['cp_maximum']; - - if($dc > $send_cost) - $dc = $send_cost; - ?> - - - - - - - -
    쿠폰 선택
    쿠폰명할인금액적용
    + + + + +
    - - - - -
    + ?> + + +
    사용할 수 있는 쿠폰이 없습니다.

    '; diff --git a/shop/personalpayform.php b/shop/personalpayform.php index 40a433ae9..585bc1ca4 100644 --- a/shop/personalpayform.php +++ b/shop/personalpayform.php @@ -347,26 +347,28 @@ function get_intall_file()

    개인결제정보

    - - - - - - - - - - - - - - - - - - - -
    결제금액
    +
    + + + + + + + + + + + + + + + + + + + +
    결제금액
    +

    결제정보

    - - - - - - - - - - - - - - - - - - - - - - - - - - +
    주문번호
    결제방식
    결제금액
    결제일시
    + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - + + - - - -
    주문번호
    결제방식
    결제금액
    결제일시
    입금자명
    입금계좌
    입금자명
    입금계좌
    영수증 - - 영수증 출력 - +
    영수증 + + 영수증 출력 + - 영수증 출력 - - -
    + if($pp['pp_settle_case'] == '신용카드') + { + ?> + 영수증 출력 + + + + + + + +
    diff --git a/shop/search.php b/shop/search.php index 3f2e97c57..e90ecd36b 100644 --- a/shop/search.php +++ b/shop/search.php @@ -104,44 +104,46 @@ $total_count = $row['cnt']; $ca_temp = ''.$row2['ca_name'].' > '; } ?> - - - - - - - +
    +
    상품
    이미지 - 상품명판매가격 - 포인트 -
    + + + + + + - - + - - - - - - - - -
    상품
    이미지 + 상품명판매가격 + 포인트 +
    + $image = get_it_image($row['it_id'], (int)($default['de_simg_width']), (int)($default['de_simg_height']), true); + ?> + + + + + + + + + + diff --git a/shop/taxsave_kcp.php b/shop/taxsave_kcp.php index 1f73fbe69..10d843b31 100644 --- a/shop/taxsave_kcp.php +++ b/shop/taxsave_kcp.php @@ -137,34 +137,36 @@ $amt_tax = (int)($amt_tot - $amt_sup);

    주문정보

    - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    주문 번호
    상품 정보
    주문자 이름
    주문자 E-Mail
    주문자 전화번호
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    주문 번호
    상품 정보
    주문자 이름
    주문자 E-Mail
    주문자 전화번호
    +
    @@ -184,52 +186,54 @@ $amt_tax = (int)($amt_tot - $amt_sup); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    원 거래 시각
    발행 용도 - 소득공제용        - 지출증빙용 -
    - - - ("-" 생략) -
    거래금액 총합
    공급가액
    봉사료
    부가가치세
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    원 거래 시각
    발행 용도 + 소득공제용        + 지출증빙용 +
    + + + ("-" 생략) +
    거래금액 총합
    공급가액
    봉사료
    부가가치세
    +
    diff --git a/shop/wishlist.php b/shop/wishlist.php index d561439f6..b6d5906a9 100644 --- a/shop/wishlist.php +++ b/shop/wishlist.php @@ -21,68 +21,71 @@ include_once('./_head.php'); - - - - - - - - - - - - +
    선택이미지상품명보관일시삭제
    + + + + + + + + + + + + $image = get_it_image($row['it_id'], 70, 70); + $it_point = get_item_point($row); + ?> - - - - - - - - + + + + + + + '; - ?> - -
    선택이미지상품명보관일시삭제
    - - 품절 - - - - - - - - - 삭제
    + + 품절 + + + + + + + + + 삭제
    보관함이 비었습니다.
    + if ($i == 0) + echo '보관함이 비었습니다.'; + ?> + + + +
    diff --git a/skin/poll/shop_basic/poll_result.skin.php b/skin/poll/shop_basic/poll_result.skin.php index c2d310191..4e59d4de3 100644 --- a/skin/poll/shop_basic/poll_result.skin.php +++ b/skin/poll/shop_basic/poll_result.skin.php @@ -60,28 +60,31 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 - +

    - - - - - - - - - - - - - - - - - - - -
    자동등록방지
    + +
    + + + + + + + + + + + + + + + + + + + +
    자동등록방지
    +
    diff --git a/skin/shop/basic/itemqaform.skin.php b/skin/shop/basic/itemqaform.skin.php index 692a17a38..428e67292 100644 --- a/skin/shop/basic/itemqaform.skin.php +++ b/skin/shop/basic/itemqaform.skin.php @@ -13,22 +13,24 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - - - - - - - - - - - - - - - -
    +
    + + + + + + + + + + + + + + + +
    +
    diff --git a/skin/shop/basic/itemuseform.skin.php b/skin/shop/basic/itemuseform.skin.php index d95b308d8..f1c119202 100644 --- a/skin/shop/basic/itemuseform.skin.php +++ b/skin/shop/basic/itemuseform.skin.php @@ -13,54 +13,56 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - - - - - - - - - - - - - - - - - - - -
    평가 -
      -
    • - > - - -
    • -
    • - > - - -
    • -
    • - > - - -
    • -
    • - > - - -
    • -
    • - > - - -
    • -
    -
    +
    + + + + + + + + + + + + + + + + + + + +
    평가 +
      +
    • + > + + +
    • +
    • + > + + +
    • +
    • + > + + +
    • +
    • + > + + +
    • +
    • + > + + +
    • +
    +
    +
    From be769cc130e3d8304cd6ac2521eb5bed2bd7b556 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 4 Nov 2013 14:00:41 +0900 Subject: [PATCH 09/28] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EC=97=90=20=EC=A3=BC=EB=AC=B8=20=EC=83=81=ED=92=88=20?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=96=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/ajax.orderitem.php | 100 ++++++++++++++++++++++++++++++ adm/shop_admin/orderlist.php | 57 +++++++++++++---- css/admin.css | 2 + 3 files changed, 147 insertions(+), 12 deletions(-) create mode 100644 adm/shop_admin/ajax.orderitem.php diff --git a/adm/shop_admin/ajax.orderitem.php b/adm/shop_admin/ajax.orderitem.php new file mode 100644 index 000000000..e02d85efd --- /dev/null +++ b/adm/shop_admin/ajax.orderitem.php @@ -0,0 +1,100 @@ +주문정보가 존재하지 않습니다.
    '); + +// 상품목록 +$sql = " select it_id, + it_name, + cp_price, + ct_notax + from {$g5['g5_shop_cart_table']} + where od_id = '$od_id' + group by it_id + order by ct_id "; +$result = sql_query($sql); +?> + +
    +

    주문상품 목록

    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    주문 상품 목록
    상품명옵션항목상태수량판매가소계쿠폰포인트배송비
    + + + + +
    + +
    +
    \ No newline at end of file diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index afa9c0ab3..fae477d4b 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -33,7 +33,7 @@ if ($od_status) { $sort1 = "od_receipt_time"; $sort2 = "desc"; break; - case '배송' : // 배송중 + case '배송' : // 배송중 $sort1 = "od_invoice_time"; $sort2 = "desc"; break; @@ -292,7 +292,7 @@ $listall = '전체목록/orderinquiryview.php?od_id=&uid=">
    --> - + @@ -426,10 +426,43 @@ $listall = '전체목록 $(function(){ - $("#fr_date, #to_date").datepicker({ changeMonth: true, changeYear: true, dateFormat: "yy-mm-dd", showButtonPanel: true, yearRange: "c-99:c+99", maxDate: "+0d" }); + $("#fr_date, #to_date").datepicker({ changeMonth: true, changeYear: true, dateFormat: "yy-mm-dd", showButtonPanel: true, yearRange: "c-99:c+99", maxDate: "+0d" }); + + // 주문상품보기 + $(".orderitem").on("click", function() { + var $this = $(this); + var od_id = $this.text().replace(/[^0-9]/g, ""); + + if($this.next().size()) + return false; + + $("#orderitemlist").remove(); + + $.post( + "./ajax.orderitem.php", + { od_id: od_id }, + function(data) { + $this.parent().append("
    "); + $("#orderitemlist > div") + .html(data) + .append("
    "); + } + ); + + return false; + }); + + // 상품리스트 닫기 + $("#orderitemlist-x").on("click", function() { + $("#orderitemlist").remove(); + }); + + $("body").on("click", function() { + $("#orderitemlist").remove(); + }); }); -function set_date(today) +function set_date(today) { if (today == "오늘") { document.getElementById("fr_date").value = ""; @@ -468,10 +501,10 @@ function forderlist_submit(f) /* switch (f.od_status.value) { - case "" : + case "" : alert("변경하실 주문상태를 선택하세요."); return false; - case '주문' : + case '주문' : default : @@ -493,9 +526,9 @@ function forderlist_submit(f) var chk = document.getElementsByName("chk[]"); - for (var i=0; i div {position:absolute;top:0;left:0} /* 주문내역 수정 */ .sodr_nonpay {color:#ff6600} From 54abab0381a045bd18e0295ae92fa1ab21e5d7a5 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 4 Nov 2013 14:14:05 +0900 Subject: [PATCH 10/28] =?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=A3=BC=EB=AC=B8=EC=84=9C=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=98=A8=EB=9D=BC?= =?UTF-8?q?=EC=9D=B8=20=EC=84=9C=EC=8B=9D=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 | 26 +++++++++++++++++++------- mobile/shop/orderform.php | 32 ++++++++++++++++++-------------- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/css/mobile_shop.css b/css/mobile_shop.css index 34a4c14c9..0a8b69c44 100644 --- a/css/mobile_shop.css +++ b/css/mobile_shop.css @@ -179,8 +179,8 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} #sit_ov_btn {margin:0;padding:0;text-align:center;list-style:none} #sit_ov_btn li {display:inline-block;margin:0 0 0 1px} -#sit_ov_btn a {display:inline-block;padding:10px;font-size:0.95em;vertical-align:middle;text-align:center;text-decoration:none;letter-spacing:-0.1em} -#sit_ov_btn input {margin:0;padding:10px;border:0;font-size:0.95em;text-align:center;text-decoration:none;letter-spacing:-0.1em} +#sit_ov_btn a {display:inline-block;padding:10px;vertical-align:middle;text-decoration:none;letter-spacing:-0.1em} +#sit_ov_btn input {margin:0;padding:10px;border:0;letter-spacing:-0.1em} #sit_btn_buy {background:#ff5b89;color:#fff} #sit_btn_cart, #sit_btn_wish {background:#555;color:#fff} #sit_btn_rec {background:#888;color:#fff} @@ -343,10 +343,10 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} /* 장바구니 */ #sod_bsk {} -.sod_bsk_img {width:90px;text-align:center} -.sod_bsk_itopt {margin:5px 0;border:1px solid #e9e9e9;border-bottom:0;background:#f5f6fa} +.sod_bsk_img {width:100px;text-align:center} +.sod_bsk_itopt {margin:5px 0;border-top:1px dashed #e9e9e9;background:#f5f6fa} .sod_bsk_itopt ul {margin:0;padding:0;list-style:none} -.sod_bsk_itopt li {padding:5px;border-bottom:1px solid #e9e9e9} +.sod_bsk_itopt li {margin:0 0 1px;padding:5px} .sod_option_btn .mod_options {margin:0 0 10px;padding:5px 0;width:100%;border:0;background:#333;color:#fff} #sod_bsk_list {position:relative} @@ -358,7 +358,7 @@ html.no-overflowscrolling #mod_option_frm {height:auto;max-height:10000px !impor #sod_bsk_tot dt, #sod_bsk_tot dd {float:left;padding:10px 0;border-bottom:1px solid #e9e9e9} #sod_bsk_tot dt {padding-left:2%;width:48%;font-weight:bold} #sod_bsk_tot dd {margin:0;padding-right:2%;width:47%;text-align:right} -.sod_bsk_cnt {background:#333;color:#fff} +.sod_bsk_cnt {background:#ff3061;color:#fff} .sod_bsk_point {border-bottom:0 !important} #sod_bsk_act {margin:0 0 20px;text-align:center} @@ -544,7 +544,7 @@ html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_f .btn_admin:focus, .btn_admin:hover {text-decoration:none !important} /* 기본테이블 */ -.tbl_wrap {margin:0 10px 10px} +.tbl_wrap {margin:0 0 10px} .tbl_wrap table {width:100%;border-collapse:collapse;border-spacing:0} .tbl_wrap caption {padding:10px 0;color:#4b8b99;font-weight:bold;text-align:left} @@ -559,6 +559,18 @@ html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_f .tbl_head01 td {padding:5px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;line-height:1.5em;word-break:break-all} .tbl_head01 .empty_table {padding:10px 0;text-align:center} +/* thead 두 줄 테이블 */ +.tbl_head02 {} +.tbl_head02 table {clear:both;width:100%;border-collapse:collapse;border-spacing:0} +.tbl_head02 thead th {padding:5px 0;border:1px solid #d1dee2;background:#e5ecef;color:#383838;font-size:0.95em;letter-spacing:-0.1em} +.tbl_head02 thead input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */ +.tbl_head02 thead a {color:#383838;text-decoration:underline} +.tbl_head01 tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff} +.tbl_head01 tfoot td {border-color:#666;background:#484848;color:#fff;font-weight:bold;text-align:center} +.tbl_head02 tbody th {border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9} +.tbl_head02 tbody td {padding:5px 3px;line-height:1.4em;word-break:break-all} +.tbl_head02 .empty_table {padding:10px 0;text-align:center} + /* 폼 테이블 */ .tbl_frm01 {} .tbl_frm01 th {padding:10px 0;width:90px;border:1px solid #e9e9e9;border-left:0;text-align:left} diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index bee761df4..84bc25f9e 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -41,13 +41,15 @@ ob_start(); - - - - - - - + + + + + + + + + @@ -177,8 +179,8 @@ ob_start(); ?> - - + - - - - - + + + + + + + Date: Mon, 4 Nov 2013 14:35:06 +0900 Subject: [PATCH 11/28] =?UTF-8?q?ie6=20=EC=97=90=EC=84=9C=20=EC=83=81?= =?UTF-8?q?=ED=92=88=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EC=A0=80=20=EC=A0=9C=EB=8C=80=EB=A1=9C=20=ED=91=9C=EC=8B=9C?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=AC=B8=EC=A0=9C=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/orderlist.php | 4 ++-- css/admin.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index fae477d4b..a845ca34f 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -442,8 +442,8 @@ $(function(){ "./ajax.orderitem.php", { od_id: od_id }, function(data) { - $this.parent().append("
    "); - $("#orderitemlist > div") + $this.parent().append("
    "); + $("#orderitemlist .itemlist") .html(data) .append("
    "); } diff --git a/css/admin.css b/css/admin.css index 2792ace1a..c3bc67ce5 100644 --- a/css/admin.css +++ b/css/admin.css @@ -442,7 +442,7 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center} /* 주문내역 */ #sodr_list td {text-align:center !important} #orderitemlist {position:relative} -#orderitemlist > div {position:absolute;top:0;left:0} +#orderitemlist .itemlist {position:absolute;top:0;left:0} /* 주문내역 수정 */ .sodr_nonpay {color:#ff6600} From 5ae7d5058954c43e4cbd64702b54dffe057552bc Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 4 Nov 2013 15:06:26 +0900 Subject: [PATCH 12/28] =?UTF-8?q?ct=5Fstatus=20=ED=95=84=EB=93=9C=20?= =?UTF-8?q?=ED=83=80=EC=9E=85=20=EB=B3=80=EA=B2=BD=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/shop.extend2.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php index 89a16d1a9..1107521c0 100644 --- a/extend/shop.extend2.php +++ b/extend/shop.extend2.php @@ -637,4 +637,12 @@ if(!sql_query(" DESCRIBE `{$g5['g5_shop_order_delete_table']}` ", false)) { PRIMARY KEY (`de_id`) )", true); } + +// 장바구니 테이블에 입금 상태 추가 +$sql = " SHOW COLUMNS from {$g5['g5_shop_cart_table']} LIKE 'ct_status' "; +$row= sql_fetch($sql); +if(stripos($row['Type'], 'enum') !== false) { + sql_query(" ALTER TABLE `{$g5['g5_shop_cart_table']}` + CHANGE `ct_status` `ct_status` varchar(255) NOT NULL DEFAULT '' ", true); +} ?> From c55eafaec7aa2e158393aa000dd94a777a3bf481 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 4 Nov 2013 15:22:15 +0900 Subject: [PATCH 13/28] =?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#316=20=EC=A3=BC=EB=AC=B8=EB=82=B4?= =?UTF-8?q?=EC=97=AD=20=EC=83=81=ED=92=88=EB=A6=AC=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=96=B4=20=EB=A7=88=ED=81=AC=EC=97=85=20?= =?UTF-8?q?=EB=B0=8F=20=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/ajax.orderitem.php | 10 ++++------ adm/shop_admin/orderlist.php | 4 ++-- css/admin.css | 10 +++++++++- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/adm/shop_admin/ajax.orderitem.php b/adm/shop_admin/ajax.orderitem.php index e02d85efd..6813955d9 100644 --- a/adm/shop_admin/ajax.orderitem.php +++ b/adm/shop_admin/ajax.orderitem.php @@ -28,7 +28,6 @@ $result = sql_query($sql);

    주문상품 목록

    -
    상품이미지상품명총수량판매가쿠폰소계포인트상품이미지상품명
    총수량판매가쿠폰소계포인트
    + @@ -189,11 +191,13 @@ ob_start();
    @@ -71,17 +70,17 @@ $result = sql_query($sql); ?> - - - - + + @@ -95,6 +94,5 @@ $result = sql_query($sql); ?>
    주문 상품 목록
    + +
    -
    \ No newline at end of file diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index a845ca34f..56cbb3b82 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -445,7 +445,7 @@ $(function(){ $this.parent().append("
    "); $("#orderitemlist .itemlist") .html(data) - .append("
    "); + .append("
    "); } ); @@ -453,7 +453,7 @@ $(function(){ }); // 상품리스트 닫기 - $("#orderitemlist-x").on("click", function() { + $(".orderitemlist-x").on("click", function() { $("#orderitemlist").remove(); }); diff --git a/css/admin.css b/css/admin.css index c3bc67ce5..ef99c06cf 100644 --- a/css/admin.css +++ b/css/admin.css @@ -351,7 +351,9 @@ table .tr_bg1 {background:#f9f9f9} td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center} .td_id {width:150px} .td_idsmall {width:75px} +.td_itname {text-align:left !important} .td_itopt {width:200px} +.td_itopt_tl {text-align:left !important} .td_img {text-align:center} .td_imgline {width:70px;text-align:center} .td_input input {width:94%} @@ -440,10 +442,16 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center} .scf_sms_cnt {display:block} /* 주문내역 */ -#sodr_list td {text-align:center !important} +#sodr_list td {text-align:center} +#sodr_list .td_name {text-align:center !important} #orderitemlist {position:relative} #orderitemlist .itemlist {position:absolute;top:0;left:0} +#orderitemlist {position:relative} +#orderitemlist .itemlist {z-index:2;position:absolute;top:0;left:-41px;width:958px;border:1px solid #a2a5a9;background:#f2f5f9} +#orderitemlist td {background:#fff} +#orderitemlist #orderitemlist_close {padding:0 20px 10px;text-align:right} + /* 주문내역 수정 */ .sodr_nonpay {color:#ff6600} strong.sodr_nonpay {display:block;padding:5px 0;text-align:right} From f95cae2ee5f6dd10700789a0e408270d3fc366f7 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 4 Nov 2013 17:08:15 +0900 Subject: [PATCH 14/28] =?UTF-8?q?=ED=95=84=ED=84=B0=EB=A7=81=20textarea=20?= =?UTF-8?q?=EC=97=90=20=EC=9E=98=EB=AA=BB=20=EC=BD=94=EB=94=A9=EB=90=9C=20?= =?UTF-8?q?=EA=B3=B5=EB=B0=B1=EC=9D=84=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/config_form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/config_form.php b/adm/config_form.php index 34d49e7c1..0213eed72 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -467,7 +467,7 @@ $pg_anchor = '