(no commit message)

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 5438274b097daef724ac9f083b61885926fd5727..ebfb198daae12db757e1b72b64ed76b7323e6c67 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -54,7 +54,7 @@ class wsThemeParametres extends wsParametres {
                        'label' => __("Largeur du champ de recherche"));\r
 \r
                $this->forms['search'] = array('label' => __('Personnalisation de la recherche'),\r
-                       'fieldsnames' => array('couleurS', 'searchFieldColor', 'searchShadeAlpha','searchFieldWidth', '|', 'highlightColor'));\r
+                       'fieldsnames' => array('couleurS', 'searchFieldColor', 'searchShadeAlpha', 'searchFieldWidth', '|', 'highlightColor'));\r
                /* Icones */\r
                $this->fields['iconSet'] = array('type' => 'icones', 'default' => 1, 'editable' => true,\r
                        'label' => __("Jeu d'icônes"));\r
@@ -148,6 +148,11 @@ class wsThemeParametres extends wsParametres {
                        'label' => __('Top Bar'),\r
                        'path' => $themeRoot,\r
                        'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id);\r
+               $this->fields['topBarAlign'] = array('type' => 'combo',\r
+                       'datas' => array(__('Centré') => wsTheme::CENTER,\r
+                               __('Gauche') => wsTheme::LEFT,\r
+                               __("Droite") => wsTheme::RIGHT),\r
+                       'default' => wsTheme::LEFT, 'editable' => true, 'label' => __('Alignement Horizontal de la Top Bar'));\r
 \r
                $this->fields['afterSearch'] = array('type' => 'file', 'default' => '', 'editable' => true,\r
                        'label' => __('Image supplémentaire'),\r
@@ -157,7 +162,7 @@ class wsThemeParametres extends wsParametres {
                );\r
 \r
                $this->forms['menubar'] = array('label' => __('Personnalisation de la barre de menu'),\r
-                       'fieldsnames' => array('menuHeight', '|', 'menuColor', '|', 'menuImage', '|', 'shadeOnMenu', '|', 'invertMenuPosition', '|', 'topBar', '|', 'afterSearch'));\r
+                       'fieldsnames' => array('menuHeight', '|', 'menuColor', '|', 'menuImage', '|', 'shadeOnMenu', '|', 'invertMenuPosition', '|', 'topBar','topBarAlign', '|', 'afterSearch'));\r
                /* Menu bar logo */\r
                $this->fields['logo'] = array('type' => 'file', 'default' => 'menu_clientLogo.png', 'editable' => true,\r
                        'label' => __('Image'),\r