diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 4fbdc10e5d..36cea26072 100755 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -148,6 +148,16 @@ $lang->product->menu = new stdclass(); $lang->product->menu->home = '主页|product|index|'; $lang->product->menu->list = $lang->productCommon . '|product|all|'; +$lang->product->viewMenu = new stdclass(); +$lang->product->viewMenu->requirement = array('link' => "用户需求|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->viewMenu->story = array('link' => "软件需求|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->viewMenu->plan = array('link' => "计划|productplan|browse|productID=%s", 'subModule' => 'productplan'); +$lang->product->viewMenu->release = array('link' => '发布|release|browse|productID=%s', 'subModule' => 'release'); +$lang->product->viewMenu->roadmap = '路线图|product|roadmap|productID=%s'; +$lang->product->viewMenu->branch = '@branch@|branch|manage|productID=%s'; +$lang->product->viewMenu->module = '模块|tree|browse|productID=%s&view=story'; +$lang->product->viewMenu->view = array('link' => '概况|product|view|productID=%s', 'alias' => 'edit'); + /* System menu. */ $lang->system = new stdclass(); $lang->system->menu = new stdclass(); @@ -556,9 +566,10 @@ $lang->navGroup->my = 'my'; $lang->navGroup->todo = 'my'; $lang->navGroup->effort = 'my'; +$lang->navGroup->productplan = 'product'; + $lang->navGroup->story = 'project'; $lang->navGroup->branch = 'project'; -$lang->navGroup->productplan = 'project'; $lang->navGroup->release = 'project'; $lang->navGroup->tree = 'project'; $lang->navGroup->task = 'project'; diff --git a/module/product/control.php b/module/product/control.php index 83410a7e85..dbaf4c6139 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -102,7 +102,8 @@ class product extends control */ public function browse($productID = 0, $branch = '', $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1) { - $this->lang->navGroup->product = 'project'; + $this->lang->product->menu = $this->lang->product->viewMenu; + /* Lower browse type. */ $browseType = strtolower($browseType); diff --git a/module/product/js/browse.js b/module/product/js/browse.js index 1259367ee7..d047519aaa 100644 --- a/module/product/js/browse.js +++ b/module/product/js/browse.js @@ -1,7 +1,7 @@ $(function() { - $('#subNavbar .nav li').removeClass('active'); - $("#subNavbar .nav li[data-id=" + storyType + ']').addClass('active'); + $('#navbar .nav li').removeClass('active'); + $("#navbar .nav li[data-id=" + storyType + ']').addClass('active'); if($('#storyList thead th.c-title').width() < 150) $('#storyList thead th.c-title').width(150); $('#storyList td.has-child .story-toggle').each(function() diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index 3ab6abf8e1..e53a147a4a 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -75,7 +75,7 @@ id);?> - createLink('product', 'view', 'product=' . $product->id), $product->name);?> + createLink('product', 'browse', 'product=' . $product->id), $product->name);?> '>line, '');?> stories['active'];?> stories['changed'];?> diff --git a/module/program/model.php b/module/program/model.php index 168cf762ad..8c30797392 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -730,7 +730,7 @@ class programModel extends model while($program = $stmt->fetch()) { $link = $from == 'program' ? helper::createLink('program', 'pgmview', "programID=$program->id", '', '', $program->id) : helper::createLink('product', 'all', "programID=$program->id", '', '', $program->id); - $linkHtml = html::a($link, " " . $program->name, '', "id='program$program->id'"); + $linkHtml = html::a($link, " " . $program->name, '', "id='program$program->id' class='text-ellipsis' title=$program->name"); if(isset($programMenu[$program->id]) and !empty($programMenu[$program->id])) {