close #131 : l'impression est moche

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1026 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/htdocs/css/print.css b/htdocs/css/print.css
new file mode 100644 (file)
index 0000000..edec9bc
--- /dev/null
+++ b/htdocs/css/print.css
@@ -0,0 +1,4 @@
+#body-menu, #body-top, #body-logo, #body-bottom, #dev, #db-trace, .xdx, .noprint
+{ display:none; }
+
+table#body, img { border:0px; }

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 8ec3227..967cb07 100644 (file)
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -45,6 +45,7 @@
     {/if}
   </div>
 
+  <div class="noprint">
   <div class="bits">
     {if $smarty.session.auth ge AUTH_COOKIE}
     {if !$c.wasinscrit && !$c.dcd}
@@ -84,6 +85,7 @@
       *}{icon name=user_gray title="fiche AX"}</a>]
     {/if}
   </div>
+  </div>
 
   <div class="long">
   {if $c.wasinscrit}

diff --git a/templates/search/adv.links.tpl b/templates/search/adv.links.tpl
index 3f6a69b..0b587d1 100644 (file)
--- a/templates/search/adv.links.tpl
+++ b/templates/search/adv.links.tpl
@@ -22,7 +22,7 @@
 
 {if $do_title}<h1>Recherche dans l'annuaire</h1>{/if}
 
-<ul>
+<ul class="noprint">
   {if $with_soundex && ($smarty.request.firstname || $smarty.request.name)}
   <li>Étendre ta recherche par <strong>
     <a  href="{$with_soundex}">proximité sonore</a>

diff --git a/templates/search/index.tpl b/templates/search/index.tpl
index c6a0c20..780fec8 100644 (file)
--- a/templates/search/index.tpl
+++ b/templates/search/index.tpl
@@ -30,15 +30,19 @@
     {/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 and $advanced and !$simple}
+    <span class="noprint">
     &nbsp;(<a href='geoloc/?{$search_vars}'>Voir sur une carte</a>)
+    </span>
     {/if}
   </h1>
+  {/if}
   
   {if $search_results_nb > 1}
