Merge commit 'origin/master' into fusionax

Conflicts:

	core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --combined templates/search/adv.form.tpl
index cfe97f8,2fcc841..95eb62e
--- 1/templates/search/adv.form.tpl
--- 2/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@@ -75,13 -75,19 +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}');
 -          } else {
 -            $("select[@name='diploma']").attr('value', '');
 -          }
 -        });
      } else {
        $(".autocomplete[@name='schoolTxt']").removeClass('hidden_valid');
 -
 -      $("select[@name='diploma']").attr('value', '');
      }
 +
 +    $("[@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,15 -179,27 +173,15 @@@
    <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>
 -      <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>
@@@ -306,8 -324,8 +306,8 @@@ checked="checked"{/if}/>Chercher unique
        </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>
@@@ -386,29 -404,6 +386,29 @@@
        <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">