(no commit message)

diff --git a/fluidbook/icones/1/mobile/search.svg b/fluidbook/icones/1/mobile/search.svg
new file mode 100644 (file)
index 0000000..ed50b69
--- /dev/null
+++ b/fluidbook/icones/1/mobile/search.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="20px" height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">\r
+<path fill="$colorize" d="M17.798,14.34l-4.24-4.244c0.352-0.783,0.552-1.648,0.552-2.562c0-3.461-2.818-6.28-6.281-6.28\r
+       c-3.465,0-6.282,2.818-6.282,6.28c0,3.464,2.817,6.282,6.282,6.282c0.913,0,1.778-0.199,2.562-0.553l4.241,4.243\r
+       c0.875,0.875,2.293,0.875,3.167,0.001C18.672,16.633,18.674,15.216,17.798,14.34z M7.763,12.008c-2.458,0-4.45-1.993-4.45-4.451\r
+       s1.992-4.45,4.45-4.45s4.45,1.992,4.45,4.45S10.221,12.008,7.763,12.008z"/>\r
+</svg>\r

diff --git a/inc/ws/Util/packager/class.ws.packager.html5.php b/inc/ws/Util/packager/class.ws.packager.html5.php
index 5e9f26281c239df3fe7fef6f3f88a39815605b55..d5dd6866f3bde76d331e09cc1db84a9f637db5d4 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.html5.php
+++ b/inc/ws/Util/packager/class.ws.packager.html5.php
@@ -97,7 +97,7 @@ class wsPackagerHTML5 extends wsPackager {
                $arrowsColor = '#' . $this->theme->parametres->arrowsColor;\r
                // Set the icon list with the color\r
                $icons = array('nav-bookmark' => $couleurI, 'nav-friend' => $couleurI, 'nav-help' => $couleurI, 'nav-index' => $couleurI, 'nav-sommaire' => $couleurI,\r
-                       'next' => $arrowsColor, 'previous' => $arrowsColor);\r
+                       'next' => $arrowsColor, 'previous' => $arrowsColor, 'search' => $couleurI);\r
 \r
                foreach ($icons as $icon => $color) {\r
                        // Get content of the svg\r
@@ -226,7 +226,6 @@ class wsPackagerHTML5 extends wsPackager {
        protected function writeCSS($file) {\r
                $res = array();\r
 \r
-\r
                // General theme\r
                $h = $this->book->parametres->height . 'px';\r
                $w2 = ($this->book->parametres->width * 2) . 'px';\r
@@ -234,11 +233,25 @@ class wsPackagerHTML5 extends wsPackager {
                $wm = ($this->book->parametres->width * $this->multiply) . 'px';\r
                $hm = ($this->book->parametres->height * $this->multiply) . 'px';\r
 \r
+\r
                $navTop = ($this->book->parametres->height - 40 - 100) / 2;\r
-               $res[] = '.portrait #pages,.portrait .doublePage.page,.page,.background{width:' . $w . ';max-width:' . $w . ';height:' . $h . ';max-height:' . $h . '}';\r
-               $res[] = '.background{background-size:100% 100%;}';\r
-               $res[] = '.doublePage,#pages{width:' . $w2 . ';max-width:' . $w2 . ';height:' . $h . ';max-height:' . $h . '}';\r
-               $res[] = '.page.right{left:' . $w . '}';\r
+               $res[] = '.portrait #pages,.portrait .doublePage.page,.page,.portrait #shadow,#shadow.single{width:' . $w . ';max-width:' . $w . ';height:' . $h . ';max-height:' . $h . '}';\r
+               $res[] = '.background{' . $this->writeCSSUA('transform-origin', 'top left') . ';}';\r
+               foreach (self::$resolutions as $r) {\r
+                       $ratio = 72 / $r;\r
+                       $wr = $this->book->parametres->width / $ratio;\r
+                       $hr = $this->book->parametres->height / $ratio;\r
+\r
+                       $br = '.background.r' . $r . '{';\r
+                       if ($ratio != 1) {\r
+                               $br.=$this->writeCSSUA('transform', 'scale(' . $ratio . ')') . ';';\r
+                       }\r
+                       $br.='width:' . $wr . 'px;height:' . $hr . 'px;}';\r
+                       $res[] = $br;\r
+               }\r
+               $res[] = '.doublePage,#pages,.landscape #shadow.double{width:' . $w2 . ';max-width:' . $w2 . ';height:' . $h . ';max-height:' . $h . '}';\r
+               $res[] = '.landscape #shadow.single.right{left: ' . $w . ';}';\r
+               $res[] = '.landscape .page.right{left:' . $w . '}';\r
                $texts = '.texts{' . $this->writeCSSUA('transform-origin', 'top left') . ';';\r
                $texts.=$this->writeCSSUA('transform', 'scale(' . (1 / $this->multiply) . ')') . ';';\r
                $texts.='width:' . $wm . '; max-width:' . $wm . ';';\r
@@ -334,7 +347,7 @@ class wsPackagerHTML5 extends wsPackager {
                // Book shadow\r
                $shadowColor = self::colorToCSS($this->theme->parametres->bookShadeColor);\r
                if ($shadowColor != 'transparent') {\r
-                       $res[] = '#pages{' . $this->writeCSSUA('box-shadow', '0 0 20px ' . $shadowColor) . '}';\r
+                       $res[] = '#shadow{' . $this->writeCSSUA('box-shadow', '0 0 20px ' . $shadowColor) . '}';\r
                }\r
 \r
                // Pages styles\r