(no commit message)

diff --git a/fluidbook/icones/1/mobile/help-fingers.svg b/fluidbook/icones/1/mobile/help-fingers.svg
new file mode 100644 (file)
index 0000000..f45e6d2
--- /dev/null
+++ b/fluidbook/icones/1/mobile/help-fingers.svg
@@ -0,0 +1,70 @@
+<?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="400px" height="200px" viewBox="0 0 400 200" enable-background="new 0 0 400 200" xml:space="preserve">\r
+<path fill="#FFFFFF" d="M325.007,380.926c-6.234,3.42-17.771-15.209-24.419-15.673c-6.647-0.462-12.627,1.673-11.301,5.287\r
+       c1.328,3.614,8.041,6.632,12.646,13.757c4.607,7.125,8.96,17.877,13.788,23.558c4.826,5.681,7.769,7.103,10.452,12.148\r
+       c2.686,5.044,3.487,19.679,3.487,19.679s8.721,10.81,19.221,10.084c10.499-0.727,17.6-8.491,17.6-8.491s-1.919-14.349,0.599-26.077\r
+       c2.52-11.729,9.348-31.298,8.117-34.542s-2.151-2.216-3.605-4.017c-1.455-1.801-2.467-6.491-3.686-8.153\r
+       c-1.219-1.663-5.957-1.628-7.083-2.921c-1.126-1.297-3.726-7.551-7.257-7.432c-3.533,0.119-3.95,0.355-4.511-0.291\r
+       c-0.56-0.646-1.09-3.015-1.293-5.337c-0.204-2.322-2.585-10.019-3.636-14.103c-1.051-4.083-1.574-13.285-4.98-13.953\r
+       c-4.793-0.941-6.391,2.834-6.146,4.551c0.244,1.721,2.436,15.6,2.025,23.225S333.848,376.075,325.007,380.926z"/>\r
+<path fill="#FFFFFF" d="M510.75,419.371c8.194,1.449,10.623,1.621,16.727,3.484c6.102,1.863,23.625,18.063,23.625,18.063\r
+       s15.418,1.648,23.134-7.213c7.716-8.863,7.19-20.598,7.19-20.598s-12.842-9.813-20.113-21.059\r
+       c-7.271-11.25-17.329-32.089-20.861-33.678c-3.532-1.591-3.447-0.051-6.018-0.326c-2.57-0.272-7.072-3.176-9.346-3.526\r
+       c-2.275-0.351-5.988,3.418-7.898,3.286c-1.912-0.135-8.9-3.02-11.596-0.139c-2.695,2.884-2.838,3.399-3.79,3.332\r
+       c-0.952-0.068-3.241-1.52-5.234-3.192c-1.995-1.672-9.95-5.869-14.003-8.263c-4.054-2.394-11.73-9.246-14.947-7.084\r
+       c-4.527,3.041-2.809,7.282-1.26,8.445c1.551,1.166,14.237,10.393,19.934,16.736c5.695,6.343,8.416,9.215,15.665,21.538\r
+       c1.447,2.46,1.034,5.093,0.311,4.659s-6.545-3.814-7.124-4.828c-0.579-1.013-2.172-7.092-3.039-8.538\r
+       c-0.868-1.446-4.341-6.513-9.84-5.934c-5.5,0.579-2.027,4.487-1.014,7.236c1.014,2.75,3.038,17.366,5.644,19.826\r
+       s10.999,8.394,13.169,10.854C502.236,414.915,505.105,418.373,510.75,419.371z"/>\r
+<circle fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" cx="337.004" cy="328.412" r="11.687"/>\r
+<circle fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" cx="469.823" cy="347.279" r="13.047"/>\r
+<circle opacity="0.5" fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" cx="469.822" cy="347.28" r="21.289"/>\r
+<path fill="#FFFFFF" d="M359.093,309.676l1.417,11.041c0,1.909-1.543,3.453-3.453,3.457c-1.908-0.003-2.721-1.063-3.457-3.457\r
+       l-2.059-6.842l-6.844-2.059c-2.367-0.525-3.452-1.545-3.455-3.453c0.002-1.91,1.548-3.456,3.455-3.455l10.923,1.4\r
+       c0,0,1.662,0.123,2.512,0.973C358.98,308.131,359.093,309.676,359.093,309.676z"/>\r
+<path opacity="0.5" fill="#FFFFFF" d="M369.646,299.123l1.417,11.042c0,1.909-1.544,3.452-3.454,3.456\r
+       c-1.907-0.002-2.72-1.063-3.456-3.457l-2.059-6.842l-6.844-2.059c-2.367-0.525-3.453-1.545-3.455-3.453\r
+       c0.001-1.909,1.548-3.455,3.455-3.455l10.922,1.4c0,0,1.663,0.123,2.512,0.973C369.533,297.578,369.646,299.123,369.646,299.123z"/>\r
+<circle fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" cx="295.333" cy="370.084" r="11.687"/>\r
+<path fill="#FFFFFF" d="M273.244,388.822l-1.417-11.043c-0.001-1.908,1.544-3.452,3.453-3.455c1.907,0.002,2.721,1.063,3.457,3.456\r
+       l2.058,6.843l6.844,2.058c2.367,0.526,3.453,1.545,3.455,3.454c-0.001,1.908-1.547,3.455-3.455,3.455l-10.922-1.4\r
+       c0,0-1.662-0.125-2.512-0.974S273.244,388.822,273.244,388.822z"/>\r
+<path opacity="0.5" fill="#FFFFFF" d="M262.691,399.374l-1.416-11.042c-0.002-1.908,1.543-3.453,3.453-3.456\r
+       c1.907,0.003,2.72,1.063,3.457,3.457l2.058,6.842l6.843,2.058c2.368,0.526,3.453,1.545,3.455,3.454c0,1.909-1.547,3.456-3.455,3.455\r
+       l-10.922-1.4c0,0-1.662-0.124-2.512-0.974C262.804,400.919,262.691,399.374,262.691,399.374z"/>\r
+<path fill="#FFFFFF" d="M103.007,108.689c-6.234,3.42-17.77-15.209-24.418-15.673c-6.648-0.462-12.627,1.673-11.301,5.287\r
+       c1.328,3.614,8.041,6.632,12.647,13.757c4.607,7.125,8.959,17.877,13.788,23.558c4.826,5.681,7.769,7.103,10.453,12.148\r
+       c2.686,5.044,3.487,19.679,3.487,19.679s8.721,10.81,19.221,10.084c10.5-0.727,17.6-8.491,17.6-8.491s-1.919-14.349,0.599-26.077\r
+       c2.519-11.729,9.347-31.298,8.117-34.542c-1.23-3.244-2.151-2.216-3.605-4.017c-1.455-1.801-2.467-6.491-3.686-8.153\r
+       c-1.219-1.663-5.957-1.627-7.083-2.921c-1.126-1.296-3.725-7.55-7.257-7.432c-3.533,0.12-3.95,0.356-4.511-0.291\r
+       c-0.559-0.646-1.09-3.015-1.293-5.337c-0.205-2.322-2.585-10.019-3.636-14.103c-1.051-4.083-1.574-13.285-4.98-13.953\r
+       c-4.793-0.941-6.391,2.833-6.147,4.551c0.244,1.72,2.436,15.599,2.026,23.225C112.615,87.613,111.848,103.839,103.007,108.689z"/>\r
+<path fill="#FFFFFF" d="M288.75,147.135c8.194,1.449,10.623,1.621,16.727,3.484c6.102,1.863,23.625,18.063,23.625,18.063\r
+       s15.418,1.648,23.134-7.213c7.716-8.863,7.19-20.598,7.19-20.598s-12.842-9.813-20.113-21.059\r
+       c-7.271-11.25-17.329-32.089-20.861-33.678c-3.532-1.59-3.447-0.05-6.018-0.325c-2.57-0.273-7.072-3.176-9.346-3.527\r
+       c-2.275-0.351-5.988,3.418-7.898,3.286c-1.912-0.134-8.9-3.02-11.596-0.139c-2.695,2.884-2.838,3.399-3.79,3.332\r
+       c-0.952-0.069-3.241-1.52-5.234-3.192c-1.995-1.672-9.95-5.869-14.003-8.263c-4.054-2.393-11.73-9.245-14.947-7.083\r
+       c-4.527,3.041-2.809,7.282-1.26,8.445c1.551,1.165,14.237,10.392,19.934,16.735c5.695,6.343,8.416,9.215,15.665,21.539\r
+       c1.447,2.46,1.034,5.093,0.311,4.659s-6.545-3.814-7.124-4.828c-0.579-1.013-2.172-7.092-3.039-8.538\r
+       c-0.868-1.446-4.341-6.513-9.84-5.934c-5.5,0.579-2.027,4.487-1.014,7.236c1.014,2.75,3.038,17.366,5.644,19.826\r
+       s10.999,8.394,13.169,10.854C280.236,142.679,283.105,146.137,288.75,147.135z"/>\r
+<circle fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" cx="115.004" cy="56.176" r="11.687"/>\r
+<circle fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" cx="247.823" cy="75.043" r="13.047"/>\r
+<circle opacity="0.5" fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" cx="247.822" cy="75.044" r="21.289"/>\r
+<path fill="#FFFFFF" d="M137.093,37.439l1.417,11.042c0,1.909-1.543,3.453-3.454,3.456c-1.908-0.002-2.72-1.063-3.457-3.457\r
+       l-2.058-6.842l-6.844-2.058c-2.368-0.526-3.453-1.545-3.455-3.454c0.001-1.909,1.547-3.456,3.455-3.455l10.922,1.4\r
+       c0,0,1.662,0.124,2.512,0.973C136.981,35.894,137.093,37.439,137.093,37.439z"/>\r
+<path opacity="0.5" fill="#FFFFFF" d="M147.646,26.887l1.417,11.042c0,1.909-1.543,3.453-3.454,3.456\r
+       c-1.907-0.002-2.72-1.063-3.457-3.457l-2.058-6.842l-6.844-2.058c-2.367-0.526-3.453-1.545-3.455-3.454\r
+       c0.001-1.909,1.548-3.456,3.455-3.455l10.922,1.4c0,0,1.663,0.124,2.512,0.973C147.533,25.342,147.646,26.887,147.646,26.887z"/>\r
+<circle fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" cx="73.333" cy="97.848" r="11.686"/>\r
+<path fill="#FFFFFF" d="M51.244,116.586l-1.417-11.043c-0.001-1.908,1.543-3.452,3.453-3.455c1.908,0.002,2.721,1.063,3.457,3.456\r
+       l2.058,6.843l6.844,2.058c2.367,0.526,3.453,1.545,3.455,3.454c-0.001,1.908-1.548,3.455-3.455,3.455l-10.922-1.4\r
+       c0,0-1.663-0.125-2.512-0.974S51.244,116.586,51.244,116.586z"/>\r
+<path opacity="0.5" fill="#FFFFFF" d="M40.691,127.138l-1.417-11.042c-0.001-1.908,1.543-3.453,3.453-3.456\r
+       c1.908,0.003,2.72,1.063,3.457,3.457l2.058,6.842l6.843,2.058c2.368,0.526,3.453,1.545,3.455,3.454\r
+       c-0.001,1.909-1.547,3.456-3.455,3.455l-10.922-1.4c0,0-1.663-0.124-2.512-0.974C40.804,128.683,40.691,127.138,40.691,127.138z"/>\r
+</svg>\r

