Move avatar to the top right corner

4 files changed, 30 insertions, 31 deletions

diff --git a/app/Template/board/task_avatar.php b/app/Template/board/task_avatar.php
new file mode 100644
index 00000000..5630c190
--- /dev/null
+++ b/app/Template/board/task_avatar.php
@@ -0,0 +1,19 @@
+<?php if (! empty($task['owner_id'])): ?>
+<div class="task-board-avatars">
+    <span
+        <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?>
+        class="task-board-assignee task-board-change-assignee"
+        data-url="<?= $this->url->href('BoardPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
+    <?php else: ?>
+        class="task-board-assignee">
+    <?php endif ?>
+        <?= $this->avatar->small(
+            $task['owner_id'],
+            $task['assignee_username'],
+            $task['assignee_name'],
+            $task['assignee_email'],
+            'avatar-inline'
+        ) ?>
+    </span>
+</div>
+<?php endif ?>
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index b20e4a3e..a8203739 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -1,23 +1,3 @@
-<?php if (! empty($task['owner_id'])): ?>
-    <div class="task-board-avatars">
-    <span
-        <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?>
-        class="task-board-assignee task-board-change-assignee"
-        data-url="<?= $this->url->href('BoardPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
-    <?php else: ?>
-        class="task-board-assignee">
-    <?php endif ?>
-        <?= $this->avatar->small(
-            $task['owner_id'],
-            $task['assignee_username'],
-            $task['assignee_name'],
-            $task['assignee_email'],
-            'avatar-inline'
-        ) ?>
-    </span>
-    </div>
-<?php endif ?>
-
 <?php if (! empty($task['category_id'])): ?>
 <div class="task-board-category-container">
     <span class="task-board-category">
diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php
index 42e59b72..19bcbcfa 100644
--- a/app/Template/board/task_private.php
+++ b/app/Template/board/task_private.php
@@ -44,18 +44,18 @@
             </span>
             <?php endif ?>
 
-            <?= $this->hook->render('template:board:private:task:before-title', array('task' => $task)) ?>
+            <?= $this->render('board/task_avatar', array('task' => $task)) ?>
 
-            <span class="task-board-title">
+            <?= $this->hook->render('template:board:private:task:before-title', array('task' => $task)) ?>
+            <div class="task-board-title">
                 <?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
-            </span>
-
+            </div>
             <?= $this->hook->render('template:board:private:task:after-title', array('task' => $task)) ?>
 
             <?= $this->render('board/task_footer', array(
-                    'task' => $task,
-                    'not_editable' => $not_editable,
-                    'project' => $project,
+                'task' => $task,
+                'not_editable' => $not_editable,
+                'project' => $project,
             )) ?>
         </div>
     <?php endif ?>
diff --git a/app/Template/board/task_public.php b/app/Template/board/task_public.php
index 15834fa8..a53d42c8 100644
--- a/app/Template/board/task_public.php
+++ b/app/Template/board/task_public.php
@@ -8,12 +8,12 @@
     </span>
     <?php endif ?>
 
-    <?= $this->hook->render('template:board:public:task:before-title', array('task' => $task)) ?>
+    <?= $this->render('board/task_avatar', array('task' => $task)) ?>
 
-    <span class="task-board-title">
+    <?= $this->hook->render('template:board:public:task:before-title', array('task' => $task)) ?>
+    <div class="task-board-title">
         <?= $this->url->link($this->text->e($task['title']), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?>
-    </span>
-
+    </div>
     <?= $this->hook->render('template:board:public:task:after-title', array('task' => $task)) ?>
 
     <?= $this->render('board/task_footer', array(