From bb9e7916574bd7e21550bf7505757fccae6cbdd0 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 11 Mar 2017 18:08:25 -0500
Subject: Use same layout as task listing for task search

---
 app/Template/search/activity.php | 75 +++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 40 deletions(-)

(limited to 'app/Template/search/activity.php')

diff --git a/app/Template/search/activity.php b/app/Template/search/activity.php
index 6be346b6..c48cce22 100644
--- a/app/Template/search/activity.php
+++ b/app/Template/search/activity.php
@@ -1,45 +1,40 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li>
-                <?= $this->url->icon('search', t('Search tasks'), 'SearchController', 'index') ?>
-            </li>
-        </ul>
-    </div>
+<div class="page-header">
+    <ul>
+        <li>
+            <?= $this->url->icon('search', t('Search tasks'), 'SearchController', 'index') ?>
+        </li>
+    </ul>
+</div>
 
-    <div class="filter-box">
-        <form method="get" action="<?= $this->url->dir() ?>" class="search">
-            <?= $this->form->hidden('controller', $values) ?>
-            <?= $this->form->hidden('action', $values) ?>
+<div class="filter-box margin-bottom">
+    <form method="get" action="<?= $this->url->dir() ?>" class="search">
+        <?= $this->form->hidden('controller', $values) ?>
+        <?= $this->form->hidden('action', $values) ?>
 
-            <div class="input-addon">
-                <?= $this->form->text('search', $values, array(), array(empty($values['search']) ? 'autofocus' : '', 'placeholder="'.t('Search').'"'), 'input-addon-field') ?>
-                <div class="input-addon-item">
-                    <?= $this->render('app/filters_helper') ?>
-                </div>
+        <div class="input-addon">
+            <?= $this->form->text('search', $values, array(), array(empty($values['search']) ? 'autofocus' : '', 'placeholder="'.t('Search').'"'), 'input-addon-field') ?>
+            <div class="input-addon-item">
+                <?= $this->render('app/filters_helper') ?>
             </div>
-        </form>
-    </div>
-
-    <?php if (empty($values['search'])): ?>
-        <div class="panel">
-            <h3><?= t('Advanced search') ?></h3>
-            <p><?= t('Example of query: ') ?><strong>project:"My project" creator:me</strong></p>
-            <ul>
-                <li><?= t('Search by project: ') ?><strong>project:"My project"</strong></li>
-                <li><?= t('Search by creator: ') ?><strong>creator:admin</strong></li>
-                <li><?= t('Search by creation date: ') ?><strong>created:today</strong></li>
-                <li><?= t('Search by task status: ') ?><strong>status:open</strong></li>
-                <li><?= t('Search by task title: ') ?><strong>title:"My task"</strong></li>
-            </ul>
-            <p><i class="fa fa-external-link fa-fw"></i><?= $this->url->doc(t('View advanced search syntax'), 'search') ?></p>
         </div>
-    <?php elseif (! empty($values['search']) && $nb_events === 0): ?>
-        <p class="alert"><?= t('Nothing found.') ?></p>
-    <?php else: ?>
-        <div class="margin-top">
-            <?= $this->render('event/events', array('events' => $events)) ?>
-        </div>
-    <?php endif ?>
+    </form>
+</div>
 
-</section>
+<?php if (empty($values['search'])): ?>
+    <div class="panel">
+        <h3><?= t('Advanced search') ?></h3>
+        <p><?= t('Example of query: ') ?><strong>project:"My project" creator:me</strong></p>
+        <ul>
+            <li><?= t('Search by project: ') ?><strong>project:"My project"</strong></li>
+            <li><?= t('Search by creator: ') ?><strong>creator:admin</strong></li>
+            <li><?= t('Search by creation date: ') ?><strong>created:today</strong></li>
+            <li><?= t('Search by task status: ') ?><strong>status:open</strong></li>
+            <li><?= t('Search by task title: ') ?><strong>title:"My task"</strong></li>
+        </ul>
+        <p><i class="fa fa-external-link fa-fw"></i><?= $this->url->doc(t('View advanced search syntax'), 'search') ?></p>
+    </div>
+<?php elseif (! empty($values['search']) && $nb_events === 0): ?>
+    <p class="alert"><?= t('Nothing found.') ?></p>
+<?php else: ?>
+    <?= $this->render('event/events', array('events' => $events)) ?>
+<?php endif ?>
-- 
cgit v1.2.3