]> _ Git - cubeextranet.git/commitdiff
(no commit message)
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 10 Oct 2012 12:22:40 +0000 (12:22 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 10 Oct 2012 12:22:40 +0000 (12:22 +0000)
fluidbook/icones/1/mobile/nav-map.svg [new file with mode: 0644]
fluidbook/icones/1/mobile/nav-tag.svg [new file with mode: 0644]
inc/ws/Metier/class.ws.book.parametres.php
inc/ws/Util/html5/class.ws.html5.compiler.php

diff --git a/fluidbook/icones/1/mobile/nav-map.svg b/fluidbook/icones/1/mobile/nav-map.svg
new file mode 100644 (file)
index 0000000..8a327ab
--- /dev/null
@@ -0,0 +1,17 @@
+<?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="15px" height="20px" viewBox="0 0 15 20" enable-background="new 0 0 15 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M7.445,0.72c-3.421,0-6.194,2.773-6.194,6.194c0,1.539,0.586,2.984,1.514,4.067c0,0-0.005-0.007-0.015-0.02\r
+               c0.005,0.007,0.009,0.012,0.015,0.02c0.527,0.713,2.289,2.903,4.68,8.108c2.391-5.205,4.153-7.396,4.68-8.108\r
+               c0.005-0.007,0.009-0.013,0.014-0.02c-0.009,0.012-0.014,0.02-0.014,0.02c0.928-1.083,1.514-2.529,1.514-4.067\r
+               C13.639,3.493,10.865,0.72,7.445,0.72z M2.561,10.706C2.526,10.659,2.515,10.644,2.561,10.706L2.561,10.706z M2.574,10.724\r
+               c0.015,0.02,0.035,0.046,0.059,0.079C2.612,10.775,2.591,10.747,2.574,10.724z M2.657,10.836c0.017,0.023,0.036,0.048,0.057,0.076\r
+               C2.697,10.89,2.677,10.863,2.657,10.836z M7.445,10.174c-1.8,0-3.26-1.459-3.26-3.26c0-1.8,1.459-3.259,3.26-3.259\r
+               c1.799,0,3.259,1.459,3.259,3.259C10.704,8.714,9.244,10.174,7.445,10.174z M12.176,10.913c0.021-0.028,0.039-0.053,0.057-0.076\r
+               C12.212,10.863,12.192,10.89,12.176,10.913z M12.256,10.803c0.024-0.033,0.044-0.059,0.059-0.079\r
+               C12.298,10.747,12.277,10.775,12.256,10.803z M12.328,10.706C12.375,10.644,12.363,10.659,12.328,10.706L12.328,10.706z"/>\r
+</g>\r
+</svg>\r
diff --git a/fluidbook/icones/1/mobile/nav-tag.svg b/fluidbook/icones/1/mobile/nav-tag.svg
new file mode 100644 (file)
index 0000000..c1b0c53
--- /dev/null
@@ -0,0 +1,20 @@
+<?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="24px" height="20px" viewBox="0 0 24 20" enable-background="new 0 0 24 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M19.086,5.345c-0.27,0.064-0.557,0.105-0.865,0.112c-0.041,0-0.082,0.001-0.121,0.001\r
+               c-0.514,0-1.006-0.066-1.457-0.192c-0.547,0.508-1.402,0.498-1.936-0.035c-0.545-0.545-0.545-1.429,0-1.974\r
+               c0.545-0.545,1.43-0.545,1.975,0c0.152,0.152,0.26,0.332,0.327,0.523c0.353,0.103,0.753,0.155,1.182,0.147\r
+               c0.246-0.005,0.479-0.047,0.702-0.113l-0.118-0.94l-0.002-0.002c-0.022-0.419-0.19-0.832-0.511-1.152\r
+               c-0.326-0.326-0.747-0.496-1.174-0.513l-5.146-0.65c-0.064-0.016-0.13-0.024-0.197-0.025c-0.229-0.002-0.458,0.083-0.632,0.258\r
+               l-9.856,9.856c-0.344,0.345-0.344,0.903,0,1.248l6.832,6.831c0.344,0.345,0.903,0.345,1.247,0l9.855-9.855\r
+               c0.175-0.175,0.261-0.404,0.258-0.633c0-0.066-0.009-0.132-0.023-0.196L19.086,5.345z M15.697,10.885l-6.378,6.378\r
+               c-0.344,0.344-0.903,0.344-1.247,0L2.719,11.91c-0.345-0.344-0.345-0.902,0-1.247l6.377-6.377c0.345-0.345,0.903-0.344,1.247,0\r
+               l5.354,5.353C16.041,9.982,16.041,10.541,15.697,10.885z"/>\r
+       <path fill="$colorize" d="M18.942,5.109c-1.593,0.181-2.831-0.257-2.921-0.29c-0.201-0.074-0.319-0.322-0.262-0.553\r
+               c0.057-0.232,0.268-0.359,0.47-0.286c0.042,0.015,3.499,1.218,6.116-1.5c0.154-0.16,0.395-0.141,0.539,0.042\r
+               c0.143,0.184,0.135,0.461-0.02,0.621C21.59,4.469,20.162,4.97,18.942,5.109z"/>\r
+</g>\r
+</svg>\r
index 980b08308e80966db288bffbd2bf7fc11bffc271..0e66dfc69214b8082f0d188f10619081778879a6 100644 (file)
@@ -250,13 +250,14 @@ class wsBookParametres extends wsParametres {
                                __('Glisser') => 'slide',\r
                                __('Tourner') => 'flip')\r
                );\r
