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/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) diff --git a/css/mobile.css b/css/mobile.css index 564850fed..27fcedb97 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} diff --git a/head.sub.php b/head.sub.php index 06a97f562..af3dd3516 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; ?> 스크랩 - 추천 - + + 추천 + 이 글을 추천하셨습니다 + - 비추천 - + + 비추천 + + -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/style.css b/mobile/skin/board/gallery/style.css index 6b43400ef..9fcf341af 100644 --- a/mobile/skin/board/gallery/style.css +++ b/mobile/skin/board/gallery/style.css @@ -182,11 +182,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/gallery/view.skin.php b/mobile/skin/board/gallery/view.skin.php index 3d87b7366..4a87e398b 100644 --- a/mobile/skin/board/gallery/view.skin.php +++ b/mobile/skin/board/gallery/view.skin.php @@ -147,12 +147,16 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
스크랩 - 추천 - + + 추천 + + - 비추천 - + + 비추천 + +
-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/style.css b/skin/board/basic/style.css index ff3826b57..7b6510eff 100644 --- a/skin/board/basic/style.css +++ b/skin/board/basic/style.css @@ -214,11 +214,10 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa #bo_v_con img {max-width:100%;height:auto} #bo_v_act {margin-bottom:30px;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;height:23px;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:top} +#bo_v_act .bo_v_act_gng {position:relative} +#bo_v_act a {margin-right:5px;vertical-align:middle} #bo_v_act strong {color:#ff3061} -#bo_v_act_good, -#bo_v_act_nogood {position:absolute;font-size:0;line-height:0;overflow:hidden} +#bo_v_act_good, #bo_v_act_nogood {display:none;position:absolute;top:30px;left:0;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/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php index 3b2a2081e..84ca3d234 100644 --- a/skin/board/basic/view.skin.php +++ b/skin/board/basic/view.skin.php @@ -157,12 +157,16 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
스크랩 - 추천 - + + 추천 + + - 비추천 - + + 비추천 + +
-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/style.css b/skin/board/gallery/style.css index cdc04b992..bfb4c3956 100644 --- a/skin/board/gallery/style.css +++ b/skin/board/gallery/style.css @@ -207,11 +207,10 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa #bo_v_con img {max-width:100%;height:auto} #bo_v_act {margin-bottom:30px;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;height:23px;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:top} +#bo_v_act .bo_v_act_gng {position:relative} +#bo_v_act a {margin-right:5px;vertical-align:middle} #bo_v_act strong {color:#ff3061} -#bo_v_act_good, -#bo_v_act_nogood {position:absolute;font-size:0;line-height:0;overflow:hidden} +#bo_v_act_good, #bo_v_act_nogood {display:none;position:absolute;top:30px;left:0;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/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php index 3b2a2081e..84ca3d234 100644 --- a/skin/board/gallery/view.skin.php +++ b/skin/board/gallery/view.skin.php @@ -157,12 +157,16 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
스크랩 - 추천 - + + 추천 + + - 비추천 - + + 비추천 + +
-1) { $tx.text("이 글을 비추천하셨습니다."); + $tx.fadeIn(200).delay(2500).fadeOut(200); } else { $tx.text("이 글을 추천하셨습니다."); + $tx.fadeIn(200).delay(2500).fadeOut(200); } } }, "json"