From f2058e9b9f94964e5411f8416fd3ee39e1aa977e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Wed, 16 May 2018 09:08:57 +0800 Subject: [PATCH 1/7] * Task#4118. --- module/testcase/view/exporttemplet.html.php | 49 ++++++++++----------- module/testcase/view/import.html.php | 11 +++-- 2 files changed, 31 insertions(+), 29 deletions(-) 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'");?> - +
From f1d8d22691f8d08a43bf642acf99d004bde2609d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Wed, 16 May 2018 09:13:05 +0800 Subject: [PATCH 2/7] * Task#4125. --- module/testsuite/view/exporttemplet.html.php | 48 ++++++++++---------- module/testsuite/view/import.html.php | 9 ++-- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/module/testsuite/view/exporttemplet.html.php b/module/testsuite/view/exporttemplet.html.php index 80e5e9e311..d86f7e61be 100644 --- a/module/testsuite/view/exporttemplet.html.php +++ b/module/testsuite/view/exporttemplet.html.php @@ -19,31 +19,29 @@ function closeWindow() } } -
-
- 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'");?> - +
From da32e7d4de5885d2b71d689db8ee57aacdad9d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Wed, 16 May 2018 09:36:26 +0800 Subject: [PATCH 3/7] * Task#4125. --- module/testcase/view/showimport.html.php | 198 ++++++++++++----------- 1 file changed, 100 insertions(+), 98 deletions(-) diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php index ae4feecb56..3ace4698ad 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') + ?> +
+ +