From 0f5ce93307aad170f25b45288c2cb082d99172c4 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 10 Feb 2023 09:57:32 +0800 Subject: [PATCH 1/5] * code for task #83740. --- xuanxuan/extension/xuan/admin/ext/lang/de/xuanxuan.php | 2 +- xuanxuan/extension/xuan/admin/ext/lang/en/xuanxuan.php | 2 +- xuanxuan/extension/xuan/admin/ext/lang/fr/xuanxuan.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xuanxuan/extension/xuan/admin/ext/lang/de/xuanxuan.php b/xuanxuan/extension/xuan/admin/ext/lang/de/xuanxuan.php index 1a35918f24..b7062e1f1c 100644 --- a/xuanxuan/extension/xuan/admin/ext/lang/de/xuanxuan.php +++ b/xuanxuan/extension/xuan/admin/ext/lang/de/xuanxuan.php @@ -25,7 +25,7 @@ $lang->admin->sizeType['G'] = 1024 * 1024 * 1024; global $config; if($config->vision != 'lite') { - $lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting'); + $lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting,conference'); $lang->admin->menuList->system['menuOrder']['20'] = 'xuanxuan'; $lang->admin->menuList->system['tabMenu']['xuanxuan']['index'] = array('link' => 'Home|admin|xuanxuan|'); diff --git a/xuanxuan/extension/xuan/admin/ext/lang/en/xuanxuan.php b/xuanxuan/extension/xuan/admin/ext/lang/en/xuanxuan.php index 1a35918f24..b7062e1f1c 100644 --- a/xuanxuan/extension/xuan/admin/ext/lang/en/xuanxuan.php +++ b/xuanxuan/extension/xuan/admin/ext/lang/en/xuanxuan.php @@ -25,7 +25,7 @@ $lang->admin->sizeType['G'] = 1024 * 1024 * 1024; global $config; if($config->vision != 'lite') { - $lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting'); + $lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting,conference'); $lang->admin->menuList->system['menuOrder']['20'] = 'xuanxuan'; $lang->admin->menuList->system['tabMenu']['xuanxuan']['index'] = array('link' => 'Home|admin|xuanxuan|'); diff --git a/xuanxuan/extension/xuan/admin/ext/lang/fr/xuanxuan.php b/xuanxuan/extension/xuan/admin/ext/lang/fr/xuanxuan.php index 1a35918f24..b7062e1f1c 100644 --- a/xuanxuan/extension/xuan/admin/ext/lang/fr/xuanxuan.php +++ b/xuanxuan/extension/xuan/admin/ext/lang/fr/xuanxuan.php @@ -25,7 +25,7 @@ $lang->admin->sizeType['G'] = 1024 * 1024 * 1024; global $config; if($config->vision != 'lite') { - $lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting'); + $lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting,conference'); $lang->admin->menuList->system['menuOrder']['20'] = 'xuanxuan'; $lang->admin->menuList->system['tabMenu']['xuanxuan']['index'] = array('link' => 'Home|admin|xuanxuan|'); From cb153273d0c161d883234575ac429bdc13d110b4 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 10 Feb 2023 10:00:37 +0800 Subject: [PATCH 2/5] * adjust for admin set menu. --- module/admin/lang/menu.php | 2 +- module/admin/model.php | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php index 9886b231ff..80dc574cf2 100644 --- a/module/admin/lang/menu.php +++ b/module/admin/lang/menu.php @@ -76,7 +76,7 @@ $lang->admin->menuList->switch['subMenu']['setmodule'] = array('link' => "{$lang $lang->admin->menuList->switch['menuOrder']['5'] = 'setmodule'; $lang->admin->menuList->model['subMenu']['common'] = array('link' => "{$lang->globalSetting}|custom|required|module=project", 'subModule' => 'custom'); -$lang->admin->menuList->model['subMenu']['scrum'] = array('link' => "{$lang->scrumModel}|auditcl|scrumbrowse|"); +$lang->admin->menuList->model['subMenu']['scrum'] = array('link' => "{$lang->scrumModel}|auditcl|scrumbrowse|", 'subModule' => 'auditcl'); $lang->admin->menuList->model['subMenu']['waterfall'] = array('link' => "{$lang->waterfallModel}|stage|settype|", 'subModule' => 'stage'); $lang->admin->menuList->model['menuOrder']['5'] = 'common'; diff --git a/module/admin/model.php b/module/admin/model.php index 45acba68c4..8d02b38d01 100755 --- a/module/admin/model.php +++ b/module/admin/model.php @@ -273,20 +273,21 @@ class adminModel extends model { $moduleName = $this->app->rawModule; $methodName = $this->app->rawMethod; - $paramName = $this->app->rawParams ? reset($this->app->rawParams) : ''; + $firstParam = $this->app->rawParams ? reset($this->app->rawParams) : ''; + foreach($this->lang->admin->menuList->$menuKey['subMenu'] as $subMenuKey => $subMenu) { $subModule = ''; if($moduleName == 'custom' and strpos(',required,set,', $methodName) !== false) { - if(isset($this->config->admin->navsGroup[$subMenuKey]) and strpos($this->config->admin->navsGroup[$subMenuKey], ",$paramName,") !== false) $subModule = 'custom'; - if($paramName == $subMenuKey) $subModule = 'custom'; + if(isset($this->config->admin->navsGroup[$subMenuKey]) and strpos($this->config->admin->navsGroup[$subMenuKey], ",$firstParam,") !== false) $subModule = 'custom'; + if($firstParam == $subMenuKey) $subModule = 'custom'; } if(!empty($subModule)) $subMenu['subModule'] = $subModule; if(isset($this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey])) { - if(!empty($subModule)) $this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey][$paramName]['subModule'] = $subModule; + if(!empty($subModule)) $this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey][$firstParam]['subModule'] = $subModule; $subMenu['subMenu'] = $this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey]; } From a95bb643ed106987ace8a251292884facbe3b9c8 Mon Sep 17 00:00:00 2001 From: guofeilong Date: Fri, 10 Feb 2023 10:37:49 +0800 Subject: [PATCH 3/5] * Code for css task #746. --- module/custom/css/common.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/custom/css/common.css b/module/custom/css/common.css index fd7c269813..8a1a8a3f5c 100644 --- a/module/custom/css/common.css +++ b/module/custom/css/common.css @@ -1,3 +1,5 @@ .alert-block {border-top: 1px solid #ddd;} .btn-toolbar.pull-left .divider {margin-left: 0px; border-color: rgba(0,0,0,.2);} .main-content .main-header {padding: 10px 20px;} +#subNavbar .nav>li>a { padding: 4px 12px;} +#subHeader.admin-tab-menu {margin-bottom: -25px;} From b5f18edb351038df23c2ce061b2055ade309f40a Mon Sep 17 00:00:00 2001 From: guofeilong Date: Fri, 10 Feb 2023 10:46:00 +0800 Subject: [PATCH 4/5] * Code for task #748 --- module/mail/view/detect.html.php | 8 +------- module/mail/view/edit.html.php | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/module/mail/view/detect.html.php b/module/mail/view/detect.html.php index 4ad689faa8..8413df0492 100755 --- a/module/mail/view/detect.html.php +++ b/module/mail/view/detect.html.php @@ -12,13 +12,7 @@ ?> app->getModuleRoot() . 'message/view/header.html.php';?>
-
-
-

- mail->common;?> - arrow . $lang->mail->detect;?> -

-
+
diff --git a/module/mail/view/edit.html.php b/module/mail/view/edit.html.php index 263a7a3826..2d07ec249b 100755 --- a/module/mail/view/edit.html.php +++ b/module/mail/view/edit.html.php @@ -12,13 +12,7 @@ ?> app->getModuleRoot() . 'message/view/header.html.php';?>
-
-
-

- mail->common;?> - arrow . $lang->mail->edit;?> -

-
+
' id='dataform'>
mail->inputFromEmail; ?>mail->nextStep, '', 'btn btn-primary');?>
From f578ab069b53fc2678df1443ec180e1006f33aa5 Mon Sep 17 00:00:00 2001 From: guofeilong Date: Fri, 10 Feb 2023 10:53:31 +0800 Subject: [PATCH 5/5] * Code for task #750 --- module/entry/view/create.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/entry/view/create.html.php b/module/entry/view/create.html.php index f571010eea..673bcd45b3 100644 --- a/module/entry/view/create.html.php +++ b/module/entry/view/create.html.php @@ -13,7 +13,7 @@
-
+

entry->common;?>