wip #6258 @0.5

diff --git a/resources/linkeditor/js/linkeditor.loader.js b/resources/linkeditor/js/linkeditor.loader.js
index b45a6a830adf9105e1aead7873540952b5ad2da4..2fab79bd4a7b0e57614dc4d8cbd57a61d97f6c41 100644 (file)
--- a/resources/linkeditor/js/linkeditor.loader.js
+++ b/resources/linkeditor/js/linkeditor.loader.js
@@ -73,7 +73,8 @@ LinkeditorLoader.prototype = {
         var imageFormat = FLUIDBOOK_DATA.settings.imageFormat;
         var c = '<div class="contents">';
         if (this.linkeditor.utils.isSpecialPage(p)) {
-            c += '<img draggable="false" class="images" src="' + this.linkeditor.utils.getSpecialPageAssetURL(p) + '" />';
+            let data = this.linkeditor.utils.getSpecialPageAssetData(p);
+            c += '<img draggable="false" width="' + data.dim[0] + '" height="' + data.dim[1] + '" class="images" src="' + data.url + '" />';
         } else {
             if (this.pagesSource === 'pages') {
                 if (this.rasterizePages.indexOf(p) >= 0) {

diff --git a/resources/linkeditor/js/linkeditor.utils.js b/resources/linkeditor/js/linkeditor.utils.js
index 799f68f3edeb027320f3bbbdb184caa2bc0b6751..514068600b9358916d2fe815868345f42c8cb48b 100644 (file)
--- a/resources/linkeditor/js/linkeditor.utils.js
+++ b/resources/linkeditor/js/linkeditor.utils.js
@@ -19,15 +19,19 @@ LinkeditorUtils.prototype = {
         return page.toString().indexOf('link_') === 0 || (THEME[page] !== undefined && THEME[page] !== null);
     },
 
-    getSpecialPageAssetURL(page) {
+    getSpecialPageAssetData: function (page) {
         if (page.toString().indexOf('link_') === 0) {
             let asset = this.getLinkImageId(page);
-            return ASSETS[asset]['url'];
+            return ASSETS[asset];
         } else {
-            return THEME[page]['url'];
+            return THEME[page];
         }
     },
 
+    getSpecialPageAssetURL: function (page) {
+        return this.getSpecialPageAssetData(page).url;
+    },
+
     getLinkImageId(page) {
         return page.toString().substring(5);
     },

diff --git a/resources/views/fluidbook_publication/link_editor.blade.php b/resources/views/fluidbook_publication/link_editor.blade.php
index 9b617e089a4421abfd9368317721ccad8e1a8184..2e2d66ae2559ae839bf56527d28fd1c99241ce61 100644 (file)
--- a/resources/views/fluidbook_publication/link_editor.blade.php
+++ b/resources/views/fluidbook_publication/link_editor.blade.php
@@ -19,18 +19,26 @@
     $theme=\App\Models\FluidbookTheme::find($fluidbook->theme);
     /** @var \Cubist\Backpack\Magic\PageData $themeData */
     $themeData=$theme->getPageData();
-    $t=$themeData->getRawData();
+    $themeRawData=$themeData->getRawData();
 
     $extraThemeFiles=['background'=>'backgroundImage','aftersearch'=>'afterSearch'];
     $extraFluidbookFiles=['tabs'=>'tabsHTML5'];
     $hasExtra=false;
+    $t=[];
     foreach ($extraThemeFiles as $name=>$field) {
-        $file=$themeData->getImageFile($t[$field]);
+        $file=$themeData->getImageFile($field);
         if(null===$file){
             $t[$name]=null;
             continue;
         }
-        $t[$name]=['path'=>$file,'url'=>$themeData->getImageURL($t[$field]),'dim'=> \Cubist\Util\Graphics\Image::getimagesize($file)];
+        if(stristr($file,'.svg')){
+            $opt=\Fluidbook\Tools\SVG\SVGTools::optimizeSVG($file);
+        }
+        $t[$name]=[
+            'path'=>$file,
+            'url'=>str_replace('.svg','.o.svg',$themeData->getImageURL($field)),
+            'dim'=> \Cubist\Util\Graphics\Image::getimagesize($file)
+            ];
         $hasExtra=true;
     }
     foreach ($extraFluidbookFiles  as $name=>$field) {
@@ -55,7 +63,6 @@
             ];
         $hasExtra=true;
     }
-
     $translations=[
         'success_save'=>__('Liens sauvegardés'),
         'error_save'=>__('Une erreur s\'est produite lors de la sauvegarde des liens'),