From 7526dc0656f32e7bed38808b3f234663547343a4 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 4 Dec 2013 10:04:26 +0900 Subject: [PATCH 01/16] =?UTF-8?q?=EB=B0=B0=EC=86=A1=EC=95=88=EB=82=B4=20?= =?UTF-8?q?=EB=A9=94=EC=9D=BC=EC=97=90=20=EB=B0=B0=EC=86=A1=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EB=A7=81=ED=81=AC=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/ordermail.inc.php | 1 + shop/mail/ordermail.mail.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/adm/shop_admin/ordermail.inc.php b/adm/shop_admin/ordermail.inc.php index 357ebce0c..e631fd865 100644 --- a/adm/shop_admin/ordermail.inc.php +++ b/adm/shop_admin/ordermail.inc.php @@ -75,6 +75,7 @@ if ($od_send_mail) $delivery_list['dl_company'] = $od['od_delivery_company']; $delivery_list['od_invoice'] = $od['od_invoice']; $delivery_list['od_invoice_time'] = $od['od_invoice_time']; + $delivery_list['dl_inquiry'] = get_delivery_inquiry($od['od_delivery_company'], $od['od_invoice'], 'dvr_link'); $is_delivery = true; } diff --git a/shop/mail/ordermail.mail.php b/shop/mail/ordermail.mail.php index e3917653f..49aa51a03 100644 --- a/shop/mail/ordermail.mail.php +++ b/shop/mail/ordermail.mail.php @@ -123,7 +123,7 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig 배송회사 - + 운송장번호 From 2be3d0511c6147c4807d1292796ec7e0b034a3df Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 4 Dec 2013 10:30:23 +0900 Subject: [PATCH 02/16] =?UTF-8?q?=EC=83=88=EA=B8=80=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=BD=94=EB=A9=98=ED=8A=B8=20=EC=82=AD=EC=A0=9C=EC=8B=9C=20?= =?UTF-8?q?=EC=9B=90=EA=B8=80=20=EC=82=AD=EC=A0=9C=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=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 --- bbs/new.php | 1 + 1 file changed, 1 insertion(+) diff --git a/bbs/new.php b/bbs/new.php index 4af2934a2..d91c0a8e2 100644 --- a/bbs/new.php +++ b/bbs/new.php @@ -73,6 +73,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) { $row2 = sql_fetch(" select * from {$tmp_write_table} where wr_id = '{$row['wr_parent']}' "); $row3 = sql_fetch(" select mb_id, wr_name, wr_email, wr_homepage, wr_datetime from {$tmp_write_table} where wr_id = '{$row['wr_id']}' "); $list[$i] = $row2; + $list[$i]['wr_id'] = $row['wr_id']; $list[$i]['mb_id'] = $row3['mb_id']; $list[$i]['wr_name'] = $row3['wr_name']; $list[$i]['wr_email'] = $row3['wr_email']; From 2e7f04b8771b015e53fa8292027a6638894888dd Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 4 Dec 2013 13:11:22 +0900 Subject: [PATCH 03/16] =?UTF-8?q?trackback=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EA=B5=AC=EB=AC=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_copy_update.php | 1 - adm/sql_write.sql | 1 - install/gnuboard5.sql | 2 -- 3 files changed, 4 deletions(-) diff --git a/adm/board_copy_update.php b/adm/board_copy_update.php index 4eaab6076..e89c4468b 100644 --- a/adm/board_copy_update.php +++ b/adm/board_copy_update.php @@ -43,7 +43,6 @@ $sql = " insert into {$g5['board_table']} bo_download_level = '{$board[bo_download_level]}', bo_html_level = '{$board[bo_html_level]}', bo_link_level = '{$board[bo_link_level]}', - bo_trackback_level = '{$board[bo_trackback_level]}', bo_count_modify = '{$board[bo_count_modify]}', bo_count_delete = '{$board[bo_count_delete]}', bo_read_point = '{$board[bo_read_point]}', diff --git a/adm/sql_write.sql b/adm/sql_write.sql index f943b0453..21cad8d7f 100644 --- a/adm/sql_write.sql +++ b/adm/sql_write.sql @@ -14,7 +14,6 @@ CREATE TABLE `__TABLE_NAME__` ( `wr_link2` text NOT NULL, `wr_link1_hit` int(11) NOT NULL DEFAULT '0', `wr_link2_hit` int(11) NOT NULL DEFAULT '0', - `wr_trackback` varchar(255) NOT NULL, `wr_hit` int(11) NOT NULL DEFAULT '0', `wr_good` int(11) NOT NULL DEFAULT '0', `wr_nogood` int(11) NOT NULL DEFAULT '0', diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql index cc177af55..986aaa475 100644 --- a/install/gnuboard5.sql +++ b/install/gnuboard5.sql @@ -35,7 +35,6 @@ CREATE TABLE IF NOT EXISTS `g5_board` ( `bo_download_level` tinyint(4) NOT NULL DEFAULT '0', `bo_html_level` tinyint(4) NOT NULL DEFAULT '0', `bo_link_level` tinyint(4) NOT NULL DEFAULT '0', - `bo_trackback_level` tinyint(4) NOT NULL DEFAULT '0', `bo_count_delete` tinyint(4) NOT NULL DEFAULT '0', `bo_count_modify` tinyint(4) NOT NULL DEFAULT '0', `bo_read_point` int(11) NOT NULL DEFAULT '0', @@ -55,7 +54,6 @@ CREATE TABLE IF NOT EXISTS `g5_board` ( `bo_use_name` tinyint(4) NOT NULL DEFAULT '0', `bo_use_signature` tinyint(4) NOT NULL DEFAULT '0', `bo_use_ip_view` tinyint(4) NOT NULL DEFAULT '0', - `bo_use_trackback` tinyint(4) NOT NULL DEFAULT '0', `bo_use_list_view` tinyint(4) NOT NULL DEFAULT '0', `bo_use_list_file` tinyint(4) NOT NULL DEFAULT '0', `bo_use_list_content` tinyint(4) NOT NULL DEFAULT '0', From 429a7b24072bde045966c52345d68c3a556e655b Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 4 Dec 2013 13:50:44 +0900 Subject: [PATCH 04/16] =?UTF-8?q?=EA=B0=80=EA=B2=A9=EB=B9=84=EA=B5=90=20?= =?UTF-8?q?=EC=82=AC=EC=9D=B4=ED=8A=B8=20=EC=96=B4=EB=B0=94=EC=9B=83=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=ED=8C=8C=EC=9D=BC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/price.php | 8 -- shop/price/about.php | 94 ------------------------ shop/price/about_new.php | 95 ------------------------ shop/price2/about.php | 149 ------------------------------------- shop/price2/about_new.php | 150 -------------------------------------- 5 files changed, 496 deletions(-) delete mode 100644 shop/price/about.php delete mode 100644 shop/price/about_new.php delete mode 100644 shop/price2/about.php delete mode 100644 shop/price2/about_new.php diff --git a/adm/shop_admin/price.php b/adm/shop_admin/price.php index ad5345122..99db62116 100644 --- a/adm/shop_admin/price.php +++ b/adm/shop_admin/price.php @@ -50,14 +50,6 @@ $pg_anchor = ' -
어바웃
-
- -
diff --git a/shop/price/about.php b/shop/price/about.php deleted file mode 100644 index 363735d65..000000000 --- a/shop/price/about.php +++ /dev/null @@ -1,94 +0,0 @@ -"; - -$sql =" select * from {$g5['g5_shop_item_table']} where it_use = '1' order by ca_id"; -$result = sql_query($sql); - -for ($i=0; $row=sql_fetch_array($result); $i++) -{ - $ca_id1 = ""; - $ca_id2 = ""; - $ca_id3 = ""; - $ca_id4 = ""; - $ca_name1 = ""; - $ca_name2 = ""; - $ca_name3 = ""; - $ca_name4 = ""; - - $ca_id1 = substr($row['ca_id'],0,2); - $row2 = sql_fetch(" select ca_name from {$g5['g5_shop_category_table']} where ca_id = '$ca_id1' "); - $ca_name1 = $row2['ca_name']; - - if (strlen($row['ca_id']) >= 4) { - $ca_id2 = substr($row['ca_id'],0,4); - $row2 = sql_fetch(" select ca_name from {$g5['g5_shop_category_table']} where ca_id = '$ca_id2' "); - $ca_name2 = $row2['ca_name']; - } - - if (strlen($row['ca_id']) >= 6) { - $ca_id3 = substr($row['ca_id'],0,6); - $row2 = sql_fetch(" select ca_name from {$g5['g5_shop_category_table']} where ca_id = '$ca_id3' "); - $ca_name3 = $row2['ca_name']; - } - - if (strlen($row['ca_id']) >= 8) { - $ca_id4 = substr($row['ca_id'],0,8); - $row2 = sql_fetch(" select ca_name from {$g5['g5_shop_category_table']} where ca_id = '$ca_id4' "); - $ca_name4 = $row2['ca_name']; - } - - $PRDATE = substr($row['it_time'], 0, 10); - - // 배송비계산 - $delivery = get_item_sendcost2($row['it_id'], $row['it_price'], 1); - - // 상품이미지 - $img_url = get_it_imageurl($row['it_id']); - - // 포인트 - $it_point = get_item_point($row); - -echo "{$lt}{$row['it_id']}{$gt}"; // 쇼핑몰 상품ID -echo "{$lt}C{$gt}"; // 상품구분 C/U/D 전체EP는 일괄적으로 C -echo "{$lt}{$row['it_name']}{$gt}"; // 상품명 -echo "{$lt}{$row['it_price']}{$gt}"; // 판매가격 -echo "{$lt}".G5_SHOP_URL."/item.php?it_id={$row['it_id']}{$gt}"; // 상품의 상세페이지 주소 -echo "{$lt}".$img_url."{$gt}"; // 이미지 URL -echo "{$lt}$ca_id1{$gt}"; // 대분류 카테고리 코드 -echo "{$lt}$ca_id2{$gt}"; // 중분류 카테고리 코드 -echo "{$lt}$ca_id3{$gt}"; // 소분류 카테고리 코드 -echo "{$lt}$ca_id4{$gt}"; // 세분류 카테고리 코드 -echo "{$lt}$ca_name1{$gt}"; // 대 카테고리명 -echo "{$lt}$ca_name2{$gt}"; // 중 카테고리명 -echo "{$lt}$ca_name3{$gt}"; // 소 카테고리명 -echo "{$lt}$ca_name4{$gt}"; // 세 카테고리명 -echo "{$lt}{$gt}"; // 모델명 -echo "{$lt}{$gt}"; // 브랜드 -echo "{$lt}{$row['it_maker']}{$gt}"; // 메이커 -echo "{$lt}{$row['it_origin']}{$gt}"; // 원산지 -echo "{$lt}$PRDATE{$gt}"; // 상품등록일자 -echo "{$lt}$delivery{$gt}"; // 배송비 -echo "{$lt}{$gt}"; // 이벤트 -echo "{$lt}{$gt}"; // 쿠폰금액 -echo "{$lt}{$gt}"; // 무이자 -echo "{$lt}$it_point{$gt}"; // 적립금 -echo "{$lt}Y{$gt}"; // 이미지변경여부 -echo "{$lt}{$gt}"; // 물품특성정보 -echo "{$lt}{$gt}"; // 상점내 매출비율 -echo "{$lt}"; // 상품정보 변경시간 -echo "\r\n"; -} - -$content = ob_get_contents(); -ob_end_clean(); - -// 100124 : 옥션에서는 아직 utf-8 을 지원하지 않고 있음 -$content = iconv('utf-8', 'euc-kr', $content); - -echo $content; -?> \ No newline at end of file diff --git a/shop/price/about_new.php b/shop/price/about_new.php deleted file mode 100644 index e3bd55e78..000000000 --- a/shop/price/about_new.php +++ /dev/null @@ -1,95 +0,0 @@ -"; - -$time = date("Y-m-d 00:00:00", G5_SERVER_TIME - 86400); -$sql =" select * from {$g5['g5_shop_item_table']} where it_use = '1' and it_time >= '$time' order by ca_id"; -$result = sql_query($sql); - -for ($i=0; $row=sql_fetch_array($result); $i++) -{ - $ca_id1 = ""; - $ca_id2 = ""; - $ca_id3 = ""; - $ca_id4 = ""; - $ca_name1 = ""; - $ca_name2 = ""; - $ca_name3 = ""; - $ca_name4 = ""; - - $ca_id1 = substr($row['ca_id'],0,2); - $row2 = sql_fetch(" select ca_name from {$g5['g5_shop_category_table']} where ca_id = '$ca_id1' "); - $ca_name1 = $row2['ca_name']; - - if (strlen($row['ca_id']) >= 4) { - $ca_id2 = substr($row['ca_id'],0,4); - $row2 = sql_fetch(" select ca_name from {$g5['g5_shop_category_table']} where ca_id = '$ca_id2' "); - $ca_name2 = $row2['ca_name']; - } - - if (strlen($row['ca_id']) >= 6) { - $ca_id3 = substr($row['ca_id'],0,6); - $row2 = sql_fetch(" select ca_name from {$g5['g5_shop_category_table']} where ca_id = '$ca_id3' "); - $ca_name3 = $row2['ca_name']; - } - - if (strlen($row['ca_id']) >= 8) { - $ca_id4 = substr($row['ca_id'],0,8); - $row2 = sql_fetch(" select ca_name from {$g5['g5_shop_category_table']} where ca_id = '$ca_id4' "); - $ca_name4 = $row2['ca_name']; - } - - $PRDATE = substr($row['it_time'], 0, 10); - - // 배송비계산 - $delivery = get_item_sendcost2($row['it_id'], $row['it_price'], 1); - - // 상품이미지 - $img_url = get_it_imageurl($row['it_id']); - - // 포인트 - $it_point = get_item_point($row); - -echo "{$lt}{$row['it_id']}{$gt}"; // 쇼핑몰 상품ID -echo "{$lt}C{$gt}"; // 상품구분 C/U/D 전체EP는 일괄적으로 C -echo "{$lt}{$row['it_name']}{$gt}"; // 상품명 -echo "{$lt}{$row['it_price']}{$gt}"; // 판매가격 -echo "{$lt}".G5_SHOP_URL."/item.php?it_id={$row['it_id']}{$gt}"; // 상품의 상세페이지 주소 -echo "{$lt}".$img_url."{$gt}"; // 이미지 URL -echo "{$lt}$ca_id1{$gt}"; // 대분류 카테고리 코드 -echo "{$lt}$ca_id2{$gt}"; // 중분류 카테고리 코드 -echo "{$lt}$ca_id3{$gt}"; // 소분류 카테고리 코드 -echo "{$lt}$ca_id4{$gt}"; // 세분류 카테고리 코드 -echo "{$lt}$ca_name1{$gt}"; // 대 카테고리명 -echo "{$lt}$ca_name2{$gt}"; // 중 카테고리명 -echo "{$lt}$ca_name3{$gt}"; // 소 카테고리명 -echo "{$lt}$ca_name4{$gt}"; // 세 카테고리명 -echo "{$lt}{$gt}"; // 모델명 -echo "{$lt}{$gt}"; // 브랜드 -echo "{$lt}{$row['it_maker']}{$gt}"; // 메이커 -echo "{$lt}{$row['it_origin']}{$gt}"; // 원산지 -echo "{$lt}$PRDATE{$gt}"; // 상품등록일자 -echo "{$lt}$delivery{$gt}"; // 배송비 -echo "{$lt}{$gt}"; // 이벤트 -echo "{$lt}{$gt}"; // 쿠폰금액 -echo "{$lt}{$gt}"; // 무이자 -echo "{$lt}$it_point{$gt}"; // 적립금 -echo "{$lt}Y{$gt}"; // 이미지변경여부 -echo "{$lt}{$gt}"; // 물품특성정보 -echo "{$lt}{$gt}"; // 상점내 매출비율 -echo "{$lt}"; // 상품정보 변경시간 -echo "\r\n"; -} - -$content = ob_get_contents(); -ob_end_clean(); - -// 100124 : 옥션에서는 아직 utf-8 을 지원하지 않고 있음 -$content = iconv('utf-8', 'euc-kr', $content); - -echo $content; -?> \ No newline at end of file diff --git a/shop/price2/about.php b/shop/price2/about.php deleted file mode 100644 index 08d9f3b26..000000000 --- a/shop/price2/about.php +++ /dev/null @@ -1,149 +0,0 @@ -"; - -$sql =" select * from {$g5['g5_shop_item_table']} where it_use = '1' order by ca_id"; -$result = sql_query($sql); - -for ($i=0; $row=sql_fetch_array($result); $i++) -{ - $ca_id1 = ""; - $ca_id2 = ""; - $ca_id3 = ""; - $ca_id4 = ""; - $ca_name1 = ""; - $ca_name2 = ""; - $ca_name3 = ""; - $ca_name4 = ""; - - $ca_id1 = substr($row['ca_id'],0,2); - $row2 = sql_fetch(" select ca_name from {$g5['g5_shop_category_table']} where ca_id = '$ca_id1' "); - $ca_name1 = $row2['ca_name']; - - if (strlen($row['ca_id']) >= 4) { - $ca_id2 = substr($row['ca_id'],0,4); - $row2 = sql_fetch(" select ca_name from {$g5['g5_shop_category_table']} where ca_id = '$ca_id2' "); - $ca_name2 = $row2['ca_name']; - } - - if (strlen($row['ca_id']) >= 6) { - $ca_id3 = substr($row['ca_id'],0,6); - $row2 = sql_fetch(" select ca_name from {$g5['g5_shop_category_table']} where ca_id = '$ca_id3' "); - $ca_name3 = $row2['ca_name']; - } - - if (strlen($row['ca_id']) >= 8) { - $ca_id4 = substr($row['ca_id'],0,8); - $row2 = sql_fetch(" select ca_name from {$g5['g5_shop_category_table']} where ca_id = '$ca_id4' "); - $ca_name4 = $row2['ca_name']; - } - - $PRDATE = substr($row['it_time'], 0, 10); - - // 상품이미지 - $img_url = get_it_imageurl($row['it_id']); - - // 포인트 - $it_point = get_item_point($row); - - // 상품별옵션 - $sql = " select * from {$g5['g5_shop_item_option_table']} where it_id = '{$row['it_id']}' and io_type = '0' and io_use = '1' order by io_no asc "; - $result2 = sql_query($sql); - $opt_count = @mysql_num_rows($result2); - - if(!$opt_count) { - $it_name = $row['it_name']; - $buy_url = G5_SHOP_URL.'/itembuy.php?it_id='.$row['it_id']; - $it_price = $row['it_price']; - $delivery = get_item_sendcost2($row['it_id'], $it_price, 1); - -echo "{$lt}{$row['it_id']}{$gt}"; // 쇼핑몰 상품ID -echo "{$lt}C{$gt}"; // 상품구분 C/U/D 전체EP는 일괄적으로 C -echo "{$lt}{$it_name}{$gt}"; // 상품명 -echo "{$lt}{$it_price}{$gt}"; // 판매가격 -echo "{$lt}{$buy_url}{$gt}"; // 상품의 상세페이지 주소 -echo "{$lt}".$img_url."{$gt}"; // 이미지 URL -echo "{$lt}$ca_id1{$gt}"; // 대분류 카테고리 코드 -echo "{$lt}$ca_id2{$gt}"; // 중분류 카테고리 코드 -echo "{$lt}$ca_id3{$gt}"; // 소분류 카테고리 코드 -echo "{$lt}$ca_id4{$gt}"; // 세분류 카테고리 코드 -echo "{$lt}$ca_name1{$gt}"; // 대 카테고리명 -echo "{$lt}$ca_name2{$gt}"; // 중 카테고리명 -echo "{$lt}$ca_name3{$gt}"; // 소 카테고리명 -echo "{$lt}$ca_name4{$gt}"; // 세 카테고리명 -echo "{$lt}{$gt}"; // 모델명 -echo "{$lt}{$gt}"; // 브랜드 -echo "{$lt}{$row['it_maker']}{$gt}"; // 메이커 -echo "{$lt}{$row['it_origin']}{$gt}"; // 원산지 -echo "{$lt}$PRDATE{$gt}"; // 상품등록일자 -echo "{$lt}$delivery{$gt}"; // 배송비 -echo "{$lt}{$gt}"; // 이벤트 -echo "{$lt}{$gt}"; // 쿠폰금액 -echo "{$lt}{$gt}"; // 무이자 -echo "{$lt}$it_point{$gt}"; // 적립금 -echo "{$lt}Y{$gt}"; // 이미지변경여부 -echo "{$lt}{$gt}"; // 물품특성정보 -echo "{$lt}{$gt}"; // 상점내 매출비율 -echo "{$lt}"; // 상품정보 변경시간 -echo "\r\n"; - - } else { - $subj = explode(',', $row['it_option_subject']); - for($k=0; $row2=sql_fetch_array($result2); $k++) { - $it_name = $row['it_name'].' '; - $opt = explode(chr(30), $row2['io_id']); - $sep = ''; - for($j=0; $j \ No newline at end of file diff --git a/shop/price2/about_new.php b/shop/price2/about_new.php deleted file mode 100644 index 871bd9d5a..000000000 --- a/shop/price2/about_new.php +++ /dev/null @@ -1,150 +0,0 @@ -"; - -$time = date("Y-m-d 00:00:00", G5_SERVER_TIME - 86400); -$sql =" select * from {$g5['g5_shop_item_table']} where it_use = '1' and it_time >= '$time' order by ca_id"; -$result = sql_query($sql); - -for ($i=0; $row=sql_fetch_array($result); $i++) -{ - $ca_id1 = ""; - $ca_id2 = ""; - $ca_id3 = ""; - $ca_id4 = ""; - $ca_name1 = ""; - $ca_name2 = ""; - $ca_name3 = ""; - $ca_name4 = ""; - - $ca_id1 = substr($row['ca_id'],0,2); - $row2 = sql_fetch(" select ca_name from {$g5['g5_shop_category_table']} where ca_id = '$ca_id1' "); - $ca_name1 = $row2['ca_name']; - - if (strlen($row['ca_id']) >= 4) { - $ca_id2 = substr($row['ca_id'],0,4); - $row2 = sql_fetch(" select ca_name from {$g5['g5_shop_category_table']} where ca_id = '$ca_id2' "); - $ca_name2 = $row2['ca_name']; - } - - if (strlen($row['ca_id']) >= 6) { - $ca_id3 = substr($row['ca_id'],0,6); - $row2 = sql_fetch(" select ca_name from {$g5['g5_shop_category_table']} where ca_id = '$ca_id3' "); - $ca_name3 = $row2['ca_name']; - } - - if (strlen($row['ca_id']) >= 8) { - $ca_id4 = substr($row['ca_id'],0,8); - $row2 = sql_fetch(" select ca_name from {$g5['g5_shop_category_table']} where ca_id = '$ca_id4' "); - $ca_name4 = $row2['ca_name']; - } - - $PRDATE = substr($row['it_time'], 0, 10); - - // 상품이미지 - $img_url = get_it_imageurl($row['it_id']); - - // 포인트 - $it_point = get_item_point($row); - - // 상품별옵션 - $sql = " select * from {$g5['g5_shop_item_option_table']} where it_id = '{$row['it_id']}' and io_type = '0' and io_use = '1' order by io_no asc "; - $result2 = sql_query($sql); - $opt_count = @mysql_num_rows($result2); - - if(!$opt_count) { - $it_name = $row['it_name']; - $buy_url = G5_SHOP_URL.'/itembuy.php?it_id='.$row['it_id']; - $it_price = $row['it_price']; - $delivery = get_item_sendcost2($row['it_id'], $it_price, 1); - -echo "{$lt}{$row['it_id']}{$gt}"; // 쇼핑몰 상품ID -echo "{$lt}C{$gt}"; // 상품구분 C/U/D 전체EP는 일괄적으로 C -echo "{$lt}{$it_name}{$gt}"; // 상품명 -echo "{$lt}{$it_price}{$gt}"; // 판매가격 -echo "{$lt}".$buy_url."{$gt}"; // 상품의 상세페이지 주소 -echo "{$lt}".$img_url."{$gt}"; // 이미지 URL -echo "{$lt}$ca_id1{$gt}"; // 대분류 카테고리 코드 -echo "{$lt}$ca_id2{$gt}"; // 중분류 카테고리 코드 -echo "{$lt}$ca_id3{$gt}"; // 소분류 카테고리 코드 -echo "{$lt}$ca_id4{$gt}"; // 세분류 카테고리 코드 -echo "{$lt}$ca_name1{$gt}"; // 대 카테고리명 -echo "{$lt}$ca_name2{$gt}"; // 중 카테고리명 -echo "{$lt}$ca_name3{$gt}"; // 소 카테고리명 -echo "{$lt}$ca_name4{$gt}"; // 세 카테고리명 -echo "{$lt}{$gt}"; // 모델명 -echo "{$lt}{$gt}"; // 브랜드 -echo "{$lt}{$row['it_maker']}{$gt}"; // 메이커 -echo "{$lt}{$row['it_origin']}{$gt}"; // 원산지 -echo "{$lt}$PRDATE{$gt}"; // 상품등록일자 -echo "{$lt}$delivery{$gt}"; // 배송비 -echo "{$lt}{$gt}"; // 이벤트 -echo "{$lt}{$gt}"; // 쿠폰금액 -echo "{$lt}{$gt}"; // 무이자 -echo "{$lt}$it_point{$gt}"; // 적립금 -echo "{$lt}Y{$gt}"; // 이미지변경여부 -echo "{$lt}{$gt}"; // 물품특성정보 -echo "{$lt}{$gt}"; // 상점내 매출비율 -echo "{$lt}"; // 상품정보 변경시간 -echo "\r\n"; - - } else { - $subj = explode(',', $row['it_option_subject']); - for($k=0; $row2=sql_fetch_array($result2); $k++) { - $it_name = $row['it_name'].' '; - $opt = explode(chr(30), $row2['io_id']); - $sep = ''; - for($j=0; $j \ No newline at end of file From 7698589c56df50ce2de0a7cbed67ddb615a66feb Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 5 Dec 2013 11:16:01 +0900 Subject: [PATCH 05/16] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=201=EB=8C=80?= =?UTF-8?q?1=20=EB=AC=B8=EC=9D=98=20=EB=AA=A9=EB=A1=9D=20=EB=A7=88?= =?UTF-8?q?=ED=81=AC=EC=97=85,=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 --- adm/board_form.php | 3 +- css/default.css | 4 +- mobile/skin/qa/basic/list.skin.php | 91 +++++++++++++----------------- mobile/skin/qa/basic/style.css | 21 +++---- 4 files changed, 50 insertions(+), 69 deletions(-) diff --git a/adm/board_form.php b/adm/board_form.php index 788c6c8b3..4223285ce 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -434,7 +434,8 @@ $pg_anchor = '
    - >사용 (글쓴이 클릭시 나오는 레이어 메뉴) + > + 사용 (글쓴이 클릭시 나오는 레이어 메뉴) diff --git a/css/default.css b/css/default.css index 5ec4b5700..454883b0c 100644 --- a/css/default.css +++ b/css/default.css @@ -254,8 +254,8 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 /* 사이드뷰 */ .sv_wrap {display:inline-block;position:relative;font-weight:normal} -.sv_wrap .sv {z-index:1000;display:none;margin:5px 0 0;border:1px solid #283646;background:#111} -.sv_wrap .sv a {display:inline-block;margin:0;padding:3px;width:94px;border-bottom:1px solid #283646;color:#fff} +.sv_wrap .sv {z-index:1000;display:none;margin:5px 0 0;border:1px solid #283646} +.sv_wrap .sv a {display:inline-block;margin:0;padding:3px;width:94px;border-bottom:1px solid #283646;background:#111;color:#fff !important} .sv_wrap a:focus, .sv_wrap a:hover, .sv_wrap a:active {text-decoration:none} .sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto} .sv_nojs .sv {display:block} diff --git a/mobile/skin/qa/basic/list.skin.php b/mobile/skin/qa/basic/list.skin.php index 27a752ce5..b876fbadd 100644 --- a/mobile/skin/qa/basic/list.skin.php +++ b/mobile/skin/qa/basic/list.skin.php @@ -1,10 +1,5 @@ @@ -42,55 +37,45 @@ if ($is_checkbox) $colspan++; -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
    + + +
    + - '; } ?> - -
    목록
    번호 - - - 분류제목글쓴이상태등록일
    - - - - - - - -
    게시물이 없습니다.
    +
    +
      + +
    • + +
      + + +
      + +
      + + + + +
      +
      + + + + +
      +
      +
      • + + + 게시물이 없습니다.'; } ?> +
    diff --git a/mobile/skin/qa/basic/style.css b/mobile/skin/qa/basic/style.css index ee6a7fbb5..54a6095c1 100644 --- a/mobile/skin/qa/basic/style.css +++ b/mobile/skin/qa/basic/style.css @@ -26,19 +26,14 @@ #bo_w .btn_cancel {} #bo_w .btn_frmline {} /* 우편번호검색버튼 등 */ -/* 기본테이블 */ -/* 목록 테이블 */ -#bo_list .tbl_head01 {} -#bo_list .tbl_head01 caption {} -#bo_list .tbl_head01 thead th {} -#bo_list .tbl_head01 thead a {} -#bo_list .tbl_head01 thead th input {} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */ -#bo_list .tbl_head01 tfoot th {} -#bo_list .tbl_head01 tfoot td {} -#bo_list .tbl_head01 tbody th {} -#bo_list .tbl_head01 td {} -#bo_list .tbl_head01 a {} -#bo_list td.empty_table {} +/* 목록 */ +#bo_list .ul_wrap ul {margin:0;padding:0;border-top:1px solid #e9e9e9;list-style:none} +#bo_list .ul_wrap li {position:relative;padding:8px 10px;border-bottom:1px solid #e9e9e9} +#bo_list .ul_wrap li.bo_adm {padding:8px 10px 8px 30px} +#bo_list .ul_wrap a {display:block;padding:0 0 10px} +#bo_list .ul_wrap .li_chk {position:absolute;top:8px;left:10px} +#bo_list .ul_wrap .li_info span {display:inline-block;margin:0 5px 0 0;vertical-align:middle} +#bo_list .ul_wrap .li_stat {position:absolute;bottom:8px;right:10px} /* 읽기 내 테이블 */ #bo_v .tbl_head01 {} From f67669969e210c096d339856e1ff4524dd7c98cb Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 5 Dec 2013 11:17:25 +0900 Subject: [PATCH 06/16] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=201=EB=8C=80?= =?UTF-8?q?1=20=EB=AC=B8=EC=9D=98=20=EC=B6=94=EA=B0=80=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 --- mobile/skin/qa/basic/list.skin.php | 2 +- mobile/skin/qa/basic/style.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mobile/skin/qa/basic/list.skin.php b/mobile/skin/qa/basic/list.skin.php index b876fbadd..f5fad07ca 100644 --- a/mobile/skin/qa/basic/list.skin.php +++ b/mobile/skin/qa/basic/list.skin.php @@ -38,7 +38,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
    +
    diff --git a/mobile/skin/qa/basic/style.css b/mobile/skin/qa/basic/style.css index 54a6095c1..c2e9aafc9 100644 --- a/mobile/skin/qa/basic/style.css +++ b/mobile/skin/qa/basic/style.css @@ -27,6 +27,7 @@ #bo_w .btn_frmline {} /* 우편번호검색버튼 등 */ /* 목록 */ +#bo_list #list_chk {padding:0 10px 10px} #bo_list .ul_wrap ul {margin:0;padding:0;border-top:1px solid #e9e9e9;list-style:none} #bo_list .ul_wrap li {position:relative;padding:8px 10px;border-bottom:1px solid #e9e9e9} #bo_list .ul_wrap li.bo_adm {padding:8px 10px 8px 30px} From 43d018f11e107598176cd0dac17d632effe8070a Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 5 Dec 2013 11:47:24 +0900 Subject: [PATCH 07/16] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=201=EB=8C=80?= =?UTF-8?q?1=20=EB=AC=B8=EC=9D=98=20=EB=AA=A9=EB=A1=9D=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC=EC=BD=94=EB=93=9C=20=EC=9C=84=EC=B9=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 --- mobile/skin/qa/basic/style.css | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/mobile/skin/qa/basic/style.css b/mobile/skin/qa/basic/style.css index c2e9aafc9..28bdeaac5 100644 --- a/mobile/skin/qa/basic/style.css +++ b/mobile/skin/qa/basic/style.css @@ -26,16 +26,6 @@ #bo_w .btn_cancel {} #bo_w .btn_frmline {} /* 우편번호검색버튼 등 */ -/* 목록 */ -#bo_list #list_chk {padding:0 10px 10px} -#bo_list .ul_wrap ul {margin:0;padding:0;border-top:1px solid #e9e9e9;list-style:none} -#bo_list .ul_wrap li {position:relative;padding:8px 10px;border-bottom:1px solid #e9e9e9} -#bo_list .ul_wrap li.bo_adm {padding:8px 10px 8px 30px} -#bo_list .ul_wrap a {display:block;padding:0 0 10px} -#bo_list .ul_wrap .li_chk {position:absolute;top:8px;left:10px} -#bo_list .ul_wrap .li_info span {display:inline-block;margin:0 5px 0 0;vertical-align:middle} -#bo_list .ul_wrap .li_stat {position:absolute;bottom:8px;right:10px} - /* 읽기 내 테이블 */ #bo_v .tbl_head01 {} #bo_v .tbl_head01 caption {} @@ -73,17 +63,14 @@ /* ### 기본 스타일 커스터마이징 끝 ### */ /* 게시판 목록 */ -#bo_list .td_chk {width:30px;text-align:center} -#bo_list .td_group {width:100px;text-align:center} -#bo_list .td_board {width:120px;text-align:center} -#bo_list .td_num {width:50px;text-align:center} -#bo_list .td_numbig {width:80px;text-align:center} -#bo_list .td_mb_id {width:100px;text-align:center} -#bo_list .td_nick {width:100px;text-align:center} -#bo_list .td_name {width:100px;text-align:left} -#bo_list .td_date {width:60px;text-align:center} -#bo_list .td_datetime {width:150px;text-align:center} -#bo_list .td_mng {width:80px;text-align:center} +#bo_list #list_chk {padding:0 10px 10px} +#bo_list .ul_wrap ul {margin:0;padding:0;border-top:1px solid #e9e9e9;list-style:none} +#bo_list .ul_wrap li {position:relative;padding:8px 10px;border-bottom:1px solid #e9e9e9} +#bo_list .ul_wrap li.bo_adm {padding:8px 10px 8px 30px} +#bo_list .ul_wrap a {display:block;padding:0 0 10px} +#bo_list .ul_wrap .li_chk {position:absolute;top:8px;left:10px} +#bo_list .ul_wrap .li_info span {display:inline-block;margin:0 5px 0 0;vertical-align:middle} +#bo_list .ul_wrap .li_stat {position:absolute;bottom:8px;right:10px} #bo_cate h2 {width:0;height:0;font-size:0;line-height:0;overflow:hidden} #bo_cate ul {margin:5px 10px;padding-left:1px;zoom:1} From c05d81cf293f75602f6fafe0c17e300b4e52788e Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 5 Dec 2013 15:06:57 +0900 Subject: [PATCH 08/16] ereg -> preg_match --- plugin/PHPMailer_v2.0.4/class.phpmailer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/PHPMailer_v2.0.4/class.phpmailer.php b/plugin/PHPMailer_v2.0.4/class.phpmailer.php index a943219c1..9214dbc9b 100644 --- a/plugin/PHPMailer_v2.0.4/class.phpmailer.php +++ b/plugin/PHPMailer_v2.0.4/class.phpmailer.php @@ -591,7 +591,7 @@ class PHPMailer { /* Retry while there is no connection */ while($index < count($hosts) && $connection == false) { $hostinfo = array(); - if(eregi('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) { + if(preg_match('/^(.+):([0-9]+)$/i', $hosts[$index], $hostinfo)) { $host = $hostinfo[1]; $port = $hostinfo[2]; } else { From 9247f50aa1352080c2ae05cdd6d4296560f3016f Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 5 Dec 2013 15:07:39 +0900 Subject: [PATCH 09/16] =?UTF-8?q?=EC=97=91=EC=85=80=20=EB=B0=B0=EC=86=A1?= =?UTF-8?q?=EC=9D=BC=EA=B4=84=EC=B2=98=EB=A6=AC=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/admin.shop.lib.php | 122 ++++++++++++++++ adm/shop_admin/orderdelivery.php | 55 ++++++++ adm/shop_admin/orderdeliveryexcel.php | 60 ++++++++ adm/shop_admin/orderdeliveryupdate.php | 187 +++++++++++++++++++++++++ adm/shop_admin/orderlist.php | 9 ++ adm/shop_admin/orderlistupdate.php | 127 +---------------- 6 files changed, 436 insertions(+), 124 deletions(-) create mode 100644 adm/shop_admin/admin.shop.lib.php create mode 100644 adm/shop_admin/orderdelivery.php create mode 100644 adm/shop_admin/orderdeliveryexcel.php create mode 100644 adm/shop_admin/orderdeliveryupdate.php diff --git a/adm/shop_admin/admin.shop.lib.php b/adm/shop_admin/admin.shop.lib.php new file mode 100644 index 000000000..fa9563f9f --- /dev/null +++ b/adm/shop_admin/admin.shop.lib.php @@ -0,0 +1,122 @@ + \ No newline at end of file diff --git a/adm/shop_admin/orderdelivery.php b/adm/shop_admin/orderdelivery.php new file mode 100644 index 000000000..09783fbe7 --- /dev/null +++ b/adm/shop_admin/orderdelivery.php @@ -0,0 +1,55 @@ + + +
    +

    + +
    +

    + 엑셀파일을 이용하여 배송정보를 일괄등록할 수 있습니다.
    + 형식은 배송처리용 엑셀파일을 다운로드하여 배송 정보를 입력하시면 됩니다.
    + 수정 완료 후 엑셀파일을 업로드하시면 배송정보가 일괄등록됩니다.
    + 엑셀파일을 저장하실 때는 Excel 97 - 2003 통합문서 (*.xls) 로 저장하셔야 합니다.
    + 주문상태가 준비이고 미수금이 0인 주문에 한해 엑셀파일이 생성됩니다. +

    + +

    + 배송정보 일괄등록용 엑셀파일 다운로드 +

    +
    + +
    + +
    + + +
    + +
    + + + + + + +
    + +
    + + +
    + +
    + +
    + + \ No newline at end of file diff --git a/adm/shop_admin/orderdeliveryexcel.php b/adm/shop_admin/orderdeliveryexcel.php new file mode 100644 index 000000000..a4993ce4f --- /dev/null +++ b/adm/shop_admin/orderdeliveryexcel.php @@ -0,0 +1,60 @@ +addworksheet(); + +// Put Excel data +$data = array('주문번호', '주문자명', '주문자전화1', '주문자전화2', '배송자명', '배송지전화1', '배송지전화2', '배송지주소', '배송회사', '운송장번호'); +$data = array_map('iconv_euckr', $data); + +$col = 0; +foreach($data as $cell) { + $worksheet->write(0, $col++, $cell); +} + +for($i=1; $row=sql_fetch_array($result); $i++) { + $row = array_map('iconv_euckr', $row); + + $worksheet->write($i, 0, ' '.$row['od_id']); + $worksheet->write($i, 1, $row['od_name']); + $worksheet->write($i, 2, $row['od_tel']); + $worksheet->write($i, 3, $row['od_hp']); + $worksheet->write($i, 4, $row['od_b_name']); + $worksheet->write($i, 5, $row['od_b_tel']); + $worksheet->write($i, 6, $row['od_b_hp']); + $worksheet->write($i, 7, $row['od_b_addr1'].' '.$row['od_b_addr2']); + $worksheet->write($i, 8, $row['od_delivery_company']); + $worksheet->write($i, 9, $row['od_invoice']); +} + +$workbook->close(); + +header("Content-Type: application/x-msexcel; name=\"deliverylist-".date("ymd", time()).".xls\""); +header("Content-Disposition: inline; filename=\"deliverylist-".date("ymd", time()).".xls\""); +$fh=fopen($fname, "rb"); +fpassthru($fh); +unlink($fname); +?> \ No newline at end of file diff --git a/adm/shop_admin/orderdeliveryupdate.php b/adm/shop_admin/orderdeliveryupdate.php new file mode 100644 index 000000000..dfd480296 --- /dev/null +++ b/adm/shop_admin/orderdeliveryupdate.php @@ -0,0 +1,187 @@ +SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']); +} + +$escrow_count = 0; +if($_POST['send_escrow']) { + $escrow_tno = array(); + $escrow_corp = array(); + $escrow_numb = array(); + $escrow_idx = 0; +} + +if($_FILES['excelfile']['tmp_name']) { + $file = $_FILES['excelfile']['tmp_name']; + + include_once(G5_LIB_PATH.'/Excel/reader.php'); + + $data = new Spreadsheet_Excel_Reader(); + + // Set output Encoding. + $data->setOutputEncoding('UTF-8'); + + /*** + * if you want you can change 'iconv' to mb_convert_encoding: + * $data->setUTFEncoder('mb'); + * + **/ + + /*** + * By default rows & cols indeces start with 1 + * For change initial index use: + * $data->setRowColOffset(0); + * + **/ + + + + /*** + * Some function for formatting output. + * $data->setDefaultFormat('%.2f'); + * setDefaultFormat - set format for columns with unknown formatting + * + * $data->setColumnFormat(4, '%.3f'); + * setColumnFormat - set format for column (apply only to number fields) + * + **/ + + $data->read($file); + + /* + + + $data->sheets[0]['numRows'] - count rows + $data->sheets[0]['numCols'] - count columns + $data->sheets[0]['cells'][$i][$j] - data from $i-row $j-column + + $data->sheets[0]['cellsInfo'][$i][$j] - extended info about cell + + $data->sheets[0]['cellsInfo'][$i][$j]['type'] = "date" | "number" | "unknown" + if 'type' == "unknown" - use 'raw' value, because cell contain value with format '0.00'; + $data->sheets[0]['cellsInfo'][$i][$j]['raw'] = value if cell without format + $data->sheets[0]['cellsInfo'][$i][$j]['colspan'] + $data->sheets[0]['cellsInfo'][$i][$j]['rowspan'] + */ + + error_reporting(E_ALL ^ E_NOTICE); + + $fail_od_id = array(); + $total_count = 0; + $fail_count = 0; + $succ_count = 0; + + // $i 사용시 ordermail.inc.php의 $i 때문에 무한루프에 빠짐 + for ($k = 2; $k <= $data->sheets[0]['numRows']; $k++) { + $total_count++; + + $od_id = addslashes(trim($data->sheets[0]['cells'][$k][1])); + $od_delivery_company = addslashes($data->sheets[0]['cells'][$k][9]); + $od_invoice = addslashes($data->sheets[0]['cells'][$k][10]); + + if(!$od_id || !$od_delivery_company || !$od_invoice) { + $fail_count++; + $fail_od_id[] = $od_id; + continue; + } + + // 주문정보 + $od = sql_fetch(" select * from {$g5['g5_shop_order_table']} where od_id = '$od_id' "); + if (!$od) { + $fail_od_id[] = $od_id; + continue; + } + + $delivery['invoice'] = $od_invoice; + $delivery['invoice_time'] = G5_TIME_YMDHIS; + $delivery['delivery_company'] = $od_delivery_company; + + // 주문정보 업데이트 + order_update_delivery($od_id, $od['mb_id'], '배송', $delivery); + change_status($od_id, '준비', '배송'); + + // SMS + if($config['cf_sms_use'] == 'icode' && $_POST['send_sms'] && $default['de_sms_use5']) { + $sms_contents = conv_sms_contents($od_id, $default['de_sms_cont5']); + if($sms_contents) { + $receive_number = preg_replace("/[^0-9]/", "", $od['od_hp']); // 수신자번호 + $send_number = preg_replace("/[^0-9]/", "", $default['de_admin_company_tel']); // 발신자번호 + + if($receive_number && $send_number) { + $SMS->Add($receive_number, $send_number, $config['cf_icode_id'], $sms_contents, ""); + $sms_count++; + } + } + } + + // 메일 + if($config['cf_email_use'] && $_POST['od_send_mail']) + include './ordermail.inc.php'; + + // 에스크로 배송 + if($_POST['send_escrow'] && $od['od_tno'] && $od['od_escrow']) { + $escrow_tno[$escrow_idx] = $od['od_tno']; + $escrow_numb[$escrow_idx] = $od_invoice; + $escrow_corp[$escrow_idx] = $od_delivery_company; + $escrow_idx++; + $escrow_count++; + } + } +} + +// SMS +if($config['cf_sms_use'] == 'icode' && $_POST['send_sms'] && $sms_count) +{ + $SMS->Send(); +} + +// 에스크로 배송 +if($_POST['send_escrow'] && $escrow_count) +{ + include_once('./orderescrow.inc.php'); +} + +$g5['title'] = '엑셀 배송일괄처리 결과'; +include_once(G5_PATH.'/head.sub.php'); +?> + +
    +

    + +

    배송일괄처리를 완료했습니다.

    + +
    +
    총배송건수
    +
    +
    완료건수
    +
    +
    실패건수
    +
    + 0) { ?> +
    실패주문코드
    +
    + +
    + +
    + +
    + +
    + + \ No newline at end of file diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index 7fb7cfacf..a46a2d892 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -118,6 +118,8 @@ $listall = '전체목록 전체 주문내역 건 + + 엑셀배송처리
    @@ -495,6 +497,13 @@ $(function(){ $("body").on("click", function() { $("#orderitemlist").remove(); }); + + // 엑셀배송처리창 + $("#order_delivery").on("click", function() { + var opt = "width=600,height=450,left=10,top=10"; + window.open(this.href, "win_excel", opt); + return false; + }); }); function set_date(today) diff --git a/adm/shop_admin/orderlistupdate.php b/adm/shop_admin/orderlistupdate.php index 89c7d057d..db0469074 100644 --- a/adm/shop_admin/orderlistupdate.php +++ b/adm/shop_admin/orderlistupdate.php @@ -1,6 +1,7 @@ Date: Thu, 5 Dec 2013 15:24:55 +0900 Subject: [PATCH 10/16] =?UTF-8?q?=EC=97=91=EC=85=80=EB=B0=B0=EC=86=A1?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EB=A7=81=ED=81=AC=20=EC=A4=80=EB=B9=84=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=EC=97=90=EC=84=9C=EB=A7=8C=20=EB=82=98?= =?UTF-8?q?=EC=98=A4=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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index a46a2d892..a8d60abe5 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -118,8 +118,9 @@ $listall = '전체목록 전체 주문내역 건 - + 엑셀배송처리 +
    From 6bc1c3240aab7230dd75594cc36ed8af68701b3d Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 5 Dec 2013 15:25:13 +0900 Subject: [PATCH 11/16] =?UTF-8?q?=EC=97=91=EC=85=80=EC=A0=80=EC=9E=A5=20?= =?UTF-8?q?=ED=8F=AC=EB=A7=B7=20=EA=B0=95=EC=A1=B0=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/itemexcel.php | 2 +- adm/shop_admin/orderdelivery.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adm/shop_admin/itemexcel.php b/adm/shop_admin/itemexcel.php index c516d5beb..d91826794 100644 --- a/adm/shop_admin/itemexcel.php +++ b/adm/shop_admin/itemexcel.php @@ -16,7 +16,7 @@ include_once(G5_PATH.'/head.sub.php'); 엑셀파일을 이용하여 상품을 일괄등록할 수 있습니다.
    형식은 상품일괄등록용 엑셀파일을 다운로드하여 상품 정보를 입력하시면 됩니다.
    수정 완료 후 엑셀파일을 업로드하시면 상품이 일괄등록됩니다.
    - 엑셀파일을 저장하실 때는 Excel 97 - 2003 통합문서 (*.xls) 로 저장하셔야 합니다. + 엑셀파일을 저장하실 때는 Excel 97 - 2003 통합문서 (*.xls) 로 저장하셔야 합니다.

    diff --git a/adm/shop_admin/orderdelivery.php b/adm/shop_admin/orderdelivery.php index 09783fbe7..d88baa1ea 100644 --- a/adm/shop_admin/orderdelivery.php +++ b/adm/shop_admin/orderdelivery.php @@ -16,8 +16,8 @@ include_once(G5_PATH.'/head.sub.php'); 엑셀파일을 이용하여 배송정보를 일괄등록할 수 있습니다.
    형식은 배송처리용 엑셀파일을 다운로드하여 배송 정보를 입력하시면 됩니다.
    수정 완료 후 엑셀파일을 업로드하시면 배송정보가 일괄등록됩니다.
    - 엑셀파일을 저장하실 때는 Excel 97 - 2003 통합문서 (*.xls) 로 저장하셔야 합니다.
    - 주문상태가 준비이고 미수금이 0인 주문에 한해 엑셀파일이 생성됩니다. + 엑셀파일을 저장하실 때는 Excel 97 - 2003 통합문서 (*.xls) 로 저장하셔야 합니다.
    + 주문상태가 준비이고 미수금이 0인 주문에 한해 엑셀파일이 생성됩니다.

    From a06aea159b5f9dfd3562e05b210e45ea0c1d69d0 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 5 Dec 2013 15:34:33 +0900 Subject: [PATCH 12/16] =?UTF-8?q?=EC=97=91=EC=85=80=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=EC=8B=9C=20=EC=A3=BC=EB=AC=B8=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EB=B3=80=EA=B2=BD=EB=90=98=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=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/orderprintresult.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/orderprintresult.php b/adm/shop_admin/orderprintresult.php index a6583f734..039867b07 100644 --- a/adm/shop_admin/orderprintresult.php +++ b/adm/shop_admin/orderprintresult.php @@ -147,7 +147,7 @@ if ($csv == 'xls') $worksheet->write($i, 7, $row['ct_option']); $worksheet->write($i, 8, $ct_send_cost); $worksheet->write($i, 9, $row['it_id']); - $worksheet->write($i, 10, $row['od_id']); + $worksheet->write($i, 10, ' '.$row['od_id']); $worksheet->write($i, 11, $row['od_invoice']); $worksheet->write($i, 12, $row['od_memo']); } From 4b85df3ec381ee8302e24acd008ca2d7a032761d Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 5 Dec 2013 15:39:49 +0900 Subject: [PATCH 13/16] =?UTF-8?q?=EC=97=91=EC=85=80=20=EB=B0=B0=EC=86=A1?= =?UTF-8?q?=20=EC=9D=BC=EA=B4=84=EC=B2=98=EB=A6=AC=EC=8B=9C=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=EA=B0=80=20=EC=A4=80=EB=B9=84=EA=B0=80=20=EC=95=84?= =?UTF-8?q?=EB=8B=8C=20=EA=B2=83=EC=9D=80=20=EC=B2=98=EB=A6=AC=EC=95=88?= =?UTF-8?q?=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderdeliveryupdate.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/adm/shop_admin/orderdeliveryupdate.php b/adm/shop_admin/orderdeliveryupdate.php index dfd480296..54b802170 100644 --- a/adm/shop_admin/orderdeliveryupdate.php +++ b/adm/shop_admin/orderdeliveryupdate.php @@ -105,6 +105,11 @@ if($_FILES['excelfile']['tmp_name']) { continue; } + if($od['od_status'] == '준비') { + $fail_od_id[] = $od_id; + continue; + } + $delivery['invoice'] = $od_invoice; $delivery['invoice_time'] = G5_TIME_YMDHIS; $delivery['delivery_company'] = $od_delivery_company; From b4863810de7ba1948fd22c1566f926512ab4cf35 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 5 Dec 2013 15:48:09 +0900 Subject: [PATCH 14/16] =?UTF-8?q?=EC=97=90=EC=8A=A4=ED=81=AC=EB=A1=9C=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C=EB=B0=A9=EB=B2=95=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EC=A3=BC=EB=AC=B8?= =?UTF-8?q?=EC=83=81=ED=92=88=20=EB=A0=88=EC=9D=B4=EC=96=B4=20=EC=B6=9C?= =?UTF-8?q?=EB=A0=A5=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=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 --- adm/shop_admin/orderlist.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index a8d60abe5..418958d40 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -117,8 +117,8 @@ $listall = '전체목록 - 전체 주문내역 건 - + 전체 주문내역 건 + 0) { ?> 엑셀배송처리

    @@ -471,7 +471,7 @@ $(function(){ var $this = $(this); var od_id = $this.text().replace(/[^0-9]/g, ""); - if($this.next().size()) + if($this.next("#orderitemlist").size()) return false; $("#orderitemlist").remove(); @@ -480,7 +480,7 @@ $(function(){ "./ajax.orderitem.php", { od_id: od_id }, function(data) { - $this.parent().append("
    "); + $this.after("
    "); $("#orderitemlist .itemlist") .html(data) .append("
    "); From 3efeae844f0b3851fe5e7f8eb1edc35a8dc94318 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 5 Dec 2013 16:18:15 +0900 Subject: [PATCH 15/16] =?UTF-8?q?=EC=83=81=ED=92=88=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=EC=97=90=20=EC=83=81=ED=92=88=ED=92=88=EC=A0=88=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=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/itemform.php | 13 +++++++++++++ adm/shop_admin/itemformupdate.php | 3 +++ adm/shop_admin/itemlist.php | 2 ++ adm/shop_admin/itemlistupdate.php | 1 + extend/shop.extend2.php | 6 ++++++ install/gnuboard5shop.sql | 1 + lib/shop.lib.php | 4 ++-- 7 files changed, 28 insertions(+), 2 deletions(-) diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php index b66c61f0c..94bc0f528 100644 --- a/adm/shop_admin/itemform.php +++ b/adm/shop_admin/itemform.php @@ -481,6 +481,19 @@ $(function(){ + + + + + > 예 + + + + + + + + diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php index 8a2cd7a13..d595370d0 100644 --- a/adm/shop_admin/itemformupdate.php +++ b/adm/shop_admin/itemformupdate.php @@ -287,6 +287,7 @@ $sql_common = " ca_id = '$ca_id', it_notax = '$it_notax', it_sell_email = '$it_sell_email', it_use = '$it_use', + it_soldout = '$it_soldout', it_stock_qty = '$it_stock_qty', it_noti_qty = '$it_noti_qty', it_sc_type = '$it_sc_type', @@ -459,6 +460,7 @@ if(is_checked('chk_ca_it_notax')) $ca_fields .= " , it_notax = '$i if(is_checked('chk_ca_it_sell_email')) $ca_fields .= " , it_sell_email = '$it_sell_email' "; if(is_checked('chk_ca_it_tel_inq')) $ca_fields .= " , it_tel_inq = '$it_tel_inq' "; if(is_checked('chk_ca_it_use')) $ca_fields .= " , it_use = '$it_use' "; +if(is_checked('chk_ca_it_soldout')) $ca_fields .= " , it_soldout = '$it_soldout' "; if(is_checked('chk_ca_it_info')) $ca_fields .= " , it_info_gubun = '$it_info_gubun', it_info_value = '$it_info_value' "; if(is_checked('chk_ca_it_price')) $ca_fields .= " , it_price = '$it_price' "; if(is_checked('chk_ca_it_cust_price')) $ca_fields .= " , it_cust_price = '$it_cust_price' "; @@ -504,6 +506,7 @@ if(is_checked('chk_all_it_notax')) $all_fields .= " , it_notax = ' if(is_checked('chk_all_it_sell_email')) $all_fields .= " , it_sell_email = '$it_sell_email' "; if(is_checked('chk_all_it_tel_inq')) $all_fields .= " , it_tel_inq = '$it_tel_inq' "; if(is_checked('chk_all_it_use')) $all_fields .= " , it_use = '$it_use' "; +if(is_checked('chk_all_it_soldout')) $all_fields .= " , it_soldout = '$it_soldout' "; if(is_checked('chk_all_it_info')) $all_fields .= " , it_info_gubun = '$it_info_gubun', it_info_value = '$it_info_value' "; if(is_checked('chk_all_it_price')) $all_fields .= " , it_price = '$it_price' "; if(is_checked('chk_all_it_cust_price')) $all_fields .= " , it_cust_price = '$it_cust_price' "; diff --git a/adm/shop_admin/itemlist.php b/adm/shop_admin/itemlist.php index d580eb013..654e7bfa3 100644 --- a/adm/shop_admin/itemlist.php +++ b/adm/shop_admin/itemlist.php @@ -144,6 +144,7 @@ $listall = '전체목록분류 순서 판매 + 품절 조회 관리 @@ -184,6 +185,7 @@ $listall = '전체목록 value="1"> + value="1"> 보기 diff --git a/adm/shop_admin/itemlistupdate.php b/adm/shop_admin/itemlistupdate.php index 84dcbfa7a..258888143 100644 --- a/adm/shop_admin/itemlistupdate.php +++ b/adm/shop_admin/itemlistupdate.php @@ -25,6 +25,7 @@ if ($_POST['act_button'] == "선택수정") { it_price = '{$_POST['it_price'][$k]}', it_stock_qty = '{$_POST['it_stock_qty'][$k]}', it_use = '{$_POST['it_use'][$k]}', + it_soldout = '{$_POST['it_soldout'][$k]}', it_order = '{$_POST['it_order'][$k]}', it_update_time = '".G5_TIME_YMDHIS."' where it_id = '{$_POST['it_id'][$k]}' "; diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php index 932f68dcd..bf717cdb8 100644 --- a/extend/shop.extend2.php +++ b/extend/shop.extend2.php @@ -731,4 +731,10 @@ if(!sql_query(" select iq_hp from {$g5['g5_shop_item_qa_table']} limit 1 ", fals ADD `iq_hp` varchar(255) NOT NULL DEFAULT '' AFTER `iq_email` ", true); } */ + +// 상품품절 필드추가 +if(!sql_query(" select it_soldout from {$g5['g5_shop_item_table']} limit 1 ", false)) { + sql_query(" ALTER TABLE `{$g5['g5_shop_item_table']}` + ADD `it_soldout` tinyint(4) NOT NULL DEFAULT '0' AFTER `it_use` ", true); +} ?> diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql index 4b086f50a..2378f622a 100644 --- a/install/gnuboard5shop.sql +++ b/install/gnuboard5shop.sql @@ -427,6 +427,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_item` ( `it_notax` tinyint(4) NOT NULL DEFAULT '0', `it_sell_email` varchar(255) NOT NULL DEFAULT '', `it_use` tinyint(4) NOT NULL DEFAULT '0', + `it_soldout` tinyint(4) NOT NULL DEFAULT '0', `it_stock_qty` int(11) NOT NULL DEFAULT '0', `it_noti_qty` int(11) NOT NULL DEFAULT '0', `it_sc_type` tinyint(4) NOT NULL DEFAULT '0', diff --git a/lib/shop.lib.php b/lib/shop.lib.php index 09d40e837..1c35117fe 100644 --- a/lib/shop.lib.php +++ b/lib/shop.lib.php @@ -1831,10 +1831,10 @@ function is_soldout($it_id) global $g5; // 상품정보 - $sql = " select it_stock_qty from {$g5['g5_shop_item_table']} where it_id = '$it_id' "; + $sql = " select it_soldout, it_stock_qty from {$g5['g5_shop_item_table']} where it_id = '$it_id' "; $it = sql_fetch($sql); - if($it['it_stock_qty'] <= 0) + if($it['it_soldout'] || $it['it_stock_qty'] <= 0) return true; $count = 0; From fb8b3283ec47f5dbc283e9f8401cea3b357c36c9 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 5 Dec 2013 16:18:28 +0900 Subject: [PATCH 16/16] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EB=B0=8F=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EB=93=B1=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/default.css | 67 +++++++++++++++++----------------- css/mobile.css | 2 +- head.php | 57 ++++------------------------- img/ft.png | Bin 0 -> 3204 bytes img/ft_catch.jpg | Bin 7192 -> 0 bytes skin/board/basic/style.css | 4 +- skin/board/gallery/style.css | 4 +- skin/latest/basic/style.css | 2 +- skin/member/basic/style.css | 25 ++++++------- skin/new/basic/new.skin.php | 1 + skin/new/basic/style.css | 2 +- skin/outlogin/basic/style.css | 7 ++-- skin/poll/basic/style.css | 23 ++++++------ skin/popular/basic/style.css | 11 +++--- skin/visit/basic/style.css | 15 ++++---- tail.php | 2 +- 16 files changed, 88 insertions(+), 134 deletions(-) create mode 100644 img/ft.png delete mode 100644 img/ft_catch.jpg diff --git a/css/default.css b/css/default.css index 454883b0c..da04d20c9 100644 --- a/css/default.css +++ b/css/default.css @@ -3,14 +3,14 @@ /* 초기화 */ html {overflow-y:scroll} -body {margin:0;padding:0;background:#f9fafe;color:#000;font-size:0.75em;font-family:dotum} +body {margin:0;padding:0;font-size:0.75em;font-family:dotum} html, h1, h2, h3, h4, h5, h6, form, fieldset, img {margin:0;padding:0;border:0} 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} #hd ul, nav ul, #ft ul {margin:0;padding:0;list-style:none} legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} -label, input, select, img {vertical-align:middle} +label, input, button, select, img {vertical-align:middle} input, button {margin:0;padding:0;font-family:dotum;font-size:1em} button {cursor:pointer} @@ -22,29 +22,29 @@ a:link, a:visited {color:#000;text-decoration:none} a:hover, a:focus, a:active {color:#000;text-decoration:underline} /* 상단 레이아웃 */ -#hd {z-index:10;position:relative;min-width:980px;border-top:3px solid #151515;background:#fff} +#hd {z-index:10;position:relative;min-width:970px;background:#fff} #hd_h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} -#hd_wrapper {position:relative;margin:0 auto;width:980px} +#hd_wrapper {position:relative;margin:0 auto;width:970px} #logo {padding:26px 0} /* 전체 검색 */ -#sch_all {position:absolute;top:22px;left:170px;margin:0;padding:0;border:1px solid #555} +#sch_all {position:absolute;top:22px;left:170px;margin:0;padding:0;border:1px solid #c3c6ca} #sch_all legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} -#sch_all #sch_all_stx {padding-left:5px;width:165px;height:24px;border:0;background:#fff;line-height:1.9em !important;line-height:1.6em} -#sch_all_submit {padding:0 5px;height:26px;border:0;background:#555;color:#fff;cursor:pointer} +#sch_all #sch_all_stx {padding-left:5px;width:110px;height:24px;border:0;background:#fff;line-height:1.9em !important;line-height:1.6em} +#sch_all_submit {padding:0 5px;height:26px;border:0;background:#e2e6eb;color:#333;cursor:pointer} #tnb {position:absolute;top:18px;right:0;margin:0;padding:0;list-style:none;zoom:1} #tnb:after {display:block;visibility:hidden;clear:both;content:""} -#tnb li {float:left} +#tnb li {float:left;margin:0 0 0 10px} #tnb a {display:inline-block;padding:5px 10px;color:#333;letter-spacing:-0.1em;line-height:2em} #tnb a:focus, #tnb a:hover, #tnb a:active {text-decoration:none} #tnb img {margin-right:3px} /* gnb js off */ -#gnb {position:relative;margin:-1px 0 0;border-bottom:1px solid #c3c7c5;background:#f0f4f8} +#gnb {position:relative;margin:-1px 0 0;border-top:1px dotted #dde4e9;border-bottom:1px solid #dde4e9;background:#ecf0f7} #gnb h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} -#gnb #gnb_1dul {margin:0 auto !important;padding:0;width:980px;zoom:1} +#gnb #gnb_1dul {margin:0 auto !important;padding:0;width:970px;zoom:1} #gnb #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1dli {z-index:10;clear:both;zoom:1} .gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""} @@ -70,12 +70,12 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} .gnb_empty {width:100%;height:35px;text-align:center;line-height:2.95em} /* 중간 레이아웃 */ -#wrapper {z-index:5;margin:50px auto;width:980px;zoom:1} +#wrapper {z-index:5;margin:0 auto;width:970px;border-right:1px solid #dde4e9;border-left:1px solid #dde4e9;zoom:1} #wrapper:after {display:block;visibility:hidden;clear:both;content:""} -#aside {float:right;width:210px;border:1px solid #cfded8;background:#fff} +#aside {float:right;margin:0 0 0 -1px;width:210px;border-left:1px solid #dde4e9;background:#fff} -#container {z-index:4;position:relative;float:left;padding:25px 14px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border:1px solid #cfded8;background:#fff;font-size:1em;zoom:1} +#container {z-index:4;position:relative;float:left;padding:25px 16px 15px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border-right:1px solid #dde4e9;background:#fff;font-size:1em;zoom:1} #container:after {display:block;visibility:hidden;clear:both;content:""} #container_title {margin-bottom:20px;font-size:1.2em;font-weight:bold} @@ -86,14 +86,13 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} .ts_up2 {font-size:1.3em !important} /* 하단 레이아웃 */ -#ft {min-width:980px;background:#484848} +#ft {min-width:970px;border-top:1px solid #dde4e9;background:#f2f5f9} #ft h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} -#ft_catch {position:relative;margin:0 auto;padding:20px 0;width:980px;text-align:center} +#ft_catch {position:relative;margin:0 auto;padding:20px 0;width:970px;text-align:center} #ft_copy {background:#414141} -#ft_copy p {position:relative;margin:0 auto;width:980px;color:#4a9ab8} -#ft_copy b {color:#fff} +#ft_copy p {position:relative;margin:0 auto;width:970px;color:#fff} #ft_copy a {position:absolute;top:10px;right:0;color:#fff} /* 게시물 선택복사 선택이동 */ @@ -133,29 +132,29 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} .cke_sc_def dd {width:30%} /* 버튼 */ -a.btn01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;line-height:2.15em;vertical-align:middle} +a.btn01 {display:inline-block;padding:0 10px;height:25px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;line-height:2.2em;vertical-align:middle} a.btn01:focus, .btn01:hover {text-decoration:none} -a.btn02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #000;background:#333;color:#fff;text-decoration:none;line-height:2.15em;vertical-align:middle} +a.btn02 {display:inline-block;padding:0 10px;height:25px;border:1px solid #3b3c3f;background:#4b545e;color:#fff;text-decoration:none;line-height:2.2em;vertical-align:middle} a.btn02:focus, .btn02:hover {text-decoration:none} .btn_confirm {text-align:center} /* 서식단계 진행 */ -input.btn_submit {padding:0 10px;height:24px;border:0;background:#ff3061;color:#fff;letter-spacing:-0.1em;vertical-align:middle;cursor:pointer} -button.btn_submit {height:22px} -fieldset .btn_submit {height:22px} +input.btn_submit {padding:0 10px;height:27px;border:0;background:#ff3061;color:#fff;vertical-align:middle;cursor:pointer} +fieldset .btn_submit {height:24px} -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 {display:inline-block;padding:0 10px;height:25px;border:1px solid #ccc;background:#fafafa;line-height:2.3em;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} /* 우편번호검색버튼 등 */ +a.btn_frmline, button.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:24px;border:0;background:#4b545e;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top} /* 우편번호검색버튼 등 */ +a.btn_frmline {line-height:2.2em} button.btn_frmline {font-size:1em} /* 게시판용 버튼 */ -a.btn_b01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #d9ded9;background:#f2f5f9;color:#000;text-decoration:none;line-height:2.15em;vertical-align:middle} +a.btn_b01 {display:inline-block;padding:0 10px;height:25px;border:1px solid #d9ded9;background:#f2f5f9;color:#000;text-decoration:none;line-height:2.2em;vertical-align:middle} a.btn_b01:focus, .btn_b01:hover {text-decoration:none} -a.btn_b02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #000;background:#333;color:#fff;text-decoration:none;line-height:2.15em;vertical-align:middle} +a.btn_b02 {display:inline-block;padding:0 10px;height:25px;border:1px solid #3b3c3f;background:#4b545e;color:#fff;text-decoration:none;line-height:2.2em;vertical-align:middle} a.btn_b02:focus, .btn_b02:hover {text-decoration:none} -a.btn_admin {display:inline-block;padding:0 10px;height:23px;border:1px solid #e8180c;background:#e8180c;color:#fff;text-decoration:none;line-height:2.15em;vertical-align:middle} /* 관리자 전용 버튼 */ +a.btn_admin {display:inline-block;padding:0 10px;height:25px;border:1px solid #e8180c;background:#e8180c;color:#fff;text-decoration:none;line-height:2.2em;vertical-align:middle} /* 관리자 전용 버튼 */ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} /* 댓글 스타일 */ @@ -188,9 +187,9 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} /* 폼 테이블 */ .tbl_frm01 {margin:0 0 20px} .tbl_frm01 table {width:100%;border-collapse:collapse;border-spacing:0} -.tbl_frm01 th {width:100px;padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#f7f7f7;text-align:left} +.tbl_frm01 th {width:100px;padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#f5f8f9;text-align:left} .tbl_frm01 td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent} -.tbl_frm01 textarea, .tbl_frm01 .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7f7f7;color:#000;vertical-align:middle} +.tbl_frm01 textarea, .tbl_frm01 .frm_input {height:22px;border:1px solid #b8c9c2;background:#f7f7f7;color:#000;vertical-align:middle;line-height:2em} .tbl_frm01 textarea {width:98%;height:100px} /* .tbl_frm01 #captcha {margin:0;padding:0;border:0;background:transparent} @@ -201,7 +200,7 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} .tbl_frm01 .frm_address {display:block;margin-top:5px} .tbl_frm01 .frm_file {display:block;margin-bottom:5px} -fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7f7f7;color:#000;vertical-align:middle} +fieldset .frm_input {height:22px;border:1px solid #b8c9c2;background:#f7f7f7;color:#000;vertical-align:middle;line-height:2em} /* 자료 없는 목록 */ .empty_table {padding:50px 0 !important;text-align:center} @@ -233,7 +232,7 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 /* 새창 기본 스타일 */ .new_win {} .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 {margin:0 0 20px;padding:20px;border-top:3px solid #333;border-bottom:1px solid #dde4e9;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} .new_win .win_ul:after {display:block;visibility:hidden;clear:both;content:""} @@ -241,10 +240,10 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 .new_win .win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #455255;border-left:1px solid #455255;color:#fff;font-family:dotum;font-weight:bold;text-decoration:none} .new_win .win_desc {margin:0 20px} -.new_win .win_btn {clear:both;margin:20px;text-align:center} /* 새창용 */ -.new_win .win_btn button {display:inline-block;padding:0 10px;height:30px;border:0;background:#666;color:#fff;line-height:2em;cursor:pointer} +.new_win .win_btn {clear:both;padding:20px;text-align:center} /* 새창용 */ +.new_win .win_btn button {display:inline-block;padding:0 10px;height:30px;border:0;background:#4b545e;color:#fff;line-height:2em;cursor:pointer} .new_win .win_btn input {height:30px;line-height:2em} -.new_win .win_btn a {display:inline-block;padding:0 10px;height:30px;background:#666;color:#fff;vertical-align:middle;line-height:2.4em} +.new_win .win_btn a {display:inline-block;padding:0 10px;height:30px;background:#4b545e;color:#fff;vertical-align:middle;line-height:2.4em} .new_win .win_btn a:focus, .new_win .win_btn a:hover {text-decoration:none} /* 자바스크립트 alert 대안 */ diff --git a/css/mobile.css b/css/mobile.css index e7543c9a6..c7e9c488c 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -9,7 +9,7 @@ h1, h2, h3, h4, h5, h6 {font-size:1em} 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} legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} -label, input, select, img {vertical-align:middle} +label, input, button select, img {vertical-align:middle} 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} diff --git a/head.php b/head.php index d9bc8d637..6078b96f3 100644 --- a/head.php +++ b/head.php @@ -77,59 +77,18 @@ if ($config['cf_include_head']) { -
    diff --git a/img/ft.png b/img/ft.png new file mode 100644 index 0000000000000000000000000000000000000000..0259a9f17ff7cddaa53aac3935fcb62395b396fb GIT binary patch literal 3204 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 F{~yj5B!B<_ literal 0 HcmV?d00001 diff --git a/img/ft_catch.jpg b/img/ft_catch.jpg deleted file mode 100644 index b856ce5f2a8a73fe691ff32c2ad2553e0b3cbd21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7192 zcmcI}XHXN~w{1cP=^YWIgdh>AQXu$aG zpwyi$&c%DCvQOE00+HE>-a!t5u~fHYH~LsuNJa`um0OstLhqriy}bv@i^#&8+BCB= z=8itazFb^>VIAXT=nl>_QU7F&BSkETC*dXir{M(bRKz3V9qjvehhS>i%~DHm5wY#z z1VPyw!0`U_VQ$6cQ&oA}e*H%3$@r(I;1;-m$a64YhWFnO^MQFU#%J1lg8bm5EDVx_Ud+;4}BKa~?aq zMoU?UBX-GlU#f_Ng4k#RJp~k#KfX4uce1&ozhST6RXaA{!Xz;);+o0N!MZ@zoK<$q ztt&O=^;{3n)*8H31ponXzzEpboMUAT^p&Q4V@|Lx95910*=!qNcS{@ZFK2x)MxHjd8S$;Y}fj`)3!k0HJN!vM8 zD4>_i-`>9W9bZO>9s;eGW8#yGfB+`)I-is-a;{MH18XB*honM7$geD#pU;*HIiv!Q zS;4XutKYFT`bt9s9Df?p5c%>5S${`O2!;fH6soqD@&;{1y7ucJfg@86p+4%-jlq~>-_bmFR5#uTMh%AG1L*3TIikoXOX;DYg+Qk8 zS1E?RX_KK5mbTc_@8sN>>zq7z82-r5ld)|6S>A-jDkc7c0&1URvd-H{s`5L6giq=+Yd$LIzSxf1xXr>Z@VcgHj;aMMMxy}EDKan08D2B1l1v#eVa zi{20soJ(3kU-unr6|Rwx$X{pNzFPU$4e74eD!6?3?)>uTv;p^(o9x>Nidilv!72Jt zg+mci`Xx)rnG;jH9?2D}{G%E=Q^Wi%yZ#^y^|MoGxRst{|JB7{y5wHHY2F;C%d!Q< znW^+I$Vh6Ev&J!APFu=_Pm`wx3%)SD&%&!1B3tzQ?zpEYO;r1~O*LB1gQLOJl$XIwU)lkl}#^xh6LUr;M; zhbtC6V7-yf&Xkb5Y6BV>8xO~3Qham__iB{lm>E(JM~AsNr_bOse<=ZBF@lP6^bpD< ztP`Ebp5P6DGzS^HGna6z|GBfRE#wB!J79PN*azp{0DdC)iOu$C@`6*&uFh7^F15UF z0J4RleAXQ&(80>C7Pc}`EOr9#THpGfppxX6(xE@kF(ma;CnqhS`zUdo1^QDfk>6p8 zB;=C}DI1V?BvY{$kZ`@X2yZ`JLJrZ^(?G`Z~sh6B6NH# ze{Xk}dLT@KZJS-^wnx_m4bZIPjfFd4C)hmRsu)D|F@#JuUZ)k>1PPVTZDv$Ty;-pJ@uxoTC zpCV)Jye?h+Knjzv_hW}K4ZC;=Tu!d8wO4OT4!J|k7i==d!`{*qs8J(O@?dc@;sbta z>3iXLmTZ7q+)Tw{uQgUW0dWu%G_Kw>0(uAJodAIRI6Adj$BAH839wsIA5VHxDL>oLU{4G5cNWOg7c)teo- z+k7nk6KGX#nPtKX&%6UhauRvB`QYB zrGh@z9n~Jm&8pr%taO$WTvwL_G%{b$`b6w#KT&Hvvk@rwpcD&rMHJf$i;v~o6*Jl< zBiqW-za>Y}8o^3wg3hP9xiyZ1(K8RP*brYMPxU*;q-PZc%raxEcF*B$B%8w07k+z2 zb`)bA1+KXhc0>nkyifA5mCSnlZ)$D;AiZh$T=ro8uJ(s;sF|gvNj~KZ^e9rq{4%c5 z>nf_x$G8X|b*+mCKEdN{0QS?q_Mgw_m53K_0LjvI^M0=pTTZ`T1qU=qx#Sr-)-4pn zU%zVmd#pS1^GGSgh$^{D!9PDt-VsrTT$cckR#b_8+)ReEnyuV%F zfu9$gW32CkA^v!Jw2p9J>(*tsSE9babjfW94L#eWWb5%J_Zl#oGIJ!>JCm!CFDfjU z2lc$9*=#uHqS~&Zq;5h^;_2Wqf<1lbW9jD}rRn(mDbif4J&B~hiqtDMGLOR{7ZM4e z)HW0!Q(>3p+527Hr>*&9S;(dQKBw<+7Q!s!3)w4iVOrnCtlLG@3!CSI-*0MwQ~v^G+Na--R5Db*zq+DQrPch zAHu^ps`1&=!QC~xr-bu@sA*6J+c0*VRo^wP`ar*1o&x-62vY_f(|3W471p1uR&@h@_tpwP)>oZU*bX9bii}ZOr zm_@0IM#=hA-LajU!V^vr^)JN{!cgUfZ*ols4NGsLGTM~rem=$xMN=?$yzzD~4A}6pHzIQ@%$e;7j$0H3vegkNHO37Yt$E>cBdu(DJ z*BL=f*;%+r^wNKnQ21Nmd*jBM0l&kp^9%k&LlE9&RHfSpbGc=w{t&%E%R4U4!qKi* z9Bl;EG44(Ex;TYN?HVyGmH66^6YW1kkeAPx=(a6&Mrhjf z-`e?-`Ad))PJQr$3nY0vrmjTf)re43Z**Y9K<=xA)utrv5maPor(|!+%V6oz1R=_kUqzRoFQ_S9W3H90(=>bd zSvT!aE$Pk;tQ*zZuC4)&X2w5$-S10@cHtlsiB|Mm7{pO_;7A@vkOUv2vX?41IMX0# zL2pZGYB!x9T0MwZSnEERTXn@cAHLMTo;(y#{Os+wk`J_$0X!PIeuk+;~Mdm_o5sn-%=$bwUwVlXZqS@6Z*$dU~`FUu& zoIBJN&a~kn?b;KO)CjT0ScXO}yI_k$vtuPDX(pj5T01VFE0Qr}Q4N(HAj02G|5}c} zV`iqJZl1Zq+w89#tb7HnJXsUAP8xQC^m?vyL`|7bMpbt8*{!SoS0 zEiGsZlmmxjoBYZ6PtLH8j<%c^ub_}1&v(t|YxXv6MrH;!^4_><3kQ7%X2Whfipax~M|U^-P5OoT(T(&R8CGkC`?Ix7nK+MnVx~ zZLSD|Lr79Ae`v1X(?4zZn`f=fvi1X0MSmJI-_f6JsL+1YcgP;5Zj2HD58Lvan2>)S znSOW&{2cE}@5$ezgRb*;w%&UuP&PC9aXC`dA&{-D*WR}?)fE2i&TmNH!>u#2<8>by zfxGwC`P&SsJIdcG{L}0yOf%GUN_Mrt=04OQs4-OSOTF;(G$6Offjg^oxFp4U%Kh%0 za8qgvNylXny*g+R3oC+$_*2tDVEL1#Sw=yB9^J zD5lXQw=Ij0eA#?!kF>H`V-)ZkJ%2No8mP*DuF$zZ&u9BY|rC{#klhont zfmg$*@fk@rGRyvmc@BL39dT<$oh|_qb1h15##pzdgfB`@i8TiEk6&tm;qO`u{08Rt z)?ANp|IB5Gp^4OOlyuQQBGM0yD3*dmxV6QE$ndTa!IkM(q|ZBl(s^)fhwCTZNbo8GM~{In|Eyogn3XY)YXa@X&a$nxpJ&NZb``cV0!W1uwC|L&&{=)xm0YVq0(ML#W=Vd>A=F{_Wx8xW?X+CxS6(g(!`VnR%c21WEh$kl_ zCeCRy6J?grsgn0Z^qPoOnL$YDdxnI(fTBO3KK(rc<8WjF; z)S-CxEL35wWQ4msPP(~JW=^3)N&mTm0`06WW?hm#2D(aeBEC-q3SBiRtqN= zjfJrA+<(X=qh-bi$u2%rl3C)p`^8gX*~C58-lA85U~cgV#yRoEuFL{_EE@Og(xTR) z=1z;u(p?qio|8^e?HP%9p6;4w9F0*)PKMuafh6LRj2=$wnK7&^9#80Q3#$TSmHs{l zRkwIUbst+{UD_>Rn?r@{+tTpA`X#KC`^Zj24XXf6A*%PrVezDT%0eSTS)H#6SL8nL zvYMAXZ~*O2B~2tmCKHNmdOIBZR#7EXd4*;koF&U$tgucbB{dH+A@R4Z*YKcZb&>4Xx8+Owz9)bUxWnq6F+>4#D*<(~VGQ zpQ4JavOzs8Q>m|WyK5NLT)etI8O$Ej(~{3Ts>fw3apWSFH`ZsJmMGy>;#MA@gB(q# zcg63NDH8*=d61Y#IK|mqD2WN-O+JU&5YJWbgUD&kZY_>JVUp+=kDgOKdzKjZ13rlF z7FbYuA`-;HB>Pr_v_Bi78+~QZq^`q6DWwG(wlE_gjhjK5;|EmTl>cm`YCC6i<|!DK zm~Byl^MJiVJ~5<51pAn?TS{spkHhB(_P5`2+x|1_C1sfOuA-q5-xo7jw!yc(S?~=K z_jzrTDWmt-36;C_GJ{Rkb>_v`hQh?-@5N(M%qADXjamKDD$pa=M>a$W9Izo-@9{Tc z8Sxx|GE$+aJ+_C_5${jQmbwVV?icCr<6IcEHk$gYnBU^26U$AVp2d(X%dRaYk?Yf9 z88sOT;OCFPrvUnVOW|rX^Z8D%)#Pe}&rjKD?q=6@Ky&XO{dDEu9Zb9yWQYI(Gd(P= z-p^Z_YIkiCBXmQ%-$npm^~S|%Zp%~*EHDM#zW5Qq!f<5;?7YAFz1;CRNIQ8@vq>n0 zgcb?>z}^n<6uF%fUt@zPlKcd6>vnFbony&-IXRc(Tu0}6EM`Paua}MV?FjWt2<@4r zY;?{0qlF10;}HsV6F&IJYn2%04kb1>lEYxKin1h|MQ_P7GED5P^grkxaRgt>meRa0 zONR4AhcN>91jN{jslGp8#^93c)l!p4?KTN;w? zn91v?)+0;&JX$S~M>8GFk`5 zQ{DtZ^zcZ&Rl?sZ;QubR%ApsyjuOjGJlbZEeO3i^=McJxxn++*T-s-{itX!Me72$+ z-qxfsRVu?ULWUwsLy|GGV^K)7akZyY{6DBDtJ-XM_tno$Iy&7~Og!GCDX^JRqt=*rqxI8vj%L{`(iui$?T1wii9oy>BJBe^fb-ptn#&b4dP%Bt@ey>AQ^%6%84v yX{DHr9BA>SkMQ^x_X?uf2aMEdpNWsX$WR-Aj_~pEDX4iW{L3=^{}%+`%>OU`Bim~L diff --git a/skin/board/basic/style.css b/skin/board/basic/style.css index d6cb17c8a..91e4dbb74 100644 --- a/skin/board/basic/style.css +++ b/skin/board/basic/style.css @@ -158,7 +158,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa /* 게시판 읽기 */ #bo_v {margin-bottom:20px;padding-bottom:20px} -#bo_v_table {position:absolute;top:0;right:15px;margin:0;padding:0 5px;height:25px;background:#565e60;color:#fff;font-weight:bold;line-height:2.2em} +#bo_v_table {position:absolute;top:0;right:16px;margin:0;padding:0 5px;height:25px;background:#ff3061;color:#fff;font-weight:bold;line-height:2.2em} #bo_v_title {padding:10px 0;font-size:1.2em} @@ -225,7 +225,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa #bo_v_sns li {float:left;margin:0 5px 0 0} /* 게시판 댓글 */ -#bo_vc {margin:0 0 20px;padding:20px 20px 10px;border-top:1px solid #cfded8;border-bottom:1px solid #cfded8;background:#f5f6fa} +#bo_vc {margin:0 0 20px;padding:20px 20px 10px;border:1px solid #e5e8ec;background:#f5f8f9} #bo_vc h2 {margin-bottom:10px} #bo_vc article {padding:0 0 10px;border-top:1px dotted #ccc} #bo_vc header {position:relative;padding:15px 0 5px} diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css index 0389eb8ec..df45c9cf6 100644 --- a/skin/board/gallery/style.css +++ b/skin/board/gallery/style.css @@ -151,7 +151,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa /* 게시판 읽기 */ #bo_v {margin-bottom:20px;padding-bottom:20px} -#bo_v_table {position:absolute;top:0;right:15px;margin:0;padding:0 5px;height:25px;background:#565e60;color:#fff;font-weight:bold;line-height:2.2em} +#bo_v_table {position:absolute;top:0;right:16px;margin:0;padding:0 5px;height:25px;background:#565e60;color:#fff;font-weight:bold;line-height:2.2em} #bo_v_title {padding:10px 0;font-size:1.2em} @@ -218,7 +218,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa #bo_v_sns li {float:left;margin:0 5px 0 0} /* 게시판 댓글 */ -#bo_vc {margin:0 0 20px;padding:20px 20px 10px;border-top:1px solid #cfded8;border-bottom:1px solid #cfded8;background:#f5f6fa} +#bo_vc {margin:0 0 20px;padding:20px 20px 10px;border:1px solid #e5e8ec;background:#f5f8f9} #bo_vc h2 {margin-bottom:10px} #bo_vc article {padding:0 0 10px;border-top:1px dotted #ccc} #bo_vc header {position:relative;padding:15px 0 5px} diff --git a/skin/latest/basic/style.css b/skin/latest/basic/style.css index 23bea367b..ab55517b1 100644 --- a/skin/latest/basic/style.css +++ b/skin/latest/basic/style.css @@ -3,7 +3,7 @@ /* 새글 스킨 (latest) */ .lt_pc {float:left;margin-left:20px} -.lt {position:relative;float:left;margin-bottom:20px;padding-bottom:10px;width:354px;height:150px;border-bottom:1px solid #ddd} +.lt {position:relative;float:left;margin-bottom:20px;padding-bottom:10px;width:354px;height:150px;border-bottom:1px solid #e9e9e9} .lt ul {margin:0 0 10px;padding:0;list-style:none} .lt li {padding:3px 0} .lt .lt_title {display:block;padding:10px 0 8px} diff --git a/skin/member/basic/style.css b/skin/member/basic/style.css index 7f40a5583..c4e655832 100644 --- a/skin/member/basic/style.css +++ b/skin/member/basic/style.css @@ -85,7 +85,7 @@ /* 회원가입 약관 */ #fregister section {margin:0 0 20px;padding:20px 0;border-bottom:3px solid #eee} #fregister h2 {margin:0 0 20px;text-align:center} -#fregister textarea {display:block;margin-bottom:10px;padding:5px;width:98%;height:150px;border:1px solid #d9d9d9;background:#f7f7f7} +#fregister textarea {display:block;margin-bottom:10px;padding:5px;width:98%;height:150px;border:1px solid #e9e9e9;background:#f7f7f7} #fregister .fregister_agree {padding:10px 0 0;text-align:right} #fregister .fregister_agree label {display:inline-block;margin-right:5px} #fregister p {color:#e8180c;text-align:center} @@ -99,7 +99,7 @@ /* 회원가입 완료 */ #reg_result {padding:50px 0 0} #reg_result #result_logo {margin-bottom:50px;text-align:center} -#reg_result #result_email {padding:10px 50px;border-top:1px solid #eee;border-bottom:1px solid #eee;background:#fff;line-height:2em} +#reg_result #result_email {padding:10px 50px;border-top:1px solid #e9e9e9;border-bottom:1px solid #dde4e9;background:#fff;line-height:2em} #reg_result #result_email span {display:inline-block;width:150px} #reg_result #result_email strong {color:#e8180c;font-size:1.2em} #reg_result .btn_confirm {margin:50px 0} @@ -118,18 +118,15 @@ #mb_login #login_fs label {letter-spacing:-0.1em} #mb_login #login_fs .login_id {position:absolute;top:26px;left:95px} #mb_login #login_fs .login_pw {position:absolute;top:52px;left:95px} -#mb_login #login_fs .frm_input {display:block;margin:0 0 5px 80px} -#mb_login #login_fs .btn_submit {position:absolute;top:20px;left:335px;height:49px} +#mb_login #login_fs .frm_input {display:block;margin:0 0 5px 80px;width:162px} +#mb_login #login_fs .btn_submit {position:absolute;top:20px;right:95px;width:60px;height:53px} #mb_login #login_info {margin:0 0 30px;padding:20px;border:1px solid #cfded8;background:#f5f6fa} #mb_login #login_info div {text-align:right} /* 쪽지 */ #memo_view_contents {margin:0 auto 20px;width:90%} #memo_view_contents h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} -#memo_view_ul {margin:0;padding:0 0 10px;border-bottom:1px solid #eee;list-style:none} -.memo_view_li {position:relative;padding:5px 0} .memo_view_subj {display:inline-block;width:65px} -#memo_view_ul a {} #memo_view section p {padding:10px;min-height:150px;height:auto !important;height:150px;background:#fff} #memo_write textarea {height:100px} @@ -141,18 +138,18 @@ /* 회원 패스워드 확인 */ #mb_confirm {margin:0 auto;padding:100px 0;width:500px} #mb_confirm h1 {margin:0 0 20px;font-size:1.3em} -#mb_confirm p {padding:20px;border:1px solid #d9d9d9;border-bottom:0;background:#fff} +#mb_confirm p {padding:20px;border:1px solid #dde4e9;border-bottom:0;background:#fff} #mb_confirm p strong {display:block} -#mb_confirm fieldset {margin:0 0 30px;padding:30px 0;border:1px solid #d9d9d9;background:#f5f6fa;text-align:center} +#mb_confirm fieldset {margin:0 0 30px;padding:30px 0;border:1px solid #e9e9e9;background:#f5f6fa;text-align:center} #mb_confirm label {letter-spacing:-0.1em} #mb_confirm_id {display:inline-block;margin-right:20px;font-weight:bold} /* 비밀글 패스워드 확인 */ #pw_confirm {margin:0 auto;padding:100px 0;width:500px} #pw_confirm h1 {margin:0 0 20px;font-size:1.3em} -#pw_confirm p {padding:20px;border:1px solid #d9d9d9;border-bottom:0;background:#fff} +#pw_confirm p {padding:20px;border:1px solid #dde4e9;border-bottom:0;background:#fff} #pw_confirm p strong {display:block} -#pw_confirm fieldset {margin:0 0 30px;padding:30px 0;border:1px solid #d9d9d9;background:#f5f6fa;text-align:center} +#pw_confirm fieldset {margin:0 0 30px;padding:30px 0;border:1px solid #e9e9e9;background:#f5f6fa;text-align:center} #pw_confirm label {letter-spacing:-0.1em} #pw_confirm_id {display:inline-block;margin-right:20px;font-weight:bold} @@ -166,11 +163,11 @@ #profile h2 {margin:0} /* 우편번호 검색 */ -#post_code fieldset {margin:0 auto 10px;padding:15px 10px;width:87%;text-align:center} -#post_code dl {margin:0 auto 10px;padding:20px 10px;width:87%;border-right:1px solid #eee;border-bottom:1px solid #eee;background:#fff} +#post_code fieldset {margin:0 20px 10px;padding:15px 10px;text-align:center} +#post_code dl {margin:0 auto 10px;padding:20px 10px;width:87%;border:1px solid #dde4e9;background:#fff} #post_code dt {margin-bottom:15px;color:#000} #post_code dd {margin:0;padding:0} #post_code ul {margin:0;padding:0;list-style:none} -#post_code li a {display:block;padding:8px 0 6px;border-bottom:1px solid #eee} +#post_code li a {display:block;padding:8px 0 6px;border-bottom:1px solid #} #post_code p {margin:0 auto 30px;width:90%} .post_code {display:inline-block;width:50px;color:#999} \ No newline at end of file diff --git a/skin/new/basic/new.skin.php b/skin/new/basic/new.skin.php index 61864db51..935377785 100644 --- a/skin/new/basic/new.skin.php +++ b/skin/new/basic/new.skin.php @@ -18,6 +18,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 +

    회원 아이디만 검색 가능