From 50a9e2ba7db6a155cee75771d73c584d721cf687 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Mon, 1 Dec 2014 21:23:46 -0500
Subject: Move project templates to a subfolder

---
 app/Controller/Base.php            |  2 +-
 app/Controller/Project.php         | 56 +++++++++++++-------------------
 app/Template/app/dashboard.php     |  2 +-
 app/Template/project/activity.php  | 16 +++++++++
 app/Template/project/disable.php   | 14 ++++++++
 app/Template/project/duplicate.php | 14 ++++++++
 app/Template/project/edit.php      | 15 +++++++++
 app/Template/project/enable.php    | 14 ++++++++
 app/Template/project/events.php    | 21 ++++++++++++
 app/Template/project/feed.php      | 27 ++++++++++++++++
 app/Template/project/index.php     | 48 +++++++++++++++++++++++++++
 app/Template/project/layout.php    | 16 +++++++++
 app/Template/project/new.php       | 21 ++++++++++++
 app/Template/project/remove.php    | 14 ++++++++
 app/Template/project/search.php    | 30 +++++++++++++++++
 app/Template/project/share.php     | 19 +++++++++++
 app/Template/project/show.php      | 66 ++++++++++++++++++++++++++++++++++++++
 app/Template/project/sidebar.php   | 56 ++++++++++++++++++++++++++++++++
 app/Template/project/tasks.php     | 21 ++++++++++++
 app/Template/project/users.php     | 59 ++++++++++++++++++++++++++++++++++
 app/Template/project_activity.php  | 16 ---------
 app/Template/project_disable.php   | 14 --------
 app/Template/project_duplicate.php | 14 --------
 app/Template/project_edit.php      | 15 ---------
 app/Template/project_enable.php    | 14 --------
 app/Template/project_events.php    | 21 ------------
 app/Template/project_feed.php      | 27 ----------------
 app/Template/project_index.php     | 48 ---------------------------
 app/Template/project_layout.php    | 16 ---------
 app/Template/project_new.php       | 21 ------------
 app/Template/project_remove.php    | 14 --------
 app/Template/project_search.php    | 30 -----------------
 app/Template/project_share.php     | 19 -----------
 app/Template/project_show.php      | 66 --------------------------------------
 app/Template/project_sidebar.php   | 56 --------------------------------
 app/Template/project_tasks.php     | 21 ------------
 app/Template/project_users.php     | 57 --------------------------------
 app/Template/task_public.php       |  2 +-
 38 files changed, 496 insertions(+), 506 deletions(-)
 create mode 100644 app/Template/project/activity.php
 create mode 100644 app/Template/project/disable.php
 create mode 100644 app/Template/project/duplicate.php
 create mode 100644 app/Template/project/edit.php
 create mode 100644 app/Template/project/enable.php
 create mode 100644 app/Template/project/events.php
 create mode 100644 app/Template/project/feed.php
 create mode 100644 app/Template/project/index.php
 create mode 100644 app/Template/project/layout.php
 create mode 100644 app/Template/project/new.php
 create mode 100644 app/Template/project/remove.php
 create mode 100644 app/Template/project/search.php
 create mode 100644 app/Template/project/share.php
 create mode 100644 app/Template/project/show.php
 create mode 100644 app/Template/project/sidebar.php
 create mode 100644 app/Template/project/tasks.php
 create mode 100644 app/Template/project/users.php
 delete mode 100644 app/Template/project_activity.php
 delete mode 100644 app/Template/project_disable.php
 delete mode 100644 app/Template/project_duplicate.php
 delete mode 100644 app/Template/project_edit.php
 delete mode 100644 app/Template/project_enable.php
 delete mode 100644 app/Template/project_events.php
 delete mode 100644 app/Template/project_feed.php
 delete mode 100644 app/Template/project_index.php
 delete mode 100644 app/Template/project_layout.php
 delete mode 100644 app/Template/project_new.php
 delete mode 100644 app/Template/project_remove.php
 delete mode 100644 app/Template/project_search.php
 delete mode 100644 app/Template/project_share.php
 delete mode 100644 app/Template/project_show.php
 delete mode 100644 app/Template/project_sidebar.php
 delete mode 100644 app/Template/project_tasks.php
 delete mode 100644 app/Template/project_users.php

(limited to 'app')

diff --git a/app/Controller/Base.php b/app/Controller/Base.php
index 92a3d068..9f799a8f 100644
--- a/app/Controller/Base.php
+++ b/app/Controller/Base.php
@@ -300,7 +300,7 @@ abstract class Base
         $params['title'] = $params['project']['name'] === $params['title'] ? $params['title'] : $params['project']['name'].' &gt; '.$params['title'];
         $params['board_selector'] = $this->projectPermission->getAllowedProjects($this->acl->getUserId());
 
-        return $this->template->layout('project_layout', $params);
+        return $this->template->layout('project/layout', $params);
     }
 
     /**
diff --git a/app/Controller/Project.php b/app/Controller/Project.php
index fc5ffea4..83c81cae 100644
--- a/app/Controller/Project.php
+++ b/app/Controller/Project.php
@@ -33,7 +33,7 @@ class Project extends Base
             }
         }
 
-        $this->response->html($this->template->layout('project_index', array(
+        $this->response->html($this->template->layout('project/index', array(
             'board_selector' => $this->projectPermission->getAllowedProjects($this->acl->getUserId()),
             'active_projects' => $active_projects,
             'inactive_projects' => $inactive_projects,
@@ -51,7 +51,7 @@ class Project extends Base
     {
         $project = $this->getProject();
 
-        $this->response->html($this->projectLayout('project_show', array(
+        $this->response->html($this->projectLayout('project/show', array(
             'project' => $project,
             'stats' => $this->project->getStats($project['id']),
             'webhook_token' => $this->config->get('webhook_token'),
@@ -148,7 +148,7 @@ class Project extends Base
             $this->response->redirect('?controller=project&action=share&project_id='.$project['id']);
         }
 
-        $this->response->html($this->projectLayout('project_share', array(
+        $this->response->html($this->projectLayout('project/share', array(
             'project' => $project,
             'title' => t('Public access'),
         )));
@@ -159,13 +159,13 @@ class Project extends Base
      *
      * @access public
      */
