wip #2806 @0.5

diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js
index 18fc30bef169989c37242d5e8078b0464008fcc5..2dab278d7db0712b7296c2509cbec831600205e1 100644 (file)
--- a/js/libs/fluidbook/fluidbook.links.js
+++ b/js/libs/fluidbook/fluidbook.links.js
@@ -185,7 +185,7 @@ FluidbookLinks.prototype = {
 
         var links = $("#links").removeClass('right');
         $(links).html('').show();
-        if (this.fluidbook.displayOnePage && pageNr % 2 === 1 && this.fluidbook.l10n.dir==='ltr') {
+        if (this.fluidbook.displayOnePage && pageNr % 2 === 1 && this.fluidbook.l10n.dir === 'ltr') {
             $(links).addClass('right')
         }
         if (this.fluidbook.datas.bookmark) {
@@ -193,8 +193,19 @@ FluidbookLinks.prototype = {
         }
 
         links.prepend('<div class="leftContainer container"></div><div class="rightContainer container"></div>');
+
         links.find('.rightContainer').html(this.fluidbook.datas.links[rightPage]);
         links.find('.leftContainer').html(this.fluidbook.datas.links[leftPage]);
+
+        if (this.fluidbook.displayOnePage) {
+            if (pageNr !== rightPage) {
+                links.find('.rightContainer').hide();
+            }
+            if (pageNr !== leftPage) {
+                links.find('.leftContainer').hide();
+            }
+        }
+
         if (links.find('.link.multimedia iframe').length > 0) {
             this.fluidbook.networkControl.pause(30000);
         }

diff --git a/style/fluidbook.less b/style/fluidbook.less
index 5ee0c23f1d082c05fa5277e513849ce6f5942de6..9f9723569c50540b53042abb9cdcd25b5664b889 100644 (file)
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -188,35 +188,19 @@ body, html {
 }
 
 /* Desktop devices */
-
-.msie {
-  &.desktop {
-    #links .nonlinkarea {
-      cursor: url(./images/cursors/zoom-in.cur), auto;
-    }
-
-    .zoomed {
-      #links .nonlinkarea {
-        cursor: url(./images/cursors/zoom-out.cur), auto;
-      }
-    }
+&.using-mouse body:not(.zoom-disabled) {
+  #links .container {
+    cursor: zoom-in;
   }
-}
 
-&.no-msie {
-  &.desktop {
-    #links .nonlinkarea {
-      cursor: zoom-in;
-    }
-
-    .zoomed {
-      #links .nonlinkarea {
-        cursor: zoom-out;
-      }
+  &.zoomed {
+    #links .container {
+      cursor: zoom-out;
     }
   }
 }
 
+
 #links {
   .container {
     position: absolute;
@@ -225,7 +209,11 @@ body, html {
     height: @book-page-height;
 
     &.rightContainer {
-      left:  @book-page-width;
+      left: @book-page-width;
+
+      .mobilefirst & {
+        left: 0;
+      }
     }
   }
 }
@@ -1226,7 +1214,7 @@ html.ios body.portrait #interface {
   background-color: rgba(0, 0, 0, 0.001);
 }
 
-.rtl  #links {
+.rtl #links {
   .leftContainer {
     left: 50%;
   }
@@ -1321,7 +1309,6 @@ html.ios body.portrait #interface {
   top: 0px;
   left: 0px;
   display: block;
-  cursor: zoom-in;
 
   .zoom-disabled & {
     cursor: auto !important;