wip #7390 @0.5

diff --git a/js/libs/fluidbook/fluidbook.bookmarks.js b/js/libs/fluidbook/fluidbook.bookmarks.js
index 66d411682e71ae3d61fadb61e2e3ceebf327d989..3c9eb3b69ce871821011dba9ea994fae68f789ea 100644 (file)
--- a/js/libs/fluidbook/fluidbook.bookmarks.js
+++ b/js/libs/fluidbook/fluidbook.bookmarks.js
@@ -135,7 +135,7 @@ FluidbookBookmarks.prototype = {
     },
 
     getPDF: function () {
-        return this.fluidbook.service.getBaseURL(true) + 'e/' + this.fluidbook.settings.cid + '/' + this.getBookmarksCompacted();
+        return this.fluidbook.service.getBaseURL(true) + 'e/'+this.fluidbook.settings.id+'-' +this.fluidbook.settings.cid + '/' + this.getBookmarksCompacted();
     },
 
     getBookmarksCompacted: function () {

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 5d036fc98c611c0447711f2e767052f6f6b5985e..ee41027acefacf6620f3994eaad174ab3a5eccea 100644 (file)
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -854,7 +854,7 @@ Fluidbook.prototype = {
         var pdfName;
 
         if (this.settings.pages != this.contentlock.getMaxPage()) {
-            pdf = this.service.getBaseURL(true) + 'e/' + this.settings.cid + '/1-' + this.contentlock.getMaxPage();
+            pdf = this.service.getBaseURL(true) + 'e/'+this.settings.id+'-' + this.settings.cid + '/1-' + this.contentlock.getMaxPage();
         } else if (this.settings.pdfName.substr(0, 4) === 'http') {
             pdf = this.settings.pdfName;
         } else {

diff --git a/js/libs/fluidbook/fluidbook.print.js b/js/libs/fluidbook/fluidbook.print.js
index 7ae5e14726f99385fe3abed116841269abd53154..8b6af2fb14c6897c07f260e165808279edf11339 100644 (file)
--- a/js/libs/fluidbook/fluidbook.print.js
+++ b/js/libs/fluidbook/fluidbook.print.js
@@ -24,7 +24,7 @@ FluidbookPrint.prototype = {
             var element = $(this);
             var mode = element.data('mode'); // Either 'print' or 'download'
             var print = (mode === 'print');
-            var dynamicPDF = $this.fluidbook.service.getBaseURL(true) + (print ? 'ep' : 'e') + '/' + $this.fluidbook.settings.cid + '/';
+            var dynamicPDF = $this.fluidbook.service.getBaseURL(true) + (print ? 'ep' : 'e') + '/' +$this.fluidbook.settings.id + '-' + $this.fluidbook.settings.cid + '/';
             var leftPageNumber = $this.fluidbook.getPhysicalPageNumberOfSide('left');
             var rightPageNumber = $this.fluidbook.getPhysicalPageNumberOfSide('right');
             var choice = $('input[name="pageChoice"]:checked').val();