-    public function edit()
+    public function edit(array $values = array(), array $errors = array())
     {
         $project = $this->getProjectManagement();
 
-        $this->response->html($this->projectLayout('project_edit', array(
-            'errors' => array(),
-            'values' => $project,
+        $this->response->html($this->projectLayout('project/edit', array(
+            'values' => empty($values) ? $project : $values,
+            'errors' => $errors,
             'project' => $project,
             'title' => t('Edit project')
         )));
@@ -193,12 +193,7 @@ class Project extends Base
             }
         }
 
-        $this->response->html($this->projectLayout('project_edit', array(
-            'errors' => $errors,
-            'values' => $values,
-            'project' => $project,
-            'title' => t('Edit Project')
-        )));
+        $this->edit($values, $errors);
     }
 
     /**
@@ -210,7 +205,7 @@ class Project extends Base
     {
         $project = $this->getProjectManagement();
 
-        $this->response->html($this->projectLayout('project_users', array(
+        $this->response->html($this->projectLayout('project/users', array(
             'project' => $project,
             'users' => $this->projectPermission->getAllUsers($project['id']),
             'title' => t('Edit project access list')
@@ -315,7 +310,7 @@ class Project extends Base
             $this->response->redirect('?controller=project');
         }
 
-        $this->response->html($this->projectLayout('project_remove', array(
+        $this->response->html($this->projectLayout('project/remove', array(
             'project' => $project,
             'title' => t('Remove project')
         )));
@@ -344,7 +339,7 @@ class Project extends Base
             $this->response->redirect('?controller=project');
         }
 
-        $this->response->html($this->projectLayout('project_duplicate', array(
+        $this->response->html($this->projectLayout('project/duplicate', array(
             'project' => $project,
             'title' => t('Clone this project')
         )));
@@ -372,7 +367,7 @@ class Project extends Base
             $this->response->redirect('?controller=project&action=show&project_id='.$project['id']);
         }
 
-        $this->response->html($this->projectLayout('project_disable', array(
+        $this->response->html($this->projectLayout('project/disable', array(
             'project' => $project,
             'title' => t('Project activation')
         )));
@@ -400,7 +395,7 @@ class Project extends Base
             $this->response->redirect('?controller=project&action=show&project_id='.$project['id']);
         }
 
-        $this->response->html($this->projectLayout('project_enable', array(
+        $this->response->html($this->projectLayout('project/enable', array(
             'project' => $project,
             'title' => t('Project activation')
         )));
@@ -421,7 +416,7 @@ class Project extends Base
             $this->forbidden(true);
         }
 
-        $this->response->xml($this->template->load('project_feed', array(
+        $this->response->xml($this->template->load('project/feed', array(
             'events' => $this->projectActivity->getProject($project['id']),
             'project' => $project,
         )));
@@ -436,7 +431,7 @@ class Project extends Base
     {
         $project = $this->getProject();
 
-        $this->response->html($this->template->layout('project_activity', array(
+        $this->response->html($this->template->layout('project/activity', array(
             'board_selector' => $this->projectPermission->getAllowedProjects($this->acl->getUserId()),
             'events' => $this->projectActivity->getProject($project['id']),
             'project' => $project,
@@ -465,7 +460,7 @@ class Project extends Base
             $nb_tasks = $this->taskPaginator->countSearchTasks($project['id'], $search);
         }
 
-        $this->response->html($this->template->layout('project_search', array(
+        $this->response->html($this->template->layout('project/search', array(
             'board_selector' => $this->projectPermission->getAllowedProjects($this->acl->getUserId()),
             'tasks' => $tasks,
             'nb_tasks' => $nb_tasks,
@@ -508,7 +503,7 @@ class Project extends Base
         $tasks = $this->taskPaginator->closedTasks($project['id'], $offset, $limit, $order, $direction);
         $nb_tasks = $this->taskPaginator->countClosedTasks($project['id']);
 
-        $this->response->html($this->template->layout('project_tasks', array(
+        $this->response->html($this->template->layout('project/tasks', array(
             'board_selector' => $this->projectPermission->getAllowedProjects($this->acl->getUserId()),
             'pagination' => array(
                 'controller' => 'project',
@@ -534,16 +529,14 @@ class Project extends Base
      *
      * @access public
      */
-    public function create()
+    public function create(array $values = array(), array $errors = array())
     {
         $is_private = $this->request->getIntegerParam('private', $this->acl->isRegularUser());
 
-        $this->response->html($this->template->layout('project_new', array(
+        $this->response->html($this->template->layout('project/new', array(
             'board_selector' => $this->projectPermission->getAllowedProjects($this->acl->getUserId()),
-            'errors' => array(),
-            'values' => array(
-                'is_private' => $is_private,
-            ),
+            'values' => empty($values) ? array('is_private' => $is_private) : $values,
+            'errors' => $errors,
             'title' => $is_private ? t('New private project') : t('New project'),
         )));
     }
@@ -571,11 +564,6 @@ class Project extends Base
             }
         }
 
-        $this->response->html($this->template->layout('project_new', array(
-            'board_selector' => $this->projectPermission->getAllowedProjects($this->acl->getUserId()),
-            'errors' => $errors,
-            'values' => $values,
-            'title' => ! empty($values['is_private']) ? t('New private project') : t('New project'),
-        )));
+        $this->create($values, $errors);
     }
 }
diff --git a/app/Template/app/dashboard.php b/app/Template/app/dashboard.php
index 9bcd69f6..22b77eaa 100644
--- a/app/Template/app/dashboard.php
+++ b/app/Template/app/dashboard.php
@@ -20,7 +20,7 @@
         </div>
         <div class="dashboard-right-column">
             <h2><?= t('Activity stream') ?></h2>
-            <?= Helper\template('project_events', array('events' => $events)) ?>
+            <?= Helper\template('project/events', array('events' => $events)) ?>
         </div>
     </section>
 </section>
