diff --git a/config/filter.php b/config/filter.php index 244e589df6..71cb71ac32 100644 --- a/config/filter.php +++ b/config/filter.php @@ -26,6 +26,7 @@ $filter->default->cookie['lang'] = 'reg::lang'; $filter->default->cookie['theme'] = 'reg::word'; $filter->default->cookie['fingerprint'] = 'reg::word'; $filter->default->cookie['hideMenu'] = 'equal::true'; +$filter->default->cookie['systemModel'] = 'code'; $filter->bug = new stdclass(); $filter->caselib = new stdclass(); diff --git a/module/action/lang/de.php b/module/action/lang/de.php index 3dd5720193..42d458974e 100644 --- a/module/action/lang/de.php +++ b/module/action/lang/de.php @@ -68,6 +68,7 @@ $lang->action->objectTypes['product'] = $lang->productCommon; $lang->action->objectTypes['story'] = 'Story'; $lang->action->objectTypes['productplan'] = 'Plan'; $lang->action->objectTypes['release'] = 'Release'; +$lang->action->objectTypes['program'] = 'Program'; $lang->action->objectTypes['project'] = $lang->projectCommon; $lang->action->objectTypes['task'] = 'Aufgabe'; $lang->action->objectTypes['build'] = 'Build'; @@ -386,6 +387,7 @@ $lang->action->label->product = $lang->productCommon . '|product|view|produc $lang->action->label->productplan = 'Plan|productplan|view|productID=%s'; $lang->action->label->release = 'Release|release|view|productID=%s'; $lang->action->label->story = 'Story|story|view|storyID=%s'; +$lang->action->label->program = "Program|program|browse|"; $lang->action->label->project = "{$lang->projectCommon}|project|view|projectID=%s"; $lang->action->label->task = 'Aufgaben|task|view|taskID=%s'; $lang->action->label->build = 'Builds|build|view|buildID=%s'; @@ -407,6 +409,7 @@ $lang->action->label->risk = 'Risk|risk|view|riskID=%s'; /* Object type. */ $lang->action->search->objectTypeList[''] = ''; $lang->action->search->objectTypeList['product'] = $lang->productCommon; +$lang->action->search->objectTypeList['program'] = 'Program'; $lang->action->search->objectTypeList['project'] = $lang->projectCommon; $lang->action->search->objectTypeList['bug'] = 'Bug'; $lang->action->search->objectTypeList['case'] = 'Fälle'; diff --git a/module/action/lang/en.php b/module/action/lang/en.php index ba6d92efc9..fd92c5456e 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -68,6 +68,7 @@ $lang->action->objectTypes['product'] = $lang->productCommon; $lang->action->objectTypes['story'] = 'Story'; $lang->action->objectTypes['productplan'] = 'Plan'; $lang->action->objectTypes['release'] = 'Release'; +$lang->action->objectTypes['program'] = 'Program'; $lang->action->objectTypes['project'] = $lang->projectCommon; $lang->action->objectTypes['task'] = 'Task'; $lang->action->objectTypes['build'] = 'Build'; @@ -386,6 +387,7 @@ $lang->action->label->product = $lang->productCommon . '|product|view|produc $lang->action->label->productplan = 'Plan|productplan|view|productID=%s'; $lang->action->label->release = 'Release|release|view|productID=%s'; $lang->action->label->story = 'Story|story|view|storyID=%s'; +$lang->action->label->program = "Program|program|browse|"; $lang->action->label->project = "{$lang->projectCommon}|project|view|projectID=%s"; $lang->action->label->task = 'Task|task|view|taskID=%s'; $lang->action->label->build = 'Build|build|view|buildID=%s'; @@ -407,6 +409,7 @@ $lang->action->label->risk = 'Risk|risk|view|riskID=%s'; /* Object type. */ $lang->action->search->objectTypeList[''] = ''; $lang->action->search->objectTypeList['product'] = $lang->productCommon; +$lang->action->search->objectTypeList['program'] = 'Program'; $lang->action->search->objectTypeList['project'] = $lang->projectCommon; $lang->action->search->objectTypeList['bug'] = 'Bug'; $lang->action->search->objectTypeList['case'] = 'Case'; diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php index e391d748e1..f31752eea1 100644 --- a/module/action/lang/fr.php +++ b/module/action/lang/fr.php @@ -68,6 +68,7 @@ $lang->action->objectTypes['product'] = $lang->productCommon; $lang->action->objectTypes['story'] = 'Story'; $lang->action->objectTypes['productplan'] = 'Plan'; $lang->action->objectTypes['release'] = 'Release'; +$lang->action->objectTypes['program'] = 'Program'; $lang->action->objectTypes['project'] = 'Projet'; $lang->action->objectTypes['task'] = 'Tâche'; $lang->action->objectTypes['build'] = 'Build'; @@ -386,6 +387,7 @@ $lang->action->label->product = $lang->productCommon . '|product|view|produc $lang->action->label->productplan = 'Plan|productplan|view|productID=%s'; $lang->action->label->release = 'Release|release|view|productID=%s'; $lang->action->label->story = 'Story|story|view|storyID=%s'; +$lang->action->label->program = "Program|program|browse|"; $lang->action->label->project = "{$lang->projectCommon}|project|view|projectID=%s"; $lang->action->label->task = 'Tâche|task|view|taskID=%s'; $lang->action->label->build = 'Build|build|view|buildID=%s'; @@ -407,6 +409,7 @@ $lang->action->label->risk = 'Risk|risk|view|riskID=%s'; /* Object type. */ $lang->action->search->objectTypeList[''] = ''; $lang->action->search->objectTypeList['product'] = $lang->productCommon; +$lang->action->search->objectTypeList['program'] = 'Program'; $lang->action->search->objectTypeList['project'] = $lang->projectCommon; $lang->action->search->objectTypeList['bug'] = 'Bug'; $lang->action->search->objectTypeList['case'] = 'CasTest'; diff --git a/module/action/lang/vi.php b/module/action/lang/vi.php index 7e99a7a548..c719b20d01 100644 --- a/module/action/lang/vi.php +++ b/module/action/lang/vi.php @@ -68,6 +68,7 @@ $lang->action->objectTypes['product'] = $lang->productCommon; $lang->action->objectTypes['story'] = 'Câu chuyện'; $lang->action->objectTypes['productplan'] = 'Kế hoạch'; $lang->action->objectTypes['release'] = 'Phát hành'; +$lang->action->objectTypes['program'] = 'Program'; $lang->action->objectTypes['project'] = $lang->projectCommon; $lang->action->objectTypes['task'] = 'Nhiệm vụ'; $lang->action->objectTypes['build'] = 'Bản dựng'; @@ -386,6 +387,7 @@ $lang->action->label->product = $lang->productCommon . '|product|view|produc $lang->action->label->productplan = 'Kế hoạch|productplan|view|productID=%s'; $lang->action->label->release = 'Phát hành|release|view|productID=%s'; $lang->action->label->story = 'Câu chuyện|story|view|storyID=%s'; +$lang->action->label->program = "Program|program|browse|"; $lang->action->label->project = "{$lang->projectCommon}|project|view|projectID=%s"; $lang->action->label->task = 'Nhiệm vụ|task|view|taskID=%s'; $lang->action->label->build = 'Bản dựng|build|view|buildID=%s'; @@ -407,6 +409,7 @@ $lang->action->label->risk = 'Risk|risk|view|riskID%s'; /* Object type. */ $lang->action->search->objectTypeList[''] = ''; $lang->action->search->objectTypeList['product'] = $lang->productCommon; +$lang->action->search->objectTypeList['program'] = 'Program'; $lang->action->search->objectTypeList['project'] = $lang->projectCommon; $lang->action->search->objectTypeList['bug'] = 'Bug'; $lang->action->search->objectTypeList['case'] = 'Tình huống'; diff --git a/module/block/view/recentprogramblock.html.php b/module/block/view/recentprogramblock.html.php index d8ab8169df..572dcb761d 100644 --- a/module/block/view/recentprogramblock.html.php +++ b/module/block/view/recentprogramblock.html.php @@ -5,10 +5,10 @@ #cards .panel:hover {border-color: #006AF1; box-shadow: 0 0 10px 0 rgba(0,0,100,.25);} #cards .panel-heading {padding: 12px 24px 10px 16px;} #cards .panel-body {padding: 0 16px 16px;} -#cards .panel-actions {padding: 7px 0;} +#cards .panel-actions {padding: 7px 0;} #cards .panel-actions .dropdown-menu > li > a {padding-left: 5px; text-align: left;} #cards .panel-actions .dropdown-menu > li > a > i {opacity: .5; display: inline-block; margin-right: 4px; width: 18px; text-align: center;} -#cards .panel-actions .dropdown-menu > li > a:hover > i {opacity: 1;} +#cards .panel-actions .dropdown-menu > li > a:hover > i {opacity: 1;} #cards .program-type-label {padding: 1px 2px;} #cards .program-name {font-size: 16px; font-weight: normal; display: inline-block; max-width: 80%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; vertical-align: middle;} #cards .program-infos {font-size: 12px;} @@ -20,6 +20,15 @@ #cards .program-detail .progress {height: 4px;} #cards .program-detail .progress-text-left .progress-text {width: 50px; left: -50px;} #cards .panel-heading {cursor: pointer;} +#cards .program-stages-container {margin: 0 -16px -16px -16px; padding: 0 4px; height: 46px; overflow-x: auto; position: relative;} +#cards .program-stages:after {content: ' '; width: 30px; display: block; right: -16px; top: 16px; bottom: -6px; z-index: 1; background: linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 100%); position: absolute;} +#cards .program-stages-row {position: relative; height: 30px; z-index: 0;} +#cards .program-stage-item {white-space: nowrap; position: absolute; top: 0; min-width: 48px; padding-top: 13px; color: #838A9D;} +#cards .program-stage-item > div {white-space: nowrap; overflow: visible; text-align: center; text-overflow: ellipsis;} +#cards .program-stage-item:before {content: ' '; display: block; width: 8px; height: 8px; border-radius: 50%; background: #D1D1D1; position: absolute; left: 50%; margin-left: -4px; top: 0; z-index: 1;} +#cards .program-stage-item + .program-stage-item:after {content: ' '; display: block; left: -50%; right: 50%; height: 2px; background-color: #D1D1D1; top: 3px; position: absolute; z-index: 0;} +#cards .program-stage-item.is-going {color: #333;} +#cards .program-stage-item.is-going::before {background-color: #0C64EB;}
$program):?> @@ -57,7 +66,26 @@ template === 'cmmi'): ?>

