diff --git a/module/block/view/admin.html.php b/module/block/view/admin.html.php index 01a89a8f14..56746f92cf 100644 --- a/module/block/view/admin.html.php +++ b/module/block/view/admin.html.php @@ -40,7 +40,7 @@ include '../../common/view/chosen.html.php';
- +
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 8386800f1e..d6dcb4e8bf 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -129,6 +129,8 @@ $lang->bug->resolvedByMeAB = 'Resolved By Me'; $lang->bug->ditto = 'Ditto'; $lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!'; $lang->bug->noAssigned = 'Not Assigned'; +$lang->bug->noBug = 'No BUG. You could '; +$lang->bug->noModule = '
You have no modules
Manage now
'; /* 页面标签。*/ $lang->bug->lblAssignedTo = 'Assignee'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 3f1026b38f..b48ac8e227 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -130,6 +130,7 @@ $lang->bug->ditto = '同上'; $lang->bug->dittoNotice = '该bug与上一bug不属于同一产品！'; $lang->bug->noAssigned = '未指派'; $lang->bug->noBug = '暂时没有BUG，您现在可以'; +$lang->bug->noModule = '
您现在还没有模块信息
请维护测试模块
'; /* 页面标签。*/ $lang->bug->lblAssignedTo = '当前指派'; diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 56a7290c4c..edd10051ec 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -11,11 +11,6 @@ */ ?> - -
-

bug->noBug;?> " . $lang->bug->create, '', "class='btn btn-info'");?>

