(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 58ae8b6f0b27635f8aeebdfeed3b9df7d1bfb7a2..6d65acfea4ff3c8e2cc9e86630672642e7ccfece 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -260,7 +260,6 @@ class wsFlash extends cubeFlashGateway {
                        $i = $this->xml->addChild('icone');\r
                        $i->addAttribute('id', $icone->icone_id);\r
                        $i->addAttribute('nom', $icone->nom);\r
-                       $i->addAttribute('newSet', $icone->isNew());\r
                        $i->addAttribute('path', ICONS . $icone->icone_id . '.png');\r
                }\r
        }\r

diff --git a/inc/ws/Metier/class.ws.icone.php b/inc/ws/Metier/class.ws.icone.php
index 2fc9e9fbe059ec027d46eb3fcf0b6adb835d048e..84b83199b8c263bf15915f40987601cbca5fe553 100644 (file)
--- a/inc/ws/Metier/class.ws.icone.php
+++ b/inc/ws/Metier/class.ws.icone.php
@@ -6,16 +6,8 @@ class wsIcone extends cubeMetier {
 \r
        protected $_is_new = null;\r
 \r
-       public static $files = array('index', 'normal', 'sommaire', 'zoomin', 'zoomout', 'print', 'send', 'bookmark', 'pdf', 'help');\r
-       public static $files_new = array('index', 'normal', 'sommaire', 'print', 'sendfriend', 'bookmark', 'fullscreen', 'normalscreen', 'pdf', 'help');\r
+       public static $files = array('index', 'normal', 'sommaire', 'print', 'send', 'bookmark', 'fullscreen', 'normalscreen', 'save','archives', 'help');\r
 \r
-       public function isNew()\r
-       {\r
-               if (is_null($this->_is_new)) {\r
-                       $this->_is_new = !file_exists(ROOT . '/icones/' . $this->icone_id . '/nav-index-off.png');\r
-               }\r
-               return $this->_is_new;\r
-       }\r
 \r
        public function makeImage()\r
        {\r

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index bf0891f77046634b72d0f44f4c762bc6fdcb025f..2a3adb58d59e3a4dec345b1ed475c627572e83ad 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -43,6 +43,8 @@ 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
                /* Book */\r
                $this->fields['bookShadeColor'] = array('type' => 'couleurAlpha', 'default' => '66000000', 'editable' => true,\r
                        'label' => __("Couleur de l'ombre sous le fluidbook"), 'extra' => false, 'grade' => 3);\r
@@ -134,7 +136,7 @@ class wsThemeParametres extends wsParametres {
                $this->forms['bouton'] = array('label' => __('Personnalisation des boutons'),\r
                        'fieldsnames' => array('couleurA', 'arrowsColor'));\r
                $this->forms['icones'] = array('label' => __('Personnalisation des icônes'),\r
-                       'fieldsnames' => array('iconSet','iconsHMargin', 'iconShadeColor', '|', 'colorizeIcons', 'couleurI'));\r
+                       'fieldsnames' => array('iconSet',  'iconShadeColor','|','iconsTMargin','iconsHMargin', '|', 'colorizeIcons', 'couleurI'));\r
                $this->forms['pagesbar'] = array('label' => __('Personnalisation de la barre des pages'),\r
                        'fieldsnames' => array('pagesBar', 'pageBarThumbBack'));\r
                $this->forms['book'] = array('label' => __('Personnalisation du fluidbook'),\r