From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 30 Mar 2010 17:42:43 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=366329a10de4af1c149000c6258afe7af75dbfaf;p=cubeextranet.git

---

diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
index b6586d427..bde091b32 100644
--- 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 {
 
 	public function valid()
 	{
-		return $this->current() !== false;
+		return $this->_isset($this->key());
 	}
 
 	protected function initFields()
@@ -101,6 +101,7 @@ class wsParametres extends cubeMetier implements Iterator {
 				$value = ($value == '' || $value == '0' || $value == 'false')?false:true;
 				break;
 			case 'color':
+			case 'couleur':
 				$value = substr(trim($value, '#'), 0, 6);
 				break;
 			case 'date':
diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 4affcad4f..1de956a81 100644
--- 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;
 		}
 		parent::initFields();
-		$this->fields['couleurA'] = array('type' => 'couleur', 'default' => '', 'editable' => true,
+		/* */ $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);
@@ -19,23 +19,30 @@ class wsThemeParametres extends wsParametres {
 			'label' => __("Couleur du texte du moteur de recherche"), 'extra' => false, 'grade' => 3);
 		$this->fields['couleurL'] = array('type' => 'couleur', 'default' => '', 'editable' => true,
 			'label' => __("Couleur du fond du loader"), 'extra' => false, 'grade' => 3);
-		$this->fields['couleurI'] = array('type' => 'couleur', 'default' => 'transparent', '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,
+			'label' => __('Intensité de l\'ombre sous le fluidbook'), 'extra' => true, 'grade' => 3,
+			'min' => 0, 'max' => 100);
+		/* */$this->fields['colorizeIcons'] = array('type' => 'boolean', 'default' => false, 'editable' => true,
+			'label' => __('Colorier les icônes'), 'extra' => true, 'grade' => 4);
+		/* */$this->fields['couleurI'] = array('type' => 'couleur', 'default' => 'transparent', 'editable' => true,
 			'label' => __("Couleur des icônes"), 'extra' => false, 'grade' => 3);
-		$this->fields['creditsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,
+		/* */$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,
 			'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3);
-		$this->fields['backgroundImage'] = array('type' => 'file', 'default' => 'backgroundImg.jpg', 'editable' => true,
+		/* */$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,
 			'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id);
-		$this->fields['repeat'] = array('type' => 'combo',
+		/* */$this->fields['repeat'] = array('type' => 'combo',
 			'datas' => array(__('Etirer') => wsTheme::STRETCH,
 				__('Etirer le fond en conservant les proportions') => wsTheme::RATIO,
 				__("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['shadeOnMenu'] = array('type' => 'boolean', 'default' => true, 'editable' => true,
+		/* */ $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,
 			'label' => __('Image de fond'), 'extra' => false, 'grade' => 3,
@@ -51,34 +58,44 @@ class wsThemeParametres extends wsParametres {
 			'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,
+		/* */$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,
 			'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['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,
+		/* */ $this->fields['arrowsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,
 			'label' => __('Couleur des flèches des boutons de navigation (page suivante, page précédente)'), 'extra' => true, 'grade' => 4);
-		$this->fields['pagesBarTxtColor'] = array('type' => 'color', 'default' => 'ffffff', 'editable' => true,
+		$this->fields['pagesBarTxtColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,
 			'label' => __("Couleur des numéros de page de la barre d'accès rapide aux pages"), 'extra' => true, 'grade' => 4);
-		$this->fields['sections'] = array('type' => 'textarea', 'default' => '', 'editable' => true,
+		/* */ $this->fields['sections'] = array('type' => 'textarea', 'default' => '', 'editable' => true,
 			'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,
 			'label' => __('Afficher les numéros de page'), 'extra' => false, 'grade' => 1);
 
-		$this->forms['background'] = array('label' => __('Personnalisation du fond'), 'fieldsnames' => array('backgroundImage', 'backgroundColor', 'repeat'));
-		$this->forms['bouton'] = array('label' => __('Personnalisation des boutons'), 'fieldsnames' => array('couleurA', 'arrowsColor'));
-		$this->forms['icones'] = array('label' => __('Personnalisation des icônes'), 'fieldsnames' => array('couleurI'));
-		$this->forms['pagebar'] = array('label' => __('Personnalisation de la barre des pages'),
+		$this->forms['background'] = array('label' => __('Personnalisation du fond'),
+			'fieldsnames' => array('backgroundImage', 'backgroundColor', 'repeat'));
+		$this->forms['bouton'] = array('label' => __('Personnalisation des boutons'),
+			'fieldsnames' => array('couleurA', 'arrowsColor'));
+		$this->forms['icones'] = array('label' => __('Personnalisation des icônes'),
+			'fieldsnames' => array('colorizeIcons', 'couleurI'));
+		$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', 'usePageEdges'));
-		$this->forms['menubar'] = array('label' => __('Personnalisation de la barre de menu'), 'fieldsnames' => array('shadeOnMenu', 'menuImage', 'couleurS'));
-		$this->forms['menu'] = array('label' => __('Personnalisation des menus'), 'fieldsnames' => array('couleurB'));
-		$this->forms['loader'] = array('label' => __('Personnalisation du loader'), 'fieldsnames' => array('couleurL', 'logoLoader'));
-		$this->forms['logo'] = array('label' => __('Personnalisation du logo'), 'fieldsnames' => array('logo', 'shadeAlpha'));
-		$this->forms['credits'] = array('label' => __('Personnalisation des crédits'), 'fieldsnames' => array('creditsColor'));
+			'fieldsnames' => array('displayPageNumber', 'shadeAlpha', 'pageNoReflection', 'usePageEdges','bookShadeColor','bookShadeAlpha'));
+		$this->forms['menubar'] = array('label' => __('Personnalisation de la barre de menu'),
+			'fieldsnames' => array('shadeOnMenu', 'menuImage', 'couleurS'));
+		$this->forms['menu'] = array('label' => __('Personnalisation des menus'),
+			'fieldsnames' => array('couleurB'));
+		$this->forms['loader'] = array('label' => __('Personnalisation du loader'),
+			'fieldsnames' => array('couleurL', 'logoLoader'));
+		$this->forms['logo'] = array('label' => __('Personnalisation du logo'),
+			'fieldsnames' => array('logo'));
+		$this->forms['credits'] = array('label' => __('Personnalisation des crédits'),
+			'fieldsnames' => array('creditsColor'));
 	}
 }
 
diff --git a/swf/_src/wsComposer.fla b/swf/_src/wsComposer.fla
index ad7cbac7d..c0572e7d5 100644
Binary files a/swf/_src/wsComposer.fla and b/swf/_src/wsComposer.fla differ