From 67b836164997527b91452b19adbcb8aa3c5decf1 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 15 May 2016 18:31:47 -0400
Subject: Refactoring: added controlled middleware and changed response class

---
 app/Template/app/activity.php            |  4 ---
 app/Template/app/calendar.php            |  5 ---
 app/Template/app/layout.php              | 32 -----------------
 app/Template/app/notifications.php       | 61 --------------------------------
 app/Template/app/overview.php            | 12 -------
 app/Template/app/projects.php            | 50 --------------------------
 app/Template/app/sidebar.php             | 27 --------------
 app/Template/app/subtasks.php            | 43 ----------------------
 app/Template/app/tasks.php               | 49 -------------------------
 app/Template/config/application.php      |  2 +-
 app/Template/config/board.php            |  2 +-
 app/Template/config/calendar.php         |  4 +--
 app/Template/config/integrations.php     |  4 +--
 app/Template/config/layout.php           |  3 +-
 app/Template/config/project.php          |  2 +-
 app/Template/config/webhook.php          |  4 +--
 app/Template/dashboard/activity.php      |  4 +++
 app/Template/dashboard/calendar.php      |  5 +++
 app/Template/dashboard/layout.php        | 32 +++++++++++++++++
 app/Template/dashboard/notifications.php | 61 ++++++++++++++++++++++++++++++++
 app/Template/dashboard/projects.php      | 50 ++++++++++++++++++++++++++
 app/Template/dashboard/show.php          | 12 +++++++
 app/Template/dashboard/sidebar.php       | 27 ++++++++++++++
 app/Template/dashboard/subtasks.php      | 43 ++++++++++++++++++++++
 app/Template/dashboard/tasks.php         | 49 +++++++++++++++++++++++++
 app/Template/header.php                  |  6 ++--
 app/Template/layout.php                  |  2 +-
 app/Template/user/sidebar.php            |  4 +--
 28 files changed, 299 insertions(+), 300 deletions(-)
 delete mode 100644 app/Template/app/activity.php
 delete mode 100644 app/Template/app/calendar.php
 delete mode 100644 app/Template/app/layout.php
 delete mode 100644 app/Template/app/notifications.php
 delete mode 100644 app/Template/app/overview.php
 delete mode 100644 app/Template/app/projects.php
 delete mode 100644 app/Template/app/sidebar.php
 delete mode 100644 app/Template/app/subtasks.php
 delete mode 100644 app/Template/app/tasks.php
 create mode 100644 app/Template/dashboard/activity.php
 create mode 100644 app/Template/dashboard/calendar.php
 create mode 100644 app/Template/dashboard/layout.php
 create mode 100644 app/Template/dashboard/notifications.php
 create mode 100644 app/Template/dashboard/projects.php
 create mode 100644 app/Template/dashboard/show.php
 create mode 100644 app/Template/dashboard/sidebar.php
 create mode 100644 app/Template/dashboard/subtasks.php
 create mode 100644 app/Template/dashboard/tasks.php

(limited to 'app/Template')

