diff options
| author | Frederic Guillot <fred@kanboard.net> | 2015-02-09 21:49:53 -0500 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2015-02-09 21:49:53 -0500 |
| commit | 1de845e6c3e4a3c71ff78322f42ef50ab91c952f (patch) | |
| tree | d828f20b6fb215ca35e6330c64b1bbb865d230af | |
| parent | 755b38f09e9f6494129f55b96baff6672981a073 (diff) | |
Display subtask icon status and title everywhere
| -rw-r--r-- | app/Core/Helper.php | 4 | ||||
| -rw-r--r-- | app/Template/app/subtasks.php | 4 | ||||
| -rw-r--r-- | app/Template/subtask/show.php | 2 | ||||
| -rw-r--r-- | assets/css/app.css | 2 | ||||
| -rw-r--r-- | assets/css/src/task.css | 2 |
5 files changed, 4 insertions, 10 deletions
diff --git a/app/Core/Helper.php b/app/Core/Helper.php index 9bbaea57..d60e29d4 100644 --- a/app/Core/Helper.php +++ b/app/Core/Helper.php @@ -634,7 +634,7 @@ class Helper if ($subtask['status'] == 0 && isset($this->session['has_subtask_inprogress']) && $this->session['has_subtask_inprogress'] === true) { return $this->a( - trim($this->render('subtask/icons', array('subtask' => $subtask))) . $this->e($subtask['status_name']), + trim($this->render('subtask/icons', array('subtask' => $subtask))) . $this->e($subtask['title']), 'subtask', 'subtaskRestriction', array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'redirect' => $redirect), @@ -644,7 +644,7 @@ class Helper } return $this->a( - trim($this->render('subtask/icons', array('subtask' => $subtask))) . $this->e($subtask['status_name']), + trim($this->render('subtask/icons', array('subtask' => $subtask))) . $this->e($subtask['title']), 'subtask', 'toggleStatus', array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'redirect' => $redirect) diff --git a/app/Template/app/subtasks.php b/app/Template/app/subtasks.php index 1ed57a22..fdfbdf2f 100644 --- a/app/Template/app/subtasks.php +++ b/app/Template/app/subtasks.php @@ -6,7 +6,6 @@ <tr> <th class="column-10"><?= $paginator->order('Id', 'tasks.id') ?></th> <th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></th> - <th class="column-15"><?= $paginator->order(t('Status'), 'status') ?></th> <th><?= $paginator->order(t('Subtask'), 'title') ?></th> <th class="column-20"><?= t('Time tracking') ?></th> </tr> @@ -22,9 +21,6 @@ <?= $this->toggleSubtaskStatus($subtask, 'dashboard') ?> </td> <td> - <?= $this->a($this->e($subtask['title']), 'task', 'show', array('task_id' => $subtask['task_id'], 'project_id' => $subtask['project_id'])) ?> - </td> - <td> <?php if (! empty($subtask['time_spent'])): ?> <strong><?= $this->e($subtask['time_spent']).'h' ?></strong> <?= t('spent') ?> <?php endif ?> diff --git a/app/Template/subtask/show.php b/app/Template/subtask/show.php index 6d4533d2..1d55d1ee 100644 --- a/app/Template/subtask/show.php +++ b/app/Template/subtask/show.php @@ -8,7 +8,6 @@ <table class="subtasks-table"> <tr> <th class="column-40"><?= t('Title') ?></th> - <th class="column-15"><?= t('Status') ?></th> <th><?= t('Assignee') ?></th> <th><?= t('Time tracking') ?></th> <?php if (! isset($not_editable)): ?> @@ -17,7 +16,6 @@ </tr> <?php foreach ($subtasks as $subtask): ?> <tr> - <td><?= $this->e($subtask['title']) ?></td> <td> <?php if (! isset($not_editable)): ?> <?= $this->toggleSubtaskStatus($subtask, 'task') ?> diff --git a/assets/css/app.css b/assets/css/app.css index 844d1641..950d5746 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -1499,7 +1499,7 @@ a.task-board-nobody { } .task-board-footer { - height: 20px; + height: 25px; } .task-board-date { diff --git a/assets/css/src/task.css b/assets/css/src/task.css index d5b004ee..1a477370 100644 --- a/assets/css/src/task.css +++ b/assets/css/src/task.css @@ -73,7 +73,7 @@ a.task-board-nobody { } .task-board-footer { - height: 20px; + height: 25px; } .task-board-date { |