wip #3962 @1

diff --git a/fluidbook/icones/15/interface.svg b/fluidbook/icones/15/interface.svg
index 55bd8f84ffeb98c8afea839d4f5691d517fd9f14..293c4296f253a7f71b1b728741713d8747e93dba 100644 (file)
--- a/fluidbook/icones/15/interface.svg
+++ b/fluidbook/icones/15/interface.svg
@@ -1,5 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" style="display: none;">\r
-\r
     <symbol id="nav-home" viewBox="0 0 25 25">\r
         <path d="M19.3,23h-4.8c-0.4,0-0.7-0.3-0.7-0.7v-4.9h-2.6v4.9c0,0.4-0.3,0.7-0.7,0.7H5.7c-0.4,0-0.7-0.3-0.7-0.7v-8\r
                c0-0.4,0.3-0.7,0.7-0.7s0.7,0.3,0.7,0.7v7.3h3.4v-4.9c0-0.4,0.3-0.7,0.7-0.7h4c0.4,0,0.7,0.3,0.7,0.7v4.9h3.4v-6.9\r
@@ -7,7 +6,6 @@
         <path d="M21.8,14.6c-0.2,0-0.4-0.1-0.5-0.2l-8.7-8.7l-8.7,8.7c-0.3,0.3-0.7,0.3-1,0s-0.3-0.7,0-1L12,4.1\r
                c0.3-0.3,0.7-0.3,1,0l9.3,9.3c0.3,0.3,0.3,0.7,0,1C22.1,14.5,21.9,14.6,21.8,14.6z"/>\r
     </symbol>\r
-\r
     <symbol id="nav-share" viewBox="0 0 25 25">\r
         <path d="M18.6,16.2c-1,0-1.9,0.5-2.5,1.2l-7.1-3.7c0.1-0.3,0.1-0.5,0.1-0.8c0-0.3,0-0.6-0.1-0.8l7.1-3.7c0.6,0.7,1.5,1.2,2.5,1.2\r
        c1.8,0,3.2-1.5,3.2-3.2s-1.4-3.2-3.2-3.2s-3.2,1.4-3.2,3.2c0,0.3,0,0.6,0.1,0.8l-7.1,3.7c-0.6-0.7-1.5-1.2-2.5-1.2\r
@@ -16,38 +14,38 @@
         M5.9,14.4c-0.9,0-1.6-0.7-1.6-1.6s0.7-1.6,1.6-1.6s1.6,0.7,1.6,1.6S6.8,14.4,5.9,14.4z M18.6,21c-0.9,0-1.6-0.7-1.6-1.6\r
        s0.7-1.6,1.6-1.6s1.6,0.7,1.6,1.6S19.5,21,18.6,21z"/>\r
     </symbol>\r
-\r
     <symbol id="nav-share-1" viewBox="0 0 512 512">\r
         <path d="m143 440c-2 0-4 0-4 0-6-2-10-8-10-14l0-78-27 0c-30 0-55-24-55-55l0-164c0-31 25-55 55-55l308 0c30 0 55 24 55 55l0 164c0 31-25 55-55 55l-179 0-77 88c-2 2-7 4-11 4z m-41-338c-14 0-26 11-26 25l0 164c0 14 12 26 26 26l41 0c4 0 9 2 11 5 2 2 4 6 4 10l0 55 57-63c2-2 6-5 10-5l185 0c14 0 26-12 26-26l0-164c0-16-12-27-26-27z"/>\r
     </symbol>\r
-\r
     <symbol id="nav-bookmarks" viewBox="0 0 512 512">\r
         <path d="m465 92l-51 0 0-16c0-8-6-15-15-15l-73 0c-9 0-15 7-15 15l0 16c-24 2-43 10-55 27-12-17-33-27-59-27l-150 0c-8 0-14 6-14 14l0 300c0 8 6 14 14 14l141 0c23 0 39 8 48 22 2 4 8 9 12 9 2 0 4 0 6-2 2 2 4 2 6 2 4 0 10-2 12-9 9-14 27-22 47-22l142 0c8 0 14-6 14-14l0-300c4-8-2-14-10-14z m-125-2l45 0 0 115-12-12c-2-3-6-5-11-5-4 0-8 2-10 5l-12 12z m-152 301l-127 0 0-270 136 0c28 0 45 16 45 45l0 240c-15-9-33-15-54-15z m263 0l-127 0c-21 0-39 6-54 17l0-242c0-29 15-43 41-45l0 119c0 6 4 10 8 12 7 2 13 0 17-4l26-27 27 27c2 2 6 4 10 4 2 0 4 0 7-2 6-2 8-8 8-12l0-117 37 0z"/>\r
     </symbol>\r
