From: vincent@cubedesigners.com Date: Wed, 23 May 2012 14:06:29 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=4536f14a3954527ed8ab83bd55513cea430fa440;p=cubeextranet.git --- diff --git a/fluidbook/compile/_js/fluidbook.js b/fluidbook/compile/_js/fluidbook.js index abeba64b2..c23ccd7c7 100644 --- a/fluidbook/compile/_js/fluidbook.js +++ b/fluidbook/compile/_js/fluidbook.js @@ -65,11 +65,8 @@ function popupFS(page){ if(page==undefined){ page=0; } - window.open('index.html#/'+page, 'fbpopupfs_'+rand(1000,9999), 'width='+screen.width+',height='+screen.height+',resizable=yes'); -} - -function rand(min,max){ - return Math.round(min+(Math.rand()*(max-min))); + var date=new Date().getTime(); + window.open('index.html#/'+page, 'fbpopupfs_'+date, 'width='+screen.width+',height='+screen.height+',resizable=yes'); } function getCookieVal(offset) @@ -197,6 +194,18 @@ function wheel(event){ event.returnValue = false; } +function ready(){ + document.body.style.backgroundColor='#'+getBackgroundColor(); +} + +function getBackgroundColor(){ + if(_GET['background']!=undefined){ + return _GET['background']; + }else{ + return backgroundColor; + } +} + /** Initialization code. * If you use your own event management code, change it as required. */ diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html index 388ebfbbe..705b181d2 100644 --- a/fluidbook/compile/index.html +++ b/fluidbook/compile/index.html @@ -16,19 +16,20 @@ - - $ga + $ga - +

$alt

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php index 505b1f236..c545ef271 100644 --- a/inc/ws/DAO/class.ws.dao.book.php +++ b/inc/ws/DAO/class.ws.dao.book.php @@ -1014,7 +1014,7 @@ class wsDAOBook extends commonDAO { } } - $externalsOptions = array('ongletsSWF', 'tabs2DSWF'); + $externalsOptions = array('ongletsSWF', 'tabs2DSWF','externalChapters','externalArchives'); foreach ($externalsOptions as $e) { if (isset($book->parametres->$e) && $book->parametres->$e != '') { $f = $workingDir . '/' . $book->parametres->$e;