From 9f308f6aae1014ffe302f135f7188fbdc9daf189 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 6 Feb 2014 14:56:15 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EA=B3=B5=ED=86=B5:=20=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=EC=B0=BE=EA=B8=B0=20p=20=ED=83=9C=EA=B7=B8=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/skin/member/basic/style.css | 2 +- skin/member/basic/style.css | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mobile/skin/member/basic/style.css b/mobile/skin/member/basic/style.css index ca87695c3..a0894c62e 100644 --- a/mobile/skin/member/basic/style.css +++ b/mobile/skin/member/basic/style.css @@ -103,7 +103,7 @@ /* 아이디/비밀번호 찾기 */ #find_info #info_fs {margin:0 20px 10px} -#find_info #info_fs p {padding:0 0 10px} +#find_info #info_fs p {margin:0 0 10px;line-height:1.8em} #find_info #info_fs #mb_email {width:100%} #find_info #captcha {margin:0 20px;padding:0 0 10px} #find_info #captcha input {margin-left:5px} diff --git a/skin/member/basic/style.css b/skin/member/basic/style.css index 3994b44d5..0cd50a3a3 100644 --- a/skin/member/basic/style.css +++ b/skin/member/basic/style.css @@ -111,6 +111,8 @@ /* 아이디/비밀번호 찾기 */ #find_info #mb_hp_label {display:inline-block;margin-left:10px} #find_info #info_fs {margin:0 20px 20px;padding:0;background:#fff} +#find_info #info_fs .frm_input {width:70%} +#find_info p {margin:0 0 10px;line-height:1.8em} #find_info #captcha {margin:0 20px} /* 로그인 */ From 17c6458f0b68b81ba3216a10fde7dea80044111b Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 6 Feb 2014 15:22:47 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=83=81=EB=8B=A8=20=EB=A1=9C=EA=B3=A0=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=EC=B0=BD=20=ED=85=8D=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=ED=81=AC=EA=B8=B0=20=EC=A1=B0=EC=A0=88=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EA=B0=80=EC=9E=85=20=EB=93=B1=20=EB=A7=81=ED=81=AC=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95,=20=EB=A1=9C=EA=B3=A0?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=ED=96=88=EC=9D=84=20=EB=95=8C=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=EC=B0=BD=20=EB=93=B1=20=EC=9D=BC=EC=A0=95=20=EA=B0=84?= =?UTF-8?q?=EA=B2=A9=20=EC=9C=A0=EC=A7=80=EB=A5=BC=20=EC=9C=84=ED=95=9C=20?= =?UTF-8?q?=EC=A1=B0=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 26 ++++++++++++++------------ head.php | 14 +++++++------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/css/default.css b/css/default.css index e82bcebe1..9a9b550ca 100644 --- a/css/default.css +++ b/css/default.css @@ -25,29 +25,31 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} /* 상단 레이아웃 */ #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:970px} +#hd_wrapper {position:relative;margin:0 auto;padding:26px 0;width:970px;zoom:1} +#hd_wrapper:after {display:block;visibility:hidden;clear:both;content:""} -#logo {padding:26px 0} +#logo {float:left;padding:5px 0 0} /* 전체 검색 */ -#hd_sch {position:absolute;top:22px;left:170px;margin:0;padding:0;border:1px solid #c3c6ca} +#hd_sch {float:left;margin:0 0 0 20px;padding:0;border:1px solid #c3c6ca} #hd_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} #hd_sch #sch_stx {padding-left:5px;width:110px;height:24px;border:0;background:#fff;line-height:1.9em !important;line-height:1.6em} #hd_sch #sch_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;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} - /* 텍스트 크기 조절 */ -#text_size {position:absolute;top:21px;left:340px;margin:0 0 10px;letter-spacing:-3px} -#text_size button {margin:0;padding:2px 2px 1px;border:1px solid #c3c6ca;background:transparent;vertical-align:middle;cursor:pointer} +#text_size {float:left;margin:0 0 0 10px;letter-spacing:-3px} +#text_size button {margin:0;padding:1px 2px;border:1px solid #c3c6ca;background:transparent;vertical-align:middle;cursor:pointer} .ts_up {font-size:1.167em !important} .ts_up2 {font-size:1.3em !important} +/* 상단 회원가입 등 링크 */ +#tnb {float:right;margin:0;padding:0;list-style:none;zoom:1} +#tnb:after {display:block;visibility:hidden;clear:both;content:""} +#tnb li {float:left;margin:0 0 0 10px} +#tnb a {display:inline-block;padding:0 10px;height:28px;color:#333;letter-spacing:-0.1em;line-height:2.4em} +#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-top:1px dotted #dde4e9;border-bottom:1px solid #dde4e9;background:#ecf0f7} #gnb h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} diff --git a/head.php b/head.php index c0cead9d5..736449e8d 100644 --- a/head.php +++ b/head.php @@ -74,6 +74,13 @@ if (G5_IS_MOBILE) { +
+ + + + +
+ - -
- - - - -
From f72db5731e9884713cbaede05f2509a23e731647 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 6 Feb 2014 16:14:54 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1=20=EC=8B=9C=20=EB=A9=94=EC=9D=BC=20=EB=B0=9C=EC=86=A1?= =?UTF-8?q?=20=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 --- bbs/write_comment_update.php | 23 ++++++++++------------- bbs/write_update.php | 22 +++++++++------------- 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/bbs/write_comment_update.php b/bbs/write_comment_update.php index dddbff657..78b49cdb0 100644 --- a/bbs/write_comment_update.php +++ b/bbs/write_comment_update.php @@ -218,20 +218,17 @@ if ($w == 'c') // 댓글 입력 // 최고관리자에게 보내는 메일 if ($config['cf_email_wr_super_admin']) $array_email[] = $super_admin['mb_email']; - // 옵션에 메일받기가 체크되어 있고, 게시자의 메일이 있다면 - if (strstr($wr['wr_option'], 'mail') && $wr['wr_email']) { - // 원글 메일발송에 체크가 되어 있다면 - if ($config['cf_email_wr_write']) $array_email[] = $wr['wr_email']; + // 원글게시자에게 보내는 메일 + if ($config['cf_email_wr_write']) $array_email[] = $wr['wr_email']; - // 댓글 쓴 모든이에게 메일 발송이 되어 있다면 (자신에게는 발송하지 않는다) - if ($config['cf_email_wr_comment_all']) { - $sql = " select distinct wr_email from {$write_table} - where wr_email not in ( '{$wr['wr_email']}', '{$member['mb_email']}', '' ) - and wr_parent = '$wr_id' "; - $result = sql_query($sql); - while ($row=sql_fetch_array($result)) - $array_email[] = $row['wr_email']; - } + // 댓글 쓴 모든이에게 메일 발송이 되어 있다면 (자신에게는 발송하지 않는다) + if ($config['cf_email_wr_comment_all']) { + $sql = " select distinct wr_email from {$write_table} + where wr_email not in ( '{$wr['wr_email']}', '{$member['mb_email']}', '' ) + and wr_parent = '$wr_id' "; + $result = sql_query($sql); + while ($row=sql_fetch_array($result)) + $array_email[] = $row['wr_email']; } // 중복된 메일 주소는 제거 diff --git a/bbs/write_update.php b/bbs/write_update.php index 9ac58e347..0b71d3306 100644 --- a/bbs/write_update.php +++ b/bbs/write_update.php @@ -604,22 +604,18 @@ if (!($w == 'u' || $w == 'cu') && $config['cf_email_use'] && $board['bo_use_emai // 최고관리자에게 보내는 메일 if ($config['cf_email_wr_super_admin']) $array_email[] = $super_admin['mb_email']; - // 옵션에 메일받기가 체크되어 있고, 게시자의 메일이 있다면 - if (strstr($wr['wr_option'], 'mail') && $wr['wr_email']) { - // 원글 메일발송에 체크가 되어 있다면 - if ($config['cf_email_wr_write']) $array_email[] = $wr['wr_email']; + // 원글게시자에게 보내는 메일 + if ($config['cf_email_wr_write']) { + if($w == '') + $wr['wr_email'] = $wr_email; - // 코멘트 쓴 모든이에게 메일 발송이 되어 있다면 (자신에게는 발송하지 않는다) - if ($config['cf_email_wr_comment_all']) { - $sql = " select distinct wr_email from {$write_table} - where wr_email not in ( '{$wr['wr_email']}', '{$member['mb_email']}', '' ) - and wr_parent = '{$wr_id}' "; - $result = sql_query($sql); - while ($row=sql_fetch_array($result)) - $array_email[] = $row['wr_email']; - } + $array_email[] = $wr['wr_email']; } + // 옵션에 메일받기가 체크되어 있고, 게시자의 메일이 있다면 + if (strstr($wr['wr_option'], 'mail') && $wr['wr_email']) + $array_email[] = $wr['wr_email']; + // 중복된 메일 주소는 제거 $unique_email = array_unique($array_email); $unique_email = array_values($unique_email);