wip #4169 @1

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 8771bddf5aed627d4d4afa2003a20b57a1f17d9d..a00ad923943a3de2f693e37ab6a398d105da4eb9 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -449,7 +449,7 @@ class wsBookParametres extends wsParametres
         $this->fields['chaptersCascade'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Sommaire en cascade"), 'grade' => 3);
 
         $this->forms['sommaire'] = array('label' => __('Sommaire'),
-            'fieldsnames' => array('chaptersCaptionDisplay', 'chaptersFontSize', '|', 'displayChaptersIcon', 'displayChaptersPopup', 'displayChaptersAtStart', 'chaptersPage', 'chaptersPosition', 'chaptersLevelLimit', 'chaptersCascade', 'chaptersPagesNumber', '|', 'chaptersColMaxWidth', 'chaptersColumns', 'displayChaptersLine', '|',  'externalChaptersHTML', '|', 'mobileChaptersStyle'));
+            'fieldsnames' => array('chaptersCaptionDisplay', 'chaptersFontSize', '|', 'displayChaptersIcon', 'displayChaptersPopup', 'displayChaptersAtStart', 'chaptersPage', 'chaptersPosition', 'chaptersLevelLimit', 'chaptersCascade', 'chaptersPagesNumber', '|', 'chaptersColMaxWidth', 'chaptersColumns', 'displayChaptersLine', '|', 'externalChaptersHTML', '|', 'mobileChaptersStyle'));
         // .
         $this->fields['tabsHTML5'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
             'label' => __('Fichier d\'onglets') . ' (SVG, ZIP)', 'grade' => 3, 'hint' => __('Charger un zip rendra les options ci-dessous inopérantes'), 'fileFilter' => $tabsFilter);
@@ -609,7 +609,7 @@ class wsBookParametres extends wsParametres
             'label' => 'Articles', 'grade' => 3, 'fileFilter' => $articlesFilter];
         $this->fields['articlesFormat'] = ['type' => 'combo', 'default' => 'fluidbook', 'editable' => true, 'label' => 'Format', 'grade' => 3, 'datas' => [__('Fluidbook') => 'fluidbook', 'Business Immo' => 'business-immo']];
         $this->fields['articlesFont'] = ['type' => 'combo', 'label' => __('Police des articles'), 'default' => 'OpenSans', 'datas' => [
-            'Open Sans (police du Fluidbook)' => 'OpenSans', 'Montserrat' => 'Montserrat'], 'editable' => 'true', 'grade' => 3];
+            'Open Sans (police du Fluidbook)' => 'OpenSans', 'Montserrat' => 'Montserrat', 'Police système' => 'sans-serif'], 'editable' => 'true', 'grade' => 3];
         $this->fields['articlesImages'] = ['type' => 'freefile', 'label' => __('Images des articles'), 'default' => '', 'hint' => __('Les noms des fichiers doivent être les même que ceux des balises <image> du XML'), 'editable' => true, 'grade' => 3, 'dir' => 'articles', 'multiple' => true];
         $this->fields['articlesShare'] = ['type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le partage'), 'grade' => 3];
         $this->fields['articlesStyle'] = ['type' => 'combo', 'default' => true, 'editable' => true, 'label' => __('Style'), 'grade' => 3, 'datas' => ['Défaut' => 'default', 'Atlantic' => 'atlantic', 'Harmonie Mutuelle' => 'harmonie-mutuelle', 'Business Immo' => 'business-immo']];

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 b91faa27308e404c95c7570e1546835725766e87..d03b9543b88b075c256bd6d138f1aaedeab81764 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -2634,6 +2634,10 @@ class wsHTML5Compiler
 
     public function addFontKit($font)
     {
+        if ($font === 'sans-serif') {
+            return;
+        }
+
         $path = 'style/fonts/' . $font;
         $css = $path . '/font.css';
         if (in_array($css, $this->stylesheets)) {