From 78290d812fa8f8d583f575e21ea9cadbb05dbd13 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 1 Feb 2023 14:50:02 +0800
Subject: [PATCH 1/8] * Optimize class style.

---
 module/admin/css/index.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index bec672d81e..24eb85239b 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -34,7 +34,7 @@
 
 .classList > .classItem {flex: 1 1 30%; margin: 5px; border: 1px solid #E3E4E9; border-radius: 4px; margin-bottom: 16px; align-items: center;}
 .classItem > .imgBack {flex: 1 1 50%;}
-.classItem > .imgBack > .classImg {background-repeat: no-repeat; background-size: contain; aspect-ratio: 16 / 9; background-position: center; margin: 5px;}
-.classItem > .classContent {flex: 1 1 50%; padding: 5px; font-size: 14px; color: #0B0F18; text-align: center; overflow: hidden; height: 30px; line-height: 22px; font-weight: 700;}
+.classItem > .imgBack > .classImg {background-repeat: no-repeat; background-size: contain; aspect-ratio: 16 / 9; background-position: center; margin: 0px; border-radius: 4px;}
+.classItem > .classContent {flex: 1 1 50%; padding: 5px; font-size: 14px; color: #0B0F18; text-align: center; overflow: hidden; height: 24px; margin-bottom: 6px; font-weight: 700;}
 .more {float: right; padding-right: 12px; font-weight: normal;}
 .panel.publicClass {padding: 0 10px;}

From 84905c803d0ade9be1f3f86c52f5b0edfc5bed8e Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 1 Feb 2023 15:05:58 +0800
Subject: [PATCH 2/8]  * code for task #83428.

---
 extension/lite/common/ext/lang/de/lite.php    | 94 ------------------
 extension/lite/common/ext/lang/en/lite.php    | 94 ------------------
 extension/lite/common/ext/lang/fr/lite.php    | 94 ------------------
 extension/lite/common/ext/lang/zh-cn/lite.php | 96 -------------------
 module/admin/lang/menu.php                    | 14 ++-
 module/custom/view/required.html.php          |  7 ++
 module/custom/view/set.html.php               | 13 ++-
 7 files changed, 29 insertions(+), 383 deletions(-)

diff --git a/extension/lite/common/ext/lang/de/lite.php b/extension/lite/common/ext/lang/de/lite.php
index 0a74146ca0..ef7b1da49c 100644
--- a/extension/lite/common/ext/lang/de/lite.php
+++ b/extension/lite/common/ext/lang/de/lite.php
@@ -143,81 +143,6 @@ $lang->doc->menuOrder[30] = 'custom';
 $lang->doc->menu->project['subMenu'] = new stdclass();
 $lang->doc->menu->custom['subMenu']  = new stdclass();
 
-if(isset($lang->admin->menu->xuanxuan)) $xuanxuanMenu = $lang->admin->menu->xuanxuan;
-/* Admin menu. */
-$lang->admin->menu            = new stdclass();
-$lang->admin->menu->index     = array('link' => "$lang->indexPage|admin|index", 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-if(isset($xuanxuanMenu)) $lang->admin->menu->xuanxuan = $xuanxuanMenu;
-$lang->admin->menu->company   = array('link' => "{$lang->personnel->common}|company|browse|", 'subModule' => ',user,dept,group,');
-$lang->admin->menu->custom    = array('link' => "{$lang->custom->common}|custom|index", 'exclude' => 'custom-browsestoryconcept,custom-timezone,custom-estimate');
-$lang->admin->menu->extension = array('link' => "{$lang->extension->common}|extension|browse", 'subModule' => 'extension');
-$lang->admin->menu->dev       = array('link' => "$lang->redev|dev|api", 'alias' => 'db', 'subModule' => 'dev,editor,entry');
-$lang->admin->menu->message   = array('link' => "{$lang->message->common}|message|index", 'subModule' => 'message,mail,webhook,sms');
-$lang->admin->menu->system    = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,admin,search,ldap', 'exclude' => 'admin-index,admin-xuanxuan,admin-register,admin-ztcompany');
-
-if($config->vision != 'lite') $lang->admin->menu->xuanxuan['link']  = 'Chat|admin|xuanxuan';
-
-/* Admin menu order. */
-$lang->admin->menuOrder = array();
-$lang->admin->menuOrder[5]  = 'index';
-$lang->admin->menuOrder[6]  = 'xuanxuan';
-$lang->admin->menuOrder[10] = 'company';
-$lang->admin->menuOrder[15] = 'custom';
-$lang->admin->menuOrder[20] = 'message';
-$lang->admin->menuOrder[25] = 'extension';
-$lang->admin->menuOrder[30] = 'dev';
-$lang->admin->menuOrder[35] = 'system';
-
-$lang->admin->menu->message['subMenu']          = new stdclass();
-$lang->admin->menu->message['subMenu']->message = array();
-$lang->admin->menu->message['subMenu']->mail    = array('link' => "{$lang->mail->common}|mail|index", 'subModule' => 'mail');
-$lang->admin->menu->message['subMenu']->webhook = array('link' => "Webhook|webhook|browse", 'subModule' => 'webhook');
-
-if($config->edition != 'open') $lang->admin->menu->message['subMenu']->sms = array('link' => "Message|sms|index");
-
-$lang->admin->menu->message['subMenu']->browser = array('link' => "$lang->browser|message|browser");
-$lang->admin->menu->message['subMenu']->setting = array('link' => "$lang->settings|message|setting");
-
-$lang->admin->menu->message['menuOrder'][5]  = 'mail';
-$lang->admin->menu->message['menuOrder'][10] = 'webhook';
-$lang->admin->menu->message['menuOrder'][11] = 'sms';
-$lang->admin->menu->message['menuOrder'][15] = 'browser';
-$lang->admin->menu->message['menuOrder'][20] = 'setting';
-
-$lang->admin->menu->company['subMenu']              = new stdclass();
-$lang->admin->menu->company['subMenu']->browseUser  = array('link' => "{$lang->user->common}|company|browse", 'subModule' => 'user');
-$lang->admin->menu->company['subMenu']->dept        = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept');
-$lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->priv}|group|browse", 'subModule' => 'group');
-
-$lang->admin->menu->dev['subMenu']         = new stdclass();
-$lang->admin->menu->dev['subMenu']->api    = array('link' => "API|dev|api");
-$lang->admin->menu->dev['subMenu']->db     = array('link' => "$lang->db|dev|db");
-$lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor");
-$lang->admin->menu->dev['subMenu']->entry  = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
-
-$lang->admin->menu->dev['menuOrder'][5]  = 'api';
-$lang->admin->menu->dev['menuOrder'][10] = 'db';
-$lang->admin->menu->dev['menuOrder'][15] = 'editor';
-$lang->admin->menu->dev['menuOrder'][20] = 'entry';
-
-$lang->admin->menu->system['subMenu']              = new stdclass();
-$lang->admin->menu->system['subMenu']->data        = array('link' => "{$lang->admin->data}|backup|index", 'subModule' => 'action');
-$lang->admin->menu->system['subMenu']->safe        = array('link' => "$lang->security|admin|safe", 'alias' => 'checkweak');
-$lang->admin->menu->system['subMenu']->cron        = array('link' => "{$lang->admin->cron}|cron|index", 'subModule' => 'cron');
-$lang->admin->menu->system['subMenu']->timezone    = array('link' => "$lang->timezone|custom|timezone");
-$lang->admin->menu->system['subMenu']->buildIndex  = array('link' => "{$lang->admin->buildIndex}|search|buildindex|");
-
-if($config->visions == ',lite,' and $config->edition != 'open') $lang->admin->menu->system['subMenu']->license = array('link' => "License|admin|license'", 'alias' => 'license');
-if($config->visions != ',lite,') unset($lang->admin->menu->system['subMenu']->buildIndex);
-
-if($config->edition != 'open')
-{
-    $lang->admin->menu->system['subMenu']->ldap        = array('link' => 'LDAP|ldap|set', 'subModule' => 'ldap');
-    $lang->admin->menu->system['subMenu']->libreoffice = array('link' => 'Office|custom|libreoffice');
-}
-
-$lang->admin->dividerMenu = ',company,message,system,';
-
 /* adjust items of search. */
 $lang->searchObjects['all']       = 'All';
 $lang->searchObjects['todo']      = 'Todo';
@@ -275,25 +200,6 @@ global $config;
 if(isset($config->xuanxuan) && strpos($config->visions, ',rnd,') === false)
 {
     $lang->xuanxuan = new stdclass();
-    $lang->admin->menu->xuanxuan = array('link' => 'Chat|admin|xuanxuan', 'subModule' => 'client,setting');
-    $lang->admin->menuOrder[6]   = 'xuanxuan';
-
-    $lang->admin->menu->xuanxuan['subMenu'] = new stdclass();
-    $lang->admin->menu->xuanxuan['subMenu']->index   = array('link' => 'Home|admin|xuanxuan');
-    $lang->admin->menu->xuanxuan['subMenu']->setting = array('link' => 'Parameter|setting|xuanxuan');
-    $lang->admin->menu->xuanxuan['subMenu']->update  = array('link' => 'Update|client|browse', 'subModule' => 'client');
-
-    $lang->admin->menu->xuanxuan['menuOrder'][0]  = 'index';
-    $lang->admin->menu->xuanxuan['menuOrder'][5]  = 'setting';
-    $lang->admin->menu->xuanxuan['menuOrder'][10] = 'update';
-
-    if($config->edition != 'open')
-    {
-        $lang->admin->menu->xuanxuan['subModule']           = 'client,setting,conference';
-        $lang->admin->menu->xuanxuan['subMenu']->conference = array('link' => 'Conference|conference|admin');
-        $lang->admin->menu->xuanxuan['menuOrder'][7]        = 'conference';
-        $lang->navGroup->conference                         = 'admin';
-    }
 
     $lang->navGroup->im      = 'admin';
     $lang->navGroup->setting = 'admin';
diff --git a/extension/lite/common/ext/lang/en/lite.php b/extension/lite/common/ext/lang/en/lite.php
index 0a74146ca0..ef7b1da49c 100644
--- a/extension/lite/common/ext/lang/en/lite.php
+++ b/extension/lite/common/ext/lang/en/lite.php
@@ -143,81 +143,6 @@ $lang->doc->menuOrder[30] = 'custom';
 $lang->doc->menu->project['subMenu'] = new stdclass();
 $lang->doc->menu->custom['subMenu']  = new stdclass();
 
-if(isset($lang->admin->menu->xuanxuan)) $xuanxuanMenu = $lang->admin->menu->xuanxuan;
-/* Admin menu. */
-$lang->admin->menu            = new stdclass();
-$lang->admin->menu->index     = array('link' => "$lang->indexPage|admin|index", 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-if(isset($xuanxuanMenu)) $lang->admin->menu->xuanxuan = $xuanxuanMenu;
-$lang->admin->menu->company   = array('link' => "{$lang->personnel->common}|company|browse|", 'subModule' => ',user,dept,group,');
-$lang->admin->menu->custom    = array('link' => "{$lang->custom->common}|custom|index", 'exclude' => 'custom-browsestoryconcept,custom-timezone,custom-estimate');
-$lang->admin->menu->extension = array('link' => "{$lang->extension->common}|extension|browse", 'subModule' => 'extension');
-$lang->admin->menu->dev       = array('link' => "$lang->redev|dev|api", 'alias' => 'db', 'subModule' => 'dev,editor,entry');
-$lang->admin->menu->message   = array('link' => "{$lang->message->common}|message|index", 'subModule' => 'message,mail,webhook,sms');
-$lang->admin->menu->system    = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,admin,search,ldap', 'exclude' => 'admin-index,admin-xuanxuan,admin-register,admin-ztcompany');
-
-if($config->vision != 'lite') $lang->admin->menu->xuanxuan['link']  = 'Chat|admin|xuanxuan';
-
-/* Admin menu order. */
-$lang->admin->menuOrder = array();
-$lang->admin->menuOrder[5]  = 'index';
-$lang->admin->menuOrder[6]  = 'xuanxuan';
-$lang->admin->menuOrder[10] = 'company';
-$lang->admin->menuOrder[15] = 'custom';
-$lang->admin->menuOrder[20] = 'message';
-$lang->admin->menuOrder[25] = 'extension';
-$lang->admin->menuOrder[30] = 'dev';
-$lang->admin->menuOrder[35] = 'system';
-
-$lang->admin->menu->message['subMenu']          = new stdclass();
-$lang->admin->menu->message['subMenu']->message = array();
-$lang->admin->menu->message['subMenu']->mail    = array('link' => "{$lang->mail->common}|mail|index", 'subModule' => 'mail');
-$lang->admin->menu->message['subMenu']->webhook = array('link' => "Webhook|webhook|browse", 'subModule' => 'webhook');
-
-if($config->edition != 'open') $lang->admin->menu->message['subMenu']->sms = array('link' => "Message|sms|index");
-
-$lang->admin->menu->message['subMenu']->browser = array('link' => "$lang->browser|message|browser");
-$lang->admin->menu->message['subMenu']->setting = array('link' => "$lang->settings|message|setting");
-
-$lang->admin->menu->message['menuOrder'][5]  = 'mail';
-$lang->admin->menu->message['menuOrder'][10] = 'webhook';
-$lang->admin->menu->message['menuOrder'][11] = 'sms';
-$lang->admin->menu->message['menuOrder'][15] = 'browser';
-$lang->admin->menu->message['menuOrder'][20] = 'setting';
-
-$lang->admin->menu->company['subMenu']              = new stdclass();
-$lang->admin->menu->company['subMenu']->browseUser  = array('link' => "{$lang->user->common}|company|browse", 'subModule' => 'user');
-$lang->admin->menu->company['subMenu']->dept        = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept');
-$lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->priv}|group|browse", 'subModule' => 'group');
-
-$lang->admin->menu->dev['subMenu']         = new stdclass();
-$lang->admin->menu->dev['subMenu']->api    = array('link' => "API|dev|api");
-$lang->admin->menu->dev['subMenu']->db     = array('link' => "$lang->db|dev|db");
-$lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor");
-$lang->admin->menu->dev['subMenu']->entry  = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
-
-$lang->admin->menu->dev['menuOrder'][5]  = 'api';
-$lang->admin->menu->dev['menuOrder'][10] = 'db';
-$lang->admin->menu->dev['menuOrder'][15] = 'editor';
-$lang->admin->menu->dev['menuOrder'][20] = 'entry';
-
-$lang->admin->menu->system['subMenu']              = new stdclass();
-$lang->admin->menu->system['subMenu']->data        = array('link' => "{$lang->admin->data}|backup|index", 'subModule' => 'action');
-$lang->admin->menu->system['subMenu']->safe        = array('link' => "$lang->security|admin|safe", 'alias' => 'checkweak');
-$lang->admin->menu->system['subMenu']->cron        = array('link' => "{$lang->admin->cron}|cron|index", 'subModule' => 'cron');
-$lang->admin->menu->system['subMenu']->timezone    = array('link' => "$lang->timezone|custom|timezone");
-$lang->admin->menu->system['subMenu']->buildIndex  = array('link' => "{$lang->admin->buildIndex}|search|buildindex|");
-
-if($config->visions == ',lite,' and $config->edition != 'open') $lang->admin->menu->system['subMenu']->license = array('link' => "License|admin|license'", 'alias' => 'license');
-if($config->visions != ',lite,') unset($lang->admin->menu->system['subMenu']->buildIndex);
-
-if($config->edition != 'open')
-{
-    $lang->admin->menu->system['subMenu']->ldap        = array('link' => 'LDAP|ldap|set', 'subModule' => 'ldap');
-    $lang->admin->menu->system['subMenu']->libreoffice = array('link' => 'Office|custom|libreoffice');
-}
-
-$lang->admin->dividerMenu = ',company,message,system,';
-
 /* adjust items of search. */
 $lang->searchObjects['all']       = 'All';
 $lang->searchObjects['todo']      = 'Todo';
@@ -275,25 +200,6 @@ global $config;
 if(isset($config->xuanxuan) && strpos($config->visions, ',rnd,') === false)
 {
     $lang->xuanxuan = new stdclass();
-    $lang->admin->menu->xuanxuan = array('link' => 'Chat|admin|xuanxuan', 'subModule' => 'client,setting');
-    $lang->admin->menuOrder[6]   = 'xuanxuan';
-
-    $lang->admin->menu->xuanxuan['subMenu'] = new stdclass();
-    $lang->admin->menu->xuanxuan['subMenu']->index   = array('link' => 'Home|admin|xuanxuan');
-    $lang->admin->menu->xuanxuan['subMenu']->setting = array('link' => 'Parameter|setting|xuanxuan');
-    $lang->admin->menu->xuanxuan['subMenu']->update  = array('link' => 'Update|client|browse', 'subModule' => 'client');
-
-    $lang->admin->menu->xuanxuan['menuOrder'][0]  = 'index';
-    $lang->admin->menu->xuanxuan['menuOrder'][5]  = 'setting';
-    $lang->admin->menu->xuanxuan['menuOrder'][10] = 'update';
-
-    if($config->edition != 'open')
-    {
-        $lang->admin->menu->xuanxuan['subModule']           = 'client,setting,conference';
-        $lang->admin->menu->xuanxuan['subMenu']->conference = array('link' => 'Conference|conference|admin');
-        $lang->admin->menu->xuanxuan['menuOrder'][7]        = 'conference';
-        $lang->navGroup->conference                         = 'admin';
-    }
 
     $lang->navGroup->im      = 'admin';
     $lang->navGroup->setting = 'admin';
diff --git a/extension/lite/common/ext/lang/fr/lite.php b/extension/lite/common/ext/lang/fr/lite.php
index 0a74146ca0..ef7b1da49c 100644
--- a/extension/lite/common/ext/lang/fr/lite.php
+++ b/extension/lite/common/ext/lang/fr/lite.php
@@ -143,81 +143,6 @@ $lang->doc->menuOrder[30] = 'custom';
 $lang->doc->menu->project['subMenu'] = new stdclass();
 $lang->doc->menu->custom['subMenu']  = new stdclass();
 
-if(isset($lang->admin->menu->xuanxuan)) $xuanxuanMenu = $lang->admin->menu->xuanxuan;
-/* Admin menu. */
-$lang->admin->menu            = new stdclass();
-$lang->admin->menu->index     = array('link' => "$lang->indexPage|admin|index", 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-if(isset($xuanxuanMenu)) $lang->admin->menu->xuanxuan = $xuanxuanMenu;
-$lang->admin->menu->company   = array('link' => "{$lang->personnel->common}|company|browse|", 'subModule' => ',user,dept,group,');
-$lang->admin->menu->custom    = array('link' => "{$lang->custom->common}|custom|index", 'exclude' => 'custom-browsestoryconcept,custom-timezone,custom-estimate');
-$lang->admin->menu->extension = array('link' => "{$lang->extension->common}|extension|browse", 'subModule' => 'extension');
-$lang->admin->menu->dev       = array('link' => "$lang->redev|dev|api", 'alias' => 'db', 'subModule' => 'dev,editor,entry');
-$lang->admin->menu->message   = array('link' => "{$lang->message->common}|message|index", 'subModule' => 'message,mail,webhook,sms');
-$lang->admin->menu->system    = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,admin,search,ldap', 'exclude' => 'admin-index,admin-xuanxuan,admin-register,admin-ztcompany');
-
-if($config->vision != 'lite') $lang->admin->menu->xuanxuan['link']  = 'Chat|admin|xuanxuan';
-
-/* Admin menu order. */
-$lang->admin->menuOrder = array();
-$lang->admin->menuOrder[5]  = 'index';
-$lang->admin->menuOrder[6]  = 'xuanxuan';
-$lang->admin->menuOrder[10] = 'company';
-$lang->admin->menuOrder[15] = 'custom';
-$lang->admin->menuOrder[20] = 'message';
-$lang->admin->menuOrder[25] = 'extension';
-$lang->admin->menuOrder[30] = 'dev';
-$lang->admin->menuOrder[35] = 'system';
-
-$lang->admin->menu->message['subMenu']          = new stdclass();
-$lang->admin->menu->message['subMenu']->message = array();
-$lang->admin->menu->message['subMenu']->mail    = array('link' => "{$lang->mail->common}|mail|index", 'subModule' => 'mail');
-$lang->admin->menu->message['subMenu']->webhook = array('link' => "Webhook|webhook|browse", 'subModule' => 'webhook');
-
-if($config->edition != 'open') $lang->admin->menu->message['subMenu']->sms = array('link' => "Message|sms|index");
-
-$lang->admin->menu->message['subMenu']->browser = array('link' => "$lang->browser|message|browser");
-$lang->admin->menu->message['subMenu']->setting = array('link' => "$lang->settings|message|setting");
-
-$lang->admin->menu->message['menuOrder'][5]  = 'mail';
-$lang->admin->menu->message['menuOrder'][10] = 'webhook';
-$lang->admin->menu->message['menuOrder'][11] = 'sms';
-$lang->admin->menu->message['menuOrder'][15] = 'browser';
-$lang->admin->menu->message['menuOrder'][20] = 'setting';
-
-$lang->admin->menu->company['subMenu']              = new stdclass();
-$lang->admin->menu->company['subMenu']->browseUser  = array('link' => "{$lang->user->common}|company|browse", 'subModule' => 'user');
-$lang->admin->menu->company['subMenu']->dept        = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept');
-$lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->priv}|group|browse", 'subModule' => 'group');
-
-$lang->admin->menu->dev['subMenu']         = new stdclass();
-$lang->admin->menu->dev['subMenu']->api    = array('link' => "API|dev|api");
-$lang->admin->menu->dev['subMenu']->db     = array('link' => "$lang->db|dev|db");
-$lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor");
-$lang->admin->menu->dev['subMenu']->entry  = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
-
-$lang->admin->menu->dev['menuOrder'][5]  = 'api';
-$lang->admin->menu->dev['menuOrder'][10] = 'db';
-$lang->admin->menu->dev['menuOrder'][15] = 'editor';
-$lang->admin->menu->dev['menuOrder'][20] = 'entry';
-
-$lang->admin->menu->system['subMenu']              = new stdclass();
-$lang->admin->menu->system['subMenu']->data        = array('link' => "{$lang->admin->data}|backup|index", 'subModule' => 'action');
-$lang->admin->menu->system['subMenu']->safe        = array('link' => "$lang->security|admin|safe", 'alias' => 'checkweak');
-$lang->admin->menu->system['subMenu']->cron        = array('link' => "{$lang->admin->cron}|cron|index", 'subModule' => 'cron');
-$lang->admin->menu->system['subMenu']->timezone    = array('link' => "$lang->timezone|custom|timezone");
-$lang->admin->menu->system['subMenu']->buildIndex  = array('link' => "{$lang->admin->buildIndex}|search|buildindex|");
-
-if($config->visions == ',lite,' and $config->edition != 'open') $lang->admin->menu->system['subMenu']->license = array('link' => "License|admin|license'", 'alias' => 'license');
-if($config->visions != ',lite,') unset($lang->admin->menu->system['subMenu']->buildIndex);
-
-if($config->edition != 'open')
-{
-    $lang->admin->menu->system['subMenu']->ldap        = array('link' => 'LDAP|ldap|set', 'subModule' => 'ldap');
-    $lang->admin->menu->system['subMenu']->libreoffice = array('link' => 'Office|custom|libreoffice');
-}
-
-$lang->admin->dividerMenu = ',company,message,system,';
-
 /* adjust items of search. */
 $lang->searchObjects['all']       = 'All';
 $lang->searchObjects['todo']      = 'Todo';
@@ -275,25 +200,6 @@ global $config;
 if(isset($config->xuanxuan) && strpos($config->visions, ',rnd,') === false)
 {
     $lang->xuanxuan = new stdclass();
-    $lang->admin->menu->xuanxuan = array('link' => 'Chat|admin|xuanxuan', 'subModule' => 'client,setting');
-    $lang->admin->menuOrder[6]   = 'xuanxuan';
-
-    $lang->admin->menu->xuanxuan['subMenu'] = new stdclass();
-    $lang->admin->menu->xuanxuan['subMenu']->index   = array('link' => 'Home|admin|xuanxuan');
-    $lang->admin->menu->xuanxuan['subMenu']->setting = array('link' => 'Parameter|setting|xuanxuan');
-    $lang->admin->menu->xuanxuan['subMenu']->update  = array('link' => 'Update|client|browse', 'subModule' => 'client');
-
-    $lang->admin->menu->xuanxuan['menuOrder'][0]  = 'index';
-    $lang->admin->menu->xuanxuan['menuOrder'][5]  = 'setting';
-    $lang->admin->menu->xuanxuan['menuOrder'][10] = 'update';
-
-    if($config->edition != 'open')
-    {
-        $lang->admin->menu->xuanxuan['subModule']           = 'client,setting,conference';
-        $lang->admin->menu->xuanxuan['subMenu']->conference = array('link' => 'Conference|conference|admin');
-        $lang->admin->menu->xuanxuan['menuOrder'][7]        = 'conference';
-        $lang->navGroup->conference                         = 'admin';
-    }
 
     $lang->navGroup->im      = 'admin';
     $lang->navGroup->setting = 'admin';
diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php
index bf296cab43..dd43e3aeca 100644
--- a/extension/lite/common/ext/lang/zh-cn/lite.php
+++ b/extension/lite/common/ext/lang/zh-cn/lite.php
@@ -53,7 +53,6 @@ else
 $lang->task->common = '任务';
 $lang->dashboard = isset($lang->dashboard->common) ? $lang->dashboard->common : $lang->dashboard;
 
-
 /* Ticket. */
 if($config->edition != 'open') $lang->feedback->menu->ticket = array('link' => '工单|ticket|browse|browseType=unclosed');
 
@@ -144,82 +143,6 @@ $lang->doc->menuOrder[30] = 'custom';
 $lang->doc->menu->project['subMenu'] = new stdclass();
 $lang->doc->menu->custom['subMenu']  = new stdclass();
 
-if(isset($lang->admin->menu->xuanxuan)) $xuanxuanMenu = $lang->admin->menu->xuanxuan;
-/* Admin menu. */
-$lang->admin->menu            = new stdclass();
-$lang->admin->menu->index     = array('link' => "$lang->indexPage|admin|index", 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-if(isset($xuanxuanMenu)) $lang->admin->menu->xuanxuan = $xuanxuanMenu;
-$lang->admin->menu->company   = array('link' => "{$lang->personnel->common}|company|browse|", 'subModule' => ',user,dept,group,');
-$lang->admin->menu->custom    = array('link' => "{$lang->custom->common}|custom|index", 'exclude' => 'custom-browsestoryconcept,custom-timezone,custom-estimate');
-$lang->admin->menu->extension = array('link' => "{$lang->extension->common}|extension|browse", 'subModule' => 'extension');
-$lang->admin->menu->dev       = array('link' => "$lang->redev|dev|api", 'alias' => 'db', 'subModule' => 'dev,editor,entry');
-$lang->admin->menu->message   = array('link' => "{$lang->message->common}|message|index", 'subModule' => 'message,mail,webhook,sms');
-$lang->admin->menu->system    = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,admin,search,ldap', 'exclude' => 'admin-index,admin-xuanxuan,admin-register,admin-ztcompany');
-
-if($config->vision != 'lite') $lang->admin->menu->xuanxuan['link']  = '聊天|admin|xuanxuan';
-
-/* Admin menu order. */
-$lang->admin->menuOrder = array();
-$lang->admin->menuOrder[5]  = 'index';
-$lang->admin->menuOrder[6]  = 'xuanxuan';
-$lang->admin->menuOrder[10] = 'company';
-$lang->admin->menuOrder[15] = 'custom';
-$lang->admin->menuOrder[20] = 'message';
-$lang->admin->menuOrder[25] = 'extension';
-$lang->admin->menuOrder[30] = 'dev';
-$lang->admin->menuOrder[35] = 'system';
-
-$lang->admin->menu->message['subMenu']          = new stdclass();
-$lang->admin->menu->message['subMenu']->message = array();
-$lang->admin->menu->message['subMenu']->mail    = array('link' => "{$lang->mail->common}|mail|index", 'subModule' => 'mail');
-$lang->admin->menu->message['subMenu']->webhook = array('link' => "Webhook|webhook|browse", 'subModule' => 'webhook');
-
-if($config->edition != 'open') $lang->admin->menu->message['subMenu']->sms = array('link' => "短信|sms|index");
-
-$lang->admin->menu->message['subMenu']->browser = array('link' => "$lang->browser|message|browser");
-$lang->admin->menu->message['subMenu']->setting = array('link' => "$lang->settings|message|setting");
-
-$lang->admin->menu->message['menuOrder'][5]  = 'mail';
-$lang->admin->menu->message['menuOrder'][10] = 'webhook';
-$lang->admin->menu->message['menuOrder'][11] = 'sms';
-$lang->admin->menu->message['menuOrder'][15] = 'browser';
-$lang->admin->menu->message['menuOrder'][20] = 'setting';
-
-$lang->admin->menu->company['subMenu']              = new stdclass();
-$lang->admin->menu->company['subMenu']->browseUser  = array('link' => "{$lang->user->common}|company|browse", 'subModule' => 'user');
-$lang->admin->menu->company['subMenu']->dept        = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept');
-$lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->priv}|group|browse", 'subModule' => 'group');
-
-$lang->admin->menu->dev['subMenu']         = new stdclass();
-$lang->admin->menu->dev['subMenu']->api    = array('link' => "API|dev|api");
-$lang->admin->menu->dev['subMenu']->db     = array('link' => "$lang->db|dev|db");
-$lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor");
-$lang->admin->menu->dev['subMenu']->entry  = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
-
-$lang->admin->menu->dev['menuOrder'][5]  = 'api';
-$lang->admin->menu->dev['menuOrder'][10] = 'db';
-$lang->admin->menu->dev['menuOrder'][15] = 'editor';
-$lang->admin->menu->dev['menuOrder'][20] = 'entry';
-
-$lang->admin->menu->system['subMenu']              = new stdclass();
-$lang->admin->menu->system['subMenu']->backup      = array('link' => "{$lang->backup->common}|backup|index");
-$lang->admin->menu->system['subMenu']->trash       = array('link' => "{$lang->action->trash}|action|trash");
-$lang->admin->menu->system['subMenu']->safe        = array('link' => "$lang->security|admin|safe", 'alias' => 'checkweak');
-$lang->admin->menu->system['subMenu']->cron        = array('link' => "{$lang->admin->cron}|cron|index", 'subModule' => 'cron');
-$lang->admin->menu->system['subMenu']->timezone    = array('link' => "$lang->timezone|custom|timezone");
-$lang->admin->menu->system['subMenu']->buildIndex  = array('link' => "{$lang->admin->buildIndex}|search|buildindex|");
-
-if($config->visions == ',lite,' and $config->edition != 'open') $lang->admin->menu->system['subMenu']->license = array('link' => "授权信息|admin|license'", 'alias' => 'license');
-if($config->visions != ',lite,') unset($lang->admin->menu->system['subMenu']->buildIndex);
-
-if($config->edition != 'open')
-{
-    $lang->admin->menu->system['subMenu']->ldap        = array('link' => 'LDAP|ldap|set', 'subModule' => 'ldap');
-    $lang->admin->menu->system['subMenu']->libreoffice = array('link' => 'Office|custom|libreoffice');
-}
-
-$lang->admin->dividerMenu = ',company,message,system,';
-
 /* adjust items of search. */
 $lang->searchObjects['all']       = '全部';
 $lang->searchObjects['todo']      = '待办';
@@ -277,25 +200,6 @@ global $config;
 if(isset($config->xuanxuan) && strpos($config->visions, ',rnd,') === false)
 {
     $lang->xuanxuan = new stdclass();
-    $lang->admin->menu->xuanxuan = array('link' => '聊天|admin|xuanxuan', 'subModule' => 'client,setting');
-    $lang->admin->menuOrder[6]   = 'xuanxuan';
-
-    $lang->admin->menu->xuanxuan['subMenu'] = new stdclass();
-    $lang->admin->menu->xuanxuan['subMenu']->index   = array('link' => '首页|admin|xuanxuan');
-    $lang->admin->menu->xuanxuan['subMenu']->setting = array('link' => '参数|setting|xuanxuan');
-    $lang->admin->menu->xuanxuan['subMenu']->update  = array('link' => '更新|client|browse', 'subModule' => 'client');
-
-    $lang->admin->menu->xuanxuan['menuOrder'][0]  = 'index';
-    $lang->admin->menu->xuanxuan['menuOrder'][5]  = 'setting';
-    $lang->admin->menu->xuanxuan['menuOrder'][10] = 'update';
-
-    if($config->edition != 'open')
-    {
-        $lang->admin->menu->xuanxuan['subModule']           = 'client,setting,conference';
-        $lang->admin->menu->xuanxuan['subMenu']->conference = array('link' => '音视频|conference|admin');
-        $lang->admin->menu->xuanxuan['menuOrder'][7]        = 'conference';
-        $lang->navGroup->conference                         = 'admin';
-    }
 
     $lang->navGroup->im      = 'admin';
     $lang->navGroup->setting = 'admin';
diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index 4ec645fefb..53bbc299ba 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -65,7 +65,7 @@ $lang->admin->menuList->system['dividerMenu'] = ',safe,';
 
 $lang->admin->menuList->user['subMenu']['dept']  = array('link' => "{$lang->dept->common}|dept|browse|", 'subModule' => 'dept');
 $lang->admin->menuList->user['subMenu']['user']  = array('link' => "{$lang->user->common}|company|browse|", 'subModule' => 'user');
-$lang->admin->menuList->user['subMenu']['group'] = array('link' => "{$lang->priv}}|group|browse|", 'subModule' => 'group');
+$lang->admin->menuList->user['subMenu']['group'] = array('link' => "{$lang->priv}|group|browse|", 'subModule' => 'group');
 
 $lang->admin->menuList->user['menuOrder']['5']  = 'dept';
 $lang->admin->menuList->user['menuOrder']['10'] = 'user';
@@ -77,7 +77,7 @@ $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|", 'subModule' => 'auditcl');
-$lang->admin->menuList->model['subMenu']['waterfall'] = array('link' => "$lang->waterfallModel|stage|settype|", 'subModule' => 'stage');
+$lang->admin->menuList->model['subMenu']['waterfall'] = array('link' => "{$lang->waterfallModel}|stage|settype|", 'subModule' => 'stage');
 
 $lang->admin->menuList->model['menuOrder']['5']  = 'common';
 $lang->admin->menuList->model['menuOrder']['15'] = 'waterfall';
@@ -122,3 +122,13 @@ $lang->admin->menuList->dev['menuOrder']['5']  = 'api';
 $lang->admin->menuList->dev['menuOrder']['10'] = 'db';
 $lang->admin->menuList->dev['menuOrder']['15'] = 'editor';
 $lang->admin->menuList->dev['menuOrder']['20'] = 'entry';
+
+if($config->vision == 'lite')
+{
+    unset($lang->admin->menuList->system['subMenu']['mode']);
+    unset($lang->admin->menuList->system['subMenu']['buildindex']);
+    unset($lang->admin->menuList->system['subMenu']['tableengine']);
+    unset($lang->admin->menuList->system['menuOrder']['5']);
+    unset($lang->admin->menuList->system['menuOrder']['45']);
+    unset($lang->admin->menuList->system['menuOrder']['50']);
+}
diff --git a/module/custom/view/required.html.php b/module/custom/view/required.html.php
index eb83cf9aa6..c98d668b19 100644
--- a/module/custom/view/required.html.php
+++ b/module/custom/view/required.html.php
@@ -11,6 +11,13 @@
  */
 ?>
 <?php include 'header.html.php';?>
+<script>
+$('#navbar ul.nav li').removeClass('active');
+$('#navbar ul.nav li[data-id=<?php echo $moduleName?>]').addClass('active');
+<?php if($moduleName == 'bug'):?>
+$('#navbar ul.nav li[data-id=qa]').addClass('active');
+<?php endif;?>
+</script>
 <div id='mainContent' class='main-row'>
   <div class='side-col' id='sidebar'>
     <div class='cell'>
diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php
index 6c9a90b07d..f9b3dd1fdd 100644
--- a/module/custom/view/set.html.php
+++ b/module/custom/view/set.html.php
@@ -28,14 +28,21 @@ $itemRow = <<<EOT
   </tr>
 EOT;
 ?>
+<style>
+.checkbox-primary {width: 170px; margin: 0 10px 10px 0; display: inline-block;}
+</style>
 <?php js::set('itemRow', $itemRow)?>
 <?php js::set('module',  $module)?>
 <?php js::set('field',   $field)?>
 <?php js::set('confirmReviewCase', $lang->custom->notice->confirmReviewCase)?>
 <?php js::set('stopSubmit', true)?>
-<style>
-.checkbox-primary {width: 170px; margin: 0 10px 10px 0; display: inline-block;}
-</style>
+<script>
+$('#navbar ul.nav li').removeClass('active');
+$('#navbar ul.nav li[data-id=<?php echo $module?>]').addClass('active');
+<?php if($module == 'todo'):?>
+$('#navbar ul.nav li[data-id=my]').addClass('active');
+<?php endif;?>
+</script>
 <?php if($module == 'story' and $field == 'review'):?>
 <style>
 .table-form>tbody>tr>th {width: 120px !important}

From de17879c593dd7702f63472e6791cc5659bbade6 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 1 Feb 2023 15:37:07 +0800
Subject: [PATCH 3/8]  * code for task #83436.

---
 module/admin/lang/menu.php           | 21 ++++++++++++++++++---
 module/common/lang/menu.php          | 13 -------------
 module/custom/view/required.html.php |  1 +
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index 53bbc299ba..e4a13779bc 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -82,9 +82,6 @@ $lang->admin->menuList->model['subMenu']['waterfall'] = array('link' => "{$lang-
 $lang->admin->menuList->model['menuOrder']['5']  = 'common';
 $lang->admin->menuList->model['menuOrder']['15'] = 'waterfall';
 
-if($config->edition != 'max') unset($lang->admin->menuList->model['subMenu']['scrum']);
-if($config->edition == 'max') $lang->admin->menuList->model['menuOrder']['10'] = 'scrum';
-
 $lang->admin->menuList->feature['subMenu']['my']          = array('link' => "{$lang->my->common}|custom|set|module=todo");
 $lang->admin->menuList->feature['subMenu']['product']     = array('link' => "{$lang->productCommon}|custom|product|");
 $lang->admin->menuList->feature['subMenu']['execution']   = array('link' => "{$lang->execution->common}|custom|execution|");
@@ -132,3 +129,21 @@ if($config->vision == 'lite')
     unset($lang->admin->menuList->system['menuOrder']['45']);
     unset($lang->admin->menuList->system['menuOrder']['50']);
 }
+
+if($config->edition != 'max') unset($lang->admin->menuList->model['subMenu']['scrum']);
+if(!helper::hasFeature('waterfall'))
+{
+    unset($lang->admin->menuList->model['subMenu']['waterfall']);
+    unset($lang->admin->menuList->model['menuOrder']['15']);
+}
+if($config->edition == 'max' and !helper::hasFeature('scrum_auditplan'))
+{
+    if(!helper::hasFeature('scrum_process'))
+    {
+        $lang->admin->menuList->model['menuOrder']['10'] = 'scrum';
+    }
+    else
+    {
+        unset($lang->admin->menuList->model['subMenu']['scrum']);
+    }
+}
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index c5b2aab74e..677538c228 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -712,7 +712,6 @@ if(!helper::hasFeature('product_track'))
     unset($lang->product->menu->track, $lang->product->menuOrder[40]);
     $lang->product->dividerMenu = str_replace(',track,', ',doc,', $lang->product->dividerMenu);
 }
-if(!helper::hasFeature('waterfall')) unset($lang->admin->menu->model['dropMenu']->waterfall);
 
 if(!helper::hasFeature('devops'))
 {
@@ -729,15 +728,3 @@ if(!helper::hasFeature('kanban'))
     unset($lang->mainNav->kanban, $lang->mainNav->menuOrder[40]);
     $lang->dividerMenu = str_replace(',kanban,' , ',doc,', $lang->dividerMenu);
 }
-
-if($config->edition == 'max' and !helper::hasFeature('scrum_auditplan'))
-{
-    if(!helper::hasFeature('scrum_process'))
-    {
-        $lang->admin->menu->model['dropMenu']->scrum = array('link' => "{$lang->scrumModel}|process|scrumbrowse|processID=0&browseType=scrum", 'subModule' => 'auditcl,process,activity,zoutput,classify,');
-    }
-    else
-    {
-        unset($lang->admin->menu->model['dropMenu']->scrum);
-    }
-}
diff --git a/module/custom/view/required.html.php b/module/custom/view/required.html.php
index c98d668b19..85932e81f2 100644
--- a/module/custom/view/required.html.php
+++ b/module/custom/view/required.html.php
@@ -17,6 +17,7 @@ $('#navbar ul.nav li[data-id=<?php echo $moduleName?>]').addClass('active');
 <?php if($moduleName == 'bug'):?>
 $('#navbar ul.nav li[data-id=qa]').addClass('active');
 <?php endif;?>
+if($('#navbar ul.nav li[data-id=common]').length > 0) $('#navbar ul.nav li[data-id=common]').addClass('active');
 </script>
 <div id='mainContent' class='main-row'>
   <div class='side-col' id='sidebar'>

From bfb0c2248486a5dfab1cb7ad0b8357b9be978437 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 1 Feb 2023 16:00:45 +0800
Subject: [PATCH 4/8] * Optimize page style.

---
 module/admin/css/index.css  |  7 ++++---
 module/admin/lang/en.php    | 38 ++++++++++++++++++-------------------
 module/admin/model.php      |  8 ++++++--
 www/theme/default/style.css |  2 ++
 4 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index 24eb85239b..e5518ba5da 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -11,7 +11,7 @@
 .settings.panel, .plug.panel {margin-bottom: 16px;}
 
 .settings-list {display: flex; flex-wrap: wrap; padding: 0 4px 16px 4px;}
-.settings-list > .setting-box {flex: 1 1 18%; padding: 8px; border: 1px solid #E3E4E9; margin-right: 10px; margin-top: 16px; display: flex; flex-direction: column; justify-content: space-between; cursor: pointer;}
+.settings-list > .setting-box {flex: 1 1 18%; padding: 8px; border: 1px solid rgba(227, 228, 233, 0.6); margin-right: 10px; margin-top: 16px; display: flex; flex-direction: column; justify-content: space-between; cursor: pointer;}
 .settings-list > .setting-box > h4 > img {padding-right: 16px;}
 .settings-list > .setting-box > .setting-desc {padding-bottom: 16px;}
 
@@ -32,9 +32,10 @@
 .official-content > .content {color: #838A9D; font-size: 12px;}
 .official-content > .title {color: #313C52; font-size: 13px;}
 
-.classList > .classItem {flex: 1 1 30%; margin: 5px; border: 1px solid #E3E4E9; border-radius: 4px; margin-bottom: 16px; align-items: center;}
+.classList > .classItem {flex: 1 1 30%; margin: 5px; border: 1px solid rgba(227, 228, 233, 0.6); border-radius: 4px; margin-bottom: 16px; align-items: center;}
 .classItem > .imgBack {flex: 1 1 50%;}
-.classItem > .imgBack > .classImg {background-repeat: no-repeat; background-size: contain; aspect-ratio: 16 / 9; background-position: center; margin: 0px; border-radius: 4px;}
+.classItem > .imgBack > .classImg {background-repeat: no-repeat; background-size: contain; aspect-ratio: 16 / 9; background-position: center; margin: 0px; border-top-left-radius: 4px; border-top-right-radius: 4px;}
 .classItem > .classContent {flex: 1 1 50%; padding: 5px; font-size: 14px; color: #0B0F18; text-align: center; overflow: hidden; height: 24px; margin-bottom: 6px; font-weight: 700;}
 .more {float: right; padding-right: 12px; font-weight: normal;}
 .panel.publicClass {padding: 0 10px;}
+.setting-help {width: 45px;}
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index 48f1977590..3340253118 100755
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -149,25 +149,25 @@ $lang->admin->safe->noticeWeakMode = 'The password will be checked when logging
 $lang->admin->safe->noticeStrong   = 'The longer the password, the more letters, numbers, or special characters it contains, and the less repetitive the password, the more secure it is!';
 $lang->admin->safe->noticeGd       = 'Your server does not have GD module installed, you cannot use the Captcha function, Please use it after installation.';
 
-$lang->admin->menuSetting['system']['name'] = 'System';
-$lang->admin->menuSetting['system']['desc'] = '';
-$lang->admin->menuSetting['user']['name'] = 'User';
-$lang->admin->menuSetting['user']['desc'] = '';
-$lang->admin->menuSetting['switch']['name'] = 'Switch';
-$lang->admin->menuSetting['switch']['desc'] = '';
-$lang->admin->menuSetting['model']['name'] = 'Model';
-$lang->admin->menuSetting['model']['desc'] = '';
-$lang->admin->menuSetting['feature']['name'] = 'Feature';
-$lang->admin->menuSetting['feature']['desc'] = '';
-$lang->admin->menuSetting['template']['name'] = 'Template';
-$lang->admin->menuSetting['template']['desc'] = '';
-$lang->admin->menuSetting['message']['name'] = 'Message';
-$lang->admin->menuSetting['message']['desc'] = '';
+$lang->admin->menuSetting['system']['name']    = 'System';
+$lang->admin->menuSetting['system']['desc']    = '';
+$lang->admin->menuSetting['user']['name']      = 'User';
+$lang->admin->menuSetting['user']['desc']      = '';
+$lang->admin->menuSetting['switch']['name']    = 'Switch';
+$lang->admin->menuSetting['switch']['desc']    = 'Turn on and off some system functions.';
+$lang->admin->menuSetting['model']['name']     = 'Model';
+$lang->admin->menuSetting['model']['desc']     = '';
+$lang->admin->menuSetting['feature']['name']   = 'Feature';
+$lang->admin->menuSetting['feature']['desc']   = '';
+$lang->admin->menuSetting['template']['name']  = 'Template';
+$lang->admin->menuSetting['template']['desc']  = '';
+$lang->admin->menuSetting['message']['name']   = 'Message';
+$lang->admin->menuSetting['message']['desc']   = '';
 $lang->admin->menuSetting['extension']['name'] = 'Extension';
-$lang->admin->menuSetting['extension']['desc'] = '';
-$lang->admin->menuSetting['dev']['name'] = 'Develop';
-$lang->admin->menuSetting['dev']['desc'] = '';
-$lang->admin->menuSetting['convert']['name'] = 'Data Import';
-$lang->admin->menuSetting['convert']['desc'] = '';
+$lang->admin->menuSetting['extension']['desc'] = 'Browse and install plugins.';
+$lang->admin->menuSetting['dev']['name']       = 'Develop';
+$lang->admin->menuSetting['dev']['desc']       = '';
+$lang->admin->menuSetting['convert']['name']   = 'Data Import';
+$lang->admin->menuSetting['convert']['desc']   = 'Data import from third-party systems.';
 
 include dirname(__FILE__) . '/menu.php';
diff --git a/module/admin/model.php b/module/admin/model.php
index 5b0254c96d..4d97ffba73 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -379,12 +379,16 @@ class adminModel extends model
         if(empty($currentMenuKey)) return null;
 
         $currentMenu = $this->lang->admin->menuList->$currentMenuKey;
-        $output      = "<div class='btn-group header-btn'><button class='btn pull-right btn-link' data-toggle='dropdown'> <span class='text'>{$currentMenu['name']}</span> <span class='caret'></span></button><ul class='dropdown-menu' id='adminMenu'>";
+        $output      = "<div class='btn-group header-btn'>";
+        $output     .= "<button class='btn pull-right btn-link' data-toggle='dropdown'>";
+        $output     .= "<span class='text'>{$currentMenu['name']}</span>";
+        $output     .= "<span class='caret'></span></button>";
+        $output     .= "<ul class='dropdown-menu' id='adminMenu'>";
         foreach($this->lang->admin->menuList as $menuKey => $menuGroup)
         {
             $class = $menuKey == $currentMenuKey ? "class='active'" : '';
             if($menuGroup['disabled']) $class .= ' disabled';
-            $output .= "<li $class>" . html::a($menuGroup['disabled'] ? '###' : $menuGroup['link'], $menuGroup['name']) . "</li>";
+            $output .= "<li $class>" . html::a($menuGroup['disabled'] ? '###' : $menuGroup['link'], "<img src='/static/svg/admin-$menuKey.svg'/> {$menuGroup['name']}") . "</li>";
         }
         $output .= "</ul></div>";
 
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 4938e9681c..8af7ea91d6 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -234,3 +234,5 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-
 
 /* Unset style for qa qa-automation-menu. */
 .qa-automation-menu > a:focus, .qa-automation-menu > a:hover {background: unset!important; cursor: default;}
+
+#adminMenu.dropdown-menu {min-width: max-content;}

From fd57156a905556b42c9612d18a9f1f1b8dde79b8 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 1 Feb 2023 16:33:39 +0800
Subject: [PATCH 5/8] * Optimize admin switcher style.

---
 www/theme/default/style.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 8af7ea91d6..5c9565c19c 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -236,3 +236,5 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-
 .qa-automation-menu > a:focus, .qa-automation-menu > a:hover {background: unset!important; cursor: default;}
 
 #adminMenu.dropdown-menu {min-width: max-content;}
+#adminMenu.dropdown-menu > li {padding: 0;}
+#adminMenu.dropdown-menu > li > a {padding: 6px 20px;}

From 5db8511efc181222dbdd2ee1aa3e8592d2fb42e8 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 1 Feb 2023 16:35:28 +0800
Subject: [PATCH 6/8] * Adjust code.

---
 module/admin/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/admin/model.php b/module/admin/model.php
index 4d97ffba73..84da25458d 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -381,14 +381,14 @@ class adminModel extends model
         $currentMenu = $this->lang->admin->menuList->$currentMenuKey;
         $output      = "<div class='btn-group header-btn'>";
         $output     .= "<button class='btn pull-right btn-link' data-toggle='dropdown'>";
-        $output     .= "<span class='text'>{$currentMenu['name']}</span>";
+        $output     .= "<span class='text'>{$currentMenu['name']}</span> ";
         $output     .= "<span class='caret'></span></button>";
         $output     .= "<ul class='dropdown-menu' id='adminMenu'>";
         foreach($this->lang->admin->menuList as $menuKey => $menuGroup)
         {
             $class = $menuKey == $currentMenuKey ? "class='active'" : '';
             if($menuGroup['disabled']) $class .= ' disabled';
-            $output .= "<li $class>" . html::a($menuGroup['disabled'] ? '###' : $menuGroup['link'], "<img src='/static/svg/admin-$menuKey.svg'/> {$menuGroup['name']}") . "</li>";
+            $output .= "<li $class>" . html::a($menuGroup['disabled'] ? '###' : $menuGroup['link'], "<img src='/static/svg/admin-$menuKey.svg' /> {$menuGroup['name']}") . "</li>";
         }
         $output .= "</ul></div>";
 

From 2ef5fe6d4a6006fe3696837278b0dfcab76331b7 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 1 Feb 2023 16:58:39 +0800
Subject: [PATCH 7/8] * Add language.

---
 module/admin/lang/de.php | 38 +++++++++++++++++++-------------------
 module/admin/lang/en.php | 16 ++++++++--------
 module/admin/lang/fr.php | 38 +++++++++++++++++++-------------------
 3 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php
index 979c1c09b4..ca1e6c6c96 100755
--- a/module/admin/lang/de.php
+++ b/module/admin/lang/de.php
@@ -149,25 +149,25 @@ $lang->admin->safe->noticeWeakMode = 'The password will be checked when logging
 $lang->admin->safe->noticeStrong   = 'The longer the password, the more letters, numbers, or special characters it contains, and the less repetitive the password, the more secure it is!';
 $lang->admin->safe->noticeGd       = 'Your server does not have GD module installed, you cannot use the Captcha function, Please use it after installation.';
 
-$lang->admin->menuSetting['system']['name'] = 'System';
-$lang->admin->menuSetting['system']['desc'] = '';
-$lang->admin->menuSetting['user']['name'] = 'User';
-$lang->admin->menuSetting['user']['desc'] = '';
-$lang->admin->menuSetting['switch']['name'] = 'Switch';
-$lang->admin->menuSetting['switch']['desc'] = '';
-$lang->admin->menuSetting['model']['name'] = 'Model';
-$lang->admin->menuSetting['model']['desc'] = '';
-$lang->admin->menuSetting['feature']['name'] = 'Feature';
-$lang->admin->menuSetting['feature']['desc'] = '';
-$lang->admin->menuSetting['template']['name'] = 'Template';
-$lang->admin->menuSetting['template']['desc'] = '';
-$lang->admin->menuSetting['message']['name'] = 'Message';
-$lang->admin->menuSetting['message']['desc'] = '';
+$lang->admin->menuSetting['system']['name']    = 'System';
+$lang->admin->menuSetting['system']['desc']    = 'System elements configuration, such as backup, chat, security etc.';
+$lang->admin->menuSetting['user']['name']      = 'User';
+$lang->admin->menuSetting['user']['desc']      = 'Manage departments,add members and group configuration permissions.';
+$lang->admin->menuSetting['switch']['name']    = 'Switch';
+$lang->admin->menuSetting['switch']['desc']    = 'Turn on and off some functions of the system.';
+$lang->admin->menuSetting['model']['name']     = 'Model';
+$lang->admin->menuSetting['model']['desc']     = 'Configure different project management models and project common elements.';
+$lang->admin->menuSetting['feature']['name']   = 'Feature';
+$lang->admin->menuSetting['feature']['desc']   = 'Configure the elements of the system according to the function menu.';
+$lang->admin->menuSetting['template']['name']  = 'Template';
+$lang->admin->menuSetting['template']['desc']  = 'Configure the template type and template content of the document.';
+$lang->admin->menuSetting['message']['name']   = 'Message';
+$lang->admin->menuSetting['message']['desc']   = 'Configure notification paths and customize the actions to be notified.';
 $lang->admin->menuSetting['extension']['name'] = 'Extension';
-$lang->admin->menuSetting['extension']['desc'] = '';
-$lang->admin->menuSetting['dev']['name'] = 'Develop';
-$lang->admin->menuSetting['dev']['desc'] = '';
-$lang->admin->menuSetting['convert']['name'] = 'Data Import';
-$lang->admin->menuSetting['convert']['desc'] = '';
+$lang->admin->menuSetting['extension']['desc'] = 'Browse and install plugins.';
+$lang->admin->menuSetting['dev']['name']       = 'Develop';
+$lang->admin->menuSetting['dev']['desc']       = 'Support for secondary development of the system.';
+$lang->admin->menuSetting['convert']['name']   = 'Data Import';
+$lang->admin->menuSetting['convert']['desc']   = 'Data import from third-party systems.';
 
 include dirname(__FILE__) . '/menu.php';
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index 3340253118..c808ebf358 100755
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -150,23 +150,23 @@ $lang->admin->safe->noticeStrong   = 'The longer the password, the more letters,
 $lang->admin->safe->noticeGd       = 'Your server does not have GD module installed, you cannot use the Captcha function, Please use it after installation.';
 
 $lang->admin->menuSetting['system']['name']    = 'System';
-$lang->admin->menuSetting['system']['desc']    = '';
+$lang->admin->menuSetting['system']['desc']    = 'System elements configuration, such as backup, chat, security etc.';
 $lang->admin->menuSetting['user']['name']      = 'User';
-$lang->admin->menuSetting['user']['desc']      = '';
+$lang->admin->menuSetting['user']['desc']      = 'Manage departments,add members and group configuration permissions.';
 $lang->admin->menuSetting['switch']['name']    = 'Switch';
-$lang->admin->menuSetting['switch']['desc']    = 'Turn on and off some system functions.';
+$lang->admin->menuSetting['switch']['desc']    = 'Turn on and off some functions of the system.';
 $lang->admin->menuSetting['model']['name']     = 'Model';
-$lang->admin->menuSetting['model']['desc']     = '';
+$lang->admin->menuSetting['model']['desc']     = 'Configure different project management models and project common elements.';
 $lang->admin->menuSetting['feature']['name']   = 'Feature';
-$lang->admin->menuSetting['feature']['desc']   = '';
+$lang->admin->menuSetting['feature']['desc']   = 'Configure the elements of the system according to the function menu.';
 $lang->admin->menuSetting['template']['name']  = 'Template';
-$lang->admin->menuSetting['template']['desc']  = '';
+$lang->admin->menuSetting['template']['desc']  = 'Configure the template type and template content of the document.';
 $lang->admin->menuSetting['message']['name']   = 'Message';
-$lang->admin->menuSetting['message']['desc']   = '';
+$lang->admin->menuSetting['message']['desc']   = 'Configure notification paths and customize the actions to be notified.';
 $lang->admin->menuSetting['extension']['name'] = 'Extension';
 $lang->admin->menuSetting['extension']['desc'] = 'Browse and install plugins.';
 $lang->admin->menuSetting['dev']['name']       = 'Develop';
-$lang->admin->menuSetting['dev']['desc']       = '';
+$lang->admin->menuSetting['dev']['desc']       = 'Support for secondary development of the system.';
 $lang->admin->menuSetting['convert']['name']   = 'Data Import';
 $lang->admin->menuSetting['convert']['desc']   = 'Data import from third-party systems.';
 
diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php
index c460eb9aa1..760eb8f74d 100755
--- a/module/admin/lang/fr.php
+++ b/module/admin/lang/fr.php
@@ -149,25 +149,25 @@ $lang->admin->safe->noticeWeakMode = "Le mot de passe sera vérifié lors de la
 $lang->admin->safe->noticeStrong   = "Le mot de passe est d'autant plus sécurisé qu'il est long, qu'il contient plus de lettres, de chiffres ou de caractères spéciaux, et que les lettres du mot de passe sont peu répétitives !";
 $lang->admin->safe->noticeGd       = 'Your server does not have GD module installed, you cannot use the Captcha function, Please use it after installation.';
 
-$lang->admin->menuSetting['system']['name'] = 'System';
-$lang->admin->menuSetting['system']['desc'] = '';
-$lang->admin->menuSetting['user']['name'] = 'User';
-$lang->admin->menuSetting['user']['desc'] = '';
-$lang->admin->menuSetting['switch']['name'] = 'Switch';
-$lang->admin->menuSetting['switch']['desc'] = '';
-$lang->admin->menuSetting['model']['name'] = 'Model';
-$lang->admin->menuSetting['model']['desc'] = '';
-$lang->admin->menuSetting['feature']['name'] = 'Feature';
-$lang->admin->menuSetting['feature']['desc'] = '';
-$lang->admin->menuSetting['template']['name'] = 'Template';
-$lang->admin->menuSetting['template']['desc'] = '';
-$lang->admin->menuSetting['message']['name'] = 'Message';
-$lang->admin->menuSetting['message']['desc'] = '';
+$lang->admin->menuSetting['system']['name']    = 'System';
+$lang->admin->menuSetting['system']['desc']    = 'System elements configuration, such as backup, chat, security etc.';
+$lang->admin->menuSetting['user']['name']      = 'User';
+$lang->admin->menuSetting['user']['desc']      = 'Manage departments,add members and group configuration permissions.';
+$lang->admin->menuSetting['switch']['name']    = 'Switch';
+$lang->admin->menuSetting['switch']['desc']    = 'Turn on and off some functions of the system.';
+$lang->admin->menuSetting['model']['name']     = 'Model';
+$lang->admin->menuSetting['model']['desc']     = 'Configure different project management models and project common elements.';
+$lang->admin->menuSetting['feature']['name']   = 'Feature';
+$lang->admin->menuSetting['feature']['desc']   = 'Configure the elements of the system according to the function menu.';
+$lang->admin->menuSetting['template']['name']  = 'Template';
+$lang->admin->menuSetting['template']['desc']  = 'Configure the template type and template content of the document.';
+$lang->admin->menuSetting['message']['name']   = 'Message';
+$lang->admin->menuSetting['message']['desc']   = 'Configure notification paths and customize the actions to be notified.';
 $lang->admin->menuSetting['extension']['name'] = 'Extension';
-$lang->admin->menuSetting['extension']['desc'] = '';
-$lang->admin->menuSetting['dev']['name'] = 'Develop';
-$lang->admin->menuSetting['dev']['desc'] = '';
-$lang->admin->menuSetting['convert']['name'] = 'Data Import';
-$lang->admin->menuSetting['convert']['desc'] = '';
+$lang->admin->menuSetting['extension']['desc'] = 'Browse and install plugins.';
+$lang->admin->menuSetting['dev']['name']       = 'Develop';
+$lang->admin->menuSetting['dev']['desc']       = 'Support for secondary development of the system.';
+$lang->admin->menuSetting['convert']['name']   = 'Data Import';
+$lang->admin->menuSetting['convert']['desc']   = 'Data import from third-party systems.';
 
 include dirname(__FILE__) . '/menu.php';

From 96e8ac519dc390e38a1c398dcaa19e07d8b9dd34 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 1 Feb 2023 17:05:41 +0800
Subject: [PATCH 8/8]  * code for task #83438.

---
 module/admin/model.php                   | 4 ++--
 module/convert/view/convertjira.html.php | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/module/admin/model.php b/module/admin/model.php
index 5b0254c96d..f045ba01ba 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -379,12 +379,12 @@ class adminModel extends model
         if(empty($currentMenuKey)) return null;
 
         $currentMenu = $this->lang->admin->menuList->$currentMenuKey;
-        $output      = "<div class='btn-group header-btn'><button class='btn pull-right btn-link' data-toggle='dropdown'> <span class='text'>{$currentMenu['name']}</span> <span class='caret'></span></button><ul class='dropdown-menu' id='adminMenu'>";
+        $output      = "<div class='btn-group header-btn dropdown'><button class='btn pull-right btn-link' data-toggle='dropdown'> <span class='text'>{$currentMenu['name']}</span> <span class='caret'></span></button><ul class='dropdown-menu' id='adminMenu' style='width:135px;'>";
         foreach($this->lang->admin->menuList as $menuKey => $menuGroup)
         {
             $class = $menuKey == $currentMenuKey ? "class='active'" : '';
             if($menuGroup['disabled']) $class .= ' disabled';
-            $output .= "<li $class>" . html::a($menuGroup['disabled'] ? '###' : $menuGroup['link'], $menuGroup['name']) . "</li>";
+            $output .= "<li $class>"  . html::a($menuGroup['disabled'] ? '###' : $menuGroup['link'], "<img src='{$this->config->webRoot}static/svg/admin-{$menuKey}.svg' style='padding-right:10px;' />" . $menuGroup['name']) . "</li>";
         }
         $output .= "</ul></div>";
 
diff --git a/module/convert/view/convertjira.html.php b/module/convert/view/convertjira.html.php
index 777c9c4300..6244c89ebd 100644
--- a/module/convert/view/convertjira.html.php
+++ b/module/convert/view/convertjira.html.php
@@ -20,11 +20,6 @@
 </style>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
-    <div class='main-header'>
-      <div class='heading'>
-        <h4><?php echo $lang->convert->jira->method;?></h4>
-      </div>
-    </div>
     <div class='row text-center'>
       <div class='col-xs-6'>
         <div class='text-center importMethod' data-url="<?php echo $this->createLink("convert", "importNotice", "type=db");?>">