(no commit message)

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 76169f43613d317a03cda505fac0f8e95e82377a..36298fbb6aa55cb2a7d3089d4cf5896d4d8bba88 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -199,8 +199,15 @@ class wsBookParametres extends wsParametres {
                                __('Version HTML5') => 'html5',\r
                                __("Version HTML5 en images") => 'html5-images')\r
                );\r
+\r
+               $this->fields['mobileTransitions'] = array('type' => 'combo', 'default' => 'none', 'editable' => true, 'label' => __('Transitions entre les pages'), 'grade' => 5,\r
+                       'datas' => array(__('Aucune transition') => 'none',\r
+                               __('Glisser') => 'slide',\r
+                               __('Tourner') => 'flip')\r
+               );\r
+\r
                $this->forms['mobile'] = array('label' => __('Version mobile'),\r
-                       'fieldsnames' => array('mobileVersion'));\r
+                       'fieldsnames' => array('mobileVersion', 'mobileTransitions'));\r
 \r
                $this->fields['secureURL'] = array('type' => 'text', 'default' => 'http://', 'editable' => true, 'label' => __('URL de sécurisation'), 'grade' => 5, 'hint' => __('URL intérrogé pour vérifier si le visiteur à les droits pour consulter la publication'));\r
                $this->fields['secureURLRedirect'] = array('type' => 'text', 'default' => 'http://', 'editable' => true, 'label' => __('Redirection'), 'grade' => 5, 'hint' => __("Si l'authentification échoue, redirection vers cette adresse"));\r
@@ -236,8 +243,8 @@ class wsBookParametres extends wsParametres {
                $this->forms['v1'] = array('label' => __('Options spécifiques au fluidbook version 1'),\r
                        'fieldsnames' => array('extras', 'v1SWF'));\r
 \r
-               $this->fields['disableDemo'] =  array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Désactiver le lien de démo'), 'grade' => 5);\r
-               $this->fields['redirectDemo'] =  array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Rediriger le lien de démo vers'), 'grade' => 5);\r
+               $this->fields['disableDemo'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Désactiver le lien de démo'), 'grade' => 5);\r
+               $this->fields['redirectDemo'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Rediriger le lien de démo vers'), 'grade' => 5);\r
                $this->forms['demo'] = array('label' => __('Lien de démo'),\r
                        'fieldsnames' => array('disableDemo', 'redirectDemo'));\r
        }\r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index a0741877ccb3e03cb759b72f45cb982189791c92..176cf8c92665379ac819ed1e4f1ec315fcb49737 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -20,6 +20,7 @@ class wsHTML5Compiler {
                'js/libs/fluidbook/fluidbook.service.js',
                'js/libs/fluidbook/fluidbook.l10n.js',
                'js/libs/fluidbook/fluidbook.nav.js',
+               'js/libs/fluidbook/fluidbook.touch.js',
                'js/libs/fluidbook/fluidbook.js',
                'js/main.js');
        protected static $testJsFiles = array(
@@ -117,8 +118,8 @@ class wsHTML5Compiler {
 
                $this->cssOneWidth = $this->width * $this->cssOneScale;
                $this->cssOneHeight = $this->height * $this->cssOneScale;
-               
-               $this->cssSVGScale=0.75/2;
+
+               $this->cssSVGScale = 0.75 / 2;
 
                $this->scale = 1;
                if ($this->book->parametres->zoomMode == 1) {
@@ -515,6 +516,10 @@ class wsHTML5Compiler {
                $res[] = '.landscape #fluidbook{left:' . $offsetLeft2 . 'px;}';
                $res[] = '.portrait #pages,.portrait .doublePage.page,.page,.portrait #shadow,#shadow.single,.page .links{width:' . $w . ';max-width:' . $w . ';height:' . $h . ';max-height:' . $h . '}';
                $res[] = '.doublePage,#pages,.landscape #shadow.double{width:' . $w2 . ';max-width:' . $w2 . ';height:' . $h . ';max-height:' . $h . '}';
+               $res[] = '.landscape .doublePage.next{' . $this->writeCSSUA('transform', 'translate(' . $w2 . ',0)') . '}';
+               $res[] = '.landscape .doublePage.prev{' . $this->writeCSSUA('transform', 'translate(-' . $w2 . ',0)') . '}';
+               $res[] = '.portrait .doublePage.next{' . $this->writeCSSUA('transform', 'translate(' . $w . ',0)') . '}';
+               $res[] = '.portrait .doublePage.prev{' . $this->writeCSSUA('transform', 'translate(-' . $w . ',0)') . '}';
                $res[] = '.landscape #shadow.single.right{left: ' . $w . ';}';
                $res[] = '.landscape .page.right{left:' . $w . '}';
                if ($this->theme->parametres->displayPageNumber) {