diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index 16b99fe58e..2b9cd14819 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -52,7 +52,7 @@ productplan->hour;?> productplan->project;?> productplan->desc;?> - actions;?> + actions;?> @@ -79,20 +79,16 @@ projectID)) echo html::a(helper::createLink('project', 'task', 'projectID=' . $plan->projectID), '');?>
desc;?>
-
- createLink('productplan', 'delete', "planID=$plan->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"productplan\",confirmDelete)", '', '', "class='btn btn-icon' title='{$lang->productplan->delete}'"); - } - ?> -
id"), '', '', "class='btn' title='{$lang->project->create}'"); if(common::hasPriv('productplan', 'linkStory')) echo html::a(inlink('view', "planID=$plan->id&type=story&orderBy=id_desc&link=true"), '', '', "class='btn' title='{$lang->productplan->linkStory}'"); if(common::hasPriv('productplan', 'linkBug') and $config->global->flow != 'onlyStory') echo html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=id_desc&link=true"), '', '', "class='btn' title='{$lang->productplan->linkBug}'"); common::printIcon('productplan', 'edit', "planID=$plan->id", $plan, 'list'); + if(common::hasPriv('productplan', 'delete', $plan)) + { + $deleteURL = $this->createLink('productplan', 'delete', "planID=$plan->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"productplan\",confirmDelete)", '', '', "class='btn btn-icon' title='{$lang->productplan->delete}'"); + } ?> diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php index 9b71a2d80b..95ac73f3a8 100644 --- a/module/testcase/view/batchedit.html.php +++ b/module/testcase/view/batchedit.html.php @@ -12,122 +12,128 @@ ?> lang->testcase->dittoNotice);?> -
-
- icons['testcase']);?> - icons['batchEdit']);?> testcase->common . $lang->colon . $lang->testcase->batchEdit;?> -
- +
+
+

testcase->common . $lang->colon . $lang->testcase->batchEdit;?>