diff --git a/app/Template/app/activity.php b/app/Template/app/activity.php
deleted file mode 100644
index 71a67fb2..00000000
--- a/app/Template/app/activity.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="page-header">
-    <h2><?= t('My activity stream') ?></h2>
-</div>
-<?= $this->render('event/events', array('events' => $events)) ?>
\ No newline at end of file
diff --git a/app/Template/app/calendar.php b/app/Template/app/calendar.php
deleted file mode 100644
index a154203b..00000000
--- a/app/Template/app/calendar.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="calendar"
-     data-check-url="<?= $this->url->href('calendar', 'user', array('user_id' => $user['id'])) ?>"
-     data-save-url="<?= $this->url->href('calendar', 'save') ?>"
->
-</div>
diff --git a/app/Template/app/layout.php b/app/Template/app/layout.php
deleted file mode 100644
index 2a32ac02..00000000
--- a/app/Template/app/layout.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <?php if ($this->user->hasAccess('ProjectCreation', 'create')): ?>
-                <li>
-                    <i class="fa fa-plus fa-fw"></i>
-                    <?= $this->url->link(t('New project'), 'ProjectCreation', 'create', array(), false, 'popover') ?>
-                </li>
-            <?php endif ?>
-            <?php if ($this->app->config('disable_private_project', 0) == 0): ?>
-            <li>
-                <i class="fa fa-lock fa-fw"></i>
-                <?= $this->url->link(t('New private project'), 'ProjectCreation', 'createPrivate', array(), false, 'popover') ?>
-            </li>
-            <?php endif ?>
-            <li>
-                <i class="fa fa-search fa-fw"></i>
-                <?= $this->url->link(t('Search'), 'search', 'index') ?>
-            </li>
-            <li>
-                <i class="fa fa-folder fa-fw"></i>
-                <?= $this->url->link(t('Project management'), 'project', 'index') ?>
-            </li>
-        </ul>
-    </div>
-    <section class="sidebar-container" id="dashboard">
-        <?= $this->render($sidebar_template, array('user' => $user)) ?>
-        <div class="sidebar-content">
-            <?= $content_for_sublayout ?>
-        </div>
-    </section>
-</section>
\ No newline at end of file
diff --git a/app/Template/app/notifications.php b/app/Template/app/notifications.php
deleted file mode 100644
index b64eb0b7..00000000
--- a/app/Template/app/notifications.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<div class="page-header">
-    <h2><?= t('My notifications') ?></h2>
-
-<?php if (empty($notifications)): ?>
-</div>
-<p class="alert"><?= t('No new notifications.') ?></p>
-<?php else: ?>
-    <ul>
-        <li>
-            <i class="fa fa-check-square-o fa-fw"></i>
-            <?= $this->url->link(t('Mark all as read'), 'webNotification', 'flush', array('user_id' => $user['id'])) ?>
-        </li>
-    </ul>
-</div>
-
-    <table class="table-fixed table-small">
-        <tr>
-            <th><?= t('Notification') ?></th>
-            <th class="column-20"><?= t('Date') ?></th>
-            <th class="column-15"><?= t('Action') ?></th>
-        </tr>
-        <?php foreach ($notifications as $notification): ?>
-        <tr>
-            <td>
-                <?php if ($this->text->contains($notification['event_name'], 'subtask')): ?>
-                    <i class="fa fa-tasks fa-fw"></i>
-                <?php elseif ($this->text->contains($notification['event_name'], 'task.move')): ?>
-                    <i class="fa fa-arrows-alt fa-fw"></i>
-                <?php elseif ($this->text->contains($notification['event_name'], 'task.overdue')): ?>
-                    <i class="fa fa-calendar-times-o fa-fw"></i>
-                <?php elseif ($this->text->contains($notification['event_name'], 'task')): ?>
-                    <i class="fa fa-newspaper-o fa-fw"></i>
-                <?php elseif ($this->text->contains($notification['event_name'], 'comment')): ?>
-                    <i class="fa fa-comments-o fa-fw"></i>
-                <?php elseif ($this->text->contains($notification['event_name'], 'file')): ?>
-                    <i class="fa fa-file-o fa-fw"></i>
-                <?php endif ?>
-
-                <?php if ($this->text->contains($notification['event_name'], 'comment')): ?>
-                    <?= $this->url->link($notification['title'], 'task', 'show', array('task_id' => $notification['event_data']['task']['id'], 'project_id' => $notification['event_data']['task']['project_id']), false, '', '', false, 'comment-'.$notification['event_data']['comment']['id']) ?>
-                <?php elseif ($this->text->contains($notification['event_name'], 'task.overdue')): ?>
-                    <?php if (count($notification['event_data']['tasks']) > 1): ?>
-                        <?= $notification['title'] ?>
-                    <?php else: ?>
-                        <?= $this->url->link($notification['title'], 'task', 'show', array('task_id' => $notification['event_data']['tasks'][0]['id'], 'project_id' => $notification['event_data']['tasks'][0]['project_id'])) ?>
-                    <?php endif ?>
-                <?php else: ?>
-                    <?= $this->url->link($notification['title'], 'task', 'show', array('task_id' => $notification['event_data']['task']['id'], 'project_id' => $notification['event_data']['task']['project_id'])) ?>
-                <?php endif ?>
-            </td>
-            <td>
-                <?= $this->dt->datetime($notification['date_creation']) ?>
-            </td>
-            <td>
-                <i class="fa fa-check fa-fw"></i>
-                <?= $this->url->link(t('Mark as read'), 'webNotification', 'remove', array('user_id' => $user['id'], 'notification_id' => $notification['id'])) ?>
-            </td>
-        </tr>
-        <?php endforeach ?>
-    </table>
-<?php endif ?>
\ No newline at end of file
diff --git a/app/Template/app/overview.php b/app/Template/app/overview.php
deleted file mode 100644
index 0b354791..00000000
--- a/app/Template/app/overview.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="filter-box">
-    <form method="get" action="<?= $this->url->dir() ?>" class="search">
-        <?= $this->form->hidden('controller', array('controller' => 'search')) ?>
-        <?= $this->form->hidden('action', array('action' => 'index')) ?>
-        <?= $this->form->text('search', array(), array(), array('placeholder="'.t('Search').'"'), 'form-input-large') ?>
-        <?= $this->render('app/filters_helper') ?>
-    </form>
-</div>
-
-<?= $this->render('app/projects', array('paginator' => $project_paginator, 'user' => $user)) ?>
-<?= $this->render('app/tasks', array('paginator' => $task_paginator, 'user' => $user)) ?>
-<?= $this->render('app/subtasks', array('paginator' => $subtask_paginator, 'user' => $user)) ?>
\ No newline at end of file
diff --git a/app/Template/app/projects.php b/app/Template/app/projects.php
deleted file mode 100644
index c0110b07..00000000
--- a/app/Template/app/projects.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<div class="page-header">
-    <h2><?= $this->url->link(t('My projects'), 'app', 'projects', array('user_id' => $user['id'])) ?> (<?= $paginator->getTotal() ?>)</h2>
-</div>
-<?php if ($paginator->isEmpty()): ?>
-    <p class="alert"><?= t('Your are not member of any project.') ?></p>
-<?php else: ?>
-    <table class="table-fixed table-small">
-        <tr>
-            <th class="column-5"><?= $paginator->order('Id', 'id') ?></th>
-            <th class="column-3"><?= $paginator->order('<i class="fa fa-lock fa-fw" title="'.t('Private project').'"></i>', 'is_private') ?></th>
-            <th class="column-25"><?= $paginator->order(t('Project'), \Kanboard\Model\Project::TABLE.'.name') ?></th>
-            <th><?= t('Columns') ?></th>
-        </tr>
-        <?php foreach ($paginator->getCollection() as $project): ?>
-        <tr>
-            <td>
-                <?= $this->render('project/dropdown', array('project' => $project)) ?>
-            </td>
-            <td>
-                <?php if ($project['is_private']): ?>
-                    <i class="fa fa-lock fa-fw" title="<?= t('Private project') ?>"></i>
-                <?php endif ?>
-            </td>
-            <td>
-                <?php if ($this->user->hasProjectAccess('gantt', 'project', $project['id'])): ?>
-                    <?= $this->url->link('<i class="fa fa-sliders fa-fw"></i>', 'gantt', 'project', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?>
-                <?php endif ?>
-
-                <?= $this->url->link('<i class="fa fa-list"></i>', 'listing', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('List')) ?>&nbsp;
-                <?= $this->url->link('<i class="fa fa-calendar"></i>', 'calendar', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Calendar')) ?>&nbsp;
-
-                <?= $this->url->link($this->text->e($project['name']), 'board', 'show', array('project_id' => $project['id'])) ?>
-                <?php if (! empty($project['description'])): ?>
-                    <span class="tooltip" title="<?= $this->text->markdownAttribute($project['description']) ?>">
-                        <i class="fa fa-info-circle"></i>
-                    </span>
-                <?php endif ?>
-            </td>
-            <td class="dashboard-project-stats">
-                <?php foreach ($project['columns'] as $column): ?>
-                    <strong title="<?= t('Task count') ?>"><?= $column['nb_tasks'] ?></strong>
-                    <span><?= $this->text->e($column['title']) ?></span>
-                <?php endforeach ?>
-            </td>
-        </tr>
-        <?php endforeach ?>
-    </table>
-
-    <?= $paginator ?>
-<?php endif ?>
diff --git a/app/Template/app/sidebar.php b/app/Template/app/sidebar.php
deleted file mode 100644
index 66d15b14..00000000
--- a/app/Template/app/sidebar.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="sidebar">
-    <h2><?= $this->text->e($user['name'] ?: $user['username']) ?></h2>
-    <ul>
-        <li <?= $this->app->checkMenuSelection('app', 'index') ?>>
-            <?= $this->url->link(t('Overview'), 'app', 'index', array('user_id' => $user['id'])) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('app', 'projects') ?>>
-            <?= $this->url->link(t('My projects'), 'app', 'projects', array('user_id' => $user['id'])) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('app', 'tasks') ?>>
-            <?= $this->url->link(t('My tasks'), 'app', 'tasks', array('user_id' => $user['id'])) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('app', 'subtasks') ?>>
-            <?= $this->url->link(t('My subtasks'), 'app', 'subtasks', array('user_id' => $user['id'])) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('app', 'calendar') ?>>
-            <?= $this->url->link(t('My calendar'), 'app', 'calendar', array('user_id' => $user['id'])) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('app', 'activity') ?>>
-            <?= $this->url->link(t('My activity stream'), 'app', 'activity', array('user_id' => $user['id'])) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('app', 'notifications') ?>>
-            <?= $this->url->link(t('My notifications'), 'app', 'notifications', array('user_id' => $user['id'])) ?>
-        </li>
-        <?= $this->hook->render('template:dashboard:sidebar') ?>
-    </ul>
-</div>
\ No newline at end of file
diff --git a/app/Template/app/subtasks.php b/app/Template/app/subtasks.php
deleted file mode 100644
index cca09481..00000000
--- a/app/Template/app/subtasks.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<div class="page-header">
-    <h2><?= $this->url->link(t('My subtasks'), 'app', 'subtasks', array('user_id' => $user['id'])) ?> (<?= $paginator->getTotal() ?>)</h2>
-</div>
-<?php if ($paginator->isEmpty()): ?>
-    <p class="alert"><?= t('There is nothing assigned to you.') ?></p>
-<?php else: ?>
-    <table class="table-fixed table-small">
-        <tr>
-            <th class="column-5"><?= $paginator->order('Id', 'tasks.id') ?></th>
-            <th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></th>
-            <th><?= $paginator->order(t('Task'), 'task_name') ?></th>
-            <th><?= $paginator->order(t('Subtask'), 'title') ?></th>
-            <th class="column-20"><?= t('Time tracking') ?></th>
-        </tr>
-        <?php foreach ($paginator->getCollection() as $subtask): ?>
-        <tr>
-            <td class="task-table color-<?= $subtask['color_id'] ?>">
-                <?= $this->render('task/dropdown', array('task' => array('id' => $subtask['task_id'], 'project_id' => $subtask['project_id']))) ?>
-            </td>
-            <td>
-                <?= $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'])) ?>
-            </td>
-            <td>
-                <?= $this->subtask->toggleStatus($subtask, $subtask['project_id']) ?>
-            </td>
-            <td>
-                <?php if (! empty($subtask['time_spent'])): ?>
-                    <strong><?= $this->text->e($subtask['time_spent']).'h' ?></strong> <?= t('spent') ?>
-                <?php endif ?>
-
-                <?php if (! empty($subtask['time_estimated'])): ?>
-                    <strong><?= $this->text->e($subtask['time_estimated']).'h' ?></strong> <?= t('estimated') ?>
-                <?php endif ?>
-            </td>
-        </tr>
-        <?php endforeach ?>
-    </table>
-
-    <?= $paginator ?>
-<?php endif ?>
\ No newline at end of file
diff --git a/app/Template/app/tasks.php b/app/Template/app/tasks.php
deleted file mode 100644
index f0ed61e0..00000000
--- a/app/Template/app/tasks.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<div class="page-header">
-    <h2><?= $this->url->link(t('My tasks'), 'app', 'tasks', array('user_id' => $user['id'])) ?> (<?= $paginator->getTotal() ?>)</h2>
-</div>
-<?php if ($paginator->isEmpty()): ?>
-    <p class="alert"><?= t('There is nothing assigned to you.') ?></p>
-<?php else: ?>
-    <table class="table-fixed table-small">
-        <tr>
-            <th class="column-5"><?= $paginator->order('Id', 'tasks.id') ?></th>
-            <th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></th>
-            <th><?= $paginator->order(t('Task'), 'title') ?></th>
-            <th class="column-5"><?= $paginator->order('Priority', 'tasks.priority') ?></th>
-            <th class="column-20"><?= t('Time tracking') ?></th>
-            <th class="column-20"><?= $paginator->order(t('Due date'), 'date_due') ?></th>
-        </tr>
-        <?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']), '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'])) ?>
-            </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 ?>
-
-                <?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>
-        </tr>
-        <?php endforeach ?>
-    </table>
-
-    <?= $paginator ?>
-<?php endif ?>
diff --git a/app/Template/config/application.php b/app/Template/config/application.php
index 259756bc..ee0e147b 100644
--- a/app/Template/config/application.php
+++ b/app/Template/config/application.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Application settings') ?></h2>
 </div>
-<form method="post" action="<?= $this->url->href('config', 'application') ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'application')) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
diff --git a/app/Template/config/board.php b/app/Template/config/board.php
index ba1bab59..75cd40ef 100644
--- a/app/Template/config/board.php
+++ b/app/Template/config/board.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Board settings') ?></h2>
 </div>
-<form method="post" action="<?= $this->url->href('config', 'board') ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'board')) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
diff --git a/app/Template/config/calendar.php b/app/Template/config/calendar.php
index b7b230df..37084a8b 100644
--- a/app/Template/config/calendar.php
+++ b/app/Template/config/calendar.php
@@ -2,7 +2,7 @@
     <h2><?= t('Calendar settings') ?></h2>
 </div>
 <section>
-<form method="post" action="<?= $this->url->href('config', 'calendar') ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'calendar')) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -31,4 +31,4 @@
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
     </div>
 </form>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/config/integrations.php b/app/Template/config/integrations.php
index e404c52e..2a29b358 100644
--- a/app/Template/config/integrations.php
+++ b/app/Template/config/integrations.php
@@ -2,7 +2,7 @@
     <h2><?= t('Integration with third-party services') ?></h2>
 </div>
 
-<form method="post" action="<?= $this->url->href('config', 'integrations') ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'integrations')) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
     <?= $this->hook->render('template:config:integrations', array('values' => $values)) ?>
 
@@ -14,4 +14,4 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/config/layout.php b/app/Template/config/layout.php
index f34caaab..6eafa593 100644
--- a/app/Template/config/layout.php
+++ b/app/Template/config/layout.php
@@ -1,10 +1,9 @@
 <section id="main">
     <section class="sidebar-container" id="config-section">
-
         <?= $this->render($sidebar_template) ?>
 
         <div class="sidebar-content">
             <?= $content_for_sublayout ?>
         </div>
     </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/config/project.php b/app/Template/config/project.php
index b6b7ec25..b0112773 100644
--- a/app/Template/config/project.php
+++ b/app/Template/config/project.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Project settings') ?></h2>
 </div>
-<form method="post" action="<?= $this->url->href('config', 'project') ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'project')) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
diff --git a/app/Template/config/webhook.php b/app/Template/config/webhook.php
index b96979a0..5db1fa6e 100644
--- a/app/Template/config/webhook.php
+++ b/app/Template/config/webhook.php
@@ -2,7 +2,7 @@
     <h2><?= t('Webhook settings') ?></h2>
 </div>
 <section>
-<form method="post" action="<?= $this->url->href('config', 'webhook') ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'webhook')) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -32,4 +32,4 @@
             <?= $this->url->link(t('Reset token'), 'config', 'token', array('type' => 'webhook'), true) ?>
         </li>
     </ul>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/dashboard/activity.php b/app/Template/dashboard/activity.php
new file mode 100644
index 00000000..71a67fb2
--- /dev/null
+++ b/app/Template/dashboard/activity.php
@@ -0,0 +1,4 @@
+<div class="page-header">
+    <h2><?= t('My activity stream') ?></h2>
+</div>
+<?= $this->render('event/events', array('events' => $events)) ?>
\ No newline at end of file
diff --git a/app/Template/dashboard/calendar.php b/app/Template/dashboard/calendar.php
new file mode 100644
index 00000000..a154203b
--- /dev/null
+++ b/app/Template/dashboard/calendar.php
@@ -0,0 +1,5 @@
+<div id="calendar"
+     data-check-url="<?= $this->url->href('calendar', 'user', array('user_id' => $user['id'])) ?>"
+     data-save-url="<?= $this->url->href('calendar', 'save') ?>"
+>
+</div>
diff --git a/app/Template/dashboard/layout.php b/app/Template/dashboard/layout.php
new file mode 100644
index 00000000..2a32ac02
--- /dev/null
+++ b/app/Template/dashboard/layout.php
@@ -0,0 +1,32 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <?php if ($this->user->hasAccess('ProjectCreation', 'create')): ?>
+                <li>
+                    <i class="fa fa-plus fa-fw"></i>
+                    <?= $this->url->link(t('New project'), 'ProjectCreation', 'create', array(), false, 'popover') ?>
+                </li>
+            <?php endif ?>
+            <?php if ($this->app->config('disable_private_project', 0) == 0): ?>
+            <li>
+                <i class="fa fa-lock fa-fw"></i>
+                <?= $this->url->link(t('New private project'), 'ProjectCreation', 'createPrivate', array(), false, 'popover') ?>
+            </li>
+            <?php endif ?>
+            <li>
+                <i class="fa fa-search fa-fw"></i>
+                <?= $this->url->link(t('Search'), 'search', 'index') ?>
+            </li>
+            <li>
+                <i class="fa fa-folder fa-fw"></i>
+                <?= $this->url->link(t('Project management'), 'project', 'index') ?>
+            </li>
+        </ul>
+    </div>
+    <section class="sidebar-container" id="dashboard">
+        <?= $this->render($sidebar_template, array('user' => $user)) ?>
+        <div class="sidebar-content">
+            <?= $content_for_sublayout ?>
+        </div>
+    </section>
+</section>
\ No newline at end of file
diff --git a/app/Template/dashboard/notifications.php b/app/Template/dashboard/notifications.php
new file mode 100644
index 00000000..b64eb0b7
--- /dev/null
+++ b/app/Template/dashboard/notifications.php
@@ -0,0 +1,61 @@
+<div class="page-header">
+    <h2><?= t('My notifications') ?></h2>
+
+<?php if (empty($notifications)): ?>
+</div>
+<p class="alert"><?= t('No new notifications.') ?></p>
+<?php else: ?>
+    <ul>
+        <li>
+            <i class="fa fa-check-square-o fa-fw"></i>
+            <?= $this->url->link(t('Mark all as read'), 'webNotification', 'flush', array('user_id' => $user['id'])) ?>
+        </li>
+    </ul>
+</div>
+
+    <table class="table-fixed table-small">
+        <tr>
+            <th><?= t('Notification') ?></th>
+            <th class="column-20"><?= t('Date') ?></th>
+            <th class="column-15"><?= t('Action') ?></th>
+        </tr>
+        <?php foreach ($notifications as $notification): ?>
+        <tr>
+            <td>
+                <?php if ($this->text->contains($notification['event_name'], 'subtask')): ?>
+                    <i class="fa fa-tasks fa-fw"></i>
+                <?php elseif ($this->text->contains($notification['event_name'], 'task.move')): ?>
+                    <i class="fa fa-arrows-alt fa-fw"></i>
+                <?php elseif ($this->text->contains($notification['event_name'], 'task.overdue')): ?>
+                    <i class="fa fa-calendar-times-o fa-fw"></i>
+                <?php elseif ($this->text->contains($notification['event_name'], 'task')): ?>
+                    <i class="fa fa-newspaper-o fa-fw"></i>
+                <?php elseif ($this->text->contains($notification['event_name'], 'comment')): ?>
+                    <i class="fa fa-comments-o fa-fw"></i>
+                <?php elseif ($this->text->contains($notification['event_name'], 'file')): ?>
+                    <i class="fa fa-file-o fa-fw"></i>
+                <?php endif ?>
+
+                <?php if ($this->text->contains($notification['event_name'], 'comment')): ?>
+                    <?= $this->url->link($notification['title'], 'task', 'show', array('task_id' => $notification['event_data']['task']['id'], 'project_id' => $notification['event_data']['task']['project_id']), false, '', '', false, 'comment-'.$notification['event_data']['comment']['id']) ?>
+                <?php elseif ($this->text->contains($notification['event_name'], 'task.overdue')): ?>
+                    <?php if (count($notification['event_data']['tasks']) > 1): ?>
+                        <?= $notification['title'] ?>
+                    <?php else: ?>
+                        <?= $this->url->link($notification['title'], 'task', 'show', array('task_id' => $notification['event_data']['tasks'][0]['id'], 'project_id' => $notification['event_data']['tasks'][0]['project_id'])) ?>
+                    <?php endif ?>
+                <?php else: ?>
+                    <?= $this->url->link($notification['title'], 'task', 'show', array('task_id' => $notification['event_data']['task']['id'], 'project_id' => $notification['event_data']['task']['project_id'])) ?>
+                <?php endif ?>
+            </td>
+            <td>
+                <?= $this->dt->datetime($notification['date_creation']) ?>
+            </td>
+            <td>
+                <i class="fa fa-check fa-fw"></i>
+                <?= $this->url->link(t('Mark as read'), 'webNotification', 'remove', array('user_id' => $user['id'], 'notification_id' => $notification['id'])) ?>
+            </td>
+        </tr>
+        <?php endforeach ?>
+    </table>
+<?php endif ?>
\ No newline at end of file
diff --git a/app/Template/dashboard/projects.php b/app/Template/dashboard/projects.php
new file mode 100644
index 00000000..cdf19bdf
--- /dev/null
+++ b/app/Template/dashboard/projects.php
@@ -0,0 +1,50 @@
+<div class="page-header">
+    <h2><?= $this->url->link(t('My projects'), 'DashboardController', 'projects', array('user_id' => $user['id'])) ?> (<?= $paginator->getTotal() ?>)</h2>
+</div>
+<?php if ($paginator->isEmpty()): ?>
+    <p class="alert"><?= t('Your are not member of any project.') ?></p>
+<?php else: ?>
+    <table class="table-fixed table-small">
+        <tr>
+            <th class="column-5"><?= $paginator->order('Id', 'id') ?></th>
+            <th class="column-3"><?= $paginator->order('<i class="fa fa-lock fa-fw" title="'.t('Private project').'"></i>', 'is_private') ?></th>
+            <th class="column-25"><?= $paginator->order(t('Project'), \Kanboard\Model\Project::TABLE.'.name') ?></th>
+            <th><?= t('Columns') ?></th>
+        </tr>
+        <?php foreach ($paginator->getCollection() as $project): ?>
+        <tr>
+            <td>
+                <?= $this->render('project/dropdown', array('project' => $project)) ?>
+            </td>
+            <td>
+                <?php if ($project['is_private']): ?>
+                    <i class="fa fa-lock fa-fw" title="<?= t('Private project') ?>"></i>
+                <?php endif ?>
+            </td>
+            <td>
+                <?php if ($this->user->hasProjectAccess('gantt', 'project', $project['id'])): ?>
+                    <?= $this->url->link('<i class="fa fa-sliders fa-fw"></i>', 'gantt', 'project', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?>
+                <?php endif ?>
+
+                <?= $this->url->link('<i class="fa fa-list"></i>', 'listing', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('List')) ?>&nbsp;
+                <?= $this->url->link('<i class="fa fa-calendar"></i>', 'calendar', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Calendar')) ?>&nbsp;
+
+                <?= $this->url->link($this->text->e($project['name']), 'board', 'show', array('project_id' => $project['id'])) ?>
+                <?php if (! empty($project['description'])): ?>
+                    <span class="tooltip" title="<?= $this->text->markdownAttribute($project['description']) ?>">
+                        <i class="fa fa-info-circle"></i>
+                    </span>
+                <?php endif ?>
+            </td>
+            <td class="dashboard-project-stats">
+                <?php foreach ($project['columns'] as $column): ?>
+                    <strong title="<?= t('Task count') ?>"><?= $column['nb_tasks'] ?></strong>
+                    <span><?= $this->text->e($column['title']) ?></span>
+                <?php endforeach ?>
+            </td>
+        </tr>
+        <?php endforeach ?>
+    </table>
+
+    <?= $paginator ?>
+<?php endif ?>
diff --git a/app/Template/dashboard/show.php b/app/Template/dashboard/show.php
new file mode 100644
index 00000000..bc4e2952
--- /dev/null
+++ b/app/Template/dashboard/show.php
@@ -0,0 +1,12 @@
+<div class="filter-box">
+    <form method="get" action="<?= $this->url->dir() ?>" class="search">
+        <?= $this->form->hidden('controller', array('controller' => 'search')) ?>
+        <?= $this->form->hidden('action', array('action' => 'index')) ?>
+        <?= $this->form->text('search', array(), array(), array('placeholder="'.t('Search').'"'), 'form-input-large') ?>
+        <?= $this->render('app/filters_helper') ?>
+    </form>
+</div>
+
+<?= $this->render('dashboard/projects', array('paginator' => $project_paginator, 'user' => $user)) ?>
+<?= $this->render('dashboard/tasks', array('paginator' => $task_paginator, 'user' => $user)) ?>
+<?= $this->render('dashboard/subtasks', array('paginator' => $subtask_paginator, 'user' => $user)) ?>
diff --git a/app/Template/dashboard/sidebar.php b/app/Template/dashboard/sidebar.php
new file mode 100644
index 00000000..86cc20f8
--- /dev/null
+++ b/app/Template/dashboard/sidebar.php
@@ -0,0 +1,27 @@
+<div class="sidebar">
+    <h2><?= $this->text->e($user['name'] ?: $user['username']) ?></h2>
+    <ul>
+        <li <?= $this->app->checkMenuSelection('DashboardController', 'show') ?>>
+            <?= $this->url->link(t('Overview'), 'DashboardController', 'show', array('user_id' => $user['id'])) ?>
+        </li>
+        <li <?= $this->app->checkMenuSelection('DashboardController', 'projects') ?>>
+            <?= $this->url->link(t('My projects'), 'DashboardController', 'projects', array('user_id' => $user['id'])) ?>
+        </li>
+        <li <?= $this->app->checkMenuSelection('DashboardController', 'tasks') ?>>
+            <?= $this->url->link(t('My tasks'), 'DashboardController', 'tasks', array('user_id' => $user['id'])) ?>
+        </li>
+        <li <?= $this->app->checkMenuSelection('DashboardController', 'subtasks') ?>>
+            <?= $this->url->link(t('My subtasks'), 'DashboardController', 'subtasks', array('user_id' => $user['id'])) ?>
+        </li>
+        <li <?= $this->app->checkMenuSelection('DashboardController', 'calendar') ?>>
+            <?= $this->url->link(t('My calendar'), 'DashboardController', 'calendar', array('user_id' => $user['id'])) ?>
+        </li>
+        <li <?= $this->app->checkMenuSelection('DashboardController', 'activity') ?>>
+            <?= $this->url->link(t('My activity stream'), 'DashboardController', 'activity', array('user_id' => $user['id'])) ?>
+        </li>
+        <li <?= $this->app->checkMenuSelection('DashboardController', 'notifications') ?>>
+            <?= $this->url->link(t('My notifications'), 'DashboardController', 'notifications', array('user_id' => $user['id'])) ?>
+        </li>
+        <?= $this->hook->render('template:dashboard:sidebar') ?>
+    </ul>
+</div>
diff --git a/app/Template/dashboard/subtasks.php b/app/Template/dashboard/subtasks.php
new file mode 100644
index 00000000..ee6caf02
--- /dev/null
+++ b/app/Template/dashboard/subtasks.php
@@ -0,0 +1,43 @@
+<div class="page-header">
+    <h2><?= $this->url->link(t('My subtasks'), 'DashboardController', 'subtasks', array('user_id' => $user['id'])) ?> (<?= $paginator->getTotal() ?>)</h2>
+</div>
+<?php if ($paginator->isEmpty()): ?>
+    <p class="alert"><?= t('There is nothing assigned to you.') ?></p>
+<?php else: ?>
+    <table class="table-fixed table-small">
+        <tr>
+            <th class="column-5"><?= $paginator->order('Id', 'tasks.id') ?></th>
+            <th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></th>
+            <th><?= $paginator->order(t('Task'), 'task_name') ?></th>
+            <th><?= $paginator->order(t('Subtask'), 'title') ?></th>
+            <th class="column-20"><?= t('Time tracking') ?></th>
+        </tr>
+        <?php foreach ($paginator->getCollection() as $subtask): ?>
+        <tr>
+            <td class="task-table color-<?= $subtask['color_id'] ?>">
+                <?= $this->render('task/dropdown', array('task' => array('id' => $subtask['task_id'], 'project_id' => $subtask['project_id']))) ?>
+            </td>
+            <td>
+                <?= $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'])) ?>
+            </td>
+            <td>
+                <?= $this->subtask->toggleStatus($subtask, $subtask['project_id']) ?>
+            </td>
+            <td>
+                <?php if (! empty($subtask['time_spent'])): ?>
+                    <strong><?= $this->text->e($subtask['time_spent']).'h' ?></strong> <?= t('spent') ?>
+                <?php endif ?>
+
+                <?php if (! empty($subtask['time_estimated'])): ?>
+                    <strong><?= $this->text->e($subtask['time_estimated']).'h' ?></strong> <?= t('estimated') ?>
+                <?php endif ?>
+            </td>
+        </tr>
+        <?php endforeach ?>
+    </table>
+
+    <?= $paginator ?>
+<?php endif ?>
diff --git a/app/Template/dashboard/tasks.php b/app/Template/dashboard/tasks.php
new file mode 100644
index 00000000..71b62572
--- /dev/null
+++ b/app/Template/dashboard/tasks.php
@@ -0,0 +1,49 @@
+<div class="page-header">
+    <h2><?= $this->url->link(t('My tasks'), 'DashboardController', 'tasks', array('user_id' => $user['id'])) ?> (<?= $paginator->getTotal() ?>)</h2>
+</div>
+<?php if ($paginator->isEmpty()): ?>
+    <p class="alert"><?= t('There is nothing assigned to you.') ?></p>
+<?php else: ?>
+    <table class="table-fixed table-small">
+        <tr>
+            <th class="column-5"><?= $paginator->order('Id', 'tasks.id') ?></th>
+            <th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></th>
+            <th><?= $paginator->order(t('Task'), 'title') ?></th>
+            <th class="column-5"><?= $paginator->order('Priority', 'tasks.priority') ?></th>
+            <th class="column-20"><?= t('Time tracking') ?></th>
+            <th class="column-20"><?= $paginator->order(t('Due date'), 'date_due') ?></th>
+        </tr>
+        <?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']), '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'])) ?>
+            </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 ?>
+
+                <?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>
+        </tr>
+        <?php endforeach ?>
+    </table>
+
+    <?= $paginator ?>
+<?php endif ?>
diff --git a/app/Template/header.php b/app/Template/header.php
index 3885e671..f47b270f 100644
--- a/app/Template/header.php
+++ b/app/Template/header.php
@@ -2,7 +2,7 @@
     <nav>
         <h1>
             <span class="logo">
-                <?= $this->url->link('K<span>B</span>', 'app', 'index', array(), false, '', t('Dashboard')) ?>
+                <?= $this->url->link('K<span>B</span>', 'DashboardController', 'show', array(), false, '', t('Dashboard')) ?>
             </span>
             <span class="title">
                 <?= $this->text->e($title) ?>
@@ -34,7 +34,7 @@
             <li class="user-links">
                 <?php if ($this->user->hasNotifications()): ?>
                     <span class="notification">
-                        <?= $this->url->link('<i class="fa fa-bell web-notification-icon"></i>', 'app', 'notifications', array('user_id' => $this->user->getId()), false, '', t('Unread notifications')) ?>
+                        <?= $this->url->link('<i class="fa fa-bell web-notification-icon"></i>', 'DashboardController', 'notifications', array('user_id' => $this->user->getId()), false, '', t('Unread notifications')) ?>
                     </span>
                 <?php endif ?>
 
@@ -63,7 +63,7 @@
                         <li class="no-hover"><strong><?= $this->text->e($this->user->getFullname()) ?></strong></li>
                         <li>
                             <i class="fa fa-tachometer fa-fw"></i>
-                            <?= $this->url->link(t('My dashboard'), 'app', 'index', array('user_id' => $this->user->getId())) ?>
+                            <?= $this->url->link(t('My dashboard'), 'DashboardController', 'show', array('user_id' => $this->user->getId())) ?>
                         </li>
                         <li>
                             <i class="fa fa-home fa-fw"></i>
diff --git a/app/Template/layout.php b/app/Template/layout.php
index a80fc288..701b297d 100644
--- a/app/Template/layout.php
+++ b/app/Template/layout.php
@@ -44,7 +44,7 @@
 
         <?= $this->hook->render('template:layout:head') ?>
     </head>
-    <body data-status-url="<?= $this->url->href('app', 'status') ?>"
+    <body data-status-url="<?= $this->url->href('UserHelper', 'status') ?>"
           data-login-url="<?= $this->url->href('auth', 'login') ?>"
           data-keyboard-shortcut-url="<?= $this->url->href('Doc', 'shortcuts') ?>"
           data-timezone="<?= $this->app->getTimezone() ?>"
diff --git a/app/Template/user/sidebar.php b/app/Template/user/sidebar.php
index 5ea2e355..9da43ced 100644
--- a/app/Template/user/sidebar.php
+++ b/app/Template/user/sidebar.php
@@ -8,7 +8,7 @@
         <?php endif ?>
         <?php if ($this->user->isAdmin()): ?>
             <li>
-                <?= $this->url->link(t('User dashboard'), 'app', 'index', array('user_id' => $user['id'])) ?>
+                <?= $this->url->link(t('User dashboard'), 'DashboardController', 'show', array('user_id' => $user['id'])) ?>
             </li>
         <?php endif ?>
         <?php if ($this->user->isAdmin() || $this->user->isCurrentUser($user['id'])): ?>
@@ -80,4 +80,4 @@
 
         <?= $this->hook->render('template:user:sidebar:actions', array('user' => $user)) ?>
     </ul>
-</div>
\ No newline at end of file
+</div>
-- 
cgit v1.2.3