diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 2d715a8f5..fcfe61936 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -7,23 +7,8 @@ class adminAdminView extends admin { - /** - * @brief Initilization - * @return none - **/ - function init() { - $this->setTemplatePath($this->module_path.'tpl'); - - // forbit access if the user is not an administrator - $oMemberModel = &getModel('member'); - $logged_info = $oMemberModel->getLoggedInfo(); - if($logged_info->is_admin!='Y') return $this->stop("msg_is_not_administrator"); - - // change into administration layout - $this->setLayoutPath($this->getTemplatePath()); - $this->setLayoutFile('layout.html'); - - // Retrieve the list of installed modules + function loadSideBar() + { $oModuleModel = &getModel('module'); $installed_module_list = $oModuleModel->getModulesXmlInfo(); @@ -64,6 +49,32 @@ if(count($package_modules)) $package_modules[count($package_modules)-1]->position = 'end'; Context::set('package_modules', $package_modules); Context::set('installed_modules', $installed_modules); + Context::setBrowserTitle("XE Admin Page"); + + // add javascript tooltip plugin - gony + Context::loadJavascriptPlugin('qtip'); + Context::loadJavascriptPlugin('watchinput'); + } + + /** + * @brief Initilization + * @return none + **/ + function init() { + + // forbit access if the user is not an administrator + $oMemberModel = &getModel('member'); + $logged_info = $oMemberModel->getLoggedInfo(); + if($logged_info->is_admin!='Y') return $this->stop("msg_is_not_administrator"); + + // change into administration layout + $this->setTemplatePath($this->module_path.'tpl'); + $this->setLayoutPath($this->getTemplatePath()); + $this->setLayoutFile('layout.html'); + + $this->loadSideBar(); + + // Retrieve the list of installed modules $db_info = Context::getDBInfo(); @@ -78,11 +89,6 @@ if($db_info->http_port) Context::set('http_port', $db_info->http_port); if($db_info->https_port) Context::set('https_port', $db_info->https_port); - Context::setBrowserTitle("XE Admin Page"); - - // add javascript tooltip plugin - gony - Context::loadJavascriptPlugin('qtip'); - Context::loadJavascriptPlugin('watchinput'); } /** @@ -268,6 +274,8 @@ Context::set('langs', Context::loadLangSupported()); Context::set('lang_selected', Context::loadLangSelected()); + + Context::set('use_mobile_view', $db_info->use_mobile_view=="Y"?'Y':'N'); $ftp_info = Context::getFTPInfo(); Context::set('ftp_info', $ftp_info); diff --git a/modules/admin/lang/en.lang.php b/modules/admin/lang/en.lang.php index e7b5f9ae6..8e0eb9cc2 100644 --- a/modules/admin/lang/en.lang.php +++ b/modules/admin/lang/en.lang.php @@ -82,5 +82,7 @@ $lang->ftp_get_list = "Get List"; $lang->ftp_remove_info = 'Remove FTP Info.'; $lang->msg_ftp_invalid_path = 'Failed to read the specified FTP Path.'; - $lang->msg_self_restart_cache_engine = 'Memcached 또는 캐쉬데몬을 재시작 해주세요.'; + $lang->msg_self_restart_cache_engine = 'Please restart Memcached or cache daemon.'; + $lang->mobile_view = 'Use Mobile View'; + $lang->about_mobile_view = 'If accessing with a smartphone, display content with mobile layout.'; ?> diff --git a/modules/admin/lang/es.lang.php b/modules/admin/lang/es.lang.php index 1c1119d72..8455f3bd9 100644 --- a/modules/admin/lang/es.lang.php +++ b/modules/admin/lang/es.lang.php @@ -84,5 +84,7 @@ $lang->ftp_get_list = "Get List"; $lang->ftp_remove_info = 'Remove FTP Info.'; $lang->msg_ftp_invalid_path = 'Failed to read the specified FTP Path.'; - $lang->msg_self_restart_cache_engine = 'Memcached 또는 캐쉬데몬을 재시작 해주세요.'; + $lang->msg_self_restart_cache_engine = 'Please restart Memcached or cache daemon.'; + $lang->mobile_view = 'Use Mobile View'; + $lang->about_mobile_view = 'If accessing with a smartphone, display content with mobile layout.'; ?> diff --git a/modules/admin/lang/fr.lang.php b/modules/admin/lang/fr.lang.php index 5793d68ca..47fb94caf 100644 --- a/modules/admin/lang/fr.lang.php +++ b/modules/admin/lang/fr.lang.php @@ -83,5 +83,7 @@ $lang->ftp_get_list = "Get List"; $lang->ftp_remove_info = 'Remove FTP Info.'; $lang->msg_ftp_invalid_path = 'Failed to read the specified FTP Path.'; - $lang->msg_self_restart_cache_engine = 'Memcached 또는 캐쉬데몬을 재시작 해주세요.'; + $lang->msg_self_restart_cache_engine = 'Please restart Memcached or cache daemon.'; + $lang->mobile_view = 'Use Mobile View'; + $lang->about_mobile_view = 'If accessing with a smartphone, display content with mobile layout.'; ?> diff --git a/modules/admin/lang/jp.lang.php b/modules/admin/lang/jp.lang.php index 96c4e4f0e..105e93f7b 100644 --- a/modules/admin/lang/jp.lang.php +++ b/modules/admin/lang/jp.lang.php @@ -82,5 +82,7 @@ $lang->ftp_get_list = "Get List"; $lang->ftp_remove_info = 'Remove FTP Info.'; $lang->msg_ftp_invalid_path = 'Failed to read the specified FTP Path.'; - $lang->msg_self_restart_cache_engine = 'Memcached 또는 캐쉬데몬을 재시작 해주세요.'; + $lang->msg_self_restart_cache_engine = 'Please restart Memcached or cache daemon.'; + $lang->mobile_view = 'Use Mobile View'; + $lang->about_mobile_view = 'If accessing with a smartphone, display content with mobile layout.'; ?> diff --git a/modules/admin/lang/ko.lang.php b/modules/admin/lang/ko.lang.php index 60d56353f..ff9392dcb 100644 --- a/modules/admin/lang/ko.lang.php +++ b/modules/admin/lang/ko.lang.php @@ -83,4 +83,6 @@ $lang->ftp_remove_info = 'FTP 정보 삭제'; $lang->msg_ftp_invalid_path = 'FTP Path를 읽을 수 없습니다.'; $lang->msg_self_restart_cache_engine = 'Memcached 또는 캐쉬데몬을 재시작 해주세요.'; + $lang->mobile_view = '모바일 뷰 사용'; + $lang->about_mobile_view = '스마트폰 등을 이용하여 접속할 때 모바일 화면에 최적화된 레이아웃을 이용하도록 합니다.'; ?> diff --git a/modules/admin/lang/ru.lang.php b/modules/admin/lang/ru.lang.php index c3c82dceb..10cf2f24d 100644 --- a/modules/admin/lang/ru.lang.php +++ b/modules/admin/lang/ru.lang.php @@ -81,5 +81,7 @@ $lang->ftp_get_list = 'Get List'; $lang->ftp_remove_info = 'Remove FTP Info'; $lang->msg_ftp_invalid_path = 'Failed to read the specified FTP Path.'; - $lang->msg_self_restart_cache_engine = 'Memcached 또는 캐쉬데몬을 재시작 해주세요.'; + $lang->msg_self_restart_cache_engine = 'Please restart Memcached or cache daemon.'; + $lang->mobile_view = 'Use Mobile View'; + $lang->about_mobile_view = 'If accessing with a smartphone, display content with mobile layout.'; ?> diff --git a/modules/admin/lang/vi.lang.php b/modules/admin/lang/vi.lang.php index 57c85f25b..c3d47a8cf 100644 --- a/modules/admin/lang/vi.lang.php +++ b/modules/admin/lang/vi.lang.php @@ -84,5 +84,7 @@ $lang->ftp_get_list = "Get List"; $lang->ftp_remove_info = 'Remove FTP Info.'; $lang->msg_ftp_invalid_path = 'Failed to read the specified FTP Path.'; - $lang->msg_self_restart_cache_engine = 'Memcached 또는 캐쉬데몬을 재시작 해주세요.'; + $lang->msg_self_restart_cache_engine = 'Please restart Memcached or cache daemon.'; + $lang->mobile_view = 'Use Mobile View'; + $lang->about_mobile_view = 'If accessing with a smartphone, display content with mobile layout.'; ?> diff --git a/modules/admin/lang/zh-CN.lang.php b/modules/admin/lang/zh-CN.lang.php index 9c443acc0..615f4bef7 100644 --- a/modules/admin/lang/zh-CN.lang.php +++ b/modules/admin/lang/zh-CN.lang.php @@ -82,5 +82,7 @@ $lang->ftp_get_list = "Get List"; $lang->ftp_remove_info = 'Remove FTP Info.'; $lang->msg_ftp_invalid_path = 'Failed to read the specified FTP Path.'; - $lang->msg_self_restart_cache_engine = 'Memcached 또는 캐쉬데몬을 재시작 해주세요.'; + $lang->msg_self_restart_cache_engine = 'Please restart Memcached or cache daemon.'; + $lang->mobile_view = 'Use Mobile View'; + $lang->about_mobile_view = 'If accessing with a smartphone, display content with mobile layout.'; ?> diff --git a/modules/admin/lang/zh-TW.lang.php b/modules/admin/lang/zh-TW.lang.php index 6a5b2f3f0..aae423d73 100644 --- a/modules/admin/lang/zh-TW.lang.php +++ b/modules/admin/lang/zh-TW.lang.php @@ -83,4 +83,6 @@ $lang->ftp_remove_info = '移除 FTP 資料'; $lang->msg_ftp_invalid_path = '指定的 FTP 路徑讀取失敗。'; $lang->msg_self_restart_cache_engine = '請重新啟動 Memcached 快取程式。'; + $lang->mobile_view = 'Use Mobile View'; + $lang->about_mobile_view = 'If accessing with a smartphone, display content with mobile layout.'; ?> diff --git a/modules/admin/tpl/config.html b/modules/admin/tpl/config.html index 5f50a0d16..3ae6ba4a5 100644 --- a/modules/admin/tpl/config.html +++ b/modules/admin/tpl/config.html @@ -114,6 +114,13 @@
{$lang->about_server_ports}
+{$lang->about_mobile_view}
+