-\r
     <symbol id="nav-chapters" viewBox="0 0 512 512">\r
         <path d="m184 154l267 0c11 0 20-10 20-21 0-11-9-20-20-20l-267 0c-11 0-20 9-20 20 0 11 9 21 20 21z m267 82l-267 0c-11 0-20 9-20 20 0 11 9 20 20 20l267 0c11 0 20-9 20-20 0-11-9-20-20-20z m0 122l-267 0c-11 0-20 10-20 21 0 11 9 20 20 20l267 0c11 0 20-9 20-20 0-11-9-21-20-21z m-369-204l20 0c12 0 21-10 21-21 0-11-9-20-21-20l-20 0c-11 0-21 9-21 20 0 11 10 21 21 21z m20 82l-20 0c-11 0-21 9-21 20 0 11 10 20 21 20l20 0c12 0 21-9 21-20 0-11-9-20-21-20z m0 122l-20 0c-11 0-21 10-21 21 0 11 10 20 21 20l20 0c12 0 21-9 21-20 0-11-9-21-21-21z"/>\r
     </symbol>\r
-\r
     <symbol id="nav-download" viewBox="0 0 512 512">\r
         <path d="m434 344c-8 0-14 6-14 14l0 31c0 19-12 31-31 31l-264 0c-19 0-31-12-31-31l0-31c0-8-6-14-14-14-8 0-14 6-14 14l0 31c0 35 26 60 59 60l262 0c35 0 59-27 59-60l0-31c3-8-6-14-12-14z m-188 23c2 2 2 2 4 2 2 0 4 2 6 2 2 0 4 0 6-2 2 0 2-2 4-2l111-119c6-6 6-15 0-21-6-6-15-6-21 0l-86 92 0-245c0-8-6-15-14-15-8 0-14 7-14 15l0 245-86-92c-6-6-15-6-21 0-6 6-6 15 0 21z"/>\r
     </symbol>\r
-\r
     <symbol id="nav-fullscreen" viewBox="0 0 512 512">\r
         <path d="m446 74c-2-4-4-6-8-8-2 0-4-3-6-3l-141 0c-8 0-15 7-15 15 0 8 7 14 15 14l106 0-116 117c-7 6-7 14 0 20 2 2 6 4 10 4 4 0 8-2 10-4l117-116 0 106c0 8 6 14 14 14 8 0 14-6 14-14l0-141c3 0 0-2 0-4z m-215 207c-6-7-14-7-20 0l-117 116 0-106c0-8-6-15-14-15-8 0-14 7-14 15l0 141c0 2 0 4 2 6 2 4 4 6 8 8 2 0 4 3 6 3l141 0c8 0 15-7 15-15 0-8-7-14-15-14l-110 0 116-117c7-8 7-16 2-22z"/>\r
     </symbol>\r
-\r
     <symbol id="nav-fullscreen-exit" viewBox="0 0 512 512">\r
         <path d="m223 281c-2 0-4-2-6-2l-141 0c-8 2-15 8-15 16 0 8 7 14 15 14l106 0-116 117c-7 6-7 14 0 20 4 3 6 5 10 5 4 0 8-2 10-5l117-116 0 106c0 8 6 15 14 15 8 0 14-7 14-15l0-141c0-2 0-4-2-6 0-4-2-6-6-8z m213-78l-106 0 116-117c7-6 7-14 0-20-6-7-14-7-20 0l-117 116 0-106c0-8-6-15-14-15-8 0-14 7-14 15l0 141c0 2 0 4 2 6 2 4 4 6 8 8 2 0 4 2 6 2l141 0c8 0 15-6 15-14 0-8-9-16-17-16z"/>\r
     </symbol>\r
