Merge pull request #2 from fguillot/master

merge

5 files changed, 20 insertions, 5 deletions

diff --git a/app/Template/task/details.php b/app/Template/task/details.php
index 6093c157..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">
@@ -40,6 +42,8 @@
                 </li>
                 <?php endif ?>
                 <li class="smaller">
+
+                <?= $this->hook->render('template:task:details:first-column', array('task' => $task)) ?>
             </ul>
         </div>
         <div class="task-summary-column">
@@ -64,6 +68,8 @@
                     <strong><?= t('Position:') ?></strong>
                     <span><?= $task['position'] ?></span>
                 </li>
+
+                <?= $this->hook->render('template:task:details:second-column', array('task' => $task)) ?>
             </ul>
         </div>
         <div class="task-summary-column">
@@ -102,6 +108,8 @@
                     <span><?= t('%s hours', $task['time_spent']) ?></span>
                 </li>
                 <?php endif ?>
+
+                <?= $this->hook->render('template:task:details:third-column', array('task' => $task)) ?>
             </ul>
         </div>
         <div class="task-summary-column">
@@ -132,6 +140,8 @@
                     <span><?= $this->dt->datetime($task['date_moved']) ?></span>
                 </li>
                 <?php endif ?>
+
+                <?= $this->hook->render('template:task:details:fourth-column', array('task' => $task)) ?>
             </ul>
         </div>
     </div>
@@ -141,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/sidebar.php b/app/Template/task/sidebar.php
index 773b28dc..a2d73b8c 100644
--- a/app/Template/task/sidebar.php
+++ b/app/Template/task/sidebar.php
@@ -23,6 +23,8 @@
             <?= $this->url->link(t('Time tracking'), 'task', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
         <?php endif ?>
+
+        <?= $this->hook->render('template:task:sidebar:information', array('task' => $task)) ?>
     </ul>
 
     <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?>
@@ -91,8 +93,8 @@
                 <?= $this->url->link(t('Remove'), 'task', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
             </li>
         <?php endif ?>
+
+        <?= $this->hook->render('template:task:sidebar:actions', array('task' => $task)) ?>
     </ul>
     <?php endif ?>
-
-    <?= $this->hook->render('template:task:sidebar', array('task' => $task)) ?>
 </div>