diff --git a/fluidbook/icones/1/mobile/help-mouse.svg b/fluidbook/icones/1/mobile/help-mouse.svg
new file mode 100644 (file)
index 0000000..eb6d44b
--- /dev/null
+++ b/fluidbook/icones/1/mobile/help-mouse.svg
@@ -0,0 +1,23 @@
+<?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="100px" height="200px" viewBox="0 0 100 200" enable-background="new 0 0 100 200" xml:space="preserve">\r
+<g>\r
+       <g>\r
+               <path fill="#FFFFFF" d="M47.024,89.074v13.825c0,1.94,1.579,3.52,3.521,3.52c1.94,0,3.52-1.579,3.52-3.52V89.074\r
+                       c0-1.94-1.579-3.52-3.52-3.52C48.604,85.554,47.024,87.134,47.024,89.074z"/>\r
+               <path opacity="0.5" fill="#FFFFFF" d="M51.724,83.313c2.68,0.547,4.701,2.923,4.701,5.761v13.825c0,2.838-2.021,5.213-4.701,5.761\r
+                       v4.025h33.898c-4.954-18.886-18.195-32.55-33.898-33.206V83.313z"/>\r
+               <path opacity="0.5" fill="#FFFFFF" d="M14.896,115.046c-0.985,4.466-1.523,9.19-1.523,14.083\r
+                       c0,27.443,16.643,49.691,37.172,49.691s37.172-22.248,37.172-49.691c0-4.893-0.538-9.617-1.523-14.083H14.896z"/>\r
+               <path fill="#FFFFFF" d="M49.364,112.686v-4.025c-2.679-0.549-4.7-2.924-4.7-5.761V89.074c0-2.837,2.021-5.213,4.7-5.761v-3.833\r
+                       c-15.703,0.656-28.944,14.32-33.898,33.206H49.364z"/>\r
+       </g>\r
+       <path opacity="0.5" fill="#FFFFFF" d="M50.82,76.915c-0.294,0-0.587-0.109-0.816-0.329c-0.47-0.451-0.486-1.197-0.035-1.668\r
+               c0.07-0.074,7.023-7.435,6.136-14.931c-0.432-3.643-2.679-6.794-6.68-9.366c-4.609-2.964-7.204-6.683-7.711-11.052\r
+               c-0.999-8.637,6.567-16.568,6.89-16.902c0.455-0.469,1.199-0.48,1.668-0.028c0.47,0.453,0.481,1.199,0.029,1.668\r
+               c-0.071,0.074-7.117,7.478-6.241,14.999c0.423,3.629,2.658,6.768,6.643,9.33c4.625,2.974,7.232,6.703,7.748,11.084\r
+               c1.012,8.609-6.461,16.5-6.778,16.831C51.44,76.793,51.131,76.915,50.82,76.915z"/>\r
+</g>\r
+</svg>\r

