(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 0eb872f86e3e33bfd04237e7c0f5cb218b6e428c..c25b876f26b23d06142344d2888747419594db12 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -93,7 +93,7 @@ class wsUrl {
 \r
                $steps = array();\r
                $steps['composition'] = __('Composition');\r
-               $steps['theme'] = __('Personnalisation');\r
+               $steps['themeSelector'] = __('Personnalisation');\r
                $steps['settings'] = __('Paramètres');\r
                $steps['links'] = __('Edition des liens');\r
                $steps['preview'] = __('Aperçu');\r

diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
index bde091b327566354df5a0f6006c10108ade80d39..aaa43df28f7407d61d712dc7c449c36394b9aa08 100644 (file)
--- a/inc/ws/Metier/class.ws.parametres.php
+++ b/inc/ws/Metier/class.ws.parametres.php
@@ -138,8 +138,12 @@ class wsParametres extends cubeMetier implements Iterator {
                $f = $this->forms[$name];\r
                $f['fields'] = array();\r
                foreach($f['fieldsnames'] as $n) {\r
-                       $f['fields'][$n] = $this->fields[$n];\r
-                       $f['fields'][$n]['value'] = $this->get($n);\r
+                       if ($n == '|') {\r
+                               $f['fields'][] = '|';\r
+                       } else {\r
+                               $f['fields'][$n] = $this->fields[$n];\r
+                               $f['fields'][$n]['value'] = $this->get($n);\r
+                       }\r
                }\r
                return $f;\r
        }\r

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index a82f9eda0551109513c9657de64f24973be67218..ae962496fd2324ff659c11695057e0718757406e 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -13,18 +13,25 @@ class wsThemeParametres extends wsParametres {
                parent::initFields();\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
+               /* */$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
+                       'label' => __("Couleur du texte"), 'extra' => false, 'grade' => 3);\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
+                       'label' => __("Couleur des textes des zones de sélection"), 'extra' => false, 'grade' => 3);\r
+\r
                $this->fields['couleurS'] = array('type' => 'couleur', 'default' => '', 'editable' => true,\r
                        'label' => __("Couleur du texte du moteur de recherche"), '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 du loader"), '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
                        'label' => __('Colorier les icônes'), 'extra' => true, 'grade' => 4);\r
@@ -32,8 +39,10 @@ class wsThemeParametres extends wsParametres {
                        'label' => __("Couleur des icônes"), '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
-               $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
+                       'label' => __('Utiliser une image de fond'), 'extra' => true, 'grade' => 4);\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
@@ -44,27 +53,31 @@ class wsThemeParametres extends wsParametres {
                                __("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
+                       'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3);\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
+               /* */$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
                        '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
                        '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 sur les pages (100 : maximale - 0 : invisible)'), 'extra' => true, 'grade' => 4,\r
+                       'label' => __('Transparence des ombres et reflets sur les pages'), '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['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
                        'label' => __("Afficher la bordure des pages"), 'extra' => true, 'grade' => 4);\r
                /* */ $this->fields['arrowsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
@@ -75,11 +88,15 @@ class wsThemeParametres extends wsParametres {
                        '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
+               /* */$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
+                       'label' => __('Intervertir la position des icônes et du logo'), 'extra' => false, 'grade' => 1);\r
+\r
+               /* Regroupement des champs par formulaire */\r
 \r
                $this->forms['background'] = array('label' => __('Personnalisation du fond'),\r
-                       'fieldsnames' => array('backgroundImage', 'backgroundColor', 'repeat'));\r
+                       'fieldsnames' => array('backgroundColor','|', 'useBackgroundImage', 'backgroundImage', '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
@@ -87,11 +104,11 @@ class wsThemeParametres extends wsParametres {
                $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', 'pageNoReflection', 'usePageEdges', 'bookShadeColor', 'bookShadeAlpha'));\r
+                       'fieldsnames' => array('pageReflection','shadeAlpha','|', 'usePageEdges','|', 'bookShadeColor', 'bookShadeAlpha','|','displayPageNumber'));\r
                $this->forms['menubar'] = array('label' => __('Personnalisation de la barre de menu'),\r
-                       'fieldsnames' => array('shadeOnMenu', 'menuImage', 'couleurS'));\r
+                       'fieldsnames' => array('menuColor','|', 'useMenuImage', 'menuImage','|','shadeOnMenu','|','invertMenuPosition'));\r
                $this->forms['menu'] = array('label' => __('Personnalisation des menus'),\r
-                       'fieldsnames' => array('couleurB'));\r
+                       'fieldsnames' => array('couleurB', 'subTextColor', 'subSelectColor', 'subTextSelectColor'));\r
                $this->forms['loader'] = array('label' => __('Personnalisation du loader'),\r
                        'fieldsnames' => array('couleurL', 'logoLoader'));\r
                $this->forms['logo'] = array('label' => __('Personnalisation du logo'),\r

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

diff --git a/swf/_src/wsComposerComponents.fla b/swf/_src/wsComposerComponents.fla
index b8177b87df15271e54ef3915a8def26b73056d0a..d35ae7844fea7f09ea5420b09b77017f2b29a1b1 100644 (file)
Binary files a/swf/_src/wsComposerComponents.fla and b/swf/_src/wsComposerComponents.fla differ