|
-
+
|
@@ -271,8 +271,8 @@ function receive_alldel()
| |
- 명 |
- |
@@ -294,19 +294,19 @@ function receive_alldel()
| |
- 예약 |
| |
- |
diff --git a/adm/shop_admin/supplementdata.php b/adm/shop_admin/supplementdata.php
index fc2a2827d..16c0be625 100644
--- a/adm/shop_admin/supplementdata.php
+++ b/adm/shop_admin/supplementdata.php
@@ -31,13 +31,13 @@ if(!$makemode) {
?>
-
-
-
+
+
+
|
- 추가금액 재고수량 통보수량
- 사용여부 |
- |
+ |
추가옵션명 |
추가옵션항목 |
추가금액 |
@@ -61,7 +61,7 @@ if($option_count) {
$str .= ' ';
$sp_id = $list[$i]['sp_id'];
- $str .= ' | ';
+ $str .= ' | ';
if(trim($opt[0]) && trim($opt[1])) {
$str .= '' . $opt[0] . ' | ';
@@ -76,10 +76,10 @@ if($option_count) {
$sp_use0 = ' selected="selected"';
}
- $str .= ' | ';
- $str .= ' | ';
- $str .= ' | ';
- $str .= '';
+ $str .= ' | | ';
+ $str .= ' | ';
+ $str .= ' | ';
+ $str .= '';
$str .= ' | ';
}
} else {
@@ -94,13 +94,13 @@ if($option_count) {
for($k = 0; $k < $sp_opt_count; $k++) {
$sp_id = $sp_subj . chr(30) . $sp_opt[$k];
- $str .= ' | ';
+ $str .= ' | ';
$str .= '' . $sp_subj . ' | ';
$str .= '' . $sp_opt[$k] . ' | ';
- $str .= ' | ';
- $str .= ' | ';
- $str .= ' | ';
- $str .= '';
+ $str .= ' | | ';
+ $str .= ' | ';
+ $str .= ' | ';
+ $str .= '';
$str .= '';
}
}
@@ -119,7 +119,7 @@ echo $str;
- 기간 : ~
-
+ 기간 : ~
+
|
건수 : |
diff --git a/bbs/register_form.php b/bbs/register_form.php
index 5f9e3301f..1552caf81 100644
--- a/bbs/register_form.php
+++ b/bbs/register_form.php
@@ -1,6 +1,6 @@
alert(\''.$msg.'\');';
if ($w == "") {
- goto_url($g4['bbs_url'].'/register_result.php');
+ goto_url(G4_BBS_URL.'/register_result.php');
} else if ($w == 'u') {
$row = sql_fetch(" select mb_password from {$g4['member_table']} where mb_id = '{$member[mb_id]}' ");
$tmp_password = $row['mb_password'];
if ($old_email != $mb_email && $config['cf_use_email_certify']) {
set_session("ss_mb_id", "");
- alert('회원 정보가 수정 되었습니다.\n\nE-mail 주소가 변경되었으므로 다시 인증하셔야 합니다.', G4_PATH);
+ alert('회원 정보가 수정 되었습니다.\n\nE-mail 주소가 변경되었으므로 다시 인증하셔야 합니다.', G4_URL);
} else {
- alert('회원 정보가 수정 되었습니다.', $g4['url']);
+ alert('회원 정보가 수정 되었습니다.', G4_URL);
/*
echo '
회원정보수정
diff --git a/css/default.css b/css/default.css
index a2097e555..4b607f610 100644
--- a/css/default.css
+++ b/css/default.css
@@ -105,7 +105,7 @@ tfoot td {border-color:#c9c9c9;background:#f9f9f5;font-weight:bold;text-align:ce
caption {padding:0 0 10px;text-align:left}
th {padding:12px 0 8px;border-top:1px solid #ddd;border-bottom:1px solid #ddd}
th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
-td {padding:10px 5px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;word-break:break-all}
+td {padding:10px 5px 7px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;line-height:1.5em;word-break:break-all}
table a {color:#000;text-decoration:none}
.bo_sideview td {padding:7px 5px} /* 사이드뷰 사용하는 테이블 셀 패딩값 */
.empty_table {padding:85px 0;text-align:center}
@@ -142,7 +142,7 @@ table a {color:#000;text-decoration:none}
/* ///// 새창 기본 스타일 ///// */
.new_win {}
-.new_win h1 {margin-bottom:20px;padding:20px 20px 10px;background:#fff;font-size:1.2em}
+.new_win h1 {margin-bottom:20px;padding:20px 20px 10px;border-bottom:1px solid #eee;background:#fff;font-size:1.2em}
.new_win table {margin:0 auto 20px;width:93%}
.new_win_ul {margin:-20px 0 20px 0;padding:0 0 0 20px;border-bottom:1px solid #515151;background:#484848;list-style:none;zoom:1}
.new_win_ul:after {display:block;visibility:hidden;clear:both;content:""}
@@ -187,10 +187,11 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
#ol_before ul:after {display:block;visibility:hidden;clear:both;content:""}
#ol_before li {float:left;margin-left:5px;padding-top:2px}
#ol_before #ol_auto {float:left;margin:4px 0 0;padding:0}
-#ol_before a {color:#000;letter-spacing:-0.1em}
+#ol_before a {letter-spacing:-0.1em}
#ol_svc {padding-top:8px;text-align:right}
#ol_after_hd {text-align:center}
+#ol_after_hd a {color:#109ff1}
#ol_after_private {margin:7px 0;zoom:1}
#ol_after_private:after {display:block;visibility:hidden;clear:both;content:""}
#ol_after_private li {float:left}
@@ -241,10 +242,19 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
/* 설문조사 스킨 */
#poll {}
#poll header {padding:14px 14px 0}
+#poll header a {color:#109ff1;text-decoration:none}
#poll ul {margin:0 0 10px;padding:5px 14px;background:#f7f7f2;list-style:none}
#poll li {padding:3px 0}
#poll footer {padding:0 14px 14px;text-align:right}
+/* 폼메일 */
+#formmail textarea {height:100px}
+
+/* 자기소개 */
+#profile table {margin-bottom:0}
+#profile section {margin:0 auto 20px;padding:20px;width:86%}
+#profile h2 {margin:0}
+
/* 최근게시물 스킨 (latest) */
.lt {float:left;margin-bottom:20px;padding:20px;width:314px;height:149px}
.lt ul {margin:0;padding:0;list-style:none}
@@ -306,14 +316,13 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
.btn_bo_user {float:right;margin:0;padding:0;list-style:none}
.btn_bo_user li {float:left;margin-left:5px}
#bo_list caption {padding:0;height:0;color:transparent;overflow:hidden} /* ff에서 감추기 위해 color:transparent 사용 */
-#bo_list td {line-height:1em}
#bo_list strong {color:#109ff1}
.btn_bo_adm {float:left}
.btn_bo_adm li {float:left;margin-right:5px}
.bo_notice {}
-.bo_cate_link {display:inline-block;padding:0 5px 0 0;font-weight:bold;text-decoration:none} /* 글제목 줄 분류스타일 */
+.bo_cate_link {display:inline-block;margin:0 3px 0 0;font-weight:bold;text-decoration:none} /* 글제목 줄 분류스타일 */
.bo_current {color:#109ff1}
-.td_subject img {margin-left:5px}
+.td_subject img {margin-left:3px}
.cnt_cmt {display:inline-block;margin:0 4px;color:#109ff1}
/* 게시판 읽기 */
@@ -325,10 +334,10 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
#bo_v_info {padding:0 20px 15px;border-bottom:1px solid #f0f0f0}
#bo_v_info h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_info strong {display:inline-block;margin:0 15px 0 5px;font-weight:normal}
-#bo_v_top {zoom:1}
+#bo_v_top {margin:15px 0 10px;padding:0 20px;zoom:1}
#bo_v_top:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_top h2 {margin:0;padding:0;height:0;overflow:hidden}
-#bo_v_top ul {margin-bottom:10px;padding:0 20px;list-style:none}
+#bo_v_top ul {list-style:none}
#bo_v_file {background:#fff}
#bo_v_file h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_file ul {margin:0;padding:0;list-style:none}
diff --git a/lib/common.lib.php b/lib/common.lib.php
index defe2e2f6..70ba129a4 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1429,18 +1429,10 @@ function check_string($str, $options)
// 한글
if ($oc >= 0xA0 && $oc <= 0xFF) {
- if (strtoupper($g4['charset']) == 'UTF-8') {
- if ($options & G4_HANGUL) {
- $s .= $c . $str[$i+1] . $str[$i+2];
- }
- $i+=2;
- } else {
- // 한글은 2바이트 이므로 문자하나를 건너뜀
- $i++;
- if ($options & G4_HANGUL) {
- $s .= $c . $str[$i];
- }
+ if ($options & G4_HANGUL) {
+ $s .= $c . $str[$i+1] . $str[$i+2];
}
+ $i+=2;
}
// 숫자
else if ($oc >= 0x30 && $oc <= 0x39) {
diff --git a/shop/_head.php b/shop/_head.php
index fe9024ae1..c3e0a4a26 100644
--- a/shop/_head.php
+++ b/shop/_head.php
@@ -1,4 +1,4 @@
\ No newline at end of file
diff --git a/shop.php b/shop/index.php
similarity index 94%
rename from shop.php
rename to shop/index.php
index b81c99afa..c471117a1 100644
--- a/shop.php
+++ b/shop/index.php
@@ -3,10 +3,10 @@ include_once("./_common.php");
include_once(G4_LIB_PATH.'/latest.lib.php');
include_once(G4_LIB_PATH.'/thumbnail.lib.php');
-define("_INDEX_", TRUE);
+define("G4_SHOP_INDEX", TRUE);
-$g4['title'] = "";
-include_once(G4_PATH.'/shop.head.php');
+$g4['title'] = $default['de_admin_company_name'];
+include_once('./_head.php');
?>
@@ -99,7 +99,7 @@ include_once(G4_PATH.'/shop.head.php');
\ No newline at end of file
diff --git a/shop.head.php b/shop/shop.head.php
similarity index 100%
rename from shop.head.php
rename to shop/shop.head.php
diff --git a/shop.tail.php b/shop/shop.tail.php
similarity index 100%
rename from shop.tail.php
rename to shop/shop.tail.php
diff --git a/skin/board/neo/view.skin.php b/skin/board/neo/view.skin.php
index 8d5f73413..a57613290 100644
--- a/skin/board/neo/view.skin.php
+++ b/skin/board/neo/view.skin.php
@@ -78,7 +78,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
-
+
@@ -133,7 +133,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
include_once('./view_comment.php');
?>
-
+
diff --git a/skin/member/neo/profile.skin.php b/skin/member/neo/profile.skin.php
index b0c535bea..3b1eceb33 100644
--- a/skin/member/neo/profile.skin.php
+++ b/skin/member/neo/profile.skin.php
@@ -32,8 +32,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
-
|