+
+ createLink('custom', 'ajaxSaveCustomFields', 'module=testcase§ion=custom&key=batchEditFields')?> +
-
- -
- -config->testcase->edit->requiredFields) as $field) -{ - if($field) - { - $requiredFields[$field] = ''; - if(strpos(",{$config->testcase->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = ''; - } -} -?> -
- - - - - - - - - - - - - - - - - - - - - +
+ + config->testcase->edit->requiredFields) as $field) + { + if($field) { - $product = $this->product->getByID($cases[$caseID]->product); - - $branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getPairs($product->id); - if($product->type != 'normal') - { - foreach($branches as $branchID => $branchName) $branches[$branchID] = '/' . $product->name . '/' . $branchName; - $branches = array('ditto' => $this->lang->story->ditto) + $branches; - } - - $modules = $this->tree->getOptionMenu($cases[$caseID]->product, $viewType = 'case', 0, $cases[$caseID]->branch); - $modules = array('ditto' => $this->lang->story->ditto) + $modules; + $requiredFields[$field] = ''; + if(strpos(",{$config->testcase->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = ''; } - ?> - - - - - - - - - - - - - - - - - - - - -
idAB;?>'> - priAB;?> - ";?> - '> - statusAB;?> - ";?> - '>testcase->branch;?>'>testcase->module;?>'> - testcase->story;?> - ";?> - testcase->title;?> testcase->type;?> '> - testcase->precondition;?> - ";?> - '> - testcase->keywords;?> - ";?> - '> - testcase->stage;?> - ";?> -
'> pri, 'class=form-control');?>'>testcase->statusList, $cases[$caseID]->status, 'class=form-control');?>' style='overflow:visible'> - id;?> - type == 'normal') ? "disabled='disabled'" : '';?> - branch, "class='form-control chosen' onchange='loadBranches($branchProductID, this.value, $caseID)', $disabled");?> - ' style='overflow:visible'>module, "class='form-control chosen'");?>' style='overflow:visible'>story, "class='form-control chosen'");?> -
- color, "data-provide='colorpicker' data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->testcase->colorTag}' data-update-text='#titles\\[{$caseID}\\]'");?> - title, "class='form-control' autocomplete='off'"); echo "*";?> -
- 		type, 'class=form-control');?>'>precondition, "rows='1' class='form-control autosize'")?>'> keywords, "class='form-control' autocomplete='off'");?>' style='overflow:visible'>testcase->stageList, $cases[$caseID]->stage, "class='form-control chosen' multiple data-placeholder='{$lang->testcase->stage}'");?>
-
+ } + ?> +
+ + + + + + + + + + + + + + + + + + + + + product->getByID($cases[$caseID]->product); + + $branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getPairs($product->id); + if($product->type != 'normal') + { + foreach($branches as $branchID => $branchName) $branches[$branchID] = '/' . $product->name . '/' . $branchName; + $branches = array('ditto' => $this->lang->story->ditto) + $branches; + } + + $modules = $this->tree->getOptionMenu($cases[$caseID]->product, $viewType = 'case', 0, $cases[$caseID]->branch); + $modules = array('ditto' => $this->lang->story->ditto) + $modules; + } + ?> + + + + + + + + + + + + + + + + + + + + +
idAB;?>'> + priAB;?> + ";?> + '> + statusAB;?> + ";?> + '>testcase->branch;?>'>testcase->module;?>'> + testcase->story;?> + ";?> + testcase->title;?> testcase->type;?> '> + testcase->precondition;?> + ";?> + '> + testcase->keywords;?> + ";?> + '> + testcase->stage;?> + ";?> +
'> pri, 'class=form-control');?>'>testcase->statusList, $cases[$caseID]->status, 'class=form-control');?>' style='overflow:visible'> + id;?> + type == 'normal') ? "disabled='disabled'" : '';?> + branch, "class='form-control chosen' onchange='loadBranches($branchProductID, this.value, $caseID)', $disabled");?> + ' style='overflow:visible'>module, "class='form-control chosen'");?>' style='overflow:visible'>story, "class='form-control chosen'");?> +
+
+ title, "class='form-control' autocomplete='off'");?> +
+ +
    +
  • testcase->colorTag;?>
    • +
+ color, "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right' data-update-color='#title\\[$caseID\\]'");?> +
+
+
+ 		type, 'class=form-control');?>'>precondition, "rows='1' class='form-control autosize'")?>'> keywords, "class='form-control' autocomplete='off'");?>' style='overflow:visible'>testcase->stageList, $cases[$caseID]->stage, "class='form-control chosen' multiple data-placeholder='{$lang->testcase->stage}'");?>
+
-createLink('custom', 'ajaxSaveCustomFields', 'module=testcase§ion=custom&key=batchEditFields')?> - +
diff --git a/module/testcase/view/exporttemplet.html.php b/module/testcase/view/exporttemplet.html.php index 80e5e9e311..c7625af41b 100644 --- a/module/testcase/view/exporttemplet.html.php +++ b/module/testcase/view/exporttemplet.html.php @@ -19,31 +19,30 @@ function closeWindow() } } -
-
- icons['export']);?> - testcase->exportTemplet;?> +
+
+

testcase->exportTemplet;?>

-
-
- - - - - - -
-
- testcase->num;?> - -
- 		- charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?> - - -
-
+
+ + + + + + +
+
+ testcase->num;?> + +
+ 		+ charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?> + + +
+
+
diff --git a/module/testcase/view/import.html.php b/module/testcase/view/import.html.php index 5f8a96a6d4..d1ea464b4b 100644 --- a/module/testcase/view/import.html.php +++ b/module/testcase/view/import.html.php @@ -1,7 +1,10 @@ -
-
- +
+
+

testcase->importFile;?>