-\r
     <symbol id="nav-help" viewBox="0 0 512 512">\r
         <path d="m256 59c-109 0-197 88-197 197 0 109 88 197 197 197 109 0 197-88 197-197 0-109-88-197-197-197z m0 367c-94 0-170-76-170-170 0-94 76-170 170-170 94 0 170 76 170 170 0 94-76 170-170 170z m16-84c0 9-7 16-16 16-9 0-16-7-16-16 0-9 7-16 16-16 9 0 16 7 16 16z m-16-201c-33 0-61 27-61 62 0 8 6 12 12 12 6 0 12-6 12-12 0-19 17-35 35-35 18 0 35 16 35 35 0 18-17 35-35 35-8 0-12 6-12 12l0 41c0 8 6 12 12 12 6 0 12-6 12-12l0-29c27-6 47-31 47-59 4-35-24-62-57-62z"/>\r
     </symbol>\r
-\r
     <symbol id="nav-index" viewBox="0 0 512 512">\r
         <path d="m315 66l-118 0c-9 0-15 6-15 14l0 147c0 9 6 15 15 15l118 0c9 0 15-6 15-15l0-147c0-8-6-14-15-14z m-14 147l-90 0 0-119 90 0z m14 57l-118 0c-9 0-15 6-15 15l0 147c0 8 6 14 15 14l118 0c9 0 15-6 15-14l0-147c0-9-6-15-15-15z m-14 148l-90 0 0-119 90 0z m195-352l-119 0c-8 0-15 6-15 14l0 147c0 9 7 15 15 15l119 0c8 0 14-6 14-15l0-147c0-8-6-14-14-14z m-15 147l-90 0 0-119 90 0z m-346-147l-119 0c-8 0-14 6-14 14l0 147c0 9 6 15 14 15l119 0c8 0 15-6 15-15l0-147c0-8-7-14-15-14z m-14 147l-90 0 0-119 90 0z m14 57l-119 0c-8 0-14 6-14 15l0 147c0 8 6 14 14 14l119 0c8 0 15-6 15-14l0-147c0-9-7-15-15-15z m-14 148l-90 0 0-119 90 0z"/>\r
     </symbol>\r
+    <symbol id="nav-notes" viewBox="0 0 25 25">\r
+        <path d="M19.2,23.7H2.3c-0.5,0-0.8-0.4-0.8-0.8V5.3c0-0.5,0.4-0.8,0.8-0.8H12c0.5,0,0.8,0.4,0.8,0.8S12.5,6.1,12,6.1\r
+       H3.2v15.9h15.2V13c0-0.5,0.4-0.8,0.8-0.8S20,12.5,20,13v9.9C20,23.2,19.6,23.7,19.2,23.7z"/>\r
+        <path d="M8.9,16.7c-0.2,0-0.5-0.1-0.6-0.2c-0.2-0.2-0.2-0.5-0.2-0.8l1.1-3.9c0-0.1,0.1-0.2,0.2-0.4l9.2-9.2\r
+       c1.1-1.1,2.9-1.1,4.1,0c0.6,0.6,0.8,1.2,0.8,2s-0.2,1.4-0.8,2l-9.2,9.2c-0.1,0.1-0.2,0.1-0.4,0.2l-3.9,1.1C9.2,16.7,9,16.7,8.9,16.7\r
+       z M10.8,12.4l-0.6,2.3l2.3-0.6L21.6,5c0.2-0.2,0.4-0.5,0.4-0.8s-0.1-0.6-0.4-0.8c-0.5-0.5-1.2-0.5-1.7,0L10.8,12.4z"/>\r
+        <path d="M17.5,4.5l1.2-1.2L21.4,6l-1.2,1.2L17.5,4.5z"/>\r
+    </symbol>\r
 \r
     <symbol id="nav-print" viewBox="0 0 512 512">\r
         <path d="m424 186l-39 0 0-114c0-9-6-15-14-15l-230 0c-8 0-14 6-14 15l0 114-39 0c-22 0-41 19-41 41l0 121c0 23 19 41 41 41l39 0 0 49c0 8 6 15 14 15l230 0c8 0 14-7 14-15l0-49 39 0c22 0 41-18 41-41l0-121c0-22-19-41-41-41z m-268-100l200 0 0 100-200 0z m200 340l-200 0 0-88 200 0z m80-76c0 6-6 12-12 12l-39 0 0-38c0-9-6-15-14-15l-230 0c-8 0-14 6-14 15l0 38-39 0c-6 0-12-6-12-12l0-121c0-6 6-12 12-12l336 0c6 0 12 6 12 12z m-278-96l-33 0c-8 0-14 6-14 14 0 8 6 15 14 15l35 0c8 0 14-7 14-15 0-8-8-14-16-14z m32 139l132 0c8 0 14-6 14-14 0-8-6-14-14-14l-132 0c-8 0-14 6-14 14 0 8 6 14 14 14z"/>\r
