diff options
| author | Frederic Guillot <fred@kanboard.net> | 2017-02-26 19:30:02 -0500 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2017-02-26 19:30:02 -0500 |
| commit | f3deb6492a74f1ffa9e3391274e0ab7947a04016 (patch) | |
| tree | cbf7a3563cf1543bd131dd114f8dc89afdf5328f /app/Template/task_list | |
| parent | 4f325193be4f16a9658258fecd525e71917156a0 (diff) | |
Add toggle button to show/hide subtasks in task list view
Diffstat (limited to 'app/Template/task_list')
| -rw-r--r-- | app/Template/task_list/header.php | 6 | ||||
| -rw-r--r-- | app/Template/task_list/listing.php | 13 | ||||
| -rw-r--r-- | app/Template/task_list/task_subtasks.php | 22 |
3 files changed, 38 insertions, 3 deletions
diff --git a/app/Template/task_list/header.php b/app/Template/task_list/header.php index fb05dbdc..6501a919 100644 --- a/app/Template/task_list/header.php +++ b/app/Template/task_list/header.php @@ -7,6 +7,12 @@ <?php endif ?> </div> <div class="table-list-header-menu"> + <?php if ($this->user->hasSubtaskListActivated()): ?> + <?= $this->url->icon('tasks', t('Hide subtasks'), 'TaskListController', 'show', array('project_id' => $project['id'], 'hide_subtasks' => 1)) ?> + <?php else: ?> + <?= $this->url->icon('tasks', t('Show subtasks'), 'TaskListController', 'show', array('project_id' => $project['id'], 'show_subtasks' => 1)) ?> + <?php endif ?> + <?= $this->render('task_list/sort_menu', array('paginator' => $paginator)) ?> </div> </div>
\ No newline at end of file diff --git a/app/Template/task_list/listing.php b/app/Template/task_list/listing.php index 171c148d..b3c66aa6 100644 --- a/app/Template/task_list/listing.php +++ b/app/Template/task_list/listing.php @@ -5,7 +5,11 @@ <p class="alert"><?= t('No tasks found.') ?></p> <?php elseif (! $paginator->isEmpty()): ?> <div class="table-list"> - <?= $this->render('task_list/header', array('paginator' => $paginator)) ?> + <?= $this->render('task_list/header', array( + 'paginator' => $paginator, + 'project' => $project, + )) ?> + <?php foreach ($paginator->getCollection() as $task): ?> <div class="table-list-row color-<?= $task['color_id'] ?>"> <?= $this->render('task_list/task_title', array( @@ -21,8 +25,11 @@ )) ?> <?= $this->render('task_list/task_icons', array( - 'project' => $project, - 'task' => $task, + 'task' => $task, + )) ?> + + <?= $this->render('task_list/task_subtasks', array( + 'task' => $task, )) ?> </div> <?php endforeach ?> diff --git a/app/Template/task_list/task_subtasks.php b/app/Template/task_list/task_subtasks.php new file mode 100644 index 00000000..716d6df2 --- /dev/null +++ b/app/Template/task_list/task_subtasks.php @@ -0,0 +1,22 @@ +<?php if (! empty($task['subtasks'])): ?> +<div class="task-list-subtasks"> + <?php foreach ($task['subtasks'] as $subtask): ?> + <div class="task-list-subtask"> + <span class="subtask-cell column-50"> + <?= $this->subtask->renderToggleStatus($task, $subtask) ?> + </span> + <span class="subtask-cell column-20 subtask-assignee"> + <?php if (! empty($subtask['username'])): ?> + <?= $this->text->e($subtask['name'] ?: $subtask['username']) ?> + <?php endif ?> + </span> + <span class="subtask-cell subtask-time-tracking-cell"> + <?= $this->render('subtask/timer', array( + 'task' => $task, + 'subtask' => $subtask, + )) ?> + </span> + </div> + <?php endforeach ?> +</div> +<?php endif ?> |