wait #4962 @0.25

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 1e4040a95e85af8546bc9abef29d2cbd61cdec19..16829676fa969a50a49c56641a235ad6ffce8241 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -72,11 +72,15 @@ class wsThemeParametres extends wsParametres
         /* Icones */\r
         $this->fields['iconSet'] = array('type' => 'combo', 'default' => '15', 'editable' => true,\r
             'label' => __("Jeu d'icônes"), 'datas' => $iconSets);\r
+        $this->fields['symbols'] = array('type' => 'file', 'default' => '', 'editable' => true,\r
+            'label' => __('Symbols'),\r
+            'path' => $themeRoot,\r
+            'uploadURL' => $uploadThemeURL . '&fieldname=symbols');\r
         $this->fields['couleurI'] = array('type' => 'couleur', 'default' => '$couleurA', 'editable' => true,\r
             'label' => __("Couleur des icônes"));\r
 \r
         $this->forms['icones'] = array('label' => __('Personnalisation des icônes'),\r
-            'fieldsnames' => array('iconSet', 'couleurI'));\r
+            'fieldsnames' => array('iconSet','symbols', 'couleurI'));\r
 \r
         /* Book */\r
         $this->fields['interfaceFont'] = ['type' => 'combo', 'default' => 'OpenSans', 'datas' => wsBookParametres::$fonts, 'editable' => true, 'label' => __('Police de l\'interface')];\r

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 e61ddb8b6590d3593b1c6c9014bce7ac2fed36f0..2bf4d4dd69edbfed8a8f43bf587c8d6300d8f5a7 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -342,6 +342,9 @@ class wsHTML5Compiler
         if ($this->theme->parametres->iconSet > 15) {
             $this->svgfiles[] = WS_ICONS . '/' . $this->theme->parametres->iconSet . '/interface.svg';
         }
+        if ($this->theme->parametres->symbols !== '') {
+            $this->svgfiles[] = $this->themeRoot . '/' . $this->theme->parametres->symbols;
+        }
 
         if ($this->book->parametres->zoomMode == 1 || $this->isMobileFirst()) {
             $this->multiply = $this->pdf2htmlRatio * $this->scale * $this->cssOneScale;