(no commit message)

diff --git a/importWs.php b/importWs.php
index a6129bfb624ac767e64079fa1c822c20bc8e3425..edf1a8e1cc16e04f3c14e8de8a1a4b3b8a3d8999 100644 (file)
--- a/importWs.php
+++ b/importWs.php
@@ -164,6 +164,7 @@ while ($r->fetch()) {
 }\r
 // Import des thèmes\r
 $r = $core->con->select('SELECT * FROM ws.theme');\r
+$theme=new wsTheme();\r
 while ($r->fetch()) {\r
        //$r->iconSet = $r->iid;\r
        $c = $core->con->openCursor('themes');\r
@@ -173,7 +174,7 @@ while ($r->fetch()) {
        $c->date = $r->date;\r
        $c->nom = $r->titre;\r
        $c->signature = $r->sigid;\r
-       $parametres = new wsThemeParametres();\r
+       $parametres = new wsThemeParametres($theme);\r
        $parametres->fromRecord($r);\r
        $c->parametres = serialize($parametres);\r
        $c->insert();\r

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 6dba93628c0ab12a156880a6869c49d83301ca3f..b9ae9f310e0e796f8231b9400fbe007f354de817 100644 (file)
--- 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);\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['couleurS'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true,\r
+                       'label' => __("Couleur du texte"), 'extra' => false, 'grade' => 3);\r
+               /* */$this->fields['searchFieldColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
+                       'label' => __("Couleur du champs de saisie"), 'extra' => false, 'grade' => 3);\r
+               /* */$this->fields['highlightColor'] = array('type' => 'couleur', 'default' => '00ff00', 'editable' => true,\r
+                       'label' => __("Couleur du surlignage des résultats"), 'extra' => false, 'grade' => 3);\r
                /* */$this->fields['couleurL'] = array('type' => 'couleur', 'default' => '', 'editable' => true,\r
                        'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3);\r
                /* */$this->fields['loadingSecColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
@@ -84,8 +87,6 @@ class wsThemeParametres extends wsParametres {
                        'label' => __("Afficher la bordure des pages"), 'extra' => true, 'grade' => 4);\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['sections'] = array('type' => 'textarea', 'default' => '', 'editable' => true,\r
-                       'label' => __("Sections"), 'extra' => false, '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
                /* */$this->fields['invertMenuPosition'] = array('type' => 'boolean', 'default' => false, 'editable' => true,\r
@@ -113,6 +114,8 @@ class wsThemeParametres extends wsParametres {
                        'fieldsnames' => array('logo'));\r
                $this->forms['credits'] = array('label' => __('Personnalisation des crédits'),\r
                        'fieldsnames' => array('creditsColor'));\r
+               $this->forms['search'] = array('label' => __('Personnalisation de la recherche'),\r
+                       'fieldsnames' => array('couleurS', 'searchFieldColor', '|', 'highlightColor'));\r
        }\r
 }\r
 \r

diff --git a/swf/_src/wsComposer.fla b/swf/_src/wsComposer.fla
index 835f3204c60801aa6d1cb4e3d4cb44bfe9c31446..dc2757b7f413d4ac0f09a880bdd22d07b088f974 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 37c6cf0eda373cdd9c33ca5eef885e3eebb4141a..de810c318d87a808e9298569849c797fe78dbbd5 100644 (file)
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 ecabb126e174704c7ccd94b2a4060de0e3293807..aba6b0cb0b125124f0d51cca8b47a2d5448ebaac 100644 (file)
Binary files a/swf/_src/wsComposerComponents.swc and b/swf/_src/wsComposerComponents.swc differ