(no commit message)

diff --git a/.htaccess b/.htaccess
index f54024048c9734d6172da49dfd80c3f4ca8178ab..06c506ed78b3f06283de9bb24526538161b9a5bd 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -33,14 +33,17 @@ AddCharset UTF-8 log
        RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.html$ viewer/$1_$2_$3/index [L]\r
        RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.swf$ fluidbook/compile/index.swf [L]\r
        RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/player.swf$ fluidbook/compile/player.swf [L]\r
+       RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/fluidbook.js$ fluidbook/compile/fluidbook.js [L]\r
        RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/final/$1/$4 [L]\r
 \r
        RewriteRule ^vieweru/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.html$ vieweru/$1_$2_$3/index [L]\r
        RewriteRule ^vieweru/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.swf$ fluidbook/compile/_unprotected/index.swf [L]\r
        RewriteRule ^vieweru/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/player.swf$ fluidbook/compile/_unprotected/player.swf [L]\r
+       RewriteRule ^vieweru/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/fluidbook.js$ fluidbook/compile/fluidbook.js [L]\r
        RewriteRule ^vieweru/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/final/$1/$4 [L]\r
 \r
        RewriteRule ^viewerp/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.html$ viewerp/$1_$2_$3/index [L]\r
        RewriteRule ^viewerp/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.swf$ fluidbook/compile/_standalone/player.swf [L]\r
+       RewriteRule ^viewerp/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/fluidbook.js$ fluidbook/compile/fluidbook.js [L]\r
        RewriteRule ^viewerp/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/final/$1/$4 [L]\r
 </IfModule>
\ No newline at end of file

diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html
index a90526aa13fcafc09a870c899ac17ae1f0e13044..f887b5991ba68366046519591bc3b9ba68273bf7 100644 (file)
--- a/fluidbook/compile/index.html
+++ b/fluidbook/compile/index.html
@@ -14,7 +14,7 @@ $redirectScript
 <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
 </div>\r
-<script type="text/javascript">swfobject.embedSWF("$pathToIndex", "fluidbook", "100%", "100%", "10.0.0","", parseGet(),        {"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":"gpu","allowFullScreen":"true"},{"bgcolor":"#$bgcolor"});\r
+<script type="text/javascript">swfobject.embedSWF("$pathToIndex", "fluidbook", "100%", "100%", "10.0.0","", parseGet(),        {"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#$bgcolor"});\r
 </script>\r
 $ga\r
 </body>\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 6d1b984a772071559c9f644c42660a1a8070f1c9..4c5f6d734fcc7ca313abc5431eab703118df4221 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -476,7 +476,7 @@ html{height:100%}' . "\n";
                $res .= '{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#000000"}';\r
                $res .= ');';\r
                $res .= '</script>';\r
-               $js = array($webcompile . 'fluidbook.js');\r
+               $js = array('fluidbook.js');\r
                $jsvar = array();\r
 \r
                $gacodes = array(GA);\r