diff options
Diffstat (limited to 'app/Template/task')
| -rw-r--r-- | app/Template/task/close.php | 4 | ||||
| -rw-r--r-- | app/Template/task/details.php | 1 | ||||
| -rw-r--r-- | app/Template/task/public.php | 7 | ||||
| -rw-r--r-- | app/Template/task/show.php | 3 | ||||
| -rw-r--r-- | app/Template/task/sidebar.php | 3 |
5 files changed, 15 insertions, 3 deletions
diff --git a/app/Template/task/close.php b/app/Template/task/close.php index 316d58eb..a0a95787 100644 --- a/app/Template/task/close.php +++ b/app/Template/task/close.php @@ -8,8 +8,8 @@ </p> <div class="form-actions"> - <?= $this->a(t('Yes'), 'task', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?> + <?= $this->a(t('Yes'), 'task', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes', 'redirect' => $redirect), true, 'btn btn-red') ?> <?= t('or') ?> - <?= $this->a(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + <?= $this->a(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </div>
\ No newline at end of file diff --git a/app/Template/task/details.php b/app/Template/task/details.php index 3205514c..76241acf 100644 --- a/app/Template/task/details.php +++ b/app/Template/task/details.php @@ -60,6 +60,7 @@ <?= t('Column on the board:') ?> <strong><?= $this->e($task['column_title']) ?></strong> (<?= $this->e($task['project_name']) ?>) + <?= dt('since %B %e, %Y at %k:%M %p', $task['date_moved']) ?> </li> <li><?= t('Task position:').' '.$this->e($task['position']) ?></li> <?php if ($task['category_name']): ?> diff --git a/app/Template/task/public.php b/app/Template/task/public.php index 2d95e6db..d7acef9f 100644 --- a/app/Template/task/public.php +++ b/app/Template/task/public.php @@ -10,6 +10,13 @@ 'is_public' => true )) ?> + <?= $this->render('tasklink/show', array( + 'task' => $task, + 'links' => $links, + 'project' => $project, + 'not_editable' => true + )) ?> + <?= $this->render('subtask/show', array( 'task' => $task, 'subtasks' => $subtasks, diff --git a/app/Template/task/show.php b/app/Template/task/show.php index b8243cc6..1ff2ef43 100644 --- a/app/Template/task/show.php +++ b/app/Template/task/show.php @@ -1,7 +1,8 @@ <?= $this->render('task/details', array('task' => $task, 'project' => $project)) ?> <?= $this->render('task/time', array('task' => $task, 'values' => $values, 'date_format' => $date_format, 'date_formats' => $date_formats)) ?> <?= $this->render('task/show_description', array('task' => $task)) ?> +<?= $this->render('tasklink/show', array('task' => $task, 'links' => $links)) ?> <?= $this->render('subtask/show', array('task' => $task, 'subtasks' => $subtasks)) ?> <?= $this->render('task/timesheet', array('task' => $task)) ?> <?= $this->render('file/show', array('task' => $task, 'files' => $files)) ?> -<?= $this->render('task/comments', array('task' => $task, 'comments' => $comments, 'project' => $project)) ?>
\ No newline at end of file +<?= $this->render('task/comments', array('task' => $task, 'comments' => $comments, 'project' => $project)) ?> diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php index e85a1671..f41be14d 100644 --- a/app/Template/task/sidebar.php +++ b/app/Template/task/sidebar.php @@ -19,6 +19,9 @@ <?= $this->a(t('Add a sub-task'), 'subtask', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </li> <li> + <?= $this->a(t('Add a link'), 'tasklink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + </li> + <li> <?= $this->a(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </li> <li> |