program->ongoingStage; ?>

+ projects as $project) + { + if(!$project->parent) $programProjects[] = $project; + } + ?> +
project->statusList, $program->status);?>
+ +
+
+ +
'> +
name; ?>
+
+ +
+
+
projects ? current($program->projects) : '';?> @@ -82,3 +110,18 @@
+ diff --git a/module/common/lang/en.php b/module/common/lang/en.php index b00638571f..8a36808ddd 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -132,7 +132,7 @@ $lang->dividerMenu = ',admin,'; /* Scrum menu. */ $lang->menu = new stdclass(); -//$lang->menu->program = 'Home|program|index'; +$lang->menu->program = 'Home|program|index'; $lang->menu->product = $lang->productCommon . '|product|index|locate=no'; $lang->menu->project = 'Iteration|project|index|locate=no'; $lang->menu->doc = 'Doc|doc|index|'; @@ -144,34 +144,24 @@ $lang->program = new stdclass(); /* System menu. */ $lang->system = new stdclass(); $lang->system->menu = new stdclass(); -$lang->system->subMenu = new stdclass(); -$lang->system->subMenu->setmodel = new stdclass(); -//$lang->system->menu->setmodel = array('link' => 'cmmi|custom|setcmmi|', 'class' => 'dropdown dropdown-hover'); $lang->system->menu->estimate = array('link' => 'Estimate|custom|estimate|'); $lang->system->menu->stage = array('link' => 'Stage|stage|browse|', 'subModule' => 'stage'); -$lang->system->menu->measurement = array('link' => 'Measurement|measurement|settips|', 'subModule' => 'sqlbuilder,measurement,report'); -$lang->system->menu->auditcl = array('link' => 'QA|auditcl|browse|', 'subModule' => 'auditcl'); -$lang->system->menu->cmcl = array('link' => 'Cmcl|cmcl|browse|', 'subModule' => ',cmcl,baseline,'); -$lang->system->menu->process = array('link' => 'Process|process|browse|', 'subModule' => ',activity,output,classify,'); -$lang->system->menu->reviewcl = array('link' => 'Reviewcl|reviewcl|browse|category=PP|', 'subModule' => ',reviewcl,reviewsetting,'); $lang->system->menu->subject = array('link' => 'Subject|subject|browse|'); $lang->system->menu->holiday = array('link' => 'Holiday|holiday|browse|'); -$lang->system->subMenu->setmodel->scrum ='scrum|custom|setscrum|'; +$lang->system->menu->custom = array('link' => 'Custom|custom|plan|'); $lang->system->dividerMenu = ',auditcl,subject,'; -//if($this->cookie->systemModel == 'scrum') -//{ -// $lang->system->menu = new stdclass(); -// $lang->system->subMenu->setmodel = new stdclass(); -// $lang->system->menu->setmodel = array('link' => 'scrum|custom|setscrum|', 'class' => 'dropdown dropdown-hover'); -// $lang->system->menu->subject = array('link' => '科目|subject|browse|'); -// $lang->system->menu->measurement = array('link' => '度量|measurement|settips|', 'subModule' => 'sqlbuilder,measurement'); -// $lang->system->menu->holiday = array('link' => '节假日|holiday|browse|'); -// -// $lang->system->subMenu->setmodel->cmmi ='cmmi|custom|setcmmi|'; -// $lang->mainNav->system = ' 组织|measurement|settips|'; -// unset($lang->system->dividerMenu); -//} +if(isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') +{ + $lang->system->menu = new stdclass(); + $lang->system->menu->subject = array('link' => 'Subject|subject|browse|'); + $lang->system->menu->holiday = array('link' => 'Holiday|holiday|browse|'); + $lang->system->menu->custom = array('link' => 'Custom|custom|concept|'); + + $lang->system->subMenu->setmodel->cmmi ='cmmi|custom|setcmmi|'; + $lang->mainNav->system = ' System|subject|settips|'; + unset($lang->system->dividerMenu); +} $lang->stage = new stdclass(); $lang->stage->menu = new stdclass(); @@ -180,45 +170,6 @@ $lang->stage->menu->settype = 'Stage Type|stage|settype|'; $lang->measurement = new stdclass(); $lang->measurement->menu = new stdclass(); -$lang->measurement->menu->settips = 'Set Tips|measurement|settips|'; -$lang->measurement->menu->define = array('link' => 'Measurement|measurement|browse|type=basic', 'alias' => 'createbasic'); -$lang->measurement->menu->data = array('link' => 'Sqlbuilder|sqlbuilder|browsesqlview|', 'subModule' => 'sqlbuilder'); -$lang->measurement->menu->template = array('link' => 'Measurement|measurement|template|', 'subModule' => 'report', 'alias' => 'createtemplate'); - -$lang->sqlbuilder = new stdclass(); -$lang->sqlbuilder->menu = $lang->measurement->menu; - -$lang->cmcl = new stdclass(); -$lang->cmcl->menu = new stdclass(); -$lang->cmcl->menu->browse = array('link' => 'Cmcl|cmcl|browse|', 'subModule' => 'cmcl'); -$lang->cmcl->menu->catalog = 'Catalog|baseline|catalog|'; -$lang->cmcl->menu->template = array('link' => 'Template|baseline|template|', 'alias' => 'createtemplate,edittemplate,view,editbook,managebook'); - -$lang->baseline = new stdclass(); -$lang->baseline->menu = $lang->cmcl->menu; - -$lang->process = new stdclass(); -$lang->process->menu = new stdclass(); -$lang->process->menu->browse = array('link' => 'Process|process|browse|', 'subModule' => 'process'); -$lang->process->menu->activity = array('link' => 'Activity|activity|browse|', 'subModule' => 'activity'); -$lang->process->menu->output = array('link' => 'Output|output|browse|', 'subModule' => 'output'); -$lang->process->menu->classify = array('link' => 'Classify|classify|browse|', 'subModule' => 'classify'); - -$lang->activity = new stdclass(); -$lang->output = new stdclass(); -$lang->classify = new stdclass(); -$lang->activity->menu = $lang->process->menu; -$lang->output->menu = $lang->process->menu; -$lang->classify->menu = $lang->process->menu; - -$lang->reviewcl = new stdclass(); -$lang->reviewcl->menu = new stdclass(); -$lang->reviewcl->menu->browse = array('link' => 'Reviewcl|reviewcl|browse|category=PP', 'subModule' => 'reviewcl'); -$lang->reviewcl->menu->version = array('link' => 'Review Version|reviewsetting|version|'); -$lang->reviewcl->menu->reviewer = array('link' => 'Reviewer|reviewsetting|reviewer|'); - -$lang->reviewsetting = new stdclass(); -$lang->reviewsetting->menu = $lang->reviewcl->menu; /* Object list in search form. */ $lang->searchObjects['bug'] = 'Bug'; @@ -611,6 +562,7 @@ $lang->navGroup->testsuite = 'program'; $lang->navGroup->caselib = 'program'; $lang->navGroup->feedback = 'program'; $lang->navGroup->deploy = 'program'; +$lang->navGroup->stakeholder = 'program'; $lang->navGroup->programplan = 'program'; $lang->navGroup->workestimation = 'program'; @@ -630,6 +582,7 @@ $lang->navGroup->nc = 'program'; $lang->navGroup->job = 'program'; $lang->navGroup->jenkins = 'program'; $lang->navGroup->compile = 'program'; +$lang->navGroup->build = 'program'; $lang->navGroup->durationestimation = 'program'; @@ -1101,10 +1054,9 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') /* Cmmi menu. */ $lang->menu->cmmi = new stdclass(); -$lang->menu->cmmi->workestimation = array('link' => 'Estimation|workestimation|index|program={PROGRAM}', 'subModule' => 'durationestimation,budget'); +$lang->menu->cmmi->programindex = array('link' => 'Home|program|index|program={PROGRAM}'); $lang->menu->cmmi->programplan = array('link' => 'Programplan|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|review|browse|program={PROGRAM}', 'subModule' => ',reviewissue,'); $lang->menu->cmmi->weekly = array('link' => 'Weekly|weekly|index|program={PROGRAM}', 'subModule' => ',milestone,'); $lang->menu->cmmi->doc = array('link' => 'Doc|doc|index|program={PROGRAM}'); $lang->menu->cmmi->product = array('link' => 'Story|product|browse|product={PRODUCT}&branch=&browseType=unclosed&queryID=0&storyType=requirement', 'subModule' => ',story,'); @@ -1114,10 +1066,17 @@ $lang->menu->cmmi->qa = array('link' => 'QA|bug|browse|product={PROD $lang->menu->cmmi->release = array('link' => 'Release|release|browse|product={PRODUCT}', 'subModule' => 'release'); $lang->menu->cmmi->issue = 'Issue|issue|browse|'; $lang->menu->cmmi->risk = 'Risk|risk|browse|'; -$lang->menu->cmmi->report = array('link' => 'Measurement|report|programsummary|program={PROGRAM}', 'subModule' => ',report,'); -$lang->menu->cmmi->auditplan = array('link' => 'Audit|auditplan|browse|', 'subModule' => 'nc'); -$lang->menu->cmmi->cm = array('link' => 'CM|cm|browse|program={PROGRAM}', 'subModule' => 'cm'); -$lang->menu->cmmi->pssp = 'Process|pssp|browse|program={PROGRAM}'; +$lang->menu->cmmi->list = array('link' => 'More|workestimation|index|program={PROGRAM}', 'class' => 'dropdown dropdown-hover cmmi-list', 'subModule' => 'stakeholder,workestimation,durationestimation,budget,pssp,stakeholder'); + +/* Srcum menu. */ +$lang->menu->srcum = new stdclass(); +$lang->menu->srcum->programindex = array('link' => 'Home|program|index|program={PROGRAM}'); + +$lang->cmmi = new stdclass(); +$lang->cmmi->subMenu = new stdclass(); +$lang->cmmi->subMenu->list = new stdclass(); +$lang->cmmi->subMenu->list->workestimation = array('link' => 'Workestimation|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget'); +$lang->cmmi->subMenu->list->program = 'Program|program|edit|'; $lang->cmmiproduct = new stdclass(); $lang->workestimation = new stdclass(); @@ -1133,6 +1092,7 @@ $lang->nc = new stdclass(); $lang->pssp = new stdclass(); $lang->issue = new stdclass(); $lang->risk = new stdclass(); +$lang->stakeholder = new stdclass(); $lang->durationestimation = new stdclass(); $lang->workestimation->menu = new stdclass(); @@ -1148,6 +1108,7 @@ $lang->cm->menu = new stdclass(); $lang->pssp->menu = new stdclass(); $lang->issue->menu = new stdclass(); $lang->risk->menu = new stdclass(); +$lang->stakeholder->menu = new stdclass(); $lang->durationestimation->menu = new stdclass(); $lang->workestimation->menu->index = 'Workestimation|workestimation|index|program={PROGRAM}'; @@ -1160,28 +1121,16 @@ $lang->budget->menu = $lang->workestimation->menu; $lang->programplan->menu->gantt = array('link' => 'Gantt|programplan|browse|programID={PROGRAM}&productID={PRODUCT}&type=gantt'); $lang->programplan->menu->lists = 'Stage|programplan|browse|programID={PROGRAM}&productID={PRODUCT}&type=lists'; -$lang->review->menu->review = array('link' => 'Reivew|review|browse|program={PROGRAM}', 'subModule' => 'review'); -$lang->review->menu->issue = array('link' => 'Reviewissue|reviewissue|issue|program={PROGRAM}', 'subModule' => 'reviewissue'); - -$lang->reviewissue = new stdclass(); -$lang->reviewissue->menu = $lang->review->menu; - $lang->weekly->menu->browse = 'Weekly|weekly|index|program={PROGRAM}'; $lang->weekly->menu->issue = 'Milestone|milestone|index|program={PROGRAM}'; +$lang->cmmiproduct->menu->plan = array('link' => 'Plan|productplan|browse|productID={PRODUCT}', 'subModule' => 'productplan'); $lang->cmmiproduct->menu->requirement = 'User Story|product|browse|product={PRODUCT}&branch=&browseType=unclosed&queryID=0&storyType=requirement'; $lang->cmmiproduct->menu->story = 'Software Story|product|browse|product={PRODUCT}&branch=&browseType=unclosed&queryID=0&storyType=story'; $lang->cmmiproduct->menu->track = 'Track|story|track|product={PRODUCT}'; -$lang->auditplan->menu->browse = array('link' => 'Auditplan|auditplan|browse|', 'alias' => 'create,edit'); -$lang->auditplan->menu->nc = array('link' => 'NC|nc|browse|program={PROGRAM}', 'subModule' => 'nc'); - -$lang->story->menu = $lang->cmmiproduct->menu; $lang->milestone->menu = $lang->weekly->menu; $lang->nc->menu = $lang->auditplan->menu; -$lang->cm->menu->browse = array('link' => 'Baseline|cm|browse|program={PROGRAM}', 'alias' => 'create,edit'); -$lang->cm->menu->report = 'Report|cm|report|program={PROGRAM}'; - $lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'report', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'holiday', 'custom', 'auditcl', 'subject', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search'); $lang->haveMenuMethod = array('custom'); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 9e3a17b188..f94e5f5c78 100755 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -144,27 +144,20 @@ $lang->program = new stdclass(); /* System menu. */ $lang->system = new stdclass(); $lang->system->menu = new stdclass(); -$lang->system->subMenu = new stdclass(); -$lang->system->subMenu->setmodel = new stdclass(); -$lang->system->menu->setmodel = array('link' => 'cmmi|custom|setcmmi|', 'class' => 'dropdown dropdown-hover'); $lang->system->menu->estimate = array('link' => '估算|custom|estimate|'); $lang->system->menu->stage = array('link' => '阶段|stage|browse|', 'subModule' => 'stage'); $lang->system->menu->subject = array('link' => '科目|subject|browse|'); $lang->system->menu->holiday = array('link' => '节假日|holiday|browse|'); $lang->system->menu->custom = array('link' => '自定义|custom|plan|'); -$lang->system->subMenu->setmodel->scrum ='scrum|custom|setscrum|'; $lang->system->dividerMenu = ',auditcl,subject,'; if(isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') { $lang->system->menu = new stdclass(); - $lang->system->subMenu->setmodel = new stdclass(); - $lang->system->menu->setmodel = array('link' => 'scrum|custom|setscrum|', 'class' => 'dropdown dropdown-hover'); $lang->system->menu->subject = array('link' => '科目|subject|browse|'); $lang->system->menu->holiday = array('link' => '节假日|holiday|browse|'); $lang->system->menu->custom = array('link' => '自定义|custom|concept|'); - $lang->system->subMenu->setmodel->cmmi ='cmmi|custom|setcmmi|'; $lang->mainNav->system = ' 组织|subject|browse|'; unset($lang->system->dividerMenu); } @@ -174,6 +167,9 @@ $lang->stage->menu = new stdclass(); $lang->stage->menu->browse = array('link' => '阶段列表|stage|browse|', 'alias' => 'create,edit,batchcreate'); $lang->stage->menu->settype = '阶段类型|stage|settype|'; +$lang->measurement = new stdclass(); +$lang->measurement->menu = new stdclass(); + /* 查询条中可以选择的对象列表。*/ $lang->searchObjects['bug'] = 'Bug'; $lang->searchObjects['story'] = "{$lang->storyCommon}"; @@ -973,6 +969,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->testcase->subMenu = new stdclass(); $lang->testcase->subMenu->bysuite = new stdclass(); + $lang->testcase->subMenu->bysuite = new stdclass(); $lang->testcase->subMenu->bysuite->create = '建套件|testsuite|create|productID=%s'; $lang->testcase->menuOrder[5] = 'product'; diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php index fa2b4a1c97..e2cfbb1c78 100755 --- a/module/common/view/header.html.php +++ b/module/common/view/header.html.php @@ -15,6 +15,7 @@ if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile; app->loadConfig('sso');?> sso->redirect)) js::set('ssoRedirect', $config->sso->redirect);?> navGroup, $app->rawModule) == 'program');?> +navGroup, $app->rawModule) == 'system');?>