Allow tablets to be treated as mobile or not depending on configuration

This commit is contained in:
Kijin Sung 2016-05-10 23:33:12 +09:00
parent e8d4c1f27f
commit ad8a07096c
9 changed files with 94 additions and 101 deletions

View file

@ -430,7 +430,8 @@ class adminAdminView extends admin
Context::set('selected_timezone', Rhymix\Framework\Config::get('locale.default_timezone'));
// Mobile view
Context::set('use_mobile_view', config('use_mobile_view') ? 'Y' : 'N');
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);
// Favicon and mobicon and site default image
$oAdminModel = getAdminModel('admin');
@ -527,7 +528,6 @@ class adminAdminView extends admin
Context::set('thumbnail_type', $config->thumbnail_type ?: 'crop');
// Other settings
Context::set('use_mobile_view', Rhymix\Framework\Config::get('use_mobile_view'));
Context::set('use_rewrite', Rhymix\Framework\Config::get('use_rewrite'));
Context::set('use_sso', Rhymix\Framework\Config::get('use_sso'));
Context::set('delay_session', Rhymix\Framework\Config::get('session.delay'));