]> _ Git - cubeextranet.git/commitdiff
(no commit message)
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 23 May 2012 14:06:29 +0000 (14:06 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 23 May 2012 14:06:29 +0000 (14:06 +0000)
fluidbook/compile/_js/fluidbook.js
fluidbook/compile/index.html
inc/ws/DAO/class.ws.dao.book.php

index abeba64b2a70c2c463ebd934859642cbd6bbd310..c23ccd7c73989111375ae7605e882c5f79be7e50 100644 (file)
@@ -65,11 +65,8 @@ function popupFS(page){
        if(page==undefined){\r
                page=0;\r
        }\r
-       window.open('index.html#/'+page, 'fbpopupfs_'+rand(1000,9999), 'width='+screen.width+',height='+screen.height+',resizable=yes');\r
-}\r
-\r
-function rand(min,max){\r
-       return Math.round(min+(Math.rand()*(max-min)));\r
+       var date=new Date().getTime();\r
+       window.open('index.html#/'+page, 'fbpopupfs_'+date, 'width='+screen.width+',height='+screen.height+',resizable=yes');\r
 }\r
 \r
 function getCookieVal(offset)\r
@@ -197,6 +194,18 @@ function wheel(event){
        event.returnValue = false;\r
 }\r
 \r
+function ready(){\r
+       document.body.style.backgroundColor='#'+getBackgroundColor();\r
+}\r
+\r
+function getBackgroundColor(){\r
+       if(_GET['background']!=undefined){\r
+               return _GET['background'];\r
+       }else{\r
+               return backgroundColor;\r
+       }\r
+}\r
+\r
 /** Initialization code.\r
  * If you use your own event management code, change it as required.\r
  */\r
index 388ebfbbe6b1a55c5a51780073634b6a8b2c0938..705b181d2bced2b126bb6f709e5d4af39e397f95 100644 (file)
                <link href="style.css?junk=$junk" rel="stylesheet" type="text/css">\r
                <style type="text/css" media="print">*{ visibility: hidden; display: none }</style>\r
                <script type="text/javascript" src="fluidbook.js?junk=$junk"></script>\r
-               <script type="text/javascript">FB_DEFAULT_LANG='$lang';</script>\r
-               $ga\r
                <script type="text/javascript">\r
+                       FB_DEFAULT_LANG='$lang';\r
+                       var backgroundColor="$bgcolor";\r
                        if(isMobile()){\r
                                $redirectMobile\r
                        }else if(isBadMobile()){\r
                                $redirectPDF\r
                        }else{\r
-                               swfobject.embedSWF("$pathToIndex?junk=$junk", "fluidbook", "100%", "100%", "$flashversion","",getFlashvars($junk,$fv),{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#$bgcolor"});\r
+                               swfobject.embedSWF("$pathToIndex?junk=$junk", "fluidbook", "100%", "100%", "$flashversion","",getFlashvars($junk,$fv),{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#"+getBackgroundColor()});\r
                        }\r
                </script>\r
+               $ga\r
        </head>\r
-       <body style="background-color:#$bgcolor" onload="this.focus();">\r
+       <body onload="ready();">\r
                <div id="fluidbook">\r
                        <div style="padding:20px;text-align:center;"><a href="http://get.adobe.com/flashplayer/" target="_blank"><img style="border:0;" src="$pathToGetflash" alt="" width="734" height="409" /></a></div>\r
                        <div style="padding:20px;">$alt</div>\r
index 505b1f236753260524567719de8a8819da5a0eb1..c545ef2716bd8eab548ffbf4e62e91a262eaf740 100644 (file)
@@ -1014,7 +1014,7 @@ class wsDAOBook extends commonDAO {
                        }\r
                }\r
 \r
-               $externalsOptions = array('ongletsSWF', 'tabs2DSWF');\r
+               $externalsOptions = array('ongletsSWF', 'tabs2DSWF','externalChapters','externalArchives');\r
                foreach ($externalsOptions as $e) {\r
                        if (isset($book->parametres->$e) && $book->parametres->$e != '') {\r
                                $f = $workingDir . '/' . $book->parametres->$e;\r