-
- bug->mySelects[$browseType]) && in_array($brow
-
- - - - - + + + + + +
+ +
+ @@ -72,7 +75,7 @@ js::set('productID' , $bug->product); comment;?> - + goback, $this->session->bugList);?> diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php index bfe4b75ead..96b2000d26 100644 --- a/module/build/view/create.html.php +++ b/module/build/view/create.html.php @@ -75,7 +75,7 @@ - + diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php index ff4adde391..56f99f8bf8 100644 --- a/module/build/view/edit.html.php +++ b/module/build/view/edit.html.php @@ -69,7 +69,7 @@ - + config->global->flow != 'onlyTest' ? html::hidden('project', $build->project) : '';?> diff --git a/module/common/view/customfield.html.php b/module/common/view/customfield.html.php index bd8df84bdc..702c2b1205 100644 --- a/module/common/view/customfield.html.php +++ b/module/common/view/customfield.html.php @@ -26,7 +26,7 @@
save);?> - cancel, '', "btn btn-gray close-dropdown");?> + cancel, '', "btn close-dropdown");?>
diff --git a/module/dept/view/browse.html.php b/module/dept/view/browse.html.php index 297015a2cb..6babe903c2 100644 --- a/module/dept/view/browse.html.php +++ b/module/dept/view/browse.html.php @@ -66,7 +66,7 @@ - + diff --git a/module/doc/model.php b/module/doc/model.php index c32deeda72..100157c26d 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -157,7 +157,7 @@ class docModel extends model if(isset($menu['link'])) { list($menuLabel, $module, $method, $vars) = explode('|', $menu['link']); - $actions .= html::a(helper::createLink($module, $method, $vars), $menuLabel, '', "class='btn btn-gray'"); + $actions .= html::a(helper::createLink($module, $method, $vars), $menuLabel, '', "class='btn'"); } } diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php index ab485fb744..f877746312 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -40,8 +40,8 @@ var browseType = ''; diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php index 379596f9a2..d20af49704 100644 --- a/module/doc/view/browsebygrid.html.php +++ b/module/doc/view/browsebygrid.html.php @@ -4,8 +4,8 @@
diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php index 86eb0f11f0..4336b72ef9 100644 --- a/module/doc/view/create.html.php +++ b/module/doc/view/create.html.php @@ -77,7 +77,7 @@ - + diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php index 8064e4b0a7..6ccf23f233 100644 --- a/module/doc/view/edit.html.php +++ b/module/doc/view/edit.html.php @@ -74,7 +74,7 @@ - + diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php index 511143d5d4..20cac33c9b 100644 --- a/module/doc/view/objectlibs.html.php +++ b/module/doc/view/objectlibs.html.php @@ -23,7 +23,7 @@ diff --git a/module/file/view/buildform.html.php b/module/file/view/buildform.html.php index 430f46b557..a2c107f71e 100644 --- a/module/file/view/buildform.html.php +++ b/module/file/view/buildform.html.php @@ -8,7 +8,7 @@
- +
diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php index f598a4b599..78e822ebcc 100644 --- a/module/group/view/manageview.html.php +++ b/module/group/view/manageview.html.php @@ -65,7 +65,7 @@ - + diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index 7616851ab1..0d36b15c26 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -38,7 +38,7 @@ - + @@ -122,7 +122,7 @@ - + diff --git a/module/group/view/privbymodule.html.php b/module/group/view/privbymodule.html.php index a08bdd13dd..091d7a8c4d 100644 --- a/module/group/view/privbymodule.html.php +++ b/module/group/view/privbymodule.html.php @@ -42,7 +42,7 @@ - + diff --git a/module/product/view/batchedit.html.php b/module/product/view/batchedit.html.php index 06caec89ac..8f1a270edb 100755 --- a/module/product/view/batchedit.html.php +++ b/module/product/view/batchedit.html.php @@ -72,7 +72,7 @@ - + diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php index df4613da93..47189f0a1f 100644 --- a/module/product/view/create.html.php +++ b/module/product/view/create.html.php @@ -84,7 +84,7 @@ - + diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php index 6b62c9d0ac..403da55ade 100644 --- a/module/product/view/edit.html.php +++ b/module/product/view/edit.html.php @@ -73,7 +73,7 @@ - + diff --git a/module/productplan/view/batchedit.html.php b/module/productplan/view/batchedit.html.php index 73d2a5846d..baa4c55c3f 100644 --- a/module/productplan/view/batchedit.html.php +++ b/module/productplan/view/batchedit.html.php @@ -42,7 +42,7 @@ - + diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php index 990e70a989..e1a890bca1 100644 --- a/module/productplan/view/create.html.php +++ b/module/productplan/view/create.html.php @@ -59,7 +59,7 @@ - + id);?> diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php index 336f317116..fcb8384d4e 100644 --- a/module/productplan/view/edit.html.php +++ b/module/productplan/view/edit.html.php @@ -59,7 +59,7 @@ - + id);?> diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index a09442fed6..d825727c9e 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -138,7 +138,7 @@ - + diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index bc8469d1fc..b928c20b9f 100644 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -145,7 +145,7 @@ project->whitelist;?> whitelist, '', '', 'inline');?> - +
diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php index 5a35954310..7daf7a0979 100644 --- a/module/release/view/create.html.php +++ b/module/release/view/create.html.php @@ -50,7 +50,7 @@ - + diff --git a/module/release/view/edit.html.php b/module/release/view/edit.html.php index dae9757248..b860913653 100644 --- a/module/release/view/edit.html.php +++ b/module/release/view/edit.html.php @@ -58,7 +58,7 @@ - + product);?> diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index 7f7880602d..fd26071b73 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -211,7 +211,7 @@ foreach($fieldParams as $fieldName => $param) if($style != 'simple') { if(common::hasPriv('search', 'saveQuery')) echo html::a($this->createLink('search', 'saveQuery', "module=$module&onMenuBar=$onMenuBar"), $lang->save, '', "class='btn-save-form btn btn-secondary btn-wide'") . " "; - echo html::commonButton($lang->search->reset, 'onclick=resetForm(this)', 'btn-reset-form btn btn-gray btn-wide'); + echo html::commonButton($lang->search->reset, 'onclick=resetForm(this)', 'btn-reset-form btn btn-wide'); } echo html::commonButton('', '', 'btn-expand-form btn btn-info pull-right'); echo html::hidden('formType', 'lite'); diff --git a/module/story/view/batchclose.html.php b/module/story/view/batchclose.html.php index 6e38655985..d3edd397a7 100755 --- a/module/story/view/batchclose.html.php +++ b/module/story/view/batchclose.html.php @@ -56,7 +56,7 @@ - + diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php index 393865fde3..3c5252dac1 100644 --- a/module/story/view/batchcreate.html.php +++ b/module/story/view/batchcreate.html.php @@ -92,7 +92,7 @@ save, '', 'btn btn-wide btn-primary');?> - + diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php index 95dec5380a..7dceb1f76f 100644 --- a/module/story/view/batchedit.html.php +++ b/module/story/view/batchedit.html.php @@ -149,7 +149,7 @@ foreach(explode(',', $showFields) as $field) - + diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index 7d5906c48e..b9399f37bc 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -186,7 +186,7 @@ - + diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index f9c0e33ff1..e43ae048be 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -135,7 +135,7 @@ - + diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index c47af5bb03..9eef705605 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -111,7 +111,7 @@ - + diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index 5ef8e92306..a96ae4d545 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -166,7 +166,7 @@ - + diff --git a/module/testcase/view/review.html.php b/module/testcase/view/review.html.php index ffa16445f9..c115c40637 100644 --- a/module/testcase/view/review.html.php +++ b/module/testcase/view/review.html.php @@ -14,14 +14,14 @@ -
-
- icons['testcase']);?> id;?> - createLink('case', 'view', "caseID=$case->id"), $case->title);?> - icons['review']) . ' ' . $lang->testcase->review;?> +
+
+

