From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 22 Apr 2010 17:20:05 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=059a2643baa18f59a56df32d8e3c2caf54a886ef;p=cubeextranet.git

---

diff --git a/importWs.php b/importWs.php
index a6129bfb6..edf1a8e1c 100644
--- a/importWs.php
+++ b/importWs.php
@@ -164,6 +164,7 @@ while ($r->fetch()) {
 }
 // Import des thèmes
 $r = $core->con->select('SELECT * FROM ws.theme');
+$theme=new wsTheme();
 while ($r->fetch()) {
 	//$r->iconSet = $r->iid;
 	$c = $core->con->openCursor('themes');
@@ -173,7 +174,7 @@ while ($r->fetch()) {
 	$c->date = $r->date;
 	$c->nom = $r->titre;
 	$c->signature = $r->sigid;
-	$parametres = new wsThemeParametres();
+	$parametres = new wsThemeParametres($theme);
 	$parametres->fromRecord($r);
 	$c->parametres = serialize($parametres);
 	$c->insert();
diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 6dba93628..b9ae9f310 100644
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -21,9 +21,12 @@ class wsThemeParametres extends wsParametres {
 			'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['couleurS'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true,
+			'label' => __("Couleur du texte"), 'extra' => false, 'grade' => 3);
+		/* */$this->fields['searchFieldColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,
+			'label' => __("Couleur du champs de saisie"), 'extra' => false, 'grade' => 3);
+		/* */$this->fields['highlightColor'] = array('type' => 'couleur', 'default' => '00ff00', 'editable' => true,
+			'label' => __("Couleur du surlignage des résultats"), 'extra' => false, 'grade' => 3);
 		/* */$this->fields['couleurL'] = array('type' => 'couleur', 'default' => '', 'editable' => true,
 			'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3);
 		/* */$this->fields['loadingSecColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,
@@ -84,8 +87,6 @@ class wsThemeParametres extends wsParametres {
 			'label' => __("Afficher la bordure des pages"), 'extra' => true, 'grade' => 4);
 		/* */ $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['sections'] = array('type' => 'textarea', 'default' => '', 'editable' => true,
-			'label' => __("Sections"), 'extra' => false, 'grade' => 4);
 		/* */$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,
@@ -113,6 +114,8 @@ class wsThemeParametres extends wsParametres {
 			'fieldsnames' => array('logo'));
 		$this->forms['credits'] = array('label' => __('Personnalisation des crédits'),
 			'fieldsnames' => array('creditsColor'));
+		$this->forms['search'] = array('label' => __('Personnalisation de la recherche'),
+			'fieldsnames' => array('couleurS', 'searchFieldColor', '|', 'highlightColor'));
 	}
 }
 
diff --git a/swf/_src/wsComposer.fla b/swf/_src/wsComposer.fla
index 835f3204c..dc2757b7f 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 37c6cf0ed..de810c318 100644
Binary files a/swf/_src/wsComposerComponents.fla and b/swf/_src/wsComposerComponents.fla differ
diff --git a/swf/_src/wsComposerComponents.swc b/swf/_src/wsComposerComponents.swc
index ecabb126e..aba6b0cb0 100644
Binary files a/swf/_src/wsComposerComponents.swc and b/swf/_src/wsComposerComponents.swc differ