Changeset 32841

Timestamp:

12.11.2009 01:08:38 (3 months ago)

Author:

marcimat@…

Message:

Cosmétique du pdf changé (pour le A4 uniquement).
- titre des chapitres en haut à gauche
- numéros de pages centrés en bas

Location:

_galaxie_/programmer.spip.org/plugin_documentation

Files:

• contenu/page-integrale.html (modified) (1 diff)
• documentation_options.php (modified) (1 diff)
• habillage.css (modified) (1 diff)
• images/presentation.png (added)
• impression.css (modified) (5 diffs)
• inclure/couverture.html (modified) (1 diff)
• plugin.xml (modified) (1 diff)

_galaxie_/programmer.spip.org/plugin_documentation/contenu/page-integrale.html

@@ -12 +12 @@
 [(#ENV{pas_de_couverture}|et{[(#ENV{id_rubrique}|non)]})
         <div class="presentation">
+                [<div class="image">(#CHEMIN{images/presentation.png}
+                        |image_reduire{500,400}|image_sepia{#ENV{couleur}})</div>]
                 [<div class="chapo[ (#EDIT_CONFIG{meta::descriptif_site})]">(#DESCRIPTIF_SITE_SPIP)</div>]
         </div>

_galaxie_/programmer.spip.org/plugin_documentation/documentation_options.php

@@ -28 +28 @@
         include_spip('inc/lang');
         $langues = explode(',', $GLOBALS['meta']['langues_multilingue']);
-        // si la langue est definie dans l'url (en/ ou fr/) on l'utilise
-        if (preg_match(',^' . $GLOBALS['meta']['adresse_site'] . '/(' . join('|',$langues) . ')/,', 'http://' . $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], $r)) {
-                $langue = $r[1];
-                changer_langue($langue);
-        } else {        
-                $langue = utiliser_langue_visiteur();
-                if (!in_array($langue, $langues)) {
-                        $langue = $GLOBALS['meta']['langue_site'];
-                }
+        $langue = utiliser_langue_visiteur();
+        if (!in_array($langue, $langues)) {
+                $langue = $GLOBALS['meta']['langue_site'];
         }
         set_request('lang', $langue);

_galaxie_/programmer.spip.org/plugin_documentation/habillage.css

@@ -647 +647 @@
 #posts .integrale .couverture_chapitre .image {padding:2em 1em 1em;}
 
-posts .integrale .presentation .chapo {margin:4em 0em; padding:1em 2em;}
+#posts .integrale .presentation .chapo {margin:4em 0em; padding:1em 2em;}
+#posts .integrale .presentation {padding-top: 6cm; }
 
 #posts .integrale .spip_code { font-style:inherit;}

_galaxie_/programmer.spip.org/plugin_documentation/impression.css

@@ -45 +45 @@
 .integrale .page_vide {page:presentation; page-break-before:always;}
 
-.integrale .rubrique > h1 {page-break-before:always;}
-.integrale .rubrique .rubrique > h1 {page-break-before:auto;}
+.integrale .rubrique {page-break-before:always;}
+.integrale .rubrique .rubrique {page-break-before:auto;}
 
 
@@ -70 +70 @@
 
 /* assign values to header/footer strings */
-.integrale .chapitre > h1 { string-set: chapter content(); }
+.integrale .chapitre > h1 { string-set: chapter "# " content(); font-family:bolonewt;}
+.integrale h1#tdm,
+.integrale h1#index { string-set: chapter "# " content();}
 
 .integrale .couverture .pied   { string-set: couverturepied content(); position:relative; left:-3000em; }
@@ -77 +79 @@
 @page  {
         size: A4 portrait;
-        border-bottom:1px solid #ddd;
+        
         padding:0 0 .5cm;
-        margin:2cm 3cm;
-        @bottom-left {
-                content: string(chapter);
-                vertical-align:top;
-                color:#888;
-                padding-left:40px; background:url(images/pied_icone.png) no-repeat left top;
-                padding-bottom:8px;
-        }  
-        @bottom-right {
+        margin:1.5cm 3cm 1cm;
+        @top-left {
+                content:"";
+                color:#aaa;
+                font-size:140%;
+                font-weight:bold;
+                font-family:bolonewt;
+                padding:5px;
+                margin-left:-2cm;
+        }
+        @bottom-center {
+                padding:5px;
+                font-size:120%;
+                font-weight:bold;
+                font-family:bolonewt;
+                /*border-top:1px solid #888;*/
+                margin:0 7cm;
                 content: counter(page); 
                 vertical-align:top;
@@ -93 +103 @@
         }
 }
+
+@page:left {
+        @top-left {content: string(chapter);}
+}
+
 @page couverture { 
         border:3px solid #ddd;
-        padding:2cm .2em 1em;
-        margin:4cm 3cm;
-        @bottom-left {
-                content: ""; 
-                background:none;
-        }  
-        @bottom-right {
+        padding:4cm .2em 1em;
+        margin:3cm 3cm;
+        @top-left {content:"";}
+        @bottom-center {
+                border:none;
+                margin:0;
                 content: string(couverturepied);
+                font-size:100%;
+                text-align:right;
         }
 }
@@ -109 +125 @@
         border:3px solid #ddd;
         padding:1cm;
-        margin:4cm 3cm;
-        @bottom-left {
-                content: ""; 
-                background:none;
-        }  
-        @bottom-right {
-                content: "";
+        margin:3cm 3cm;
+        /*margin:4cm 3cm;*/
+        @bottom-center {
+                margin-top:2cm;
         }
+}
+@page chapitre:left {
+        @top-left {content: "";}
+        @bottom-center {content: "";}
 }
 
 @page presentation {
         padding:0 0 .5cm;
-        margin:2cm 3cm;
-        border:none;
-        @bottom-left {
-                content: "";
-                background:none; 
-        }  
-        @bottom-right {
-                content: "";
+        @bottom-center {
+                content:"";
+                border:none;
         }
 }

_galaxie_/programmer.spip.org/plugin_documentation/inclure/couverture.html

@@ -22 +22 @@
 
         <div class="presentation">
+                [<div class="image">(#CHEMIN{images/presentation.png}
+                        |image_reduire{500,400}|image_sepia{#ENV{couleur}})</div>]
                 [<div class="chapo[ (#EDIT_CONFIG{meta::descriptif_site})]">(#DESCRIPTIF_SITE_SPIP)</div>]
         </div>

_galaxie_/programmer.spip.org/plugin_documentation/plugin.xml

@@ -5 +5 @@
         
         <lien></lien>
-        <version>1.4.5</version>
+        <version>1.4.6</version>
         <version_base>1.0.2</version_base>