(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 60e0eb692003d3be0a28b533b96e171a1f2195bb..561bdde60b5c5bd9250fe68f261990169c7d93f9 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -137,12 +137,16 @@ class wsFlash extends cubeFlashGateway {
                foreach($theme->parametres as $k => $v) {\r
                        $t->addChild($k, $v);\r
                }\r
+               $files = $t->addChild('files');\r
                foreach(wsTheme::$files as $k => $v) {\r
-                       $f = ROOT.THEMES . $theme->theme_id . '/' . $v;\r
-                       if (file_exists($f)) {\r
-                               $t->addChild($k, $f);\r
-                       }else{\r
-                               fb($f);\r
+                       $f = THEMES . $theme->theme_id . '/' . $v;\r
+                       $files->addChild($k, $f);\r
+               }\r
+               $oo = array('on', 'off');\r
+               foreach(wsIcones::$files as $v) {\r
+                       foreach($oo as $o) {\r
+                               $f = ICONS . $theme->icones . '/nav-' . $v . '-' . $o . '.png';\r
+                               $files->addChild($v . '_' . $o, $f);\r
                        }\r
                }\r
        }\r

diff --git a/inc/ws/Metier/_common.php b/inc/ws/Metier/_common.php
index 9d097e2b6e07a04954064442191a7e7d05a8e1c5..3a9ee437f4ceae755c85232498a39e15d2c79060 100644 (file)
--- a/inc/ws/Metier/_common.php
+++ b/inc/ws/Metier/_common.php
@@ -9,5 +9,6 @@ $__autoload['wsDocument'] = dirname(__FILE__) . '/class.ws.document.php';
 $__autoload['wsLink'] = dirname(__FILE__) . '/class.ws.link.php';\r
 $__autoload['wsDocumentLocalInfos'] = dirname(__FILE__) . '/class.ws.document.localinfos.php';\r
 $__autoload['wsBox'] = dirname(__FILE__) . '/class.ws.box.php';\r
+$__autoload['wsIcones'] = dirname(__FILE__) . '/class.ws.icones.php';\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/Metier/class.ws.icones.php b/inc/ws/Metier/class.ws.icones.php
new file mode 100644 (file)
index 0000000..4bcda8e
--- /dev/null
+++ b/inc/ws/Metier/class.ws.icones.php
@@ -0,0 +1,6 @@
+<?php\r
+class wsIcones extends cubeMetier {\r
+       public static $files = array('index', 'normal', 'sommaire', 'zoomin', 'zoomout', 'print', 'send', 'bookmark', 'pdf', 'help', 'search');\r
+}\r
+\r
+?>
\ No newline at end of file

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 843ef67ea3b1b7fb402be2d975bfa52383f6b927..e5cca3fe7babde8fc637679a6b42548afba776bf 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -13,6 +13,7 @@ class wsThemeParametres extends wsParametres {
                $this->fields['couleurS'] = array('type' => 'couleur', 'default' => '', 'editable' => true, 'label' => __("Couleur du texte du moteur de recherche"), 'extra' => false, 'grade' => 3);\r
                $this->fields['couleurL'] = array('type' => 'couleur', 'default' => '', 'editable' => true, 'label' => __("Couleur du fond du loader"), 'extra' => false, 'grade' => 3);\r
                $this->fields['couleurI'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, 'label' => __("Couleur des icônes"), 'extra' => false, 'grade' => 3);\r
+               $this->fields['backgroundColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, 'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3);\r
                $this->fields['repeat'] = array('type' => 'combo',\r
                        'datas' => array(__('Etirer') => 0, __('Etirer le fond') => '2', __("Répéter") => '1', __('Ne pas répéter ni étirer') => '3'),\r
                        'default' => '0', 'editable' => true, 'label' => __('Affichage du fond'), 'grade' => 3);\r

diff --git a/inc/ws/Metier/class.ws.theme.php b/inc/ws/Metier/class.ws.theme.php
index 7e80b29d5ae8e28b70d8785dbd18fb71d9b2e39e..8f645b73bcda8732dd377b29ef9c430aa6f92af7 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.php
+++ b/inc/ws/Metier/class.ws.theme.php
@@ -5,7 +5,7 @@ class wsTheme extends cubeMetier {
        const RATIO = 2;\r
        const REPEAT = 1;\r
 \r
-       public static $files = array('background' => 'backgroundImg.jpg', 'menu' => 'menu_back.png', 'logo' => 'menu_clientLogo.png');\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
        protected $icones;\r