From da47c729d9a5c87ee04b34fed388de150e52cd4d Mon Sep 17 00:00:00 2001 From: liyuchun Date: Mon, 22 Nov 2021 13:36:52 +0800 Subject: [PATCH 1/3] * Adjust execution button name. --- module/bug/css/create.css | 6 +-- module/bug/view/create.html.php | 49 +++++++++++++++---------- module/execution/view/activate.html.php | 4 +- module/execution/view/close.html.php | 4 +- module/execution/view/start.html.php | 2 +- module/execution/view/suspend.html.php | 6 +-- 6 files changed, 38 insertions(+), 33 deletions(-) diff --git a/module/bug/css/create.css b/module/bug/css/create.css index 88962a459d..916014f09f 100644 --- a/module/bug/css/create.css +++ b/module/bug/css/create.css @@ -45,8 +45,4 @@ html[lang='en'] #deadlineTd .input-group-addon {padding: 5px 18px;} #osBox .required:after {right: 1px;} #osBox {width: 190px;} #projectBox .required:after {right: 1px;} -#assignedTo_chosen, .load-all-user {float: left;;} -.assigned-box #assignedTo_chosen {width: 80% !important;} -.deadline-box #assignedTo_chosen {width: 153px !important;} -.assigned-box .load-all-user {float: left;} -.load-all-user .btn {border-left: none;} +#notifyEmailTd .input-group-addon, #deadlineTd .input-group-addon {border-radius: 2px 0px 2px 0px !important;} diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index 19c011153d..f9ded3e757 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -129,31 +129,40 @@ js::set('moduleID', $moduleID); bug->lblAssignedTo;?> -
- -
'> - - bug->allUsers, "class='btn btn-default' onclick='loadAllUsers()' data-toggle='tooltip'");?> -
- -
-
- bug->deadline;?> - -
-
- +
+ + bug->allUsers, "class='btn btn-default' onclick='loadAllUsers()' data-toggle='tooltip'");?>
- -
- bug->feedbackBy?> - - bug->notifyEmail?> - + + + +
+ bug->deadline?> +
+ + bug->feedbackBy;?> + + +
+ bug->notifyEmail?> + +
+ + + + +
+ bug->feedbackBy?> + + bug->notifyEmail?> + +
+ + diff --git a/module/execution/view/activate.html.php b/module/execution/view/activate.html.php index d8f34124cc..7cb5cd726b 100644 --- a/module/execution/view/activate.html.php +++ b/module/execution/view/activate.html.php @@ -5,7 +5,7 @@ * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) * @license ZPL (http://zpl.pub/page/zplv12.html) * @author Chunsheng Wang - * @package execution + * @package execution * @version $Id: suspend.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $ * @link http://www.zentao.net */ @@ -59,7 +59,7 @@ - goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> + execution->activate . $lang->executionCommon) . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> diff --git a/module/execution/view/close.html.php b/module/execution/view/close.html.php index 9d9edf493d..cd2f0062bf 100644 --- a/module/execution/view/close.html.php +++ b/module/execution/view/close.html.php @@ -5,7 +5,7 @@ * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) * @license ZPL (http://zpl.pub/page/zplv12.html) * @author Chunsheng Wang - * @package execution + * @package execution * @version $Id: suspend.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $ * @link http://www.zentao.net */ @@ -35,7 +35,7 @@ - goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> + execution->close . $lang->executionCommon) . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> diff --git a/module/execution/view/start.html.php b/module/execution/view/start.html.php index 43cc98ccad..b45485f913 100644 --- a/module/execution/view/start.html.php +++ b/module/execution/view/start.html.php @@ -31,7 +31,7 @@ - execution->start) . ' ' . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> + execution->start . $lang->executionCommon) . ' ' . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> diff --git a/module/execution/view/suspend.html.php b/module/execution/view/suspend.html.php index 1581055615..b061a5e683 100644 --- a/module/execution/view/suspend.html.php +++ b/module/execution/view/suspend.html.php @@ -5,7 +5,7 @@ * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) * @license ZPL (http://zpl.pub/page/zplv12.html) * @author Chunsheng Wang - * @package execution + * @package execution * @version $Id: suspend.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $ * @link http://www.zentao.net */ @@ -34,11 +34,11 @@ - goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> + execution->suspend . $lang->executionCommon) . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> -
+
From dfe63ef1a61107cfb4d80647910ed0f1555ba00b Mon Sep 17 00:00:00 2001 From: liyuchun Date: Mon, 22 Nov 2021 14:00:53 +0800 Subject: [PATCH 2/3] * Adjust style of create story. --- module/story/css/create.css | 2 ++ module/story/view/create.html.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/module/story/css/create.css b/module/story/css/create.css index b059c5ef9f..8cf063f7ef 100644 --- a/module/story/css/create.css +++ b/module/story/css/create.css @@ -3,3 +3,5 @@ .pri-selector > .btn {padding: 5px 8px !important; width: 100%;} .pri-selector > .dropdown-menu {padding: 10px;} + +#source_chosen {min-width: 50px !important;} diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index 2fc377548b..2c425cd239 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -91,7 +91,7 @@
story->source;?>
story->sourceList, $source, "class='form-control chosen'");?> story->sourceNote;?> - +
From 5dc23ad4f2366f035802caefd71a480fe8e0973c Mon Sep 17 00:00:00 2001 From: liyuchun Date: Mon, 22 Nov 2021 14:48:33 +0800 Subject: [PATCH 3/3] * Adjust create bug view. --- module/bug/view/create.html.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index f9ded3e757..f49d8dd535 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -162,6 +162,7 @@ js::set('moduleID', $moduleID); +