wait #4696 @0:10

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar
index d7a9ba26fa0f299efabd27a5d74085416e3def5a..3dd089ab5796dcb1de058241e7b15fae7dee5723 100644 (file)
Binary files a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar differ

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 95256ee370e070cc63858d61ae110f9e85a4235a..edb722f732174dfb4b73fd5f4f317e6165f6152f 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -332,7 +332,7 @@ class wsDocument extends cubeMetier
                 $this->bookmarks[$bookmark_id] = array('titre' => str_replace('
', '', trim($v)));
             } elseif ($k == 'BookmarkLevel') {
                 $this->bookmarks[$bookmark_id]['level'] = $v;
-            } elseif ($k == 'BookmarkPageNumber') {
+            } elseif ($k == 'BookmarkPage') {
                 $this->bookmarks[$bookmark_id]['page'] = $v;
                 $bookmark_id++;
             } elseif ($k == 'NumberSections') {

diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php
index 2a5c295d95723e0abedba78ae4f221f3efd7964e..2bd6193923ab7a2ba111e8ec2820e2df27b2b896 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -2144,9 +2144,9 @@ class Joueclub2021CartLink extends cartLink
         return '<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
         viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve" width="50" height="50">
 <style type="text/css">
-       .st0{opacity:0.4;}
+       .st0{opacity:0.4;enable-background:new    ;}
        .st1{fill:#E20613;stroke:#F0EEEA;stroke-width:3.3;stroke-miterlimit:10;}
-       .st2{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-miterlimit:10;}
+       .st2{fill:#FFFFFF;}
        .st3{fill:#FFFFFF;stroke:#E20613;stroke-width:2.2479;stroke-miterlimit:10;}
        .st4{fill:none;stroke:#E20613;stroke-width:2.2479;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
        .st10{fill:#999999;}