X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fsearch%2Fadv.form.tpl;h=29bdea5c0d5a71d2c637de1aedae25f15b6b51f2;hb=f981776842674edfa2c654e4248a7b290df98501;hp=5e618430d8345108ed36fe44c2a3462d6257e557;hpb=93f3f260cdb11c082f0ebb268b0e75d518099604;p=platal.git

diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl
index 5e61843..29bdea5 100644
--- a/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@ -36,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>';
       };
   }
 
@@ -73,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
@@ -171,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('');
         });
     });
 -->
@@ -284,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>
@@ -394,10 +388,10 @@ 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>
@@ -409,31 +403,22 @@ checked="checked"{/if}/>Chercher uniquement les adresses où les camarades sont
       <td><input type="text" name="phone_number" size="32" value="{$smarty.request.phone_number}"/></td>
     </tr>
     <tr>
-      <td colspan="2">Messageries, networking et sites webs</td>
-    </tr>
-    <tr>
-      <td>
-        <span style="margin-left:2em">Adresse</span>
+      <td style="vertical-align: middle">
+        <span>Networking et sites webs</span>
       </td>
       <td>
-        <input type="text" name="networking_address" size="32" value="{$smarty.request.networking_address}" />
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <span style="margin-left:2em">Type</span>
-      </td>
-      <td>
-        <select name="networking_type">
-          <option value="" {if $smarty.request.networking_type eq ""} selected="selected"{/if}>
-            Tout
-          </option>
-        {foreach from=$network_list item=network}
-          <option value="{$network.name}" {if $smarty.request.networking_type eq $network.name} selected="selected" {/if}>
-            {$network.name}
-          </option>
-        {/foreach}
-        </select>
+        <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}
@@ -443,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>