From 31f3de9646e4e54db431be6a6751e931be43d995 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Wed, 1 Jul 2015 18:28:32 -0400
Subject: Add global search section

---
 app/Template/app/layout.php     | 29 ++++++++++++++++----
 app/Template/app/projects.php   |  2 +-
 app/Template/app/subtasks.php   |  2 +-
 app/Template/app/tasks.php      |  2 +-
 app/Template/search/index.php   | 26 ++++++++++++++++++
 app/Template/search/results.php | 60 +++++++++++++++++++++++++++++++++++++++++
 6 files changed, 113 insertions(+), 8 deletions(-)
 create mode 100644 app/Template/search/index.php
 create mode 100644 app/Template/search/results.php

(limited to 'app/Template')

diff --git a/app/Template/app/layout.php b/app/Template/app/layout.php
index d2d63f25..4a307a19 100644
--- a/app/Template/app/layout.php
+++ b/app/Template/app/layout.php
@@ -2,13 +2,32 @@
     <div class="page-header page-header-mobile">
         <ul>
             <?php if ($this->user->isAdmin()): ?>
-                <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New project'), 'project', 'create') ?></li>
+                <li>
+                    <i class="fa fa-plus fa-fw"></i>
+                    <?= $this->url->link(t('New project'), 'project', 'create') ?>
+                </li>
             <?php endif ?>
-            <li><i class="fa fa-lock fa-fw"></i><?= $this->url->link(t('New private project'), 'project', 'create', array('private' => 1)) ?></li>
-            <li><i class="fa fa-folder fa-fw"></i><?= $this->url->link(t('Project management'), 'project', 'index') ?></li>
+            <li>
+                <i class="fa fa-lock fa-fw"></i>
+                <?= $this->url->link(t('New private project'), 'project', 'create', array('private' => 1)) ?>
+            </li>
+            <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>
             <?php if ($this->user->isAdmin()): ?>
-                <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('User management'), 'user', 'index') ?></li>
-                <li><i class="fa fa-cog fa-fw"></i><?= $this->url->link(t('Settings'), 'config', 'index') ?></li>
+                <li>
+                    <i class="fa fa-user fa-fw"></i>
+                    <?= $this->url->link(t('User management'), 'user', 'index') ?>
+                </li>
+                <li>
+                    <i class="fa fa-cog fa-fw"></i>
+                    <?= $this->url->link(t('Settings'), 'config', 'index') ?>
+                </li>
             <?php endif ?>
         </ul>
     </div>
diff --git a/app/Template/app/projects.php b/app/Template/app/projects.php
index 22e0cc47..61839cee 100644
--- a/app/Template/app/projects.php
+++ b/app/Template/app/projects.php
@@ -4,7 +4,7 @@
 <?php if ($paginator->isEmpty()): ?>
     <p class="alert"><?= t('Your are not member of any project.') ?></p>
 <?php else: ?>
-    <table class="table-fixed">
+    <table class="table-fixed table-small">
         <tr>
             <th class="column-8"><?= $paginator->order('Id', 'id') ?></th>
             <th class="column-20"><?= $paginator->order(t('Project'), 'name') ?></th>
diff --git a/app/Template/app/subtasks.php b/app/Template/app/subtasks.php
index 67f2d04f..ad7402bd 100644
--- a/app/Template/app/subtasks.php
+++ b/app/Template/app/subtasks.php
@@ -4,7 +4,7 @@
 <?php if ($paginator->isEmpty()): ?>
     <p class="alert"><?= t('There is nothing assigned to you.') ?></p>
 <?php else: ?>
-    <table class="table-fixed">
+    <table class="table-fixed table-small">
         <tr>
             <th class="column-10"><?= $paginator->order('Id', 'tasks.id') ?></th>
             <th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></th>
diff --git a/app/Template/app/tasks.php b/app/Template/app/tasks.php
index 8e7fe74a..3712750b 100644
--- a/app/Template/app/tasks.php
+++ b/app/Template/app/tasks.php
@@ -4,7 +4,7 @@
 <?php if ($paginator->isEmpty()): ?>
     <p class="alert"><?= t('There is nothing assigned to you.') ?></p>
 <?php else: ?>
-    <table class="table-fixed">
+    <table class="table-fixed table-small">
         <tr>
             <th class="column-8"><?= $paginator->order('Id', 'tasks.id') ?></th>
             <th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></th>
diff --git a/app/Template/search/index.php b/app/Template/search/index.php
new file mode 100644
index 00000000..058f428d
--- /dev/null
+++ b/app/Template/search/index.php
@@ -0,0 +1,26 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <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->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('search/results', array(
+            'paginator' => $paginator,
+        )) ?>
+    <?php endif ?>
+
+</section>
\ No newline at end of file
diff --git a/app/Template/search/results.php b/app/Template/search/results.php
new file mode 100644
index 00000000..1d8cc6e2
--- /dev/null
+++ b/app/Template/search/results.php
@@ -0,0 +1,60 @@
+<table class="table-fixed table-small">
+    <tr>
+        <th class="column-8"><?= $paginator->order(t('Project'), 'tasks.project_id') ?></th>
+        <th class="column-8"><?= $paginator->order(t('Id'), 'tasks.id') ?></th>
+        <th class="column-8"><?= $paginator->order(t('Column'), 'tasks.column_id') ?></th>
+        <th class="column-8"><?= $paginator->order(t('Category'), 'tasks.category_id') ?></th>
+        <th><?= $paginator->order(t('Title'), 'tasks.title') ?></th>
+        <th class="column-10"><?= $paginator->order(t('Assignee'), 'users.username') ?></th>
+        <th class="column-10"><?= $paginator->order(t('Due date'), 'tasks.date_due') ?></th>
+        <th class="column-10"><?= $paginator->order(t('Date created'), 'tasks.date_creation') ?></th>
+        <th class="column-10"><?= $paginator->order(t('Date completed'), 'tasks.date_completed') ?></th>
+        <th class="column-5"><?= $paginator->order(t('Status'), 'tasks.is_active') ?></th>
+    </tr>
+    <?php foreach ($paginator->getCollection() as $task): ?>
+    <tr>
+        <td>
+            <?= $this->url->link($this->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?>
+        </td>
+        <td class="task-table color-<?= $task['color_id'] ?>">
+            <?= $this->url->link('#'.$this->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+        </td>
+        <td>
+            <?= $this->e($task['column_name']) ?>
+        </td>
+        <td>
+            <?= $this->e($task['category_name']) ?>
+        </td>
+        <td>
+            <?= $this->url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+        </td>
+        <td>
+            <?php if ($task['assignee_username']): ?>
+                <?= $this->e($task['assignee_name'] ?: $task['assignee_username']) ?>
+            <?php else: ?>
+                <?= t('Unassigned') ?>
+            <?php endif ?>
+        </td>
+        <td>
+            <?= dt('%B %e, %Y', $task['date_due']) ?>
+        </td>
+        <td>
+            <?= dt('%B %e, %Y', $task['date_creation']) ?>
+        </td>
+        <td>
+            <?php if ($task['date_completed']): ?>
+                <?= dt('%B %e, %Y', $task['date_completed']) ?>
+            <?php endif ?>
+        </td>
+        <td>
+            <?php if ($task['is_active'] == \Model\Task::STATUS_OPEN): ?>
+                <?= t('Open') ?>
+            <?php else: ?>
+                <?= t('Closed') ?>
+            <?php endif ?>
+        </td>
+    </tr>
+    <?php endforeach ?>
+</table>
+
+<?= $paginator ?>
-- 
cgit v1.2.3