From 72c1b4819e0b8642bdeff377ddc64cda94d8bcf4 Mon Sep 17 00:00:00 2001 From: wangzemei Date: Mon, 17 Oct 2022 16:24:14 +0800 Subject: [PATCH 1/4] * finish task #72349 --- module/task/css/common.css | 19 +++++++++++++++++++ module/task/css/create.css | 17 ----------------- module/task/css/edit.css | 17 +---------------- 3 files changed, 20 insertions(+), 33 deletions(-) diff --git a/module/task/css/common.css b/module/task/css/common.css index 6ac775e840..ffd387d200 100644 --- a/module/task/css/common.css +++ b/module/task/css/common.css @@ -1,2 +1,21 @@ .body-modal > .main {padding: 20px;} .body-modal > .main .table-form {border: 1px solid #ddd;} + +#modalTeam .modal-dialog {padding-bottom: 20px;} +#modalTeam .modal-content {padding: 0 0 5px; height: 340px;} +#modalTeam .modal-body {padding: 12px 13px 20px; max-height: 296px!important; overflow-y: scroll!important;} +#modalTeam .modal-header {height: 44px; padding: 10px 20px; margin: 0; } +#modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;} +#taskTeamEditor tr {padding: 8px 7px 8px 7px;} +#taskTeamEditor td .chosen-single .chosen-search input, +#taskTeamEditor tr td .chosen-single {height: 35px; line-height: 24px;} +#taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;} +#taskTeamEditor tr td:first-child {width: 40px; position: relative;} +.team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;} +#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;} +#taskTeamEditor tr:last-child td:first-child .icon, #taskTeamEditor tr.member-last td:first-child .icon {display: none;} + +#modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;} +#modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;} +#modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;} +#modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;} \ No newline at end of file diff --git a/module/task/css/create.css b/module/task/css/create.css index 676e62d8af..603c1d4e69 100644 --- a/module/task/css/create.css +++ b/module/task/css/create.css @@ -29,20 +29,3 @@ .keep-row-height {height: 32px;} #modalTeam .modal-dialog {height: 340px; width: 620px; color: #3c4353;} -#modalTeam .modal-content {padding: 0 0 5px; height: 340px;} -#modalTeam .modal-header {height: 44px; padding: 10px 20px; margin: 0;} -#modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;} -#modalTeam .modal-body {padding: 12px 13px 20px; max-height: 296px!important; overflow-y: scroll!important;} -#taskTeamEditor tr {padding: 8px 7px 8px 7px;} -#taskTeamEditor td .chosen-single .chosen-search input, -#taskTeamEditor tr td .chosen-single {height: 35px; line-height: 24px;} -#taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;} -#taskTeamEditor tr td:first-child {width: 40px; position: relative;} -.team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;} -#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;} -#taskTeamEditor tr:last-child td:first-child .icon {display: none;} - -#modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;} -#modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;} -#modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;} -#modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;} diff --git a/module/task/css/edit.css b/module/task/css/edit.css index 9eee7f882d..68968921b2 100644 --- a/module/task/css/edit.css +++ b/module/task/css/edit.css @@ -4,20 +4,5 @@ #taskTeamEditor .sortable .input-group .input-group-addon.required:after {top: 10px; right: 2px; z-index: 3;} #storyIdBox .chosen-container .chosen-drop.chosen-no-wrap>.chosen-results>li {text-overflow: unset;} -#modalTeam .modal-dialog {padding-bottom: 20px;} -#modalTeam .modal-content {padding: 20px 13px 0; height: 340px;max-height: 296px!important; overflow-y: scroll!important;} -#modalTeam .modal-header {height: 44px; padding: 10px 20px; margin: 0; } -#modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;} -#taskTeamEditor tr {padding: 8px 7px 8px 7px;} -#taskTeamEditor td .chosen-single .chosen-search input, -#taskTeamEditor tr td .chosen-single {height: 35px; line-height: 24px;} -#taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;} -#taskTeamEditor tr td:first-child {width: 40px; position: relative;} -.team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;} -#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;} -#taskTeamEditor tr:last-child td:first-child .icon {display: none;} -#modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;} -#modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;} -#modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;} -#modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;} +#modalTeam .modal-content {padding: 20px 13px 0; height: 340px;max-height: 296px!important; overflow-y: scroll!important;} From 5064fc3669ce96f7c7eb9be4807db8737b88de72 Mon Sep 17 00:00:00 2001 From: wangzemei Date: Mon, 17 Oct 2022 16:45:59 +0800 Subject: [PATCH 2/4] * update createTaskTeam style --- module/task/css/create.css | 4 +++- module/task/view/taskteam.html.php | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/module/task/css/create.css b/module/task/css/create.css index 603c1d4e69..6aa2ede9c0 100644 --- a/module/task/css/create.css +++ b/module/task/css/create.css @@ -28,4 +28,6 @@ .c-modulel {width: 110px;} .keep-row-height {height: 32px;} -#modalTeam .modal-dialog {height: 340px; width: 620px; color: #3c4353;} +#modalTeam .modal-dialog {height: 340px; width: 520px; color: #3c4353;} +#taskTeamEditor .chosen-single {width: 200px;} +#taskTeamEditor .estimateBox {width: 120px;} diff --git a/module/task/view/taskteam.html.php b/module/task/view/taskteam.html.php index 9e62015a66..f1d3446753 100644 --- a/module/task/view/taskteam.html.php +++ b/module/task/view/taskteam.html.php @@ -60,11 +60,11 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal - + - + team)):?>
task->estimateAB}'") ?> @@ -81,7 +81,7 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
- + mode) or $task->mode == 'linear'):?> From 0b2907217fa235da72bf004fa8e4a7be0a48e631 Mon Sep 17 00:00:00 2001 From: wangzemei Date: Tue, 18 Oct 2022 09:43:23 +0800 Subject: [PATCH 3/4] * replace input component --- module/task/css/common.css | 8 ++++++- module/task/view/taskteam.html.php | 36 ++++++++++++++++++++---------- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/module/task/css/common.css b/module/task/css/common.css index 98aa13731a..08778de2e4 100644 --- a/module/task/css/common.css +++ b/module/task/css/common.css @@ -14,8 +14,14 @@ .team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;} #taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;} #taskTeamEditor tr:last-child td:first-child .icon, #taskTeamEditor tr.member-last td:first-child .icon {display: none;} - +#taskTeamEditor tr .input-control {display: inline-block; width: 130px; } +#taskTeamEditor tr .input-control + .input-control {margin-left: 12px; border-left: 1px solid #eee;} #modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;} #modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;} #modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;} #modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;} + +#modalTeam .input-control input[type="text"]::input-placeholder{text-align: right;} +#modalTeam .input-control input[type="text"]::-webkit-input-placeholder{text-align: right;} +#modalTeam .input-control input[type="text"]::-moz-placeholder{text-align: right;} +#modalTeam .input-control input[type="text"]::-ms-input-placeholder{text-align: right;} \ No newline at end of file diff --git a/module/task/view/taskteam.html.php b/module/task/view/taskteam.html.php index 9bbb22f2e9..28ca7dee5f 100644 --- a/module/task/view/taskteam.html.php +++ b/module/task/view/taskteam.html.php @@ -37,12 +37,18 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
- task->estimate?> - estimate, "class='form-control text-center' placeholder='{$lang->task->hour}'" . ($hourDisabled ? ' readonly' : ''))?> - task->consumed?> - consumed, "class='form-control text-center' readonly placeholder='{$lang->task->hour}'")?> - task->left?> - left, "class='form-control text-center' placeholder='{$lang->task->hour}'" . ($hourDisabled ? ' readonly' : ''))?> +
+ estimate, "class='form-control text-center' placeholder='{$lang->task->estimate}'" . ($hourDisabled ? ' readonly' : ''))?> + +
+
+ consumed, "class='form-control text-center' readonly placeholder='{$lang->task->consumed}'")?> + +
+
+ left, "class='form-control text-center' placeholder='{$lang->task->left}'" . ($hourDisabled ? ' readonly' : ''))?> + +
@@ -73,12 +79,18 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
- task->estimate?> - task->hour}'")?> - task->consumed?> - task->hour}'")?> - task->left?> - task->hour}'")?> +
+ task->estimate}'")?> + +
+
+ task->consumed}'")?> + +
+
+ task->left}'")?> + +
From 9eb84fcc4e80ad5a32532996909647811c1c4b95 Mon Sep 17 00:00:00 2001 From: wangzemei Date: Tue, 18 Oct 2022 13:06:15 +0800 Subject: [PATCH 4/4] * modify format --- module/task/css/common.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/task/css/common.css b/module/task/css/common.css index 08778de2e4..842d9c8db3 100644 --- a/module/task/css/common.css +++ b/module/task/css/common.css @@ -3,7 +3,7 @@ #modalTeam .modal-dialog {padding-bottom: 20px;} #modalTeam .modal-content {padding: 0 0 5px; height: 340px;} -#modalTeam .modal-body {padding: 12px 13px 20px; max-height: 296px!important; overflow-y: scroll!important;} +#modalTeam .modal-body {padding: 12px 13px 20px; max-height: 296px !important; overflow-y: scroll !important;} #modalTeam .modal-header {height: 44px; padding: 10px 20px; margin: 0; } #modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;} #taskTeamEditor tr {padding: 8px 7px 8px 7px;} @@ -12,7 +12,7 @@ #taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;} #taskTeamEditor tr td:first-child {width: 40px; position: relative;} .team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;} -#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;} +#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;} #taskTeamEditor tr:last-child td:first-child .icon, #taskTeamEditor tr.member-last td:first-child .icon {display: none;} #taskTeamEditor tr .input-control {display: inline-block; width: 130px; } #taskTeamEditor tr .input-control + .input-control {margin-left: 12px; border-left: 1px solid #eee;}