-  <div>
+  <div class="noprint">
     Trier par :
     {foreach from=$search_order_link item=tri}
     [<a href='{$tri.url}'>
@@ -82,14 +86,16 @@
   {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>
   {/if}

diff --git a/templates/search/quick.form.tpl b/templates/search/quick.form.tpl
index 13046a8..22bdcc8 100644 (file)
--- a/templates/search/quick.form.tpl
+++ b/templates/search/quick.form.tpl
@@ -27,7 +27,7 @@
     {if $smarty.session.auth ge AUTH_COOKIE}
     <tr>
       <th colspan="2">
-        Recherche simple [<a href="search/adv">&gt;&gt;&gt;&nbsp;Recherche&nbsp;avancée</a>]
+        Recherche simple <span class="noprint">[<a href="search/adv">&gt;&gt;&gt;&nbsp;Recherche&nbsp;avancée</a>]</span>
       </th>
     </tr>
     <tr>
@@ -35,7 +35,7 @@
         <input type='text' name="quick" value="{$smarty.request.quick}" style="width: 98%" /><br />
       </td>
     </tr>
-    <tr>
+    <tr class="noprint">
       <td style="width: 78%">
         <input type='checkbox' name='order' value='date_mod' {if $smarty.request.order eq "date_mod"}checked='checked'{/if} />
         mettre les fiches modifiées récemment en premier
@@ -44,7 +44,7 @@
         {/if}
       </td>
     {else}
-    <tr>
+    <tr class="noprint">
       <td style="width: 78%">
         <input type='text' name="quick" value="{$smarty.request.quick}" style="width: 98%" /><br />
       </td>

diff --git a/templates/skin/common.header.tpl b/templates/skin/common.header.tpl
index cfe1a38..b687f86 100644 (file)
--- a/templates/skin/common.header.tpl
+++ b/templates/skin/common.header.tpl
@@ -37,8 +37,9 @@
     <link rel="bookmark" href="http://www.polytechnique.fr/eleves/" title="| Site d'élèves" />
 
     {foreach from=$xorg_css item=css}
-    <link rel="stylesheet" type="text/css" href="css/{$css}" />
+    <link rel="stylesheet" type="text/css" href="css/{$css}" media="all"/>
     {/foreach}
+    <link rel="stylesheet" type="text/css" href="css/print.css" media="print"/>
     {foreach from=$xorg_js item=js}
     <script type="text/javascript" src="javascript/{$js}"></script>
     {/foreach}

diff --git a/templates/skin/default.tpl b/templates/skin/default.tpl
index 27b4280..1aa6f74 100644 (file)
--- a/templates/skin/default.tpl
+++ b/templates/skin/default.tpl
@@ -24,7 +24,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <base href="{$globals->baseurl}/" />
-    <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
     {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>

diff --git a/templates/skin/espace.tpl b/templates/skin/espace.tpl
index 0d6519f..3372ec7 100644 (file)
--- a/templates/skin/espace.tpl
+++ b/templates/skin/espace.tpl
@@ -24,8 +24,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <base href="{$globals->baseurl}/" />
-    <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
-    <link rel="stylesheet" type="text/css" href="css/espace.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
+    <link rel="stylesheet" type="text/css" href="css/espace.css" media="all" />
     {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>

diff --git a/templates/skin/humlinux.tpl b/templates/skin/humlinux.tpl
index f15b8a4..82db7d1 100644 (file)
--- a/templates/skin/humlinux.tpl
+++ b/templates/skin/humlinux.tpl
@@ -24,8 +24,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <base href="{$globals->baseurl}/" />
-    <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
-    <link rel="stylesheet" type="text/css" href="css/humlinux.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
+    <link rel="stylesheet" type="text/css" href="css/humlinux.css" media="all" />
     {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>

diff --git a/templates/skin/keynote.tpl b/templates/skin/keynote.tpl
index e333e67..bf3857a 100644 (file)
--- a/templates/skin/keynote.tpl
+++ b/templates/skin/keynote.tpl
@@ -24,7 +24,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <base href="{$globals->baseurl}/" />
-    <link rel="stylesheet" type="text/css" href="css/keynote.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="css/keynote.css" media="all" />
     {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>

diff --git a/templates/skin/linux.tpl b/templates/skin/linux.tpl
index 18b92a5..5cf08ea 100644 (file)
--- a/templates/skin/linux.tpl
+++ b/templates/skin/linux.tpl
@@ -24,8 +24,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <base href="{$globals->baseurl}/" />
-    <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
-    <link rel="stylesheet" type="text/css" href="css/linux.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
+    <link rel="stylesheet" type="text/css" href="css/linux.css" media="all" />
     {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>

diff --git a/templates/skin/liteskin.tpl b/templates/skin/liteskin.tpl
index e6b0b64..d276dbc 100644 (file)
--- a/templates/skin/liteskin.tpl
+++ b/templates/skin/liteskin.tpl
@@ -24,8 +24,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <base href="{$globals->baseurl}/" />
-    <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
-    <link rel="stylesheet" type="text/css" href="css/liteskin.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
+    <link rel="stylesheet" type="text/css" href="css/liteskin.css" media="all" />
     {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>

diff --git a/templates/skin/nbviolet.tpl b/templates/skin/nbviolet.tpl
index e6c5394..f4c3951 100644 (file)
--- a/templates/skin/nbviolet.tpl
+++ b/templates/skin/nbviolet.tpl
@@ -24,8 +24,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <base href="{$globals->baseurl}/" />
-    <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
-    <link rel="stylesheet" type="text/css" href="css/nbviolet.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
+    <link rel="stylesheet" type="text/css" href="css/nbviolet.css" media="all" />
     {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>

diff --git a/templates/skin/newxorg.tpl b/templates/skin/newxorg.tpl
index ffc73bb..baf54d6 100644 (file)
--- a/templates/skin/newxorg.tpl
+++ b/templates/skin/newxorg.tpl
@@ -24,8 +24,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <base href="{$globals->baseurl}/" />
-    <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
-    <link rel="stylesheet" type="text/css" href="css/newxorg.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
+    <link rel="stylesheet" type="text/css" href="css/newxorg.css" media="all" />
     {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>

diff --git a/templates/skin/oldtimes.tpl b/templates/skin/oldtimes.tpl
index 60c47ea..7f953f9 100644 (file)
--- a/templates/skin/oldtimes.tpl
+++ b/templates/skin/oldtimes.tpl
@@ -24,8 +24,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <base href="{$globals->baseurl}/" />
-    <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
-    <link rel="stylesheet" type="text/css" href="css/oldtimes.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
+    <link rel="stylesheet" type="text/css" href="css/oldtimes.css" media="all" />
     {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>

diff --git a/templates/skin/openweb.tpl b/templates/skin/openweb.tpl
index a2f4e21..b44b846 100644 (file)
--- a/templates/skin/openweb.tpl
+++ b/templates/skin/openweb.tpl
@@ -24,7 +24,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <base href="{$globals->baseurl}/" />
-    <link rel="stylesheet" type="text/css" href="css/openweb.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="css/openweb.css" media="all" />
     {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>

diff --git a/templates/skin/sharky.tpl b/templates/skin/sharky.tpl
index 4b7a5f1..6cce80a 100644 (file)
--- a/templates/skin/sharky.tpl
+++ b/templates/skin/sharky.tpl
@@ -24,8 +24,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <base href="{$globals->baseurl}/" />
-    <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
-    <link rel="stylesheet" type="text/css" href="css/sharky.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
+    <link rel="stylesheet" type="text/css" href="css/sharky.css" media="all" />
     {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>

diff --git a/templates/skin/spectral.tpl b/templates/skin/spectral.tpl
index 48931ec..e4d22e3 100644 (file)
--- a/templates/skin/spectral.tpl
+++ b/templates/skin/spectral.tpl
@@ -24,8 +24,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <base href="{$globals->baseurl}/" />
-    <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
-    <link rel="stylesheet" type="text/css" href="css/spectral.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
+    <link rel="stylesheet" type="text/css" href="css/spectral.css" media="all" />
     {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>

diff --git a/templates/skin/trapped.tpl b/templates/skin/trapped.tpl
index a09f088..7dd47ed 100644 (file)
--- a/templates/skin/trapped.tpl
+++ b/templates/skin/trapped.tpl
@@ -24,8 +24,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <base href="{$globals->baseurl}/" />
-    <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
-    <link rel="stylesheet" type="text/css" href="css/trapped.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
+    <link rel="stylesheet" type="text/css" href="css/trapped.css" media="all" />
     {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>