From a502508d7329c3ffd06e043b2f7ac1c792d6a936 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 17 Jan 2014 09:43:58 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EB=A9=94?= =?UTF-8?q?=ED=83=80=ED=83=9C=EA=B7=B8=20=EC=84=A4=EC=A0=95=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/config_form.php | 12 ++++++++++++ adm/config_form_update.php | 1 + head.sub.php | 3 +++ install/gnuboard5.sql | 1 + 4 files changed, 17 insertions(+) diff --git a/adm/config_form.php b/adm/config_form.php index 3df62ab63..125032e68 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -120,6 +120,11 @@ if(!isset($config['cf_analytics'])) { ADD `cf_analytics` TEXT NOT NULL AFTER `cf_intercept_ip` ", true); } +if(!isset($config['cf_add_meta'])) { + sql_query(" ALTER TABLE `{$g5['config_table']}` + ADD `cf_add_meta` TEXT NOT NULL AFTER `cf_analytics` ", true); +} + if(!isset($config['cf_sms_use'])) { sql_query(" ALTER TABLE `{$g5['config_table']}` ADD `cf_sms_use` varchar(255) NOT NULL DEFAULT '' AFTER `cf_cert_limit`, @@ -418,6 +423,13 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) { + + + + + + + diff --git a/adm/config_form_update.php b/adm/config_form_update.php index e5be0a956..0a2682508 100644 --- a/adm/config_form_update.php +++ b/adm/config_form_update.php @@ -53,6 +53,7 @@ $sql = " update {$g5['config_table']} cf_possible_ip = '".trim($_POST['cf_possible_ip'])."', cf_intercept_ip = '".trim($_POST['cf_intercept_ip'])."', cf_analytics = '{$_POST['cf_analytics']}', + cf_add_meta = '{$_POST['cf_add_meta']}', cf_member_skin = '{$_POST['cf_member_skin']}', cf_use_homepage = '{$_POST['cf_use_homepage']}', cf_req_homepage = '{$_POST['cf_req_homepage']}', diff --git a/head.sub.php b/head.sub.php index b1988fe05..e1a2942e2 100644 --- a/head.sub.php +++ b/head.sub.php @@ -41,6 +41,9 @@ if (G5_IS_MOBILE) { echo ''.PHP_EOL; echo ''.PHP_EOL; } + +if($config['cf_add_meta']) + echo $config['cf_add_meta'].PHP_EOL; ?> <?php echo $g5_head_title; ?> Date: Fri, 17 Jan 2014 09:56:54 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EA=B3=B5=ED=86=B5:=20=EA=B2=8C=EC=8B=9C?= =?UTF-8?q?=ED=8C=90=20=EA=B8=80=20=EC=B6=94=EC=B2=9C=20=EB=B9=84=EC=B6=94?= =?UTF-8?q?=EC=B2=9C=20=EC=8B=9C=20=EC=95=8C=EB=A6=BC=20=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EC=96=B4=20=EB=A7=88=ED=81=AC=EC=97=85=20=EB=B0=8F=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/board/basic/style.css | 7 +++---- mobile/skin/board/basic/view.skin.php | 12 ++++++++---- mobile/skin/board/gallery/style.css | 7 +++---- mobile/skin/board/gallery/view.skin.php | 12 ++++++++---- skin/board/basic/style.css | 7 +++---- skin/board/basic/view.skin.php | 12 ++++++++---- skin/board/gallery/style.css | 7 +++---- skin/board/gallery/view.skin.php | 12 ++++++++---- 8 files changed, 44 insertions(+), 32 deletions(-) diff --git a/mobile/skin/board/basic/style.css b/mobile/skin/board/basic/style.css index 5f291d5f2..389ba3b5c 100644 --- a/mobile/skin/board/basic/style.css +++ b/mobile/skin/board/basic/style.css @@ -195,11 +195,10 @@ #bo_v_con a {color:#000;text-decoration:underline} #bo_v_con img {max-width:100%;height:auto} -#bo_v_act {margin-bottom:20px;text-align:center} -#bo_v_act a {margin-right:5px;vertical-align:top} -#bo_v_act span {display:inline-block;margin-right:5px;padding:0 10px;border:1px solid #eee !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2em;vertical-align:top} +#bo_v_act {position:relative;margin-bottom:20px;text-align:center} +#bo_v_act a {margin-right:5px;vertical-align:middle} #bo_v_act strong {color:#ff3061} -#bo_v_act_good, #bo_v_act_nogood {display:inline-block;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden} +#bo_v_act_good, #bo_v_act_nogood {display:none;position:absolute;top:30px;right:10%;padding:10px 0;width:165px;background:#ff3061;color:#fff;text-align:center} #bo_v_sns {margin:0 0 20px;padding:0;list-style:none;zoom:1} #bo_v_sns:after {display:block;visibility:hidden;clear:both;content:""} diff --git a/mobile/skin/board/basic/view.skin.php b/mobile/skin/board/basic/view.skin.php index 3d87b7366..dd7a54842 100644 --- a/mobile/skin/board/basic/view.skin.php +++ b/mobile/skin/board/basic/view.skin.php @@ -147,12 +147,16 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
스크랩 - 추천 - + + 추천 + 이 글을 추천하셨습니다 + - 비추천 - + + 비추천 + +
스크랩 - 추천 - + + 추천 + + - 비추천 - + + 비추천 + + 스크랩 - 추천 - + + 추천 + + - 비추천 - + + 비추천 + + 스크랩 - 추천 - + + 추천 + + - 비추천 - + + 비추천 + + Date: Fri, 17 Jan 2014 11:18:21 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=20=EC=83=81?= =?UTF-8?q?=EB=8B=A8=EB=A9=94=EB=89=B4=20=EB=84=88=EB=B9=84=2020%=20->=202?= =?UTF-8?q?5%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/mobile.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/mobile.css b/css/mobile.css index 0366596f5..9e3b132cc 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -64,7 +64,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} #lnb {} #lnb ul {margin:0;padding:0;border-bottom:1px solid #e7f1ed;list-style:none} #lnb ul:after {display:block;visibility:hidden;clear:both;content:""} -#lnb li {float:left;margin-bottom:-1px;width:20%} +#lnb li {float:left;margin-bottom:-1px;width:25%} #lnb a {display:block;padding:10px 0;border-right:1px solid #e7f1ed;border-bottom:1px solid #e7f1ed;color:#000;text-align:center;text-decoration:none} #lnb li:nth-of-type(5n) a {border-right:0} From 244b33600f3589b236250335c4f4a6c28e4f552c Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 17 Jan 2014 11:20:52 +0900 Subject: [PATCH 4/5] =?UTF-8?q?print=5Fresult=20=ED=95=A8=EC=88=98?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=98=A4=EB=A5=98=EA=B0=80=20=EC=9E=88?= =?UTF-8?q?=EC=9D=84=20=EB=95=8C=EB=A7=8C=20exit=20=EB=90=98=EB=8F=84?= =?UTF-8?q?=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 --- bbs/good.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bbs/good.php b/bbs/good.php index beac6ac91..b18806c00 100644 --- a/bbs/good.php +++ b/bbs/good.php @@ -10,7 +10,8 @@ if($_POST['js'] == "on") { function print_result($error, $count) { echo '{ "error": "' . $error . '", "count": "' . $count . '" }'; - exit; + if($error) + exit; } if (!$is_member) From 2c6e901eb69ec47e762f05ec42b1ccdb6e2d904f Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 17 Jan 2014 11:21:17 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EC=B6=94=EC=B2=9C=20=EB=B9=84=EC=B6=94?= =?UTF-8?q?=EC=B2=9C=20=ED=9B=84=20=EA=B2=B0=EA=B3=BC=20=EB=A9=94=EC=84=B8?= =?UTF-8?q?=EC=A7=80=20=ED=91=9C=EC=8B=9C=EB=90=98=EB=8F=84=EB=A1=9D=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/board/basic/view.skin.php | 2 ++ mobile/skin/board/gallery/view.skin.php | 2 ++ skin/board/basic/view.skin.php | 2 ++ skin/board/gallery/view.skin.php | 2 ++ 4 files changed, 8 insertions(+) diff --git a/mobile/skin/board/basic/view.skin.php b/mobile/skin/board/basic/view.skin.php index dd7a54842..891d13005 100644 --- a/mobile/skin/board/basic/view.skin.php +++ b/mobile/skin/board/basic/view.skin.php @@ -251,8 +251,10 @@ function excute_good(href, $el, $tx) $el.find("strong").text(number_format(String(data.count))); if($tx.attr("id").search("nogood") > -1) { $tx.text("이 글을 비추천하셨습니다."); + $tx.fadeIn(200).delay(2500).fadeOut(200); } else { $tx.text("이 글을 추천하셨습니다."); + $tx.fadeIn(200).delay(2500).fadeOut(200); } } }, "json" diff --git a/mobile/skin/board/gallery/view.skin.php b/mobile/skin/board/gallery/view.skin.php index 1b8adcb35..4a87e398b 100644 --- a/mobile/skin/board/gallery/view.skin.php +++ b/mobile/skin/board/gallery/view.skin.php @@ -251,8 +251,10 @@ function excute_good(href, $el, $tx) $el.find("strong").text(number_format(String(data.count))); if($tx.attr("id").search("nogood") > -1) { $tx.text("이 글을 비추천하셨습니다."); + $tx.fadeIn(200).delay(2500).fadeOut(200); } else { $tx.text("이 글을 추천하셨습니다."); + $tx.fadeIn(200).delay(2500).fadeOut(200); } } }, "json" diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php index 9a14f8ff8..84ca3d234 100644 --- a/skin/board/basic/view.skin.php +++ b/skin/board/basic/view.skin.php @@ -263,8 +263,10 @@ function excute_good(href, $el, $tx) $el.find("strong").text(number_format(String(data.count))); if($tx.attr("id").search("nogood") > -1) { $tx.text("이 글을 비추천하셨습니다."); + $tx.fadeIn(200).delay(2500).fadeOut(200); } else { $tx.text("이 글을 추천하셨습니다."); + $tx.fadeIn(200).delay(2500).fadeOut(200); } } }, "json" diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php index 9a14f8ff8..84ca3d234 100644 --- a/skin/board/gallery/view.skin.php +++ b/skin/board/gallery/view.skin.php @@ -263,8 +263,10 @@ function excute_good(href, $el, $tx) $el.find("strong").text(number_format(String(data.count))); if($tx.attr("id").search("nogood") > -1) { $tx.text("이 글을 비추천하셨습니다."); + $tx.fadeIn(200).delay(2500).fadeOut(200); } else { $tx.text("이 글을 추천하셨습니다."); + $tx.fadeIn(200).delay(2500).fadeOut(200); } } }, "json"