wip #7172

diff --git a/app/Fluidbook/Link/LinksData.php b/app/Fluidbook/Link/LinksData.php
index ead8ff0d57b45b254a80898d73508868073bc53a..00f87ae320c86a46c0b24b2e1e7d9a6ec872c33b 100644 (file)
--- a/app/Fluidbook/Link/LinksData.php
+++ b/app/Fluidbook/Link/LinksData.php
@@ -285,7 +285,7 @@ class LinksData
     protected static function _fixV2TooltipLinks(&$links)
     {
         foreach ($links as $k => $link) {
-            if ($link['type'] == Link::TOOLTIP && (!$link['inline'] || $link['inline']==='popup')) {
+            if ($link['type'] == Link::TOOLTIP && (!$link['inline'] || $link['inline'] === 'popup')) {
                 $links[$k]['type'] = Link::TEXT_POPUP;
                 $links[$k]['to'] = $link['infobulle'];
                 $links[$k]['infobulle'] = $links[$k]['tooltip'] = '';
@@ -671,7 +671,23 @@ class LinksData
                 }
 
                 $link = [];
-                $cols = array('page' => '', 'left' => '', 'top' => '', 'width' => '', 'height' => '', 'type' => '', 'to' => '', 'target' => '_blank', 'video_loop' => true, 'video_auto_start' => true, 'video_controls' => true, 'video_sound_on' => true, 'tooltip' => '', 'numerotation' => 'physical', "inline" => 'inline', 'pdfjs' => 'normal');
+                $cols = ['page' => '',
+                    'left' => '',
+                    'top' => '',
+                    'width' => '',
+                    'height' => '',
+                    'type' => '',
+                    'to' => '',
+                    'target' => '_blank',
+                    'video_loop' => true,
+                    'video_auto_start' => true,
+                    'video_controls' => true,
+                    'video_sound_on' => true,
+                    'tooltip' => '',
+                    'numerotation' => 'physical',
+                    "inline" => 'inline',
+                    'pdfjs' => 'normal'];
+
                 $k = 0;
                 foreach ($cols as $col => $default) {
                     if (isset($line[$k])) {

diff --git a/resources/fluidbookpublication/fonts/Montserrat/100.woff2 b/resources/fluidbookpublication/fonts/Montserrat/100.woff2
index 62df627edfe084622153822a34a1c098ae06de44..5b0da45250b77aacb9689502ac6e29eafca0c775 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/100.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/100.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/Montserrat/100italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/100italic.woff2
index 84a63c117ebc6194598f4d42832f65686ec6c84f..1b0eed557fb348a968c9391eb30ee8e48ab5ab47 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/100italic.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/100italic.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/Montserrat/200.woff2 b/resources/fluidbookpublication/fonts/Montserrat/200.woff2
index 57d319382a1e8abaa4a91b8833efaa3c360b3ea9..ce301e3e9cb8abdc88e3aa1db5be4f5d77a8e5d7 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/200.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/200.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/Montserrat/200italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/200italic.woff2
index a466e55f17a6c6d17abf393774bcf4f975b12666..77ad56426646f18555fe68bebafa279fea199183 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/200italic.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/200italic.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/Montserrat/300.woff2 b/resources/fluidbookpublication/fonts/Montserrat/300.woff2
index 49da656f7c7f72637f0fe5070337cc8a533c9bbc..576237189fc6e38adb500b6c006fed28632da7b0 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/300.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/300.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/Montserrat/300italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/300italic.woff2
index 9b1c8b443adb3800f25fbbcf0e25746a4ed9ddae..dc3d122bdee0159683dfbe64d2329ee2bfa83dc9 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/300italic.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/300italic.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/Montserrat/500.woff2 b/resources/fluidbookpublication/fonts/Montserrat/500.woff2
index 4825b81d16d90bafb1d9bdf3d863f2e718f61a20..d88afd2f85ec91fba3a74dca476d346037d56715 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/500.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/500.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/Montserrat/500italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/500italic.woff2
index 75e50a2ce4ec16246c3abc55f639a7d22aa9bb00..5001301c463d6dabbcd9f8db38978b1a6d49e0bf 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/500italic.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/500italic.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/Montserrat/600.woff2 b/resources/fluidbookpublication/fonts/Montserrat/600.woff2
index 427c7443a4f506413e666a6c10c3e298dec759cf..a08e4d8f5f833269b6ae77e8a1fe5c66240b30da 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/600.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/600.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/Montserrat/600italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/600italic.woff2
index 5b462ac1f13f99fea019ec9de818c34975d484a2..7f07b52cf5ced9e34228e9868a3f820135316042 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/600italic.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/600italic.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/Montserrat/700.woff2 b/resources/fluidbookpublication/fonts/Montserrat/700.woff2
index 94ca550349022cd33ddd7587dab2a06bb221a2e2..fdb80122ca2f2ae19f4a9e838a4850ef9ddcec8d 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/700.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/700.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/Montserrat/700italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/700italic.woff2
index 35a0ac0f58eb88fa9e780d1b76c426eaa1ed5add..b6c5427d9ecee1702a079693e2447d57995a8e11 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/700italic.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/700italic.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/Montserrat/800.woff2 b/resources/fluidbookpublication/fonts/Montserrat/800.woff2
index 86891f8e99bf0af8058dc322a1b886c141e2e5c3..4216310b58386f24214419138213f3d1642a490d 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/800.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/800.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/Montserrat/800italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/800italic.woff2
index fb310cc53aa59c36cac7072e8256aafa7b2be608..dd297cb75017a9ee0c23df42d0ff03529328eb45 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/800italic.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/800italic.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/Montserrat/900.woff2 b/resources/fluidbookpublication/fonts/Montserrat/900.woff2
index 505aa5a9ea14a42c5080840155a090488a7b5859..451d873d2e7aa358c0bdbf89127e422fdee1f814 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/900.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/900.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/Montserrat/900italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/900italic.woff2
index d92dca27daf048a4d4a5cbb6cf4dfa0371e3c1e6..a423a3aa2b7969d543d940a39117aba66156af9f 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/900italic.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/900italic.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/Montserrat/font.css b/resources/fluidbookpublication/fonts/Montserrat/font.css
index 70a2e42b7710e26602079b470308ed5b427bff75..b2aca479415205863bc61ebee94680b946ded208 100644 (file)
--- a/resources/fluidbookpublication/fonts/Montserrat/font.css
+++ b/resources/fluidbookpublication/fonts/Montserrat/font.css
@@ -1,126 +1,126 @@
 @font-face {
     font-family: 'Montserrat';
     font-style: normal;
-    font-weight: 600;
-    url('600.woff2') format('woff2');
+    font-weight: 700;
+    src: url('700.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: normal;
-    font-weight: 900;
-    url('900.woff2') format('woff2');
+    font-weight: 800;
+    src: url('800.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
-    font-style: italic;
-    font-weight: 200;
-    url('200italic.woff2') format('woff2');
+    font-style: normal;
+    font-weight: 100;
+    src: url('100.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
-    font-style: normal;
-    font-weight: 100;
-    url('100.woff2') format('woff2');
+    font-style: italic;
+    font-weight: 800;
+    src: url('800italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
-    font-style: italic;
-    font-weight: 500;
-    url('500italic.woff2') format('woff2');
+    font-style: normal;
+    font-weight: 200;
+    src: url('200.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
-    font-style: italic;
-    font-weight: 600;
-    url('600italic.woff2') format('woff2');
+    font-style: normal;
+    font-weight: 500;
+    src: url('500.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
-    font-style: italic;
-    font-weight: 400;
-    url('italic.woff2') format('woff2');
+    font-style: normal;
+    font-weight: 900;
+    src: url('900.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: normal;
-    font-weight: 200;
-    url('200.woff2') format('woff2');
+    font-weight: 300;
+    src: url('300.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: italic;
-    font-weight: 300;
-    url('300italic.woff2') format('woff2');
+    font-weight: 400;
+    src: url('italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: italic;
-    font-weight: 900;
-    url('900italic.woff2') format('woff2');
+    font-weight: 700;
+    src: url('700italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
-    font-style: normal;
-    font-weight: 800;
-    url('800.woff2') format('woff2');
+    font-style: italic;
+    font-weight: 200;
+    src: url('200italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: italic;
-    font-weight: 800;
-    url('800italic.woff2') format('woff2');
+    font-weight: 100;
+    src: url('100italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: normal;
-    font-weight: 700;
-    url('700.woff2') format('woff2');
+    font-weight: 600;
+    src: url('600.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
-    font-style: normal;
+    font-style: italic;
     font-weight: 300;
-    url('300.woff2') format('woff2');
+    src: url('300italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
-    font-style: normal;
+    font-style: italic;
     font-weight: 500;
-    url('500.woff2') format('woff2');
+    src: url('500italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: italic;
-    font-weight: 100;
-    url('100italic.woff2') format('woff2');
+    font-weight: 900;
+    src: url('900italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: italic;
-    font-weight: 700;
-    url('700italic.woff2') format('woff2');
+    font-weight: 600;
+    src: url('600italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: normal;
     font-weight: 400;
-    url('regular.woff2') format('woff2');
+    src: url('regular.woff2') format('woff2');
 }
 

diff --git a/resources/fluidbookpublication/fonts/Montserrat/italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/italic.woff2
index dd09acf3348477be56f4bfcb78937ac613ee8204..12658ab27a5d084150107dd0bed233f5225dcc52 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/italic.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/italic.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/Montserrat/regular.woff2 b/resources/fluidbookpublication/fonts/Montserrat/regular.woff2
index b51ed8cafedc0274670475d05afb055ab952f4f5..f9ba05e91cc7e23bdd404922b83dae319b17fed6 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/Montserrat/regular.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/regular.woff2 differ

diff --git a/resources/fluidbookpublication/fonts/OpenSans/font.css b/resources/fluidbookpublication/fonts/OpenSans/font.css
index 2fb75a91e823df61c50151a1e416b41e474c814c..0a6cff84b0bff88d7ae016328d355d5e321896fd 100644 (file)
--- a/resources/fluidbookpublication/fonts/OpenSans/font.css
+++ b/resources/fluidbookpublication/fonts/OpenSans/font.css
@@ -2,83 +2,83 @@
     font-family: 'Open Sans';
     font-style: italic;
     font-weight: 700;
-    url('700italic.woff2') format('woff2');
+    src: url('700italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
     font-weight: 400;
-    url('regular.woff2') format('woff2');
+    src: url('regular.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
     font-weight: 500;
-    url('500.woff2') format('woff2');
+    src: url('500.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
     font-weight: 800;
-    url('800italic.woff2') format('woff2');
+    src: url('800italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
     font-weight: 300;
-    url('300italic.woff2') format('woff2');
+    src: url('300italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
     font-weight: 300;
-    url('300.woff2') format('woff2');
+    src: url('300.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
     font-weight: 800;
-    url('800.woff2') format('woff2');
+    src: url('800.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
     font-weight: 600;
-    url('600italic.woff2') format('woff2');
+    src: url('600italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
     font-weight: 500;
-    url('500italic.woff2') format('woff2');
+    src: url('500italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
     font-weight: 600;
-    url('600.woff2') format('woff2');
+    src: url('600.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
     font-weight: 400;
-    url('italic.woff2') format('woff2');
+    src: url('italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
     font-weight: 700;
-    url('700.woff2') format('woff2');
+    src: url('700.woff2') format('woff2');
 }
 

diff --git a/resources/fluidbookpublication/fonts/SourceSans/font.css b/resources/fluidbookpublication/fonts/SourceSans/font.css
index b111ca8e77151f2d474d4b0463722e13ec253541..208d96fd499cbc0d05746101b7a62953d4aa8560 100644 (file)
--- a/resources/fluidbookpublication/fonts/SourceSans/font.css
+++ b/resources/fluidbookpublication/fonts/SourceSans/font.css
@@ -2,111 +2,111 @@
     font-family: 'Source Sans 3';
     font-style: normal;
     font-weight: 600;
-    url('600.woff2') format('woff2');
+    src: url('600.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: normal;
     font-weight: 200;
-    url('200.woff2') format('woff2');
+    src: url('200.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: italic;
     font-weight: 700;
-    url('700italic.woff2') format('woff2');
+    src: url('700italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: normal;
     font-weight: 800;
-    url('800.woff2') format('woff2');
+    src: url('800.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: italic;
     font-weight: 600;
-    url('600italic.woff2') format('woff2');
+    src: url('600italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: italic;
     font-weight: 200;
-    url('200italic.woff2') format('woff2');
+    src: url('200italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: normal;
     font-weight: 400;
-    url('regular.woff2') format('woff2');
+    src: url('regular.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: italic;
     font-weight: 800;
-    url('800italic.woff2') format('woff2');
+    src: url('800italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: normal;
     font-weight: 700;
-    url('700.woff2') format('woff2');
+    src: url('700.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: italic;
     font-weight: 900;
-    url('900italic.woff2') format('woff2');
+    src: url('900italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: normal;
     font-weight: 900;
-    url('900.woff2') format('woff2');
+    src: url('900.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: italic;
     font-weight: 500;
-    url('500italic.woff2') format('woff2');
+    src: url('500italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: normal;
     font-weight: 300;
-    url('300.woff2') format('woff2');
+    src: url('300.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: italic;
     font-weight: 300;
-    url('300italic.woff2') format('woff2');
+    src: url('300italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: italic;
     font-weight: 400;
-    url('italic.woff2') format('woff2');
+    src: url('italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: normal;
     font-weight: 500;
-    url('500.woff2') format('woff2');
+    src: url('500.woff2') format('woff2');
 }