Display same task summary on all task view pages

5 files changed, 63 insertions, 50 deletions

diff --git a/app/Template/activity/task.php b/app/Template/activity/task.php
index 04c64c63..39953d1a 100644
--- a/app/Template/activity/task.php
+++ b/app/Template/activity/task.php
@@ -1,9 +1,12 @@
-<div class="task-show-title color-<?= $task['color_id'] ?>">
-    <h2><?= $this->text->e($task['title']) ?></h2>
-</div>
+<?= $this->render('task/details', array(
+    'task' => $task,
+    'tags' => $tags,
+    'project' => $project,
+    'editable' => false,
+)) ?>
 
 <div class="page-header">
     <h2><?= t('Activity stream') ?></h2>
 </div>
 
-<?= $this->render('event/events', array('events' => $events)) ?>
\ No newline at end of file
+<?= $this->render('event/events', array('events' => $events)) ?>
diff --git a/app/Template/task/analytics.php b/app/Template/task/analytics.php
index db2d0cef..ecfef242 100644
--- a/app/Template/task/analytics.php
+++ b/app/Template/task/analytics.php
@@ -1,6 +1,10 @@
-<div class="task-show-title color-<?= $task['color_id'] ?>">
-    <h2><?= $this->text->e($task['title']) ?></h2>
-</div>
+<?= $this->render('task/details', array(
+    'task' => $task,
+    'tags' => $tags,
+    'project' => $project,
+    'editable' => false,
+)) ?>
+
 <div class="page-header">
     <h2><?= t('Analytics') ?></h2>
 </div>
diff --git a/app/Template/task/show.php b/app/Template/task/show.php
index b18c2bca..a5c2d5a7 100644
--- a/app/Template/task/show.php
+++ b/app/Template/task/show.php
@@ -8,58 +8,58 @@
 )) ?>
 
 <?php if (!empty($task['description'])): ?>
-<?= $this->hook->render('template:task:show:before-description', array('task' => $task, 'project' => $project)) ?>
-<?= $this->render('task/description', array('task' => $task)) ?>
+    <?= $this->hook->render('template:task:show:before-description', array('task' => $task, 'project' => $project)) ?>
+    <?= $this->render('task/description', array('task' => $task)) ?>
 <?php endif ?>
 
 <?php if(!empty($subtasks)): ?>
-<?= $this->hook->render('template:task:show:before-subtasks', array('task' => $task, 'project' => $project)) ?>
-<?= $this->render('subtask/show', array(
-    'task' => $task,
-    'subtasks' => $subtasks,
-    'project' => $project,
-    'editable' => true,
-)) ?>
+    <?= $this->hook->render('template:task:show:before-subtasks', array('task' => $task, 'project' => $project)) ?>
+    <?= $this->render('subtask/show', array(
+        'task' => $task,
+        'subtasks' => $subtasks,
+        'project' => $project,
+        'editable' => true,
+    )) ?>
 <?php endif ?>
 
 <?php if (!empty($internal_links)): ?>
-<?= $this->hook->render('template:task:show:before-internal-links', array('task' => $task, 'project' => $project)) ?>
-<?= $this->render('task_internal_link/show', array(
-    'task' => $task,
-    'links' => $internal_links,
-    'project' => $project,
-    'link_label_list' => $link_label_list,
-    'editable' => true,
-    'is_public' => false,
-)) ?>
+    <?= $this->hook->render('template:task:show:before-internal-links', array('task' => $task, 'project' => $project)) ?>
+    <?= $this->render('task_internal_link/show', array(
+        'task' => $task,
+        'links' => $internal_links,
+        'project' => $project,
+        'link_label_list' => $link_label_list,
+        'editable' => true,
+        'is_public' => false,
+    )) ?>
 <?php endif ?>
 
 <?php if (!empty($external_links)): ?>
-<?= $this->hook->render('template:task:show:before-external-links', array('task' => $task, 'project' => $project)) ?>
-<?= $this->render('task_external_link/show', array(
-    'task' => $task,
-    'links' => $external_links,
-    'project' => $project,
-)) ?>
+    <?= $this->hook->render('template:task:show:before-external-links', array('task' => $task, 'project' => $project)) ?>
+    <?= $this->render('task_external_link/show', array(
+        'task' => $task,
+        'links' => $external_links,
+        'project' => $project,
+    )) ?>
 <?php endif ?>
 
 <?php if (!empty($files) || !empty($images)): ?>
-<?= $this->hook->render('template:task:show:before-attachments', array('task' => $task, 'project' => $project)) ?>
-<?= $this->render('task_file/show', array(
-    'task' => $task,
-    'files' => $files,
-    'images' => $images
-)) ?>
+    <?= $this->hook->render('template:task:show:before-attachments', array('task' => $task, 'project' => $project)) ?>
+    <?= $this->render('task_file/show', array(
+        'task' => $task,
+        'files' => $files,
+        'images' => $images
+    )) ?>
 <?php endif ?>
 
 <?php if (!empty($comments)): ?>
-<?= $this->hook->render('template:task:show:before-comments', array('task' => $task, 'project' => $project)) ?>
-<?= $this->render('comments/show', array(
-    'task' => $task,
-    'comments' => $comments,
-    'project' => $project,
-    'editable' => $this->user->hasProjectAccess('CommentController', 'edit', $project['id']),
-)) ?>
+    <?= $this->hook->render('template:task:show:before-comments', array('task' => $task, 'project' => $project)) ?>
+    <?= $this->render('comments/show', array(
+        'task' => $task,
+        'comments' => $comments,
+        'project' => $project,
+        'editable' => $this->user->hasProjectAccess('CommentController', 'edit', $project['id']),
+    )) ?>
 <?php endif ?>
 
 <?= $this->hook->render('template:task:show:bottom', array('task' => $task, 'project' => $project)) ?>
diff --git a/app/Template/task/time_tracking_details.php b/app/Template/task/time_tracking_details.php
index 1a179522..2b46ca6b 100644
--- a/app/Template/task/time_tracking_details.php
+++ b/app/Template/task/time_tracking_details.php
@@ -1,6 +1,9 @@
-<div class="task-show-title color-<?= $task['color_id'] ?>">
-    <h2><?= $this->text->e($task['title']) ?></h2>
-</div>
+<?= $this->render('task/details', array(
+    'task' => $task,
+    'tags' => $tags,
+    'project' => $project,
+    'editable' => false,
+)) ?>
 
 <?= $this->render('task/time_tracking_summary', array('task' => $task)) ?>
 
diff --git a/app/Template/task/transitions.php b/app/Template/task/transitions.php
index 9e04c4e1..6f5f02a6 100644
--- a/app/Template/task/transitions.php
+++ b/app/Template/task/transitions.php
@@ -1,6 +1,9 @@
-<div class="task-show-title color-<?= $task['color_id'] ?>">
-    <h2><?= $this->text->e($task['title']) ?></h2>
-</div>
+<?= $this->render('task/details', array(
+    'task' => $task,
+    'tags' => $tags,
+    'project' => $project,
+    'editable' => false,
+)) ?>
 
 <div class="page-header">
     <h2><?= t('Transitions') ?></h2>