From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 26 Aug 2013 16:38:26 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=05facf8c215387f28a8777c9fc986da6797833f7;p=cubeextranet.git

---

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index a1407bbc6..c6f2ffac8 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -283,7 +283,9 @@ class wsBookParametres extends wsParametres {
 				__('Tourner') => 'flip')
 		);
 		$this->fields['mobileNavigationType'] = array('type' => 'combo', 'default' => 'book', 'editable' => true, 'label' => __('Mode de navigation'), 'grade' => 5,
-			'datas' => array(__('Normal (livre)') => 'book',
+			'datas' => array(__('Normal (automatique)') => 'book',
+				__('Normal (double page)') => 'landscape',
+				__('Normal (une page)') => 'portrait',
 				__('Magazine tablette') => 'tab')
 		);
 		$this->fields['mobileTransitionDuration'] = array('type' => 'float', 'default' => '1.0', 'editable' => true, 'label' => __('Durée de la transition'));
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index cfb73d931..33079ea25 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -734,7 +734,7 @@ class wsHTML5Compiler {
 			//$link['page']++;
 		}
 		if ($link['page'] <= 0 || $link['page'] > $this->book->parametres->pages) {
-			continue;
+			return;
 		}
 
 		$this->config->bookmarkGroups[] = array('page' => ($link['page'] ), 'nb' => $link['to'], 'name' => $link['extra']);
@@ -1005,20 +1005,6 @@ class wsHTML5Compiler {
 		$res[] = '.doublePage._2d.axis_y.next{' . self::writeCSSUA('transform', 'translate3d(0,' . $h . ',0)') . '}';
 		$res[] = '.doublePage._2d.axis_y.prev{' . self::writeCSSUA('transform', 'translate3d(0,-' . $h . ',0)') . '}';
 
-		/* $res[] = '.dev .landscape .doublePage._2d.axis_x.next{left:' . $w2 . ';' . self::writeCSSUA('transform', 'none') . '}';
-		  $res[] = '.dev .landscape .doublePage._2d.axis_x.prev{left:-' . $w2 . ';' . self::writeCSSUA('transform', 'none') . '}';
-		  $res[] = '.dev .portrait .doublePage._2d.axis_x.next{left:' . $w . ';' . self::writeCSSUA('transform', 'none') . '}';
-		  $res[] = '.dev .portrait .doublePage._2d.axis_x.prev{left:-' . $w . ';' . self::writeCSSUA('transform', 'none') . '}';
-		  $res[] = '.dev .doublePage._2d.axis_y.next{top:' . $h . ';' . self::writeCSSUA('transform', 'none') . '}';
-		  $res[] = '.dev .doublePage._2d.axis_y.prev{top:-' . $h . ';' . self::writeCSSUA('transform', 'none') . '}';
-
-		  $res[] = '.dev .landscape .doublePage._2d.axis_x.next{' . self::writeCSSUA('transform', 'translate(' . $w2 . ',0)') . '}';
-		  $res[] = '.dev .landscape .doublePage._2d.axis_x.prev{' . self::writeCSSUA('transform', 'translate(-' . $w2 . ',0)') . '}';
-		  $res[] = '.dev .portrait .doublePage._2d.axis_x.next{' . self::writeCSSUA('transform', 'translate(' . $w . ',0)') . '}';
-		  $res[] = '.dev .portrait .doublePage._2d.axis_x.prev{' . self::writeCSSUA('transform', 'translate(-' . $w . ',0)') . '}';
-		  $res[] = '.dev .doublePage._2d.axis_y.next{' . self::writeCSSUA('transform', 'translate(0,' . $h . ')') . '}';
-		  $res[] = '.dev .doublePage._2d.axis_y.prev{' . self::writeCSSUA('transform', 'translate(0,-' . $h . ')') . '}'; */
-
 		$res[] = '.doublePage._3d{left:' . $w . ';}';
 		$res[] = '#links.right{left:-' . $w . ';}';
 		$res[] = '.landscape #shadow.single.right{left: ' . $w . ';}';