(no commit message)

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 706d1a89e1515f81313e8d2a67e908b677a820b8..040e70bfd5eea0b2a1dce3e3ba82d067d43f6f23 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -60,11 +60,9 @@ class wsThemeParametres extends wsParametres {
                        'label' => __("Couleur de l'effet de rollover"), 'extra' => false, 'grade' => 3);\r
                $this->fields['iconsHMargin'] = array('type' => 'integer', 'default' => 15, 'editable' => true,\r
                        'label' => __('Espace entre les icônes'), 'min' => 0, 'max' => 50);\r
-               $this->fields['iconsTMargin'] = array('type' => 'integer', 'default' => 7, 'editable' => true,\r
-                       'label' => __('Marge supérieur des icônes'), 'min' => 0, 'max' => 20);\r
 \r
                $this->forms['icones'] = array('label' => __('Personnalisation des icônes'),\r
-                       'fieldsnames' => array('iconSet', 'iconShadeColor', '|', 'iconsTMargin', 'iconsHMargin', '|', 'colorizeIcons', 'couleurI'));\r
+                       'fieldsnames' => array('iconSet', 'iconShadeColor', '|', 'iconsHMargin', '|', 'colorizeIcons', 'couleurI'));\r
 \r
                /* Book */\r
                $this->fields['bookShadeColor'] = array('type' => 'couleurAlpha', 'default' => '66000000', 'editable' => true,\r
@@ -127,6 +125,8 @@ class wsThemeParametres extends wsParametres {
                        'fieldsnames' => array('backgroundColor', '|', 'useBackgroundImage', 'backgroundImage', '|',\r
                                'repeat', 'backgroundHAlign', 'backgroundVAlign'));\r
                /* Menu bar */\r
+               $this->fields['menuHeight'] = array('type' => 'integer', 'default' => 39, 'editable' => true,\r
+                       'label' => __('Hauteur (en pixels)'));\r
                $this->fields['menuColor'] = array('type' => 'couleurAlpha', 'default' => 'ffffffff', 'editable' => true,\r
                        'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3);\r
                $this->fields['shadeOnMenu'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
@@ -141,7 +141,7 @@ class wsThemeParametres extends wsParametres {
                        'label' => __("Intervertir le menu et le logo"), 'extra' => true, 'grade' => 4);\r
 \r
                $this->forms['menubar'] = array('label' => __('Personnalisation de la barre de menu'),\r
-                       'fieldsnames' => array('menuColor', '|', 'useMenuImage', 'menuImage', '|', 'shadeOnMenu', '|', 'invertMenuPosition'));\r
+                       'fieldsnames' => array('menuHeight', '|', 'menuColor', '|', 'useMenuImage', 'menuImage', '|', 'shadeOnMenu', '|', 'invertMenuPosition'));\r
                /* Menu bar logo */\r
                $this->fields['logo'] = array('type' => 'file', 'default' => 'menu_clientLogo.png', 'editable' => true,\r
                        'label' => __('Image'), 'extra' => false, 'grade' => 3,\r