+
+ +
@@ -10,7 +13,7 @@ charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?> - +
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php index ae4feecb56..568bc45645 100644 --- a/module/testcase/view/showimport.html.php +++ b/module/testcase/view/showimport.html.php @@ -5,104 +5,106 @@
- - - - - - - - - - - - - - - - - - - - - - - $case):?> - title)) continue;?> - - - - - - - - - - - - - - - + + + + + + + + + + + + $case):?> + title)) continue;?> + + + + + + + + + + + + + + + + + + + + + + + +
lineNumber?>testcase->id?>testcase->title?>testcase->branch?>testcase->module?>testcase->story?>testcase->pri?>testcase->type?>testcase->stage?>testcase->keywords?>testcase->precondition?> - - - - - -
testcase->stepDesc?>testcase->stepExpect?>
-
- id)) - { - echo $case->id . html::hidden("id[$key]", $case->id); - $insert = false; - } - else - { - echo "{$lang->testcase->new}"; - } - echo html::hidden("product[$key]", $productID); - ?> - title, ENT_QUOTES), "class='form-control'")?>branch) and $case->branch !== '') ? $case->branch : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->branch : $branch), "class='form-control chosen'")?>module) ? $case->module : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->module : ''), "class='form-control chosen'")?>story) ? $case->story : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->story : ''), "class='form-control chosen'")?>testcase->priList, isset($case->pri) ? $case->pri : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->pri : ''), "class='form-control'")?>testcase->typeList, $case->type, "class='form-control'")?>testcase->stageList, !empty($case->stage) ? $case->stage : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->stage : ''), "multiple='multiple' class='form-control chosen'")?>keywords) ? $case->keywords : "", "class='form-control' autocomplete='off'")?>precondition) ? htmlspecialchars($case->precondition) : "", "class='form-control'")?> - - - $desc):?> - - - - - - - -
+
+ + + + + + + + + - - - - - - - - - -
lineNumber?>testcase->id?>testcase->title?>testcase->branch?>
- {$lang->save}"; - } - else - { - echo html::submitButton(); - } - echo '   ' . html::backButton() - ?> -
- +
testcase->module?>testcase->story?>testcase->pri?>testcase->type?>testcase->stage?>testcase->keywords?>testcase->precondition?> + + + + + +
testcase->stepDesc?>testcase->stepExpect?>
+
+ id)) + { + echo $case->id . html::hidden("id[$key]", $case->id); + $insert = false; + } + else + { + echo "{$lang->testcase->new}"; + } + echo html::hidden("product[$key]", $productID); + ?> + title, ENT_QUOTES), "class='form-control'")?>branch) and $case->branch !== '') ? $case->branch : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->branch : $branch), "class='form-control chosen'")?>module) ? $case->module : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->module : ''), "class='form-control chosen'")?>story) ? $case->story : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->story : ''), "class='form-control chosen'")?>testcase->priList, isset($case->pri) ? $case->pri : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->pri : ''), "class='form-control'")?>testcase->typeList, $case->type, "class='form-control'")?>testcase->stageList, !empty($case->stage) ? $case->stage : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->stage : ''), "multiple='multiple' class='form-control chosen'")?>keywords) ? $case->keywords : "", "class='form-control' autocomplete='off'")?>precondition) ? htmlspecialchars($case->precondition) : "", "class='form-control'")?> + + + $desc):?> + + + + + + + +
+ +
+ {$lang->save}"; + } + else + { + echo html::submitButton('', '', 'btn btn-primary btn-wide'); + } + echo '   ' . html::backButton('', '', 'btn btn-wide') + ?> +
+ +
-
-
- icons['export']);?> - testcase->exportTemplet;?> +
+
+

testcase->exportTemplet;?>

-
- -
- - - + + + +
-
- testcase->num;?> - + + + - - - -
+
+ testcase->num;?> + -
- 		- charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?> - - -
- + ?> +
+ 		+ charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?> + + +
+ +
diff --git a/module/testsuite/view/import.html.php b/module/testsuite/view/import.html.php index 5f8a96a6d4..775c6f7f16 100644 --- a/module/testsuite/view/import.html.php +++ b/module/testsuite/view/import.html.php @@ -1,6 +1,9 @@ -
-
+
+
+

