wip #2780 @2

diff --git a/inc/ws/Util/html5/mobilefirst/class.ws.html5.compiler.php b/inc/ws/Util/html5/mobilefirst/class.ws.html5.compiler.php
index 9ff37552b2b561c8c3b1c1594b3813fa910d474c..aaf96612f556796f45dbefb50f7a64736fd0665a 100644 (file)
--- a/inc/ws/Util/html5/mobilefirst/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/mobilefirst/class.ws.html5.compiler.php
@@ -1277,7 +1277,6 @@ class wsHTML5Compiler
                 continue;
             }
 
-
             $linkData['hidden'] = in_array($linkData['uid'], $hiddenLinks);
             if ($linkData['type'] == 28) {
                 $this->addSEOArticle($linkData['page'], $linkData['to'], $linkData['extra'], $linkData['image']);
@@ -1298,9 +1297,9 @@ class wsHTML5Compiler
                 $linkPages[$link->page] = true;
             }
 
-
             $c = $link->getHTMLContainer();
             $css[] = $link->getCSSContainer();
+
             if (!isset($pages[$link->page])) {
                 $pages[$link->page] = '';
                 $cpages[$link->page] = '';
@@ -1330,7 +1329,6 @@ class wsHTML5Compiler
         }
 
         foreach ($allpages as $i) {
-
             $c = '';
             $cc = '';
             if (isset($pages[$i])) {

diff --git a/inc/ws/Util/html5/mobilefirst/class.ws.html5.links.php b/inc/ws/Util/html5/mobilefirst/class.ws.html5.links.php
index 2c03fbb09500fbda91aa429ce2943401ba6afc7f..0174cdcea817fd2a1338e8dfff7331a574172688 100644 (file)
--- a/inc/ws/Util/html5/mobilefirst/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/mobilefirst/class.ws.html5.links.php
@@ -347,7 +347,7 @@ class wsHTML5Link
 
     public function getCSSContainer()
     {
-        if (!($this instanceof contentLink) && intval($this->page) % 2 == 1) {
+        if (!($this instanceof contentLink) && intval($this->page) % 2 == 1 && $this->compiler->book->parametres->mobileNavigationType != 'mobilefirst') {
             $this->page--;
             $this->left += $this->compiler->width;
         }
@@ -1320,7 +1320,7 @@ class htmlMultimediaLink extends wsHTML5Link
 
     public function getCSSContainer()
     {
-        if (!($this instanceof contentLink) && $this->page % 2 == 1) {
+        if (!($this instanceof contentLink) && $this->page % 2 == 1 && $this->compiler->book->parametres->mobileNavigationType != 'mobilefirst') {
             $this->page--;
             $this->left += $this->compiler->width;
         }
@@ -1576,7 +1576,7 @@ class inpesPopinLink extends htmlMultimediaLink
 
     public function getCSSContainer()
     {
-        if (!($this instanceof contentLink) && $this->page % 2 == 1) {
+        if (!($this instanceof contentLink) && $this->page % 2 == 1 && $this->compiler->book->parametres->mobileNavigationType != 'mobilefirst') {
             $this->page--;
             $this->left += $this->compiler->width;
         }