* Fix menu.

This commit is contained in:
Yagami
2020-05-15 17:11:30 +08:00
parent d1e3e3184f
commit cf2d5cc26f
3 changed files with 38 additions and 16 deletions
+13 -9
View File
@@ -17,15 +17,19 @@ $lang->index->menuOrder[10] = 'project';
/* my menu order. */
$lang->my->menuOrder[5] = 'index';
$lang->my->menuOrder[10] = 'calendar';
$lang->my->menuOrder[15] = 'task';
$lang->my->menuOrder[20] = 'bug';
$lang->my->menuOrder[25] = 'testtask';
$lang->my->menuOrder[30] = 'story';
$lang->my->menuOrder[35] = 'myProject';
$lang->my->menuOrder[40] = 'dynamic';
$lang->my->menuOrder[45] = 'profile';
$lang->my->menuOrder[50] = 'changePassword';
$lang->my->menuOrder[55] = 'score';
$lang->my->menuOrder[15] = 'program';
$lang->my->menuOrder[20] = 'review';
$lang->my->menuOrder[25] = 'story';
$lang->my->menuOrder[30] = 'requirement';
$lang->my->menuOrder[35] = 'task';
$lang->my->menuOrder[40] = 'bug';
$lang->my->menuOrder[50] = 'testtask';
$lang->my->menuOrder[50] = 'myProject';
$lang->my->menuOrder[55] = 'nc';
$lang->my->menuOrder[60] = 'dynamic';
$lang->my->menuOrder[65] = 'profile';
$lang->my->menuOrder[70] = 'changePassword';
$lang->my->menuOrder[75] = 'score';
$lang->todo->menuOrder = $lang->my->menuOrder;
/* product menu order. */
+21 -4
View File
@@ -309,18 +309,19 @@ $lang->my->menu = new stdclass();
$lang->my->menu->index = '首页|my|index';
$lang->my->menu->calendar = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
$lang->my->menu->program = array('link' => '项目|my|program|');
$lang->my->menu->task = array('link' => '任务|my|task|', 'subModule' => 'task');
$lang->my->menu->bug = array('link' => 'Bug|my|bug|', 'subModule' => 'bug');
$lang->my->menu->testtask = array('link' => '测试|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase');
$lang->my->menu->story = array('link' => "{$lang->storyCommon}|my|story|", 'subModule' => 'story');
$lang->my->menu->myProject = "{$lang->projectCommon}|my|project|";
//$lang->my->menu->myProject = "{$lang->projectCommon}|my|project|";
$lang->my->menu->dynamic = '动态|my|dynamic|';
$lang->my->menu->profile = array('link' => '档案|my|profile', 'alias' => 'editprofile');
$lang->my->menu->changePassword = '密码|my|changepassword';
$lang->my->menu->manageContacts = '联系人|my|managecontacts';
$lang->my->menu->score = array('link' => '积分|my|score', 'subModule' => 'score');
$lang->my->dividerMenu = ',task,myProject,profile,';
$lang->my->dividerMenu = ',program,story,dynamic,';
$lang->todo = new stdclass();
$lang->todo->menu = $lang->my->menu;
@@ -533,7 +534,7 @@ $lang->admin->menu->dev = array('link' => '二次开发|dev|api', 'alias'
$lang->admin->menu->translate = array('link' => '翻译|dev|translate');
$lang->admin->menu->data = array('link' => '数据|backup|index', 'subModule' => 'backup,action');
$lang->admin->menu->safe = array('link' => '安全|admin|safe', 'alias' => 'checkweak');
$lang->admin->menu->system = array('link' => '系统|cron|index', 'subModule' => 'cron');
$lang->admin->menu->system = array('link' => '系统|cron|index', 'subModule' => 'cron,search');
$lang->company->menu = $lang->company->menu;
$lang->dept->menu = $lang->company->menu;
@@ -644,6 +645,7 @@ $lang->navGroup->feedback = 'program';
$lang->navGroup->programplan = 'program';
$lang->navGroup->workestimation = 'program';
$lang->navGroup->budget = 'program';
$lang->navGroup->review = 'program';
$lang->navGroup->reviewissue = 'program';
$lang->navGroup->weekly = 'program';
@@ -657,6 +659,8 @@ $lang->navGroup->auditplan = 'program';
$lang->navGroup->cm = 'program';
$lang->navGroup->nc = 'program';
$lang->navGroup->durationestimation = 'program';
$lang->navGroup->report = 'reporting';
$lang->navGroup->stage = 'system';
@@ -692,6 +696,8 @@ $lang->navGroup->backup = 'admin';
$lang->navGroup->mail = 'admin';
$lang->navGroup->dev = 'admin';
$lang->navGroup->extension = 'admin';
$lang->navGroup->action = 'admin';
$lang->navGroup->search = 'admin';
/* 错误提示信息。*/
$lang->error = new stdclass();
@@ -1121,7 +1127,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
/* Cmmi menu. */
$lang->menu->cmmi = new stdclass();
$lang->menu->cmmi->workestimation = '估算|workestimation|index|program={PROGRAM}';
$lang->menu->cmmi->workestimation = array('link' => '估算|workestimation|index|program={PROGRAM}', 'subModule' => 'durationestimation,budget');
$lang->menu->cmmi->programplan = array('link' => '计划|programplan|browse|program={PROGRAM}', 'subModule' => 'programplan');
$lang->menu->cmmi->project = array('link' => $lang->projectCommon . '|project|task|projectID={PROJECT}', 'subModule' => ',project,task,');
$lang->menu->cmmi->review = array('link' => '评审|review|browse|program={PROGRAM}', 'subModule' => ',reviewissue,');
@@ -1140,6 +1146,7 @@ $lang->menu->cmmi->cm = array('link' => '配置|cm|browse|program={P
$lang->menu->cmmi->pssp = '过程|pssp|browse|program={PROGRAM}';
$lang->workestimation = new stdclass();
$lang->budget = new stdclass();
$lang->programplan = new stdclass();
$lang->review = new stdclass();
$lang->reviewsetting = new stdclass();
@@ -1153,8 +1160,10 @@ $lang->nc = new stdclass();
$lang->pssp = new stdclass();
$lang->issue = new stdclass();
$lang->risk = new stdclass();
$lang->durationestimation = new stdclass();
$lang->workestimation->menu = new stdclass();
$lang->budget->menu = new stdclass();
$lang->programplan->menu = new stdclass();
$lang->review->menu = new stdclass();
$lang->reviewsetting->menu = new stdclass();
@@ -1167,6 +1176,14 @@ $lang->cm->menu = new stdclass();
$lang->pssp->menu = new stdclass();
$lang->issue->menu = new stdclass();
$lang->risk->menu = new stdclass();
$lang->durationestimation->menu = new stdclass();
$lang->workestimation->menu->index = '工作量估算|workestimation|index|program={PROGRAM}';
$lang->workestimation->menu->duration = array('link' => '工期估算|durationestimation|index|program={PROGRAM}', 'subModule' => 'durationestimation');
$lang->workestimation->menu->budget = array('link' => '费用估算|budget|summary|', 'subModule' => 'budget');
$lang->durationestimation->menu = $lang->workestimation->menu;
$lang->budget->menu = $lang->workestimation->menu;
$lang->programplan->menu->gantt = '甘特图|programplan|browse|programID={PROGRAM}&productID={PRODUCT}&type=gantt';
$lang->programplan->menu->lists = '阶段列表|programplan|browse|programID={PROGRAM}&productID={PRODUCT}&type=lists';
+4 -3
View File
@@ -15,7 +15,8 @@ if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile;
<?php $this->app->loadConfig('sso');?>
<?php if(!empty($config->sso->redirect)) js::set('ssoRedirect', $config->sso->redirect);?>
<?php $moduleName = $app->rawModule;?>
<?php $isProgram = (isset($lang->navGroup->{$moduleName}) && $lang->navGroup->{$moduleName} == 'program');?>
<?php $methodName = $app->rawMethod;?>
<?php $isProgram = (zget($lang->navGroup, $moduleName) == 'program');?>
<div id='menu'>
<div id='menuHeader'>
<?php $heading = $app->company->name;?>
@@ -30,9 +31,9 @@ if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile;
<div id='mainHeader'>
<div class='container'>
<div id='heading'>
<?php if($isProgram && isset($lang->programSwapper)) echo $lang->programSwapper;?>
<?php //if($isProgram && isset($lang->programSwapper)) echo $lang->programSwapper;?>
</div>
<nav id='navbar'><?php commonModel::printMainmenu($moduleName);?></nav>
<nav id='navbar'><?php commonModel::printMainmenu($moduleName, $methodName);?></nav>
<div id='toolbar'>
<div id="userMenu">
<?php common::printSearchBox();?>