From b0691e107085d6de8222271fba9691c820d3c209 Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Mon, 17 Sep 2007 22:01:39 +0200
Subject: [PATCH] Fix some issues with autocompletion in advanced search

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 modules/search.php                 |  2 ++
 templates/include/field.select.tpl |  7 +++++++
 templates/search/adv.form.tpl      | 24 ++++++++++++++++--------
 templates/xnetevents/subscribe.tpl |  4 ++--
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/modules/search.php b/modules/search.php
index ee08963..f301cd6 100644
--- a/modules/search.php
+++ b/modules/search.php
@@ -462,6 +462,8 @@ class SearchModule extends PLModule
                                                FROM  '.$db.$where.'
                                            GROUP BY  '.$field.'
                                            ORDER BY  '.$field));
+        $page->assign('with_text_value', true);
+        $page->assign('onchange', "document.forms.recherche.{$type}Txt.value = this.options[this.selectedIndex].text");
     }
 }
 
diff --git a/templates/include/field.select.tpl b/templates/include/field.select.tpl
index d7cc678..6da1c39 100644
--- a/templates/include/field.select.tpl
+++ b/templates/include/field.select.tpl
@@ -20,11 +20,18 @@
 {*                                                                        *}
 {**************************************************************************}
 
+{if $with_text_value}
+<div>
+{/if}
 <select name="{$name}"{if $onchange} onchange="{$onchange}"{/if}{if $id} id="{$id}"{/if}>
     <option value=""> - </option>
   {iterate from=$list item='option'}
     <option value="{$option.id}">{$option.field|htmlspecialchars}</option>
   {/iterate}
 </select>
+{if $with_text_value}
+<input type="hidden" value="" name="{$name}Txt" />
+</div>
+{/if}
 
 {* vim:set et sws=2 sts=2 sw=2 enc=utf-8: *}
diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl
index 0a80db0..f579515 100644
--- a/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@ -257,7 +257,8 @@
     <tr>
       <td>Pays</td>
       <td>
-        <input name="countryTxt" type="text" class="autocomplete" style="display:none" size="32"/>
+        <input name="countryTxt" type="text" class="autocomplete" style="display:none" size="32"
+               value="{$smarty.request.countryTxt}"/>
         <input name="country" class="autocompleteTarget" type="hidden" value="{$smarty.request.country}"/>
         <a href="country" class="autocompleteToSelect">{icon name="table" title="Tous les pays"}</a>
       </td>
@@ -283,7 +284,8 @@ checked="checked"{/if}/>chercher uniquement les adresses où les camarades sont
     <tr>
       <td>Fonction</td>
       <td>
-        <input name="fonctionTxt" type="text" class="autocomplete" style="display:none" size="32"/>
+        <input name="fonctionTxt" type="text" class="autocomplete" style="display:none" size="32"
+               value="{$smarty.request.fonctionTxt}"/>
         <input name="fonction" class="autocompleteTarget" type="hidden" value="{$smarty.request.fonction}"/>
         <a href="fonction" class="autocompleteToSelect">{icon name="table" title="Toutes les fonctions"}</a>
       </td>
@@ -295,7 +297,8 @@ checked="checked"{/if}/>chercher uniquement les adresses où les camarades sont
     <tr>
       <td>Secteur</td>
       <td>
-        <input name="secteurTxt" type="text" class="autocomplete" style="display:none" size="32"/>
+        <input name="secteurTxt" type="text" class="autocomplete" style="display:none" size="32"
+               value="{$smarty.request.secteurTxt}"/>
         <input name="secteur" class="autocompleteTarget" type="hidden" value="{$smarty.request.secteur}"/>
         <a href="secteur" class="autocompleteToSelect">{icon name="table" title="Tous les secteurs"}</a>
       </td>
@@ -316,7 +319,8 @@ checked="checked"{/if}/>chercher uniquement les adresses où les camarades sont
     <tr>
       <td>Nationalité</td>
       <td>
