firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/g5

Browse Source
This commit is contained in:
whitedot
2013-10-02 18:36:21 +09:00
parent a3ea9ebee9 23fd497041
commit 62f25b27a7
5 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
head.sub.php
View File

@ -81,7 +81,6 @@ if ($is_admin) {
<script src="<?php echo G5_JS_URL ?>/wrest.js"></script>
<?php
if(G5_IS_MOBILE) {
echo '<script> set_cookie("device_width", $(window).width(), 6, g5_cookie_domain); </script>'.PHP_EOL;
echo '<script src="'.G5_JS_URL.'/modernizr.custom.70111.js"></script>'.PHP_EOL; // overflow scroll 감지
}
//if(!defined('G5_IS_ADMIN'))

4
js/viewimageresize.js
View File

@ -14,10 +14,12 @@
}
var $img = this.find(cfg.selector);
var width = this.width();
var $this = this;
function image_resize()
{
var width = $this.width();
$img.each(function() {
$(this).removeAttr("width")
.removeAttr("height")

23
lib/thumbnail.lib.php
View File

@ -80,27 +80,8 @@ function get_view_thumbnail($contents, $thumb_width=0)
{
global $board, $config;
if (!$thumb_width) {
$dvc_width = intval($_COOKIE['device_width']);
if(G5_IS_MOBILE && $dvc_width) {
// 썸네일 width 설정
$thumb_width = 320;
if($dvc_width > $board['bo_image_width']) {
$thumb_width = $board['bo_image_width'];
} else {
if($dvc_width >= 1000) {
$thumb_width = 1000;
} else if($dvc_width >= 760 && $dvc_width < 1000) {
$thumb_width = 760;
} else if($dvc_width >= 480 && $dvc_width < 760) {
$thumb_width = 480;
}
}
} else {
$thumb_width = $board['bo_image_width'];
}
}
if (!$thumb_width)
$thumb_width = $board['bo_image_width'];
// $contents 중 img 태그 추출
$matchs = get_editor_image($contents);

7
mobile/head.php
View File

@ -107,7 +107,8 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
<div id="container">
<?php if ((!$bo_table || $w == 's' ) && !defined("_INDEX_")) { ?><h1 id="wrapper_title"><?php echo $g5['title'] ?></h1><?php } ?>
<div id="text_size">
<button class="no_text_resize" onclick="font_resize('container', 'decrease');">작게</button>
<button class="no_text_resize" onclick="font_default('container');">기본</button>
<button class="no_text_resize" onclick="font_resize('container', 'increase');">크게</button>
<!-- font_resize('엘리먼트id', '제거할 class', '추가할 class'); -->
<button id="text_size_down" onclick="font_resize('container', 'ts_up ts_up2', '');">기본</button>
<button id="text_size_def" onclick="font_resize('container', 'ts_up ts_up2', 'ts_up');">크게</button>
<button id="text_size_up" onclick="font_resize('container', 'ts_up ts_up2', 'ts_up2');">더크게</button>
</div>

2
plugin/sns/view.sns.skin.php
View File

@ -9,7 +9,7 @@ $msg_url = $sns_msg.' : '.$sns_url;
// 카카오톡 매뉴얼 : https://github.com/kakao/kakaolink-web
$kakao_appid = $_SERVER['HTTP_HOST']; // Mobile Site Domain 정확히 입력하지 않을 경우 이용이 제한될 수 있습니다.
$kakao_appname = $g5['title'];
$kakao_appname = urlencode(str_replace('\"', '"', $g5['title']));
$facebook_url = 'http://www.facebook.com/sharer/sharer.php?s=100&p[url]='.$sns_url.'&p[title]='.$sns_msg;
$twitter_url = 'http://twitter.com/home?status='.$msg_url;