(no commit message)

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index a1407bbc6d13cde4dff6ba86cdc21b5ea28e78f7..c6f2ffac8243cb958375d1e99bffbe2334ff37f0 100644 (file)
--- 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')\r
                );\r
                $this->fields['mobileNavigationType'] = array('type' => 'combo', 'default' => 'book', 'editable' => true, 'label' => __('Mode de navigation'), 'grade' => 5,\r
-                       'datas' => array(__('Normal (livre)') => 'book',\r
+                       'datas' => array(__('Normal (automatique)') => 'book',\r
+                               __('Normal (double page)') => 'landscape',\r
+                               __('Normal (une page)') => 'portrait',\r
                                __('Magazine tablette') => 'tab')\r
                );\r
                $this->fields['mobileTransitionDuration'] = array('type' => 'float', 'default' => '1.0', 'editable' => true, 'label' => __('Durée de la transition'));\r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index cfb73d931a45632d713477bb03012298a796c0de..33079ea25efc7f7d605e4d598b2823f31ffcebcc 100644 (file)
--- 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 . ';}';