From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 27 Aug 2010 13:20:13 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=18671c55d294810ec4b4feafd8c43b62f43901cb;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 58ae8b6f0..6d65acfea 100644
--- 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');
 			$i->addAttribute('id', $icone->icone_id);
 			$i->addAttribute('nom', $icone->nom);
-			$i->addAttribute('newSet', $icone->isNew());
 			$i->addAttribute('path', ICONS . $icone->icone_id . '.png');
 		}
 	}
diff --git a/inc/ws/Metier/class.ws.icone.php b/inc/ws/Metier/class.ws.icone.php
index 2fc9e9fbe..84b83199b 100644
--- a/inc/ws/Metier/class.ws.icone.php
+++ b/inc/ws/Metier/class.ws.icone.php
@@ -6,16 +6,8 @@ class wsIcone extends cubeMetier {
 
 	protected $_is_new = null;
 
-	public static $files = array('index', 'normal', 'sommaire', 'zoomin', 'zoomout', 'print', 'send', 'bookmark', 'pdf', 'help');
-	public static $files_new = array('index', 'normal', 'sommaire', 'print', 'sendfriend', 'bookmark', 'fullscreen', 'normalscreen', 'pdf', 'help');
+	public static $files = array('index', 'normal', 'sommaire', 'print', 'send', 'bookmark', 'fullscreen', 'normalscreen', 'save','archives', 'help');
 
-	public function isNew()
-	{
-		if (is_null($this->_is_new)) {
-			$this->_is_new = !file_exists(ROOT . '/icones/' . $this->icone_id . '/nav-index-off.png');
-		}
-		return $this->_is_new;
-	}
 
 	public function makeImage()
 	{
diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index bf0891f77..2a3adb58d 100644
--- 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);
 		$this->fields['iconsHMargin'] = array('type' => 'integer', 'default' => 15, 'editable' => true,
 			'label' => __('Espace entre les icônes'), 'min' => 0, 'max' => 50);
+		$this->fields['iconsTMargin'] = array('type' => 'integer', 'default' => 7, 'editable' => true,
+			'label' => __('Marge supérieur des icônes'), 'min' => 0, 'max' => 20);
 		/* Book */
 		$this->fields['bookShadeColor'] = array('type' => 'couleurAlpha', 'default' => '66000000', 'editable' => true,
 			'label' => __("Couleur de l'ombre sous le fluidbook"), 'extra' => false, 'grade' => 3);
@@ -134,7 +136,7 @@ class wsThemeParametres extends wsParametres {
 		$this->forms['bouton'] = array('label' => __('Personnalisation des boutons'),
 			'fieldsnames' => array('couleurA', 'arrowsColor'));
 		$this->forms['icones'] = array('label' => __('Personnalisation des icônes'),
-			'fieldsnames' => array('iconSet','iconsHMargin', 'iconShadeColor', '|', 'colorizeIcons', 'couleurI'));
+			'fieldsnames' => array('iconSet',  'iconShadeColor','|','iconsTMargin','iconsHMargin', '|', 'colorizeIcons', 'couleurI'));
 		$this->forms['pagesbar'] = array('label' => __('Personnalisation de la barre des pages'),
 			'fieldsnames' => array('pagesBar', 'pageBarThumbBack'));
 		$this->forms['book'] = array('label' => __('Personnalisation du fluidbook'),