(no commit message)

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index b6d51ac8553b6091250dc346e90660eddc2158ed..991a9e95b3fa6f9f89a415c6ceb6f36cdbf93d9b 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -31,18 +31,15 @@ class wsThemeParametres extends wsParametres {
                        'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3);\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' => 'couleurAlpha', 'default' => '80000000', '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
-                       '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
                        'label' => __("Jeu d'icônes"), 'extra' => false, 'grade' => 3);\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' => '$couleurA', 'editable' => true,\r
                        'label' => __("Couleur des icônes"), 'extra' => false, 'grade' => 3);\r
-               $this->fields['iconShadColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true,\r
+               $this->fields['iconShadeColor'] = array('type' => 'couleurAlpha', 'default' => '64000000', 'editable' => true,\r
                        'label' => __("Couleur de l'effet de rollover"), 'extra' => false, 'grade' => 3);\r
                $this->fields['creditsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __("Couleur du texte"), 'extra' => false, 'grade' => 3);\r
@@ -90,6 +87,8 @@ class wsThemeParametres extends wsParametres {
                        'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id);\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['pageBarThumbBack'] = array('type' => 'couleurAlpha', 'default' => '80000000', '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
                        'label' => __('Transparence des ombres et reflets sur les pages'), 'extra' => true, 'grade' => 4,\r
                        'min' => 0, 'max' => 100);\r
@@ -97,7 +96,7 @@ class wsThemeParametres extends wsParametres {
                        'label' => __("Afficher le reflet sur la page"), 'extra' => true, 'grade' => 4);\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['pageEdgeColor'] = array('type' => 'couleur', 'default' => 'cccccc', 'editable' => true,\r
+               $this->fields['pageEdgeColor'] = array('type' => 'couleur', 'default' => 'dddddd', 'editable' => true,\r
                        'label' => __('Couleur de la bordure'), 'extra' => true, 'grade' => 4);\r
                $this->fields['arrowsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __('Couleur des flèches'), 'extra' => true, 'grade' => 4);\r
@@ -118,13 +117,13 @@ class wsThemeParametres extends wsParametres {
                $this->forms['bouton'] = array('label' => __('Personnalisation des boutons'),\r
                        'fieldsnames' => array('couleurA', 'arrowsColor'));\r
                $this->forms['icones'] = array('label' => __('Personnalisation des icônes'),\r
-                       'fieldsnames' => array('iconSet', 'iconShadColor', '|', 'colorizeIcons', 'couleurI'));\r
+                       'fieldsnames' => array('iconSet', 'iconShadeColor', '|', 'colorizeIcons', 'couleurI'));\r
                $this->forms['pagesbar'] = array('label' => __('Personnalisation de la barre des pages'),\r
-                       'fieldsnames' => array('pagesBar'));\r
+                       'fieldsnames' => array('pagesBar', 'pageBarThumbBack'));\r
                $this->forms['book'] = array('label' => __('Personnalisation du fluidbook'),\r
                        'fieldsnames' => array('pageReflection', 'shadeAlpha',\r
                                '|', 'usePageEdges', 'pageEdgeColor',\r
-                               '|', 'bookShadeColor', 'bookShadeAlpha',\r
+                               '|', 'bookShadeColor',\r
                                '|', 'displayPageNumber', 'colorPageNumber',\r
                                '|', 'linksColor'));\r
                $this->forms['menubar'] = array('label' => __('Personnalisation de la barre de menu'),\r