\ No newline at end of file
diff --git a/app/Template/project/activity.php b/app/Template/project/activity.php
new file mode 100644
index 00000000..cdc25df8
--- /dev/null
+++ b/app/Template/project/activity.php
@@ -0,0 +1,16 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <li><i class="fa fa-table fa-fw"></i><?= Helper\a(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?></li>
+            <li><i class="fa fa-search fa-fw"></i><?= Helper\a(t('Search'), 'project', 'search', array('project_id' => $project['id'])) ?></li>
+            <li><i class="fa fa-check-square-o fa-fw"></i><?= Helper\a(t('Completed tasks'), 'project', 'tasks', array('project_id' => $project['id'])) ?></li>
+        </ul>
+    </div>
+    <section>
+        <?php if ($project['is_public']): ?>
+            <p class="pull-right"><i class="fa fa-rss-square"></i> <?= Helper\a(t('RSS feed'), 'project', 'feed', array('token' => $project['token'])) ?></p>
+        <?php endif ?>
+
+        <?= Helper\template('project/events', array('events' => $events)) ?>
+    </section>
+</section>
\ No newline at end of file
diff --git a/app/Template/project/disable.php b/app/Template/project/disable.php
new file mode 100644
index 00000000..7a729fa3
--- /dev/null
+++ b/app/Template/project/disable.php
@@ -0,0 +1,14 @@
+<div class="page-header">
+    <h2><?= t('Project activation') ?></h2>
+</div>
+
+<div class="confirm">
+    <p class="alert alert-info">
+        <?= t('Do you really want to disable this project: "%s"?', $project['name']) ?>
+    </p>
+
+    <div class="form-actions">
+        <?= Helper\a(t('Yes'), 'project', 'disable', array('project_id' => $project['id'], 'disable' => 'yes'), true, 'btn btn-red') ?>
+        <?= t('or') ?> <?= Helper\a(t('cancel'), 'project', 'show', array('project_id' => $project['id'])) ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Template/project/duplicate.php b/app/Template/project/duplicate.php
new file mode 100644
index 00000000..a926dcd1
--- /dev/null
+++ b/app/Template/project/duplicate.php
@@ -0,0 +1,14 @@
+<div class="page-header">
+    <h2><?= t('Clone this project') ?></h2>
+</div>
+
+<div class="confirm">
+    <p class="alert alert-info">
+        <?= t('Do you really want to duplicate this project: "%s"?', $project['name']) ?>
+    </p>
+
+    <div class="form-actions">
+        <?= Helper\a(t('Yes'), 'project', 'duplicate', array('project_id' => $project['id'], 'duplicate' => 'yes'), true, 'btn btn-red') ?>
+        <?= t('or') ?> <?= Helper\a(t('cancel'), 'project', 'show', array('project_id' => $project['id'])) ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Template/project/edit.php b/app/Template/project/edit.php
new file mode 100644
index 00000000..8eb2110d
--- /dev/null
+++ b/app/Template/project/edit.php
@@ -0,0 +1,15 @@
+<div class="page-header">
+    <h2><?= t('Edit project') ?></h2>
+</div>
+<form method="post" action="<?= Helper\u('project', 'update', array('project_id' => $values['id'])) ?>" autocomplete="off">
+
+    <?= Helper\form_csrf() ?>
+    <?= Helper\form_hidden('id', $values) ?>
+
+    <?= Helper\form_label(t('Name'), 'name') ?>
+    <?= Helper\form_text('name', $values, $errors, array('required')) ?>
+
+    <div class="form-actions">
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/Template/project/enable.php b/app/Template/project/enable.php
new file mode 100644
index 00000000..f2a1b0e7
--- /dev/null
+++ b/app/Template/project/enable.php
@@ -0,0 +1,14 @@
+<div class="page-header">
+    <h2><?= t('Project activation') ?></h2>
+</div>
+
+<div class="confirm">
+    <p class="alert alert-info">
+        <?= t('Do you really want to enable this project: "%s"?', $project['name']) ?>
+    </p>
+
+    <div class="form-actions">
+        <?= Helper\a(t('Yes'), 'project', 'enable', array('project_id' => $project['id'], 'enable' => 'yes'), true, 'btn btn-red') ?>
+        <?= t('or') ?> <?= Helper\a(t('cancel'), 'project', 'show', array('project_id' => $project['id'])) ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Template/project/events.php b/app/Template/project/events.php
new file mode 100644
index 00000000..1b606414
--- /dev/null
+++ b/app/Template/project/events.php
@@ -0,0 +1,21 @@
+<?php if (empty($events)): ?>
+    <p class="alert"><?= t('No activity.') ?></p>
+<?php else: ?>
+
+    <?php foreach ($events as $event): ?>
+        <div class="activity-event">
+            <p class="activity-datetime">
+                <?php if (Helper\contains($event['event_name'], 'subtask')): ?>
+                    <i class="fa fa-tasks"></i>
+                <?php elseif (Helper\contains($event['event_name'], 'task')): ?>
+                    <i class="fa fa-newspaper-o"></i>
+                <?php elseif (Helper\contains($event['event_name'], 'comment')): ?>
+                    <i class="fa fa-comments-o"></i>
+                <?php endif ?>
+                &nbsp;<?= dt('%B %e, %Y at %k:%M %p', $event['date_creation']) ?>
+            </p>
+            <div class="activity-content"><?= $event['event_content'] ?></div>
+        </div>
+    <?php endforeach ?>
+
+<?php endif ?>
\ No newline at end of file
diff --git a/app/Template/project/feed.php b/app/Template/project/feed.php
new file mode 100644
index 00000000..9d10ecb1
--- /dev/null
+++ b/app/Template/project/feed.php
@@ -0,0 +1,27 @@
+<?= '<?xml version="1.0" encoding="utf-8"?>' ?>
+<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom">
+    <title><?= t('%s\'s activity', $project['name']) ?></title>
+    <link rel="alternate" type="text/html" href="<?= Helper\get_current_base_url() ?>"/>
+    <link rel="self" type="application/atom+xml" href="<?= Helper\get_current_base_url().Helper\u('project', 'feed', array('token' => $project['token'])) ?>"/>
+    <updated><?= date(DATE_ATOM) ?></updated>
+    <id><?= Helper\get_current_base_url() ?></id>
+    <icon><?= Helper\get_current_base_url() ?>assets/img/favicon.png</icon>
+
+    <?php foreach ($events as $e): ?>
+    <entry>
+        <title type="text"><?= $e['event_title'] ?></title>
+        <link rel="alternate" href="<?= Helper\get_current_base_url().Helper\u('task', 'show', array('task_id' => $e['task_id'])) ?>"/>
+        <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>
+        <author>
+            <name><?= Helper\escape($e['author']) ?></name>
+        </author>
+        <content type="html">
+            <![CDATA[
+                <?= $e['event_content'] ?>
+            ]]>
+        </content>
+    </entry>
+    <?php endforeach ?>
+</feed>
\ No newline at end of file
diff --git a/app/Template/project/index.php b/app/Template/project/index.php
new file mode 100644
index 00000000..6c04449e
--- /dev/null
+++ b/app/Template/project/index.php
@@ -0,0 +1,48 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <?php if (Helper\is_admin()): ?>
+                <li><i class="fa fa-plus fa-fw"></i><?= Helper\a(t('New project'), 'project', 'create') ?></li>
+            <?php endif ?>
+            <li><i class="fa fa-lock fa-fw"></i><?= Helper\a(t('New private project'), 'project', 'create', array('private' => 1)) ?></li>
+        </ul>
+    </div>
+    <section>
+    <?php if (empty($active_projects) && empty($inactive_projects)): ?>
+        <p class="alert"><?= t('No project') ?></p>
+    <?php else: ?>
+
+        <?php if (! empty($active_projects)): ?>
+            <h3><?= t('Active projects') ?></h3>
+            <ul class="project-listing">
+                <?php foreach ($active_projects as $project): ?>
+                    <li>
+                        <?php if ($project['is_public']): ?>
+                            <i class="fa fa-share-alt fa-fw"></i>
+                        <?php endif ?>
+                        <?php if ($project['is_private']): ?>
+                            <i class="fa fa-lock fa-fw"></i>
+                        <?php endif ?>
+                        <?= Helper\a(Helper\escape($project['name']), 'project', 'show', array('project_id' => $project['id'])) ?>
+                    </li>
+                <?php endforeach ?>
+            </ul>
+        <?php endif ?>
+
+        <?php if (! empty($inactive_projects)): ?>
+            <h3><?= t('Inactive projects') ?></h3>
+            <ul class="project-listing">
+                <?php foreach ($inactive_projects as $project): ?>
+                    <li>
+                        <?php if ($project['is_private']): ?>
+                            <i class="fa fa-lock"></i>
+                        <?php endif ?>
+                        <?= Helper\a(Helper\escape($project['name']), 'project', 'show', array('project_id' => $project['id'])) ?>
+                    </li>
+                <?php endforeach ?>
+            </ul>
+        <?php endif ?>
+
+    <?php endif ?>
+    </section>
+</section>
\ No newline at end of file
diff --git a/app/Template/project/layout.php b/app/Template/project/layout.php
new file mode 100644
index 00000000..27a93021
--- /dev/null
+++ b/app/Template/project/layout.php
@@ -0,0 +1,16 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <li><i class="fa fa-table fa-fw"></i><?= Helper\a(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?></li>
+            <li><i class="fa fa-folder fa-fw"></i><?= Helper\a(t('All projects'), 'project', 'index') ?></li>
+        </ul>
+    </div>
+    <section class="sidebar-container" id="project-section">
+
+        <?= Helper\template('project/sidebar', array('project' => $project)) ?>
+
+        <div class="sidebar-content">
+            <?= $project_content_for_layout ?>
+        </div>
+    </section>
+</section>
\ No newline at end of file
diff --git a/app/Template/project/new.php b/app/Template/project/new.php
new file mode 100644
index 00000000..f3926a65
--- /dev/null
+++ b/app/Template/project/new.php
@@ -0,0 +1,21 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <li><i class="fa fa-folder fa-fw"></i><?= Helper\a(t('All projects'), 'project', 'index') ?></li>
+        </ul>
+    </div>
+    <section>
+    <form method="post" action="<?= Helper\u('project', 'save') ?>" autocomplete="off">
+
+        <?= Helper\form_csrf() ?>
+        <?= Helper\form_hidden('is_private', $values) ?>
+        <?= Helper\form_label(t('Name'), 'name') ?>
+        <?= Helper\form_text('name', $values, $errors, array('autofocus', 'required')) ?>
+
+        <div class="form-actions">
+            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+            <?= t('or') ?> <?= Helper\a(t('cancel'), 'project', 'index') ?>
+        </div>
+    </form>
+    </section>
+</section>
\ No newline at end of file
diff --git a/app/Template/project/remove.php b/app/Template/project/remove.php
new file mode 100644
index 00000000..a98f94eb
--- /dev/null
+++ b/app/Template/project/remove.php
@@ -0,0 +1,14 @@
+<div class="page-header">
+    <h2><?= t('Remove project') ?></h2>
+</div>
+
+<div class="confirm">
+    <p class="alert alert-info">
+        <?= t('Do you really want to remove this project: "%s"?', $project['name']) ?>
+    </p>
+
+    <div class="form-actions">
+        <?= Helper\a(t('Yes'), 'project', 'remove', array('project_id' => $project['id'], 'remove' => 'yes'), true, 'btn btn-red') ?>
+        <?= t('or') ?> <?= Helper\a(t('cancel'), 'project', 'show', array('project_id' => $project['id'])) ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Template/project/search.php b/app/Template/project/search.php
new file mode 100644
index 00000000..11e207d2
--- /dev/null
+++ b/app/Template/project/search.php
@@ -0,0 +1,30 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <li><i class="fa fa-table fa-fw"></i><?= Helper\a(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?></li>
+            <li><i class="fa fa-check-square-o fa-fw"></i><?= Helper\a(t('Completed tasks'), 'project', 'tasks', array('project_id' => $project['id'])) ?></li>
+            <li><i class="fa fa-dashboard fa-fw"></i><?= Helper\a(t('Activity'), 'project', 'activity', array('project_id' => $project['id'])) ?></li>
+        </ul>
+    </div>
+    <section>
+    <form method="get" action="?" autocomplete="off">
+        <?= Helper\form_hidden('controller', $values) ?>
+        <?= Helper\form_hidden('action', $values) ?>
+        <?= Helper\form_hidden('project_id', $values) ?>
+        <?= Helper\form_text('search', $values, array(), array('autofocus', 'required', 'placeholder="'.t('Search').'"'), 'form-input-large') ?>
+        <input type="submit" value="<?= t('Search') ?>" class="btn btn-blue"/>
+    </form>
+
+    <?php if (empty($tasks) && ! empty($values['search'])): ?>
+        <p class="alert"><?= t('Nothing found.') ?></p>
+    <?php elseif (! empty($tasks)): ?>
+        <?= Helper\template('task_table', array(
+            'tasks' => $tasks,
+            'categories' => $categories,
+            'columns' => $columns,
+            'pagination' => $pagination,
+        )) ?>
+    <?php endif ?>
+
+    </section>
+</section>
\ No newline at end of file
diff --git a/app/Template/project/share.php b/app/Template/project/share.php
new file mode 100644
index 00000000..8edcbbc0
--- /dev/null
+++ b/app/Template/project/share.php
@@ -0,0 +1,19 @@
+<div class="page-header">
+    <h2><?= t('Public access') ?></h2>
+</div>
+
+<?php if ($project['is_public']): ?>
+
+    <div class="listing">
+        <ul class="no-bullet">
+            <li><strong><i class="fa fa-share-alt"></i> <?= Helper\a(t('Public link'), 'board', 'readonly', array('token' => $project['token'])) ?></strong></li>
+            <li><strong><i class="fa fa-rss-square"></i> <?= Helper\a(t('RSS feed'), 'project', 'feed', array('token' => $project['token'])) ?></strong></li>
+        </ul>
+        <input type="text" readonly="readonly" value="<?= Helper\get_current_base_url().Helper\u('board', 'readonly', array('token' => $project['token'])) ?>"/>
+    </div>
+
+    <?= Helper\a(t('Disable public access'), 'project', 'share', array('project_id' => $project['id'], 'switch' => 'disable'), true, 'btn btn-red') ?>
+
+<?php else: ?>
+    <?= Helper\a(t('Enable public access'), 'project', 'share', array('project_id' => $project['id'], 'switch' => 'enable'), true, 'btn btn-blue') ?>
+<?php endif ?>
diff --git a/app/Template/project/show.php b/app/Template/project/show.php
new file mode 100644
index 00000000..907d1b70
--- /dev/null
+++ b/app/Template/project/show.php
@@ -0,0 +1,66 @@
+<div class="page-header">
+    <h2><?= t('Summary') ?></h2>
+</div>
+<ul class="listing">
+    <li><strong><?= $project['is_active'] ? t('Active') : t('Inactive') ?></strong></li>
+
+    <?php if ($project['is_private']): ?>
+        <li><i class="fa fa-lock"></i> <?= t('This project is private') ?></li>
+    <?php endif ?>
+
+    <?php if ($project['is_public']): ?>
+        <li><i class="fa fa-share-alt"></i> <?= Helper\a(t('Public link'), 'board', 'readonly', array('token' => $project['token'])) ?></li>
+        <li><i class="fa fa-rss-square"></i> <?= Helper\a(t('RSS feed'), 'project', 'feed', array('token' => $project['token'])) ?></li>
+    <?php else: ?>
+        <li><?= t('Public access disabled') ?></li>
+    <?php endif ?>
+
+    <?php if ($project['last_modified']): ?>
+        <li><?= dt('Last modified on %B %e, %Y at %k:%M %p', $project['last_modified']) ?></li>
+    <?php endif ?>
+
+    <?php if ($stats['nb_tasks'] > 0): ?>
+
+        <?php if ($stats['nb_active_tasks'] > 0): ?>
+            <li><?= Helper\a(t('%d tasks on the board', $stats['nb_active_tasks']), 'board', 'show', array('project_id' => $project['id'])) ?></li>
+        <?php endif ?>
+
+        <?php if ($stats['nb_inactive_tasks'] > 0): ?>
+            <li><?= Helper\a(t('%d closed tasks', $stats['nb_inactive_tasks']), 'project', 'tasks', array('project_id' => $project['id'])) ?></li>
+        <?php endif ?>
+
+        <li><?= t('%d tasks in total', $stats['nb_tasks']) ?></li>
+
+    <?php else: ?>
+        <li><?= t('No task for this project') ?></li>
+    <?php endif ?>
+</ul>
+
+<div class="page-header">
+    <h2><?= t('Board') ?></h2>
+</div>
+<table class="table-stripped">
+    <tr>
+        <th width="50%"><?= t('Column') ?></th>
+        <th><?= t('Task limit') ?></th>
+        <th><?= t('Active tasks') ?></th>
+    </tr>
+    <?php foreach ($stats['columns'] as $column): ?>
+    <tr>
+        <td><?= Helper\escape($column['title']) ?></td>
+        <td><?= $column['task_limit'] ?: '∞' ?></td>
+        <td><?= $column['nb_active_tasks'] ?></td>
+    </tr>
+    <?php endforeach ?>
+</table>
+
+<?php if (Helper\is_admin()): ?>
+<div class="page-header">
+    <h2><?= t('Integration') ?></h2>
+</div>
+
+<h3><i class="fa fa-github fa-fw"></i><?= t('Github webhook') ?></h3>
+<input type="text" readonly="readonly" value="<?= Helper\get_current_base_url().Helper\u('webhook', 'github', array('token' => $webhook_token, 'project_id' => $project['id'])) ?>"/><br/>
+<p class="form-help"><a href="http://kanboard.net/documentation/github-webhooks" target="_blank"><?= t('Help on Github webhook') ?></a></p>
+
+<?php endif ?>
diff --git a/app/Template/project/sidebar.php b/app/Template/project/sidebar.php
new file mode 100644
index 00000000..376a1427
--- /dev/null
+++ b/app/Template/project/sidebar.php
@@ -0,0 +1,56 @@
+<div class="sidebar">
+    <h2><?= t('Actions') ?></h2>
+    <ul>
+        <li>
+            <?= Helper\a(t('Summary'), 'project', 'show', array('project_id' => $project['id'])) ?>
+        </li>
+
+        <?php if (Helper\is_admin() || $project['is_private']): ?>
+        <li>
+            <?= Helper\a(t('Public access'), 'project', 'share', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Edit project'), 'project', 'edit', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Edit board'), 'board', 'edit', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Category management'), 'category', 'index', array('project_id' => $project['id'])) ?>
+        </li>
+        <?php if (Helper\is_admin()): ?>
+            <li>
+                <?= Helper\a(t('User management'), 'project', 'users', array('project_id' => $project['id'])) ?>
+            </li>
+        <?php endif ?>
+        <li>
+            <?= Helper\a(t('Automatic actions'), 'action', 'index', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Duplicate'), 'project', 'duplicate', array('project_id' => $project['id']), true) ?>
+        </li>
+        <li>
+            <?php if ($project['is_active']): ?>
+                <?= Helper\a(t('Disable'), 'project', 'disable', array('project_id' => $project['id']), true) ?>
+            <?php else: ?>
+                <?= Helper\a(t('Enable'), 'project', 'enable', array('project_id' => $project['id']), true) ?>
+            <?php endif ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Remove'), 'project', 'remove', array('project_id' => $project['id'])) ?>
+        </li>
+        <?php endif ?>
+    </ul>
+
+    <?php if (Helper\is_admin() || $project['is_private']): ?>
+    <h2><?= t('Exports') ?></h2>
+    <ul>
+        <li>
+            <?= Helper\a(t('Tasks'), 'project', 'exportTasks', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Daily project summary'), 'project', 'exportDailyProjectSummary', array('project_id' => $project['id'])) ?>
+        </li>
+    </li>
+    <?php endif ?>
+</div>
\ No newline at end of file
diff --git a/app/Template/project/tasks.php b/app/Template/project/tasks.php
new file mode 100644
index 00000000..638e4c31
--- /dev/null
+++ b/app/Template/project/tasks.php
@@ -0,0 +1,21 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <li><i class="fa fa-table fa-fw"></i><?= Helper\a(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?></li>
+            <li><i class="fa fa-search fa-fw"></i><?= Helper\a(t('Search'), 'project', 'search', array('project_id' => $project['id'])) ?></li>
+            <li><i class="fa fa-dashboard fa-fw"></i><?= Helper\a(t('Activity'), 'project', 'activity', array('project_id' => $project['id'])) ?></li>
+        </ul>
+    </div>
+    <section>
+    <?php if (empty($tasks)): ?>
+        <p class="alert"><?= t('No task') ?></p>
+    <?php else: ?>
+        <?= Helper\template('task_table', array(
+            'tasks' => $tasks,
+            'categories' => $categories,
+            'columns' => $columns,
+            'pagination' => $pagination,
+        )) ?>
+    <?php endif ?>
+    </section>
+</section>
\ No newline at end of file
diff --git a/app/Template/project/users.php b/app/Template/project/users.php
new file mode 100644
index 00000000..0908533f
--- /dev/null
+++ b/app/Template/project/users.php
@@ -0,0 +1,59 @@
+<div class="page-header">
+    <h2><?= t('List of authorized users') ?></h2>
+</div>
+
+<?php if ($project['is_everybody_allowed']): ?>
+    <div class="alert alert-info"><?= t('Everybody have access to this project.') ?></div>
+<?php else: ?>
+
+    <?php if (empty($users['allowed'])): ?>
+        <div class="alert alert-error"><?= t('Nobody have access to this project.') ?></div>
+    <?php else: ?>
+    <div class="alert alert-info">
+        <p><?= t('Only those users have access to this project:') ?></p>
+        <ul>
+        <?php foreach ($users['allowed'] as $user_id => $username): ?>
+            <li>
+                <strong><?= Helper\escape($username) ?></strong>
+                <?php if ($project['is_private'] == 0): ?>
+                    (<?= Helper\a(t('revoke'), 'project', 'revoke', array('project_id' => $project['id'], 'user_id' => $user_id), true) ?>)
+                <?php endif ?>
+            </li>
+        <?php endforeach ?>
+        </ul>
+        <p><?= t('Don\'t forget that administrators have access to everything.') ?></p>
+    </div>
+    <?php endif ?>
+
+    <?php if ($project['is_private'] == 0 && ! empty($users['not_allowed'])): ?>
+        <hr/>
+        <form method="post" action="<?= Helper\u('project', 'allow', array('project_id' => $project['id'])) ?>" autocomplete="off">
+
+            <?= Helper\form_csrf() ?>
+
+            <?= Helper\form_hidden('project_id', array('project_id' => $project['id'])) ?>
+
+            <?= Helper\form_label(t('User'), 'user_id') ?>
+            <?= Helper\form_select('user_id', $users['not_allowed']) ?><br/>
+
+            <div class="form-actions">
+                <input type="submit" value="<?= t('Allow this user') ?>" class="btn btn-blue"/>
+            </div>
+        </form>
+    <?php endif ?>
+
+<?php endif ?>
+
+<?php if ($project['is_private'] == 0): ?>
+<hr/>
+<form method="post" action="<?= Helper\u('project', 'allowEverybody', array('project_id' => $project['id'])) ?>">
+    <?= Helper\form_csrf() ?>
+
+    <?= Helper\form_hidden('id', array('id' => $project['id'])) ?>
+    <?= Helper\form_checkbox('is_everybody_allowed', t('Allow everybody to access to this project'), 1, $project['is_everybody_allowed']) ?>
+
+    <div class="form-actions">
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+    </div>
+</form>
+<?php endif ?>
diff --git a/app/Template/project_activity.php b/app/Template/project_activity.php
deleted file mode 100644
index d60dfb8f..00000000
--- a/app/Template/project_activity.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li><i class="fa fa-table fa-fw"></i><?= Helper\a(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?></li>
-            <li><i class="fa fa-search fa-fw"></i><?= Helper\a(t('Search'), 'project', 'search', array('project_id' => $project['id'])) ?></li>
-            <li><i class="fa fa-check-square-o fa-fw"></i><?= Helper\a(t('Completed tasks'), 'project', 'tasks', array('project_id' => $project['id'])) ?></li>
-        </ul>
-    </div>
-    <section>
-        <?php if ($project['is_public']): ?>
-            <p class="pull-right"><i class="fa fa-rss-square"></i> <?= Helper\a(t('RSS feed'), 'project', 'feed', array('token' => $project['token'])) ?></p>
-        <?php endif ?>
-
-        <?= Helper\template('project_events', array('events' => $events)) ?>
-    </section>
-</section>
\ No newline at end of file
diff --git a/app/Template/project_disable.php b/app/Template/project_disable.php
deleted file mode 100644
index 7a729fa3..00000000
--- a/app/Template/project_disable.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Project activation') ?></h2>
-</div>
-
-<div class="confirm">
-    <p class="alert alert-info">
-        <?= t('Do you really want to disable this project: "%s"?', $project['name']) ?>
-    </p>
-
-    <div class="form-actions">
-        <?= Helper\a(t('Yes'), 'project', 'disable', array('project_id' => $project['id'], 'disable' => 'yes'), true, 'btn btn-red') ?>
-        <?= t('or') ?> <?= Helper\a(t('cancel'), 'project', 'show', array('project_id' => $project['id'])) ?>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/Template/project_duplicate.php b/app/Template/project_duplicate.php
deleted file mode 100644
index a926dcd1..00000000
--- a/app/Template/project_duplicate.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Clone this project') ?></h2>
-</div>
-
-<div class="confirm">
-    <p class="alert alert-info">
-        <?= t('Do you really want to duplicate this project: "%s"?', $project['name']) ?>
-    </p>
-
-    <div class="form-actions">
-        <?= Helper\a(t('Yes'), 'project', 'duplicate', array('project_id' => $project['id'], 'duplicate' => 'yes'), true, 'btn btn-red') ?>
-        <?= t('or') ?> <?= Helper\a(t('cancel'), 'project', 'show', array('project_id' => $project['id'])) ?>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/Template/project_edit.php b/app/Template/project_edit.php
deleted file mode 100644
index 8eb2110d..00000000
--- a/app/Template/project_edit.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Edit project') ?></h2>
-</div>
-<form method="post" action="<?= Helper\u('project', 'update', array('project_id' => $values['id'])) ?>" autocomplete="off">
-
-    <?= Helper\form_csrf() ?>
-    <?= Helper\form_hidden('id', $values) ?>
-
-    <?= Helper\form_label(t('Name'), 'name') ?>
-    <?= Helper\form_text('name', $values, $errors, array('required')) ?>
-
-    <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-    </div>
-</form>
\ No newline at end of file
diff --git a/app/Template/project_enable.php b/app/Template/project_enable.php
deleted file mode 100644
index f2a1b0e7..00000000
--- a/app/Template/project_enable.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Project activation') ?></h2>
-</div>
-
-<div class="confirm">
-    <p class="alert alert-info">
-        <?= t('Do you really want to enable this project: "%s"?', $project['name']) ?>
-    </p>
-
-    <div class="form-actions">
-        <?= Helper\a(t('Yes'), 'project', 'enable', array('project_id' => $project['id'], 'enable' => 'yes'), true, 'btn btn-red') ?>
-        <?= t('or') ?> <?= Helper\a(t('cancel'), 'project', 'show', array('project_id' => $project['id'])) ?>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/Template/project_events.php b/app/Template/project_events.php
deleted file mode 100644
index 1b606414..00000000
--- a/app/Template/project_events.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php if (empty($events)): ?>
-    <p class="alert"><?= t('No activity.') ?></p>
-<?php else: ?>
-
-    <?php foreach ($events as $event): ?>
-        <div class="activity-event">
-            <p class="activity-datetime">
-                <?php if (Helper\contains($event['event_name'], 'subtask')): ?>
-                    <i class="fa fa-tasks"></i>
-                <?php elseif (Helper\contains($event['event_name'], 'task')): ?>
-                    <i class="fa fa-newspaper-o"></i>
-                <?php elseif (Helper\contains($event['event_name'], 'comment')): ?>
-                    <i class="fa fa-comments-o"></i>
-                <?php endif ?>
-                &nbsp;<?= dt('%B %e, %Y at %k:%M %p', $event['date_creation']) ?>
-            </p>
-            <div class="activity-content"><?= $event['event_content'] ?></div>
-        </div>
-    <?php endforeach ?>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/app/Template/project_feed.php b/app/Template/project_feed.php
deleted file mode 100644
index 9d10ecb1..00000000
--- a/app/Template/project_feed.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?= '<?xml version="1.0" encoding="utf-8"?>' ?>
-<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom">
-    <title><?= t('%s\'s activity', $project['name']) ?></title>
-    <link rel="alternate" type="text/html" href="<?= Helper\get_current_base_url() ?>"/>
-    <link rel="self" type="application/atom+xml" href="<?= Helper\get_current_base_url().Helper\u('project', 'feed', array('token' => $project['token'])) ?>"/>
-    <updated><?= date(DATE_ATOM) ?></updated>
-    <id><?= Helper\get_current_base_url() ?></id>
-    <icon><?= Helper\get_current_base_url() ?>assets/img/favicon.png</icon>
-
-    <?php foreach ($events as $e): ?>
-    <entry>
-        <title type="text"><?= $e['event_title'] ?></title>
-        <link rel="alternate" href="<?= Helper\get_current_base_url().Helper\u('task', 'show', array('task_id' => $e['task_id'])) ?>"/>
-        <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>
-        <author>
-            <name><?= Helper\escape($e['author']) ?></name>
-        </author>
-        <content type="html">
-            <![CDATA[
-                <?= $e['event_content'] ?>
-            ]]>
-        </content>
-    </entry>
-    <?php endforeach ?>
-</feed>
\ No newline at end of file
diff --git a/app/Template/project_index.php b/app/Template/project_index.php
deleted file mode 100644
index 6c04449e..00000000
--- a/app/Template/project_index.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <?php if (Helper\is_admin()): ?>
-                <li><i class="fa fa-plus fa-fw"></i><?= Helper\a(t('New project'), 'project', 'create') ?></li>
-            <?php endif ?>
-            <li><i class="fa fa-lock fa-fw"></i><?= Helper\a(t('New private project'), 'project', 'create', array('private' => 1)) ?></li>
-        </ul>
-    </div>
-    <section>
-    <?php if (empty($active_projects) && empty($inactive_projects)): ?>
-        <p class="alert"><?= t('No project') ?></p>
-    <?php else: ?>
-
-        <?php if (! empty($active_projects)): ?>
-            <h3><?= t('Active projects') ?></h3>
-            <ul class="project-listing">
-                <?php foreach ($active_projects as $project): ?>
-                    <li>
-                        <?php if ($project['is_public']): ?>
-                            <i class="fa fa-share-alt fa-fw"></i>
-                        <?php endif ?>
-                        <?php if ($project['is_private']): ?>
-                            <i class="fa fa-lock fa-fw"></i>
-                        <?php endif ?>
-                        <?= Helper\a(Helper\escape($project['name']), 'project', 'show', array('project_id' => $project['id'])) ?>
-                    </li>
-                <?php endforeach ?>
-            </ul>
-        <?php endif ?>
-
-        <?php if (! empty($inactive_projects)): ?>
-            <h3><?= t('Inactive projects') ?></h3>
-            <ul class="project-listing">
-                <?php foreach ($inactive_projects as $project): ?>
-                    <li>
-                        <?php if ($project['is_private']): ?>
-                            <i class="fa fa-lock"></i>
-                        <?php endif ?>
-                        <?= Helper\a(Helper\escape($project['name']), 'project', 'show', array('project_id' => $project['id'])) ?>
-                    </li>
-                <?php endforeach ?>
-            </ul>
-        <?php endif ?>
-
-    <?php endif ?>
-    </section>
-</section>
\ No newline at end of file
diff --git a/app/Template/project_layout.php b/app/Template/project_layout.php
deleted file mode 100644
index 3608df58..00000000
--- a/app/Template/project_layout.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li><i class="fa fa-table fa-fw"></i><?= Helper\a(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?></li>
-            <li><i class="fa fa-folder fa-fw"></i><?= Helper\a(t('All projects'), 'project', 'index') ?></li>
-        </ul>
-    </div>
-    <section class="sidebar-container" id="project-section">
-
-        <?= Helper\template('project_sidebar', array('project' => $project)) ?>
-
-        <div class="sidebar-content">
-            <?= $project_content_for_layout ?>
-        </div>
-    </section>
-</section>
\ No newline at end of file
diff --git a/app/Template/project_new.php b/app/Template/project_new.php
deleted file mode 100644
index f3926a65..00000000
--- a/app/Template/project_new.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li><i class="fa fa-folder fa-fw"></i><?= Helper\a(t('All projects'), 'project', 'index') ?></li>
-        </ul>
-    </div>
-    <section>
-    <form method="post" action="<?= Helper\u('project', 'save') ?>" autocomplete="off">
-
-        <?= Helper\form_csrf() ?>
-        <?= Helper\form_hidden('is_private', $values) ?>
-        <?= Helper\form_label(t('Name'), 'name') ?>
-        <?= Helper\form_text('name', $values, $errors, array('autofocus', 'required')) ?>
-
-        <div class="form-actions">
-            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-            <?= t('or') ?> <?= Helper\a(t('cancel'), 'project', 'index') ?>
-        </div>
-    </form>
-    </section>
-</section>
\ No newline at end of file
diff --git a/app/Template/project_remove.php b/app/Template/project_remove.php
deleted file mode 100644
index a98f94eb..00000000
--- a/app/Template/project_remove.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Remove project') ?></h2>
-</div>
-
-<div class="confirm">
-    <p class="alert alert-info">
-        <?= t('Do you really want to remove this project: "%s"?', $project['name']) ?>
-    </p>
-
-    <div class="form-actions">
-        <?= Helper\a(t('Yes'), 'project', 'remove', array('project_id' => $project['id'], 'remove' => 'yes'), true, 'btn btn-red') ?>
-        <?= t('or') ?> <?= Helper\a(t('cancel'), 'project', 'show', array('project_id' => $project['id'])) ?>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/Template/project_search.php b/app/Template/project_search.php
deleted file mode 100644
index 11e207d2..00000000
--- a/app/Template/project_search.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li><i class="fa fa-table fa-fw"></i><?= Helper\a(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?></li>
-            <li><i class="fa fa-check-square-o fa-fw"></i><?= Helper\a(t('Completed tasks'), 'project', 'tasks', array('project_id' => $project['id'])) ?></li>
-            <li><i class="fa fa-dashboard fa-fw"></i><?= Helper\a(t('Activity'), 'project', 'activity', array('project_id' => $project['id'])) ?></li>
-        </ul>
-    </div>
-    <section>
-    <form method="get" action="?" autocomplete="off">
-        <?= Helper\form_hidden('controller', $values) ?>
-        <?= Helper\form_hidden('action', $values) ?>
-        <?= Helper\form_hidden('project_id', $values) ?>
-        <?= Helper\form_text('search', $values, array(), array('autofocus', 'required', 'placeholder="'.t('Search').'"'), 'form-input-large') ?>
-        <input type="submit" value="<?= t('Search') ?>" class="btn btn-blue"/>
-    </form>
-
-    <?php if (empty($tasks) && ! empty($values['search'])): ?>
-        <p class="alert"><?= t('Nothing found.') ?></p>
-    <?php elseif (! empty($tasks)): ?>
-        <?= Helper\template('task_table', array(
-            'tasks' => $tasks,
-            'categories' => $categories,
-            'columns' => $columns,
-            'pagination' => $pagination,
-        )) ?>
-    <?php endif ?>
-
-    </section>
-</section>
\ No newline at end of file
diff --git a/app/Template/project_share.php b/app/Template/project_share.php
deleted file mode 100644
index 8edcbbc0..00000000
--- a/app/Template/project_share.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Public access') ?></h2>
-</div>
-
-<?php if ($project['is_public']): ?>
-
-    <div class="listing">
-        <ul class="no-bullet">
-            <li><strong><i class="fa fa-share-alt"></i> <?= Helper\a(t('Public link'), 'board', 'readonly', array('token' => $project['token'])) ?></strong></li>
-            <li><strong><i class="fa fa-rss-square"></i> <?= Helper\a(t('RSS feed'), 'project', 'feed', array('token' => $project['token'])) ?></strong></li>
-        </ul>
-        <input type="text" readonly="readonly" value="<?= Helper\get_current_base_url().Helper\u('board', 'readonly', array('token' => $project['token'])) ?>"/>
-    </div>
-
-    <?= Helper\a(t('Disable public access'), 'project', 'share', array('project_id' => $project['id'], 'switch' => 'disable'), true, 'btn btn-red') ?>
-
-<?php else: ?>
-    <?= Helper\a(t('Enable public access'), 'project', 'share', array('project_id' => $project['id'], 'switch' => 'enable'), true, 'btn btn-blue') ?>
-<?php endif ?>
diff --git a/app/Template/project_show.php b/app/Template/project_show.php
deleted file mode 100644
index 907d1b70..00000000
--- a/app/Template/project_show.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Summary') ?></h2>
-</div>
-<ul class="listing">
-    <li><strong><?= $project['is_active'] ? t('Active') : t('Inactive') ?></strong></li>
-
-    <?php if ($project['is_private']): ?>
-        <li><i class="fa fa-lock"></i> <?= t('This project is private') ?></li>
-    <?php endif ?>
-
-    <?php if ($project['is_public']): ?>
-        <li><i class="fa fa-share-alt"></i> <?= Helper\a(t('Public link'), 'board', 'readonly', array('token' => $project['token'])) ?></li>
-        <li><i class="fa fa-rss-square"></i> <?= Helper\a(t('RSS feed'), 'project', 'feed', array('token' => $project['token'])) ?></li>
-    <?php else: ?>
-        <li><?= t('Public access disabled') ?></li>
-    <?php endif ?>
-
-    <?php if ($project['last_modified']): ?>
-        <li><?= dt('Last modified on %B %e, %Y at %k:%M %p', $project['last_modified']) ?></li>
-    <?php endif ?>
-
-    <?php if ($stats['nb_tasks'] > 0): ?>
-
-        <?php if ($stats['nb_active_tasks'] > 0): ?>
-            <li><?= Helper\a(t('%d tasks on the board', $stats['nb_active_tasks']), 'board', 'show', array('project_id' => $project['id'])) ?></li>
-        <?php endif ?>
-
-        <?php if ($stats['nb_inactive_tasks'] > 0): ?>
-            <li><?= Helper\a(t('%d closed tasks', $stats['nb_inactive_tasks']), 'project', 'tasks', array('project_id' => $project['id'])) ?></li>
-        <?php endif ?>
-
-        <li><?= t('%d tasks in total', $stats['nb_tasks']) ?></li>
-
-    <?php else: ?>
-        <li><?= t('No task for this project') ?></li>
-    <?php endif ?>
-</ul>
-
-<div class="page-header">
-    <h2><?= t('Board') ?></h2>
-</div>
-<table class="table-stripped">
-    <tr>
-        <th width="50%"><?= t('Column') ?></th>
-        <th><?= t('Task limit') ?></th>
-        <th><?= t('Active tasks') ?></th>
-    </tr>
-    <?php foreach ($stats['columns'] as $column): ?>
-    <tr>
-        <td><?= Helper\escape($column['title']) ?></td>
-        <td><?= $column['task_limit'] ?: '∞' ?></td>
-        <td><?= $column['nb_active_tasks'] ?></td>
-    </tr>
-    <?php endforeach ?>
-</table>
-
-<?php if (Helper\is_admin()): ?>
-<div class="page-header">
-    <h2><?= t('Integration') ?></h2>
-</div>
-
-<h3><i class="fa fa-github fa-fw"></i><?= t('Github webhook') ?></h3>
-<input type="text" readonly="readonly" value="<?= Helper\get_current_base_url().Helper\u('webhook', 'github', array('token' => $webhook_token, 'project_id' => $project['id'])) ?>"/><br/>
-<p class="form-help"><a href="http://kanboard.net/documentation/github-webhooks" target="_blank"><?= t('Help on Github webhook') ?></a></p>
-
-<?php endif ?>
diff --git a/app/Template/project_sidebar.php b/app/Template/project_sidebar.php
deleted file mode 100644
index bd56edaf..00000000
--- a/app/Template/project_sidebar.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<div class="sidebar">
-    <h2><?= t('Actions') ?></h2>
-    <ul>
-        <li>
-            <a href="?controller=project&amp;action=show&amp;project_id=<?= $project['id'] ?>"><?= t('Summary') ?></a>
-        </li>
-
-        <?php if (Helper\is_admin() || $project['is_private']): ?>
-        <li>
-            <a href="?controller=project&amp;action=share&amp;project_id=<?= $project['id'] ?>"><?= t('Public access') ?></a>
-        </li>
-        <li>
-            <a href="?controller=project&amp;action=edit&amp;project_id=<?= $project['id'] ?>"><?= t('Edit project') ?></a>
-        </li>
-        <li>
-            <a href="?controller=board&amp;action=edit&amp;project_id=<?= $project['id'] ?>"><?= t('Edit board') ?></a>
-        </li>
-        <li>
-            <a href="?controller=category&amp;action=index&amp;project_id=<?= $project['id'] ?>"><?= t('Category management') ?></a>
-        </li>
-        <?php if (Helper\is_admin()): ?>
-            <li>
-                <a href="?controller=project&amp;action=users&amp;project_id=<?= $project['id'] ?>"><?= t('User management') ?></a>
-            </li>
-        <?php endif ?>
-        <li>
-            <a href="?controller=action&amp;action=index&amp;project_id=<?= $project['id'] ?>"><?= t('Automatic actions') ?></a>
-        </li>
-        <li>
-            <a href="?controller=project&amp;action=duplicate&amp;project_id=<?= $project['id'].Helper\param_csrf() ?>"><?= t('Duplicate') ?></a>
-        </li>
-        <li>
-            <?php if ($project['is_active']): ?>
-                <a href="?controller=project&amp;action=disable&amp;project_id=<?= $project['id'].Helper\param_csrf() ?>"><?= t('Disable') ?></a>
-            <?php else: ?>
-                <a href="?controller=project&amp;action=enable&amp;project_id=<?= $project['id'].Helper\param_csrf() ?>"><?= t('Enable') ?></a>
-            <?php endif ?>
-        </li>
-        <li>
-            <a href="?controller=project&amp;action=remove&amp;project_id=<?= $project['id'] ?>"><?= t('Remove') ?></a>
-        </li>
-        <?php endif ?>
-    </ul>
-
-    <?php if (Helper\is_admin() || $project['is_private']): ?>
-    <h2><?= t('Exports') ?></h2>
-    <ul>
-        <li>
-            <?= Helper\a(t('Tasks'), 'project', 'exportTasks', array('project_id' => $project['id'])) ?>
-        </li>
-        <li>
-            <?= Helper\a(t('Daily project summary'), 'project', 'exportDailyProjectSummary', array('project_id' => $project['id'])) ?>
-        </li>
-    </li>
-    <?php endif ?>
-</div>
\ No newline at end of file
diff --git a/app/Template/project_tasks.php b/app/Template/project_tasks.php
deleted file mode 100644
index 638e4c31..00000000
--- a/app/Template/project_tasks.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li><i class="fa fa-table fa-fw"></i><?= Helper\a(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?></li>
-            <li><i class="fa fa-search fa-fw"></i><?= Helper\a(t('Search'), 'project', 'search', array('project_id' => $project['id'])) ?></li>
-            <li><i class="fa fa-dashboard fa-fw"></i><?= Helper\a(t('Activity'), 'project', 'activity', array('project_id' => $project['id'])) ?></li>
-        </ul>
-    </div>
-    <section>
-    <?php if (empty($tasks)): ?>
-        <p class="alert"><?= t('No task') ?></p>
-    <?php else: ?>
-        <?= Helper\template('task_table', array(
-            'tasks' => $tasks,
-            'categories' => $categories,
-            'columns' => $columns,
-            'pagination' => $pagination,
-        )) ?>
-    <?php endif ?>
-    </section>
-</section>
\ No newline at end of file
diff --git a/app/Template/project_users.php b/app/Template/project_users.php
deleted file mode 100644
index 1e1f259f..00000000
--- a/app/Template/project_users.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<div class="page-header">
-    <h2><?= t('List of authorized users') ?></h2>
-</div>
-
-<?php if ($project['is_everybody_allowed']): ?>
-    <div class="alert alert-info"><?= t('Everybody have access to this project.') ?></div>
-<?php else: ?>
-
-    <?php if (empty($users['allowed'])): ?>
-        <div class="alert alert-error"><?= t('Nobody have access to this project.') ?></div>
-    <?php else: ?>
-    <div class="alert alert-info">
-        <p><?= t('Only those users have access to this project:') ?></p>
-        <ul>
-        <?php foreach ($users['allowed'] as $user_id => $username): ?>
-            <li>
-                <strong><?= Helper\escape($username) ?></strong>
-                <?php if ($project['is_private'] == 0): ?>
-                    (<?= Helper\a(t('revoke'), 'project', 'revoke', array('project_id' => $project['id'], 'user_id' => $user_id), true) ?>)
-                <?php endif ?>
-            </li>
-        <?php endforeach ?>
-        </ul>
-        <p><?= t('Don\'t forget that administrators have access to everything.') ?></p>
-    </div>
-    <?php endif ?>
-
-    <?php if ($project['is_private'] == 0 && ! empty($users['not_allowed'])): ?>
-        <form method="post" action="<?= Helper\u('project', 'allow', array('project_id' => $project['id'])) ?>" autocomplete="off">
-
-            <?= Helper\form_csrf() ?>
-
-            <?= Helper\form_hidden('project_id', array('project_id' => $project['id'])) ?>
-
-            <?= Helper\form_label(t('User'), 'user_id') ?>
-            <?= Helper\form_select('user_id', $users['not_allowed']) ?><br/>
-
-            <div class="form-actions">
-                <input type="submit" value="<?= t('Allow this user') ?>" class="btn btn-blue"/>
-            </div>
-        </form>
-    <?php endif ?>
-
-<?php endif ?>
-
-<?php if ($project['is_private'] == 0): ?>
-<form method="post" action="<?= Helper\u('project', 'allowEverybody', array('project_id' => $project['id'])) ?>">
-    <?= Helper\form_csrf() ?>
-
-    <?= Helper\form_hidden('id', array('id' => $project['id'])) ?>
-    <?= Helper\form_checkbox('is_everybody_allowed', t('Allow everybody to access to this project'), 1, $project['is_everybody_allowed']) ?>
-
-    <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-    </div>
-</form>
-<?php endif ?>
diff --git a/app/Template/task_public.php b/app/Template/task_public.php
index 13fef1ed..370204ce 100644
--- a/app/Template/task_public.php
+++ b/app/Template/task_public.php
@@ -10,7 +10,7 @@
         'is_public' => true
     )) ?>
 
-    <?= Helper\template('subtask_show', array(
+    <?= Helper\template('subtask/show', array(
         'task' => $task,
         'subtasks' => $subtasks,
         'not_editable' => true
-- 
cgit v1.2.3