From aef743fd1824442d92b964e6b4d0cead10452902 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Wed, 3 Nov 2021 15:09:32 +0000 Subject: [PATCH] wait #4857 @0.5 --- inc/ws/Metier/class.ws.theme.parametres.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php index d89ab0b62..580050fe8 100644 --- a/inc/ws/Metier/class.ws.theme.parametres.php +++ b/inc/ws/Metier/class.ws.theme.parametres.php @@ -17,6 +17,13 @@ class wsThemeParametres extends wsParametres $themeRoot = 'fluidbook/themes3/' . $this->parent->theme_id; $uploadThemeURL = SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id . '&' . session_name() . '=' . session_id(); + $iconSets = []; + global $core; + $r = $core->con->select('SELECT * FROM `fluidbook_toolbox`.`fluidbook_iconset` WHERE created_ok=1 ORDER BY id'); + while ($r->fetch()) { + $iconSets[$r->names] = $r->id; + } + parent::initFields(); /* @@ -63,8 +70,8 @@ class wsThemeParametres extends wsParametres ); /* Icones */ - $this->fields['iconSet'] = array('type' => 'icones', 'default' => 15, 'editable' => true, - 'label' => __("Jeu d'icônes")); + $this->fields['iconSet'] = array('type' => 'combo', 'default' => '15', 'editable' => true, + 'label' => __("Jeu d'icônes"), 'datas' => $iconSets); $this->fields['couleurI'] = array('type' => 'couleur', 'default' => '$couleurA', 'editable' => true, 'label' => __("Couleur des icônes")); @@ -111,7 +118,7 @@ class wsThemeParametres extends wsParametres '|', 'bookShadeColor', '|', 'usePageEdges', '|', 'displayPageNumber', 'colorPageNumber', '|', 'linksColor', 'videoBackgroundColor', - '|', 'tooltipBackColor', 'tooltipTextColor', 'tooltipTextSize','tooltipPadding', + '|', 'tooltipBackColor', 'tooltipTextColor', 'tooltipTextSize', 'tooltipPadding', '|', 'bookmarkBackgroundColor', 'bookmarkStarDisabledColor', 'bookmarkStarEnabledColor')); /* Credits */ $this->fields['creditsColor'] = array('type' => 'couleurAlpha', 'default' => '80ffffff', 'editable' => true, -- 2.39.5