3 files changed, 6 insertions, 62 deletions
diff --git a/app/Template/task/layout.php b/app/Template/task/layout.php
index 5a14fb39..ddce4bce 100644
--- a/app/Template/task/layout.php
+++ b/app/Template/task/layout.php
@@ -2,19 +2,19 @@
     <div class="page-header">
         <ul>
             <li>
-                <i class="fa fa-table fa-fw"></i>
+                <i class="fa fa-th fa-fw"></i>
                 <?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $task['project_id']), false, '', '', false, 'swimlane-'.$task['swimlane_id']) ?>
             </li>
+            <li>
+                <i class="fa fa-calendar fa-fw"></i>
+                <?= $this->url->link(t('Back to the calendar'), 'calendar', 'show', array('project_id' => $task['project_id'])) ?>
+            </li>
             <?php if ($this->user->isManager($task['project_id'])): ?>
             <li>
                 <i class="fa fa-cog fa-fw"></i>
                 <?= $this->url->link(t('Project settings'), 'project', 'show', array('project_id' => $task['project_id'])) ?>
             </li>
             <?php endif ?>
-            <li>
-                <i class="fa fa-calendar fa-fw"></i>
-                <?= $this->url->link(t('Project calendar'), 'calendar', 'show', array('project_id' => $task['project_id'])) ?>
-            </li>
         </ul>
     </div>
     <section class="sidebar-container" id="task-section">
diff --git a/app/Template/task/new.php b/app/Template/task/new.php
index 181b82bf..8fcdacdf 100644
--- a/app/Template/task/new.php
+++ b/app/Template/task/new.php
@@ -1,7 +1,7 @@
 <?php if (! $ajax): ?>
 <div class="page-header">
     <ul>
-        <li><i class="fa fa-table fa-fw"></i><?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $values['project_id'])) ?></li>
+        <li><i class="fa fa-th fa-fw"></i><?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $values['project_id'])) ?></li>
     </ul>
 </div>
 <?php else: ?>
diff --git a/app/Template/task/table.php b/app/Template/task/table.php
deleted file mode 100644
index d06bc7b7..00000000
--- a/app/Template/task/table.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<table class="table-fixed table-small">
-    <tr>
-        <th class="column-8"><?= $paginator->order(t('Id'), 'tasks.id') ?></th>
-        <th class="column-8"><?= $paginator->order(t('Column'), 'tasks.column_id') ?></th>
-        <th class="column-8"><?= $paginator->order(t('Category'), 'tasks.category_id') ?></th>
-        <th><?= $paginator->order(t('Title'), 'tasks.title') ?></th>
-        <th class="column-10"><?= $paginator->order(t('Assignee'), 'users.username') ?></th>
-        <th class="column-10"><?= $paginator->order(t('Due date'), 'tasks.date_due') ?></th>
-        <th class="column-10"><?= $paginator->order(t('Date created'), 'tasks.date_creation') ?></th>
-        <th class="column-10"><?= $paginator->order(t('Date completed'), 'tasks.date_completed') ?></th>
-        <th class="column-5"><?= $paginator->order(t('Status'), 'tasks.is_active') ?></th>
-    </tr>
-    <?php foreach ($paginator->getCollection() as $task): ?>
-    <tr>
-        <td class="task-table color-<?= $task['color_id'] ?>">
-            <?= $this->url->link('#'.$this->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
-        </td>
-        <td>
-            <?= $this->text->in($task['column_id'], $columns) ?>
-        </td>
-        <td>
-            <?= $this->text->in($task['category_id'], $categories, '') ?>
-        </td>
-        <td>
-            <?= $this->url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
-        </td>
-        <td>
-            <?php if ($task['assignee_username']): ?>
-                <?= $this->e($task['assignee_name'] ?: $task['assignee_username']) ?>
-            <?php else: ?>
-                <?= t('Unassigned') ?>
-            <?php endif ?>
-        </td>
-        <td>
-            <?= dt('%B %e, %Y', $task['date_due']) ?>
-        </td>
-        <td>
-            <?= dt('%B %e, %Y', $task['date_creation']) ?>
-        </td>
-        <td>
-            <?php if ($task['date_completed']): ?>
-                <?= dt('%B %e, %Y', $task['date_completed']) ?>
-            <?php endif ?>
-        </td>
-        <td>
-            <?php if ($task['is_active'] == \Model\Task::STATUS_OPEN): ?>
-                <?= t('Open') ?>
-            <?php else: ?>
-                <?= t('Closed') ?>
-            <?php endif ?>
-        </td>
-    </tr>
-    <?php endforeach ?>
-</table>
-
-<?= $paginator ?>