From 599b6624dde8cb1c1f6416ee0af530402089da4d Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 31 May 2015 17:57:02 -0400
Subject: Improve project navigation

---
 app/Template/analytic/layout.php      | 21 +++++++++++++++--
 app/Template/board/filters.php        | 36 +----------------------------
 app/Template/budget/breakdown.php     |  6 +----
 app/Template/budget/create.php        |  6 +----
 app/Template/budget/index.php         |  8 +++----
 app/Template/budget/sidebar.php       | 14 ++++++++++++
 app/Template/calendar/show.php        | 22 ++++++++++--------
 app/Template/export/sidebar.php       | 17 ++++++++++++++
 app/Template/export/subtasks.php      |  2 ++
 app/Template/export/tasks.php         |  2 ++
 app/Template/project/activity.php     | 28 -----------------------
 app/Template/project/dropdown.php     | 41 +++++++++++++++++++++++++++++++++
 app/Template/project/layout.php       | 14 ++++++++++--
 app/Template/project/search.php       | 42 ----------------------------------
 app/Template/project/show.php         |  1 +
 app/Template/project/sidebar.php      | 27 +++-------------------
 app/Template/project/tasks.php        | 33 ---------------------------
 app/Template/projectinfo/activity.php | 30 ++++++++++++++++++++++++
 app/Template/projectinfo/search.php   | 43 +++++++++++++++++++++++++++++++++++
 app/Template/projectinfo/tasks.php    | 33 +++++++++++++++++++++++++++
 app/Template/task/layout.php          |  8 ++++++-
 21 files changed, 242 insertions(+), 192 deletions(-)
 create mode 100644 app/Template/budget/sidebar.php
 create mode 100644 app/Template/export/sidebar.php
 delete mode 100644 app/Template/project/activity.php
 create mode 100644 app/Template/project/dropdown.php
 delete mode 100644 app/Template/project/search.php
 delete mode 100644 app/Template/project/tasks.php
 create mode 100644 app/Template/projectinfo/activity.php
 create mode 100644 app/Template/projectinfo/search.php
 create mode 100644 app/Template/projectinfo/tasks.php

(limited to 'app/Template')

diff --git a/app/Template/analytic/layout.php b/app/Template/analytic/layout.php
index c3a36bdf..de8d0de9 100644
--- a/app/Template/analytic/layout.php
+++ b/app/Template/analytic/layout.php
@@ -4,7 +4,24 @@
 <section id="main">
     <div class="page-header">
         <ul>
-            <li><i class="fa fa-table fa-fw"></i><?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?></li>
+            <li>
+            <span class="dropdown">
+                <span>
+                    <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Actions') ?></a>
+                    <ul>
+                        <?= $this->render('project/dropdown', array('project' => $project)) ?>
+                    </ul>
+                </span>
+            </span>
+            </li>
+            <li>
+                <i class="fa fa-table fa-fw"></i>
+                <?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?>
+            </li>
+            <li>
+                <i class="fa fa-folder fa-fw"></i>
+                <?= $this->url->link(t('All projects'), 'project', 'index') ?>
+            </li>
         </ul>
     </div>
     <section class="sidebar-container" id="analytic-section">
@@ -12,7 +29,7 @@
         <?= $this->render('analytic/sidebar', array('project' => $project)) ?>
 
         <div class="sidebar-content">
-            <?= $analytic_content_for_layout ?>
+            <?= $content_for_sublayout ?>
         </div>
     </section>
 </section>
\ No newline at end of file
diff --git a/app/Template/board/filters.php b/app/Template/board/filters.php
index 0617fb47..bf2adfac 100644
--- a/app/Template/board/filters.php
+++ b/app/Template/board/filters.php
@@ -21,41 +21,7 @@
                                 <i class="fa fa-arrows-h fa-fw"></i> <a href="#" class="filter-toggle-scrolling"><?= t('Horizontal scrolling') ?></a>
                             </span>
                         </li>
