- ' . $lang->admin->notice->ignore, 'hiddenwin', 'class="close" data-dismiss="alert" style="font-size: 12px"');?>
+ ' . $lang->admin->notice->ignore, 'hiddenwin', 'class="close" data-dismiss="alert" style="font-size: 12px"');?>
-
+
admin->notice->register, html::a(inlink('register'), $lang->admin->register->click, '', 'class="alert-link"'));?>
- admin->info->version, $config->version);
if($bind) echo sprintf($lang->admin->info->account, '' . $account . '');
echo $lang->admin->info->links;
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index a6baa6b868..3f1026b38f 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -129,6 +129,7 @@ $lang->bug->resolvedByMeAB = '由我解决';
$lang->bug->ditto = '同上';
$lang->bug->dittoNotice = '该bug与上一bug不属于同一产品!';
$lang->bug->noAssigned = '未指派';
+$lang->bug->noBug = '暂时没有BUG,您现在可以';
/* 页面标签。*/
$lang->bug->lblAssignedTo = '当前指派';
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 7f4ecbd7cc..3138c153d3 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -10,8 +10,13 @@
* @link http://www.zentao.net
*/
?>
+
+
+{$value} ";
+ echo "{$value} ";
}
echo '
';
- echo "";
+ echo "";
echo '
+
+
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index c42c3d9610..5b6a93ab95 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -268,22 +268,39 @@ $lang->bug->menu->index = array('link' => "QA|qa|in
$lang->testcase = new stdclass();
$lang->testcase->menu = new stdclass();
-
-$lang->testcase->menu->product = array('link' => '%s', 'fixed' => true);
$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');
-$lang->testcase->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report');
-$lang->testcase->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
-$lang->testcase->menu->report = array('link' => 'Report|testreport|browse|productID=%s', 'alias' => 'view,create,edit');
+$lang->testcase->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s');
+$lang->testcase->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s');
+$lang->testcase->menu->report = array('link' => 'Report|testreport|browse|productID=%s');
$lang->testcase->menu->caselib = array('link' => 'Library|testsuite|library');
-$lang->testcase->menu->index = array('link' => "QA|qa|index|locate=no&productID=%s", 'float' => 'right');
$lang->testtask = new stdclass();
-$lang->testtask->menu = $lang->testcase->menu;
+$lang->testtask->menu = new stdclass();
+$lang->testtask->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
+$lang->testtask->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s');
+$lang->testtask->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report');
+$lang->testtask->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s');
+$lang->testtask->menu->report = array('link' => 'Report|testreport|browse|productID=%s');
+$lang->testtask->menu->caselib = array('link' => 'Library|testsuite|library');
+
$lang->testsuite = new stdclass();
-$lang->testsuite->menu = $lang->testcase->menu;
+$lang->testsuite->menu = new stdclass();
+$lang->testsuite->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
+$lang->testsuite->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s');
+$lang->testsuite->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s');
+$lang->testsuite->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
+$lang->testsuite->menu->report = array('link' => 'Report|testreport|browse|productID=%s');
+$lang->testsuite->menu->caselib = array('link' => 'Library|testsuite|library');
+
$lang->testreport = new stdclass();
-$lang->testreport->menu = $lang->testcase->menu;
+$lang->testreport->menu = new stdclass();
+$lang->testreport->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
+$lang->testreport->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s');
+$lang->testreport->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s');
+$lang->testreport->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s');
+$lang->testreport->menu->report = array('link' => 'Report|testreport|browse|productID=%s', 'alias' => 'view,create,edit');
+$lang->testreport->menu->caselib = array('link' => 'Library|testsuite|library');
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
@@ -294,8 +311,6 @@ $lang->caselib->menu->testtask = array('link' => 'Build|testtask|browse|');
$lang->caselib->menu->testsuite = array('link' => 'Suite|testsuite|browse|');
$lang->caselib->menu->report = array('link' => 'Report|testreport|browse|');
$lang->caselib->menu->caselib = array('link' => 'Library|testsuite|library', 'alias' => 'createlib,createcase,libview,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
-$lang->caselib->menu->create = array('link' => "Create a Library|testsuite|createLib|", 'float' => 'right');
-$lang->caselib->menu->index = array('link' => "Test Home|qa|index|locate=no&productID=%s", 'float' => 'right');
/* 文档视图菜单设置。*/
$lang->doc = new stdclass();
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 25891eba45..315391ea31 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -279,20 +279,39 @@ $lang->bug->menu->caselib = array('link' => '用例库|testsuite|library');
$lang->testcase = new stdclass();
$lang->testcase->menu = new stdclass();
-
$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');
-$lang->testcase->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report');
-$lang->testcase->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
-$lang->testcase->menu->report = array('link' => '报告|testreport|browse|productID=%s', 'alias' => 'view,create,edit');
+$lang->testcase->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s');
+$lang->testcase->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
+$lang->testcase->menu->report = array('link' => '报告|testreport|browse|productID=%s');
$lang->testcase->menu->caselib = array('link' => '用例库|testsuite|library');
$lang->testtask = new stdclass();
-$lang->testtask->menu = $lang->testcase->menu;
+$lang->testtask->menu = new stdclass();
+$lang->testtask->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
+$lang->testtask->menu->testcase = array('link' => '用例|testcase|browse|productID=%s');
+$lang->testtask->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report');
+$lang->testtask->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
+$lang->testtask->menu->report = array('link' => '报告|testreport|browse|productID=%s');
+$lang->testtask->menu->caselib = array('link' => '用例库|testsuite|library');
+
$lang->testsuite = new stdclass();
-$lang->testsuite->menu = $lang->testcase->menu;
+$lang->testsuite->menu = new stdclass();
+$lang->testsuite->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
+$lang->testsuite->menu->testcase = array('link' => '用例|testcase|browse|productID=%s');
+$lang->testsuite->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s');
+$lang->testsuite->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
+$lang->testsuite->menu->report = array('link' => '报告|testreport|browse|productID=%s');
+$lang->testsuite->menu->caselib = array('link' => '用例库|testsuite|library');
+
$lang->testreport = new stdclass();
-$lang->testreport->menu = $lang->testcase->menu;
+$lang->testreport->menu = new stdclass();
+$lang->testreport->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
+$lang->testreport->menu->testcase = array('link' => '用例|testcase|browse|productID=%s');
+$lang->testreport->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s');
+$lang->testreport->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
+$lang->testreport->menu->report = array('link' => '报告|testreport|browse|productID=%s', 'alias' => 'view,create,edit');
+$lang->testreport->menu->caselib = array('link' => '用例库|testsuite|library');
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
diff --git a/module/common/model.php b/module/common/model.php
index c70de4db81..27f4e6f3ed 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -416,12 +416,12 @@ class commonModel extends model
foreach ($lang->searchObjects as $key => $value)
{
$class = $key == $searchObject ? "class='selected'" : '';
- echo "bug->noBug;?> " . $lang->bug->create, '', "class='btn btn-info'");?>
+