diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php index 8023f74fa..22541f361 100644 --- a/classes/display/HTMLDisplayHandler.php +++ b/classes/display/HTMLDisplayHandler.php @@ -9,6 +9,11 @@ class HTMLDisplayHandler const JQUERY_V1 = '1.12.4'; const JQUERY_V2 = '2.2.4'; + /** + * Default viewport setting + */ + const DEFAULT_VIEWPORT = 'width=device-width, initial-scale=1.0, user-scalable=yes'; + /** * Reserved scripts */ diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html index 892d91e46..200be6a46 100644 --- a/common/tpl/common_layout.html +++ b/common/tpl/common_layout.html @@ -5,7 +5,9 @@ - + + + diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 10a1b3164..2a6f97d4d 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -549,7 +549,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('mobile_viewport', config('mobile.viewport') ?? HTMLDisplayHandler::DEFAULT_VIEWPORT); Context::set('use_ssl', Rhymix\Framework\Config::get('url.ssl')); Context::set('delay_session', Rhymix\Framework\Config::get('session.delay')); Context::set('use_db_session', Rhymix\Framework\Config::get('session.use_db')); diff --git a/modules/admin/lang/en.php b/modules/admin/lang/en.php index 2649d5e7e..b9808e0e7 100644 --- a/modules/admin/lang/en.php +++ b/modules/admin/lang/en.php @@ -271,6 +271,7 @@ $lang->about_use_mobile_view = 'Show mobile page when visitors access with mobil $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 <meta name="viewport"> tag for mobile visitors.'; +$lang->restore_default_viewport = 'Restore Default'; $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 7aa1e75f6..e82fa5ca4 100644 --- a/modules/admin/lang/ko.php +++ b/modules/admin/lang/ko.php @@ -267,6 +267,7 @@ $lang->about_use_mobile_view = '모바일 기기로 접속시 모바일 페이 $lang->tablets_as_mobile = '태블릿도 모바일 취급'; $lang->mobile_viewport = '모바일 viewport 설정'; $lang->about_mobile_viewport = '모바일 접속시 여기 입력한 내용이 <meta name="viewport"> 태그로 출력됩니다.'; +$lang->restore_default_viewport = '기본값 복원'; $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 df1d9125f..ed96eb742 100644 --- a/modules/admin/tpl/config_advanced.html +++ b/modules/admin/tpl/config_advanced.html @@ -87,7 +87,7 @@
-

{$lang->about_mobile_viewport}

+

{$lang->about_mobile_viewport} {$lang->restore_default_viewport}

@@ -222,3 +222,9 @@
+ + \ No newline at end of file