X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fsearch%2Findex.tpl;h=d78610ae47a381457144c56517548b79c0c098b4;hb=20934085ed6e05fc18aa83e3a91259e638128f53;hp=6c9c0ed670926c4236f3c86cf48acd430b80c8a4;hpb=1f7c369094ff15214d6cc25a721ee025216c3ea5;p=platal.git

diff --git a/templates/search/index.tpl b/templates/search/index.tpl
index 6c9c0ed..d78610a 100644
--- a/templates/search/index.tpl
+++ b/templates/search/index.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -30,25 +30,26 @@
     {/if}
   {/if}
 
+  {if $search_results_nb == 0 or ($advanced and !$simple)}
   <h1 class='right'>
-    {if $search_results_nb==0}Aucune{else}{$search_results_nb}{/if} réponse{if $search_results_nb>1}s{/if}.
+    {if $search_results_nb==0}Aucune{else}{$search_results_nb}{/if} réponse{if $search_results_nb>1}s{/if}
+    {if $search_results_nb and $advanced and !$simple}
+    <span class="noprint">
+    &nbsp;(<a href='geoloc/?{$search_vars}'>Voir sur une carte</a>)
+    </span>
+    {/if}
   </h1>
-
-  {if $search_results_nb and $advanced and !$simple and $use_map}
-  <p>
-    [<a href='{rel}/geoloc/?{$search_vars}'>Voir la recherche sur une carte</a>].
-  </p>
   {/if}
   
   {if $search_results_nb > 1}
-  <div>
+  <div class="noprint">
     Trier par :
     {foreach from=$search_order_link item=tri}
     [<a href='{$tri.url}'>
     {if $tri.asc or $tri.desc}<strong>{/if}
     {$tri.text}
-    {if $tri.desc}<img src='{rel}/images/up.png' alt='tri ascendant' />{/if}
-    {if  $tri.asc}<img src='{rel}/images/dn.png' alt='tri descendant' />{/if}
+    {if $tri.desc}<img src='images/up.png' alt='tri ascendant' />{/if}
+    {if  $tri.asc}<img src='images/dn.png' alt='tri descendant' />{/if}
     {if $tri.asc or $tri.desc}</strong>{/if}
     </a>]
     {/foreach}
@@ -82,20 +83,22 @@
   {/if}
   {/if}
 
-  {min_auth level='cookie'}
+  {if $smarty.session.auth ge AUTH_COOKIE}
   <br />
   {if $smarty.capture.list|smarty:nodefaults|display_lines > 20}
+  <div class="noprint">
   {if $advanced}
   {include file=search/adv.links.tpl do_title=1}
   {else}
   {include file=search/quick.form.tpl}
   {/if}
+  </div>
   {/if}
   
-  <p>
+  <p class="noprint">
   <strong>Astuce:</strong>
-  Si tu survoles une fiche, tu sauras quand elle a été mise à jour la dernière fois !</p>
-  {/min_auth}
+  Si tu survoles une fiche, tu sauras quand elle a été mise à jour la dernière fois !</p>
+  {/if}
 {else}
   {if $advanced}
   {include file=search/adv.form.tpl}
@@ -105,4 +108,4 @@
 {/if}
 
 
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}