From 17ca61eed3a349157555f7f78f95d4eab33b3f2a Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Thu, 23 Nov 2017 16:54:06 +0900
Subject: [PATCH] Fix #832 make the viewport setting customizable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

모바일 접속시 <meta name="viewport"> 태그에 들어가는 내용을
시스템 설정 메뉴에서 커스터마이징할 수 있도록 변경함.
---
 common/defaults/config.php               | 1 +
 common/tpl/common_layout.html            | 2 +-
 modules/admin/admin.admin.controller.php | 1 +
 modules/admin/admin.admin.view.php       | 1 +
 modules/admin/lang/en.php                | 2 ++
 modules/admin/lang/ko.php                | 2 ++
 modules/admin/tpl/config_advanced.html   | 7 +++++++
 7 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/common/defaults/config.php b/common/defaults/config.php
index 8a9f620ef..34341ce20 100644
--- a/common/defaults/config.php
+++ b/common/defaults/config.php
@@ -111,6 +111,7 @@ return array(
 	'mobile' => array(
 		'enabled' => true,
 		'tablets' => false,
+		'viewport' => 'width=device-width, initial-scale=1.0, user-scalable=yes',
 	),
 	'use_prepared_statements' => true,
 	'use_rewrite' => true,
diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html
index b59512931..6d4ed4454 100644
--- a/common/tpl/common_layout.html
+++ b/common/tpl/common_layout.html
@@ -5,7 +5,7 @@
 <!-- META -->
 <meta charset="utf-8">
 <meta name="generator" content="Rhymix">
-<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes" cond="$m" />
+<meta name="viewport" content="{config('mobile.viewport') ?: 'width=device-width, initial-scale=1.0, user-scalable=yes'}" cond="$m" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <block loop="Context::getMetaTag() => $no, $val">
 <meta http-equiv="{$val['name']}"|cond="$val['is_http_equiv']" name="{$val['name']}"|cond="!$val['is_http_equiv']" content="{$val['content']}" />
diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php
index 2e366b864..0e85f1671 100644
--- a/modules/admin/admin.admin.controller.php
+++ b/modules/admin/admin.admin.controller.php
@@ -769,6 +769,7 @@ class adminAdminController extends admin
 		// Mobile view
 		Rhymix\Framework\Config::set('mobile.enabled', $vars->use_mobile_view === 'Y');
 		Rhymix\Framework\Config::set('mobile.tablets', $vars->tablets_as_mobile === 'Y');
+		Rhymix\Framework\Config::set('mobile.viewport', utf8_trim($vars->mobile_viewport));
 		if (Rhymix\Framework\Config::get('use_mobile_view') !== null)
 		{
 			Rhymix\Framework\Config::set('use_mobile_view', $vars->use_mobile_view === 'Y');
diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index 13017eb3e..92a00ad8f 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -565,6 +565,7 @@ class adminAdminView extends admin
 		Context::set('use_rewrite', Rhymix\Framework\Config::get('use_rewrite'));
 		Context::set('use_mobile_view', (config('mobile.enabled') !== null ? config('mobile.enabled') : config('use_mobile_view')) ? true : false);
 		Context::set('tablets_as_mobile', config('mobile.tablets') ? true : false);
+		Context::set('mobile_viewport', config('mobile.viewport') ?: 'width=device-width, initial-scale=1.0, user-scalable=yes');
 		Context::set('use_ssl', Rhymix\Framework\Config::get('url.ssl'));
 		Context::set('delay_session', Rhymix\Framework\Config::get('session.delay'));
 		Context::set('use_session_keys', Rhymix\Framework\Config::get('session.use_keys'));
diff --git a/modules/admin/lang/en.php b/modules/admin/lang/en.php
index 793c6578a..6e64a385b 100644
--- a/modules/admin/lang/en.php
+++ b/modules/admin/lang/en.php
@@ -248,6 +248,8 @@ $lang->timezone = 'Time Zone';
 $lang->use_mobile_view = 'Enable Mobile View';
 $lang->about_use_mobile_view = 'Show mobile page when visitors access with mobile devices.';
 $lang->tablets_as_mobile = 'Treat Tablets as Mobile';
+$lang->mobile_viewport = 'Mobile viewport Setting';
+$lang->about_mobile_viewport = 'The settings entered above will be output in a &lt;meta name=&quot;viewport&quot;&gt; tag for mobile visitors.';
 $lang->thumbnail_target = 'Extract Thumbnail From';
 $lang->thumbnail_target_all = 'All images';
 $lang->thumbnail_target_attachment = 'Attached images only';
diff --git a/modules/admin/lang/ko.php b/modules/admin/lang/ko.php
index f5d3fbcab..65b0a52af 100644
--- a/modules/admin/lang/ko.php
+++ b/modules/admin/lang/ko.php
@@ -244,6 +244,8 @@ $lang->timezone = '표준 시간대';
 $lang->use_mobile_view = '모바일 뷰 사용';
 $lang->about_use_mobile_view = '모바일 기기로 접속시 모바일 페이지를 보여줍니다.';
 $lang->tablets_as_mobile = '태블릿도 모바일 취급';
+$lang->mobile_viewport = '모바일 viewport 설정';
+$lang->about_mobile_viewport = '모바일 접속시 여기 입력한 내용이 &lt;meta name=&quot;viewport&quot;&gt; 태그로 출력됩니다.';
 $lang->thumbnail_target = '썸네일 생성 대상';
 $lang->thumbnail_target_all = '모든 이미지 (외부 이미지 포함)';
 $lang->thumbnail_target_attachment = '첨부된 이미지';
diff --git a/modules/admin/tpl/config_advanced.html b/modules/admin/tpl/config_advanced.html
index 60aa8fc9f..3aaf506da 100644
--- a/modules/admin/tpl/config_advanced.html
+++ b/modules/admin/tpl/config_advanced.html
@@ -80,6 +80,13 @@
 				</select>
 			</div>
 		</div>
+		<div class="x_control-group">
+			<label class="x_control-label" for="mobile_viewport">{$lang->mobile_viewport}</label>
+			<div class="x_controls">
+				<input type="text" name="mobile_viewport" id="mobile_viewport" value="{$mobile_viewport}" style="min-width: 80%" />
+				<p class="x_help-block">{$lang->about_mobile_viewport}</p>
+			</div>
+		</div>
 		<div class="x_control-group">
 			<label class="x_control-label">{$lang->use_db_session}</label>
 			<div class="x_controls">