Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master

Conflicts:
	templates/skin/common.title.header.tpl

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

diff --cc templates/skin/common.title.header.tpl
index 8102455,b78620c..9f0bbc5
--- 1/templates/skin/common.title.header.tpl
--- 2/templates/skin/common.title.header.tpl
+++ b/templates/skin/common.title.header.tpl
@@@ -19,30 -19,40 +19,30 @@@
  {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
  {*                                                                        *}
  {**************************************************************************}
 -          <table>
 -            <tr>
 -              <td class="date-heure">
 -                <script type="text/javascript">
 -                  <!--
 -                  document.write(getNow());
 -                  //-->
 -                </script>
 -              </td>
 -              <td class="inscrits">
 -                {$globals->core->NbIns|number_format} polytechniciens sur le web
 -                {if t($smarty.request.quick)}
 -                  {assign var=requestQuick value=$smarty.request.quick|smarty:nodefaults}
 -                {else}
 -                  {assign var=requestQuick value='Recherche dans l\'annuaire'}
 -                {/if}
 -                <form action="search" method="get">
 -                    <div>
 -                        <button id="quick_button" type="submit" style="display: none"
 -                                onclick="if ($('#quick').val() === 'Recherche dans l\'annuaire') $('#quick').val('')">
 -                          OK
 -                        </button>
 -                        <input type="text" size="20" name="quick" id="quick" class="quick_search"
 -                               value="{$requestQuick}"
 -                               onfocus="if (this.value === 'Recherche dans l\'annuaire') this.value='';
 -                                        $('#quick_button').show()"
 -                               onblur="if (this.value === '') this.value='{$requestQuick|escape:javascript}'"
 -                               />
 -                    </div>
 -                </form>
 -                {if $smarty.session.auth gt AUTH_PUBLIC && $smarty.session.notifs}
 -                <a href="carnet/panel">{$smarty.session.notifs} événement{if $smarty.session.notifs gt 1}s{/if}</a>
 -                {/if}
 -              </td>
 -            </tr>
 -          </table>
 +
 +<table>
 +  <tr>
 +    <td class="date-heure"></td>
 +    <td class="inscrits">
 +      {$globals->core->NbIns|number_format} polytechniciens sur le web
 +      {if t($smarty.request.quick)}
-         {assign var=requestQuick value=$smarty.request.quick}
++        {assign var=requestQuick value=$smarty.request.quick|smarty:nodefaults}
 +      {else}
 +        {assign var=requestQuick value='Recherche dans l\'annuaire'}
 +      {/if}
 +      <form action="search" method="get">
 +          <div>
 +              <button id="quick_button" type="submit" style="display: none">
 +                OK
 +              </button>
 +              <input type="text" size="20" name="quick" id="quick" class="quick_search"
 +                     value="{$requestQuick}" />
 +          </div>
 +      </form>
 +      {if $smarty.session.auth gt AUTH_PUBLIC && $smarty.session.notifs}
 +      <a href="carnet/panel">{$smarty.session.notifs} événement{if $smarty.session.notifs gt 1}s{/if}</a>
 +      {/if}
 +    </td>
 +  </tr>
 +</table>
  {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}