diff --git a/module/bug/css/browse.css b/module/bug/css/browse.css
index 55068d74be..8d9aac8543 100644
--- a/module/bug/css/browse.css
+++ b/module/bug/css/browse.css
@@ -2,7 +2,6 @@
.closed, .closed a {color: gray; text-decoration:line-through;}
.resolved, .resolved a {color: #8EC21F; text-decoration: none;}
.tree .closed, .tree .closed a {color: #003366; text-decoration: none;}
-td.delayed {color: #fff; background: #e84e0f !important;}
#bugForm .setting {height: 25px;}
.datatable-wrapper .table-datatable .datatable-row td {height: 37px;}
diff --git a/module/bug/model.php b/module/bug/model.php
index 6a4c7ef4d4..7679e599ae 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -3297,6 +3297,9 @@ class bugModel extends model
$class .= ' text-ellipsis';
$title = "title='" . $browser . "'";
break;
+ case 'deadline':
+ $class .= ' text-center';
+ break;
}
if($id == 'deadline' && isset($bug->delay) && $bug->status == 'active') $class .= ' delayed';
@@ -3440,7 +3443,7 @@ class bugModel extends model
echo helper::isZeroDate($bug->assignedDate) ? '' : substr($bug->assignedDate, 5, 11);
break;
case 'deadline':
- echo helper::isZeroDate($bug->deadline) ? '' : substr($bug->deadline, 5, 11);
+ echo helper::isZeroDate($bug->deadline) ? '' : '' . substr($bug->deadline, 5, 11) . '';
break;
case 'resolvedBy':
echo zget($users, $bug->resolvedBy, $bug->resolvedBy);
diff --git a/module/execution/css/bug.css b/module/execution/css/bug.css
index 095e852326..e798bf6ccb 100644
--- a/module/execution/css/bug.css
+++ b/module/execution/css/bug.css
@@ -6,7 +6,6 @@
.dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;}
.dropdown-list > li > a:hover,
.dropdown-list > li > a:focus {color: #1a4f85; text-decoration: none; background-color: #ddd;}
-td.delayed {color: #fff; background: #e84e0f !important;}
.c-severity {width: 80px;}
.c-confirmed {overflow: hidden;}
diff --git a/module/execution/css/grouptask.css b/module/execution/css/grouptask.css
index ff7b32c085..2e54857cc4 100644
--- a/module/execution/css/grouptask.css
+++ b/module/execution/css/grouptask.css
@@ -27,4 +27,3 @@
.c-hours {white-space: nowrap; overflow: hidden; text-overflow: ellipsis; text-align: right;}
.c-user, .c-type {width: 70px;}
.c-progress {width: 60px;}
-.delayed {background: #e84e0f !important; color: white;}
diff --git a/module/execution/css/task.css b/module/execution/css/task.css
index 20d6b20df0..f9081b4a59 100644
--- a/module/execution/css/task.css
+++ b/module/execution/css/task.css
@@ -1,4 +1,3 @@
-td.delayed {background: #e84e0f !important; color: white;}
#int-dropdown {margin-left: -8px; border-radius: 4px; border: 1px solid #0c64eb;}
#projectTaskForm table tbody tr td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
.table td.c-estimate, .table td.c-consumed, .table td.c-left {padding-right: 12px;}
diff --git a/module/execution/view/grouptask.html.php b/module/execution/view/grouptask.html.php
index 7e107fb0fa..0dad281b94 100644
--- a/module/execution/view/grouptask.html.php
+++ b/module/execution/view/grouptask.html.php
@@ -207,7 +207,7 @@
left . $lang->execution->workHourUnit;?> |
progress . '%';?> |
task->typeList, $task->type);?> |
- '>deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);?> |
+ '>deadline, 0, 4) > 0) echo '' . substr($task->deadline, 5, 6) . '';?> |
execution&taskID=$task->id", $task, 'list', '', '', 'iframe', true);?>
diff --git a/module/execution/view/importtask.html.php b/module/execution/view/importtask.html.php
index 3eb2618aad..25e9f99197 100644
--- a/module/execution/view/importtask.html.php
+++ b/module/execution/view/importtask.html.php
@@ -63,7 +63,7 @@
| id", $task->name, '', "class='preview iframe' data-width='90%'", true, true)) echo $task->name;?> |
>assignedToRealName;?> |
left . ' ' . $lang->execution->workHourUnit;?> |
- delay)) echo 'delayed';?>>deadline, 0, 4) > 0) echo $task->deadline;?> |
+ deadline, 0, 4) > 0) echo '' . $task->deadline . '';?> |
processStatus('task', $task);?> |
tr.table-children.table-child-top {border-top: 2px solid #cbd0db;}
.table tbody > tr.table-children.table-child-bottom {border-bottom: 2px solid #cbd0db;}
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index 5503e70cdc..599914d144 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -134,7 +134,7 @@
| ' title='bug->confirmedList, $bug->confirmed);?>'>bug->confirmedList, $bug->confirmed)?> |
rawMethod == 'work'):?>
- deadline, 0, 4) > 0) echo substr($bug->deadline, 5, 6);?> |
+ deadline, 0, 4) > 0) echo '' . substr($bug->deadline, 5, 6) . '';?> |
bug->printAssignedHtml($bug, $users);?> |
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index cae4c91b9a..cf93e51b67 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -137,7 +137,7 @@
task->printAssignedHtml($task, $users);?> |
- deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);?> |
+ deadline, 0, 4) > 0) echo '' . substr($task->deadline, 5, 6) . '';?> |
estimate, 1) . $lang->execution->workHourUnit;?> |
consumed, 1) . $lang->execution->workHourUnit;?> |
left, 1) . $lang->execution->workHourUnit;?> |
@@ -214,7 +214,7 @@
task->printAssignedHtml($child, $users);?> |
- deadline, 0, 4) > 0) echo substr($child->deadline, 5, 6);?> |
+ deadline, 0, 4) > 0) echo '' . substr($child->deadline, 5, 6) . '';?> |
estimate, 1) . ' ' . $lang->execution->workHourUnit;?> |
consumed, 1) . ' ' . $lang->execution->workHourUnit;?> |
left, 1) . ' ' . $lang->execution->workHourUnit;?> |
diff --git a/module/project/css/common.css b/module/project/css/common.css
index e49281ec10..b884affa19 100644
--- a/module/project/css/common.css
+++ b/module/project/css/common.css
@@ -3,4 +3,3 @@
.text-remind {color: #ffa34d;}
.text-remind p{float: left; margin-right: 5px;}
#ignore {text-decoration: underline; cursor: pointer; color: #ef7b0f;}
-td.delayed {color: #fff; background: #e84e0f !important;}
diff --git a/module/task/model.php b/module/task/model.php
index dcf2cb00df..34aaffe3ce 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -3777,7 +3777,7 @@ class taskModel extends model
echo round($task->progress, 2) . '%';
break;
case 'deadline':
- if(substr($task->deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);
+ if(substr($task->deadline, 0, 4) > 0) echo '' . substr($task->deadline, 5, 6) . '';
break;
case 'openedBy':
echo zget($users, $task->openedBy);
diff --git a/module/user/css/task.css b/module/user/css/task.css
index f963fb9a73..fd9b0be634 100644
--- a/module/user/css/task.css
+++ b/module/user/css/task.css
@@ -1,2 +1,2 @@
-td.delayed {color: #fff; background: #e84e0f !important;}
.hours {white-space: nowrap; overflow: hidden; text-overflow: ellipsis; text-align: right;}
+td.deadline > span {padding-left: 4px;}
diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php
index bae1a1e8f8..35415f54f6 100644
--- a/module/user/view/task.html.php
+++ b/module/user/view/task.html.php
@@ -70,7 +70,7 @@
estimate . $lang->execution->workHourUnit;?> |
consumed . $lang->execution->workHourUnit;?> |
left . $lang->execution->workHourUnit;?> |
- delay)) echo 'delayed';?>>deadline, 0, 4) > 0) echo $task->deadline;?> |
+ deadline, 0, 4) > 0) echo '' . $task->deadline . '';?> |
processStatus('task', $task);?> |
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 1cd8c999fa..782a5db3f2 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -139,3 +139,4 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p
#projectForm .c-name,
#executionTableList .c-name,
#programTableList .c-name {padding-right: 64px;}
+td.delayed > span {display: block; height: 20px; line-height: 20px; background: #FFEBEB; color: #FB2B2B; border-radius: 20px;}