From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 11 May 2011 18:03:29 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=92992fa61d9d2a3c0ebc62544abbda745719b11d;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index af4f95792..c4e574d88 100644
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -432,15 +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))) {
-			$themeRoot = WS_THEMES . '/' . $theme->theme_id . '/' . $theme->parametres->backgroundImage;
-			$dim = getimagesize($themeRoot);
+			$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);
 		}
+
+		if ($theme->parametres->topBar != '') {
+			$dim = getimagesize($themeRoot . $theme->parametres->topBar);
+			$b = $this->xml->addChild('topbar');
+			$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);
+		}
 	}
 
 	public function saveLinks() {
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 0900f80ae..ceab97366 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -686,6 +686,10 @@ class wsDAOBook extends commonDAO {
 		if ($theme->parametres->logoLoader != '') {
 			$flexLight->addBitmap($themeRoot . $theme->parametres->logoLoader, 'logoLoader');
 		}
+		if($theme->parametres->topBar!=''){
+			$flexLight->addBitmap($themeRoot . $theme->parametres->topBar, 'topBar');
+			
+		}
 		if ($theme->parametres->logo != '') {
 			$flex->addBitmap($themeRoot . $theme->parametres->logo, 'logo');
 		}
diff --git a/swf/_src/composerLibrary.swc b/swf/_src/composerLibrary.swc
index 7a0cc720e..60608aef0 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 b946139f0..16ff721af 100644
Binary files a/swf/_src/wsComposerLibrary.fla and b/swf/_src/wsComposerLibrary.fla differ