wait #5453 @1.5

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/EditOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/EditOperation.php
index e52480783b63a41bebd1b96972c56a380ac57f4b..d725d89a7142fade88b8280e0f1cbc6f9ec3b07a 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/EditOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/EditOperation.php
@@ -13,15 +13,33 @@ trait EditOperation
     protected function setupEditRoutes($segment, $routeName, $controller)
     {
         Route::match(['get'], $segment . '/{id}/edit/links', $controller . '@links');
-        Route::match(['get'], $segment . '/{id}/edit/link_{page}.jpg', $controller . '@getLinkPage');
+        Route::get($segment . '/{id}/edit/{type}_{page}.{format}', $controller . '@getLinkPage')
+           // ->whereIn('type', ['raster', 'images', 'texts', 'vector'])
+            ->whereNumber('page');
+            //->whereIn('format', ['jpg', 'png', 'avif', 'webp', 'svg']);
     }
 
 
-    protected function getLinkPage($fluidbook_id, $page)
+    protected function getLinkPage($fluidbook_id, $type, $page, $format = 'jpg')
     {
         /** @var FluidbookPublication $fluibdook */
         $fluibdook = FluidbookPublication::find($fluidbook_id);
-        $path = $fluibdook->getFile($page);
+        switch ($type) {
+            case 'raster':
+            case 'vector':
+                $withText = $withGraphics = true;
+                break;
+            case 'images':
+                $withText = false;
+                $withGraphics = true;
+                break;
+            case 'texts':
+            default:
+                $withText = true;
+                $withGraphics = false;
+                break;
+        }
+        $path = $fluibdook->getFile($page, $format, 150, $withText, $withGraphics);
         return XSendFileController::sendfile($path);
     }
 

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index 8a12f84ce1d9b67210fb73341c9242e8d509ee58..6a6e0b147e861c1dae70086b614729a56407dc23 100644 (file)
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -255,6 +255,13 @@ class FluidbookPublication extends ToolboxSettingsModel
 
     }
 
