(no commit message)

diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
index b6586d427fc0d0c18bea2be499822f30bfd0e8fd..bde091b327566354df5a0f6006c10108ade80d39 100644 (file)
--- a/inc/ws/Metier/class.ws.parametres.php
+++ b/inc/ws/Metier/class.ws.parametres.php
@@ -70,7 +70,7 @@ class wsParametres extends cubeMetier implements Iterator {
 \r
        public function valid()\r
        {\r
-               return $this->current() !== false;\r
+               return $this->_isset($this->key());\r
        }\r
 \r
        protected function initFields()\r
@@ -101,6 +101,7 @@ class wsParametres extends cubeMetier implements Iterator {
                                $value = ($value == '' || $value == '0' || $value == 'false')?false:true;\r
                                break;\r
                        case 'color':\r
+                       case 'couleur':\r
                                $value = substr(trim($value, '#'), 0, 6);\r
                                break;\r
                        case 'date':\r

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 4affcad4f9913889e3abfa0ca94ccb3bd427c3bc..1de956a8189c2f375d56f3b93f9567123ad3b89a 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -11,7 +11,7 @@ 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
                        'label' => __("Couleur des sous-menus"), 'extra' => false, 'grade' => 3);\r
@@ -19,23 +19,30 @@ class wsThemeParametres extends wsParametres {
                        'label' => __("Couleur du texte du moteur de recherche"), 'extra' => false, 'grade' => 3);\r
                $this->fields['couleurL'] = array('type' => 'couleur', 'default' => '', 'editable' => true,\r
                        'label' => __("Couleur du fond du loader"), 'extra' => false, 'grade' => 3);\r
-               $this->fields['couleurI'] = array('type' => 'couleur', 'default' => 'transparent', '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
+                       'label' => __('Intensité de l\'ombre sous le fluidbook'), 'extra' => true, 'grade' => 3,\r
+                       'min' => 0, 'max' => 100);\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
                        '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
                        'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3);\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['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['menuImage'] = array('type' => 'file', 'default' => 'menu_back.png', 'editable' => true,\r
                        'label' => __('Image de fond'), 'extra' => false, 'grade' => 3,\r
@@ -51,34 +58,44 @@ 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['shadeAlpha'] = array('type' => 'integer', 'default' => 100, 'editable' => true,\r
+               /* */$this->fields['shadeAlpha'] = array('type' => 'integer', 'default' => 100, 'editable' => true,\r
                        'label' => __('Transparence des ombres sur les pages (100 : maximale - 0 : invisible)'), 'extra' => true, 'grade' => 4,\r
                        'min' => 0, 'max' => 100);\r
+               /* */ $this->fields['pageNoReflection'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
+                       'label' => __("Masquer 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['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['pagesBarTxtColor'] = array('type' => 'color', 'default' => 'ffffff', 'editable' => true,\r
+               $this->fields['pagesBarTxtColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __("Couleur des numéros de page de la barre d'accès rapide aux pages"), 'extra' => true, 'grade' => 4);\r
-               $this->fields['sections'] = array('type' => 'textarea', 'default' => '', 'editable' => true,\r
+               /* */ $this->fields['sections'] = array('type' => 'textarea', 'default' => '', 'editable' => true,\r
                        'label' => __("Sections"), 'extra' => false, 'grade' => 4);\r
                $this->fields['indexColors'] = array('type' => 'textarea', 'default' => '', 'editable' => true,\r
                        'label' => __("Couleurs des pages de l'index"), 'extra' => true, 'grade' => 4);\r
                $this->fields['displayPageNumber'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
                        'label' => __('Afficher les numéros de page'), 'extra' => false, 'grade' => 1);\r
 \r
-               $this->forms['background'] = array('label' => __('Personnalisation du fond'), 'fieldsnames' => array('backgroundImage', 'backgroundColor', 'repeat'));\r
-               $this->forms['bouton'] = array('label' => __('Personnalisation des boutons'), 'fieldsnames' => array('couleurA', 'arrowsColor'));\r
-               $this->forms['icones'] = array('label' => __('Personnalisation des icônes'), 'fieldsnames' => array('couleurI'));\r
-               $this->forms['pagebar'] = array('label' => __('Personnalisation de la barre des pages'),\r
+               $this->forms['background'] = array('label' => __('Personnalisation du fond'),\r
+                       'fieldsnames' => array('backgroundImage', 'backgroundColor', 'repeat'));\r
+               $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('colorizeIcons', 'couleurI'));\r
+               $this->forms['pagesbar'] = array('label' => __('Personnalisation de la barre des pages'),\r
                        'fieldsnames' => array('pagesBar', 'sections', 'pagesBarTxtColor'));\r
                $this->forms['book'] = array('label' => __('Personnalisation du fluidbook'),\r
-                       'fieldsnames' => array('displayPageNumber', 'shadeAlpha', 'usePageEdges'));\r
-               $this->forms['menubar'] = array('label' => __('Personnalisation de la barre de menu'), 'fieldsnames' => array('shadeOnMenu', 'menuImage', 'couleurS'));\r
-               $this->forms['menu'] = array('label' => __('Personnalisation des menus'), 'fieldsnames' => array('couleurB'));\r
-               $this->forms['loader'] = array('label' => __('Personnalisation du loader'), 'fieldsnames' => array('couleurL', 'logoLoader'));\r
-               $this->forms['logo'] = array('label' => __('Personnalisation du logo'), 'fieldsnames' => array('logo', 'shadeAlpha'));\r
-               $this->forms['credits'] = array('label' => __('Personnalisation des crédits'), 'fieldsnames' => array('creditsColor'));\r
+                       'fieldsnames' => array('displayPageNumber', 'shadeAlpha', 'pageNoReflection', 'usePageEdges','bookShadeColor','bookShadeAlpha'));\r
+               $this->forms['menubar'] = array('label' => __('Personnalisation de la barre de menu'),\r
+                       'fieldsnames' => array('shadeOnMenu', 'menuImage', 'couleurS'));\r
+               $this->forms['menu'] = array('label' => __('Personnalisation des menus'),\r
+                       'fieldsnames' => array('couleurB'));\r
+               $this->forms['loader'] = array('label' => __('Personnalisation du loader'),\r
+                       'fieldsnames' => array('couleurL', 'logoLoader'));\r
+               $this->forms['logo'] = array('label' => __('Personnalisation du logo'),\r
+                       'fieldsnames' => array('logo'));\r
+               $this->forms['credits'] = array('label' => __('Personnalisation des crédits'),\r
+                       'fieldsnames' => array('creditsColor'));\r
        }\r
 }\r
 \r

diff --git a/swf/_src/wsComposer.fla b/swf/_src/wsComposer.fla
index ad7cbac7d7711feb6ac7a05fff3e8794951ab588..c0572e7d5cc24419c0243fb6c6ebc20a5f6e9f27 100644 (file)
Binary files a/swf/_src/wsComposer.fla and b/swf/_src/wsComposer.fla differ