Rename task view controller

56 files changed, 94 insertions, 94 deletions

diff --git a/app/Template/analytic/compare_hours.php b/app/Template/analytic/compare_hours.php
index 8249e7ba..03a2981a 100644
--- a/app/Template/analytic/compare_hours.php
+++ b/app/Template/analytic/compare_hours.php
@@ -34,10 +34,10 @@
             <?php foreach ($paginator->getCollection() as $task): ?>
             <tr>
                 <td class="task-table color-<?= $task['color_id'] ?>">
-                    <?= $this->url->link('#'.$this->text->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+                    <?= $this->url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
                 </td>
                 <td>
-                    <?= $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')) ?>
+                    <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
                 </td>
                 <td>
                     <?php if ($task['is_active'] == \Kanboard\Model\Task::STATUS_OPEN): ?>
diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php
index 03ed3950..e852c33c 100644
--- a/app/Template/board/task_private.php
+++ b/app/Template/board/task_private.php
@@ -9,7 +9,7 @@
      data-owner-id="<?= $task['owner_id'] ?>"
      data-category-id="<?= $task['category_id'] ?>"
      data-due-date="<?= $task['date_due'] ?>"
-     data-task-url="<?= $this->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
+     data-task-url="<?= $this->url->href('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
 
     <div class="task-board-sort-handle" style="display: none;"><i class="fa fa-arrows-alt"></i></div>
 
@@ -27,7 +27,7 @@
                     <?= $this->text->e($this->user->getInitials($task['assignee_name'] ?: $task['assignee_username'])) ?>
                 </span> -
             <?php endif ?>
-            <?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title tooltip', $this->text->e($task['title'])) ?>
+            <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title tooltip', $this->text->e($task['title'])) ?>
         </div>
     <?php else: ?>
         <div class="task-board-expanded">
@@ -48,7 +48,7 @@
 
             <?= $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')) ?>
+                <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
             </div>
             <?= $this->hook->render('template:board:private:task:after-title', array('task' => $task)) ?>
 
diff --git a/app/Template/board/task_public.php b/app/Template/board/task_public.php
index a53d42c8..82eb6535 100644
--- a/app/Template/board/task_public.php
+++ b/app/Template/board/task_public.php
@@ -1,6 +1,6 @@
 <div class="task-board color-<?= $task['color_id'] ?> <?= $task['date_modification'] > time() - $board_highlight_period ? 'task-board-recent' : '' ?>">
 
-    <?= $this->url->link('#'.$task['id'], 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?>
+    <?= $this->url->link('#'.$task['id'], 'TaskViewController', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?>
 
     <?php if ($task['reference']): ?>
     <span class="task-board-reference" title="<?= t('Reference') ?>">
@@ -12,7 +12,7 @@
 
     <?= $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'])) ?>
+        <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?>
     </div>
     <?= $this->hook->render('template:board:public:task:after-title', array('task' => $task)) ?>
 
@@ -21,4 +21,4 @@
         'not_editable' => $not_editable,
         'project' => $project,
     )) ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/board/tooltip_tasklinks.php b/app/Template/board/tooltip_tasklinks.php
index 6424c39d..d1156cbe 100644
--- a/app/Template/board/tooltip_tasklinks.php
+++ b/app/Template/board/tooltip_tasklinks.php
@@ -12,7 +12,7 @@
                 <td class="column-60">
                     <?= $this->url->link(
                         $this->text->e('#'.$link['task_id'].' '.$link['title']),
-                        'task', 'show', array('task_id' => $link['task_id'], 'project_id' => $link['project_id']),
+                        'TaskViewController', 'show', array('task_id' => $link['task_id'], 'project_id' => $link['project_id']),
                         false,
                         $link['is_active'] ? '' : 'task-link-closed'
                     ) ?>
@@ -31,4 +31,4 @@
         <?php endforeach ?>
     <?php endforeach ?>
     </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/comment/create.php b/app/Template/comment/create.php
index fa7c0ca6..2a92a2f8 100644
--- a/app/Template/comment/create.php
+++ b/app/Template/comment/create.php
@@ -24,6 +24,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </form>
diff --git a/app/Template/comment/edit.php b/app/Template/comment/edit.php
index 4036b673..abe98804 100644
--- a/app/Template/comment/edit.php
+++ b/app/Template/comment/edit.php
@@ -22,6 +22,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </form>
diff --git a/app/Template/comment/remove.php b/app/Template/comment/remove.php
index 3174df02..c7de8053 100644
--- a/app/Template/comment/remove.php
+++ b/app/Template/comment/remove.php
@@ -16,6 +16,6 @@
     <div class="form-actions">
         <?= $this->url->link(t('Yes'), 'comment', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/dashboard/subtasks.php b/app/Template/dashboard/subtasks.php
index ee6caf02..40e567b1 100644
--- a/app/Template/dashboard/subtasks.php
+++ b/app/Template/dashboard/subtasks.php
@@ -21,7 +21,7 @@
                 <?= $this->url->link($this->text->e($subtask['project_name']), 'board', 'show', array('project_id' => $subtask['project_id'])) ?>
             </td>
             <td>
-                <?= $this->url->link($this->text->e($subtask['task_name']), 'task', 'show', array('task_id' => $subtask['task_id'], 'project_id' => $subtask['project_id'])) ?>
+                <?= $this->url->link($this->text->e($subtask['task_name']), 'TaskViewController', 'show', array('task_id' => $subtask['task_id'], 'project_id' => $subtask['project_id'])) ?>
             </td>
             <td>
                 <?= $this->subtask->toggleStatus($subtask, $subtask['project_id']) ?>
diff --git a/app/Template/dashboard/tasks.php b/app/Template/dashboard/tasks.php
index 756bd9b4..cd245aa1 100644
--- a/app/Template/dashboard/tasks.php
+++ b/app/Template/dashboard/tasks.php
@@ -23,7 +23,7 @@
                 <?= $this->url->link($this->text->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?>
             </td>
             <td>
-                <?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                <?= $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): ?>
diff --git a/app/Template/event/comment_create.php b/app/Template/event/comment_create.php
index 9869c94b..45132e6d 100644
--- a/app/Template/event/comment_create.php
+++ b/app/Template/event/comment_create.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s commented the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
     <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
diff --git a/app/Template/event/comment_update.php b/app/Template/event/comment_update.php
index 19420cf9..5a0821bd 100644
--- a/app/Template/event/comment_update.php
+++ b/app/Template/event/comment_update.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s updated a comment on the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
     <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
diff --git a/app/Template/event/subtask_create.php b/app/Template/event/subtask_create.php
index 7e41d5c9..1bf36c05 100644
--- a/app/Template/event/subtask_create.php
+++ b/app/Template/event/subtask_create.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s created a subtask for the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
     <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
@@ -20,4 +20,4 @@
             <?php endif ?>
         </li>
     </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/event/subtask_update.php b/app/Template/event/subtask_update.php
index 9fea4fe8..201402f6 100644
--- a/app/Template/event/subtask_update.php
+++ b/app/Template/event/subtask_update.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s updated a subtask for the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
     <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
diff --git a/app/Template/event/task_assignee_change.php b/app/Template/event/task_assignee_change.php
index db78e7df..7c962223 100644
--- a/app/Template/event/task_assignee_change.php
+++ b/app/Template/event/task_assignee_change.php
@@ -4,14 +4,14 @@
     <?php if (! empty($assignee)): ?>
         <?= e('%s changed the assignee of the task %s to %s',
                 $this->text->e($author),
-                $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
+                $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
                 $this->text->e($assignee)
             ) ?>
     <?php else: ?>
-        <?= e('%s remove the assignee of the task %s', $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
+        <?= e('%s remove the assignee of the task %s', $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
     <?php endif ?>
     <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
 <div class="activity-description">
     <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/event/task_close.php b/app/Template/event/task_close.php
index 04157b0d..90ff9207 100644
--- a/app/Template/event/task_close.php
+++ b/app/Template/event/task_close.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s closed the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
     <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
diff --git a/app/Template/event/task_create.php b/app/Template/event/task_create.php
index 6e26cdb8..017a5ada 100644
--- a/app/Template/event/task_create.php
+++ b/app/Template/event/task_create.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s created the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
     <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
diff --git a/app/Template/event/task_file_create.php b/app/Template/event/task_file_create.php
index 0d8e545d..d329529a 100644
--- a/app/Template/event/task_file_create.php
+++ b/app/Template/event/task_file_create.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s attached a new file to the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
     <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
diff --git a/app/Template/event/task_move_column.php b/app/Template/event/task_move_column.php
index 0a78bca7..f3155e47 100644
--- a/app/Template/event/task_move_column.php
+++ b/app/Template/event/task_move_column.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s moved the task %s to the column "%s"',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
             $this->text->e($task['column_title'])
         ) ?>
     <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
diff --git a/app/Template/event/task_move_position.php b/app/Template/event/task_move_position.php
index eeadfa02..ecdd02b6 100644
--- a/app/Template/event/task_move_position.php
+++ b/app/Template/event/task_move_position.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s moved the task %s to the position #%d in the column "%s"',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
             $task['position'],
             $this->text->e($task['column_title'])
         ) ?>
diff --git a/app/Template/event/task_move_swimlane.php b/app/Template/event/task_move_swimlane.php
index a190bc0a..fe9bfb55 100644
--- a/app/Template/event/task_move_swimlane.php
+++ b/app/Template/event/task_move_swimlane.php
@@ -2,12 +2,12 @@
     <?php if ($task['swimlane_id'] == 0): ?>
         <?= e('%s moved the task %s to the first swimlane',
                 $this->text->e($author),
-                $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+                $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
             ) ?>
     <?php else: ?>
         <?= e('%s moved the task %s to the swimlane "%s"',
                 $this->text->e($author),
-                $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
+                $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
                 $this->text->e($task['swimlane_name'])
             ) ?>
     <?php endif ?>
diff --git a/app/Template/event/task_open.php b/app/Template/event/task_open.php
index d9cd90b3..548aa98f 100644
--- a/app/Template/event/task_open.php
+++ b/app/Template/event/task_open.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s opened the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
     <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
diff --git a/app/Template/event/task_update.php b/app/Template/event/task_update.php
index 07b94ff8..7c7507c0 100644
--- a/app/Template/event/task_update.php
+++ b/app/Template/event/task_update.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s updated the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
     <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
diff --git a/app/Template/feed/project.php b/app/Template/feed/project.php
index 1c6d1166..eae41c92 100644
--- a/app/Template/feed/project.php
+++ b/app/Template/feed/project.php
@@ -10,7 +10,7 @@
     <?php foreach ($events as $e): ?>
     <entry>
         <title type="text"><?= $e['event_title'] ?></title>
-        <link rel="alternate" href="<?= $this->url->href('task', 'show', array('task_id' => $e['task_id']), false, '', true) ?>"/>
+        <link rel="alternate" href="<?= $this->url->href('TaskViewController', 'show', array('task_id' => $e['task_id']), false, '', true) ?>"/>
         <id><?= $e['id'].'-'.$e['event_name'].'-'.$e['task_id'].'-'.$e['date_creation'] ?></id>
         <published><?= date(DATE_ATOM, $e['date_creation']) ?></published>
         <updated><?= date(DATE_ATOM, $e['date_creation']) ?></updated>
@@ -24,4 +24,4 @@
         </content>
     </entry>
     <?php endforeach ?>
-</feed>
\ No newline at end of file
+</feed>
diff --git a/app/Template/feed/user.php b/app/Template/feed/user.php
index 28847f1f..483cf7cd 100644
--- a/app/Template/feed/user.php
+++ b/app/Template/feed/user.php
@@ -10,7 +10,7 @@
     <?php foreach ($events as $e): ?>
     <entry>
         <title type="text"><?= $e['event_title'] ?></title>
-        <link rel="alternate" href="<?= $this->url->href('task', 'show', array('task_id' => $e['task_id']), false, '', true) ?>"/>
+        <link rel="alternate" href="<?= $this->url->href('TaskViewController', 'show', array('task_id' => $e['task_id']), false, '', true) ?>"/>
         <id><?= $e['id'].'-'.$e['event_name'].'-'.$e['task_id'].'-'.$e['date_creation'] ?></id>
         <published><?= date(DATE_ATOM, $e['date_creation']) ?></published>
         <updated><?= date(DATE_ATOM, $e['date_creation']) ?></updated>
@@ -24,4 +24,4 @@
         </content>
     </entry>
     <?php endforeach ?>
-</feed>
\ No newline at end of file
+</feed>
diff --git a/app/Template/listing/show.php b/app/Template/listing/show.php
index 1c92de4c..4ceb7f87 100644
--- a/app/Template/listing/show.php
+++ b/app/Template/listing/show.php
@@ -34,7 +34,7 @@
                     <?= $this->text->e($task['category_name']) ?>
                 </td>
                 <td>
-                    <?= $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')) ?>
+                    <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
                 </td>
                 <td>
                     <?php if ($task['assignee_username']): ?>
diff --git a/app/Template/notification/footer.php b/app/Template/notification/footer.php
index c3b37884..a56901ab 100644
--- a/app/Template/notification/footer.php
+++ b/app/Template/notification/footer.php
@@ -2,6 +2,6 @@
 Kanboard
 
 <?php if (isset($application_url) && ! empty($application_url)): ?>
-    - <a href="<?= $this->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', true) ?>"><?= t('view the task on Kanboard') ?></a>
+    - <a href="<?= $this->url->href('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', true) ?>"><?= t('view the task on Kanboard') ?></a>
     - <a href="<?= $this->url->href('board', 'show', array('project_id' => $task['project_id']), false, '', true) ?>"><?= t('view the board on Kanboard') ?></a>
 <?php endif ?>
diff --git a/app/Template/notification/task_overdue.php b/app/Template/notification/task_overdue.php
index a9fad249..406e41f7 100644
--- a/app/Template/notification/task_overdue.php
+++ b/app/Template/notification/task_overdue.php
@@ -14,7 +14,7 @@
             <td style="border: 1px solid #eee;">#<?= $task['id'] ?></td>
             <td style="border: 1px solid #eee;">
                 <?php if ($application_url): ?>
-                    <a href="<?= $this->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', true) ?>"><?= $this->text->e($task['title']) ?></a>
+                    <a href="<?= $this->url->href('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', true) ?>"><?= $this->text->e($task['title']) ?></a>
                 <?php else: ?>
                     <?= $this->text->e($task['title']) ?>
                 <?php endif ?>
diff --git a/app/Template/project_user/tasks.php b/app/Template/project_user/tasks.php
index 108d3b33..d459c133 100644
--- a/app/Template/project_user/tasks.php
+++ b/app/Template/project_user/tasks.php
@@ -14,7 +14,7 @@
         <?php foreach ($paginator->getCollection() as $task): ?>
         <tr>
             <td class="task-table color-<?= $task['color_id'] ?>">
-                <?= $this->url->link('#'.$this->text->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+                <?= $this->url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
             </td>
             <td>
                 <?= $this->url->link($this->text->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?>
@@ -23,7 +23,7 @@
                 <?= $this->text->e($task['column_name']) ?>
             </td>
             <td>
-                <?= $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')) ?>
+                <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
             </td>
             <td>
                 <?php if ($task['assignee_username']): ?>
diff --git a/app/Template/search/results.php b/app/Template/search/results.php
index 79df3544..58858867 100644
--- a/app/Template/search/results.php
+++ b/app/Template/search/results.php
@@ -16,7 +16,7 @@
             <?= $this->url->link($this->text->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?>
         </td>
         <td class="task-table color-<?= $task['color_id'] ?>">
-            <?= $this->url->link('#'.$this->text->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+            <?= $this->url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
         </td>
         <td>
             <?= $this->text->e($task['swimlane_name'] ?: $task['default_swimlane']) ?>
@@ -28,7 +28,7 @@
             <?= $this->text->e($task['category_name']) ?>
         </td>
         <td>
-            <?= $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')) ?>
+            <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
         </td>
         <td>
             <?php if ($task['assignee_username']): ?>
diff --git a/app/Template/subtask/create.php b/app/Template/subtask/create.php
index 31b99f90..3c080f7c 100644
--- a/app/Template/subtask/create.php
+++ b/app/Template/subtask/create.php
@@ -15,6 +15,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </form>
diff --git a/app/Template/subtask/edit.php b/app/Template/subtask/edit.php
index 9e316ea5..8f256cea 100644
--- a/app/Template/subtask/edit.php
+++ b/app/Template/subtask/edit.php
@@ -15,6 +15,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </form>
diff --git a/app/Template/subtask/remove.php b/app/Template/subtask/remove.php
index 33c10e88..426c1a93 100644
--- a/app/Template/subtask/remove.php
+++ b/app/Template/subtask/remove.php
@@ -15,6 +15,6 @@
     <div class="form-actions">
         <?= $this->url->link(t('Yes'), 'SubtaskController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </div>
diff --git a/app/Template/subtask_converter/show.php b/app/Template/subtask_converter/show.php
index af8af49e..63f45482 100644
--- a/app/Template/subtask_converter/show.php
+++ b/app/Template/subtask_converter/show.php
@@ -15,6 +15,6 @@
     <div class="form-actions">
         <?= $this->url->link(t('Yes'), 'SubtaskConverterController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </div>
diff --git a/app/Template/subtask_restriction/show.php b/app/Template/subtask_restriction/show.php
index 1ff49915..ec8b8d5b 100644
--- a/app/Template/subtask_restriction/show.php
+++ b/app/Template/subtask_restriction/show.php
@@ -12,6 +12,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-red"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </form>
diff --git a/app/Template/task/details.php b/app/Template/task/details.php
index 6e72ca3c..bbbbfd8b 100644
--- a/app/Template/task/details.php
+++ b/app/Template/task/details.php
@@ -32,7 +32,7 @@
                 <?php if ($project['is_public']): ?>
                 <li class="smaller">
                     <i class="fa fa-external-link fa-fw"></i>
-                    <?= $this->url->link(t('Public link'), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token']), false, '', '', true) ?>
+                    <?= $this->url->link(t('Public link'), 'TaskViewController', 'readonly', array('task_id' => $task['id'], 'token' => $project['token']), false, '', '', true) ?>
                 </li>
                 <?php endif ?>
                 <?php if ($project['is_public'] && !$editable): ?>
diff --git a/app/Template/task/dropdown.php b/app/Template/task/dropdown.php
index 2c3c38c6..6f887c0a 100644
--- a/app/Template/task/dropdown.php
+++ b/app/Template/task/dropdown.php
@@ -58,7 +58,7 @@
         <?php if ($this->user->canRemoveTask($task)): ?>
             <li>
                 <i class="fa fa-trash-o fa-fw"></i>
-                <?= $this->url->link(t('Remove'), 'task', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+                <?= $this->url->link(t('Remove'), 'TaskViewController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
             </li>
         <?php endif ?>
         <?php if (isset($task['is_active'])): ?>
diff --git a/app/Template/task/remove.php b/app/Template/task/remove.php
index b869b646..f963a325 100644
--- a/app/Template/task/remove.php
+++ b/app/Template/task/remove.php
@@ -8,8 +8,8 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'task', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?>
+        <?= $this->url->link(t('Yes'), 'TaskViewController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </div>
diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php
index c81aab9f..a8e8ba09 100644
--- a/app/Template/task/sidebar.php
+++ b/app/Template/task/sidebar.php
@@ -1,26 +1,26 @@
 <div class="sidebar sidebar-icons">
     <h2><?= t('Task #%d', $task['id']) ?></h2>
     <ul>
-        <li <?= $this->app->checkMenuSelection('task', 'show') ?>>
+        <li <?= $this->app->checkMenuSelection('TaskViewController', 'show') ?>>
             <i class="fa fa-newspaper-o fa-fw"></i>
-            <?= $this->url->link(t('Summary'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->url->link(t('Summary'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
         <li <?= $this->app->checkMenuSelection('activity', 'task') ?>>
             <i class="fa fa-dashboard fa-fw"></i>
             <?= $this->url->link(t('Activity stream'), 'activity', 'task', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('task', 'transitions') ?>>
+        <li <?= $this->app->checkMenuSelection('TaskViewController', 'transitions') ?>>
             <i class="fa fa-arrows-h fa-fw"></i>
-            <?= $this->url->link(t('Transitions'), 'task', 'transitions', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->url->link(t('Transitions'), 'TaskViewController', 'transitions', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('task', 'analytics') ?>>
+        <li <?= $this->app->checkMenuSelection('TaskViewController', 'analytics') ?>>
             <i class="fa fa-bar-chart fa-fw"></i>
-            <?= $this->url->link(t('Analytics'), 'task', 'analytics', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->url->link(t('Analytics'), 'TaskViewController', 'analytics', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
         <?php if ($task['time_estimated'] > 0 || $task['time_spent'] > 0): ?>
-        <li <?= $this->app->checkMenuSelection('task', 'timetracking') ?>>
+        <li <?= $this->app->checkMenuSelection('TaskViewController', 'timetracking') ?>>
             <i class="fa fa-clock-o fa-fw"></i>
-            <?= $this->url->link(t('Time tracking'), 'task', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->url->link(t('Time tracking'), 'TaskViewController', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
         <?php endif ?>
 
@@ -90,7 +90,7 @@
         <?php if ($this->user->canRemoveTask($task)): ?>
             <li>
                 <i class="fa fa-trash-o fa-fw"></i>
-                <?= $this->url->link(t('Remove'), 'task', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+                <?= $this->url->link(t('Remove'), 'TaskViewController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
             </li>
         <?php endif ?>
 
diff --git a/app/Template/task_duplication/copy.php b/app/Template/task_duplication/copy.php
index b7337a1e..f7215f3d 100644
--- a/app/Template/task_duplication/copy.php
+++ b/app/Template/task_duplication/copy.php
@@ -41,8 +41,8 @@
         <div class="form-actions">
             <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
             <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+            <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
         </div>
     </form>
 
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/app/Template/task_duplication/duplicate.php b/app/Template/task_duplication/duplicate.php
index 376f6b3b..1be6b706 100644
--- a/app/Template/task_duplication/duplicate.php
+++ b/app/Template/task_duplication/duplicate.php
@@ -10,6 +10,6 @@
     <div class="form-actions">
         <?= $this->url->link(t('Yes'), 'taskduplication', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/task_duplication/move.php b/app/Template/task_duplication/move.php
index beebf9eb..50b29363 100644
--- a/app/Template/task_duplication/move.php
+++ b/app/Template/task_duplication/move.php
@@ -41,8 +41,8 @@
         <div class="form-actions">
             <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
             <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+            <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
         </div>
     </form>
 
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/app/Template/task_external_link/find.php b/app/Template/task_external_link/find.php
index 3977a66c..09843d2f 100644
--- a/app/Template/task_external_link/find.php
+++ b/app/Template/task_external_link/find.php
@@ -23,6 +23,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Next') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/task_file/create.php b/app/Template/task_file/create.php
index 4abe6634..e3bbfa2b 100644
--- a/app/Template/task_file/create.php
+++ b/app/Template/task_file/create.php
@@ -4,7 +4,7 @@
 <div id="file-done" style="display:none">
     <p class="alert alert-success">
         <?= t('All files have been uploaded successfully.') ?>
-        <?= $this->url->link(t('View uploaded files'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+        <?= $this->url->link(t('View uploaded files'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
     </p>
 </div>
 
@@ -29,5 +29,5 @@
 <div class="form-actions">
     <input type="submit" value="<?= t('Upload files') ?>" class="btn btn-blue" id="file-upload-button" disabled>
     <?= t('or') ?>
-    <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+    <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
 </div>
diff --git a/app/Template/task_file/remove.php b/app/Template/task_file/remove.php
index fe601f6f..5097c66a 100644
--- a/app/Template/task_file/remove.php
+++ b/app/Template/task_file/remove.php
@@ -10,6 +10,6 @@
     <div class="form-actions">
         <?= $this->url->link(t('Yes'), 'TaskFile', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/task_file/screenshot.php b/app/Template/task_file/screenshot.php
index 2880478d..75958db1 100644
--- a/app/Template/task_file/screenshot.php
+++ b/app/Template/task_file/screenshot.php
@@ -12,8 +12,8 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </form>
 
-<p class="alert alert-info"><?= t('This feature does not work with all browsers.') ?></p>
\ No newline at end of file
+<p class="alert alert-info"><?= t('This feature does not work with all browsers.') ?></p>
diff --git a/app/Template/task_internal_link/create.php b/app/Template/task_internal_link/create.php
index 87b3fd28..fed29605 100644
--- a/app/Template/task_internal_link/create.php
+++ b/app/Template/task_internal_link/create.php
@@ -21,13 +21,13 @@
             'placeholder="'.t('Start to type task title...').'"',
             'title="'.t('Start to type task title...').'"',
             'data-dst-field="opposite_task_id"',
-            'data-search-url="'.$this->url->href('TaskHelper', 'autocomplete', array('exclude_task_id' => $task['id'])).'"',
+            'data-search-url="'.$this->url->href('TaskAjaxController', 'autocomplete', array('exclude_task_id' => $task['id'])).'"',
         ),
         'autocomplete') ?>
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </form>
diff --git a/app/Template/task_internal_link/edit.php b/app/Template/task_internal_link/edit.php
index 15066443..f4df57bd 100644
--- a/app/Template/task_internal_link/edit.php
+++ b/app/Template/task_internal_link/edit.php
@@ -22,13 +22,13 @@
             'placeholder="'.t('Start to type task title...').'"',
             'title="'.t('Start to type task title...').'"',
             'data-dst-field="opposite_task_id"',
-            'data-search-url="'.$this->url->href('TaskHelper', 'autocomplete', array('exclude_task_id' => $task['id'])).'"',
+            'data-search-url="'.$this->url->href('TaskAjaxController', 'autocomplete', array('exclude_task_id' => $task['id'])).'"',
         ),
         'autocomplete') ?>
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </form>
diff --git a/app/Template/task_internal_link/remove.php b/app/Template/task_internal_link/remove.php
index 4dea7c9d..966ad116 100644
--- a/app/Template/task_internal_link/remove.php
+++ b/app/Template/task_internal_link/remove.php
@@ -10,6 +10,6 @@
     <div class="form-actions">
         <?= $this->url->link(t('Yes'), 'TaskInternalLinkController', 'remove', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </div>
diff --git a/app/Template/task_internal_link/table.php b/app/Template/task_internal_link/table.php
index 631796bf..424d4791 100644
--- a/app/Template/task_internal_link/table.php
+++ b/app/Template/task_internal_link/table.php
@@ -24,7 +24,7 @@
                 <?php if ($is_public): ?>
                     <?= $this->url->link(
                         $this->text->e('#'.$link['task_id'].' '.$link['title']),
-                        'task',
+                        'TaskViewController',
                         'readonly',
                         array('task_id' => $link['task_id'], 'token' => $project['token']),
                         false,
@@ -33,7 +33,7 @@
                 <?php else: ?>
                     <?= $this->url->link(
                         $this->text->e('#'.$link['task_id'].' '.$link['title']),
-                        'task',
+                        'TaskViewController',
                         'show',
                         array('task_id' => $link['task_id'], 'project_id' => $link['project_id']),
                         false,
diff --git a/app/Template/task_modification/edit_description.php b/app/Template/task_modification/edit_description.php
index cddc0cf5..339ed036 100644
--- a/app/Template/task_modification/edit_description.php
+++ b/app/Template/task_modification/edit_description.php
@@ -22,6 +22,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </form>
diff --git a/app/Template/task_modification/edit_task.php b/app/Template/task_modification/edit_task.php
index f7ecc9cb..0707fd9a 100644
--- a/app/Template/task_modification/edit_task.php
+++ b/app/Template/task_modification/edit_task.php
@@ -33,6 +33,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue" tabindex="15"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </form>
diff --git a/app/Template/task_recurrence/edit.php b/app/Template/task_recurrence/edit.php
index e1f0feca..550db2f8 100644
--- a/app/Template/task_recurrence/edit.php
+++ b/app/Template/task_recurrence/edit.php
@@ -40,7 +40,7 @@
         <div class="form-actions">
             <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
             <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+            <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
         </div>
     </form>
 
diff --git a/app/Template/task_recurrence/info.php b/app/Template/task_recurrence/info.php
index 1a6574df..97794604 100644
--- a/app/Template/task_recurrence/info.php
+++ b/app/Template/task_recurrence/info.php
@@ -24,14 +24,14 @@
         <?php if ($task['recurrence_parent']): ?>
         <li>
             <?= t('This task has been created by: ') ?>
-            <?= $this->url->link('#'.$task['recurrence_parent'], 'task', 'show', array('task_id' => $task['recurrence_parent'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->url->link('#'.$task['recurrence_parent'], 'TaskViewController', 'show', array('task_id' => $task['recurrence_parent'], 'project_id' => $task['project_id'])) ?>
         </li>
         <?php endif ?>
         <?php if ($task['recurrence_child']): ?>
         <li>
             <?= t('This task has created this child task: ') ?>
-            <?= $this->url->link('#'.$task['recurrence_child'], 'task', 'show', array('task_id' => $task['recurrence_child'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->url->link('#'.$task['recurrence_child'], 'TaskViewController', 'show', array('task_id' => $task['recurrence_child'], 'project_id' => $task['project_id'])) ?>
         </li>
         <?php endif ?>
     <?php endif ?>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/app/Template/task_status/close.php b/app/Template/task_status/close.php
index f78e051d..2d7b0ce5 100644
--- a/app/Template/task_status/close.php
+++ b/app/Template/task_status/close.php
@@ -10,6 +10,6 @@
     <div class="form-actions">
         <?= $this->url->link(t('Yes'), 'TaskStatusController', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </div>
diff --git a/app/Template/task_status/open.php b/app/Template/task_status/open.php
index 1bd89cf4..242b5db5 100644
--- a/app/Template/task_status/open.php
+++ b/app/Template/task_status/open.php
@@ -10,6 +10,6 @@
     <div class="form-actions">
         <?= $this->url->link(t('Yes'), 'TaskStatusController', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </div>
diff --git a/app/Template/user_view/timesheet.php b/app/Template/user_view/timesheet.php
index 92ebafb5..3df57492 100644
--- a/app/Template/user_view/timesheet.php
+++ b/app/Template/user_view/timesheet.php
@@ -16,8 +16,8 @@
         </tr>
         <?php foreach ($subtask_paginator->getCollection() as $record): ?>
         <tr>
-            <td><?= $this->url->link($this->text->e($record['task_title']), 'task', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?></td>
-            <td><?= $this->url->link($this->text->e($record['subtask_title']), 'task', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?></td>
+            <td><?= $this->url->link($this->text->e($record['task_title']), 'TaskViewController', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?></td>
+            <td><?= $this->url->link($this->text->e($record['subtask_title']), 'TaskViewController', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?></td>
             <td><?= $this->dt->datetime($record['start']) ?></td>
             <td><?= $this->dt->datetime($record['end']) ?></td>
             <td><?= n($record['time_spent']).' '.t('hours') ?></td>
@@ -26,4 +26,4 @@
     </table>
 
     <?= $subtask_paginator ?>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>