From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 12 May 2011 14:40:23 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=a3ca8e6b5e6b3d5501dd21f5ccaf172b34ba630a;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index c4e574d88..665a2399e 100644
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -432,21 +432,22 @@ class wsFlash extends cubeFlashGateway {
 
 		$daoTheme = new wsDAOTheme($this->con);
 		$theme = $daoTheme->getThemeOfBook($this->args['book_id'], true);
-		$themeRoot = WS_THEMES . '/' . $theme->theme_id . '/';
-		if ($theme->parametres->backgroundImage != '' && in_array($theme->parametres->repeat, array(2, 3))) {
-			$dim = getimagesize($themeRoot . $theme->parametres->backgroundImage);
-			$b = $this->xml->addChild('background');
-			$b->addChild('width', $dim[0]);
-			$b->addChild('height', $dim[1]);
-			$b->addChild('url', 'http://' . $_SERVER['HTTP_HOST'] . WEBROOT . '/fluidbook/themes/' . $theme->theme_id . '/' . $theme->parametres->backgroundImage);
+
+		$specials = array('backgroundImage' => 'background', 'topBar' => 'topbar', 'afterSearch' => 'aftersearch');
+
+		foreach ($specials as $tparam => $sname) {
+			$this->_addSpecialInfos($theme, $tparam, $sname);
 		}
+	}
 
-		if ($theme->parametres->topBar != '') {
-			$dim = getimagesize($themeRoot . $theme->parametres->topBar);
-			$b = $this->xml->addChild('topbar');
+	protected function _addSpecialInfos($theme, $param, $specialName) {
+		if ($theme->parametres->$param != '') {
+			$themeRoot = WS_THEMES . '/' . $theme->theme_id . '/';
+			$dim = getimagesize($themeRoot . $theme->parametres->$param);
+			$b = $this->xml->addChild($specialName);
 			$b->addChild('width', $dim[0]);
 			$b->addChild('height', $dim[1]);
-			$b->addChild('url', 'http://' . $_SERVER['HTTP_HOST'] . WEBROOT . '/fluidbook/themes/' . $theme->theme_id . '/' . $theme->parametres->topBar);
+			$b->addChild('url', 'http://' . $_SERVER['HTTP_HOST'] . WEBROOT . '/fluidbook/themes/' . $theme->theme_id . '/' . $theme->parametres->$param);
 		}
 	}
 
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 31d2506fa..14b2c84b5 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -692,6 +692,11 @@ class wsDAOBook extends commonDAO {
 		if ($theme->parametres->logo != '') {
 			$flex->addBitmap($themeRoot . $theme->parametres->logo, 'logo');
 		}
+
+		if ($theme->parametres->afterSearch != '') {
+			$flex->addBitmap($themeRoot . $theme->parametres->afterSearch, 'aftersearch');
+		}
+
 		// Icons assets
 		$iconsRoot = WS_ICONS . '/' . $theme->parametres->iconSet . '/';
 		foreach (wsIcone::$files as $file) {
diff --git a/swf/_src/composerLibrary.swc b/swf/_src/composerLibrary.swc
index 60608aef0..c765aae5f 100644
Binary files a/swf/_src/composerLibrary.swc and b/swf/_src/composerLibrary.swc differ
diff --git a/swf/_src/wsComposerLibrary.fla b/swf/_src/wsComposerLibrary.fla
index 16ff721af..b96667d95 100644
Binary files a/swf/_src/wsComposerLibrary.fla and b/swf/_src/wsComposerLibrary.fla differ