wip #1472 @1

diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index f9ba875c7c441ac4ca81ae7cf8796422364a2bdd..c3018e23b04f1e25be6cdd536d9572304edd0aaf 100644 (file)
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@ -133,7 +133,8 @@ FluidbookMenu.prototype = {
                 hits[k] += v;
             });
             var e = encodeURIComponent($this.searchString);
-            $(".doubleThumb").each(function () {
+            $(".mview .doubleThumb").each(function () {
+
                 var pages = $(this).data('pages').toString().split(',');
                 var hitsp = 0;
                 var pagesWithHits = [];
@@ -451,7 +452,7 @@ FluidbookMenu.prototype = {
                 fullscreen = (w >= ww * 0.9);
                 if (this.fluidbook.datas.chaptersCascade) {
                     h = hh * 0.8;
-                    forceHeight=true;
+                    forceHeight = true;
                 }
                 break;
             case 'index':

diff --git a/js/libs/fluidbook/fluidbook.resize.js b/js/libs/fluidbook/fluidbook.resize.js
index c97847d74962b3a067a404d74d8c4c8ccf6f0987..56d256aa5fe57bb48cef4f5b5ccdd06a98eeec60 100644 (file)
--- a/js/libs/fluidbook/fluidbook.resize.js
+++ b/js/libs/fluidbook/fluidbook.resize.js
@@ -131,6 +131,14 @@ FluidbookResize.prototype = {
             height: fhh
         });
 
+
+        if ($("#pagesnumbers").data('size') == null) {
+            $("#pagesnumbers").data('size', parseInt($("#pagesnumbers").css('font-size')));
+        }
+
+        var pageNumberScale = Math.min(1, 1 / (this.bookScale / 0.5));
+        $("#pagesnumbers").css('font-size', $("#pagesnumbers").data('size') * pageNumberScale);
+
         if (this.fluidbook.datas.logoHideWhenOverriden) {
             var availableWidthForLogo = (this.ww - fw) / 2;
             if ($("#logo").outerWidth() > availableWidthForLogo) {
@@ -275,7 +283,7 @@ FluidbookResize.prototype = {
             this.fluidbook.pageTransition();
         }
     },
-    getScreenFluidbookWidth:function(){
-        return $("#fluidbook").outerWidth()*fluidbook.resize.bookScale;
+    getScreenFluidbookWidth: function () {
+        return $("#fluidbook").outerWidth() * fluidbook.resize.bookScale;
     }
 };
\ No newline at end of file

diff --git a/style/fluidbook.less b/style/fluidbook.less
index dc4d203cffca6e6666681018d16cf9ef97c641b7..882361df4f30a25bfad1555a056c2a4a6cb309d5 100644 (file)
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -391,11 +391,17 @@ body, html {
        position: absolute;
        white-space: nowrap;
        pointer-events: none;
-}
+       font-size: unit(13*@z, px);
+       margin: 0.38em 0 0 0;
+       top: @book-page-height;
+       color: @page-number-color;
+       .hideifnot(@display-page-number);
 
-#pagesnumbers div {
-       text-align: center;
-       display: inline-block;
+       > div {
+               width: @book-page-width;
+               text-align: center;
+               display: inline-block;
+       }
 }
 
 .portrait #pagesnumbers .right {