From 9aaa6d3697b441e743b915a814003bc7d326c006 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 9 Mar 2010 12:25:16 +0000
Subject: [PATCH]

---
 inc/ws/Controlleur/class.ws.flash.php       | 14 +++++++++-----
 inc/ws/Metier/_common.php                   |  1 +
 inc/ws/Metier/class.ws.icones.php           |  6 ++++++
 inc/ws/Metier/class.ws.theme.parametres.php |  1 +
 inc/ws/Metier/class.ws.theme.php            |  2 +-
 5 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 inc/ws/Metier/class.ws.icones.php

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 60e0eb692..561bdde60 100644
--- 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) {
 			$t->addChild($k, $v);
 		}
+		$files = $t->addChild('files');
 		foreach(wsTheme::$files as $k => $v) {
-			$f = ROOT.THEMES . $theme->theme_id . '/' . $v;
-			if (file_exists($f)) {
-				$t->addChild($k, $f);
-			}else{
-				fb($f);
+			$f = THEMES . $theme->theme_id . '/' . $v;
+			$files->addChild($k, $f);
+		}
+		$oo = array('on', 'off');
+		foreach(wsIcones::$files as $v) {
+			foreach($oo as $o) {
+				$f = ICONS . $theme->icones . '/nav-' . $v . '-' . $o . '.png';
+				$files->addChild($v . '_' . $o, $f);
 			}
 		}
 	}
diff --git a/inc/ws/Metier/_common.php b/inc/ws/Metier/_common.php
index 9d097e2b6..3a9ee437f 100644
--- 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';
 $__autoload['wsDocumentLocalInfos'] = dirname(__FILE__) . '/class.ws.document.localinfos.php';
 $__autoload['wsBox'] = dirname(__FILE__) . '/class.ws.box.php';
+$__autoload['wsIcones'] = dirname(__FILE__) . '/class.ws.icones.php';
 
 ?>
\ 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
index 000000000..4bcda8efa
--- /dev/null
+++ b/inc/ws/Metier/class.ws.icones.php
@@ -0,0 +1,6 @@
+<?php
+class wsIcones extends cubeMetier {
+	public static $files = array('index', 'normal', 'sommaire', 'zoomin', 'zoomout', 'print', 'send', 'bookmark', 'pdf', 'help', 'search');
+}
+
+?>
\ 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 843ef67ea..e5cca3fe7 100644
--- 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);
 		$this->fields['couleurL'] = array('type' => 'couleur', 'default' => '', 'editable' => true, 'label' => __("Couleur du fond du loader"), 'extra' => false, 'grade' => 3);
 		$this->fields['couleurI'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, 'label' => __("Couleur des icônes"), 'extra' => false, 'grade' => 3);
+		$this->fields['backgroundColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, 'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3);
 		$this->fields['repeat'] = array('type' => 'combo',
 			'datas' => array(__('Etirer') => 0, __('Etirer le fond') => '2', __("Répéter") => '1', __('Ne pas répéter ni étirer') => '3'),
 			'default' => '0', 'editable' => true, 'label' => __('Affichage du fond'), 'grade' => 3);
diff --git a/inc/ws/Metier/class.ws.theme.php b/inc/ws/Metier/class.ws.theme.php
index 7e80b29d5..8f645b73b 100644
--- 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;
 	const REPEAT = 1;
 
-	public static $files = array('background' => 'backgroundImg.jpg', 'menu' => 'menu_back.png', 'logo' => 'menu_clientLogo.png');
+	public static $files = array('background' => 'backgroundImg.jpg', 'menu' => 'menu_back.png', 'logo' => 'menu_clientLogo.png','logoLoader'=>'logoLoader.png');
 
 	protected $theme_id;
 	protected $icones;
-- 
2.39.5