1 files changed, 26 insertions, 41 deletions
diff --git a/app/Template/dashboard/tasks.php b/app/Template/dashboard/tasks.php
index 427b903d..23aef990 100644
--- a/app/Template/dashboard/tasks.php
+++ b/app/Template/dashboard/tasks.php
@@ -4,50 +4,35 @@
 <?php if ($paginator->isEmpty()): ?>
     <p class="alert"><?= t('There is nothing assigned to you.') ?></p>
 <?php else: ?>
-    <table class="table-striped table-small table-scrolling">
-        <tr>
-            <th class="column-5"><?= $paginator->order('Id', \Kanboard\Model\TaskModel::TABLE.'.id') ?></th>
-            <th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></th>
-            <th><?= $paginator->order(t('Task'), \Kanboard\Model\TaskModel::TABLE.'.title') ?></th>
-            <th class="column-8"><?= $paginator->order(t('Priority'), \Kanboard\Model\TaskModel::TABLE.'.priority') ?></th>
-            <th class="column-20"><?= t('Time tracking') ?></th>
-            <th class="column-10"><?= $paginator->order(t('Due date'), \Kanboard\Model\TaskModel::TABLE.'.date_due') ?></th>
-            <th class="column-10"><?= $paginator->order(t('Column'), 'column_title') ?></th>
-        </tr>
+    <div class="table-list">
+        <?= $this->render('task_list/header', array(
+            'paginator' => $paginator,
+        )) ?>
+
         <?php foreach ($paginator->getCollection() as $task): ?>
-        <tr>
-            <td class="task-table color-<?= $task['color_id'] ?>">
-                <?= $this->render('task/dropdown', array('task' => $task)) ?>
-            </td>
-            <td>
-                <?= $this->url->link($this->text->e($task['project_name']), 'BoardViewController', 'show', array('project_id' => $task['project_id'])) ?>
-            </td>
-            <td>
-                <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
-            </td>
-            <td>
-                <?php if ($task['priority'] >= 0): ?>
-                    P<?= $this->text->e($task['priority'])?>
-                <?php endif?>
-            </td>
-            <td>
-                <?php if (! empty($task['time_spent'])): ?>
-                    <strong><?= $this->text->e($task['time_spent']).'h' ?></strong> <?= t('spent') ?>
-                <?php endif ?>
+            <div class="table-list-row color-<?= $task['color_id'] ?>">
+                <?= $this->render('task_list/task_title', array(
+                    'task' => $task,
+                )) ?>
+
+                <?= $this->render('task_list/task_details', array(
+                    'task' => $task,
+                )) ?>
+
+                <?= $this->render('task_list/task_avatars', array(
+                    'task' => $task,
+                )) ?>
+
+                <?= $this->render('task_list/task_icons', array(
+                    'task' => $task,
+                )) ?>
 
-                <?php if (! empty($task['time_estimated'])): ?>
-                    <strong><?= $this->text->e($task['time_estimated']).'h' ?></strong> <?= t('estimated') ?>
-                <?php endif ?>
-            </td>
-            <td>
-                <?= $this->dt->date($task['date_due']) ?>
-            </td>
-            <td>
-                <?= $this->text->e($task['column_title']) ?>
-            </td>
-        </tr>
+                <?= $this->render('task_list/task_subtasks', array(
+                    'task' => $task,
+                )) ?>
+            </div>
         <?php endforeach ?>
-    </table>
+    </div>
 
     <?= $paginator ?>
 <?php endif ?>