From 13e741d0d42f11070d7f14aa1f9e11a5b67fd4ff Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 22 May 2013 13:01:46 +0900 Subject: [PATCH 01/12] =?UTF-8?q?CSS:=20cr=20=EC=82=AD=EC=A0=9C,=20?= =?UTF-8?q?=EB=8B=A4=EC=A4=91=EC=84=A0=ED=83=9D=EC=9E=90=20=EA=B0=9C?= =?UTF-8?q?=ED=96=89=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin_cr.css | 0 css/default.css | 19 ++++++------------- css/default_cr.css | 1 - css/mobile.css | 37 +++++++++++-------------------------- css/mobile_cr.css | 0 5 files changed, 17 insertions(+), 40 deletions(-) delete mode 100644 css/admin_cr.css delete mode 100644 css/default_cr.css delete mode 100644 css/mobile_cr.css diff --git a/css/admin_cr.css b/css/admin_cr.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/css/default.css b/css/default.css index 821d84d26..4bad1d49c 100644 --- a/css/default.css +++ b/css/default.css @@ -36,9 +36,7 @@ a:active {color:#000;text-decoration:underline} #tnb:after {display:block;visibility:hidden;clear:both;content:""} #tnb li {float:left} #tnb a {display:block;padding:5px 10px;color:#333;letter-spacing:-0.1em} -#tnb a:focus, -#tnb a:hover, -#tnb a:active {text-decoration:none} +#tnb a:focus, #tnb a:hover, #tnb a:active {text-decoration:none} #tnb img {margin-right:3px} /* gnb js off */ @@ -49,13 +47,11 @@ a:active {color:#000;text-decoration:underline} .gnb_1dli {z-index:10;clear:both;zoom:1} .gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1da {display:block;float:left;width:80px;height:35px;font-weight:bold;line-height:2.95em;text-decoration:none} -.gnb_1da:focus, -.gnb_1da:hover {text-decoration:none} +.gnb_1da:focus, .gnb_1da:hover {text-decoration:none} .gnb_2dul {float:left;width:auto} .gnb_2dli {float:left} .gnb_2da {display:block;float:left;width:80px;height:35px;line-height:2.95em;text-decoration:none} -.gnb_2da:focus, -.gnb_2da:hover {text-decoration:none} +.gnb_2da:focus, .gnb_2da:hover {text-decoration:none} /* gnb js on */ .gnb_js {} .gnb_js #gnb_1dul {zoom:1} @@ -101,8 +97,7 @@ a:active {color:#000;text-decoration:underline} /* 화면낭독기 사용자용 */ #hd_login_msg {position:absolute;top:0;left:0;font-size:0;line-height:0;overflow:hidden} -.msg_sound_only, -.sound_only {display:inline-block !important;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;font-size:0;line-height:0;border:0 !important;overflow:hidden !important} +.msg_sound_only, .sound_only {display:inline-block !important;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;font-size:0;line-height:0;border:0 !important;overflow:hidden !important} /* 본문 바로가기 */ #skip_to_container a {z-index:100000;position:absolute;top:0;left:0;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden} #skip_to_container a:focus, #skip_to_container a:active {width:100%;height:75px;background:#21272e;color:#fff;font-size:2em;font-weight:bold;text-align:center;text-decoration:none;line-height:3.3em} @@ -121,8 +116,7 @@ a:active {color:#000;text-decoration:underline} .cke_sc_def {margin:0 0 5px;padding:10px;border:1px solid #ccc;background:#f7f7f7;text-align:center} .cke_sc_def dl{margin:0 0 5px;text-align:left;zoom:1} .cke_sc_def dl:after {display:block;visibility:hidden;clear:both;content:""} -.cke_sc_def dt, -.cke_sc_def dd {float:left;margin:0;padding:5px 0;border-bottom:1px solid .e9e9e9} +.cke_sc_def dt, .cke_sc_def dd {float:left;margin:0;padding:5px 0;border-bottom:1px solid .e9e9e9} .cke_sc_def dt {width:20%;font-weight:bold} .cke_sc_def dd {width:30%} @@ -144,8 +138,7 @@ button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px so button.btn_frmline {font-size:1em} .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */ .btn_win a {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em;cursor:pointer} -.btn_win a:focus, -.btn_win a:hover {text-decoration:none} +.btn_win a:focus, .btn_win a:hover {text-decoration:none} /* 게시판용 버튼 */ .btn_b01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #d9ded9;background:#f5f6fa;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn_b01:focus, .btn_b01:hover {text-decoration:none !important} diff --git a/css/default_cr.css b/css/default_cr.css deleted file mode 100644 index 52a577297..000000000 --- a/css/default_cr.css +++ /dev/null @@ -1 +0,0 @@ -body {background:#000 !important} \ No newline at end of file diff --git a/css/mobile.css b/css/mobile.css index 4c4983842..b692d151e 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -10,11 +10,7 @@ header ul, nav ul, footer ul {margin:0;padding:0;list-style:none} legend {width:0;height:0;font-size:0;line-height:0;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 !important;font-size:1em} /* 모바일에서만 사용 */ +input[type=text], input[type=password], input[type=submit], input[type=image], button {border-radius:0 !important;font-size:1em} /* 모바일에서만 사용 */ select, textarea {font-size:1em} textarea {border-radius:0;-webkit-appearance:none} p {margin:0;padding:1em 0;line-height:1.7em;word-break:break-all} @@ -23,8 +19,7 @@ pre {overflow-x:scroll;font-size:1.1em} /* 화면낭독기 사용자용 */ #hd_login_msg {position:absolute;top:0;left:0;width:0;height:0;overflow:hidden} -.msg_sound_only, -.sound_only {display:inline-block;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;width:1px !important;height:1px !important;font-size:0 !important;line-height:0 !important;overflow:hidden} +.msg_sound_only, .sound_only {display:inline-block;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;width:1px !important;height:1px !important;font-size:0 !important;line-height:0 !important;overflow:hidden} /* 본문 바로가기 */ .to_content a {z-index:100000;position:absolute;top:0;left:0;width:0;height:0;font-size:0;line-height:0;overflow:hidden} @@ -101,11 +96,9 @@ pre {overflow-x:scroll;font-size:1.1em} /* 버튼 */ .btn01 {display:inline-block;padding:0 0.5em;height:2em;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;font-size:1em;text-decoration:none !important;line-height:2em;vertical-align:middle} -.btn01:focus, -.btn01:hover {text-decoration:none !important} +.btn01:focus, .btn01:hover {text-decoration:none !important} .btn02 {display:inline-block;padding:0 0.5em;height:2em;border:1px solid #333 !important;background:#333 !important;color:#fff !important;font-size:1em;text-decoration:none !important;line-height:2em;vertical-align:middle} -.btn02:focus, -.btn02:hover {text-decoration:none !important} +.btn02:focus, .btn02:hover {text-decoration:none !important} .btn_confirm {text-align:center} /* 서식단계 진행 */ .btn_submit {padding:0 1em;height:2.6em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer;-webkit-appearance:none} .btn_cancel {display:inline-block;padding:0 1em;height:2.5em;border:1px solid #ccc;background:#fafafa;color:#000;font-size:1em;text-decoration:none;line-height:2.5em} @@ -114,14 +107,11 @@ pre {overflow-x:scroll;font-size:1.1em} .btn_win a {display:inline-block;padding:0 1em;height:2.5em;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;vertical-align:middle;line-height:2.5em;cursor:pointer} /* 게시판용 버튼 */ .btn_b01 {display:inline-block;margin:0 0 0.3em;padding:0 1em;border:1px solid #eee !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2em;vertical-align:middle} -.btn_b01:focus, -.btn_b01:hover {text-decoration:none !important} +.btn_b01:focus, .btn_b01:hover {text-decoration:none !important} .btn_b02 {display:inline-block;margin:0 0 0.3em;padding:0 1em;border:1px solid #eee !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2em;vertical-align:middle} -.btn_b02:focus, -.btn_b02:hover {text-decoration:none !important} +.btn_b02:focus, .btn_b02:hover {text-decoration:none !important} .btn_admin {display:inline-block;margin:0 0 0.3em;padding:0 1em;border:1px solid #e8180c !important;background:#e8180c !important;color:#fff !important;text-decoration:none !important;line-height:2em;vertical-align:middle} /* 관리자 전용 버튼 */ -.btn_admin:focus, -.btn_admin:hover {text-decoration:none !important} +.btn_admin:focus, .btn_admin:hover {text-decoration:none !important} /* 기본테이블 */ .basic_tbl {margin-bottom:1em;width:100%;border-collapse:collapse;border-spacing:0} @@ -180,14 +170,9 @@ td.empty_table {padding:5em 0;text-align:center} /* pagination */ .pg_wrap {clear:both;margin:0 0 1em;padding-top:1em;text-align:center} .pg {display:inline-block;border:1px solid #cfded8;letter-spacing:-4px} -.pg a:focus, -.pg a:hover, -.pg a:active {text-decoration:none} -.pg_page, -.pg_current {display:inline-block;padding:0 0.6em;color:#000;letter-spacing:0;line-height:1.9em;vertical-align:middle} +.pg a:focus, .pg a:hover, .pg a:active {text-decoration:none} +.pg_page, .pg_current {display:inline-block;padding:0 0.6em;color:#000;letter-spacing:0;line-height:1.9em;vertical-align:middle} .pg_page {background:#f9f9f9;text-decoration:none} -.pg_start, -.pg_prev {border-right:1px solid #cfded8} -.pg_end, -.pg_next {border-left:1px solid #cfded8} +.pg_start, .pg_prev {border-right:1px solid #cfded8} +.pg_end, .pg_next {border-left:1px solid #cfded8} .pg_current {background:#333;color:#fff;font-weight:bold} \ No newline at end of file diff --git a/css/mobile_cr.css b/css/mobile_cr.css deleted file mode 100644 index e69de29bb..000000000 From 01a97b8c2f5c30c8d40ce11fc6f3a3f5d9d57eff Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 22 May 2013 13:13:31 +0900 Subject: [PATCH 02/12] CSS: legend style --- css/admin.css | 2 +- css/default.css | 2 +- css/mobile.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/css/admin.css b/css/admin.css index 7de6cb8ef..682bc11dd 100644 --- a/css/admin.css +++ b/css/admin.css @@ -150,7 +150,7 @@ textarea {width:90%} select {border:1px solid #ced9de} button {padding:3px;border:1px solid #ced9de;background:#f6f9fa;cursor:pointer} fieldset {margin-bottom:20px} -legend {position:absolute;font-size:0;line-height:0;border:0;overflow:hidden} +legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;border:0;overflow:hidden} fieldset span {display:block;margin-bottom:10px} fieldset p {color:#4c5f67} fieldset button, .fieldset_submit {padding:0 15px;height:23px;border:0;background:#617d46;color:#fff;font-size:1em;line-height:2.1em;vertical-align:middle;cursor:pointer} diff --git a/css/default.css b/css/default.css index 4bad1d49c..4537dea1f 100644 --- a/css/default.css +++ b/css/default.css @@ -28,7 +28,7 @@ a:active {color:#000;text-decoration:underline} /* 전체 검색 */ #sch_all {position:absolute;top:22px;left:70px;margin:0;padding:0;border:1px solid #555} -#sch_all legend {position:absolute;text-indent:-9999em;overflow:hidden} +#sch_all legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} #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} diff --git a/css/mobile.css b/css/mobile.css index b692d151e..b5b7ad61c 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -7,7 +7,7 @@ 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} 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 {width:0;height:0;font-size:0;line-height:0;overflow:hidden} +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 !important;font-size:1em} /* 모바일에서만 사용 */ From 89cb154b231099323924ceae3c852942f308c305 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 22 May 2013 13:38:14 +0900 Subject: [PATCH 03/12] =?UTF-8?q?=EB=B9=84=ED=9A=8C=EC=9B=90=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=EC=9D=B4=20=EB=82=98=EC=98=A4=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8A=94=20=EC=98=A4=EB=A5=98=EB=A5=BC=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index 84bf7196d..d72730f76 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -997,7 +997,9 @@ function get_sideview($mb_id, $name='', $email='', $homepage='') if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름 $tmp_name = $tmp_name.' '.$name; - } + } else { + $tmp_name = $tmp_name." ".$name; + } } else { $tmp_name = $tmp_name.' '.$name; } From 395bc4a8487139d7badbe6082472fa2de6187c25 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 22 May 2013 13:41:04 +0900 Subject: [PATCH 04/12] =?UTF-8?q?echo=20=EC=95=88=EC=9D=98=20=EB=94=B0?= =?UTF-8?q?=EC=98=B4=ED=91=9C=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index 84bf7196d..cfbf29a1c 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1008,7 +1008,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='') if(!$bo_table) return $name; - $tmp_name = "$name"; + $tmp_name = ''.$name.''; $title_mb_id = '[비회원]'; } From a51735e00ddf29bead8ea199ffa91d1234792320 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 22 May 2013 14:11:10 +0900 Subject: [PATCH 05/12] =?UTF-8?q?=EB=B9=84=ED=9A=8C=EC=9B=90=EC=9D=B4?= =?UTF-8?q?=EB=82=98=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=95=88=ED=95=A8=EC=8B=9C=20=EC=82=AC=EC=9D=B4=EB=93=9C?= =?UTF-8?q?=EB=B7=B0=EC=97=90=20=EC=9D=B4=EB=A6=84=EC=9D=B4=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 --- lib/common.lib.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index 6d2c9fd64..2114c3928 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -998,10 +998,10 @@ function get_sideview($mb_id, $name='', $email='', $homepage='') if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름 $tmp_name = $tmp_name.' '.$name; } else { - $tmp_name = $tmp_name." ".$name; + $tmp_name = $tmp_name.' '.$name; } - } else { - $tmp_name = $tmp_name.' '.$name; + } else { + $tmp_name = $tmp_name.' '.$name; } $tmp_name .= ''; From 371a14245d51077e3f1d9d49552d2101455a4af9 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 22 May 2013 14:17:51 +0900 Subject: [PATCH 06/12] . --- css/admin.css | 2 +- css/admin_cr.css | 0 css/default.css | 21 +++++++-------------- css/default_cr.css | 1 - css/mobile.css | 39 ++++++++++++--------------------------- css/mobile_cr.css | 0 head.php | 2 +- lib/common.lib.php | 4 +--- 8 files changed, 22 insertions(+), 47 deletions(-) delete mode 100644 css/admin_cr.css delete mode 100644 css/default_cr.css delete mode 100644 css/mobile_cr.css diff --git a/css/admin.css b/css/admin.css index 7de6cb8ef..682bc11dd 100644 --- a/css/admin.css +++ b/css/admin.css @@ -150,7 +150,7 @@ textarea {width:90%} select {border:1px solid #ced9de} button {padding:3px;border:1px solid #ced9de;background:#f6f9fa;cursor:pointer} fieldset {margin-bottom:20px} -legend {position:absolute;font-size:0;line-height:0;border:0;overflow:hidden} +legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;border:0;overflow:hidden} fieldset span {display:block;margin-bottom:10px} fieldset p {color:#4c5f67} fieldset button, .fieldset_submit {padding:0 15px;height:23px;border:0;background:#617d46;color:#fff;font-size:1em;line-height:2.1em;vertical-align:middle;cursor:pointer} diff --git a/css/admin_cr.css b/css/admin_cr.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/css/default.css b/css/default.css index 821d84d26..4537dea1f 100644 --- a/css/default.css +++ b/css/default.css @@ -28,7 +28,7 @@ a:active {color:#000;text-decoration:underline} /* 전체 검색 */ #sch_all {position:absolute;top:22px;left:70px;margin:0;padding:0;border:1px solid #555} -#sch_all legend {position:absolute;text-indent:-9999em;overflow:hidden} +#sch_all legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} #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} @@ -36,9 +36,7 @@ a:active {color:#000;text-decoration:underline} #tnb:after {display:block;visibility:hidden;clear:both;content:""} #tnb li {float:left} #tnb a {display:block;padding:5px 10px;color:#333;letter-spacing:-0.1em} -#tnb a:focus, -#tnb a:hover, -#tnb a:active {text-decoration:none} +#tnb a:focus, #tnb a:hover, #tnb a:active {text-decoration:none} #tnb img {margin-right:3px} /* gnb js off */ @@ -49,13 +47,11 @@ a:active {color:#000;text-decoration:underline} .gnb_1dli {z-index:10;clear:both;zoom:1} .gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1da {display:block;float:left;width:80px;height:35px;font-weight:bold;line-height:2.95em;text-decoration:none} -.gnb_1da:focus, -.gnb_1da:hover {text-decoration:none} +.gnb_1da:focus, .gnb_1da:hover {text-decoration:none} .gnb_2dul {float:left;width:auto} .gnb_2dli {float:left} .gnb_2da {display:block;float:left;width:80px;height:35px;line-height:2.95em;text-decoration:none} -.gnb_2da:focus, -.gnb_2da:hover {text-decoration:none} +.gnb_2da:focus, .gnb_2da:hover {text-decoration:none} /* gnb js on */ .gnb_js {} .gnb_js #gnb_1dul {zoom:1} @@ -101,8 +97,7 @@ a:active {color:#000;text-decoration:underline} /* 화면낭독기 사용자용 */ #hd_login_msg {position:absolute;top:0;left:0;font-size:0;line-height:0;overflow:hidden} -.msg_sound_only, -.sound_only {display:inline-block !important;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;font-size:0;line-height:0;border:0 !important;overflow:hidden !important} +.msg_sound_only, .sound_only {display:inline-block !important;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;font-size:0;line-height:0;border:0 !important;overflow:hidden !important} /* 본문 바로가기 */ #skip_to_container a {z-index:100000;position:absolute;top:0;left:0;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden} #skip_to_container a:focus, #skip_to_container a:active {width:100%;height:75px;background:#21272e;color:#fff;font-size:2em;font-weight:bold;text-align:center;text-decoration:none;line-height:3.3em} @@ -121,8 +116,7 @@ a:active {color:#000;text-decoration:underline} .cke_sc_def {margin:0 0 5px;padding:10px;border:1px solid #ccc;background:#f7f7f7;text-align:center} .cke_sc_def dl{margin:0 0 5px;text-align:left;zoom:1} .cke_sc_def dl:after {display:block;visibility:hidden;clear:both;content:""} -.cke_sc_def dt, -.cke_sc_def dd {float:left;margin:0;padding:5px 0;border-bottom:1px solid .e9e9e9} +.cke_sc_def dt, .cke_sc_def dd {float:left;margin:0;padding:5px 0;border-bottom:1px solid .e9e9e9} .cke_sc_def dt {width:20%;font-weight:bold} .cke_sc_def dd {width:30%} @@ -144,8 +138,7 @@ button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px so button.btn_frmline {font-size:1em} .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */ .btn_win a {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em;cursor:pointer} -.btn_win a:focus, -.btn_win a:hover {text-decoration:none} +.btn_win a:focus, .btn_win a:hover {text-decoration:none} /* 게시판용 버튼 */ .btn_b01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #d9ded9;background:#f5f6fa;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn_b01:focus, .btn_b01:hover {text-decoration:none !important} diff --git a/css/default_cr.css b/css/default_cr.css deleted file mode 100644 index 52a577297..000000000 --- a/css/default_cr.css +++ /dev/null @@ -1 +0,0 @@ -body {background:#000 !important} \ No newline at end of file diff --git a/css/mobile.css b/css/mobile.css index 4c4983842..b5b7ad61c 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -7,14 +7,10 @@ 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} 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 {width:0;height:0;font-size:0;line-height:0;overflow:hidden} +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 !important;font-size:1em} /* 모바일에서만 사용 */ +input[type=text], input[type=password], input[type=submit], input[type=image], button {border-radius:0 !important;font-size:1em} /* 모바일에서만 사용 */ select, textarea {font-size:1em} textarea {border-radius:0;-webkit-appearance:none} p {margin:0;padding:1em 0;line-height:1.7em;word-break:break-all} @@ -23,8 +19,7 @@ pre {overflow-x:scroll;font-size:1.1em} /* 화면낭독기 사용자용 */ #hd_login_msg {position:absolute;top:0;left:0;width:0;height:0;overflow:hidden} -.msg_sound_only, -.sound_only {display:inline-block;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;width:1px !important;height:1px !important;font-size:0 !important;line-height:0 !important;overflow:hidden} +.msg_sound_only, .sound_only {display:inline-block;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;width:1px !important;height:1px !important;font-size:0 !important;line-height:0 !important;overflow:hidden} /* 본문 바로가기 */ .to_content a {z-index:100000;position:absolute;top:0;left:0;width:0;height:0;font-size:0;line-height:0;overflow:hidden} @@ -101,11 +96,9 @@ pre {overflow-x:scroll;font-size:1.1em} /* 버튼 */ .btn01 {display:inline-block;padding:0 0.5em;height:2em;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;font-size:1em;text-decoration:none !important;line-height:2em;vertical-align:middle} -.btn01:focus, -.btn01:hover {text-decoration:none !important} +.btn01:focus, .btn01:hover {text-decoration:none !important} .btn02 {display:inline-block;padding:0 0.5em;height:2em;border:1px solid #333 !important;background:#333 !important;color:#fff !important;font-size:1em;text-decoration:none !important;line-height:2em;vertical-align:middle} -.btn02:focus, -.btn02:hover {text-decoration:none !important} +.btn02:focus, .btn02:hover {text-decoration:none !important} .btn_confirm {text-align:center} /* 서식단계 진행 */ .btn_submit {padding:0 1em;height:2.6em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer;-webkit-appearance:none} .btn_cancel {display:inline-block;padding:0 1em;height:2.5em;border:1px solid #ccc;background:#fafafa;color:#000;font-size:1em;text-decoration:none;line-height:2.5em} @@ -114,14 +107,11 @@ pre {overflow-x:scroll;font-size:1.1em} .btn_win a {display:inline-block;padding:0 1em;height:2.5em;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;vertical-align:middle;line-height:2.5em;cursor:pointer} /* 게시판용 버튼 */ .btn_b01 {display:inline-block;margin:0 0 0.3em;padding:0 1em;border:1px solid #eee !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2em;vertical-align:middle} -.btn_b01:focus, -.btn_b01:hover {text-decoration:none !important} +.btn_b01:focus, .btn_b01:hover {text-decoration:none !important} .btn_b02 {display:inline-block;margin:0 0 0.3em;padding:0 1em;border:1px solid #eee !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2em;vertical-align:middle} -.btn_b02:focus, -.btn_b02:hover {text-decoration:none !important} +.btn_b02:focus, .btn_b02:hover {text-decoration:none !important} .btn_admin {display:inline-block;margin:0 0 0.3em;padding:0 1em;border:1px solid #e8180c !important;background:#e8180c !important;color:#fff !important;text-decoration:none !important;line-height:2em;vertical-align:middle} /* 관리자 전용 버튼 */ -.btn_admin:focus, -.btn_admin:hover {text-decoration:none !important} +.btn_admin:focus, .btn_admin:hover {text-decoration:none !important} /* 기본테이블 */ .basic_tbl {margin-bottom:1em;width:100%;border-collapse:collapse;border-spacing:0} @@ -180,14 +170,9 @@ td.empty_table {padding:5em 0;text-align:center} /* pagination */ .pg_wrap {clear:both;margin:0 0 1em;padding-top:1em;text-align:center} .pg {display:inline-block;border:1px solid #cfded8;letter-spacing:-4px} -.pg a:focus, -.pg a:hover, -.pg a:active {text-decoration:none} -.pg_page, -.pg_current {display:inline-block;padding:0 0.6em;color:#000;letter-spacing:0;line-height:1.9em;vertical-align:middle} +.pg a:focus, .pg a:hover, .pg a:active {text-decoration:none} +.pg_page, .pg_current {display:inline-block;padding:0 0.6em;color:#000;letter-spacing:0;line-height:1.9em;vertical-align:middle} .pg_page {background:#f9f9f9;text-decoration:none} -.pg_start, -.pg_prev {border-right:1px solid #cfded8} -.pg_end, -.pg_next {border-left:1px solid #cfded8} +.pg_start, .pg_prev {border-right:1px solid #cfded8} +.pg_end, .pg_next {border-left:1px solid #cfded8} .pg_current {background:#333;color:#fff;font-weight:bold} \ No newline at end of file diff --git a/css/mobile_cr.css b/css/mobile_cr.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/head.php b/head.php index fd58d3785..7cce56f21 100644 --- a/head.php +++ b/head.php @@ -31,7 +31,7 @@ if ($config['cf_include_head']) {
diff --git a/lib/common.lib.php b/lib/common.lib.php index d72730f76..84bf7196d 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -997,9 +997,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='') if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름 $tmp_name = $tmp_name.' '.$name; - } else { - $tmp_name = $tmp_name." ".$name; - } + } } else { $tmp_name = $tmp_name.' '.$name; } From dd060fb3656aeb13587df63eec4c20def919f014 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 22 May 2013 14:27:10 +0900 Subject: [PATCH 07/12] =?UTF-8?q?=EB=B9=84=ED=9A=8C=EC=9B=90,=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EC=BD=98=20=EC=82=AC=EC=9A=A9=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=82=AC=EC=9D=B4=EB=93=9C=EB=B7=B0=20=EC=A0=9C=EB=8C=80?= =?UTF-8?q?=EB=A1=9C=20=ED=91=9C=EC=8B=9C=EB=90=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8D=98=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index cb3dff323..2114c3928 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -997,17 +997,11 @@ function get_sideview($mb_id, $name='', $email='', $homepage='') if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름 $tmp_name = $tmp_name.' '.$name; -<<<<<<< HEAD - } - } else { - $tmp_name = $tmp_name.' '.$name; -======= } else { $tmp_name = $tmp_name.' '.$name; } } else { $tmp_name = $tmp_name.' '.$name; ->>>>>>> a51735e00ddf29bead8ea199ffa91d1234792320 } $tmp_name .= ''; From ea2083485437b265c908948b5f2ed142032aa36d Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 22 May 2013 17:51:19 +0900 Subject: [PATCH 08/12] =?UTF-8?q?=EC=83=81=ED=92=88=EB=B3=B5=EC=82=AC?= =?UTF-8?q?=EC=8B=9C=20=EC=84=A0=ED=83=9D/=EC=B6=94=EA=B0=80=EC=98=B5?= =?UTF-8?q?=EC=85=98=20=EC=A0=95=EB=B3=B4=20=EB=B3=B5=EC=82=AC=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=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/item_copy_update.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/adm/shop_admin/item_copy_update.php b/adm/shop_admin/item_copy_update.php index 802edf912..d2c8f2536 100644 --- a/adm/shop_admin/item_copy_update.php +++ b/adm/shop_admin/item_copy_update.php @@ -38,6 +38,14 @@ $sql = " insert {$g4['shop_item_table']} $sql_common "; sql_query($sql); +// 선택/추가 옵션 copy +$opt_sql = " insert ignore into {$g4['shop_item_option_table']} ( io_id, io_type, it_id, io_price, io_stock_qty, io_noti_qty, io_use ) + select io_id, io_type, '$new_it_id', io_price, io_stock_qty, io_noti_qty, io_use + from {$g4['shop_item_option_table']} + where it_id = '$it_id' + order by io_no asc "; +sql_query($opt_sql); + // html 에디터로 첨부된 이미지 파일 복사 if($cp['it_explan']) { $matchs = get_editor_image($cp['it_explan']); From 3485d3193b4cc00b86a97f004c01301a2bba3a94 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 23 May 2013 09:41:14 +0900 Subject: [PATCH 09/12] =?UTF-8?q?=EC=83=81=ED=92=88=EC=82=AD=EC=A0=9C?= =?UTF-8?q?=EC=8B=9C=20=EC=83=81=ED=92=88=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EB=94=94=EB=A0=89=ED=86=A0=EB=A6=AC=20=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=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/itemformupdate.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php index 21819a130..be1505dd5 100644 --- a/adm/shop_admin/itemformupdate.php +++ b/adm/shop_admin/itemformupdate.php @@ -21,14 +21,23 @@ function itemdelete($it_id) $it = sql_fetch($sql); // 상품 이미지 삭제 + $dir_list = array(); for($i=1; $i<=10; $i++) { $file = G4_DATA_PATH.'/item/'.$it['it_img'.$i]; if(is_file($file) && $it['it_img'.$i]) { @unlink($file); - delete_item_thumbnail(dirname($file), basename($file)); + $dir = dirname($file); + delete_item_thumbnail($dir, basename($file)); + $dir_list[] = $dir; } } + // 이미지디렉토리 삭제 + for($i=0; $i Date: Thu, 23 May 2013 09:44:56 +0900 Subject: [PATCH 10/12] =?UTF-8?q?=EC=83=81=ED=92=88=EC=82=AD=EC=A0=9C?= =?UTF-8?q?=EC=8B=9C=20=EC=83=81=ED=92=88=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EB=94=94=EB=A0=89=ED=86=A0=EB=A6=AC=20=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/itemformupdate.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php index be1505dd5..b4ae6a454 100644 --- a/adm/shop_admin/itemformupdate.php +++ b/adm/shop_admin/itemformupdate.php @@ -28,7 +28,9 @@ function itemdelete($it_id) @unlink($file); $dir = dirname($file); delete_item_thumbnail($dir, basename($file)); - $dir_list[] = $dir; + + if(!in_array($dir, $dir_list)) + $dir_list[] = $dir; } } From 69a78c5e73e3cab86faf0f75731cb0d8f7853a9a Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 23 May 2013 09:56:08 +0900 Subject: [PATCH 11/12] =?UTF-8?q?#176=20=EC=98=B5=EC=85=98=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=83=9D=EC=84=B1=EC=8B=9C=20post=20=EA=B0=92=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=EC=BD=94=EB=93=9C=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/itemoption.php | 10 ++++++++-- adm/shop_admin/itemsupply.php | 9 ++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/adm/shop_admin/itemoption.php b/adm/shop_admin/itemoption.php index df141a1db..2106341eb 100644 --- a/adm/shop_admin/itemoption.php +++ b/adm/shop_admin/itemoption.php @@ -14,8 +14,6 @@ if($it['it_id']) { if(mysql_num_rows($result)) $po_run = true; } else if(!empty($_POST)) { - $po_run = true; - $opt1_subject = trim($_POST['opt1_subject']); $opt2_subject = trim($_POST['opt2_subject']); $opt3_subject = trim($_POST['opt3_subject']); @@ -23,6 +21,14 @@ if($it['it_id']) { $opt1_val = trim($_POST['opt1']); $opt2_val = trim($_POST['opt2']); $opt3_val = trim($_POST['opt3']); + + if(!$opt1_subject || !$opt1_val) { + echo '옵션1과 옵션1 항목을 입력해 주십시오.'; + exit; + } + + $po_run = true; + $opt1_count = $opt2_count = $opt3_count = 0; if($opt1_val) { diff --git a/adm/shop_admin/itemsupply.php b/adm/shop_admin/itemsupply.php index ceca87df2..eb083acc8 100644 --- a/adm/shop_admin/itemsupply.php +++ b/adm/shop_admin/itemsupply.php @@ -9,8 +9,15 @@ if($it['it_id']) { if(mysql_num_rows($result)) $ps_run = true; } else if(!empty($_POST)) { - $ps_run = true; $subject_count = count($_POST['subject']); + $supply_count = count($_POST['supply']); + + if(!$subject_count || $supply_count) { + echo '추가옵션명과 추가옵션항목을 입력해 주십시오.'; + exit; + } + + $ps_run = true; } if($ps_run) { From ef08088fa152aee055e3b6bd8b446392a4b173ab Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 23 May 2013 10:06:21 +0900 Subject: [PATCH 12/12] =?UTF-8?q?#176=20=EC=B6=94=EA=B0=80=EC=98=B5?= =?UTF-8?q?=EC=85=98=20=EB=AA=A9=EB=A1=9D=20=EC=83=9D=EC=84=B1=EC=8B=9C=20?= =?UTF-8?q?post=20=EA=B0=92=20=EC=B2=B4=ED=81=AC=EC=BD=94=EB=93=9C?= =?UTF-8?q?=EC=9D=98=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/itemsupply.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/itemsupply.php b/adm/shop_admin/itemsupply.php index eb083acc8..adc861932 100644 --- a/adm/shop_admin/itemsupply.php +++ b/adm/shop_admin/itemsupply.php @@ -12,7 +12,7 @@ if($it['it_id']) { $subject_count = count($_POST['subject']); $supply_count = count($_POST['supply']); - if(!$subject_count || $supply_count) { + if(!$subject_count || !$supply_count) { echo '추가옵션명과 추가옵션항목을 입력해 주십시오.'; exit; }