diff --git a/module/execution/css/task.css b/module/execution/css/task.css index fa4b909f0c..2b5c374680 100644 --- a/module/execution/css/task.css +++ b/module/execution/css/task.css @@ -1,7 +1,6 @@ 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;} -th.c-deadline {text-align: center;} .table td.c-estimate, .table td.c-consumed, .table td.c-left {padding-right: 12px;} .c-estimate {text-align: right;} .c-consumed {text-align: right;} @@ -10,5 +9,4 @@ th.c-deadline {text-align: center;} .btn-toolbar > .btn {margin-right: 5px !important;} #taskList .c-progress{padding-right: 8px; text-align: right;} #datatable-taskList .c-progress{padding-right: 8px; text-align: right;} -.c-finishedBy {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} -.c-deadline {text-align: left !important;} +.c-finishedBy, .c-lastEditedBy {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} diff --git a/module/task/model.php b/module/task/model.php index a075a9394e..bb53e7e25d 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -3408,7 +3408,7 @@ class taskModel extends model if($id == 'status') $class .= ' task-' . $task->status; if($id == 'id') $class .= ' cell-id'; if($id == 'name') $class .= ' text-left'; - if($id == 'deadline') $class .= ' text-center'; + if($id == 'deadline') $class .= ' text-left'; if($id == 'deadline' and isset($task->delay)) $class .= ' delayed'; if($id == 'assignedTo') $class .= ' has-btn text-left'; if($id == 'lane') $class .= ' text-left'; @@ -3427,11 +3427,9 @@ class taskModel extends model $title = " title='{$value} {$this->lang->execution->workHour}'"; } if($id == 'lane') $title = " title='{$task->lane}'"; - if($id == 'finishedBy') - { - $name = zget($users, $task->finishedBy); - $title = " title='$name'"; - } + if($id == 'finishedBy') $title = " title='" . zget($users, $task->finishedBy) . "'"; + if($id == 'openedBy') $title = " title='" . zget($users, $task->openedBy) . "'"; + if($id == 'lastEditedBy') $title = " title='" . zget($users, $task->lastEditedBy) . "'"; echo "