From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Sun, 25 Mar 2012 04:34:08 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=1330d1ebe1604a473f8366df8b4600b900ee9035;p=cubeextranet.git

---

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 76169f436..36298fbb6 100644
--- 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',
 				__("Version HTML5 en images") => 'html5-images')
 		);
+
+		$this->fields['mobileTransitions'] = array('type' => 'combo', 'default' => 'none', 'editable' => true, 'label' => __('Transitions entre les pages'), 'grade' => 5,
+			'datas' => array(__('Aucune transition') => 'none',
+				__('Glisser') => 'slide',
+				__('Tourner') => 'flip')
+		);
+
 		$this->forms['mobile'] = array('label' => __('Version mobile'),
-			'fieldsnames' => array('mobileVersion'));
+			'fieldsnames' => array('mobileVersion', 'mobileTransitions'));
 
 		$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'));
 		$this->fields['secureURLRedirect'] = array('type' => 'text', 'default' => 'http://', 'editable' => true, 'label' => __('Redirection'), 'grade' => 5, 'hint' => __("Si l'authentification échoue, redirection vers cette adresse"));
@@ -236,8 +243,8 @@ class wsBookParametres extends wsParametres {
 		$this->forms['v1'] = array('label' => __('Options spécifiques au fluidbook version 1'),
 			'fieldsnames' => array('extras', 'v1SWF'));
 
-		$this->fields['disableDemo'] =  array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Désactiver le lien de démo'), 'grade' => 5);
-		$this->fields['redirectDemo'] =  array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Rediriger le lien de démo vers'), 'grade' => 5);
+		$this->fields['disableDemo'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Désactiver le lien de démo'), 'grade' => 5);
+		$this->fields['redirectDemo'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Rediriger le lien de démo vers'), 'grade' => 5);
 		$this->forms['demo'] = array('label' => __('Lien de démo'),
 			'fieldsnames' => array('disableDemo', 'redirectDemo'));
 	}
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index a0741877c..176cf8c92 100644
--- 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) {