diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | app/Template/app/subtasks.php | 4 | ||||
| -rw-r--r-- | app/Template/app/tasks.php | 4 | ||||
| -rw-r--r-- | app/Template/board/table_column.php | 2 | ||||
| -rw-r--r-- | app/Template/listing/show.php | 4 | ||||
| -rw-r--r-- | app/Template/task/menu.php | 2 |
6 files changed, 9 insertions, 8 deletions
@@ -19,6 +19,7 @@ New features: * Add automatic actions to close tasks with no activity * Add automatic actions to send an email when there is no activity on a task * Regroup all daily background tasks in one command: "cronjob" +* Add task dropdown menu on listing pages Improvements: diff --git a/app/Template/app/subtasks.php b/app/Template/app/subtasks.php index f72f21fb..6848112c 100644 --- a/app/Template/app/subtasks.php +++ b/app/Template/app/subtasks.php @@ -6,7 +6,7 @@ <?php else: ?> <table class="table-fixed table-small"> <tr> - <th class="column-10"><?= $paginator->order('Id', 'tasks.id') ?></th> + <th class="column-5"><?= $paginator->order('Id', 'tasks.id') ?></th> <th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></th> <th><?= $paginator->order(t('Task'), 'task_name') ?></th> <th><?= $paginator->order(t('Subtask'), 'title') ?></th> @@ -15,7 +15,7 @@ <?php foreach ($paginator->getCollection() as $subtask): ?> <tr> <td class="task-table color-<?= $subtask['color_id'] ?>"> - <?= $this->url->link('#'.$subtask['task_id'], 'task', 'show', array('task_id' => $subtask['task_id'], 'project_id' => $subtask['project_id'])) ?> + <?= $this->render('task/dropdown', array('task' => array('id' => $subtask['task_id'], 'project_id' => $subtask['project_id']))) ?> </td> <td> <?= $this->url->link($this->e($subtask['project_name']), 'board', 'show', array('project_id' => $subtask['project_id'])) ?> diff --git a/app/Template/app/tasks.php b/app/Template/app/tasks.php index 1213e405..f4f9b2ad 100644 --- a/app/Template/app/tasks.php +++ b/app/Template/app/tasks.php @@ -6,7 +6,7 @@ <?php else: ?> <table class="table-fixed table-small"> <tr> - <th class="column-8"><?= $paginator->order('Id', 'tasks.id') ?></th> + <th class="column-5"><?= $paginator->order('Id', 'tasks.id') ?></th> <th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></th> <th><?= $paginator->order(t('Task'), 'title') ?></th> <th class="column-20"><?= t('Time tracking') ?></th> @@ -15,7 +15,7 @@ <?php foreach ($paginator->getCollection() as $task): ?> <tr> <td class="task-table color-<?= $task['color_id'] ?>"> - <?= $this->url->link('#'.$task['id'], 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + <?= $this->render('task/dropdown', array('task' => $task)) ?> </td> <td> <?= $this->url->link($this->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?> diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php index 8c97f7d5..58dcaf32 100644 --- a/app/Template/board/table_column.php +++ b/app/Template/board/table_column.php @@ -48,7 +48,7 @@ <?php if (! $not_editable && ! empty($column['description'])): ?> <span class="tooltip pull-right" title='<?= $this->e($this->text->markdown($column['description'])) ?>'> - <i class="fa fa-info-circle"></i> + <i class="fa fa-info-circle"></i> </span> <?php endif ?> diff --git a/app/Template/listing/show.php b/app/Template/listing/show.php index aa17b228..c24110f4 100644 --- a/app/Template/listing/show.php +++ b/app/Template/listing/show.php @@ -4,7 +4,7 @@ 'filters' => $filters, )) ?> - <?php if (! empty($values['search']) && $paginator->isEmpty()): ?> + <?php if ($paginator->isEmpty()): ?> <p class="alert"><?= t('No tasks found.') ?></p> <?php elseif (! $paginator->isEmpty()): ?> <table class="table-fixed table-small"> @@ -21,7 +21,7 @@ <?php foreach ($paginator->getCollection() as $task): ?> <tr> <td class="task-table color-<?= $task['color_id'] ?>"> - <?= $this->url->link('#'.$this->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + <?= $this->render('task/dropdown', array('task' => $task)) ?> </td> <td> <?= $this->e($task['swimlane_name'] ?: $task['default_swimlane']) ?> diff --git a/app/Template/task/menu.php b/app/Template/task/menu.php index 20fca22b..85760430 100644 --- a/app/Template/task/menu.php +++ b/app/Template/task/menu.php @@ -72,7 +72,7 @@ </li> <?php endif ?> - <?= $this->hook->render('template:task:menu:actions') ?> + <?= $this->hook->render('template:task:menu') ?> </ul> </div> <?php endif ?> |