From bb12be7840a8d813589c53031e439a6086d47726 Mon Sep 17 00:00:00 2001
From: Olivier Le Floch <olivier.le-floch@polytechnique.org>
Date: Sat, 31 Jan 2009 18:23:33 +0100
Subject: [PATCH] Clarify the navigation links between the simple and advanced
 search forms

Signed-off-by: Olivier Le Floch <olivier.le-floch@polytechnique.org>
---
 templates/search/adv.form.tpl   |  2 +-
 templates/search/quick.form.tpl | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl
index 52e4553..2fcc841 100644
--- a/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@ -179,7 +179,7 @@
   <table class="bicol" cellpadding="3" summary="Recherche">
     <tr>
       <th colspan="2">
-        Recherche avancée [<a href="search">&lt;&lt;&lt;&nbsp;Recherche simple</a>]
+        Recherche avancée [<a href="search">Revenir à la Recherche simple</a>]
       </th>
     </tr>
     <tr>
diff --git a/templates/search/quick.form.tpl b/templates/search/quick.form.tpl
index d36d55f..d6693ec 100644
--- a/templates/search/quick.form.tpl
+++ b/templates/search/quick.form.tpl
@@ -27,7 +27,7 @@
     {if $smarty.session.auth ge AUTH_COOKIE}
     <tr>
       <th colspan="2">
-        Recherche simple <span class="noprint">[<a href="search/adv">&gt;&gt;&gt;&nbsp;Recherche&nbsp;avancée</a>]</span>
+        Recherche simple
       </th>
     </tr>
     <tr>
@@ -36,19 +36,20 @@
       </td>
     </tr>
     <tr class="noprint">
-      <td style="width: 78%">
+      <td style="width: 60%">
         <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>
     {else}
     <tr class="noprint">
-      <td style="width: 78%">
+      <td style="width: 60%">
         <input type='text' name="quick" value="{$smarty.request.quick}" style="width: 98%" /><br />
       </td>
     {/if}
-      <td class="right" style="vertical-align: middle">
-        <input type="submit" value="Chercher" />
+      <td class="right">
+        [<a href="search/adv">Recherche avancée</a>]
+        <br /><br /><input type="submit" value="Chercher" />
       </td>
     </tr>
   </table>
-- 
2.1.4