From 244a261be4d03b6b00a3915dd4a1bc400dd9ee78 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 23 May 2018 16:25:50 +0800 Subject: [PATCH 01/51] * finish task #4217. --- module/bug/view/view.html.php | 2 -- module/project/view/view.html.php | 4 ---- module/score/model.php | 2 +- module/task/view/view.html.php | 2 -- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index cc623456ae..9f349d8dfd 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -336,8 +336,6 @@ $convertParams = "productID=$productID&branch=$bug->branch&moduleID=0&from=bug&b common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy'); common::printIcon('bug', 'delete', $params, $bug, 'button', '', 'hiddenwin'); ?> - - diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index ff7dae0e24..21251ba7ff 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -289,10 +289,6 @@ common::printIcon('project', 'edit', $params, $project); common::printIcon('project', 'delete', $params, $project, 'button', '', 'hiddenwin'); } - else - { - common::printBack($browseLink); - } ?> From dbd536dba5e912334055330895c37275e379afab Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 24 May 2018 11:03:08 +0800 Subject: [PATCH 18/51] * finish task #4197. --- module/doc/view/browsebygrid.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php index 53f69eb90c..ad81b6bbd9 100644 --- a/module/doc/view/browsebygrid.html.php +++ b/module/doc/view/browsebygrid.html.php @@ -4,8 +4,8 @@
From b6b41ae2da1a6006dadddf1712f7b53d9fc84c62 Mon Sep 17 00:00:00 2001 From: Catouse Date: Thu, 24 May 2018 11:10:05 +0800 Subject: [PATCH 19/51] * refactor codes. --- module/bug/css/batchedit.css | 2 + module/bug/view/batchcreate.html.php | 2 +- module/bug/view/batchedit.html.php | 10 ++-- module/task/view/create.html.php | 2 +- module/testcase/view/batchcreate.html.php | 12 ++--- module/testsuite/view/exporttemplet.html.php | 52 +++++++++++--------- module/testsuite/view/import.html.php | 42 +++++++++------- module/testsuite/view/library.html.php | 2 +- module/testtask/view/browse.html.php | 4 +- module/testtask/view/create.html.php | 2 +- www/theme/zui/css/min.css | 4 +- 11 files changed, 72 insertions(+), 62 deletions(-) diff --git a/module/bug/css/batchedit.css b/module/bug/css/batchedit.css index 10c1f35718..24236cbe26 100644 --- a/module/bug/css/batchedit.css +++ b/module/bug/css/batchedit.css @@ -1 +1,3 @@ .chosen-container[id^="plan"] .chosen-drop {min-width: 300px; border-top: 1px solid #ddd!important} +.duplicate-input {border-left-width: 0; border-radius: 0 2px 2px 0; padding-left: 9px} +.duplicate-input:focus {border-left-width: 1px; padding-left: 8px} \ No newline at end of file diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php index e3fde06adb..458c236ff7 100644 --- a/module/bug/view/batchcreate.html.php +++ b/module/bug/view/batchcreate.html.php @@ -11,7 +11,7 @@ */ ?> -
+

bug->batchCreate;?> diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index 09fabdc5fa..f9d8694b12 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -13,7 +13,7 @@ lang->bug->dittoNotice);?> -
+

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

@@ -62,7 +62,7 @@ '>bug->browser;?> '>bug->keywords;?> '>bug->resolvedByAB;?> - '>bug->resolutionAB;?> + '>bug->resolutionAB;?> @@ -125,11 +125,11 @@ >keywords, 'class=form-control');?> ' style='overflow:visible'>resolvedBy, "class='form-control chosen'");?> > - +
- +
resolution, "class=form-control onchange=setDuplicate(this.value,$bugID)");?>resolution, "class='form-control' onchange=setDuplicate(this.value,$bugID)");?> ' resolution != 'duplicate') echo "style='display:none'";?>> - bug->duplicateBug}'");?> + bug->duplicateBug}'");?>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index 0e64da2478..fd69f9558a 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -164,7 +164,7 @@ task->afterChoices, $this->config->global->flow == 'onlyTask' || !empty($task->id) ? 'toTaskList' : 'continueAdding');?> - + diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php index 84854d4132..9247cb4e5d 100644 --- a/module/testcase/view/batchcreate.html.php +++ b/module/testcase/view/batchcreate.html.php @@ -14,7 +14,7 @@ testcase->batchCreate);?> -
+

testcase->batchCreate;?> @@ -75,8 +75,8 @@ $type = $i == 0 ? 'feature' : 'ditto'; $pri = $i == 0 ? 3 : 'ditto'; ?> - - + + '> ' style='overflow:visible'> ' style='overflow:visible'> id : '', 'class="form-control chosen"');?> @@ -103,7 +103,7 @@ - + @@ -114,8 +114,8 @@

- - + + diff --git a/module/testsuite/view/exporttemplet.html.php b/module/testsuite/view/exporttemplet.html.php index d86f7e61be..4736e17d5b 100644 --- a/module/testsuite/view/exporttemplet.html.php +++ b/module/testsuite/view/exporttemplet.html.php @@ -19,29 +19,33 @@ function closeWindow() } } -
-
-

testcase->exportTemplet;?>

+
+
+
+
+

testcase->exportTemplet;?>

+
+
+
%s
%s '> ' style='overflow:visible'> ' style='overflow:visible'>
+ + + + + +
+
+ testcase->num;?> + +
+ 		+ charsets[$this->cookie->lang], 'utf-8', "class='form-control chosen-simple'");?> + + +
+ +
-
- - - - - - -
-
- testcase->num;?> - -
- 		- 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 775c6f7f16..33c4f7b2c7 100644 --- a/module/testsuite/view/import.html.php +++ b/module/testsuite/view/import.html.php @@ -1,22 +1,26 @@ -
-
-

testcase->importFile;?>

+
+
+
+
+

testcase->importFile;?>

+
+
+ + + + + + +
+ + + charsets[$this->cookie->lang], 'utf-8', "class='form-control chosen-simple'");?> + + +
+
+
-
- - - - - - -
- - - charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?> - - -
-
-
+ diff --git a/module/testsuite/view/library.html.php b/module/testsuite/view/library.html.php index 41ed4ae313..930e3f1b71 100644 --- a/module/testsuite/view/library.html.php +++ b/module/testsuite/view/library.html.php @@ -69,7 +69,7 @@ js::set('flow', $this->config->global->flow);
- " . $lang->testsuite->view, '', "class='btn'");?> + " . $lang->testsuite->view, '', "class='btn'");?>