wait #4353 @0.5

diff --git a/inc/extranet/Metier/class.extranet.document.php b/inc/extranet/Metier/class.extranet.document.php
index f79b3fe9e45ca514e0fa33d4bf868cc97297f0c7..3b39f969e73e85e2a79183b1851084b81fb96dbb 100644 (file)
--- a/inc/extranet/Metier/class.extranet.document.php
+++ b/inc/extranet/Metier/class.extranet.document.php
@@ -135,9 +135,14 @@ abstract class extranetDocument extends cubeMetier {
                                $this->pdf->Cell(33, 4, self::escape($ligne['montant']), 0, 0, 'R');\r
                        }\r
                        // Titre\r
-                       $this->pdf->SetFont('Klavika', 'B', 10);\r
+            $size=10;\r
+            if(strpos($ligne['titre'],'__')===0){\r
+                $size=13;\r
+            }\r
+\r
+                       $this->pdf->SetFont('Klavika', 'B', $size);\r
                        $this->pdf->setXY(6, $y);\r
-                       $this->pdf->Cell(171, 4, self::escape(trim($ligne['titre'])), 0, 1);\r
+                       $this->pdf->Cell(171, 4, self::escape(trim($ligne['titre']," \t\n\r\0\x0B_")), 0, 1);\r
                        // Contenu\r
                        if ($displayDescription) {\r
                                $this->pdf->SetXY(6, $this->pdf->getY() + 1);\r

diff --git a/inc/ws/Util/class.ws.links.php b/inc/ws/Util/class.ws.links.php
index 8da30eba416918ccd6ebc930c89c7cbef825d00a..48db926ff88639a5f9151ede596cb2d16800fe88 100644 (file)
--- a/inc/ws/Util/class.ws.links.php
+++ b/inc/ws/Util/class.ws.links.php
@@ -35,6 +35,7 @@ class wsLinks
             'image' => __('Image'), 'image_rollover' => __('Animation au survol'),
             'animation' => __('Animation'),
             'group' => __('Groupe'),
+            'zindex'=>__('Profondeur'),
         );
 
         $comments = array();

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index d8cadb1635dc23f6d3679d86d90663c930e16188..0cbdb69b6a1e4969362a14a824cdfeafea5e0413 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -2106,6 +2106,9 @@ class wsHTML5Compiler
             $imdir = 'html';
         }
 
+        $pages= array_slice($this->pages, 0);;
+        shuffle($pages);
+
         $thumbs = array();
         foreach ($this->pages as $page => $infos) {
             $docdir = wsDocument::getDir($infos['document_id']);
@@ -2134,9 +2137,6 @@ class wsHTML5Compiler
             }
 
             $this->vdir->copy($this->book->getThumbFile($page, $this->imageFormat), 'data/thumbnails/p' . $page . '.' . $this->imageFormat);
-            if ($page % 10 == 0) {
-                $this->log('Copied image ' . $page);
-            }
         }
 
         $this->_makeCover($this->book->getFile(1, 'jpg', 150, true, true));