diff --git a/module/testcase/control.php b/module/testcase/control.php index 05473633e3..e3748ca7dd 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -866,6 +866,10 @@ class testcase extends control $fields['stage'] = $this->lang->testcase->stage; $fields['precondition'] = $this->lang->testcase->precondition; + $fields[''] = ''; + $fields['typeValue'] = $this->lang->testcase->lblTypeValue; + $fields['stageValue'] = $this->lang->testcase->lblStageValue; + $modules = $this->loadModel('tree')->getOptionMenu($productID, 'case'); $rows = array(); foreach($modules as $moduleID => $module) @@ -874,6 +878,12 @@ class testcase extends control $row->module = $module . "(#$moduleID)"; $row->stepDesc = "1. \n2. \n3."; $row->stepExpect = "1. \n2. \n3."; + + if(empty($rows)) + { + $row->typeValue = join("\n", $this->lang->testcase->typeList); + $row->stageValue = join("\n", $this->lang->testcase->stageList); + } $rows[] = $row; } diff --git a/module/testcase/css/common.css b/module/testcase/css/common.css index 54e737e994..2ada6cfb2e 100644 --- a/module/testcase/css/common.css +++ b/module/testcase/css/common.css @@ -1,3 +1 @@ -.delbutton{font-size:12px; color:red; width:80px; padding:0} -.addbutton{font-size:12px; color:darkgreen; width:80px; padding:0} .table-form > tbody > tr > td .btn-group-vertical > .btn {margin-left: 0!important; padding: 2px 8px} diff --git a/module/testcase/css/edit.css b/module/testcase/css/edit.css index 0ec48066f5..4af9e789b3 100644 --- a/module/testcase/css/edit.css +++ b/module/testcase/css/edit.css @@ -1,2 +1,4 @@ .col-side .chosen-container .chosen-drop {width: 216px!important} .col-side .chosen-container {width: 218px!important} +.table-form > tbody > tr > td .btn.addbutton {display:block; margin:1px 0px; width:40px; padding:1px 6px;} +.table-form > tbody > tr > td .btn.delbutton {display:block; margin:1px 0px; width:40px; padding:1px 6px;} diff --git a/module/testcase/js/common.js b/module/testcase/js/common.js index b01fdfdada..367adf35c6 100644 --- a/module/testcase/js/common.js +++ b/module/testcase/js/common.js @@ -111,13 +111,13 @@ function createRow() newRowID ++; var newRow = ""; newRow += ""; - newRow += ""; + newRow += ""; newRow += ""; - newRow += "
"; - newRow += ""; - newRow += ""; - newRow += ""; - newRow += "
"; + newRow += ""; + newRow += ""; + newRow += ""; + newRow += ""; + newRow += ""; return newRow; } diff --git a/module/testcase/js/create.js b/module/testcase/js/create.js index d3b8ae8352..53494add5a 100644 --- a/module/testcase/js/create.js +++ b/module/testcase/js/create.js @@ -21,13 +21,13 @@ function createRow() newRowID ++; var newRow = ""; newRow += ""; - newRow += ""; + newRow += ""; newRow += ""; - newRow += "
"; - newRow += ""; - newRow += ""; - newRow += ""; - newRow += "
"; + newRow += ""; + newRow += ""; + newRow += ""; + newRow += ""; + newRow += ""; return newRow; } diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 1789a4eccc..63d177de92 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -98,6 +98,8 @@ $lang->testcase->lblSystemBrowserAndHardware = 'OS & browser'; $lang->testcase->lblAssignAndMail = 'Assigned & mailto'; $lang->testcase->lblStory = 'Story'; $lang->testcase->lblLastEdited = 'Last edited'; +$lang->testcase->lblTypeValue = 'List of type'; +$lang->testcase->lblStageValue = 'List of stage'; $lang->testcase->legendRelated = 'Related info'; $lang->testcase->legendBasicInfo = 'Basic info'; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 9be6110891..181c955753 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -98,6 +98,8 @@ $lang->testcase->lblSystemBrowserAndHardware = '系统::浏览器'; $lang->testcase->lblAssignAndMail = '指派给::抄送给'; $lang->testcase->lblStory = '相关需求'; $lang->testcase->lblLastEdited = '最后编辑'; +$lang->testcase->lblTypeValue = '类型可选值列表'; +$lang->testcase->lblStageValue = '阶段可选值列表'; $lang->testcase->legendRelated = '相关信息'; $lang->testcase->legendBasicInfo = '基本信息'; diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php index 46fa73492a..52f2cb2bec 100644 --- a/module/testcase/view/create.html.php +++ b/module/testcase/view/create.html.php @@ -88,10 +88,10 @@ - - - - + + + + "; echo ""; - echo ''; + echo ''; echo ''; - echo ""; + echo ""; echo ''; } ?> diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php index 643649ff2c..b1be0276af 100644 --- a/module/testcase/view/edit.html.php +++ b/module/testcase/view/edit.html.php @@ -15,7 +15,7 @@ testcase->deleteStep);?> testcase->insertBefore);?> testcase->insertAfter);?> - +
icons['testcase']);?> id;?> @@ -43,9 +43,9 @@
- + - + "; echo ""; - echo ''; + echo ''; echo ''; - echo ""; + echo ""; echo ''; } ?> diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php index a2e05fcabd..2d531a1345 100644 --- a/module/testcase/view/showimport.html.php +++ b/module/testcase/view/showimport.html.php @@ -17,9 +17,6 @@
testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>actions;?>testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>actions;?>
$stepID' . html::textarea('steps[]', $step->desc, "rows='1' class='form-control'") . '' . html::textarea('steps[]', $step->desc, "rows='1' class='form-control'") . '' . html::textarea('expects[]', $step->expect, "rows='1' class='form-control'") . '
"; - echo ""; - echo ""; - echo ""; - echo "
"; + echo ""; + echo ""; + echo ""; + echo "
testcase->stepID;?>testcase->stepDesc;?>testcase->stepDesc;?> testcase->stepExpect;?>actions;?>actions;?>
$stepID' . html::textarea('steps[]', $step->desc, "rows='3' class='form-control'") . '' . html::textarea('steps[]', $step->desc, "rows='3' class='form-control'") . '' . html::textarea('expects[]', $step->expect, "rows='3' class='form-control'") . '
"; - echo ""; - echo " "; - echo " "; - echo "
"; + echo ""; + echo ""; + echo ""; + echo "
testcase->precondition?> - - -
testcase->steps?>
testcase->stepDesc?> testcase->stepExpect?>