From bf33d10b9d7f4e234b95f87ead00940e6d10af56 Mon Sep 17 00:00:00 2001 From: Catouse Date: Tue, 5 May 2020 17:20:44 +0800 Subject: [PATCH] * task #7116, task #7127, task #7128, task #7130, implement new menu. --- module/common/lang/en.php | 18 ++++++++---------- module/common/lang/zh-cn.php | 18 ++++++++---------- module/common/model.php | 8 ++++---- module/common/view/header.html.php | 11 ++++++++++- www/js/zui/min.js | 6 +++--- www/theme/zui/css/min.css | 8 ++++---- www/theme/zui/fonts/ZentaoIcon.eot | Bin 30024 -> 33940 bytes www/theme/zui/fonts/ZentaoIcon.svg | 15 +++++++++++++++ www/theme/zui/fonts/ZentaoIcon.ttf | Bin 29848 -> 33764 bytes www/theme/zui/fonts/ZentaoIcon.woff | Bin 29924 -> 33840 bytes 10 files changed, 52 insertions(+), 32 deletions(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index ad44acd94a..f094848a76 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -119,17 +119,15 @@ $lang->common->common = 'Common Module'; /* Main menu. */ $lang->menu = new stdclass(); -$lang->menu->my = 'Dashboard|my|index'; -$lang->menu->product = $lang->productCommon . '|product|index|locate=no'; -$lang->menu->project = $lang->projectCommon . '|project|index|locate=no'; -$lang->menu->qa = 'Test|qa|index'; -$lang->menu->ci = 'CI|repo|browse'; -$lang->menu->doc = 'Doc|doc|index'; -$lang->menu->report = 'Report|report|index'; -$lang->menu->company = 'Company|company|index'; -$lang->menu->admin = 'Admin|admin|index'; +$lang->menu->my = ' Dashboard|my|index'; +$lang->menu->product = ' Project|product|index|locate=no'; +$lang->menu->doc = ' Doc|doc|index'; +$lang->menu->report = ' Report|report|index'; +$lang->menu->company = ' Company|company|index'; +$lang->menu->admin = ' Admin|admin|index'; +$lang->menu->recent = ' Recent|recent|index'; -$lang->dividerMenu = ',qa,report,'; +$lang->dividerMenu = ',admin,recent,'; /* Object list in search form. */ $lang->searchObjects['bug'] = 'Bug'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index c5febad524..d236defa09 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -119,17 +119,15 @@ $lang->common->common = '公有模块'; /* 主导航菜单。*/ $lang->menu = new stdclass(); -$lang->menu->my = ' 我的地盘|my|index'; -$lang->menu->product = $lang->productCommon . '|product|index|locate=no'; -$lang->menu->project = $lang->projectCommon . '|project|index|locate=no'; -$lang->menu->qa = '测试|qa|index'; -$lang->menu->ci = '集成|repo|browse'; -$lang->menu->doc = '文档|doc|index'; -$lang->menu->report = '统计|report|index'; -$lang->menu->company = '组织|company|index'; -$lang->menu->admin = '后台|admin|index'; +$lang->menu->my = ' 地盘|my|index'; +$lang->menu->product = ' 项目|product|index|locate=no'; +$lang->menu->doc = ' 文档|doc|index'; +$lang->menu->report = ' 报表|report|index'; +$lang->menu->company = ' 组织|company|index'; +$lang->menu->admin = ' 后台|admin|index'; +$lang->menu->recent = ' 近期|recent|index'; -$lang->dividerMenu = ',qa,report,'; +$lang->dividerMenu = ',admin,recent,'; /* 查询条中可以选择的对象列表。*/ $lang->searchObjects['bug'] = 'Bug'; diff --git a/module/common/model.php b/module/common/model.php index d7e3093493..5e90461df2 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -396,8 +396,8 @@ class commonModel extends model /** * Print admin subMenu. - * - * @param string $subMenu + * + * @param string $subMenu * @static * @access public * @return void @@ -1783,8 +1783,8 @@ EOD; } /** - * Check Not CN Lang. - * + * Check Not CN Lang. + * * @static * @access public * @return bool diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php index 9c21185fd8..59ade367a4 100755 --- a/module/common/view/header.html.php +++ b/module/common/view/header.html.php @@ -14,11 +14,20 @@ if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile; app->loadConfig('sso');?> sso->redirect)) js::set('ssoRedirect', $config->sso->redirect);?> +