(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 49621096be114fd468f9e9fa7c22487f9ad3f806..880d75462e8db5fb351751db7976c77ee5228e4c 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -173,7 +173,7 @@ class wsFlash extends cubeFlashGateway {
        {\r
                global $core;\r
                $dao = new wsDAOIcone($core->con);\r
-               $icones = $dao->selectAll();\r
+               $icones = $dao->selectAll('ORDER BY icone_id DESC');\r
                foreach($icones as $icone) {\r
                        $i = $this->xml->addChild('icone');\r
                        $i->addAttribute('id', $icone->icone_id);\r

diff --git a/inc/ws/DAO/class.ws.dao.icone.php b/inc/ws/DAO/class.ws.dao.icone.php
index 8bfe03f88a189078fef4ded9c4a5eb501d70c4b2..e773126fb5da0c5be288717b5e1bca471fd0e299 100644 (file)
--- 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);\r
        }\r
 \r
-       public function selectAll()\r
+       public function selectAll($orderby='')\r
        {\r
-               $r = $this->con->select('SELECT * FROM icones');\r
+               $r = $this->con->select('SELECT * FROM icones '.$orderby);\r
                return $this->factory($r);\r
        }\r
 }\r

diff --git a/inc/ws/Metier/class.ws.icone.php b/inc/ws/Metier/class.ws.icone.php
index c2f9532f9ba2a692b482d48e8252aad81d5a1d86..2fc9e9fbe059ec027d46eb3fcf0b6adb835d048e 100644 (file)
--- 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;\r
                }\r
 \r
-               $h = 0;\r
+               $h = 39;\r
                $w = 0;\r
+               if($this->isNew()){\r
+                       $w=8;\r
+               }\r
                $mod = 0;\r
 \r
                $liste = ($this->isNew())?wsIcone::$files_new:wsIcones::$files;\r
@@ -38,8 +41,13 @@ class wsIcone extends cubeMetier {
                        $mod = max(filemtime($image), $mod);\r
                        $h = max($h, $dim[1]);\r
                        $w += $dim[0];\r
+                       if($this->isNew()){\r
+                               $w+=16;\r
+                       }\r
                }\r
 \r
+               $height = $h;\r
+\r
                $im = imagecreatetruecolor($w, $h);\r
                imagelayereffect($im, IMG_EFFECT_REPLACE);\r
                $color = imagecolorallocatealpha($im, 255, 255, 255, 127);\r
@@ -47,13 +55,20 @@ class wsIcone extends cubeMetier {
                imagesavealpha($im, true);\r
                imagealphablending($im, true);\r
                $x = 0;\r
+               if($this->isNew()){\r
+                       $x=8;\r
+               }\r
                foreach($liste as $file) {\r
                        $image = $this->isNew()?$root . 'nav-' . $file . '.png':$root . 'nav-' . $file . '-off.png';\r
                        $s = imagecreatefrompng($image);\r
                        $w = imagesx($s);\r
                        $h = imagesy($s);\r
-                       imagecopy($im, $s , $x , 0 , 0 , 0 , $w , $h);\r
+                       imagecopy($im, $s , $x , round(($height - $h) / 2) , 0 , 0 , $w , $h);\r
+\r
                        $x += $w;\r
+                       if ($this->isNew()) {\r
+                               $x += 16;\r
+                       }\r
                }\r
 \r
                imagepng($im, $final);\r

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 06984986d04dfbf5b9f55a0e13eadfce2958804c..e80129150797b2b99c9bc86d7eb65b54cf1b61e9 100644 (file)
--- 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);\r
                $this->fields['colorizeIcons'] = array('type' => 'boolean', 'default' => false, 'editable' => true,\r
                        'label' => __('Colorier les icônes'), 'extra' => true, 'grade' => 4);\r
-               $this->fields['couleurI'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
+               $this->fields['couleurI'] = array('type' => 'couleur', 'default' => '$couleurA', 'editable' => true,\r
                        'label' => __("Couleur des icônes"), 'extra' => false, 'grade' => 3);\r
                $this->fields['iconShadColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true,\r
                        'label' => __("Couleur de l'effet de rollover"), 'extra' => false, 'grade' => 3);\r

diff --git a/swf/_src/wsComposer.fla b/swf/_src/wsComposer.fla
index 9843fff86b818c5cda6b35d1bf1acf6729826a37..c811efa8696f122c0913db298e5fc9db00c1de4b 100644 (file)
Binary files a/swf/_src/wsComposer.fla and b/swf/_src/wsComposer.fla differ