From f527b63d47544f67ba0f8564d68f3c83bc0b7942 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Fri, 17 Dec 2021 09:48:58 +0000 Subject: [PATCH] wait #4962 @0.25 --- inc/ws/Metier/class.ws.theme.parametres.php | 6 +++++- inc/ws/Util/html5/master/class.ws.html5.compiler.php | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php index 1e4040a95..16829676f 100644 --- 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 */ $this->fields['iconSet'] = array('type' => 'combo', 'default' => '15', 'editable' => true, 'label' => __("Jeu d'icônes"), 'datas' => $iconSets); + $this->fields['symbols'] = array('type' => 'file', 'default' => '', 'editable' => true, + 'label' => __('Symbols'), + 'path' => $themeRoot, + 'uploadURL' => $uploadThemeURL . '&fieldname=symbols'); $this->fields['couleurI'] = array('type' => 'couleur', 'default' => '$couleurA', 'editable' => true, 'label' => __("Couleur des icônes")); $this->forms['icones'] = array('label' => __('Personnalisation des icônes'), - 'fieldsnames' => array('iconSet', 'couleurI')); + 'fieldsnames' => array('iconSet','symbols', 'couleurI')); /* Book */ $this->fields['interfaceFont'] = ['type' => 'combo', 'default' => 'OpenSans', 'datas' => wsBookParametres::$fonts, 'editable' => true, 'label' => __('Police de l\'interface')]; 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 e61ddb8b6..2bf4d4dd6 100644 --- 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; -- 2.39.5