-        <input name="nationaliteTxt" type="text" class="autocomplete" style="display:none" size="32"/>
+        <input name="nationaliteTxt" type="text" class="autocomplete" style="display:none" size="32"
+               value="{$smarty.request.nationaliteTxt}"/>
         <input name="nationalite" class="autocompleteTarget" type="hidden" value="{$smarty.request.nationalite}"/>
         <a href="nationalite" class="autocompleteToSelect">{icon name="table" title="Toutes les nationalités"}</a>
       </td>
@@ -324,7 +328,8 @@ checked="checked"{/if}/>chercher uniquement les adresses où les camarades sont
     <tr>
       <td>Binet</td>
       <td>
-        <input name="binetTxt" type="text" class="autocomplete" style="display:none" size="32"/>
+        <input name="binetTxt" type="text" class="autocomplete" style="display:none" size="32"
+               value="{$smarty.request.binetTxt}"/>
         <input name="binet" class="autocompleteTarget" type="hidden" value="{$smarty.request.binet}"/>
         <a href="binet" class="autocompleteToSelect">{icon name="table" title="Tous les binets"}</a>
       </td>
@@ -332,7 +337,8 @@ checked="checked"{/if}/>chercher uniquement les adresses où les camarades sont
     <tr>
       <td>Groupe X</td>
       <td>
-        <input name="groupexTxt" type="text" class="autocomplete" style="display:none" size="32"/>
+        <input name="groupexTxt" type="text" class="autocomplete" style="display:none" size="32"
+               value="{$smarty.request.groupexTxt}"/>
         <input name="groupex" class="autocompleteTarget" type="hidden" value="{$smarty.request.groupex}"/>
         <a href="groupex" class="autocompleteToSelect">{icon name="table" title="Tous les groupes X"}</a>
       </td>
@@ -340,7 +346,8 @@ checked="checked"{/if}/>chercher uniquement les adresses où les camarades sont
     <tr>
       <td>Section</td>
       <td>
-        <input name="sectionTxt" type="text" class="autocomplete" style="display:none" size="32"/>
+        <input name="sectionTxt" type="text" class="autocomplete" style="display:none" size="32"
+               value="{$smarty.request.sectionTxt}"/>
         <input name="section" class="autocompleteTarget" type="hidden" value="{$smarty.request.section}"/>
         <a href="section" class="autocompleteToSelect">{icon name="table" title="Toutes les sections"}</a>
       </td>
@@ -348,7 +355,8 @@ checked="checked"{/if}/>chercher uniquement les adresses où les camarades sont
     <tr>
       <td>Formation</td>
       <td>
-        <input name="schoolTxt" type="text" class="autocomplete" style="display:none" size="32"/>
+        <input name="schoolTxt" type="text" class="autocomplete" style="display:none" size="32"
+               value="{$smarty.request.schoolTxt}"/>
         <input name="school" class="autocompleteTarget" type="hidden" value="{$smarty.request.school}"/>
         <a href="school" class="autocompleteToSelect">{icon name="table" title="Toutes les formations"}</a>
       </td>
diff --git a/templates/xnetevents/subscribe.tpl b/templates/xnetevents/subscribe.tpl
index 2dfbb79..6c81694 100644
--- a/templates/xnetevents/subscribe.tpl
+++ b/templates/xnetevents/subscribe.tpl
@@ -116,8 +116,8 @@
         </div>
         <div>
           {if $event.paiement_id &&  $event.paid < $event.topay}
-          [<a href="{$platal->ns}payment/{$event.paiement_id}?montant={math equation="a-b" a=$event.topay b=$event.paid}">
-          Payer en ligne</a>]
+          <a href="{$platal->ns}payment/{$event.paiement_id}?montant={math equation="a-b" a=$event.topay b=$event.paid}">
+          {icon name=money} Payer en ligne</a>
           {elseif $validation && $event.paid < $event.topay}
           <br />Le télépaiement pour cet événement est en instance de validation&nbsp;:<br />
           <input type="checkbox" name="notify_payment" {if $event.notify_payment}checked="checked"{/if} id="notify" />
-- 
2.1.4