wait #4752 @1

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 24aa5c28ec5f0b494f6f534708106f06ac718706..b328112bf4e20006a56029af9f1b7f743cc3e116 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -535,10 +535,15 @@ class wsBookParametres extends wsParametres
         $this->fields['iframePopupMaxWidth'] = ['type' => 'integer', 'default' => '0', 'editable' => true, 'label' => __('Largeur maximale des popups iframe')];
         $this->fields['OAMChromeFactor'] = ['type' => 'float', 'default' => '1', 'editable' => true, 'label' => __('Facteur OAM Chrome')];
         $this->fields['OAMIEFactor'] = ['type' => 'float', 'default' => '1', 'editable' => true, 'label' => __('Facteur OAM IE11')];
-        $this->fields['PDFRenderer'] = ['type' => 'combo', 'datas' => [__('Navigateur') => 'native', 'PDF.js' => 'pdfjs', 'PDF.js (legacy)' => 'pdfjs-legacy'], 'default' => 'native', 'editable' => true, 'label' => __('Rendu des PDF par')];
 
         $this->forms['multimedia'] = ['label' => __('Multimedia'),
-            'fieldsnames' => ['textPopupStylesheet', 'textPopupWidth', '|', 'PDFRenderer', '|', 'iframePopupMaxWidth', '|', 'OAMChromeFactor', 'OAMIEFactor']];
+            'fieldsnames' => ['textPopupStylesheet', 'textPopupWidth', '|', 'iframePopupMaxWidth', '|', 'OAMChromeFactor', 'OAMIEFactor']];
+
+        $this->fields['PDFRenderer'] = ['type' => 'combo', 'datas' => [__('Navigateur') => 'native', 'PDF.js' => 'pdfjs', 'PDF.js (legacy)' => 'pdfjs-legacy'], 'default' => 'native', 'editable' => true, 'label' => __('Rendu des PDF par')];
+        $this->fields['PDFJSCSS'] = ['type' => 'textarea', 'default' => '', 'editable' => true, 'label' => 'Styles PDF.js'];
+
+        $this->forms['pdf'] = ['label' => 'PDF',
+            'fieldsnames' => ['PDFRenderer', 'PDFJSCSS']];
 
         $slideshowPopupLibraries = [
             'Splide (' . __('défaut') . ')' => 'splide',
@@ -769,13 +774,14 @@ class wsBookParametres extends wsParametres
             'fieldsnames' => array('themeEnableAfterSearch'));
 
         $this->fields['forceCompileOnDownload'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Forcer la compilation lors du téléchargement'), 'grade' => 3);
+        $this->fields['embedAllLibraries'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Intégrer toutes les bibliothèques JS'), 'grade' => 3);
         $this->fields['htmlExtension'] = array('type' => 'text', 'default' => 'html', 'editable' => true, 'label' => __('Extension des fichiers html'), 'grade' => 5, 'hint' => __('Ex : php, htm, html, phtml, asp, aspx'), 'grade' => 5);
         $this->fields['actualHtmlExtension'] = array('type' => 'text', 'default' => 'html', 'editable' => false, 'label' => __('Extension des fichiers html réellement appliquée au fluidbook'), 'grade' => 5, 'hint' => __('Ex : php, htm, html, phtml, asp'), 'grade' => 5);
         $this->fields['htmlPrepend'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Code à insérer en tête des fichiers'), 'grade' => 5);
         $this->fields['baseUrl'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Base de l\'url'), 'grade' => 5,);
 
         $this->forms['package'] = array('label' => __('Option d\'export'),
-            'fieldsnames' => array('htmlExtension', "actualHtmlExtension", 'htmlPrepend', 'baseUrl', 'forceCompileOnDownload'));
+            'fieldsnames' => array('htmlExtension', "actualHtmlExtension", 'htmlPrepend', 'baseUrl', 'forceCompileOnDownload', 'embedAllLibraries'));
 
         $this->fields['disableDemo'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Désactiver le lien de démo'), 'grade' => 5);
         $this->fields['redirectDemo'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Rediriger le lien de démo vers'), 'grade' => 5);