wait #4857 @0.5

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index d89ab0b622c8befc10ad5dda43c48c8cb21e5405..580050fe8ccc5273750ee9208d92a5ff91577033 100644 (file)
--- 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;\r
         $uploadThemeURL = SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id . '&' . session_name() . '=' . session_id();\r
 \r
+        $iconSets = [];\r
+        global $core;\r
+        $r = $core->con->select('SELECT * FROM `fluidbook_toolbox`.`fluidbook_iconset` WHERE created_ok=1 ORDER BY id');\r
+        while ($r->fetch()) {\r
+            $iconSets[$r->names] = $r->id;\r
+        }\r
+\r
         parent::initFields();\r
 \r
         /*\r
@@ -63,8 +70,8 @@ class wsThemeParametres extends wsParametres
         );\r
 \r
         /* Icones */\r
-        $this->fields['iconSet'] = array('type' => 'icones', 'default' => 15, 'editable' => true,\r
-            'label' => __("Jeu d'icônes"));\r
+        $this->fields['iconSet'] = array('type' => 'combo', 'default' => '15', 'editable' => true,\r
+            'label' => __("Jeu d'icônes"), 'datas' => $iconSets);\r
         $this->fields['couleurI'] = array('type' => 'couleur', 'default' => '$couleurA', 'editable' => true,\r
             'label' => __("Couleur des icônes"));\r
 \r
@@ -111,7 +118,7 @@ class wsThemeParametres extends wsParametres
                 '|', 'bookShadeColor', '|', 'usePageEdges',\r
                 '|', 'displayPageNumber', 'colorPageNumber',\r
                 '|', 'linksColor', 'videoBackgroundColor',\r
-                '|', 'tooltipBackColor', 'tooltipTextColor', 'tooltipTextSize','tooltipPadding',\r
+                '|', 'tooltipBackColor', 'tooltipTextColor', 'tooltipTextSize', 'tooltipPadding',\r
                 '|', 'bookmarkBackgroundColor', 'bookmarkStarDisabledColor', 'bookmarkStarEnabledColor'));\r
         /* Credits */\r
         $this->fields['creditsColor'] = array('type' => 'couleurAlpha', 'default' => '80ffffff', 'editable' => true,\r