From: vincent@cubedesigners.com Date: Wed, 21 Apr 2010 16:40:08 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b7e12e70b9dcd088e5f645b8ad8a1250afc4fed1;p=cubeextranet.git --- diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index 0eb872f86..c25b876f2 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -93,7 +93,7 @@ class wsUrl { $steps = array(); $steps['composition'] = __('Composition'); - $steps['theme'] = __('Personnalisation'); + $steps['themeSelector'] = __('Personnalisation'); $steps['settings'] = __('Paramètres'); $steps['links'] = __('Edition des liens'); $steps['preview'] = __('Aperçu'); diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php index bde091b32..aaa43df28 100644 --- 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]; $f['fields'] = array(); foreach($f['fieldsnames'] as $n) { - $f['fields'][$n] = $this->fields[$n]; - $f['fields'][$n]['value'] = $this->get($n); + if ($n == '|') { + $f['fields'][] = '|'; + } else { + $f['fields'][$n] = $this->fields[$n]; + $f['fields'][$n]['value'] = $this->get($n); + } } return $f; } diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php index a82f9eda0..ae962496f 100644 --- 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(); /* */ $this->fields['couleurA'] = array('type' => 'couleur', 'default' => '', 'editable' => true, 'label' => __("Couleur principale (boutons, liens)"), 'extra' => false, 'grade' => 3); - $this->fields['couleurB'] = array('type' => 'couleur', 'default' => '', 'editable' => true, - 'label' => __("Couleur des sous-menus"), 'extra' => false, 'grade' => 3); + /* */$this->fields['couleurB'] = array('type' => 'couleur', 'default' => '', 'editable' => true, + 'label' => __("Couleur de fond"), 'extra' => false, 'grade' => 3); + /* */$this->fields['subTextColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, + 'label' => __("Couleur du texte"), 'extra' => false, 'grade' => 3); + /* */$this->fields['subSelectColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, + 'label' => __("Couleur des zones de sélection"), 'extra' => false, 'grade' => 3); + /* */$this->fields['subTextSelectColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true, + 'label' => __("Couleur des textes des zones de sélection"), 'extra' => false, 'grade' => 3); + $this->fields['couleurS'] = array('type' => 'couleur', 'default' => '', 'editable' => true, 'label' => __("Couleur du texte du moteur de recherche"), 'extra' => false, 'grade' => 3); - $this->fields['couleurL'] = array('type' => 'couleur', 'default' => '', 'editable' => true, + /* */$this->fields['couleurL'] = array('type' => 'couleur', 'default' => '', 'editable' => true, 'label' => __("Couleur du fond du loader"), 'extra' => false, 'grade' => 3); - $this->fields['bookShadeColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true, + /* */$this->fields['bookShadeColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true, 'label' => __("Couleur de l'ombre sous le fluidbook"), 'extra' => false, 'grade' => 3); - $this->fields['bookShadeAlpha'] = array('type' => 'integer', 'default' => 100, 'editable' => true, + /* */$this->fields['bookShadeAlpha'] = array('type' => 'integer', 'default' => 100, 'editable' => true, 'label' => __('Intensité de l\'ombre sous le fluidbook'), 'extra' => true, 'grade' => 3, 'min' => 0, 'max' => 100); - $this->fields['iconSet'] = array('type' => 'icones', 'default' => 1, 'editable' => true, + /* */$this->fields['iconSet'] = array('type' => 'icones', 'default' => 1, 'editable' => true, 'label' => __("Jeu d'icônes"), 'extra' => false, 'grade' => 3); /* */$this->fields['colorizeIcons'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Colorier les icônes'), 'extra' => true, 'grade' => 4); @@ -32,8 +39,10 @@ class wsThemeParametres extends wsParametres { 'label' => __("Couleur des icônes"), 'extra' => false, 'grade' => 3); /* */$this->fields['creditsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, 'label' => __("Couleur du texte"), 'extra' => false, 'grade' => 3); - $this->fields['backgroundColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, + /* */$this->fields['backgroundColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, 'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3); + /* */$this->fields['useBackgroundImage'] = array('type' => 'boolean', 'default' => true, 'editable' => true, + 'label' => __('Utiliser une image de fond'), 'extra' => true, 'grade' => 4); /* */$this->fields['backgroundImage'] = array('type' => 'file', 'default' => 'backgroundImg.jpg', 'editable' => true, 'label' => __('Image de fond'), 'extra' => false, 'grade' => 3, 'path' => 'themes/' . $this->parent->theme_id, @@ -44,27 +53,31 @@ class wsThemeParametres extends wsParametres { __("Répéter") => wsTheme::REPEAT, __('Ne pas répéter ni étirer') => wsTheme::NONE), 'default' => 0, 'editable' => true, 'label' => __('Affichage du fond'), 'grade' => 3); + /* */$this->fields['menuColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, + 'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3); /* */ $this->fields['shadeOnMenu'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Ombre portée sous la barre du menu'), 'extra' => true, 'grade' => 4); - $this->fields['menuImage'] = array('type' => 'file', 'default' => 'menu_back.png', 'editable' => true, + /* */$this->fields['useMenuImage'] = array('type' => 'boolean', 'default' => true, 'editable' => true, + 'label' => __('Utiliser une image de fond'), 'extra' => true, 'grade' => 4); + /* */$this->fields['menuImage'] = array('type' => 'file', 'default' => 'menu_back.png', 'editable' => true, 'label' => __('Image de fond'), 'extra' => false, 'grade' => 3, 'path' => 'themes/' . $this->parent->theme_id, 'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id); - $this->fields['logo'] = array('type' => 'file', 'default' => 'menu_clientLogo.png', 'editable' => true, + /* */$this->fields['logo'] = array('type' => 'file', 'default' => 'menu_clientLogo.png', 'editable' => true, 'label' => __('Image'), 'extra' => false, 'grade' => 3, 'path' => 'themes/' . $this->parent->theme_id, 'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id); - $this->fields['logoLoader'] = array('type' => 'file', 'default' => 'logoLoader.png', 'editable' => true, + /* */$this->fields['logoLoader'] = array('type' => 'file', 'default' => 'logoLoader.png', 'editable' => true, 'label' => __('Logo affiché au chargement'), 'extra' => false, 'grade' => 3, 'path' => 'themes/' . $this->parent->theme_id, 'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id); $this->fields['pagesBar'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Afficher la barre d'accès rapide aux pages"), 'extra' => true, 'grade' => 4); /* */$this->fields['shadeAlpha'] = array('type' => 'integer', 'default' => 100, 'editable' => true, - 'label' => __('Transparence des ombres sur les pages (100 : maximale - 0 : invisible)'), 'extra' => true, 'grade' => 4, + 'label' => __('Transparence des ombres et reflets sur les pages'), 'extra' => true, 'grade' => 4, 'min' => 0, 'max' => 100); - /* */ $this->fields['pageNoReflection'] = array('type' => 'boolean', 'default' => true, 'editable' => true, - 'label' => __("Masquer le reflet sur la page"), 'extra' => true, 'grade' => 4); + /* */ $this->fields['pageReflection'] = array('type' => 'boolean', 'default' => false, 'editable' => true, + 'label' => __("Afficher le reflet sur la page"), 'extra' => true, 'grade' => 4); $this->fields['usePageEdges'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Afficher la bordure des pages"), 'extra' => true, 'grade' => 4); /* */ $this->fields['arrowsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, @@ -75,11 +88,15 @@ class wsThemeParametres extends wsParametres { 'label' => __("Sections"), 'extra' => false, 'grade' => 4); $this->fields['indexColors'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __("Couleurs des pages de l'index"), 'extra' => true, 'grade' => 4); - $this->fields['displayPageNumber'] = array('type' => 'boolean', 'default' => true, 'editable' => true, + /* */$this->fields['displayPageNumber'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Afficher les numéros de page'), 'extra' => false, 'grade' => 1); + $this->fields['invertMenuPosition'] = array('type' => 'boolean', 'default' => false, 'editable' => true, + 'label' => __('Intervertir la position des icônes et du logo'), 'extra' => false, 'grade' => 1); + + /* Regroupement des champs par formulaire */ $this->forms['background'] = array('label' => __('Personnalisation du fond'), - 'fieldsnames' => array('backgroundImage', 'backgroundColor', 'repeat')); + 'fieldsnames' => array('backgroundColor','|', 'useBackgroundImage', 'backgroundImage', 'repeat')); $this->forms['bouton'] = array('label' => __('Personnalisation des boutons'), 'fieldsnames' => array('couleurA', 'arrowsColor')); $this->forms['icones'] = array('label' => __('Personnalisation des icônes'), @@ -87,11 +104,11 @@ class wsThemeParametres extends wsParametres { $this->forms['pagesbar'] = array('label' => __('Personnalisation de la barre des pages'), 'fieldsnames' => array('pagesBar', 'sections', 'pagesBarTxtColor')); $this->forms['book'] = array('label' => __('Personnalisation du fluidbook'), - 'fieldsnames' => array('displayPageNumber', 'shadeAlpha', 'pageNoReflection', 'usePageEdges', 'bookShadeColor', 'bookShadeAlpha')); + 'fieldsnames' => array('pageReflection','shadeAlpha','|', 'usePageEdges','|', 'bookShadeColor', 'bookShadeAlpha','|','displayPageNumber')); $this->forms['menubar'] = array('label' => __('Personnalisation de la barre de menu'), - 'fieldsnames' => array('shadeOnMenu', 'menuImage', 'couleurS')); + 'fieldsnames' => array('menuColor','|', 'useMenuImage', 'menuImage','|','shadeOnMenu','|','invertMenuPosition')); $this->forms['menu'] = array('label' => __('Personnalisation des menus'), - 'fieldsnames' => array('couleurB')); + 'fieldsnames' => array('couleurB', 'subTextColor', 'subSelectColor', 'subTextSelectColor')); $this->forms['loader'] = array('label' => __('Personnalisation du loader'), 'fieldsnames' => array('couleurL', 'logoLoader')); $this->forms['logo'] = array('label' => __('Personnalisation du logo'), diff --git a/swf/_src/wsComposer.fla b/swf/_src/wsComposer.fla index 99f0b6e5b..a8a33525f 100644 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 b8177b87d..d35ae7844 100644 Binary files a/swf/_src/wsComposerComponents.fla and b/swf/_src/wsComposerComponents.fla differ