@@ -169,14 +167,6 @@
     <symbol id="share-twitter" viewBox="0 0 512 512">\r
         <path d="m188 420c-43 0-86-12-122-37-7-4-9-10-7-16 2-7 9-11 15-11 24 2 51 0 73-10-22-10-38-29-47-53-2-4 0-10 2-12-18-17-28-41-28-66 0-4 2-10 6-12 0 0 2 0 2-2-6-13-10-27-10-41 0-17 4-31 12-45 2-4 6-6 10-6 4 0 10 2 12 6 35 37 80 61 132 69 0 0 0 0 0-2 0-49 41-90 90-90 22 0 43 8 59 23 12-4 25-9 37-15 6-2 12-2 16 2 4 4 6 11 4 17-2 4-2 8-4 10 4 0 9 2 13 4 4 4 4 12 0 17-11 14-21 26-35 38 0 0 0 2 0 2-2 113-86 230-230 230z m-59-37c18 6 39 8 59 8 125 0 201-102 201-201 0-2 0-6 0-8 0-4 2-10 6-12 0 0 2 0 2-2-6 0-10-4-12-10-2-4 0-11 2-15 0 0 0 0-2 0-4 0-10 0-12-4-13-12-29-18-45-18-33 0-62 26-62 61 0 4 0 11 2 15 2 4 0 8-2 12-2 4-8 6-12 6-57-4-111-29-152-68 0 5 0 9 0 11 0 20 11 39 27 51 6 4 8 10 6 16-2 6-8 11-14 11-6 0-10 0-17-3 9 21 25 35 46 39 6 2 12 7 12 15 0 6-4 12-10 14-5 2-9 2-15 2 10 14 29 23 47 23 6 0 13 4 15 10 2 6 0 12-4 16-21 15-43 25-66 31z"/>\r
     </symbol>\r
-\r
-    <symbol id="share-googleplus" viewBox="0 0 512 512">\r
-        <path d="m305 211l-141 0c-8 0-14 6-14 14l0 60c0 8 6 14 14 14l55 0c-14 16-33 27-55 27-39 0-70-31-70-70 0-39 31-70 70-70 16 0 33 7 45 17 6 4 14 4 18 0l43-43c2-2 4-6 4-10 0-5-2-9-4-11-28-26-67-41-106-41-88 0-158 72-158 158 0 88 72 158 158 158 88 0 158-72 158-160l-3-31c-2-6-8-12-14-12z m-141 174c-72 0-129-57-129-129-2-72 57-129 129-129 26 0 53 8 74 25l-23 22c-14-10-33-16-51-16-53 0-98 45-98 98 0 53 45 98 98 98 41 0 78-26 92-65 2-4 0-10-2-13-2-4-6-6-12-6l-64 0 0-30 115 0 2 16c-2 72-59 129-131 129z m330-149l-54 0 0-62c0-8-6-14-14-14-8 0-16 6-16 14l0 59-60 0c-8 0-14 7-14 15 0 8 6 14 14 14l60 0 0 60c0 8 6 14 14 14 8 0 14-6 14-14l0-60 54 0c8 0 14-6 14-14 0-8-6-12-12-12z"/>\r
-    </symbol>\r
-\r
-    <symbol id="share-viadeo" viewBox="0 0 512 512">\r
-        <path d="m160 428c-4 0-8-2-10-4-7-6-7-14 0-21 0 0 94-96 94-186 0-90-45-137-45-137-6-6-6-14 0-21 6-6 14-6 20 0 2 2 53 56 53 158 0 102-98 203-102 207-2 2-6 4-10 4z m49 29c-78 0-143-64-143-144 0-80 63-143 143-143 8 0 14 6 14 14 0 9-6 15-14 15-64 0-115 51-115 114 0 64 51 115 115 115 63 0 115-51 115-115 0-16-5-30-11-45-4-8 0-16 9-18 8-4 16 0 18 8 8 18 12 37 12 57 0 78-63 142-143 142z m158-207c0 0-2 0-2 0-19 0-33-10-43-25-15-22-13-39-7-51 11-22 39-37 62-39 31-4 41-22 41-22 4-7 10-9 16-9 6 2 10 9 10 15 0 8-4 78-28 106-10 17-31 25-49 25z m-23-41c6 8 12 12 21 12 10 0 22-4 28-14 8-10 15-33 19-53-9 4-21 8-33 10-17 0-33 10-39 20 0 4-4 11 4 25z"/>\r
-    </symbol>\r
     <symbol id="share-pinterest" viewBox="0 0 25 25">\r
         <path d="M12.5,3.4c-5,0-9.1,4.1-9.1,9.1c0,5,4.1,9.1,9.1,9.1s9.1-4.1,9.1-9.1C21.6,7.5,17.5,3.4,12.5,3.4z M12.5,20.2\r
        c-0.7,0-1.4-0.1-2.1-0.3c0.3-0.5,0.5-1.1,0.7-1.6l0.5-2c0.3,0.5,1.1,1,1.9,1c2.5,0,4.3-2.3,4.3-5.2c0-2.8-2.3-4.8-5.2-4.8\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 4037224ba30e256bea49511c3fd53c0167165958..842af04afbcb5b67fdf774d60e6b992c44b2cc7a 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -275,7 +275,7 @@ class wsBookParametres extends wsParametres
             'fieldsnames' => array('tooltipTimer', 'mobilePlugins', 'preload', 'maxPages', 'pages', 'width', 'height'));
         //.
         //