+ id;?> + createLink('case', 'view', "caseID=$case->id"), $case->title);?> +

-
-
+ @@ -40,13 +40,11 @@ - - +
testcase->reviewedDateAB;?>
- -
-
-
-
+ +
+
+
diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php index 98fc6cf8ba..b0b9434887 100644 --- a/module/testtask/view/batchrun.html.php +++ b/module/testtask/view/batchrun.html.php @@ -12,68 +12,66 @@ ?> app->loadLang('testcase'); unset($this->lang->testcase->resultList['n/a']); ?> -
-
- icons['testtask']);?> - icons['batchRun']);?> testtask->common . $lang->colon . $lang->testtask->batchRun;?> +
+
+

testtask->common . $lang->colon . $lang->testtask->batchRun;?>

+
+ + + + + + + + + + + + + loadModel('tree')->getOptionMenu($cases[$caseID]->product, $viewType = 'case', $startModuleID = 0);?> + + + + + + + + + + +
idAB;?>testcase->module;?>testcase->title;?>testcase->precondition;?>testcase->result?> testcase->stepDesc . '/' . $lang->testcase->stepExpect?>
version)?>module] . "'>" . $moduleOptionMenu[$cases[$caseID]->module] . ""?>title}'>{$cases[$caseID]->title}"?>precondition}'>{$cases[$caseID]->precondition}"?>lang->testcase->resultList, 'pass', "onclick='showAction(this.value,\".action$caseID\")'", 'block')?> + + + + $step):?> + type == 'group' or $step->type == 'step') + { + $stepId ++; + $childId = 0; + } + $ID = $step->type == 'item' ? "{$stepId}.{$childId}" : $stepId; + $stepClass = $step->type == 'item' ? 'step-item' : 'step-group'; + ?> + + + type != 'group'):?> + + + + + + + +
type == 'group') echo "colspan='2'"?>>desc' class='$stepClass'>" . $ID . "、" . $step->desc . ''?>expect'>" . $lang->testcase->stepExpect . "：" . $step->expect . ''?>
+ + + +
+
- -
- - - - - - - - - - - - - loadModel('tree')->getOptionMenu($cases[$caseID]->product, $viewType = 'case', $startModuleID = 0);?> - - - - - - - - - - -
idAB;?>testcase->module;?> testcase->title;?>testcase->precondition;?> testcase->result?> testcase->stepDesc . '/' . $lang->testcase->stepExpect?>
version)?>module] . "'>" . $moduleOptionMenu[$cases[$caseID]->module] . ""?>title}'>{$cases[$caseID]->title}"?>precondition}'>{$cases[$caseID]->precondition}"?>lang->testcase->resultList, 'pass', "onclick='showAction(this.value,\".action$caseID\")'", 'block')?> - - - - $step):?> - type == 'group' or $step->type == 'step') - { - $stepId ++; - $childId = 0; - } - $ID = $step->type == 'item' ? "{$stepId}.{$childId}" : $stepId; - $stepClass = $step->type == 'item' ? 'step-item' : 'step-group'; - ?> - - - type != 'group'):?> - - - - - - - -
type == 'group') echo "colspan='2'"?>>desc' class='$stepClass'>" . $ID . "、" . $step->desc . ''?>expect'>" . $lang->testcase->stepExpect . "：" . $step->expect . ''?>
- - - -
-
-