testcase->importFile;?>

+
+
@@ -10,7 +13,7 @@ charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?> - +
diff --git a/module/testsuite/view/showimport.html.php b/module/testsuite/view/showimport.html.php index 19a8e4abfd..5e4822ce56 100644 --- a/module/testsuite/view/showimport.html.php +++ b/module/testsuite/view/showimport.html.php @@ -5,92 +5,94 @@
- - - - - - - - - - - - - - - - - - $case):?> - title)) continue;?> - id) and !isset($cases[$case->id])) $case->id = 0;?> - - - - - - - - - - - - - - - - + + + + +
testcase->id?>testcase->title?>testcase->module?>testcase->pri?>testcase->type?>testcase->stage?>testcase->keywords?>testcase->precondition?> - - - - - -
testcase->stepDesc?>testcase->stepExpect?>
-
- id)) - { - echo $case->id . html::hidden("id[$key]", $case->id); - $insert = false; - } - else - { - echo $key . " {$lang->testcase->new}"; - } - echo html::hidden("lib[$key]", $libID); - ?> - title, "class='form-control' style='margin-top:2px' autocomplete='off'")?>module) ? $case->module : (!empty($case->id) ? $cases[$case->id]->module : ''), "class='form-control chosen'")?>testcase->priList, isset($case->pri) ? $case->pri : (!empty($case->id) ? $cases[$case->id]->pri : ''), "class='form-control'")?>testcase->typeList, isset($case->type) ? $case->type : (!empty($case->id) ? $cases[$case->id]->type : ''), "class='form-control'")?>testcase->stageList, !empty($case->stage) ? $case->stage : (!empty($case->id) ? $cases[$case->id]->stage : ''), "multiple='multiple' class='form-control chosen'")?>keywords) ? $case->keywords : "", "class='form-control' autocomplete='off'")?>precondition) ? htmlspecialchars($case->precondition) : "", "class='form-control'")?> - - - $desc):?> - - - - - - - -
- -
+
+ + + + + + + + + + + + + + + + + + $case):?> + title)) continue;?> + id) and !isset($cases[$case->id])) $case->id = 0;?> + + + + + + + + + + - -
testcase->id?>testcase->title?>testcase->module?>testcase->pri?>testcase->type?>testcase->stage?>testcase->keywords?>testcase->precondition?> + + + + + +
testcase->stepDesc?>testcase->stepExpect?>
+
id)) { - include '../../common/view/noticeimport.html.php'; - echo ""; + echo $case->id . html::hidden("id[$key]", $case->id); + $insert = false; } else { - echo html::submitButton(); + echo $key . " {$lang->testcase->new}"; } - echo '   ' . html::backButton() + echo html::hidden("lib[$key]", $libID); ?> title, "class='form-control' style='margin-top:2px' autocomplete='off'")?>module) ? $case->module : (!empty($case->id) ? $cases[$case->id]->module : ''), "class='form-control chosen'")?>testcase->priList, isset($case->pri) ? $case->pri : (!empty($case->id) ? $cases[$case->id]->pri : ''), "class='form-control'")?>testcase->typeList, isset($case->type) ? $case->type : (!empty($case->id) ? $cases[$case->id]->type : ''), "class='form-control'")?>testcase->stageList, !empty($case->stage) ? $case->stage : (!empty($case->id) ? $cases[$case->id]->stage : ''), "multiple='multiple' class='form-control chosen'")?>keywords) ? $case->keywords : "", "class='form-control' autocomplete='off'")?>precondition) ? htmlspecialchars($case->precondition) : "", "class='form-control'")?> + + + $desc):?> + + + + + + + +
+ +
- + + +
+ {$lang->save}"; + } + else + { + echo html::submitButton('', '', 'btn btn-primary btn-wide'); + } + echo '   ' . html::backButton('', '', 'btn btn-wide') + ?> +
+ +