From ba50f03d4a19620b9f4964521c827354b6b5f6c5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Mon, 22 Jun 2009 21:56:03 +0200
Subject: [PATCH] Improves search display.

---
 templates/search/adv.form.tpl   |  3 ++-
 templates/search/quick.form.tpl | 15 +++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl
index 2fcc841..b600cf1 100644
--- a/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@ -175,11 +175,12 @@
     });
 -->
 {/literal}</script>
+<p class="center">[<a href="search">Revenir à la recherche simple</a>]</p>
 <form id="recherche" action="search/adv" method="get">
   <table class="bicol" cellpadding="3" summary="Recherche">
     <tr>
       <th colspan="2">
-        Recherche avancée [<a href="search">Revenir à la Recherche simple</a>]
+        Recherche avancée
       </th>
     </tr>
     <tr>
diff --git a/templates/search/quick.form.tpl b/templates/search/quick.form.tpl
index d6693ec..d04b0da 100644
--- a/templates/search/quick.form.tpl
+++ b/templates/search/quick.form.tpl
@@ -36,26 +36,29 @@
       </td>
     </tr>
     <tr class="noprint">
-      <td style="width: 60%">
+      <td style="width: 70%">
         <input type="checkbox" name="with_soundex" id="with_soundex" value="1" {if $smarty.request.with_soundex}checked="checked"{/if} /> <label for="with_soundex">Activer la recherche par proximité sonore.</label>
         <br /><input type='checkbox' name='order' id="order" value='date_mod' {if $smarty.request.order eq "date_mod"}checked='checked'{/if} /> <label for="order">Mettre les fiches modifiées récemment en premier.</label>
         <br /><input type='checkbox' name='nonins' id="nonins" {if $smarty.request.nonins}checked='checked'{/if} value='1' /> <label for="nonins">Chercher uniquement des non inscrits.</label>
       </td>
+      <td class="right">
+        <br /><input type="submit" value="Chercher" />
+      </td>
     {else}
     <tr class="noprint">
       <td style="width: 60%">
         <input type='text' name="quick" value="{$smarty.request.quick}" style="width: 98%" /><br />
       </td>
-    {/if}
       <td class="right">
-        [<a href="search/adv">Recherche avancée</a>]
-        <br /><br /><input type="submit" value="Chercher" />
+        <input type="submit" value="Chercher" />
       </td>
+    {/if}
     </tr>
   </table>
 </form>
-
-<br />
+{if $smarty.session.auth ge AUTH_COOKIE}
+<p class="center">[<a href="search/adv">Effectuer une recherche avancée</a>]</p>
+{/if}
 
 {if $show_js}
 {literal}
-- 
2.1.4