Merge commit 'origin/master' into account

[platal.git] / templates / search / adv.form.tpl

diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl
index 8b767aa..ab1f529 100644 (file)
--- a/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -33,7 +33,7 @@
         name = row[0].replace(regexp, '<strong>$1<\/strong>');
 
         if (row[1] === "-1") {
-          return '...';
+          return '&hellip;';
         }
 
         camarades = (row[1] > 1) ? "camarades" : "camarade";
@@ -44,26 +44,26 @@
 
   // when changing country, open up region choice
   function changeCountry(a2) {
-    $(".autocompleteTarget[@name='country']").attr('value',a2);
+    $(".autocompleteTarget[name='country']").attr('value',a2);
 
     if (a2) {
-      $(".autocomplete[@name='countryTxt']").addClass('hidden_valid');
+      $(".autocomplete[name='countryTxt']").addClass('hidden_valid');
 
-      $("[@name='region']").parent().load(baseurl + 'list/region/', { country:a2 }, function() {
-          if ($("select[@name='region']").children("option").size() > 1) {
-            $("select[@name='region']").attr('value', '{/literal}{$smarty.request.region}{literal}');
+      $("[name='region']").parent().load(baseurl + 'list/region/', { country:a2 }, function() {
+          if ($("select[name='region']").children("option").size() > 1) {
+            $("select[name='region']").attr('value', '{/literal}{$smarty.request.region}{literal}');
 
             $("tr#region_ln").show();
           } else {
-            $("select[@name='region']").attr('value', '');
+            $("select[name='region']").attr('value', '');
 
             $("tr#region_ln").hide();
           }
         });
     } else {
-      $(".autocomplete[@name='countryTxt']").removeClass('hidden_valid');
+      $(".autocomplete[name='countryTxt']").removeClass('hidden_valid');
 
-      $("select[@name='region']").attr('value', '');
+      $("select[name='region']").attr('value', '');
 
       $("tr#region_ln").hide();
     }
@@ -71,16 +71,16 @@
 
   // when changing school, open diploma choice
   function changeSchool(schoolId) {
-    $(".autocompleteTarget[@name='school']").attr('value',schoolId);
+    $(".autocompleteTarget[name='school']").attr('value',schoolId);
 
     if (schoolId) {
-      $(".autocomplete[@name='schoolTxt']").addClass('hidden_valid');
+      $(".autocomplete[name='schoolTxt']").addClass('hidden_valid');
     } else {
-      $(".autocomplete[@name='schoolTxt']").removeClass('hidden_valid');
+      $(".autocomplete[name='schoolTxt']").removeClass('hidden_valid');
     }
 
-    $("[@name='diploma']").parent().load(baseurl + 'list/diploma/', { school:schoolId }, function() {
-        $("select[@name='diploma']").attr('value', '{/literal}{$smarty.request.diploma}{literal}');
+    $("[name='diploma']").parent().load(baseurl + 'list/diploma/', { school:schoolId }, function() {
+        $("select[name='diploma']").attr('value', '{/literal}{$smarty.request.diploma}{literal}');
       });
   }
 
@@ -107,9 +107,9 @@
       return function(i) {
         nameRealField = this.field.replace(/Txt$/, '');
 
-        $(".autocompleteTarget[@name='"+nameRealField+"']").attr('value',i.extra[1]);
+        $(".autocompleteTarget[name='"+nameRealField+"']").attr('value',i.extra[1]);
 
-        $(".autocomplete[@name='"+this.field+"']").addClass('hidden_valid');
+        $(".autocomplete[name='"+this.field+"']").addClass('hidden_valid');
       }
     }
 
@@ -138,11 +138,11 @@
 
       $(".autocomplete").change(function() { $(this).removeClass('hidden_valid'); });
 
-      $(".autocomplete[@name='countryTxt']").change(function() { changeCountry(''); });
+      $(".autocomplete[name='countryTxt']").change(function() { changeCountry(''); });
 
       changeCountry({/literal}'{$smarty.request.country}'{literal});
 
-      $(".autocomplete[@name='schoolTxt']").change(function() { changeSchool(''); });
+      $(".autocomplete[name='schoolTxt']").change(function() { changeSchool(''); });
 
       changeSchool({/literal}'{$smarty.request.school}'{literal});
 
@@ -150,13 +150,13 @@
           var fieldName = $(this).attr('href');
 
           $(this).attr('href', baseurl + 'list/'+fieldName).click(function() {
-              var oldval = $("input.autocompleteTarget[@name='"+fieldName+"']")[0].value;
+              var oldval = $("input.autocompleteTarget[name='"+fieldName+"']")[0].value;
 
-              $(".autocompleteTarget[@name='"+fieldName+"']").parent().load(baseurl + 'list/'+fieldName,{},
+              $(".autocompleteTarget[name='"+fieldName+"']").parent().load(baseurl + 'list/'+fieldName,{},
                 function(selectBox) {
-                  $(".autocompleteTarget[@name='"+fieldName+"']").remove();
-                  $(".autocomplete[@name='"+fieldName+"Txt']").remove();
-                  $("select[@name='"+fieldName+"']").attr('value', oldval);
+                  $(".autocompleteTarget[name='"+fieldName+"']").remove();
+                  $(".autocomplete[name='"+fieldName+"Txt']").remove();
+                  $("select[name='"+fieldName+"']").attr('value', oldval);
                 });
 
               return false;
@@ -169,31 +169,20 @@
     });
 -->
 {/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">&lt;&lt;&lt;&nbsp;Recherche simple</a>]
+        Recherche avancée
       </th>
     </tr>
     <tr>
-      <td>Nom</td>
+      <td>Nom, prénom, surnom...</td>
       <td>
         <input type="hidden" name="rechercher" value="Chercher"/>
         <input type="submit" style="display:none"/>
-        <input type="text" class="autocomplete" name="name" size="32" value="{$smarty.request.name}" />
-      </td>
-    </tr>
-    <tr>
-      <td>Prénom</td>
-      <td>
-        <input class="autocomplete" type="text" name="firstname" size="32" value="{$smarty.request.firstname}" />
-      </td>
-    </tr>
-    <tr>
-      <td>Surnom</td>
-      <td>
-        <input class="autocomplete" type="text" name="nickname" size="32" value="{$smarty.request.nickname}" />
+        <input type="text" name="name" size="32" value="{$smarty.request.name}" />
       </td>
     </tr>
     <tr>
@@ -444,7 +433,7 @@ checked="checked"{/if}/>Chercher uniquement les adresses où les camarades sont
   </table>
 </form>
 <p>
-  <small><strong>N.B. :</strong> le caractère joker * peut remplacer une ou plusieurs lettres dans les recherches.</small>
+  <small><strong>N.B.&nbsp;:</strong> le caractère joker * peut remplacer une ou plusieurs lettres dans les recherches.</small>
 </p>
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}