diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | app/Template/task/details.php | 4 | ||||
| -rw-r--r-- | app/Template/task/dropdown.php | 2 | ||||
| -rw-r--r-- | app/Template/task/layout.php | 3 | ||||
| -rw-r--r-- | app/Template/task/show.php | 2 | ||||
| -rw-r--r-- | app/Template/task_creation/form.php | 4 | ||||
| -rw-r--r-- | app/Template/task_modification/edit_task.php | 6 | ||||
| -rw-r--r-- | doc/plugin-hooks.markdown | 5 |
8 files changed, 20 insertions, 7 deletions
@@ -10,6 +10,7 @@ New features: Improvements: +* Added more template hooks * Added tasks search with the API * Added priority field to API procedures * Added API procedure "getMemberGroups" diff --git a/app/Template/task/details.php b/app/Template/task/details.php index 141c4a0b..5b8b7c6d 100644 --- a/app/Template/task/details.php +++ b/app/Template/task/details.php @@ -1,6 +1,8 @@ <section id="task-summary"> <h2><?= $this->text->e($task['title']) ?></h2> + <?= $this->hook->render('template:task:details:top', array('task' => $task)) ?> + <div class="task-summary-container color-<?= $task['color_id'] ?>"> <div class="task-summary-column"> <ul class="no-bullet"> @@ -149,4 +151,6 @@ <?= $this->url->button('fa-play', t('Set start date'), 'taskmodification', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </div> <?php endif ?> + + <?= $this->hook->render('template:task:details:bottom', array('task' => $task)) ?> </section> diff --git a/app/Template/task/dropdown.php b/app/Template/task/dropdown.php index f98f5172..6fea3728 100644 --- a/app/Template/task/dropdown.php +++ b/app/Template/task/dropdown.php @@ -55,6 +55,6 @@ </li> <?php endif ?> - <?= $this->hook->render('template:task:dropdown') ?> + <?= $this->hook->render('template:task:dropdown', array('task' => $task)) ?> </ul> </div> diff --git a/app/Template/task/layout.php b/app/Template/task/layout.php index 52db5d1b..ba2cd8d5 100644 --- a/app/Template/task/layout.php +++ b/app/Template/task/layout.php @@ -1,5 +1,6 @@ <section id="main"> <?= $this->projectHeader->render($project, 'Listing', 'show') ?> + <?= $this->hook->render('template:task:layout:top', array('task' => $task)) ?> <section class="sidebar-container" id="task-view" data-edit-url="<?= $this->url->href('taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" @@ -14,4 +15,4 @@ <?= $content_for_sublayout ?> </div> </section> -</section>
\ No newline at end of file +</section> diff --git a/app/Template/task/show.php b/app/Template/task/show.php index 86422941..8f41d653 100644 --- a/app/Template/task/show.php +++ b/app/Template/task/show.php @@ -34,7 +34,7 @@ 'project' => $project, )) ?> -<?= $this->hook->render('template:task:show:before-attachements', array('task' => $task, 'project' => $project)) ?> +<?= $this->hook->render('template:task:show:before-attachments', array('task' => $task, 'project' => $project)) ?> <?= $this->render('task_file/show', array( 'task' => $task, 'files' => $files, diff --git a/app/Template/task_creation/form.php b/app/Template/task_creation/form.php index 9bfd839f..c963bdcf 100644 --- a/app/Template/task_creation/form.php +++ b/app/Template/task_creation/form.php @@ -29,7 +29,7 @@ <?= $this->form->checkbox('another_task', t('Create another task'), 1, isset($values['another_task']) && $values['another_task'] == 1) ?> <?php endif ?> - <?= $this->hook->render('template:task:form:left-column', array('values'=>$values, 'errors'=>$errors)) ?> + <?= $this->hook->render('template:task:form:left-column', array('values' => $values, 'errors' => $errors)) ?> </div> <div class="form-column"> @@ -43,7 +43,7 @@ <?= $this->task->selectTimeEstimated($values, $errors) ?> <?= $this->task->selectDueDate($values, $errors) ?> - <?= $this->hook->render('template:task:form:right-column', array('values'=>$values, 'errors'=>$errors)) ?> + <?= $this->hook->render('template:task:form:right-column', array('values' => $values, 'errors' => $errors)) ?> </div> <div class="form-actions"> diff --git a/app/Template/task_modification/edit_task.php b/app/Template/task_modification/edit_task.php index b5891c15..5ddec5ea 100644 --- a/app/Template/task_modification/edit_task.php +++ b/app/Template/task_modification/edit_task.php @@ -14,6 +14,8 @@ <?= $this->task->selectCategory($categories_list, $values, $errors) ?> <?= $this->task->selectPriority($project, $values) ?> <?= $this->task->selectScore($values, $errors) ?> + + <?= $this->hook->render('template:task:form:left-column', array('values' => $values, 'errors' => $errors)) ?> </div> <div class="form-column"> @@ -21,6 +23,8 @@ <?= $this->task->selectTimeSpent($values, $errors) ?> <?= $this->task->selectStartDate($values, $errors) ?> <?= $this->task->selectDueDate($values, $errors) ?> + + <?= $this->hook->render('template:task:form:right-column', array('values' => $values, 'errors' => $errors)) ?> </div> <div class="form-clear"> @@ -32,4 +36,4 @@ <?= t('or') ?> <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> -</form>
\ No newline at end of file +</form> diff --git a/doc/plugin-hooks.markdown b/doc/plugin-hooks.markdown index 2237e354..f6760f96 100644 --- a/doc/plugin-hooks.markdown +++ b/doc/plugin-hooks.markdown @@ -169,6 +169,9 @@ List of template hooks: | `template:project:integrations` | Integration page in projects settings | | `template:project:sidebar` | Sidebar in project settings | | `template:project-user:sidebar` | Sidebar on project user overview page | +| `template:task:layout:top` | Task layout top (after page header) | +| `template:task:details:top` | Task summary top | +| `template:task:details:bottom` | Task summary bottom | | `template:task:details:first-column` | Task summary first column | | `template:task:details:second-column` | Task summary second column | | `template:task:details:third-column` | Task summary third column | @@ -184,7 +187,7 @@ List of template hooks: | `template:task:show:before-tasklinks` | Show task page: before tasklinks | | `template:task:show:before-subtasks` | Show task page: before subtasks | | `template:task:show:before-timetracking` | Show task page: before timetracking | -| `template:task:show:before-attachements` | Show task page: before attachments | +| `template:task:show:before-attachments` | Show task page: before attachments | | `template:task:show:before-comments` | Show task page: before comments | | `template:user:authentication:form` | "Edit authentication" form in user profile | | `template:user:create-remote:form` | "Create remote user" form | |