+               $this->fields['mobileTransitionDuration'] = array('type' => 'float', 'default' => '1.0', 'editable' => true, 'label' => __('Durée de la transition'));\r
 \r
                $this->fields['mobileIconVector'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Utiliser les icônes vectorielles'));\r
 \r
                $this->fields['mobilePlugins'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Plugin'), 'grade' => 5);\r
 \r
                $this->forms['mobile'] = array('label' => __('Version mobile'),\r
-                       'fieldsnames' => array('mobileLVersion', '|', 'mobileVersion', 'mobileTransitions', 'mobileIconVector', 'mobilePlugins'));\r
+                       'fieldsnames' => array('mobileLVersion', 'mobileVersion', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'mobileIconVector', 'mobilePlugins'));\r
 \r
                $this->fields['phonegapId'] = array('type' => 'text', 'default' => 'com.fluidbook.phonegap.$id', 'editable' => true, 'label' => __("Identifiant de l'identifiant"), 'grade' => 5, 'hint' => __('De la forme') . ' com.fluidbook.phonegap.xxxxx');\r
                $this->fields['phonegapVersion'] = array('type' => 'text', 'default' => '1.0.0', 'editable' => true, 'label' => __("Version de l'application"), 'grade' => 5, 'hint' => __('De la forme') . ' 1.2.3');\r
index 3a52bbc9cb8348067f9847439dc43e14af1472a5..bf9f531ae53aacab30a45f2cc915495d97d723bb 100644 (file)
@@ -583,7 +583,7 @@ class wsHTML5Compiler {
                // Set the icon list with the color
                $icons = array('nav-bookmark' => $couleurI, 'nav-friend' => $couleurI, 'nav-help' => $couleurI, 'nav-index' => $couleurI, 'nav-sommaire' => $couleurI,
                        'next' => $arrowsColor, 'previous' => $arrowsColor, 'search' => $couleurI, 'nav-facebook' => $couleurI, 'nav-twitter' => $couleurI,
-                       'help-fingers' => $couleurI, 'help-mouse' => $couleurI, 'nav-home' => $couleurI,'nav-archives'=>$couleurI);
+                       'help-fingers' => $couleurI, 'help-mouse' => $couleurI, 'nav-home' => $couleurI, 'nav-archives' => $couleurI);
 
                foreach ($icons as $icon => $color) {
                        wsTools::colorizeAndRasterizeIcon($this->theme->parametres->iconSet, $icon, $color, $this->vdir . '/data/images/', 4, $w, $h);
@@ -668,7 +668,7 @@ class wsHTML5Compiler {
                } else {
                        $res[] = '#pagesnumbers{display:none;}';
                }
-
+               $res[] = '.doublePage._2d,.doublePage._3d{' . $this->writeCSSUA('transition', 'all 1s ease-in-out') . '}';
 
                $res[] = '.background{' . $this->writeCSSUA('transform-origin', 'top left') . ';}';
                foreach (self::$resolutions as $r) {