+    /**
+     * @return int
+     */
+    public function getPagesNumber() {
+        return count($this->composition);
+    }
+
     /**
      * @param $page
      * @return FluidbookDocument

diff --git a/public/packages/fluidbook/toolbox/css/linkeditor.css b/public/packages/fluidbook/toolbox/css/linkeditor.css
index 042a87232a9e27d1fea7ff2051eb7a0ecf759739..8f5c03cb75ffa2341e9db8fceaac699a3120954d 100644 (file)
--- a/public/packages/fluidbook/toolbox/css/linkeditor.css
+++ b/public/packages/fluidbook/toolbox/css/linkeditor.css
@@ -338,11 +338,26 @@ html {
   left: 0px;
   background-color: rgba(255, 255, 255, 0.2);
 }
-#linkeditor #linkeditor-main #linkeditor-editor #linkeditor-canvas #linkeditor-fluidbook .linkeditor-page img {
-  display: block;
+#linkeditor #linkeditor-main #linkeditor-editor #linkeditor-canvas #linkeditor-fluidbook .linkeditor-page .contents {
+  background-color: #fff;
+  position: absolute;
+  top: 0;
+  left: 0;
   width: 100%;
   height: 100%;
 }
+#linkeditor #linkeditor-main #linkeditor-editor #linkeditor-canvas #linkeditor-fluidbook .linkeditor-page .contents img {
+  display: block;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: auto;
+  z-index: 1;
+}
+#linkeditor #linkeditor-main #linkeditor-editor #linkeditor-canvas #linkeditor-fluidbook .linkeditor-page .contents img.texts {
+  z-index: 2;
+}
 .simple #linkeditor #linkeditor-main #linkeditor-editor #linkeditor-canvas #linkeditor-fluidbook .linkeditor-page#linkeditor-page-right {
   display: none;
 }

diff --git a/public/packages/fluidbook/toolbox/css/linkeditor.css.map b/public/packages/fluidbook/toolbox/css/linkeditor.css.map
index 21dfc52444a17fffed6c6f1788147018e0cf22a7..4c1abac186694591aea6009b8afcbfdf21be8ab6 100644 (file)
--- a/public/packages/fluidbook/toolbox/css/linkeditor.css.map
+++ b/public/packages/fluidbook/toolbox/css/linkeditor.css.map
@@ -1 +1 @@
-{"version":3,"sources":["linkeditor.less"],"names":[],"mappings":"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","file":"linkeditor.css"}
\ No newline at end of file
+{"version":3,"sources":["linkeditor.less"],"names":[],"mappings":"AAAA;EACI,SAAA;EACA,UAAA;EACA,sBAAA;;AAMJ;AAAK;AAAW;EACZ,iBAAA;EACA,eAAA;;AAGJ;AAAM;AAAa;EACf,YAAA;EACA,WAAA;EACA,gBAAA;;AAGJ;EAGI,mBAAA;EACA,YAAA;;AAJJ,WAMI;AANJ,WAMW;EACH,qBAAA;EACA,YAAA;EACA,mBAAA;EACA,gBAAA;;AAVR,WAaI;EACI,WAAA;EACA,yBAAA;;AAfR,WAkBI;EAGI,+BAAA;;AArBR,WAkBI,iBAKI;EAGI,yBAAA;EACA,cAAA;EACA,YAAA;EACA,YAAA;;AA7BZ,WAkBI,iBAKI,oBAQI;EACI,YAAA;EACA,qBAAA;EACA,YAAA;EACA,mBAAA;EACA,UAAA;;AAEA,WApBZ,iBAKI,oBAQI,IAOK;EACG,kBAAA;;AAvCpB,WAkBI,iBAKI,oBAwBI;EACI,qBAAA;EACA,eAAA;;AAjDhB,WAkBI,iBAKI,oBA6BI;EACI,QAAA;EACA,YAAA;EACA,aAAA;EACA,8BAAA;;AAxDhB,WAkBI,iBAKI,oBAoCI;EACI,iBAAA;EACA,sBAAA;EACA,sBAAA;EACA,kBAAA;EACA,YAAA;EACA,eAAA;EACA,kBAAA;EACA,SAAA;EACA,iBAAA;EACA,aAAA;EACA,gBAAA;;AAtEhB,WAkBI,iBAKI,oBAoCI,uBAaI;EACI,mBAAA;EACA,iBAAA;EACA,SAAA;EACA,6BAAA;EACA,WAAA;EACA,cAAA;EACA,eAAA;EACA,qBAAA;EACA,gBAAA;EACA,kBAAA;;AAGA,WAnEhB,iBAKI,oBAoCI,uBAaI,MAaK;AAAQ,WAnEzB,iBAKI,oBAoCI,uBAaI,MAac;EACN,UAAA;EACA,SAAA;;AAvFxB,WAkBI,iBAKI,oBAqEI;EACI,qBAAA;EACA,mBAAA;EACA,YAAA;EACA,eAAA;EACA,YAAA;EACA,kBAAA;EACA,aAAA;EACA,kBAAA;EACA,cAAA;;AAEA,WArFZ,iBAKI,oBAqEI,YAWK;AAAQ,WArFrB,iBAKI,oBAqEI,YAWc;EACN,yBAAA;EACA,WAAA;;AAGJ,WA1FZ,iBAKI,oBAqEI,YAgBK;EACG,YAAA;;AADJ,WA1FZ,iBAKI,oBAqEI,YAgBK,MAGG;EACI,YAAA;;AAhHxB,WAkBI,iBAKI,oBAqEI,YAwBI;EACI,kBAAA;EACA,QAAA;EACA,YAAA;EACA,WAAA;;AAxHpB,WAkBI,iBA2GI;EACI,kBAAA;EACA,0BAAA;EACA,WAAA;;AAhIZ,WAkBI,iBA2GI,mBAOI;EACI,kBAAA;EACA,MAAA;EACA,OAAA;EACA,aAAA;EACA,eAAA;EACA,kBAAA;EACA,mBAAA;;AAEA,WA3HZ,iBA2GI,mBAOI,OASK;EACG,kBAAA;EACA,SAAS,EAAT;EACA,cAAA;EACA,YAAA;EACA,WAAA;;AAGJ,WAnIZ,iBA2GI,mBAOI,OAiBK;EACG,kBAAA;;AAGJ,WAvIZ,iBA2GI,mBAOI,OAqBK;EACG,kBAAA;;AAGJ,WA3IZ,iBA2GI,mBAOI,OAyBK;EACG,UAAA;EACA,0BAAA;EACA,sBAAA;EACA,kBAAA;EACA,SAAA;;AAEA,WAlJhB,iBA2GI,mBAOI,OAyBK,eAOI;EACG,UAAA;EACA,UAAA;;AAIR,WAxJZ,iBA2GI,mBAOI,OAsCK;EACG,wBAAA;EACA,WAAA;EACA,yBAAA;EACA,UAAA;;AAEA,WA9JhB,iBA2GI,mBAOI,OAsCK,eAMI;EACG,SAAA;EACA,WAAA;EACA,kBAAA;;AAnLxB,WAkBI,iBA2GI,mBA4DI;EAGI,WAAA;EACA,kBAAA;EACA,QAAA;EACA,SAAA;EACA,WAAA;EACA,YAAA;;AAjMhB,WAkBI,iBA2GI,mBA4DI,mBAUI;EACI,kBAAA;EACA,QAAA;EACA,SAAA;EACA,WAAA;EACA,YAAA;EACA,UAAA;EACA,sBAAA;;AA1MpB,WAkBI,iBA2GI,mBA4DI,mBAoBI;EACI,gBAAA;EACA,kBAAA;EACA,OAAA;EACA,MAAA;;AAjNpB,WAkBI,iBA2GI,mBA4DI,mBAoBI,WAMI;EACI,kBAAA;EACA,MAAA;EACA,OAAA;EACA,UAAA;EACA,eAAA;EACA,gBAAA;EACA,aAAA;;AA1NxB,WAkBI,iBA2GI,mBA4DI,mBAoBI,WAMI,MASI;EACI,cAAA;EACA,kBAAA;EACA,MAAA;EACA,OAAA;EACA,sBAAA;EACA,YAAA;;AAlO5B,WAkBI,iBA2GI,mBA4DI,mBAoBI,WAyBI;EACI,oBAAA;EACA,kBAAA;EACA,gBAAA;;AAzOxB,WAkBI,iBA2GI,mBA4DI,mBAoBI,WAyBI,UAKI;EACI,kBAAA;EACA,eAAA;;AA7O5B,WAkBI,iBA2GI,mBA4DI,mBAoBI,WAyBI,UAUI;EACI,kBAAA;;AAjP5B,WAkBI,iBA2GI,mBA4DI,mBA6DI;EACI,YAAA;EACA,WAAA;;AAxPpB,WAkBI,iBA2GI,mBA4DI,mBA6DI,oBAII;EACI,YAAA;EACA,4BAAA;;AA5PxB,WAkBI,iBA2GI,mBA4DI,mBA6DI,oBASI;AA/PpB,WAkBI,iBA2GI,mBA4DI,mBA6DI,oBASe;EACP,UAAA;EACA,2BAAA;;AAjQxB,WAkBI,iBA2GI,mBA4DI,mBA6DI,oBAcI;EACI,YAAA;;AArQxB,WAkBI,iBA2GI,mBA4DI,mBA6DI,oBAcI,UAGI;EACI,WAAA;EACA,SAAA;;AAzQ5B,WAkBI,iBA2GI,mBA4DI,mBA6DI,oBAuBI;EACI,SAAA;EACA,WAAA;;AAEA,WA/PpB,iBA2GI,mBA4DI,mBA6DI,oBAuBI,aAIK;EACG,WAAA;;AAlR5B,WAkBI,iBA2GI,mBA4DI,mBA8FI;EACI,WAAA;EACA,YAAA;;AAzRpB,WAkBI,iBA2GI,mBA4DI,mBA8FI,oBAII;EACI,WAAA;EACA,8BAAA;;AA7RxB,WAkBI,iBA2GI,mBA4DI,mBA8FI,oBAII,MAII;EACI,qBAAA;EACA,WAAW,cAAX;;AAjS5B,WAkBI,iBA2GI,mBA4DI,mBA8FI,oBAcI;AArSpB,WAkBI,iBA2GI,mBA4DI,mBA8FI,oBAce;EACP,WAAA;EACA,6BAAA;;AAvSxB,WAkBI,iBA2GI,mBA4DI,mBA8FI,oBAmBI;EACI,WAAA;;AA3SxB,WAkBI,iBA2GI,mBA4DI,mBA8FI,oBAmBI,UAGI;EACI,kBAAA;EACA,eAAA;EACA,qBAAA;EACA,mBAAA;EACA,iBAAA;EACA,oBAAA;EACA,QAAA;EACA,SAAA;;AArT5B,WAkBI,iBA2GI,mBA4DI,mBA8FI,oBAmBI,UAcI;EACI,QAAA;EACA,UAAA;;AAEA,WA1SxB,iBA2GI,mBA4DI,mBA8FI,oBAmBI,UAcI,aAIK;EACG,UAAA;;AA7ThC,WAkBI,iBA2GI,mBAuMI;EACI,WAAA;EACA,YAAA;EACA,eAAA;EACA,gBAAA;EACA,gBAAA;EACA,eAAA;EACA,qBAAA;EACA,gBAAA;;AA5UhB,WAkBI,iBA2GI,mBAkNI;EACI,yBAAA;EACA,kBAAA;EACA,UAAA;EACA,SAAA;EACA,UAAA;EACA,0BAAA;EACA,8BAAA;EACA,yBAAA;EACA,6BAAA;EACA,cAAA;;AAEA,WAzUZ,iBA2GI,mBAkNI,mBAYK;EACG,UAAA;EACA,WAAA;;AAGJ,WA9UZ,iBA2GI,mBAkNI,mBAiBK;EACG,uBAAA;;AAEA,WAjVhB,iBA2GI,mBAkNI,mBAiBK,yBAGI;EACG,sBAAA;;AAIR,WAtVZ,iBA2GI,mBAkNI,mBAyBK;EACG,sBAAA;EACA,sBAAA;EACA,mBAAA;;AAGJ,WA5VZ,iBA2GI,mBAkNI,mBA+BK;EACG,YAAA;;AAGJ,WAhWZ,iBA2GI,mBAkNI,mBAmCK;EACG,gBAAA;;AAnXpB,WAkBI,iBA2GI,mBAkNI,mBAuCI;EACI,qBAAA;EACA,kBAAA;EACA,MAAA;EACA,OAAA;;AA1XpB,WAkBI,iBA2GI,mBAkNI,mBAuCI,sBAMI;EACI,kBAAA;EACA,QAAA;EACA,SAAA;EACA,0CAAA;;AAhYxB,WAkBI,iBA2GI,mBAkNI,mBAuCI,sBAMI,iBAMI;EACI,sBAAA;EACA,kBAAA;EACA,MAAA;EACA,OAAA;EACA,WAAA;EACA,YAAA;;AAxY5B,WAkBI,iBA2GI,mBAkNI,mBAuCI,sBAMI,iBAMI,UAQI;EACI,cAAA;EACA,kBAAA;EACA,MAAA;EACA,OAAA;EACA,WAAA;EACA,YAAA;EACA,UAAA;;AAEA,WAjY5B,iBA2GI,mBAkNI,mBAuCI,sBAMI,iBAMI,UAQI,IASK;EACG,UAAA;;AAOR,OAAQ,YAzYhC,iBA2GI,mBAkNI,mBAuCI,sBAMI,iBA8BK;EAEO,aAAA","file":"linkeditor.css"}
\ No newline at end of file

diff --git a/public/packages/fluidbook/toolbox/css/linkeditor.less b/public/packages/fluidbook/toolbox/css/linkeditor.less
index 997390a39d460b5e17032951b5d16fb95b7b8187..1c7ddde14ade2d3415bf37ceb9d1c3823e40df39 100644 (file)
--- a/public/packages/fluidbook/toolbox/css/linkeditor.less
+++ b/public/packages/fluidbook/toolbox/css/linkeditor.less
@@ -404,12 +404,30 @@ body, #linkeditor, html {
                         left: 0px;
                         background-color: rgba(255, 255, 255, 0.2);
 
-                        img {
-                            display: block;
+                        .contents {
+                            background-color: #fff;
+                            position: absolute;
+                            top: 0;
+                            left: 0;
                             width: 100%;
                             height: 100%;
+
+                            img {
+                                display: block;
+                                position: absolute;
+                                top: 0;
+                                left: 0;
+                                width: 100%;
+                                height: auto;
+                                z-index: 1;
+
+                                &.texts {
+                                    z-index: 2;
+                                }
+                            }
                         }
 
+
                         &#linkeditor-page-right {
                             .simple & {
                                 display: none;

diff --git a/public/packages/fluidbook/toolbox/js/linkeditor.js b/public/packages/fluidbook/toolbox/js/linkeditor.js
index 6275d063fe6459803ea7adff5c159e81954715d6..fa92acc46bffeb3efc5153eb7505310cf7d6c665 100644 (file)
--- a/public/packages/fluidbook/toolbox/js/linkeditor.js
+++ b/public/packages/fluidbook/toolbox/js/linkeditor.js
@@ -7,15 +7,18 @@ var fs = 1;
 var mx = 0, my = 0;
 var zoom = 1;
 var zoomdragging = false;
-var dividers = [1, 2, 5, 10, 20, 50, 100];
+var dividers = [1, 2, 5, 10, 20, 50, 100, 200];
 var fluidbookRect, canvasRect, editorRect;
 var currentPage;
 var movingRuler = null;
+var rasterizePages = splitPages(FLUIDBOOK_DATA.settings.rasterizePages);
+var vectorPages = splitPages(FLUIDBOOK_DATA.settings.vectorPages);
 
 $(function () {
     init();
 });
 
+
 function init() {
     $(window).on('hashchange', function () {
         changePage();
@@ -154,7 +157,6 @@ function initToolbar() {
 }
 
 function runAction(act) {
-    console.log(act, window[act]);
     window[act]();
 }
 
@@ -416,6 +418,7 @@ function changePage(page) {
         return;
     }
     currentPage = normPage;
+    window.location.hash = '#' + currentPage;
     clearLinksAndRulers();
     loadPage(currentPage, 'left');
     if (!single) {
@@ -456,12 +459,23 @@ function _globalTo(x, y, rect, multi) {
 
 function loadPage(p, side) {
     var container = $("#linkeditor-page-" + side);
-    $(container).attr('data-page', p)
+    $(container).attr('data-page', p);
+    var imageFormat = FLUIDBOOK_DATA.settings.imageFormat;
 
     if (p === 0 || p > FLUIDBOOK_DATA.settings.pages) {
         $(container).html('');
     } else {
-        $(container).html('<img draggable="false" src="link_' + p + '.jpg" />')
+        var c = '<div class="contents">';
+        if (rasterizePages.indexOf(p) >= 0) {
+            c += '<img draggable="false" src="raster_' + p + '.' + imageFormat + '" />';
+        } else if (vectorPages.indexOf(p) >= 0) {
+            c += '<img draggable="false" src="vector_' + p + '.svg" />';
+        } else {
+            c += '<img draggable="false" class="images" src="images_' + p + '.' + imageFormat + '" />';
+            c += '<img draggable="false" class="texts" src="texts_' + p + '.svg" />';
+        }
+        c += '</div>';
+        $(container).html(c);
     }
     loadLinks(p, side);
     loadRulers(p, side);
@@ -497,8 +511,9 @@ function updateRulers() {
     // Measure of visible fluidbook px at current zoom
 
     var factor = fs / zoom;
-    var visible_w = canvasRect.width * factor;
-    var visible_h = canvasRect.height * factor;
+    var visible_w = (canvasRect.width / fs) / zoom;
+    var visible_h = (canvasRect.height / fs) / zoom;
+
     // Find the best divider to have around 10 main divisions
     var divider = 0;
     for (var i in dividers) {
@@ -589,3 +604,17 @@ function resizeCanvas() {
     var top = (canvasRect.height - fh * fs) / 2;
     $("#linkeditor-fluidbook").css({left: left, top: top, transform: 'scale(' + fs + ')'});
 }
+
+
+function splitPages(str) {
+    str = str.toString();
+    var res = [];
+    if (str == '') {
+        return res;
+    }
+    var pages = str.split(',');
+    for (var p in pages) {
+        res.push(parseInt(pages[p]));
+    }
+    return res;
+}

diff --git a/resources/views/fluidbook_publication/link_editor.blade.php b/resources/views/fluidbook_publication/link_editor.blade.php
index 0ad3c5e9d7aa5b27d238f2f6e48e29a5bce1d030..23b0f03448af428af8072b0274bccbdf4bc49534 100644 (file)
--- a/resources/views/fluidbook_publication/link_editor.blade.php
+++ b/resources/views/fluidbook_publication/link_editor.blade.php
@@ -1,7 +1,11 @@
 @php
     $title='#'.$id.' - '.__('Editeur de liens');
+    /** @var $fluidbook \App\Models\FluidbookPublication */
     $fluidbook->getLinksAndRulers($links,$rulers);
     $fbdata=$fluidbook->getPageData()->getRawData();
+    $fbdata['settings']['width']=$fbdata['width']=$fluidbook->getPageWidth();
+    $fbdata['settings']['height']=$fbdata['height']=$fluidbook->getPageHeight();
+    $fbdata['settings']['pages']=$fbdata['pages']=$fluidbook->getPagesNumber();
 @endphp
 @extends('layouts.empty')
 
@@ -28,7 +32,8 @@
                        data-tooltip="{{__('Aller à la page précédente')}}"></a>
                     <div data-tooltip="{{__('Aller à une page')}} (Ctrl+G)" data-key="ctrl+g"
                          data-action="focusPageField" id="linkeditor-page-field">
-                        <input type="number" pattern="[0-9]+"step="0" min="0" max="{{$fbdata['settings']['pages']}}"> / {{$fbdata['settings']['pages']}}</div>
+                        <input type="number" pattern="[0-9]+" step="0" min="0" max="{{$fbdata['settings']['pages']}}">
+                        / {{$fbdata['settings']['pages']}}</div>
                     <a href="#" data-action="nextPage" data-icon="next-page"
                        data-tooltip="{{__('Aller à la page suivante')}}"></a>
                     <a href="#" data-action="lastPage" data-icon="last-page"