-                        <li>
-                            <i class="fa fa-search fa-fw"></i>
-                            <?= $this->url->link(t('Search'), 'project', 'search', array('project_id' => $project['id'])) ?>
-                        </li>
-                        <li>
-                            <i class="fa fa-check-square-o fa-fw"></i>
-                            <?= $this->url->link(t('Completed tasks'), 'project', 'tasks', array('project_id' => $project['id'])) ?>
-                        </li>
-                        <li>
-                            <i class="fa fa-dashboard fa-fw"></i>
-                            <?= $this->url->link(t('Activity'), 'project', 'activity', array('project_id' => $project['id'])) ?>
-                        </li>
-                        <li>
-                            <i class="fa fa-calendar fa-fw"></i>
-                            <?= $this->url->link(t('Calendar'), 'calendar', 'show', array('project_id' => $project['id'])) ?>
-                        </li>
-                        <?php if ($project['is_public']): ?>
-                        <li>
-                            <i class="fa fa-share-alt fa-fw"></i> <?= $this->url->link(t('Public link'), 'board', 'readonly', array('token' => $project['token']), false, '', '', true) ?>
-                        </li>
-                        <?php endif ?>
-                        <?php if ($this->user->isManager($project['id'])): ?>
-                        <li>
-                            <i class="fa fa-line-chart fa-fw"></i>
-                            <?= $this->url->link(t('Analytics'), 'analytic', 'tasks', array('project_id' => $project['id'])) ?>
-                        </li>
-                        <li>
-                            <i class="fa fa-pie-chart fa-fw"></i>
-                            <?= $this->url->link(t('Budget'), 'budget', 'index', array('project_id' => $project['id'])) ?>
-                        </li>
-                        <li>
-                            <i class="fa fa-cog fa-fw"></i>
-                            <?= $this->url->link(t('Configure'), 'project', 'show', array('project_id' => $project['id'])) ?>
-                        </li>
-                        <?php endif ?>
+                        <?= $this->render('project/dropdown', array('project' => $project)) ?>
                     </ul>
                 </span>
             </span>
diff --git a/app/Template/budget/breakdown.php b/app/Template/budget/breakdown.php
index 3275a66a..92561188 100644
--- a/app/Template/budget/breakdown.php
+++ b/app/Template/budget/breakdown.php
@@ -1,9 +1,5 @@
 <div class="page-header">
-    <h2><?= t('Budget') ?></h2>
-    <ul>
-        <li><?= $this->url->link(t('Budget lines'), 'budget', 'create', array('project_id' => $project['id'])) ?></li>
-        <li><?= $this->url->link(t('Cost breakdown'), 'budget', 'breakdown', array('project_id' => $project['id'])) ?></li>
-    </ul>
+    <h2><?= t('Cost breakdown') ?></h2>
 </div>
 
 <?php if ($paginator->isEmpty()): ?>
diff --git a/app/Template/budget/create.php b/app/Template/budget/create.php
index d64bbc48..a563796d 100644
--- a/app/Template/budget/create.php
+++ b/app/Template/budget/create.php
@@ -1,9 +1,5 @@
 <div class="page-header">
-    <h2><?= t('Budget') ?></h2>
-    <ul>
-        <li><?= $this->url->link(t('Budget lines'), 'budget', 'create', array('project_id' => $project['id'])) ?></li>
-        <li><?= $this->url->link(t('Cost breakdown'), 'budget', 'breakdown', array('project_id' => $project['id'])) ?></li>
-    </ul>
+    <h2><?= t('Budget lines') ?></h2>
 </div>
 
 <?php if (! empty($lines)): ?>
diff --git a/app/Template/budget/index.php b/app/Template/budget/index.php
index d9fefc67..4fe8ac69 100644
--- a/app/Template/budget/index.php
+++ b/app/Template/budget/index.php
@@ -2,11 +2,7 @@
 <?= $this->asset->js('assets/js/vendor/dimple.v2.1.2.min.js') ?>
 
 <div class="page-header">
-    <h2><?= t('Budget') ?></h2>
-    <ul>
-        <li><?= $this->url->link(t('Budget lines'), 'budget', 'create', array('project_id' => $project['id'])) ?></li>
-        <li><?= $this->url->link(t('Cost breakdown'), 'budget', 'breakdown', array('project_id' => $project['id'])) ?></li>
-    </ul>
+    <h2><?= t('Budget overview') ?></h2>
 </div>
 
 <?php if (! empty($daily_budget)): ?>
