(no commit message)

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index b9ae9f310e0e796f8231b9400fbe007f354de817..26567a6c85debdaf8e96430ff7ca8a26b73111c1 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -11,85 +11,85 @@ class wsThemeParametres extends wsParametres {
                        return;\r
                }\r
                parent::initFields();\r
-               /* */ $this->fields['couleurA'] = array('type' => 'couleur', 'default' => '', 'editable' => true,\r
+               $this->fields['couleurA'] = array('type' => 'couleur', 'default' => '', 'editable' => true,\r
                        'label' => __("Couleur principale (boutons, liens)"), 'extra' => false, 'grade' => 3);\r
-               /* */$this->fields['couleurB'] = array('type' => 'couleur', 'default' => '', 'editable' => true,\r
+               $this->fields['couleurB'] = array('type' => 'couleur', 'default' => '', 'editable' => true,\r
                        'label' => __("Couleur de fond"), 'extra' => false, 'grade' => 3);\r
-               /* */$this->fields['subTextColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
+               $this->fields['subTextColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __("Couleur du texte"), 'extra' => false, 'grade' => 3);\r
-               /* */$this->fields['subSelectColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
+               $this->fields['subSelectColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __("Couleur des zones de sélection"), 'extra' => false, 'grade' => 3);\r
-               /* */$this->fields['subTextSelectColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true,\r
+               $this->fields['subTextSelectColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true,\r
                        'label' => __("Couleur des textes des zones de sélection"), 'extra' => false, 'grade' => 3);\r
-               /* */$this->fields['couleurS'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true,\r
+               $this->fields['couleurS'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true,\r
                        'label' => __("Couleur du texte"), 'extra' => false, 'grade' => 3);\r
-               /* */$this->fields['searchFieldColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
+               $this->fields['searchFieldColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __("Couleur du champs de saisie"), 'extra' => false, 'grade' => 3);\r
-               /* */$this->fields['highlightColor'] = array('type' => 'couleur', 'default' => '00ff00', 'editable' => true,\r
+               $this->fields['highlightColor'] = array('type' => 'couleur', 'default' => '00ff00', 'editable' => true,\r
                        'label' => __("Couleur du surlignage des résultats"), 'extra' => false, 'grade' => 3);\r
-               /* */$this->fields['couleurL'] = array('type' => 'couleur', 'default' => '', 'editable' => true,\r
+               $this->fields['couleurL'] = array('type' => 'couleur', 'default' => '', 'editable' => true,\r
                        'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3);\r
-               /* */$this->fields['loadingSecColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
+               $this->fields['loadingSecColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __("Couleur secondaire"), 'extra' => false, 'grade' => 3);\r
-               /* */$this->fields['bookShadeColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true,\r
+               $this->fields['bookShadeColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true,\r
                        'label' => __("Couleur de l'ombre sous le fluidbook"), 'extra' => false, 'grade' => 3);\r
-               /* */$this->fields['bookShadeAlpha'] = array('type' => 'integer', 'default' => 100, 'editable' => true,\r
+               $this->fields['bookShadeAlpha'] = array('type' => 'integer', 'default' => 100, 'editable' => true,\r
                        'label' => __('Intensité de l\'ombre sous le fluidbook'), 'extra' => true, 'grade' => 3,\r
                        'min' => 0, 'max' => 100);\r
-               /* */$this->fields['iconSet'] = array('type' => 'icones', 'default' => 1, 'editable' => true,\r
+               $this->fields['iconSet'] = array('type' => 'icones', 'default' => 1, 'editable' => true,\r
                        'label' => __("Jeu d'icônes"), 'extra' => false, 'grade' => 3);\r
-               /* */$this->fields['colorizeIcons'] = array('type' => 'boolean', 'default' => false, 'editable' => true,\r
+               $this->fields['colorizeIcons'] = array('type' => 'boolean', 'default' => false, 'editable' => true,\r
                        'label' => __('Colorier les icônes'), 'extra' => true, 'grade' => 4);\r
-               /* */$this->fields['couleurI'] = array('type' => 'couleur', 'default' => 'transparent', 'editable' => true,\r
+               $this->fields['couleurI'] = array('type' => 'couleur', 'default' => 'transparent', 'editable' => true,\r
                        'label' => __("Couleur des icônes"), 'extra' => false, 'grade' => 3);\r
-               /* */$this->fields['creditsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
+               $this->fields['creditsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __("Couleur du texte"), 'extra' => false, 'grade' => 3);\r
-               /* */$this->fields['backgroundColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
+               $this->fields['backgroundColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3);\r
-               /* */$this->fields['useBackgroundImage'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
+               $this->fields['useBackgroundImage'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
                        'label' => __('Utiliser une image de fond'), 'extra' => true, 'grade' => 4);\r
-               /* */$this->fields['backgroundImage'] = array('type' => 'file', 'default' => 'backgroundImg.jpg', 'editable' => true,\r
+               $this->fields['backgroundImage'] = array('type' => 'file', 'default' => 'backgroundImg.jpg', 'editable' => true,\r
                        'label' => __('Image de fond'), 'extra' => false, 'grade' => 3,\r
                        'path' => 'themes/' . $this->parent->theme_id,\r
                        'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id);\r
-               /* */$this->fields['repeat'] = array('type' => 'combo',\r
+               $this->fields['repeat'] = array('type' => 'combo',\r
                        'datas' => array(__('Etirer') => wsTheme::STRETCH,\r
                                __('Etirer le fond en conservant les proportions') => wsTheme::RATIO,\r
                                __("Répéter") => wsTheme::REPEAT,\r
                                __('Ne pas répéter ni étirer') => wsTheme::NONE),\r
                        'default' => 0, 'editable' => true, 'label' => __('Affichage du fond'), 'grade' => 3);\r
-               /* */$this->fields['menuColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
+               $this->fields['menuColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3);\r
-               /* */ $this->fields['shadeOnMenu'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
+               $this->fields['shadeOnMenu'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
                        'label' => __('Ombre portée sous la barre du menu'), 'extra' => true, 'grade' => 4);\r
-               /* */$this->fields['useMenuImage'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
+               $this->fields['useMenuImage'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
                        'label' => __('Utiliser une image de fond'), 'extra' => true, 'grade' => 4);\r
-               /* */$this->fields['menuImage'] = array('type' => 'file', 'default' => 'menu_back.png', 'editable' => true,\r
+               $this->fields['menuImage'] = array('type' => 'file', 'default' => 'menu_back.png', 'editable' => true,\r
                        'label' => __('Image de fond'), 'extra' => false, 'grade' => 3,\r
                        'path' => 'themes/' . $this->parent->theme_id,\r
                        'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id);\r
-               /* */$this->fields['logo'] = array('type' => 'file', 'default' => 'menu_clientLogo.png', 'editable' => true,\r
+               $this->fields['logo'] = array('type' => 'file', 'default' => 'menu_clientLogo.png', 'editable' => true,\r
                        'label' => __('Image'), 'extra' => false, 'grade' => 3,\r
                        'path' => 'themes/' . $this->parent->theme_id,\r
                        'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id);\r
-               /* */$this->fields['logoLoader'] = array('type' => 'file', 'default' => 'logoLoader.png', 'editable' => true,\r
+               $this->fields['logoLoader'] = array('type' => 'file', 'default' => 'logoLoader.png', 'editable' => true,\r
                        'label' => __('Logo affiché au chargement'), 'extra' => false, 'grade' => 3,\r
                        'path' => 'themes/' . $this->parent->theme_id,\r
                        'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id);\r
-               /* */$this->fields['pagesBar'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
+               $this->fields['pagesBar'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
                        'label' => __("Afficher la barre d'accès rapide aux pages"), 'extra' => true, 'grade' => 4);\r
-               /* */$this->fields['shadeAlpha'] = array('type' => 'integer', 'default' => 100, 'editable' => true,\r
+               $this->fields['shadeAlpha'] = array('type' => 'integer', 'default' => 100, 'editable' => true,\r
                        'label' => __('Transparence des ombres et reflets sur les pages'), 'extra' => true, 'grade' => 4,\r
                        'min' => 0, 'max' => 100);\r
-               /* */ $this->fields['pageReflection'] = array('type' => 'boolean', 'default' => false, 'editable' => true,\r
+               $this->fields['pageReflection'] = array('type' => 'boolean', 'default' => false, 'editable' => true,\r
                        'label' => __("Afficher le reflet sur la page"), 'extra' => true, 'grade' => 4);\r
-               /* */$this->fields['usePageEdges'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
+               $this->fields['usePageEdges'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
                        'label' => __("Afficher la bordure des pages"), 'extra' => true, 'grade' => 4);\r
-               /* */ $this->fields['arrowsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
+               $this->fields['arrowsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __('Couleur des flèches des boutons de navigation (page suivante, page précédente)'), 'extra' => true, 'grade' => 4);\r
-               /* */$this->fields['displayPageNumber'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
+               $this->fields['displayPageNumber'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
                        'label' => __('Afficher les numéros de page'), 'extra' => false, 'grade' => 1);\r
-               /* */$this->fields['invertMenuPosition'] = array('type' => 'boolean', 'default' => false, 'editable' => true,\r
+               $this->fields['invertMenuPosition'] = array('type' => 'boolean', 'default' => false, 'editable' => true,\r
                        'label' => __('Intervertir la position des icônes et du logo'), 'extra' => false, 'grade' => 1);\r
 \r
                /* Regroupement des champs par formulaire */\r