createLink('admin', 'safe'), $lang->admin->safe->set, '', "class='active'");
- if(common::hasPriv('admin', 'checkWeak')) echo html::a($this->createLink('admin', 'checkWeak'), $lang->admin->safe->checkWeak);
+ if(common::hasPriv('admin', 'safe')) echo html::a($this->createLink('admin', 'safe'), $lang->admin->safe->set, '', "class='active'");
+ if(common::hasPriv('admin', 'checkWeak')) echo html::a($this->createLink('admin', 'checkWeak'), $lang->admin->safe->checkWeak);
if(common::hasPriv('admin', 'resetPWDSetting')) echo html::a($this->createLink('admin', 'resetPWDSetting'), $lang->admin->resetPWDSetting);
?>
diff --git a/module/admin/view/setmodule.html.php b/module/admin/view/setmodule.html.php
old mode 100644
new mode 100755
index 6e2b53e3e6..de656b2694
--- a/module/admin/view/setmodule.html.php
+++ b/module/admin/view/setmodule.html.php
@@ -47,7 +47,16 @@
-
+
$lang->admin->setModule->{$feature}), $value, "data-code='{$code}'", 'inline');?>
diff --git a/module/admin/view/sso.html.php b/module/admin/view/sso.html.php
old mode 100644
new mode 100755
diff --git a/module/admin/view/tableengine.html.php b/module/admin/view/tableengine.html.php
old mode 100644
new mode 100755
diff --git a/module/admin/view/ztcompany.html.php b/module/admin/view/ztcompany.html.php
old mode 100644
new mode 100755
diff --git a/module/backup/lang/zh-cn.php b/module/backup/lang/zh-cn.php
index d75db5bfca..e01eed81b3 100644
--- a/module/backup/lang/zh-cn.php
+++ b/module/backup/lang/zh-cn.php
@@ -1,5 +1,5 @@
backup->common = '系统备份';
+$lang->backup->common = '备份';
$lang->backup->index = '备份首页';
$lang->backup->history = '备份历史';
$lang->backup->delete = '删除备份';
diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index 701a2cc579..8da269b3dd 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -10,8 +10,6 @@
* @link http://www.zentao.net
*/
global $config;
-$lang->block = new stdclass();
-$lang->block->common = 'InfoBlock';
$lang->block->id = 'ID';
$lang->block->params = 'Params';
$lang->block->name = 'Name';
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index c892a6005a..52ad95e84c 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -10,8 +10,6 @@
* @link http://www.zentao.net
*/
global $config;
-$lang->block = new stdclass();
-$lang->block->common = 'Block';
$lang->block->id = 'ID';
$lang->block->params = 'Params';
$lang->block->name = 'Name';
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index d97862d624..fa7f693d87 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -10,8 +10,6 @@
* @link http://www.zentao.net
*/
global $config;
-$lang->block = new stdclass();
-$lang->block->common = 'Bloc';
$lang->block->id = 'ID';
$lang->block->params = 'Params';
$lang->block->name = 'Nom';
diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php
index f82f02e28e..229e8814e5 100644
--- a/module/block/lang/vi.php
+++ b/module/block/lang/vi.php
@@ -10,8 +10,6 @@
* @link http://www.zentao.net
*/
global $config;
-$lang->block = new stdclass();
-$lang->block->common = 'Block';
$lang->block->name = 'Tên';
$lang->block->style = 'Kiểu';
$lang->block->grid = 'Vị trí';
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index 75e4104d52..d110b596ca 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -10,8 +10,6 @@
* @link http://www.zentao.net
*/
global $config;
-$lang->block = new stdclass();
-$lang->block->common = '区块';
$lang->block->id = '编号';
$lang->block->params = '参数';
$lang->block->name = '区块名称';
diff --git a/module/common/lang/common.php b/module/common/lang/common.php
index 3959e83492..5ed798f09b 100644
--- a/module/common/lang/common.php
+++ b/module/common/lang/common.php
@@ -3,6 +3,7 @@ $lang->common = new stdclass();
$lang->index = new stdclass();
$lang->my = new stdclass();
$lang->todo = new stdclass();
+$lang->block = new stdclass();
$lang->program = new stdclass();
$lang->programplan = new stdclass();
$lang->product = new stdclass();
@@ -87,6 +88,7 @@ $lang->sonarqube = new stdclass();
$lang->app = new stdclass();
$lang->zahost = new stdclass();
$lang->zanode = new stdclass();
+$lang->holiday = new stdclass();
$lang->projectbuild = new stdclass();
$lang->projectrelease = new stdclass();
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index acc234e2bb..139d0df14d 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -80,7 +80,7 @@ $lang->noData = 'Kein Datensatz';
$lang->fullscreen = 'Fullscreen';
$lang->retrack = 'Retrack';
$lang->whitelist = 'Weiße Liste';
-$lang->globalSetting = 'Global Setting';
+$lang->globalSetting = 'Common';
$lang->waterfallModel = 'Waterfall';
$lang->scrumModel = 'Scrum';
$lang->agilePlusModel = 'Agile Plus';
@@ -159,6 +159,8 @@ $lang->delayed = 'Delayed';
$lang->common->common = 'Standard Module';
$lang->common->story = 'Story';
$lang->my->common = 'My';
+$lang->todo->common = 'Todo';
+$lang->block->common = 'InfoBlock';
$lang->program->common = 'Program';
$lang->product->common = 'Product';
$lang->project->common = 'Project';
@@ -249,7 +251,7 @@ $lang->indexPage = 'Index';
$lang->model = 'Model';
$lang->redev = 'Develop';
$lang->browser = 'Browser';
-$lang->db = 'Database';
+$lang->database = 'Database';
$lang->editor = 'Editor';
$lang->timezone = 'Timezone';
$lang->security = 'Security';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 78c448e8d4..1eedb95f60 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -80,7 +80,7 @@ $lang->noData = 'No data.';
$lang->fullscreen = 'Fullscreen';
$lang->retrack = 'Retrack';
$lang->whitelist = 'Access whitelist';
-$lang->globalSetting = 'Global Setting';
+$lang->globalSetting = 'Common';
$lang->waterfallModel = 'Waterfall';
$lang->scrumModel = 'Scrum';
$lang->agilePlusModel = 'Agile Plus';
@@ -159,6 +159,8 @@ $lang->delayed = 'Delayed';
$lang->common->common = 'Common Module';
$lang->common->story = 'Story';
$lang->my->common = 'My';
+$lang->todo->common = 'Todo';
+$lang->block->common = 'Block';
$lang->program->common = 'Program';
$lang->product->common = 'Product';
$lang->project->common = 'Project';
@@ -249,7 +251,7 @@ $lang->indexPage = 'Index';
$lang->model = 'Model';
$lang->redev = 'Develop';
$lang->browser = 'Browser';
-$lang->db = 'Database';
+$lang->database = 'Database';
$lang->editor = 'Editor';
$lang->timezone = 'Timezone';
$lang->security = 'Security';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index f49e19b9d4..985b8b6d92 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -80,7 +80,7 @@ $lang->noData = 'No data.';
$lang->fullscreen = 'Plein Ecran';
$lang->retrack = 'Réduire';
$lang->whitelist = 'Liste blanche';
-$lang->globalSetting = 'Global Setting';
+$lang->globalSetting = 'Common';
$lang->waterfallModel = 'Waterfall';
$lang->scrumModel = 'Scrum';
$lang->agilePlusModel = 'Agile Plus';
@@ -159,6 +159,8 @@ $lang->delayed = 'Delayed';
$lang->common->common = 'Module Commun';
$lang->common->story = 'Story';
$lang->my->common = 'My';
+$lang->todo->common = 'Agenda';
+$lang->block->common = 'Bloc';
$lang->program->common = 'Program';
$lang->product->common = 'Product';
$lang->project->common = 'Project';
@@ -249,7 +251,7 @@ $lang->indexPage = 'Index';
$lang->model = 'Model';
$lang->redev = 'Develop';
$lang->browser = 'Browser';
-$lang->db = 'Database';
+$lang->database = 'Database';
$lang->editor = 'Editor';
$lang->timezone = 'Timezone';
$lang->security = 'Security';
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index b58904c642..677538c228 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -571,83 +571,7 @@ $lang->company->menuOrder[25] = 'batchAddUser';
$lang->company->menuOrder[30] = 'addUser';
/* Admin menu. */
-$lang->admin->menu = new stdclass();
-$lang->admin->menu->index = array('link' => "$lang->indexPage|admin|index", 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-$lang->admin->menu->company = array('link' => "{$lang->personnel->common}|company|browse|", 'subModule' => ',user,dept,group,');
-$lang->admin->menu->model = array('link' => "$lang->model|custom|browsestoryconcept|", 'class' => 'dropdown dropdown-hover', 'exclude' => 'custom-index,custom-set,custom-product,custom-execution,custom-kanban,custom-required,custom-flow,custom-score,custom-feedback,custom-timezone,custom-mode');
-$lang->admin->menu->custom = array('link' => "{$lang->custom->common}|custom|index", 'exclude' => 'custom-browsestoryconcept,custom-timezone,custom-estimate,custom-code,custom-mode');
-$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');
-$lang->admin->menu->system = array('link' => "{$lang->admin->system}|custom|mode", 'subModule' => 'cron,backup,action,admin,search,convert', 'exclude' => 'admin-index,admin-xuanxuan,admin-register,admin-ztcompany');
-
-$lang->admin->menu->model['dropMenu'] = new stdclass();
-$lang->admin->menu->model['dropMenu']->allModel = array('link' => "{$lang->globalSetting}|custom|browsestoryconcept|", 'subModule' => 'measurement,report,sqlbuilder,subject,custom,meetingroom,baseline');
-
-if($config->edition == 'max') $lang->admin->menu->model['dropMenu']->scrum = array('link' => "{$lang->scrumModel}|auditcl|scrumbrowse|processID=0&browseType=scrum", 'subModule' => 'auditcl,process,activity,zoutput,classify,', 'exclude' => 'process-browse');
-$lang->admin->menu->model['dropMenu']->waterfall = array('link' => "{$lang->waterfallModel}|stage|setType|", 'subModule' => 'stage,auditcl,cmcl,process,activity,zoutput,classify,reviewcl,reviewsetting,design', 'exclude' => 'process-scrumbrowse');
-
-$lang->admin->menu->allModel['subMenu'] = new stdclass();
-$lang->admin->menu->allModel['subMenu']->storyConcept = array('link' => "{$lang->storyConcept}|custom|browsestoryconcept|");
-$lang->admin->menu->allModel['subMenu']->code = array('link' => "{$lang->code}|custom|code|");
-
-$lang->admin->menu->allModel['menuOrder'][5] = 'storyConcept';
-$lang->admin->menu->allModel['menuOrder'][30] = 'code';
-
-$lang->admin->menu->waterfall['subMenu'] = new stdclass();
-$lang->admin->menu->waterfall['subMenu']->stage = array('link' => "{$lang->stage->common}|stage|setType|", 'subModule' => 'stage');
-
-/* Admin menu order. */
-$lang->admin->menuOrder[5] = 'index';
-$lang->admin->menuOrder[10] = 'company';
-$lang->admin->menuOrder[15] = 'model';
-$lang->admin->menuOrder[20] = 'custom';
-$lang->admin->menuOrder[25] = 'message';
-$lang->admin->menuOrder[30] = 'extension';
-$lang->admin->menuOrder[35] = 'dev';
-$lang->admin->menuOrder[40] = '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');
-$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'][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']->mode = array('link' => "{$lang->custom->mode}|custom|mode");
-$lang->admin->menu->system['subMenu']->setModule = array('link' => "{$lang->admin->module}|admin|setmodule");
-$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,resetpwdsetting');
-$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|");
-$lang->admin->menu->system['subMenu']->tableEngine = array('link' => "{$lang->admin->tableEngine}|admin|tableengine|");
-if(version_compare(phpversion(), 5.6) > 0) $lang->admin->menu->system['subMenu']->convertJira = array('link' => "{$lang->convert->importJira}|convert|convertjira|", 'subModule' => 'convert');
-
-$lang->admin->dividerMenu = ',company,message,system,';
+$lang->admin->menu = new stdclass();
$lang->subject->menu = new stdclass();
$lang->subject->menu->storyConcept = array('link' => "{$lang->storyConcept}|custom|browsestoryconcept|");
@@ -788,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'))
{
@@ -805,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|browseType=scrum", 'subModule' => 'auditcl,process,activity,zoutput,classify,');
- }
- else
- {
- unset($lang->admin->menu->model['dropMenu']->scrum);
- }
-}
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 605c219644..e6a1814f28 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -80,7 +80,7 @@ $lang->noData = '暂无';
$lang->fullscreen = '全屏';
$lang->retrack = '收起';
$lang->whitelist = '访问白名单';
-$lang->globalSetting = '全局设置';
+$lang->globalSetting = '通用';
$lang->waterfallModel = '瀑布模型';
$lang->scrumModel = '敏捷模型';
$lang->agilePlusModel = '融合敏捷模型';
@@ -159,6 +159,8 @@ $lang->delayed = '已延期';
$lang->common->common = '公有模块';
$lang->common->story = '需求';
$lang->my->common = '地盘';
+$lang->todo->common = '待办';
+$lang->block->common = '区块';
$lang->program->common = '项目集';
$lang->product->common = '产品';
$lang->project->common = '项目';
@@ -249,7 +251,7 @@ $lang->indexPage = '首页';
$lang->model = '模型';
$lang->redev = '二次开发';
$lang->browser = '浏览器';
-$lang->db = '数据库';
+$lang->database = '数据库';
$lang->editor = '编辑器';
$lang->timezone = '时区';
$lang->security = '安全';
@@ -297,7 +299,7 @@ $lang->devops->rules = '指令';
$lang->devops->settings = '合并请求设置';
$lang->devops->set = '设置';
-$lang->admin->module = '功能设置';
+$lang->admin->module = '功能配置';
$lang->admin->system = '系统';
$lang->admin->entry = '应用';
$lang->admin->data = '数据';
diff --git a/module/common/model.php b/module/common/model.php
index be41936395..4cdc0b0394 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -893,10 +893,10 @@ class commonModel extends model
*/
public static function printHomeButton($tab)
{
- global $lang;
- global $config;
+ global $lang, $config, $app;
if(!$tab) return;
+ if($tab == 'admin' and method_exists($app->control, 'loadModel')) $app->control->loadModel('admin')->setMenu();
$icon = zget($lang->navIcons, $tab, '');
if(!in_array($tab, array('program', 'product', 'project')))
@@ -1324,9 +1324,10 @@ class commonModel extends model
$alias = isset($menuItem->alias) ? $menuItem->alias : '';
$subModule = isset($menuItem->subModule) ? explode(',', $menuItem->subModule) : array();
$class = isset($menuItem->class) ? $menuItem->class : '';
+ $exclude = isset($menuItem->exclude) ? $menuItem->exclude : '';
$active = '';
+
if($subModule and in_array($currentModule, $subModule)) $active = 'active';
- // if($alias and $moduleName == $currentModule and strpos(",$alias,", ",$currentMethod,") !== false) $active = 'active';
if($menuItem->link)
{
$target = '';
@@ -1339,7 +1340,10 @@ class commonModel extends model
if(isset($menuItem->link['module'])) $module = $menuItem->link['module'];
if(isset($menuItem->link['method'])) $method = $menuItem->link['method'];
}
- if($module == $currentModule and ($method == $currentMethod or strpos(",$alias,", ",$currentMethod,") !== false)) $active = 'active';
+
+ if($module == $currentModule and $method == $currentMethod) $active = 'active';
+ if($module == $currentModule and strpos(",$alias,", ",$currentMethod,") !== false) $active = 'active';
+ if(strpos(",$exclude,", ",$currentModule-$currentMethod,") !== false or strpos(",$exclude,", ",$currentModule,") !== false) $active = '';
$label = $menuItem->text;
$dropMenu = '';
diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index 9c26ac3356..caa2c93e2c 100755
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -29,7 +29,8 @@ include 'chosen.html.php';
{$app->tab}->menu->$activeMenu) and is_array($lang->{$app->tab}->menu->$activeMenu) and isset($lang->{$app->tab}->menu->{$activeMenu}['subMenu'])):?>
- 
" . $menuGroup['name']) . "