(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index af4f95792904163417187364ec1ad8a21be49558..c4e574d881629ffe5660d9c41e6f64c8c3b251de 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -432,15 +432,22 @@ class wsFlash extends cubeFlashGateway {
 \r
                $daoTheme = new wsDAOTheme($this->con);\r
                $theme = $daoTheme->getThemeOfBook($this->args['book_id'], true);\r
-\r
+               $themeRoot = WS_THEMES . '/' . $theme->theme_id . '/';\r
                if ($theme->parametres->backgroundImage != '' && in_array($theme->parametres->repeat, array(2, 3))) {\r
-                       $themeRoot = WS_THEMES . '/' . $theme->theme_id . '/' . $theme->parametres->backgroundImage;\r
-                       $dim = getimagesize($themeRoot);\r
+                       $dim = getimagesize($themeRoot . $theme->parametres->backgroundImage);\r
                        $b = $this->xml->addChild('background');\r
                        $b->addChild('width', $dim[0]);\r
                        $b->addChild('height', $dim[1]);\r
                        $b->addChild('url', 'http://' . $_SERVER['HTTP_HOST'] . WEBROOT . '/fluidbook/themes/' . $theme->theme_id . '/' . $theme->parametres->backgroundImage);\r
                }\r
+\r
+               if ($theme->parametres->topBar != '') {\r
+                       $dim = getimagesize($themeRoot . $theme->parametres->topBar);\r
+                       $b = $this->xml->addChild('topbar');\r
+                       $b->addChild('width', $dim[0]);\r
+                       $b->addChild('height', $dim[1]);\r
+                       $b->addChild('url', 'http://' . $_SERVER['HTTP_HOST'] . WEBROOT . '/fluidbook/themes/' . $theme->theme_id . '/' . $theme->parametres->topBar);\r
+               }\r
        }\r
 \r
        public function saveLinks() {\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 0900f80aef1f00c9caad2c7b4ffcc7b4c1881883..ceab97366fd6535431acbbd0b6705edee047a5a5 100644 (file)
--- 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 != '') {\r
                        $flexLight->addBitmap($themeRoot . $theme->parametres->logoLoader, 'logoLoader');\r
                }\r
+               if($theme->parametres->topBar!=''){\r
+                       $flexLight->addBitmap($themeRoot . $theme->parametres->topBar, 'topBar');\r
+                       \r
+               }\r
                if ($theme->parametres->logo != '') {\r
                        $flex->addBitmap($themeRoot . $theme->parametres->logo, 'logo');\r
                }\r

diff --git a/swf/_src/composerLibrary.swc b/swf/_src/composerLibrary.swc
index 7a0cc720e55aee3b9935b5ccc7b2bf24a250aa4f..60608aef010066e159e2ad2c4a298a4c47865eb4 100644 (file)
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 b946139f0edc4245d1b3e0d8acbe43b85de2705c..16ff721aff32edc325dbb0953cfc35ac0510800f 100644 (file)
Binary files a/swf/_src/wsComposerLibrary.fla and b/swf/_src/wsComposerLibrary.fla differ