diff --git a/module/block/control.php b/module/block/control.php
index 77aa62b7a4..073c6f835b 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -256,7 +256,13 @@ class block extends control
if(isset($this->lang->block->modules[$source]->moreLinkList->{$blockID}))
{
list($moduleName, $method, $vars) = explode('|', sprintf($this->lang->block->modules[$source]->moreLinkList->{$blockID}, isset($block->params->type) ? $block->params->type : ''));
+
+ /* The list assigned to me jumps to the work page when click more button. */
$block->moreLink = $this->createLink($moduleName, $method, $vars);
+ if($moduleName = 'my' and strpos('task|story|requirement|bug|testcase|testtask|issue|risk', $method))
+ {
+ $block->moreLink = $this->createLink($moduleName, 'work', 'mode=' . $method . '&' . $vars);
+ }
}
elseif($block->block == 'dynamic')
{
diff --git a/module/build/model.php b/module/build/model.php
index c6927fe4e7..cdeb440096 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -98,7 +98,6 @@ class buildModel extends model
->leftJoin(TABLE_RELEASE)->alias('t3')->on('t1.id = t3.build')
->leftJoin(TABLE_BRANCH)->alias('t4')->on('t1.branch = t4.id')
->where('t1.PRJ')->eq((int)$projectID)
- ->andWhere('t1.project')->ne(0)
->beginIF($productID)->andWhere('t1.product')->eq((int)$productID)->fi()
->beginIF($branch)->andWhere('t1.branch')->in("0,$branch")->fi()
->andWhere('t1.deleted')->eq(0)
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 605d74ec8a..aca3ba9521 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -400,6 +400,7 @@ $lang->bug->menu->caselib = array('link' => 'Bibliothek|caselib|browse');
$lang->testcase = new stdclass();
$lang->testcase->menu = new stdclass();
$lang->testcase->subMenu = $lang->qa->subMenu;
+$lang->testcase->menu->index = array('link' => 'Index|qa|index');
$lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testcase->menu->testcase = array('link' => 'Fälle|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree', 'class' => 'dropdown dropdown-hover');
$lang->testcase->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s');
@@ -410,6 +411,7 @@ $lang->testcase->menu->caselib = array('link' => 'Bibliothek|caselib|browse');
$lang->testtask = new stdclass();
$lang->testtask->menu = new stdclass();
$lang->testtask->subMenu = $lang->qa->subMenu;
+$lang->testtask->menu->index = array('link' => 'Index|qa|index');
$lang->testtask->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testtask->menu->testcase = array('link' => 'Fälle|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testtask->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report');
@@ -420,6 +422,7 @@ $lang->testtask->menu->caselib = array('link' => 'Bibliothek|caselib|browse');
$lang->testsuite = new stdclass();
$lang->testsuite->menu = new stdclass();
$lang->testsuite->subMenu = $lang->qa->subMenu;
+$lang->testsuite->menu->index = array('link' => 'Index|qa|index');
$lang->testsuite->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testsuite->menu->testcase = array('link' => 'Fälle|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testsuite->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s');
@@ -430,6 +433,7 @@ $lang->testsuite->menu->caselib = array('link' => 'Library|caselib|browse');
$lang->testreport = new stdclass();
$lang->testreport->menu = new stdclass();
$lang->testreport->subMenu = $lang->qa->subMenu;
+$lang->testreport->menu->index = array('link' => 'Index|qa|index');
$lang->testreport->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testreport->menu->testcase = array('link' => 'Fälle|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testreport->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s');
@@ -439,6 +443,7 @@ $lang->testreport->menu->caselib = array('link' => 'Bibliothek|caselib|browse'
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
+$lang->caselib->menu->index = array('link' => 'Index|qa|index');
$lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|');
$lang->caselib->menu->testcase = array('link' => 'Fälle|testcase|browse|', 'class' => 'dropdown dropdown-hover');
$lang->caselib->menu->testtask = array('link' => 'Build|testtask|browse|');
@@ -819,7 +824,7 @@ $lang->icons['task'] = 'check-sign';
$lang->icons['tasks'] = 'tasks';
$lang->icons['program'] = 'folder-open-o';
$lang->icons['project'] = 'project';
-$lang->icons['stage'] = 'stage';
+$lang->icons['stage'] = 'waterfall';
$lang->icons['sprint'] = 'sprint';
$lang->icons['doc'] = 'file-text';
$lang->icons['doclib'] = 'folder-close';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 680e3ac1c2..b3e415bf6a 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -400,6 +400,7 @@ $lang->bug->menu->caselib = array('link' => 'Case Library|caselib|browse');
$lang->testcase = new stdclass();
$lang->testcase->menu = new stdclass();
$lang->testcase->subMenu = $lang->qa->subMenu;
+$lang->testcase->menu->index = array('link' => 'Index|qa|index');
$lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testcase->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree', 'class' => 'dropdown dropdown-hover');
$lang->testcase->menu->testtask = array('link' => 'Request|testtask|browse|productID=%s');
@@ -410,6 +411,7 @@ $lang->testcase->menu->caselib = array('link' => 'Case Library|caselib|browse'
$lang->testtask = new stdclass();
$lang->testtask->menu = new stdclass();
$lang->testtask->subMenu = $lang->qa->subMenu;
+$lang->testtask->menu->index = array('link' => 'Index|qa|index');
$lang->testtask->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testtask->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testtask->menu->testtask = array('link' => 'Request|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report');
@@ -420,6 +422,7 @@ $lang->testtask->menu->caselib = array('link' => 'Case Library|caselib|browse'
$lang->testsuite = new stdclass();
$lang->testsuite->menu = new stdclass();
$lang->testsuite->subMenu = $lang->qa->subMenu;
+$lang->testsuite->menu->index = array('link' => 'Index|qa|index');
$lang->testsuite->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testsuite->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testsuite->menu->testtask = array('link' => 'Request|testtask|browse|productID=%s');
@@ -430,6 +433,7 @@ $lang->testsuite->menu->caselib = array('link' => 'Case Library|caselib|browse
$lang->testreport = new stdclass();
$lang->testreport->menu = new stdclass();
$lang->testreport->subMenu = $lang->qa->subMenu;
+$lang->testreport->menu->index = array('link' => 'Index|qa|index');
$lang->testreport->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testreport->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testreport->menu->testtask = array('link' => 'Request|testtask|browse|productID=%s');
@@ -439,6 +443,7 @@ $lang->testreport->menu->caselib = array('link' => 'Case Library|caselib|brows
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
+$lang->caselib->menu->index = array('link' => 'Index|qa|index');
$lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|');
$lang->caselib->menu->testcase = array('link' => 'Case|testcase|browse|', 'class' => 'dropdown dropdown-hover');
$lang->caselib->menu->testtask = array('link' => 'Request|testtask|browse|');
@@ -819,7 +824,7 @@ $lang->icons['task'] = 'check-sign';
$lang->icons['tasks'] = 'tasks';
$lang->icons['program'] = 'folder-open-o';
$lang->icons['project'] = 'project';
-$lang->icons['stage'] = 'stage';
+$lang->icons['stage'] = 'waterfall';
$lang->icons['sprint'] = 'sprint';
$lang->icons['doc'] = 'file-text';
$lang->icons['doclib'] = 'folder-close';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 23f7c84a0e..38aec82ed1 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -403,6 +403,7 @@ $lang->bug->menu->caselib = array('link' => 'Library Recette|caselib|browse');
$lang->testcase = new stdclass();
$lang->testcase->menu = new stdclass();
$lang->testcase->subMenu = $lang->qa->subMenu;
+$lang->testcase->menu->index = array('link' => 'Index|qa|index');
$lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testcase->menu->testcase = array('link' => 'CasTest|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree', 'class' => 'dropdown dropdown-hover');
$lang->testcase->menu->testtask = array('link' => 'Recette|testtask|browse|productID=%s');
@@ -413,6 +414,7 @@ $lang->testcase->menu->caselib = array('link' => 'Library Recette|caselib|brow
$lang->testtask = new stdclass();
$lang->testtask->menu = new stdclass();
$lang->testtask->subMenu = $lang->qa->subMenu;
+$lang->testtask->menu->index = array('link' => 'Index|qa|index');
$lang->testtask->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testtask->menu->testcase = array('link' => 'CasTest|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testtask->menu->testtask = array('link' => 'Recette|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report');
@@ -423,6 +425,7 @@ $lang->testtask->menu->caselib = array('link' => 'Library Recette|caselib|brow
$lang->testsuite = new stdclass();
$lang->testsuite->menu = new stdclass();
$lang->testsuite->subMenu = $lang->qa->subMenu;
+$lang->testsuite->menu->index = array('link' => 'Index|qa|index');
$lang->testsuite->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testsuite->menu->testcase = array('link' => 'CasTest|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testsuite->menu->testtask = array('link' => 'Recette|testtask|browse|productID=%s');
@@ -433,6 +436,7 @@ $lang->testsuite->menu->caselib = array('link' => 'Library Recette|caselib|bro
$lang->testreport = new stdclass();
$lang->testreport->menu = new stdclass();
$lang->testreport->subMenu = $lang->qa->subMenu;
+$lang->testreport->menu->index = array('link' => 'Index|qa|index');
$lang->testreport->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testreport->menu->testcase = array('link' => 'CasTest|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testreport->menu->testtask = array('link' => 'Recette|testtask|browse|productID=%s');
@@ -442,6 +446,7 @@ $lang->testreport->menu->caselib = array('link' => 'Library Recette|caselib|br
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
+$lang->caselib->menu->index = array('link' => 'Index|qa|index');
$lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|');
$lang->caselib->menu->testcase = array('link' => 'CasTest|testcase|browse|', 'class' => 'dropdown dropdown-hover');
$lang->caselib->menu->testtask = array('link' => 'Recette|testtask|browse|');
@@ -822,7 +827,7 @@ $lang->icons['task'] = 'check-sign';
$lang->icons['tasks'] = 'tasks';
$lang->icons['program'] = 'folder-open-o';
$lang->icons['project'] = 'project';
-$lang->icons['stage'] = 'stage';
+$lang->icons['stage'] = 'waterfall';
$lang->icons['sprint'] = 'sprint';
$lang->icons['doc'] = 'file-text';
$lang->icons['doclib'] = 'folder-close';
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 59bef3d913..5f0b77a316 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -403,6 +403,7 @@ $lang->bug->menu->caselib = array('link' => 'Thư viện tình huống|caselib
$lang->testcase = new stdclass();
$lang->testcase->menu = new stdclass();
$lang->testcase->subMenu = $lang->qa->subMenu;
+$lang->testcase->menu->index = array('link' => 'Index|qa|index');
$lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testcase->menu->testcase = array('link' => 'Tình huống|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree', 'class' => 'dropdown dropdown-hover');
$lang->testcase->menu->testtask = array('link' => 'Yêu cầu|testtask|browse|productID=%s');
@@ -413,6 +414,7 @@ $lang->testcase->menu->caselib = array('link' => 'Thư viện tình huống|ca
$lang->testtask = new stdclass();
$lang->testtask->menu = new stdclass();
$lang->testtask->subMenu = $lang->qa->subMenu;
+$lang->testtask->menu->index = array('link' => 'Index|qa|index');
$lang->testtask->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testtask->menu->testcase = array('link' => 'Tình huống|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testtask->menu->testtask = array('link' => 'Yêu cầu|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report');
@@ -423,6 +425,7 @@ $lang->testtask->menu->caselib = array('link' => 'Thư viện tình huống|ca
$lang->testsuite = new stdclass();
$lang->testsuite->menu = new stdclass();
$lang->testsuite->subMenu = $lang->qa->subMenu;
+$lang->testsuite->menu->index = array('link' => 'Index|qa|index');
$lang->testsuite->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testsuite->menu->testcase = array('link' => 'Tình huống|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testsuite->menu->testtask = array('link' => 'Yêu cầu|testtask|browse|productID=%s');
@@ -433,6 +436,7 @@ $lang->testsuite->menu->caselib = array('link' => 'Thư viện tình huống|c
$lang->testreport = new stdclass();
$lang->testreport->menu = new stdclass();
$lang->testreport->subMenu = $lang->qa->subMenu;
+$lang->testreport->menu->index = array('link' => 'Index|qa|index');
$lang->testreport->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testreport->menu->testcase = array('link' => 'Tình huống|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testreport->menu->testtask = array('link' => 'Yêu cầu|testtask|browse|productID=%s');
@@ -442,6 +446,7 @@ $lang->testreport->menu->caselib = array('link' => 'Thư viện tình huống|
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
+$lang->caselib->menu->index = array('link' => 'Index|qa|index');
$lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|');
$lang->caselib->menu->testcase = array('link' => 'Tình huống|testcase|browse|', 'class' => 'dropdown dropdown-hover');
$lang->caselib->menu->testtask = array('link' => 'Yêu cầu|testtask|browse|');
@@ -822,7 +827,7 @@ $lang->icons['task'] = 'check-sign';
$lang->icons['tasks'] = 'tasks';
$lang->icons['program'] = 'folder-open-o';
$lang->icons['project'] = 'project';
-$lang->icons['stage'] = 'stage';
+$lang->icons['stage'] = 'waterfall';
$lang->icons['sprint'] = 'sprint';
$lang->icons['doc'] = 'file-text';
$lang->icons['doclib'] = 'folder-close';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index ae31ceeea3..06a67eccc0 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -400,6 +400,7 @@ $lang->bug->menu->caselib = array('link' => '用例库|caselib|browse');
$lang->testcase = new stdclass();
$lang->testcase->menu = new stdclass();
$lang->testcase->subMenu = $lang->qa->subMenu;
+$lang->testcase->menu->index = array('link' => '仪表盘|qa|index');
$lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testcase->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story', 'class' => 'dropdown dropdown-hover');
$lang->testcase->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s');
@@ -410,6 +411,7 @@ $lang->testcase->menu->caselib = array('link' => '用例库|caselib|browse');
$lang->testtask = new stdclass();
$lang->testtask->menu = new stdclass();
$lang->testtask->subMenu = $lang->qa->subMenu;
+$lang->testtask->menu->index = array('link' => '仪表盘|qa|index');
$lang->testtask->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testtask->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testtask->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s', 'subModule' => 'testtask', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report');
@@ -420,6 +422,7 @@ $lang->testtask->menu->caselib = array('link' => '用例库|caselib|browse');
$lang->testsuite = new stdclass();
$lang->testsuite->menu = new stdclass();
$lang->testsuite->subMenu = $lang->qa->subMenu;
+$lang->testsuite->menu->index = array('link' => '仪表盘|qa|index');
$lang->testsuite->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testsuite->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testsuite->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s');
@@ -430,6 +433,7 @@ $lang->testsuite->menu->caselib = array('link' => '用例库|caselib|browse');
$lang->testreport = new stdclass();
$lang->testreport->menu = new stdclass();
$lang->testreport->subMenu = $lang->qa->subMenu;
+$lang->testreport->menu->index = array('link' => '仪表盘|qa|index');
$lang->testreport->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testreport->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testreport->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s');
@@ -439,6 +443,7 @@ $lang->testreport->menu->caselib = array('link' => '用例库|caselib|browse')
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
+$lang->caselib->menu->index = array('link' => '仪表盘|qa|index');
$lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|');
$lang->caselib->menu->testcase = array('link' => '用例|testcase|browse|', 'class' => 'dropdown dropdown-hover');
$lang->caselib->menu->testtask = array('link' => '测试单|testtask|browse|');
@@ -820,7 +825,7 @@ $lang->icons['task'] = 'check-sign';
$lang->icons['tasks'] = 'tasks';
$lang->icons['program'] = 'folder-open-o';
$lang->icons['project'] = 'project';
-$lang->icons['stage'] = 'stage';
+$lang->icons['stage'] = 'waterfall';
$lang->icons['sprint'] = 'sprint';
$lang->icons['doc'] = 'file-text';
$lang->icons['doclib'] = 'folder-close';
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 1694b2d11b..688ecee397 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -395,6 +395,7 @@ $lang->bug->menu->caselib = array('link' => '用例庫|caselib|browse');
$lang->testcase = new stdclass();
$lang->testcase->menu = new stdclass();
$lang->testcase->subMenu = $lang->qa->subMenu;
+$lang->testcase->menu->index = array('link' => '儀表盤|qa|index');
$lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testcase->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story', 'class' => 'dropdown dropdown-hover');
$lang->testcase->menu->testtask = array('link' => '測試單|testtask|browse|productID=%s');
@@ -405,6 +406,7 @@ $lang->testcase->menu->caselib = array('link' => '用例庫|caselib|browse');
$lang->testtask = new stdclass();
$lang->testtask->menu = new stdclass();
$lang->testtask->subMenu = $lang->qa->subMenu;
+$lang->testtask->menu->index = array('link' => '儀表盤|qa|index');
$lang->testtask->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testtask->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testtask->menu->testtask = array('link' => '測試單|testtask|browse|productID=%s', 'subModule' => 'testtask', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report');
@@ -415,6 +417,7 @@ $lang->testtask->menu->caselib = array('link' => '用例庫|caselib|browse');
$lang->testsuite = new stdclass();
$lang->testsuite->menu = new stdclass();
$lang->testsuite->subMenu = $lang->qa->subMenu;
+$lang->testsuite->menu->index = array('link' => '儀表盤|qa|index');
$lang->testsuite->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testsuite->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testsuite->menu->testtask = array('link' => '測試單|testtask|browse|productID=%s');
@@ -425,6 +428,7 @@ $lang->testsuite->menu->caselib = array('link' => '用例庫|caselib|browse');
$lang->testreport = new stdclass();
$lang->testreport->menu = new stdclass();
$lang->testreport->subMenu = $lang->qa->subMenu;
+$lang->testreport->menu->index = array('link' => '儀表盤|qa|index');
$lang->testreport->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testreport->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testreport->menu->testtask = array('link' => '測試單|testtask|browse|productID=%s');
@@ -434,6 +438,7 @@ $lang->testreport->menu->caselib = array('link' => '用例庫|caselib|browse')
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
+$lang->caselib->menu->index = array('link' => '儀表盤|qa|index');
$lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|');
$lang->caselib->menu->testcase = array('link' => '用例|testcase|browse|', 'class' => 'dropdown dropdown-hover');
$lang->caselib->menu->testtask = array('link' => '測試單|testtask|browse|');
@@ -814,7 +819,7 @@ $lang->icons['task'] = 'check-sign';
$lang->icons['tasks'] = 'tasks';
$lang->icons['program'] = 'folder-open-o';
$lang->icons['project'] = 'project';
-$lang->icons['stage'] = 'stage';
+$lang->icons['stage'] = 'waterfall';
$lang->icons['sprint'] = 'sprint';
$lang->icons['doc'] = 'file-text';
$lang->icons['doclib'] = 'folder-close';
diff --git a/module/common/model.php b/module/common/model.php
index 15cecee721..14cdb71052 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -595,16 +595,16 @@ class commonModel extends model
}
/**
- * Get recent executions.
+ * Print recent menu.
*
* @access public
* @return void
*/
- public static function getRecentExecutions()
+ public static function printRecentMemu()
{
global $lang;
echo "
";
- echo '' . $lang->recent . '';
+ echo '';
}
/**
diff --git a/module/index/css/index.css b/module/index/css/index.css
index 02d931cc3d..be6fd85344 100644
--- a/module/index/css/index.css
+++ b/module/index/css/index.css
@@ -1,6 +1,6 @@
body {padding-left: 96px}
-#menu {position: fixed; left: 0; top: 0; bottom: 0; background-color: #3C495C; color: #fff; width: 96px; z-index: 1015;}
+#menu {position: fixed; left: 0; top: 0; bottom: 0; background-color: #3C495C; width: 96px; z-index: 1015;}
#menuNav {position: absolute; top: 0; bottom: 80px; width: 100%;}
#menu .nav > li {float: none; padding: 4px 8px;}
#menu .nav > li > a {color: #fff; line-height: 20px; padding: 8px 6px; border-radius: 2px; white-space: nowrap;}
@@ -24,9 +24,11 @@ body.menu-hide {padding-left: 0;}
.menu-hide #menu .nav > li > a > .text {display: none}
.menu-hide #menu .nav > li.has-avatar > a {padding: 2px 0;}
-#moreExecution {display:none; max-height: 420px; position: fixed; bottom: 0; left: 96px; z-index: 999; background: white; padding: 20px 10px; height: 420px; margin-bottom: 40px; border: 1px solid #efefef}
-.menu-hide #moreExecution {left: 40px}
-#moreExecution > .list-group {height: 380px; min-width: 150px; max-width:200px;}
+#moreExecution {display:none; max-height: 380px; min-height: 140px; max-width:260px; min-width: 150px; position: fixed; bottom: 40px; z-index: 999; background: white; padding: 20px 10px; border: 1px solid #efefef}
+.more-execution-show {left: 96px;}
+.more-execution-hide {left: 40px;}
+#moreExecution .icon-search {opacity: 0.5;}
+#executionList {max-height: 280px; min-height: 100px; max-width:260px; min-width: 150px; margin-top: 5px;}
#pages {position: fixed; left: 96px; bottom: 0; right: 0; top: 0;}
.page-tab {position: absolute; left: 0; bottom: 0; right: 0; top: 0; background-color: #efefef;}
diff --git a/module/index/js/index.js b/module/index/js/index.js
index cd9915ffbf..c0717fdd13 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -449,9 +449,20 @@
});
/* Hide execution list on mouseleave or click */
- $('#executionList').on('mouseleave click', function()
+ $(document).click(function()
{
- $('#moreExecution').hide();
+ $("#moreExecution").hide();
+ });
+
+ $("#recentMenu").click(function(event)
+ {
+ event.stopPropagation();
+ getExecutions();
+ });
+
+ $("#moreExecution").click(function(event)
+ {
+ event.stopPropagation();
});
});
}());
@@ -462,6 +473,15 @@ function getExecutions()
var $moreExecution = $('#moreExecution').toggle();
if(!$moreExecution.is(':hidden'))
{
+ if($('body').hasClass('menu-hide'))
+ {
+ $('#moreExecution').addClass('more-execution-hide');
+ }
+ else
+ {
+ $('#moreExecution').removeClass('more-execution-hide');
+ }
+
$.ajax(
{
url: createLink('project', 'ajaxGetRecentExecutions'),
diff --git a/module/index/view/index.html.php b/module/index/view/index.html.php
index 47a264c27a..87746d2898 100644
--- a/module/index/view/index.html.php
+++ b/module/index/view/index.html.php
@@ -25,11 +25,18 @@ js::set('defaultOpen', $open);
-