From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 26 Apr 2010 09:50:37 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=6cd5ea985c0f2f5b3491f2f83c28687d45b99986;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 49621096b..880d75462 100644
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -173,7 +173,7 @@ class wsFlash extends cubeFlashGateway {
 	{
 		global $core;
 		$dao = new wsDAOIcone($core->con);
-		$icones = $dao->selectAll();
+		$icones = $dao->selectAll('ORDER BY icone_id DESC');
 		foreach($icones as $icone) {
 			$i = $this->xml->addChild('icone');
 			$i->addAttribute('id', $icone->icone_id);
diff --git a/inc/ws/DAO/class.ws.dao.icone.php b/inc/ws/DAO/class.ws.dao.icone.php
index 8bfe03f88..e773126fb 100644
--- a/inc/ws/DAO/class.ws.dao.icone.php
+++ b/inc/ws/DAO/class.ws.dao.icone.php
@@ -16,9 +16,9 @@ class wsDAOIcone extends cubeDAO {
 		return $this->singleton($r);
 	}
 
-	public function selectAll()
+	public function selectAll($orderby='')
 	{
-		$r = $this->con->select('SELECT * FROM icones');
+		$r = $this->con->select('SELECT * FROM icones '.$orderby);
 		return $this->factory($r);
 	}
 }
diff --git a/inc/ws/Metier/class.ws.icone.php b/inc/ws/Metier/class.ws.icone.php
index c2f9532f9..2fc9e9fbe 100644
--- a/inc/ws/Metier/class.ws.icone.php
+++ b/inc/ws/Metier/class.ws.icone.php
@@ -26,8 +26,11 @@ class wsIcone extends cubeMetier {
 			return;
 		}
 
-		$h = 0;
+		$h = 39;
 		$w = 0;
+		if($this->isNew()){
+			$w=8;
+		}
 		$mod = 0;
 
 		$liste = ($this->isNew())?wsIcone::$files_new:wsIcones::$files;
@@ -38,8 +41,13 @@ class wsIcone extends cubeMetier {
 			$mod = max(filemtime($image), $mod);
 			$h = max($h, $dim[1]);
 			$w += $dim[0];
+			if($this->isNew()){
+				$w+=16;
+			}
 		}
 
+		$height = $h;
+
 		$im = imagecreatetruecolor($w, $h);
 		imagelayereffect($im, IMG_EFFECT_REPLACE);
 		$color = imagecolorallocatealpha($im, 255, 255, 255, 127);
@@ -47,13 +55,20 @@ class wsIcone extends cubeMetier {
 		imagesavealpha($im, true);
 		imagealphablending($im, true);
 		$x = 0;
+		if($this->isNew()){
+			$x=8;
+		}
 		foreach($liste as $file) {
 			$image = $this->isNew()?$root . 'nav-' . $file . '.png':$root . 'nav-' . $file . '-off.png';
 			$s = imagecreatefrompng($image);
 			$w = imagesx($s);
 			$h = imagesy($s);
-			imagecopy($im, $s , $x , 0 , 0 , 0 , $w , $h);
+			imagecopy($im, $s , $x , round(($height - $h) / 2) , 0 , 0 , $w , $h);
+
 			$x += $w;
+			if ($this->isNew()) {
+				$x += 16;
+			}
 		}
 
 		imagepng($im, $final);
diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 06984986d..e80129150 100644
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -40,7 +40,7 @@ class wsThemeParametres extends wsParametres {
 			'label' => __("Jeu d'icônes"), 'extra' => false, 'grade' => 3);
 		$this->fields['colorizeIcons'] = array('type' => 'boolean', 'default' => false, 'editable' => true,
 			'label' => __('Colorier les icônes'), 'extra' => true, 'grade' => 4);
-		$this->fields['couleurI'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,
+		$this->fields['couleurI'] = array('type' => 'couleur', 'default' => '$couleurA', 'editable' => true,
 			'label' => __("Couleur des icônes"), 'extra' => false, 'grade' => 3);
 		$this->fields['iconShadColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true,
 			'label' => __("Couleur de l'effet de rollover"), 'extra' => false, 'grade' => 3);
diff --git a/swf/_src/wsComposer.fla b/swf/_src/wsComposer.fla
index 9843fff86..c811efa86 100644
Binary files a/swf/_src/wsComposer.fla and b/swf/_src/wsComposer.fla differ