diff --git a/inc/ws/Util/packager/html5/class.ws.packager.html5.php b/inc/ws/Util/packager/html5/class.ws.packager.html5.php
index a7e157470197b9fa8c596a6e0d8f7c00cf8f1c4c..3f7e6052a76e6c85944bfac784db452496f70ca0 100644 (file)
--- a/inc/ws/Util/packager/html5/class.ws.packager.html5.php
+++ b/inc/ws/Util/packager/html5/class.ws.packager.html5.php
@@ -173,7 +173,8 @@ 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, 'search' => $couleurI, 'nav-facebook' => $couleurI, 'nav-twitter' => $couleurI);\r
+                       'next' => $arrowsColor, 'previous' => $arrowsColor, 'search' => $couleurI, 'nav-facebook' => $couleurI, 'nav-twitter' => $couleurI,\r
+                       'help-fingers' => $couleurI, 'help-mouse' => $couleurI);\r
 \r
                foreach ($icons as $icon => $color) {\r
                        wsTools::colorizeAndRasterizeIcon($this->theme->parametres->iconSet, $icon, $color, $this->vdir . '/data/images/', 4, $w, $h);\r
@@ -710,6 +711,7 @@ class wsPackagerHTML5 extends wsPackager {
                $origDir = WS_BOOKS . '/working/' . $this->book_id . '/';\r
                $types = array('mp4', 'ogv', 'webm', 'jpg');\r
                if ($video) {\r
+                       return;\r
                        wsTools::encodeWebVideos($origDir . $source, null, false);\r
                        $e = explode('.', $source);\r
                        array_pop($e);\r