-        $this->fields['navOrder'] = array('type' => 'textarea', 'default' => 'index, chapters, search, print, friend, bookmark, pdf, archives, basket, fullscreen, sound, 3d, extra, extra1, extra2, extra3, extra4, extra5, help, lang', 'editable' => true, 'label' => __('Ordre des icônes dans la nav'), 'grade' => 3);
+        $this->fields['navOrder'] = array('type' => 'textarea', 'default' => 'index, chapters, search, print, friend, bookmark, pdf, notes, archives, basket, fullscreen, sound, 3d, extra, extra1, extra2, extra3, extra4, extra5, help, lang', 'editable' => true, 'label' => __('Ordre des icônes dans la nav'), 'grade' => 3);
         $this->fields['navOrderH'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Ordre des icônes dans la nav') . ' (' . __('Si différente') . ')', 'grade' => 3);
         $this->fields['menuBreakpoint'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Breakpoint burger menu'), 'hint' => 'Par défaut 1023px', 'grade' => 3);
         $this->fields['mobileNavScale'] = array('type' => 'integer', 'default' => '100', 'editable' => true, 'label' => __('Taille du menu (en %)'), 'grade' => 3);
@@ -549,6 +549,11 @@ class wsBookParametres extends wsParametres
 
         $this->forms['splash'] = ['label' => __('Ecran de chargement'), 'fieldsnames' => ['splashImage', 'splashURL', 'splashTarget', 'splashMinimalTime']];
 
+        // Notes
+        $this->fields['notes'] = ['type' => 'boolean', 'default' => false, 'editable' => true,
+            'label' => 'Activer les notes', 'grade' => 3];
+        $this->forms['notes'] = ['label' => __('Notes'), 'fieldsnames' => ['notes']];
+
         // Articles
         $this->fields['articlesFile'] = ['type' => 'freefile', 'default' => '', 'editable' => true,
             'label' => 'Articles', 'grade' => 3, 'fileFilter' => $articlesFilter];

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 4959ce70726511efa8869b5f563cd5b67bcaac03..e1f29067afb4cbdd580dec5ff95ee14b492ffa64 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -101,6 +101,7 @@ class wsHTML5Compiler
                 'js/libs/fluidbook/fluidbook.widget.js',
                 'js/libs/fluidbook/fluidbook.keyboard.js',
                 'js/libs/fluidbook/fluidbook.posad.js',
+                'js/libs/fluidbook/fluidbook.notes.js',
                 'js/libs/fluidbook/fluidbook.js',
                 'js/main.js'],
         'mobilefirst' => [