diff --git a/module/my/css/task.css b/module/my/css/task.css index 55c85389c0..bb99a08527 100644 --- a/module/my/css/task.css +++ b/module/my/css/task.css @@ -36,3 +36,4 @@ html[lang="en"] .c-user-short {width: 88px;} [lang^=fr] #taskTable .assigned-title {width: 130px !important;} [lang^=fr] #taskTable .c-user-short {width: 75px;} [lang^=fr] #taskTable .c-status {width: 71px;} +#myTaskForm table tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;} diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index 69b47b7bfc..289ab3f422 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -44,8 +44,15 @@
- - +
@@ -151,11 +158,18 @@ } else { - $attr = isset($kanbanList[$task->execution]) ? "disabled" : ''; + $attr = isset($kanbanList[$task->execution]) ? "disabled" : ''; + $canStart = ($task->status != 'pause' and common::hasPriv('task', 'start')); + $canRestart = ($task->status == 'pause' and common::hasPriv('task', 'restart')); if($task->status != 'pause') common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); if($task->status == 'pause') common::printIcon('task', 'restart', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); - common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); + common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); + + if(($canStart or $canRestart or $canFinish or $canClose) and ($canRecordEstimate or $canEdit or $canBatchCreate)) + { + echo "
"; + } common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true); common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, "data-width='95%'"); @@ -221,10 +235,17 @@ } else { + $canStart = ($child->status != 'pause' and common::hasPriv('task', 'start')); + $canRestart = ($child->status == 'pause' and common::hasPriv('task', 'restart')); if($child->status != 'pause') common::printIcon('task', 'start', "taskID=$child->id", $child, 'list', '', '', 'iframe', true); if($child->status == 'pause') common::printIcon('task', 'restart', "taskID=$child->id", $child, 'list', '', '', 'iframe', true); - common::printIcon('task', 'close', "taskID=$child->id", $child, 'list', '', '', 'iframe', true); common::printIcon('task', 'finish', "taskID=$child->id", $child, 'list', '', '', 'iframe', true); + common::printIcon('task', 'close', "taskID=$child->id", $child, 'list', '', '', 'iframe', true); + + if(($canStart or $canRestart or $canFinish or $canClose) and ($canRecordEstimate or $canEdit or $canBatchCreate)) + { + echo "
"; + } common::printIcon('task', 'recordEstimate', "taskID=$child->id", $child, 'list', 'time', '', 'iframe', true); common::printIcon('task', 'edit', "taskID=$child->id", $child, 'list', '', '', 'iframe', true, "data-width='95%'");