diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php index e954094be1..eb244aac68 100644 --- a/module/admin/lang/de.php +++ b/module/admin/lang/de.php @@ -9,7 +9,6 @@ * @version $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->admin->common = 'Admin'; $lang->admin->index = 'Admin Home'; $lang->admin->checkDB = 'Datenbank prüfen'; $lang->admin->sso = 'SSO'; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index 7b0b00e926..a416f743b0 100644 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -9,7 +9,6 @@ * @version $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->admin->common = 'Admin'; $lang->admin->index = 'Admin Home'; $lang->admin->checkDB = 'Check Database'; $lang->admin->sso = 'Zdoo'; diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php index f4068396aa..daba420ed0 100644 --- a/module/admin/lang/fr.php +++ b/module/admin/lang/fr.php @@ -9,7 +9,6 @@ * @version $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $ * @link https://www.zentao.pm */ -$lang->admin->common = 'Admin'; $lang->admin->index = 'Admin Home'; $lang->admin->checkDB = 'Check Database'; $lang->admin->sso = 'Zdoo'; diff --git a/module/admin/lang/vi.php b/module/admin/lang/vi.php index ba969114ba..7d0347cfde 100644 --- a/module/admin/lang/vi.php +++ b/module/admin/lang/vi.php @@ -9,7 +9,6 @@ * @version $Id: vi.php 4460 2013-02-26 02:28:02Z quocnho@gmail.com $ * @link http://www.zentao.net */ -$lang->admin->common = 'Quản trị'; $lang->admin->index = 'Trang quản trị'; $lang->admin->checkDB = 'Kiểm tra CSDL'; $lang->admin->sso = 'Zdoo'; diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index 1019b561a9..9c412d4b62 100644 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -9,7 +9,6 @@ * @version $Id: zh-cn.php 4767 2013-05-05 06:10:13Z wwccss $ * @link http://www.zentao.net */ -$lang->admin->common = '后台管理'; $lang->admin->index = '后台管理首页'; $lang->admin->checkDB = '检查数据库'; $lang->admin->sso = 'ZDOO集成'; diff --git a/module/build/control.php b/module/build/control.php index 9094212619..79abcd2e12 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -27,8 +27,7 @@ class build extends control if(!empty($_POST)) { - $executionID = $this->post->execution; - $buildID = $this->build->create($executionID); + $buildID = $this->build->create($executionID); if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); $this->loadModel('action')->create('build', $buildID, 'opened'); diff --git a/module/caselib/model.php b/module/caselib/model.php index b7ffc352a4..bf0a788fe7 100644 --- a/module/caselib/model.php +++ b/module/caselib/model.php @@ -23,10 +23,13 @@ class caselibModel extends model */ public function setLibMenu($libraries, $libID, $moduleID = 0) { + /* Set case lib menu. */ + $this->loadModel('qa')->setMenu($this->loadModel('product')->getPairs(), $this->session->product); + $currentLibName = zget($libraries, $libID, ''); - $isMobile = $this->app->viewType == 'mhtml'; - $selectHtml = ''; + $isMobile = $this->app->viewType == 'mhtml'; + $selectHtml = ''; if(!empty($libraries)) { if($isMobile) diff --git a/module/ci/model.php b/module/ci/model.php index f86c6ce357..46ff711cc9 100644 --- a/module/ci/model.php +++ b/module/ci/model.php @@ -17,10 +17,7 @@ class ciModel extends model */ public function setMenu() { - $repoID = $this->session->repoID; - $moduleName = $this->app->getModuleName(); - foreach($this->lang->{$moduleName}->menu as $key => $menu) common::setMenuVars($this->lang->{$moduleName}->menu, $key, $repoID); - $this->lang->{$moduleName}->menuOrder = $this->lang->ci->menuOrder; + common::setMenuVars('devops', $this->session->repoID); } /** diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 96e287bb0e..3f8f259c21 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -64,7 +64,6 @@ $lang->required = 'Pflicht'; $lang->noData = 'Kein Datensatz'; $lang->fullscreen = 'Fullscreen'; $lang->retrack = 'Retrack'; -$lang->recent = 'Kürzlich'; $lang->whitelist = 'Weiße Liste'; $lang->actions = 'Aktionen'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 8b7951058c..520aafd080 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -69,7 +69,6 @@ $lang->required = 'Required'; $lang->noData = 'No data.'; $lang->fullscreen = 'Fullscreen'; $lang->retrack = 'Retrack'; -$lang->recent = 'Recent'; $lang->whitelist = 'Access whitelist'; $lang->actions = 'Action'; @@ -152,6 +151,7 @@ $lang->custom->common = 'Custom'; $lang->extension->common = 'Extension'; $lang->company->common = 'Company'; $lang->dept->common = 'Dept'; +$lang->program->list = 'Program List'; $lang->personnel->common = 'Member'; $lang->personnel->invest = 'Investment'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 952d5bb5ed..1b00caa861 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -64,7 +64,6 @@ $lang->required = 'Obligatoire'; $lang->noData = 'No data.'; $lang->fullscreen = 'Plein Ecran'; $lang->retrack = 'Réduire'; -$lang->recent = 'Récent'; $lang->whitelist = 'Liste blanche'; $lang->actions = 'Action'; diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 2a38657757..98d6f387c4 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -1,4 +1,17 @@ navIcons = array(); +$lang->navIcons['my'] = ""; +$lang->navIcons['program'] = ""; +$lang->navIcons['product'] = ""; +$lang->navIcons['project'] = ""; +$lang->navIcons['execution'] = ""; +$lang->navIcons['qa'] = ""; +$lang->navIcons['devops'] = ""; +$lang->navIcons['doc'] = ""; +$lang->navIcons['report'] = ""; +$lang->navIcons['system'] = ""; +$lang->navIcons['admin'] = ""; + global $config; list($programModule, $programMethod) = explode('-', $config->programLink); list($productModule, $productMethod) = explode('-', $config->productLink); @@ -7,20 +20,20 @@ list($executionModule, $executionMethod) = explode('-', $config->executionLink); /* Main Navigation. */ $lang->mainNav = new stdclass(); -$lang->mainNav->my = " {$lang->my->shortCommon}|my|index|"; -if($config->systemMode == 'new') $lang->mainNav->program = " {$lang->program->common}|$programModule|$programMethod|"; -$lang->mainNav->product = " {$lang->product->common}|$productModule|$productMethod|"; -if($config->systemMode == 'new') $lang->mainNav->project = " {$lang->project->common}|$projectModule|$projectMethod|"; +$lang->mainNav->my = "{$lang->navIcons['my']} {$lang->my->shortCommon}|my|index|"; +if($config->systemMode == 'new') $lang->mainNav->program = "{$lang->navIcons['program']} {$lang->program->common}|$programModule|$programMethod|"; +$lang->mainNav->product = "{$lang->navIcons['product']} {$lang->product->common}|$productModule|$productMethod|"; +if($config->systemMode == 'new') $lang->mainNav->project = "{$lang->navIcons['project']} {$lang->project->common}|$projectModule|$projectMethod|"; -$lang->mainNav->execution = " {$lang->execution->common}|$executionModule|$executionMethod|"; -$lang->mainNav->qa = " {$lang->qa->common}|qa|index|"; -$lang->mainNav->devops = " DevOps|repo|browse|"; -$lang->mainNav->doc = " {$lang->doc->common}|doc|index|"; -$lang->mainNav->report = " {$lang->report->common}|report|productSummary|"; -$lang->mainNav->system = " {$lang->system->common}|my|team|"; -$lang->mainNav->admin = " {$lang->admin->common}|admin|index|"; +$lang->mainNav->execution = "{$lang->navIcons['execution']} {$lang->execution->common}|$executionModule|$executionMethod|"; +$lang->mainNav->qa = "{$lang->navIcons['qa']} {$lang->qa->common}|qa|index|"; +$lang->mainNav->devops = "{$lang->navIcons['devops']} DevOps|repo|browse|"; +$lang->mainNav->doc = "{$lang->navIcons['doc']} {$lang->doc->common}|doc|index|"; +$lang->mainNav->report = "{$lang->navIcons['report']} {$lang->report->common}|report|productSummary|"; +$lang->mainNav->system = "{$lang->navIcons['system']} {$lang->system->common}|my|team|"; +$lang->mainNav->admin = "{$lang->navIcons['admin']} {$lang->admin->common}|admin|index|"; -$lang->dividerMenu = ',devops,report,'; +$lang->dividerMenu = ',devops,system,'; $lang->mainNav->menuOrder[5] = 'my'; if($config->systemMode == 'new') $lang->mainNav->menuOrder[10] = 'program'; $lang->mainNav->menuOrder[15] = 'product'; @@ -28,9 +41,9 @@ $lang->mainNav->menuOrder[20] = 'project'; $lang->mainNav->menuOrder[21] = 'execution'; $lang->mainNav->menuOrder[23] = 'qa'; $lang->mainNav->menuOrder[25] = 'devops'; -$lang->mainNav->menuOrder[30] = 'system'; -$lang->mainNav->menuOrder[35] = 'doc'; -$lang->mainNav->menuOrder[40] = 'report'; +$lang->mainNav->menuOrder[30] = 'doc'; +$lang->mainNav->menuOrder[35] = 'report'; +$lang->mainNav->menuOrder[40] = 'system'; $lang->mainNav->menuOrder[45] = 'admin'; /* My menu. */ @@ -85,7 +98,7 @@ $lang->my->dividerMenu = ',work,dynamic,'; /* Program menu. */ $lang->program->homeMenu = new stdclass(); -$lang->program->homeMenu->browse = array('link' => "{$lang->program->common}|program|browse|"); +$lang->program->homeMenu->browse = array('link' => "{$lang->program->list}|program|browse|"); $lang->program->menu = new stdclass(); $lang->program->menu->product = array('link' => "{$lang->product->common}|program|product|programID=%s", 'alias' => 'view'); @@ -158,7 +171,7 @@ $lang->scrum->menu->execution = array('link' => "$lang->executionCommon|project| $lang->scrum->menu->story = array('link' => "$lang->SRCommon|projectstory|story|projectID=%s", 'subModule' => 'projectstory', 'alias' => 'story,track'); $lang->scrum->menu->doc = array('link' => "{$lang->doc->common}|doc|objectLibs|type=project&objectID=%s", 'subModule' => 'doc'); $lang->scrum->menu->qa = array('link' => "{$lang->qa->common}|project|qa|projectID=%s", 'subModule' => 'testcase,testtask,bug', 'alias' => 'bug,testtask,testcase'); -$lang->scrum->menu->devops = array('link' => "{$lang->devops->common}|repo|browse|repoID=0&objectID=%s", 'subModule' => 'repo'); +$lang->scrum->menu->devops = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&objectID=%s", 'subModule' => 'repo'); $lang->scrum->menu->build = array('link' => "{$lang->build->common}|project|build|project=%s"); $lang->scrum->menu->release = array('link' => "{$lang->release->common}|projectrelease|browse|project=%s", 'subModule' => 'projectrelease'); $lang->scrum->menu->dynamic = array('link' => "$lang->dynamic|project|dynamic|project=%s"); @@ -200,7 +213,7 @@ $lang->waterfall->menu->doc = array('link' => "{$lang->doc->common}|doc| $lang->waterfall->menu->weekly = array('link' => "{$lang->project->report}|weekly|index|project=%s", 'subModule' => ',milestone,'); $lang->waterfall->menu->story = array('link' => "$lang->SRCommon|projectstory|story|project=%s", 'subModule' => 'projectstory'); $lang->waterfall->menu->design = array('link' => "$lang->design|design|browse|product=0&project=%s"); -$lang->waterfall->menu->repo = array('link' => "{$lang->devops->common}|repo|browse|repoID=0&objectID=%s", 'subModule' => 'repo'); +$lang->waterfall->menu->repo = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&objectID=%s", 'subModule' => 'repo'); $lang->waterfall->menu->track = array('link' => "$lang->track|projectstory|track", 'alias' => 'track'); $lang->waterfall->menu->qa = array('link' => "{$lang->qa->common}|project|qa|projectID=%s", 'subModule' => 'testcase,testtask,bug', 'alias' => 'bug,testtask,testcase'); $lang->waterfall->menu->release = array('link' => "{$lang->release->common}|projectrelease|browse", 'subModule' => 'projectrelease'); @@ -251,7 +264,7 @@ $lang->execution->menu->burn = array('link' => "$lang->burn|execution|burn|e $lang->execution->menu->view = array('link' => "$lang->view|execution|grouptask|executionID=%s", 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover'); $lang->execution->menu->story = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); $lang->execution->menu->qa = array('link' => "{$lang->qa->common}|execution|qa|executionID=%s", 'subModule' => 'bug', 'alias' => 'qa,bug,testcase,testtask,testreport'); -$lang->execution->menu->repo = array('link' => "{$lang->devops->common}|repo|browse|repoID=0&objectID=%s", 'subModule' => 'repo'); +$lang->execution->menu->repo = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&objectID=%s", 'subModule' => 'repo'); $lang->execution->menu->doc = array('link' => "{$lang->doc->common}|doc|objectLibs|type=execution&objectID=%s", 'subModule' => 'doc'); $lang->execution->menu->build = array('link' => "{$lang->build->common}|execution|build|executionID=%s", 'subModule' => 'build'); $lang->execution->menu->release = array('link' => "{$lang->release->common}|projectrelease|browse|projectID=0&executionID=%s", 'subModule' => 'projectrelease'); @@ -333,7 +346,7 @@ $lang->qa->menu->automation['subMenu']->browse = array('link' => "{$lang->i /* DevOps menu. */ $lang->devops->menu = new stdclass(); -$lang->devops->menu->code = array('link' => "{$lang->devops->common}|repo|browse|repoID=%s", 'alias' => 'diff,view,revision,log,blame,showsynccomment'); +$lang->devops->menu->code = array('link' => "{$lang->repo->common}|repo|browse|repoID=%s", 'alias' => 'diff,view,revision,log,blame,showsynccomment'); $lang->devops->menu->compile = array('link' => "{$lang->devops->compile}|job|browse", 'subModule' => 'compile,job'); $lang->devops->menu->jenkins = array('link' => "Jenkins|jenkins|browse", 'alias' => 'create,edit'); $lang->devops->menu->maintain = array('link' => "{$lang->devops->repo}|repo|maintain", 'alias' => 'create,edit'); @@ -404,7 +417,7 @@ $lang->admin->menu->custom = array('link' => "{$lang->custom->common}|custom| $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}|backup|index", 'subModule' => 'cron,backup,action,search,admin', 'exclude' => 'admin-index'); +$lang->admin->menu->system = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,admin', 'exclude' => 'admin-index'); /* Admin menu order. */ $lang->admin->menuOrder[5] = 'index'; @@ -457,7 +470,6 @@ $lang->subject->menu = new stdclass(); $lang->subject->menu->storyConcept = array('link' => "{$lang->subject->storyConcept}|custom|browsestoryconcept|"); /* System menu. */ -$lang->system = new stdclass(); $lang->system->menu = new stdclass(); $lang->system->menu->team = array('link' => "{$lang->team->common}|my|team|", 'subModule' => 'user'); $lang->system->menu->dynamic = array('link' => "$lang->dynamic|company|dynamic|"); @@ -505,9 +517,6 @@ $lang->navGroup->cm = 'project'; $lang->navGroup->nc = 'project'; $lang->navGroup->projectrelease = 'project'; $lang->navGroup->build = 'project'; -$lang->navGroup->job = 'project'; -$lang->navGroup->jenkins = 'project'; -$lang->navGroup->compile = 'project'; $lang->navGroup->measrecord = 'project'; $lang->navGroup->execution = 'execution'; @@ -524,8 +533,11 @@ $lang->navGroup->testcase = 'qa'; $lang->navGroup->testtask = 'qa'; $lang->navGroup->automation = 'qa'; -$lang->navGroup->devops = 'devops'; -$lang->navGroup->repo = 'devops'; +$lang->navGroup->devops = 'devops'; +$lang->navGroup->repo = 'devops'; +$lang->navGroup->job = 'devops'; +$lang->navGroup->jenkins = 'devops'; +$lang->navGroup->compile = 'devops'; $lang->navGroup->company = 'system'; $lang->navGroup->sqlbuilder = 'system'; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index 21ed3b710b..397c643392 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -64,7 +64,6 @@ $lang->required = 'Bắt buộc'; $lang->noData = 'Không có dữ liệu.'; $lang->fullscreen = 'Fullscreen'; $lang->retrack = 'Retrack'; -$lang->recent = 'Recente'; $lang->whitelist = 'Lista bianca'; $lang->actions = 'Hành động'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index fe47be546c..7620f5a34b 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -69,7 +69,6 @@ $lang->required = '必填'; $lang->noData = '暂无'; $lang->fullscreen = '全屏'; $lang->retrack = '收起'; -$lang->recent = '近期'; $lang->whitelist = '访问白名单'; $lang->actions = '操作'; @@ -127,14 +126,15 @@ $lang->assignedToAB = '指派'; $lang->typeAB = '类型'; $lang->common->common = '公有模块'; -$lang->my->common = '我的地盘'; +$lang->my->common = '地盘'; $lang->program->common = '项目集'; $lang->product->common = '产品'; $lang->project->common = '项目'; $lang->execution->common = $config->systemMode == 'new' ? '执行' : $lang->executionCommon; $lang->qa->common = '测试'; -$lang->devops->common = '代码'; +$lang->devops->common = 'DevOps'; $lang->doc->common = '文档'; +$lang->repo->common = '代码'; $lang->report->common = '统计'; $lang->system->common = '组织'; $lang->admin->common = '后台'; @@ -152,6 +152,7 @@ $lang->custom->common = '自定义'; $lang->extension->common = '插件'; $lang->company->common = '公司'; $lang->dept->common = '部门'; +$lang->program->list = '项目集列表'; $lang->personnel->common = '人员'; $lang->personnel->invest = '投入人员'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 49b27fd9e1..519b88cd2d 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -64,7 +64,6 @@ $lang->required = '必填'; $lang->noData = '暫無'; $lang->fullscreen = '全屏'; $lang->retrack = '收起'; -$lang->recent = '近期'; $lang->whitelist = '訪問白名單'; $lang->actions = '操作'; diff --git a/module/common/model.php b/module/common/model.php index 75d4cdab0b..feb8c256d5 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -570,6 +570,30 @@ class commonModel extends model } } + /** + * Print upper left corner home button. + * + * @param string $openApp + * @static + * @access public + * @return void + */ + public static function printHomeButton($openApp) + { + global $lang; + + if(!$openApp) return; + $icon = zget($lang->navIcons, $openApp, ''); + + $nav = $lang->mainNav->$openApp; + list($title, $currentModule, $currentMethod, $vars) = explode('|', $nav); + + $link = $openApp != 'execution' ? helper::createLink($currentModule, $currentMethod) : ''; + $html = $link ? html::a($link, "$icon {$lang->$openApp->common}", '', "class='btn'") : "$icon {$lang->$openApp->common}"; + + echo "
" . $html . '
'; + } + /** * Get main nav items list * @@ -615,18 +639,6 @@ class commonModel extends model return $items; } - /** - * Print recent menu. - * - * @access public - * @return void - */ - public static function printRecentMenu() - { - global $lang; - echo '
  • ' . $lang->recent . '
    • '; - } - /** * Print the main menu. * diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php index 23b937bebc..8d9a165e03 100755 --- a/module/common/view/header.html.php +++ b/module/common/view/header.html.php @@ -10,7 +10,10 @@ include 'chosen.html.php';