@@ -32,4 +28,6 @@
     </tr>
     <?php endforeach ?>
 </table>
+<?php else: ?>
+    <p class="alert"><?= t('There is not enough data to show something.') ?></p>
 <?php endif ?>
diff --git a/app/Template/budget/sidebar.php b/app/Template/budget/sidebar.php
new file mode 100644
index 00000000..7740cf00
--- /dev/null
+++ b/app/Template/budget/sidebar.php
@@ -0,0 +1,14 @@
+<div class="sidebar">
+    <h2><?= t('Budget') ?></h2>
+    <ul>
+        <li>
+            <?= $this->url->link(t('Budget overview'), 'budget', 'index', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= $this->url->link(t('Budget lines'), 'budget', 'create', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= $this->url->link(t('Cost breakdown'), 'budget', 'breakdown', array('project_id' => $project['id'])) ?>
+        </li>
+    </ul>
+</div>
\ No newline at end of file
diff --git a/app/Template/calendar/show.php b/app/Template/calendar/show.php
index 3fe97b65..cf2a20ec 100644
--- a/app/Template/calendar/show.php
+++ b/app/Template/calendar/show.php
@@ -1,21 +1,23 @@
 <section id="main">
     <div class="page-header">
         <ul>
+            <li>
+            <span class="dropdown">
+                <span>
+                    <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Actions') ?></a>
+                    <ul>
+                        <?= $this->render('project/dropdown', array('project' => $project)) ?>
+                    </ul>
+                </span>
+            </span>
+        </li>
             <li>
                 <i class="fa fa-table fa-fw"></i>
                 <?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?>
             </li>
             <li>
-                <i class="fa fa-search fa-fw"></i>
-                <?= $this->url->link(t('Search'), 'project', 'search', array('project_id' => $project['id'])) ?>
-            </li>
-            <li>
-                <i class="fa fa-check-square-o fa-fw"></i>
-                <?= $this->url->link(t('Completed tasks'), 'project', 'tasks', array('project_id' => $project['id'])) ?>
-            </li>
-            <li>
-                <i class="fa fa-dashboard fa-fw"></i>
-                <?= $this->url->link(t('Activity'), 'project', 'activity', array('project_id' => $project['id'])) ?>
+                <i class="fa fa-folder fa-fw"></i>
+                <?= $this->url->link(t('All projects'), 'project', 'index') ?>
             </li>
         </ul>
     </div>
diff --git a/app/Template/export/sidebar.php b/app/Template/export/sidebar.php
new file mode 100644
index 00000000..f93dcafb
--- /dev/null
+++ b/app/Template/export/sidebar.php
@@ -0,0 +1,17 @@
+<div class="sidebar">
+    <h2><?= t('Exports') ?></h2>
+    <ul>
+        <li>
+            <?= $this->url->link(t('Tasks'), 'export', 'tasks', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= $this->url->link(t('Subtasks'), 'export', 'subtasks', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= $this->url->link(t('Task transitions'), 'export', 'transitions', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= $this->url->link(t('Daily project summary'), 'export', 'summary', array('project_id' => $project['id'])) ?>
+        </li>
+    </ul>
+</div>
\ No newline at end of file
diff --git a/app/Template/export/subtasks.php b/app/Template/export/subtasks.php
index d22b96a4..4aad2641 100644
--- a/app/Template/export/subtasks.php
+++ b/app/Template/export/subtasks.php
@@ -4,6 +4,8 @@
     </h2>
 </div>
 
+<p class="alert alert-info"><?= t('This report contains all subtasks information for the given date range.') ?></p>
+
 <form method="get" action="?" autocomplete="off">
 
     <?= $this->form->hidden('controller', $values) ?>
diff --git a/app/Template/export/tasks.php b/app/Template/export/tasks.php
index 5c5e2172..c74c8f98 100644
--- a/app/Template/export/tasks.php
+++ b/app/Template/export/tasks.php
@@ -4,6 +4,8 @@
     </h2>
 </div>
 
+<p class="alert alert-info"><?= t('This report contains all tasks information for the given date range.') ?></p>
+
 <form method="get" action="?" autocomplete="off">
 
     <?= $this->form->hidden('controller', $values) ?>
diff --git a/app/Template/project/activity.php b/app/Template/project/activity.php
deleted file mode 100644
index 1c5dcb75..00000000
--- a/app/Template/project/activity.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li>
-                <i class="fa fa-table fa-fw"></i>
-                <?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?>
-            </li>
-            <li>
-                <i class="fa fa-calendar fa-fw"></i>
-                <?= $this->url->link(t('Calendar'), 'calendar', 'show', array('project_id' => $project['id'])) ?>
-            </li>
-            <li>
-                <i class="fa fa-search fa-fw"></i>
-                <?= $this->url->link(t('Search'), 'project', 'search', array('project_id' => $project['id'])) ?>
-            </li>
-            <li>
-                <i class="fa fa-check-square-o fa-fw"></i>
-                <?= $this->url->link(t('Completed tasks'), 'project', 'tasks', array('project_id' => $project['id'])) ?>
-            </li>
-            <?php if ($project['is_public']): ?>
-                <li><i class="fa fa-rss-square fa-fw"></i><?= $this->url->link(t('RSS feed'), 'project', 'feed', array('token' => $project['token']), false, '', '', true) ?></li>
-            <?php endif ?>
-        </ul>
-    </div>
-    <section>
-        <?= $this->render('event/events', array('events' => $events)) ?>
-    </section>
-</section>
\ No newline at end of file
diff --git a/app/Template/project/dropdown.php b/app/Template/project/dropdown.php
new file mode 100644
index 00000000..2e2650a7
--- /dev/null
+++ b/app/Template/project/dropdown.php
@@ -0,0 +1,41 @@
+<li>
+    <i class="fa fa-search fa-fw"></i>
+    <?= $this->url->link(t('Search'), 'projectinfo', 'search', array('project_id' => $project['id'])) ?>
+</li>
+<li>
+    <i class="fa fa-check-square-o fa-fw"></i>
+    <?= $this->url->link(t('Completed tasks'), 'projectinfo', 'tasks', array('project_id' => $project['id'])) ?>
+</li>
+<li>
+    <i class="fa fa-dashboard fa-fw"></i>
+    <?= $this->url->link(t('Activity'), 'projectinfo', 'activity', array('project_id' => $project['id'])) ?>
+</li>
+<li>
+    <i class="fa fa-calendar fa-fw"></i>
+    <?= $this->url->link(t('Calendar'), 'calendar', 'show', array('project_id' => $project['id'])) ?>
+</li>
+
+<?php if ($project['is_public']): ?>
+<li>
+    <i class="fa fa-share-alt fa-fw"></i> <?= $this->url->link(t('Public link'), 'board', 'readonly', array('token' => $project['token']), false, '', '', true) ?>
+</li>
+<?php endif ?>
+
+<?php if ($this->user->isManager($project['id'])): ?>
+<li>
+    <i class="fa fa-line-chart fa-fw"></i>
+    <?= $this->url->link(t('Analytics'), 'analytic', 'tasks', array('project_id' => $project['id'])) ?>
+</li>
+<li>
+    <i class="fa fa-pie-chart fa-fw"></i>
+    <?= $this->url->link(t('Budget'), 'budget', 'index', array('project_id' => $project['id'])) ?>
+</li>
+<li>
+    <i class="fa fa-download fa-fw"></i>
+    <?= $this->url->link(t('Exports'), 'export', 'tasks', array('project_id' => $project['id'])) ?>
+</li>
+<li>
+    <i class="fa fa-cog fa-fw"></i>
+    <?= $this->url->link(t('Settings'), 'project', 'show', array('project_id' => $project['id'])) ?>
+</li>
+<?php endif ?>
diff --git a/app/Template/project/layout.php b/app/Template/project/layout.php
index f5409500..7bb3d478 100644
--- a/app/Template/project/layout.php
+++ b/app/Template/project/layout.php
@@ -1,6 +1,16 @@
 <section id="main">
     <div class="page-header">
         <ul>
+            <li>
+            <span class="dropdown">
+                <span>
+                    <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Actions') ?></a>
+                    <ul>
+                        <?= $this->render('project/dropdown', array('project' => $project)) ?>
+                    </ul>
+                </span>
+            </span>
+        </li>
             <li>
                 <i class="fa fa-table fa-fw"></i>
                 <?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?>
@@ -11,9 +21,9 @@
             </li>
         </ul>
     </div>
-    <section class="sidebar-container" id="project-section">
+    <section class="sidebar-container">
 
-        <?= $this->render('project/sidebar', array('project' => $project)) ?>
+        <?= $this->render($sidebar_template, array('project' => $project)) ?>
 
         <div class="sidebar-content">
             <?= $project_content_for_layout ?>
diff --git a/app/Template/project/search.php b/app/Template/project/search.php
deleted file mode 100644
index a8e387c6..00000000
--- a/app/Template/project/search.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li>
-                <i class="fa fa-table fa-fw"></i>
-                <?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?>
-            </li>
-            <li>
-                <i class="fa fa-calendar fa-fw"></i>
-                <?= $this->url->link(t('Calendar'), 'calendar', 'show', array('project_id' => $project['id'])) ?>
-            </li>
-            <li>
-                <i class="fa fa-check-square-o fa-fw"></i>
-                <?= $this->url->link(t('Completed tasks'), 'project', 'tasks', array('project_id' => $project['id'])) ?>
-            </li>
-            <li>
-                <i class="fa fa-dashboard fa-fw"></i>
-                <?= $this->url->link(t('Activity'), 'project', 'activity', array('project_id' => $project['id'])) ?>
-            </li>
-        </ul>
-    </div>
-    <section>
-    <form method="get" action="?" autocomplete="off">
-        <?= $this->form->hidden('controller', $values) ?>
-        <?= $this->form->hidden('action', $values) ?>
-        <?= $this->form->hidden('project_id', $values) ?>
-        <?= $this->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($values['search']) && $paginator->isEmpty()): ?>
-        <p class="alert"><?= t('Nothing found.') ?></p>
-    <?php elseif (! $paginator->isEmpty()): ?>
-        <?= $this->render('task/table', array(
-            'paginator' => $paginator,
-            'categories' => $categories,
-            'columns' => $columns,
-        )) ?>
-    <?php endif ?>
-
-    </section>
-</section>
\ No newline at end of file
diff --git a/app/Template/project/show.php b/app/Template/project/show.php
index 9ffbd5bc..4869d8a4 100644
--- a/app/Template/project/show.php
+++ b/app/Template/project/show.php
@@ -11,6 +11,7 @@
     <?php if ($project['is_public']): ?>
         <li><i class="fa fa-share-alt"></i> <?= $this->url->link(t('Public link'), 'board', 'readonly', array('token' => $project['token']), false, '', '', true) ?></li>
         <li><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'project', 'feed', array('token' => $project['token']), false, '', '', true) ?></li>
+        <li><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ical', 'project', array('token' => $project['token'])) ?></li>
     <?php else: ?>
         <li><?= t('Public access disabled') ?></li>
     <?php endif ?>
diff --git a/app/Template/project/sidebar.php b/app/Template/project/sidebar.php
index 5c7ea715..a58c4604 100644
--- a/app/Template/project/sidebar.php
+++ b/app/Template/project/sidebar.php
@@ -19,14 +19,14 @@
             <?= $this->url->link(t('Edit board'), 'column', 'index', array('project_id' => $project['id'])) ?>
         </li>
         <li>
-            <?= $this->url->link(t('Category management'), 'category', 'index', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Swimlanes'), 'swimlane', 'index', array('project_id' => $project['id'])) ?>
         </li>
         <li>
-            <?= $this->url->link(t('Swimlanes'), 'swimlane', 'index', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Categories'), 'category', 'index', array('project_id' => $project['id'])) ?>
         </li>
         <?php if ($this->user->isAdmin() || $project['is_private'] == 0): ?>
         <li>
-            <?= $this->url->link(t('User management'), 'project', 'users', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Users'), 'project', 'users', array('project_id' => $project['id'])) ?>
         </li>
         <?php endif ?>
         <li>
@@ -35,9 +35,6 @@
         <li>
             <?= $this->url->link(t('Duplicate'), 'project', 'duplicate', array('project_id' => $project['id'])) ?>
         </li>
-        <li>
-            <?= $this->url->link(t('Budget'), 'budget', 'index', array('project_id' => $project['id'])) ?>
-        </li>
         <li>
             <?php if ($project['is_active']): ?>
                 <?= $this->url->link(t('Disable'), 'project', 'disable', array('project_id' => $project['id']), true) ?>
@@ -52,22 +49,4 @@
         <?php endif ?>
         <?php endif ?>
     </ul>
-
-    <?php if ($this->user->isManager($project['id'])): ?>
-    <h2><?= t('Exports') ?></h2>
-    <ul>
-        <li>
-            <?= $this->url->link(t('Tasks'), 'export', 'tasks', array('project_id' => $project['id'])) ?>
-        </li>
-        <li>
-            <?= $this->url->link(t('Subtasks'), 'export', 'subtasks', array('project_id' => $project['id'])) ?>
-        </li>
-        <li>
-            <?= $this->url->link(t('Task transitions'), 'export', 'transitions', array('project_id' => $project['id'])) ?>
-        </li>
-        <li>
-            <?= $this->url->link(t('Daily project summary'), 'export', 'summary', array('project_id' => $project['id'])) ?>
-        </li>
-    </ul>
-    <?php endif ?>
 </div>
diff --git a/app/Template/project/tasks.php b/app/Template/project/tasks.php
deleted file mode 100644
index 06f28061..00000000
--- a/app/Template/project/tasks.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li>
-                <i class="fa fa-table fa-fw"></i>
-                <?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?>
-            </li>
-            <li>
-                <i class="fa fa-calendar fa-fw"></i>
-                <?= $this->url->link(t('Calendar'), 'calendar', 'show', array('project_id' => $project['id'])) ?>
-            </li>
-            <li>
-                <i class="fa fa-search fa-fw"></i>
-                <?= $this->url->link(t('Search'), 'project', 'search', array('project_id' => $project['id'])) ?>
-            </li>
-            <li>
-                <i class="fa fa-dashboard fa-fw"></i>
-                <?= $this->url->link(t('Activity'), 'project', 'activity', array('project_id' => $project['id'])) ?>
-            </li>
-        </ul>
-    </div>
-    <section>
-    <?php if ($paginator->isEmpty()): ?>
-        <p class="alert"><?= t('No task') ?></p>
-    <?php else: ?>
-        <?= $this->render('task/table', array(
-            'paginator' => $paginator,
-            'categories' => $categories,
-            'columns' => $columns,
-        )) ?>
-    <?php endif ?>
-    </section>
-</section>
\ No newline at end of file
diff --git a/app/Template/projectinfo/activity.php b/app/Template/projectinfo/activity.php
new file mode 100644
index 00000000..528cdbee
--- /dev/null
+++ b/app/Template/projectinfo/activity.php
@@ -0,0 +1,30 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <li>
+            <span class="dropdown">
+                <span>
+                    <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Actions') ?></a>
+                    <ul>
+                        <?= $this->render('project/dropdown', array('project' => $project)) ?>
+                    </ul>
+                </span>
+            </span>
+            </li>
+            <li>
+                <i class="fa fa-table fa-fw"></i>
+                <?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?>
+            </li>
+            <li>
+                <i class="fa fa-folder fa-fw"></i>
+                <?= $this->url->link(t('All projects'), 'project', 'index') ?>
+            </li>
+            <?php if ($project['is_public']): ?>
+                <li><i class="fa fa-rss-square fa-fw"></i><?= $this->url->link(t('RSS feed'), 'project', 'feed', array('token' => $project['token']), false, '', '', true) ?></li>
+                <li><i class="fa fa-calendar fa-fw"></i><?= $this->url->link(t('iCal feed'), 'ical', 'project', array('token' => $project['token'])) ?></li>
+            <?php endif ?>
+        </ul>
+    </div>
+
+    <?= $this->render('event/events', array('events' => $events)) ?>
+</section>
\ No newline at end of file
diff --git a/app/Template/projectinfo/search.php b/app/Template/projectinfo/search.php
new file mode 100644
index 00000000..4b7c8f70
--- /dev/null
+++ b/app/Template/projectinfo/search.php
@@ -0,0 +1,43 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <li>
+            <span class="dropdown">
+                <span>
+                    <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Actions') ?></a>
+                    <ul>
+                        <?= $this->render('project/dropdown', array('project' => $project)) ?>
+                    </ul>
+                </span>
+            </span>
+            </li>
+            <li>
+                <i class="fa fa-table fa-fw"></i>
+                <?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?>
+            </li>
+            <li>
+                <i class="fa fa-folder fa-fw"></i>
+                <?= $this->url->link(t('All projects'), 'project', 'index') ?>
+            </li>
+        </ul>
+    </div>
+
+    <form method="get" action="?" autocomplete="off">
+        <?= $this->form->hidden('controller', $values) ?>
+        <?= $this->form->hidden('action', $values) ?>
+        <?= $this->form->hidden('project_id', $values) ?>
+        <?= $this->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($values['search']) && $paginator->isEmpty()): ?>
+        <p class="alert"><?= t('Nothing found.') ?></p>
+    <?php elseif (! $paginator->isEmpty()): ?>
+        <?= $this->render('task/table', array(
+            'paginator' => $paginator,
+            'categories' => $categories,
+            'columns' => $columns,
+        )) ?>
+    <?php endif ?>
+
+</section>
\ No newline at end of file
diff --git a/app/Template/projectinfo/tasks.php b/app/Template/projectinfo/tasks.php
new file mode 100644
index 00000000..41884783
--- /dev/null
+++ b/app/Template/projectinfo/tasks.php
@@ -0,0 +1,33 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <li>
+            <span class="dropdown">
+                <span>
+                    <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Actions') ?></a>
+                    <ul>
+                        <?= $this->render('project/dropdown', array('project' => $project)) ?>
+                    </ul>
+                </span>
+            </span>
+            </li>
+            <li>
+                <i class="fa fa-table fa-fw"></i>
+                <?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?>
+            </li>
+            <li>
+                <i class="fa fa-folder fa-fw"></i>
+                <?= $this->url->link(t('All projects'), 'project', 'index') ?>
+            </li>
+        </ul>
+    </div>
+    <?php if ($paginator->isEmpty()): ?>
+        <p class="alert"><?= t('There is no completed tasks at the moment.') ?></p>
+    <?php else: ?>
+        <?= $this->render('task/table', array(
+            'paginator' => $paginator,
+            'categories' => $categories,
+            'columns' => $columns,
+        )) ?>
+    <?php endif ?>
+</section>
\ No newline at end of file
diff --git a/app/Template/task/layout.php b/app/Template/task/layout.php
index 7bfda772..5a14fb39 100644
--- a/app/Template/task/layout.php
+++ b/app/Template/task/layout.php
@@ -5,9 +5,15 @@
                 <i class="fa fa-table fa-fw"></i>
                 <?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $task['project_id']), false, '', '', false, 'swimlane-'.$task['swimlane_id']) ?>
             </li>
+            <?php if ($this->user->isManager($task['project_id'])): ?>
+            <li>
+                <i class="fa fa-cog fa-fw"></i>
+                <?= $this->url->link(t('Project settings'), 'project', 'show', array('project_id' => $task['project_id'])) ?>
+            </li>
+            <?php endif ?>
             <li>
                 <i class="fa fa-calendar fa-fw"></i>
-                <?= $this->url->link(t('Calendar'), 'calendar', 'show', array('project_id' => $task['project_id'])) ?>
+                <?= $this->url->link(t('Project calendar'), 'calendar', 'show', array('project_id' => $task['project_id'])) ?>
             </li>
         </ul>
     </div>
-- 
cgit v1.2.3