From eafa14bdcab1e9e4108bacdede007a15fd07e479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Fri, 18 May 2018 09:28:19 +0800 Subject: [PATCH 1/8] * Task#4159. --- module/task/view/edit.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 97c8ecd5e7..50bf436656 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -31,7 +31,7 @@
-
+
'>
From 9ebca72c8626aefa35f2f966d11a3989fb2d6503 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Fri, 18 May 2018 09:31:17 +0800 Subject: [PATCH 2/8] * Finish task #4151. --- module/task/css/create.css | 1 + module/task/js/create.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/module/task/css/create.css b/module/task/css/create.css index e69de29bb2..ce475de180 100644 --- a/module/task/css/create.css +++ b/module/task/css/create.css @@ -0,0 +1 @@ +#copyButton {width: 56px; background-color: #f1f1f1; opacity: 1;} /*Adjust for task #4151;*/ diff --git a/module/task/js/create.js b/module/task/js/create.js index cd27e25ae8..d52f937445 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -75,6 +75,7 @@ function setPreview() { $('#preview').addClass('hidden'); $('#copyButton').addClass('hidden'); + $('div.colorpicker').css('right', '1px');//Adjust for task #4151; } else { @@ -84,6 +85,7 @@ function setPreview() $('#preview').removeClass('hidden'); $('#preview a').attr('href', storyLink); $('#copyButton').removeClass('hidden'); + $('div.colorpicker').css('right', '57px');//Adjust for task #4151; } setAfter(); From 6c6601ae468bda4e2d351d81162cac65eb25e209 Mon Sep 17 00:00:00 2001 From: daitingting Date: Fri, 18 May 2018 09:37:19 +0800 Subject: [PATCH 3/8] * Adjust button positon in name. --- module/task/css/create.css | 1 + module/task/view/create.html.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/task/css/create.css b/module/task/css/create.css index e69de29bb2..fcfd364093 100644 --- a/module/task/css/create.css +++ b/module/task/css/create.css @@ -0,0 +1 @@ +#copyButton{width: 50px;} diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index 800896dde0..31b58f0ef1 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -66,13 +66,13 @@ task->name;?> -
+
  • task->colorTag;?>
- +
name, "class='form-control' autocomplete='off' required");?> config->global->flow != 'onlyTask'):?> From 7d1dc5a5e9cf4d9ab33e180fefcc2069622d51f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Fri, 18 May 2018 09:38:35 +0800 Subject: [PATCH 4/8] * Format code. --- module/task/view/edit.html.php | 41 +++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 50bf436656..62b10dc45a 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -30,26 +30,31 @@
-
-
'> -
-
- -
    -
  • task->colorTag;?>
    • -
- +
+
task->name;?>
+
+
+
'> +
+
+ +
    +
  • task->colorTag;?>
    • +
+ +
+ name, 'class="form-control task-name" autocomplete="off" placeholder="' . $lang->task->name . '"');?> +
+ children) and empty($task->parent) and $task->type != 'affair'):?> + +
+ team) ? '' : 'checked';?> /> + +
+ +
- name, 'class="form-control task-name" autocomplete="off" placeholder="' . $lang->task->name . '"');?>
- children) and empty($task->parent) and $task->type != 'affair'):?> - -
- team) ? '' : 'checked';?> /> - -
- -
From 01e8f79b550475957be9d44dfdd242f8e5d7f65f Mon Sep 17 00:00:00 2001 From: daitingting Date: Fri, 18 May 2018 09:39:21 +0800 Subject: [PATCH 5/8] * Merge it. --- module/task/css/create.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/module/task/css/create.css b/module/task/css/create.css index 5ebd1cfea6..ce475de180 100644 --- a/module/task/css/create.css +++ b/module/task/css/create.css @@ -1,5 +1 @@ -<<<<<<< HEAD -#copyButton{width: 50px;} -======= #copyButton {width: 56px; background-color: #f1f1f1; opacity: 1;} /*Adjust for task #4151;*/ ->>>>>>> 9ebca72c8626aefa35f2f966d11a3989fb2d6503 From 61a74747448e2264e5e8763f6145fb6cbbb8f440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Fri, 18 May 2018 09:47:34 +0800 Subject: [PATCH 6/8] * Format code. --- module/bug/view/edit.html.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index 828ba9f44c..30969d7b84 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -65,10 +65,13 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
-
fetch('file', 'buildform');?>
+
+
files;?>
+
fetch('file', 'buildform');?>
+
- lastEditedDate); echo html::submitButton('', '', 'btn btn-wide btn-primary'); $browseLink = $app->session->bugList != false ? $app->session->bugList : inlink('browse', "productID=$bug->product"); @@ -98,7 +101,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); bug->module;?>
- resolvedBuild); type != 'designchange') unset($lang->bug->typeList['designchange']); From 8f4fbd18ab62572f2b681d1a27e9f5bc7b4a88e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Fri, 18 May 2018 09:48:23 +0800 Subject: [PATCH 7/8] * Format code for testcase. --- module/testcase/view/edit.html.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php index 0cb2574e07..38d55cfc5f 100644 --- a/module/testcase/view/edit.html.php +++ b/module/testcase/view/edit.html.php @@ -117,8 +117,9 @@
testcase->legendComment;?>
-
- fetch('file', 'buildform');?> +
+
files;?>
+
fetch('file', 'buildform');?>
lastEditedDate);?> From ddb33c2a34b222973cab76dd8efd267d2e442f8a Mon Sep 17 00:00:00 2001 From: liugang Date: Fri, 18 May 2018 10:05:13 +0800 Subject: [PATCH 8/8] * Fix button style. --- module/company/view/browse.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php index f037d4dfde..2118e729a2 100644 --- a/module/company/view/browse.html.php +++ b/module/company/view/browse.html.php @@ -114,7 +114,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
-
edit);?>
+
edit, '', 'btn');?>
show('right', 'pagerjs');?>