(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index e4650a5a740e15098af47d9c01d8be491d08229e..fb28ae4f348a4f7bf2bd8d009a839d9cad7322a4 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -137,6 +137,12 @@ class wsFlash extends cubeFlashGateway {
                $this->_themeToXML($theme);\r
        }\r
 \r
+       public function saveTheme(){\r
+               global $core;\r
+               $dao=new wsDAOTheme($core->con);\r
+               $dao->sauve($this->args);\r
+       }\r
+\r
        public function getAllThemes()\r
        {\r
                global $core;\r

diff --git a/inc/ws/DAO/class.ws.dao.theme.php b/inc/ws/DAO/class.ws.dao.theme.php
index ff2e0dbbafe6c7d7577518eb206dcc73c18121bd..82a30d1ff45730038a1cd2e7a542c6a5407b4dbc 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.theme.php
+++ b/inc/ws/DAO/class.ws.dao.theme.php
@@ -48,6 +48,24 @@ class wsDAOTheme extends extranetDAO {
                return $this->factory($r);\r
        }\r
 \r
+       public function sauve($data)\r
+       {\r
+               $parent=$this->selectById($data['theme_id']);\r
+               $c = $this->con->openCursor('themes');\r
+               $c->date = TIME;\r
+               $p = new wsThemeParametres($parent);\r
+               foreach($data as $k => $v) {\r
+                       try {\r
+                               $p->$k = $v;\r
+                       }\r
+                       catch(Exception $e) {\r
+                       }\r
+               }\r
+               $c->parametres = serialize($p);\r
+               $c->update('WHERE theme_id=\'' . $this->con->escape($data['theme_id']) . '\'');\r
+               unlink(ROOT . '/themes/' . $this->args['theme_id'] . '.jpg');\r
+       }\r
+\r
        protected function getNextId()\r
        {\r
                $r = $this->con->select('SELECT MAX(theme_id) AS theme_id FROM themes');\r

diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
index 30efeb20c1b24b35f647f127d7745350aae0eaac..144cb5642253f73322f1b8e578c8355e26486930 100644 (file)
--- a/inc/ws/Metier/class.ws.parametres.php
+++ b/inc/ws/Metier/class.ws.parametres.php
@@ -102,7 +102,11 @@ class wsParametres extends cubeMetier implements Iterator {
                                break;\r
                        case 'color':\r
                        case 'couleur':\r
-                               $value = substr(trim($value, '#'), 0, 6);\r
+                               $value = trim($value, '#');\r
+                               if (strlen($value) != 6) {\r
+                                       $value = dechex($value);\r
+                               }\r
+                               $value = cubeMath::fill($value, 6);\r
                                break;\r
                        case 'date':\r
                                $value = intval($value);\r
@@ -129,7 +133,7 @@ class wsParametres extends cubeMetier implements Iterator {
                }\r
                if (!isset($this->datas[$varname]) || is_null($this->datas[$varname])) {\r
                        if (substr($this->fields[$varname]['default'], 0, 1) == '$') {\r
-                               return $this->get(substr($this->fields[$varname]['default'],1));\r
+                               return $this->get(substr($this->fields[$varname]['default'], 1));\r
                        } else {\r
                                return $this->fields[$varname]['default'];\r
                        }\r

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 533f143bedb0cfbcb7489369b018c6f7eecf92bf..9460692737cab4ba44f702d8a85776ebac8906da 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -60,6 +60,16 @@ class wsThemeParametres extends wsParametres {
                                __("Répéter") => wsTheme::REPEAT,\r
                                __('Ne pas répéter ni étirer') => wsTheme::NONE),\r
                        'default' => 0, 'editable' => true, 'label' => __('Affichage du fond'), 'grade' => 3);\r
+               $this->fields['backgroundHAlign'] = array('type' => 'combo',\r
+                       'datas' => array(__('Centré') => wsTheme::CENTER,\r
+                               __('Gauche') => wsTheme::LEFT,\r
+                               __("Droite") => wsTheme::RIGHT),\r
+                       'default' => wsTheme::CENTER, 'editable' => true, 'label' => __('Alignement Horizontal'), 'grade' => 3);\r
+               $this->fields['backgroundVAlign'] = array('type' => 'combo',\r
+                       'datas' => array(__('Milieu') => wsTheme::MIDDLE,\r
+                               __('Haut') => wsTheme::TOP,\r
+                               __("Bas") => wsTheme::BOTTOM),\r
+                       'default' => wsTheme::MIDDLE, 'editable' => true, 'label' => __('Alignement Vertical'), 'grade' => 3);\r
                $this->fields['menuColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3);\r
                $this->fields['shadeOnMenu'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
@@ -103,7 +113,8 @@ class wsThemeParametres extends wsParametres {
                /* Regroupement des champs par formulaire */\r
 \r
                $this->forms['background'] = array('label' => __('Personnalisation du fond'),\r
-                       'fieldsnames' => array('backgroundColor', '|', 'useBackgroundImage', 'backgroundImage', 'repeat'));\r
+                       'fieldsnames' => array('backgroundColor', '|', 'useBackgroundImage', 'backgroundImage', '|',\r
+                               'repeat', 'backgroundHAlign', 'backgroundVAlign'));\r
                $this->forms['bouton'] = array('label' => __('Personnalisation des boutons'),\r
                        'fieldsnames' => array('couleurA', 'arrowsColor'));\r
                $this->forms['icones'] = array('label' => __('Personnalisation des icônes'),\r

diff --git a/inc/ws/Metier/class.ws.theme.php b/inc/ws/Metier/class.ws.theme.php
index 55f95a08880377c899117acc7acd7e7d49cd066f..4f04dbbc7e27d3edca2e1b96643f3ac5aaebf673 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.php
+++ b/inc/ws/Metier/class.ws.theme.php
@@ -5,6 +5,14 @@ class wsTheme extends cubeMetier {
        const RATIO = 2;\r
        const REPEAT = 1;\r
 \r
+       const CENTER = 4;\r
+       const LEFT = 5;\r
+       const RIGHT = 6;\r
+\r
+       const MIDDLE = 7;\r
+       const TOP = 8;\r
+       const BOTTOM = 9;\r
+\r
        public static $files = array('background' => 'backgroundImg.jpg', 'menu' => 'menu_back.png', 'logo' => 'menu_clientLogo.png', 'logoLoader' => 'logoLoader.png');\r
 \r
        protected $theme_id;\r