From 4ece04e407a5de5e89debd6c0b556c1cacf1e7b8 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Wed, 10 Oct 2012 12:22:40 +0000 Subject: [PATCH] --- fluidbook/icones/1/mobile/nav-map.svg | 17 ++++++++++++++++ fluidbook/icones/1/mobile/nav-tag.svg | 20 +++++++++++++++++++ inc/ws/Metier/class.ws.book.parametres.php | 3 ++- inc/ws/Util/html5/class.ws.html5.compiler.php | 4 ++-- 4 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 fluidbook/icones/1/mobile/nav-map.svg create mode 100644 fluidbook/icones/1/mobile/nav-tag.svg diff --git a/fluidbook/icones/1/mobile/nav-map.svg b/fluidbook/icones/1/mobile/nav-map.svg new file mode 100644 index 000000000..8a327abef --- /dev/null +++ b/fluidbook/icones/1/mobile/nav-map.svg @@ -0,0 +1,17 @@ + + + + + + + + diff --git a/fluidbook/icones/1/mobile/nav-tag.svg b/fluidbook/icones/1/mobile/nav-tag.svg new file mode 100644 index 000000000..c1b0c5375 --- /dev/null +++ b/fluidbook/icones/1/mobile/nav-tag.svg @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index 980b08308..0e66dfc69 100644 --- a/inc/ws/Metier/class.ws.book.parametres.php +++ b/inc/ws/Metier/class.ws.book.parametres.php @@ -250,13 +250,14 @@ class wsBookParametres extends wsParametres { __('Glisser') => 'slide', __('Tourner') => 'flip') ); + $this->fields['mobileTransitionDuration'] = array('type' => 'float', 'default' => '1.0', 'editable' => true, 'label' => __('Durée de la transition')); $this->fields['mobileIconVector'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Utiliser les icônes vectorielles')); $this->fields['mobilePlugins'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Plugin'), 'grade' => 5); $this->forms['mobile'] = array('label' => __('Version mobile'), - 'fieldsnames' => array('mobileLVersion', '|', 'mobileVersion', 'mobileTransitions', 'mobileIconVector', 'mobilePlugins')); + 'fieldsnames' => array('mobileLVersion', 'mobileVersion', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'mobileIconVector', 'mobilePlugins')); $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'); $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'); diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php index 3a52bbc9c..bf9f531ae 100644 --- a/inc/ws/Util/html5/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/class.ws.html5.compiler.php @@ -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) { -- 2.39.5