diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index c21b00811..3eb7974a6 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -500,58 +500,6 @@ class adminAdminController extends admin $this->setMessage('success_deleted'); } - /** - * Update general configuration. - */ - function procAdminUpdateConfigGeneral() - { - $oModuleController = getController('module'); - $vars = Context::getRequestVars(); - - // Site title and HTML footer - $args = new stdClass; - $args->siteTitle = $vars->site_title; - $args->siteSubtitle = $vars->site_subtitle; - $args->htmlFooter = $vars->html_footer; - $oModuleController->updateModuleConfig('module', $args); - - // Index module - $domain_args = new stdClass(); - $domain_args->domain_srl = 0; - $domain_args->index_module_srl = $vars->index_module_srl; - executeQuery('module.updateDomain', $domain_args); - - // Default and enabled languages - $enabled_lang = $vars->enabled_lang; - if (!in_array($vars->default_lang, $enabled_lang)) - { - $enabled_lang[] = $vars->default_lang; - } - Rhymix\Framework\Config::set('locale.default_lang', $vars->default_lang); - Rhymix\Framework\Config::set('locale.enabled_lang', array_values($enabled_lang)); - Rhymix\Framework\Config::set('locale.auto_select_lang', $vars->auto_select_lang === 'Y'); - - // Default time zone - Rhymix\Framework\Config::set('locale.default_timezone', $vars->default_timezone); - - // Mobile view - Rhymix\Framework\Config::set('mobile.enabled', $vars->use_mobile_view === 'Y'); - Rhymix\Framework\Config::set('mobile.tablets', $vars->tablets_as_mobile === 'Y'); - if (Rhymix\Framework\Config::get('use_mobile_view') !== null) - { - Rhymix\Framework\Config::set('use_mobile_view', $vars->use_mobile_view === 'Y'); - } - - // Save - if (!Rhymix\Framework\Config::save()) - { - return new Object(-1, 'msg_failed_to_save_config'); - } - - $this->setMessage('success_updated'); - $this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigGeneral')); - } - /** * Update notification configuration. */ @@ -783,6 +731,25 @@ class adminAdminController extends admin $oModuleController = getController('module'); $oModuleController->insertModuleConfig('document', $document_config); + // Mobile view + Rhymix\Framework\Config::set('mobile.enabled', $vars->use_mobile_view === 'Y'); + Rhymix\Framework\Config::set('mobile.tablets', $vars->tablets_as_mobile === 'Y'); + if (Rhymix\Framework\Config::get('use_mobile_view') !== null) + { + Rhymix\Framework\Config::set('use_mobile_view', $vars->use_mobile_view === 'Y'); + } + + // Languages and time zone + $enabled_lang = $vars->enabled_lang; + if (!in_array($vars->default_lang, $enabled_lang)) + { + $enabled_lang[] = $vars->default_lang; + } + Rhymix\Framework\Config::set('locale.default_lang', $vars->default_lang); + Rhymix\Framework\Config::set('locale.enabled_lang', array_values($enabled_lang)); + Rhymix\Framework\Config::set('locale.auto_select_lang', $vars->auto_select_lang === 'Y'); + Rhymix\Framework\Config::set('locale.default_timezone', $vars->default_timezone); + // Other settings Rhymix\Framework\Config::set('use_rewrite', $vars->use_rewrite === 'Y'); Rhymix\Framework\Config::set('use_sso', $vars->use_sso === 'Y'); @@ -1133,7 +1100,7 @@ class adminAdminController extends admin Rhymix\Framework\Cache::clearGroup('site_and_module'); // Redirect to the domain list. - $this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigDomains')); + $this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigGeneral')); } /** diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index c2a2fb65c..6f32d2353 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -407,42 +407,30 @@ class adminAdminView extends admin */ function dispAdminConfigGeneral() { - // Default and enabled languages - Context::set('supported_lang', Rhymix\Framework\Lang::getSupportedList()); - Context::set('default_lang', Rhymix\Framework\Config::get('locale.default_lang')); - Context::set('enabled_lang', Rhymix\Framework\Config::get('locale.enabled_lang')); - Context::set('auto_select_lang', Rhymix\Framework\Config::get('locale.auto_select_lang')); - - // Site title and HTML footer + // Get domain list. $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('module'); - Context::set('var_site_title', escape($config->siteTitle)); - Context::set('var_site_subtitle', escape($config->siteSubtitle)); - Context::set('all_html_footer', escape($config->htmlFooter)); + $page = intval(Context::get('page')) ?: 1; + $domain_list = $oModuleModel->getAllDomains(20, $page); + Context::set('domain_list', $domain_list); + Context::set('page_navigation', $domain_list->page_navigation); + Context::set('page', $page); - // Index module - $columnList = array('modules.mid', 'modules.browser_title', 'index_module_srl'); - $start_module = $oModuleModel->getSiteInfo(0, $columnList); - Context::set('start_module', $start_module); + // Get index module info. + $module_list = array(); + $oModuleModel = getModel('module'); + foreach ($domain_list->data as $domain) + { + if ($domain->index_module_srl && !isset($module_list[$domain->index_module_srl])) + { + $module_list[$domain->index_module_srl] = $oModuleModel->getModuleInfoByModuleSrl($domain->index_module_srl); + } + } + Context::set('module_list', $module_list); - // Default time zone - Context::set('timezones', Rhymix\Framework\DateTime::getTimezoneList()); - Context::set('selected_timezone', Rhymix\Framework\Config::get('locale.default_timezone')); + // Get language list. + Context::set('supported_lang', Rhymix\Framework\Lang::getSupportedList()); - // Mobile view - 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'); - $favicon_url = $oAdminModel->getFaviconUrl(false) ?: $oAdminModel->getFaviconUrl(); - $mobicon_url = $oAdminModel->getMobileIconUrl(false) ?: $oAdminModel->getMobileIconUrl(); - $site_default_image_url = $oAdminModel->getSiteDefaultImageUrl(); - Context::set('favicon_url', $favicon_url); - Context::set('mobicon_url', $mobicon_url); - Context::set('site_default_image_url', $site_default_image_url); - - $this->setTemplateFile('config_general'); + $this->setTemplateFile('config_domains'); } /** @@ -554,8 +542,20 @@ class adminAdminView extends admin $config = $oDocumentModel->getDocumentConfig(); Context::set('thumbnail_type', $config->thumbnail_type ?: 'crop'); + // Default and enabled languages + Context::set('supported_lang', Rhymix\Framework\Lang::getSupportedList()); + Context::set('default_lang', Rhymix\Framework\Config::get('locale.default_lang')); + Context::set('enabled_lang', Rhymix\Framework\Config::get('locale.enabled_lang')); + Context::set('auto_select_lang', Rhymix\Framework\Config::get('locale.auto_select_lang')); + + // Default time zone + Context::set('timezones', Rhymix\Framework\DateTime::getTimezoneList()); + Context::set('selected_timezone', Rhymix\Framework\Config::get('locale.default_timezone')); + // Other settings 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('use_sso', Rhymix\Framework\Config::get('use_sso')); Context::set('use_ssl', Rhymix\Framework\Config::get('url.ssl')); Context::set('delay_session', Rhymix\Framework\Config::get('session.delay')); @@ -570,38 +570,6 @@ class adminAdminView extends admin $this->setTemplateFile('config_advanced'); } - /** - * Display Debug Settings page - * @return void - */ - function dispAdminConfigDomains() - { - // Get domain list. - $oModuleModel = getModel('module'); - $page = intval(Context::get('page')) ?: 1; - $domain_list = $oModuleModel->getAllDomains(20, $page); - Context::set('domain_list', $domain_list); - Context::set('page_navigation', $domain_list->page_navigation); - Context::set('page', $page); - - // Get index module info. - $module_list = array(); - $oModuleModel = getModel('module'); - foreach ($domain_list->data as $domain) - { - if ($domain->index_module_srl && !isset($module_list[$domain->index_module_srl])) - { - $module_list[$domain->index_module_srl] = $oModuleModel->getModuleInfoByModuleSrl($domain->index_module_srl); - } - } - Context::set('module_list', $module_list); - - // Get language list. - Context::set('supported_lang', Rhymix\Framework\Lang::getSupportedList()); - - $this->setTemplateFile('config_domains'); - } - /** * Display Debug Settings page * @return void diff --git a/modules/admin/conf/module.xml b/modules/admin/conf/module.xml index b24cfd36e..6fdf3abd8 100644 --- a/modules/admin/conf/module.xml +++ b/modules/admin/conf/module.xml @@ -8,7 +8,6 @@ - @@ -26,7 +25,6 @@ - diff --git a/modules/admin/lang/en.php b/modules/admin/lang/en.php index f2b869766..4bf93d230 100644 --- a/modules/admin/lang/en.php +++ b/modules/admin/lang/en.php @@ -1,7 +1,7 @@ admin = 'Admin'; $lang->cmd_configure = 'Configure'; -$lang->subtitle_primary = 'General'; +$lang->subtitle_site_info = 'Site'; $lang->subtitle_notification = 'Notifications'; $lang->subtitle_security = 'Security'; $lang->subtitle_advanced = 'Advanced'; diff --git a/modules/admin/lang/ko.php b/modules/admin/lang/ko.php index abf4a3ba0..16db98af4 100644 --- a/modules/admin/lang/ko.php +++ b/modules/admin/lang/ko.php @@ -1,11 +1,10 @@ admin = '관리자'; $lang->cmd_configure = '설정하기'; -$lang->subtitle_primary = '기본 설정'; +$lang->subtitle_site_info = '사이트 설정'; $lang->subtitle_notification = '알림 설정'; $lang->subtitle_security = '보안 설정'; $lang->subtitle_advanced = '고급 설정'; -$lang->subtitle_domains = '도메인 설정'; $lang->subtitle_debug = '디버그 설정'; $lang->subtitle_seo = 'SEO 설정'; $lang->subtitle_etc = '기타'; diff --git a/modules/admin/tpl/config_advanced.html b/modules/admin/tpl/config_advanced.html index d488d01bb..906c63768 100644 --- a/modules/admin/tpl/config_advanced.html +++ b/modules/admin/tpl/config_advanced.html @@ -14,6 +14,72 @@ +
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+

{$lang->about_auto_select_lang}

+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
diff --git a/modules/admin/tpl/config_general.html b/modules/admin/tpl/config_general.html deleted file mode 100644 index c04f61ec5..000000000 --- a/modules/admin/tpl/config_general.html +++ /dev/null @@ -1,206 +0,0 @@ - -
-

{$XE_VALIDATOR_MESSAGE}

-
-
-
- - - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-

{$lang->about_auto_select_lang}

-
-
-
- -
- -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
-

- Favicon - Favicon -

- -
- - -

- - -

-
- {$lang->about_use_favicon} -
-
-
- -
-

- Mobile Home Icon - Rhymix -

- -
- - -

- - -

-
- {$lang->detail_use_mobile_icon} -
-
-
- -
-

- Default Image -

- -
- - -

- - -

-
- {$lang->about_site_default_image} -
-
-
-
- -
-
-
-
- - - - diff --git a/modules/admin/tpl/config_header.html b/modules/admin/tpl/config_header.html index 14bf4679f..ee02b455c 100644 --- a/modules/admin/tpl/config_header.html +++ b/modules/admin/tpl/config_header.html @@ -4,11 +4,10 @@

{$lang->menu_gnb_sub['adminConfigurationGeneral']} {$lang->help}