Merge commit 'origin/master' into fusionax

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

diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl
index 1a5e272..8b767aa 100644 (file)
--- a/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@ -22,8 +22,6 @@
 
 <h1>Recherche dans l'annuaire</h1>
 
-{javascript name="jquery"}
-{javascript name="jquery.autocomplete"}
 <script type="text/javascript">// <!--
   var baseurl = platal_baseurl + "search/";
   {literal}
@@ -38,7 +36,9 @@
           return '...';
         }
 
-        return name + '<em>&nbsp;&nbsp;-&nbsp;&nbsp;' + row[1] + ' camarades<\/em>';
+        camarades = (row[1] > 1) ? "camarades" : "camarade";
+
+        return name + '<em>&nbsp;&nbsp;-&nbsp;&nbsp;' + row[1] + '&nbsp;' + camarades + '<\/em>';
       };
   }
 
@@ -75,25 +75,13 @@
 
     if (schoolId) {
       $(".autocomplete[@name='schoolTxt']").addClass('hidden_valid');
-
-      $("[@name='diploma']").parent().load(baseurl + 'list/diploma/', { school:schoolId }, function() {
-          if ($("select[@name='diploma']").children("option").size() > 1) {
-            $("select[@name='diploma']").attr('value', '{/literal}{$smarty.request.diploma}{literal}');
-
-            $("tr#diploma_ln").show();
-          } else {
-            $("select[@name='diploma']").attr('value', '');
-
-            $("tr#diploma_ln").hide();
-          }
-        });
     } else {
       $(".autocomplete[@name='schoolTxt']").removeClass('hidden_valid');
-
-      $("select[@name='diploma']").attr('value', '');
-
-      $("tr#diploma_ln").hide();
     }
+
+    $("[@name='diploma']").parent().load(baseurl + 'list/diploma/', { school:schoolId }, function() {
+        $("select[@name='diploma']").attr('value', '{/literal}{$smarty.request.diploma}{literal}');
+      });
   }
 
   // when choosing autocomplete from list, must validate
@@ -173,6 +161,10 @@
 
               return false;
             });
+        }).parent().find('.autocomplete').change(function() {
+          // If we change the value in the type="text" field, then the value in the 'integer id' field must not be used,
+          // to ensure that, we unset it
+          $(this).parent().find('.autocompleteTarget').val('');
         });
     });
 -->
@@ -286,7 +278,7 @@
       <th colspan="2">Géographie</th>
     </tr>
     <tr>
-      <td>Ville</td>
+      <td>Ville ou code postal</td>
       <td><input type="text" class="autocomplete" name="city" size="32" value="{$smarty.request.city}" /></td>
     </tr>
     <tr>
@@ -326,8 +318,8 @@ checked="checked"{/if}/>Chercher uniquement les adresses où les camarades sont
       </td>
     </tr>
     <tr>
-      <td>Poste</td>
-      <td><input type="text" class="autocomplete" name="poste" size="32" value="{$smarty.request.poste}" /></td>
+      <td>Description</td>
+      <td><input type="text" class="autocomplete" name="description" size="32" value="{$smarty.request.description}" /></td>
     </tr>
     <tr>
       <td>Secteur</td>
@@ -396,16 +388,39 @@ checked="checked"{/if}/>Chercher uniquement les adresses où les camarades sont
         <a href="school" class="autocompleteToSelect">{icon name="table" title="Toutes les formations"}</a>
       </td>
     </tr>
-    <tr id="diploma_ln">
+    <tr>
       <td>Diplôme</td>
       <td>
-        <input name="diploma" type="hidden" size="32" value="{$smarty.request.diploma}"/>
+        <input name="diploma" size="32" value="{$smarty.request.diploma}"/>
       </td>
     </tr>
     <tr>
       <td>Commentaire contient</td>
       <td><input type="text" name="free" size="32" value="{$smarty.request.free}" /></td>
     </tr>
+    <tr>
+      <td>Numéro de téléphone</td>
+      <td><input type="text" name="phone_number" size="32" value="{$smarty.request.phone_number}"/></td>
+    </tr>
+    <tr>
+      <td style="vertical-align: middle">
+        <span>Networking et sites webs</span>
+      </td>
+      <td>
+        <table>
+          <tr>
+            <td style="padding-left: 0px;">
+              <input type="text" name="networking_address" size="32" value="{$smarty.request.networking_address}" />
+            </td>
+            <td>
+              <input type="text" name="networking_typeTxt" class="autocomplete" size="10" value="{$smarty.request.networking_typeTxt}" />
+              <input name="networking_type" class="autocompleteTarget" type="hidden" value="{$smarty.request.networking_type}"/>
+              <a href="networking_type" class="autocompleteToSelect">{icon name="table" title="Tous les types d'adresse"}</a>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
         {if $smarty.session.auth ge AUTH_COOKIE}
     <tr>
       <td colspan="2">
@@ -413,6 +428,12 @@ checked="checked"{/if}/>Chercher uniquement les adresses où les camarades sont
           <label for="order">Mettre les fiches modifiées récemment en premier.</label>
       </td>
     </tr>
+    <tr>
+      <td colspan="2">
+           <input type='checkbox' name='exact' id="exact" {if $smarty.request.exact}checked='checked'{/if} value='1'/>
+           <label for="exact">Faire une recherche exacte.</label>
+      </td>
+    </tr>
         {/if}
     <tr><td colspan="2"></td></tr>
     <tr>