]> _ Git - cubeextranet.git/commitdiff
projects / cubeextranet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 83cfd2f)
(no commit message)
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Mon, 9 Jan 2012 17:57:57 +0000 (17:57 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Mon, 9 Jan 2012 17:57:57 +0000 (17:57 +0000)
fluidbook/compile/index.html patch | blob | history
inc/ws/DAO/class.ws.dao.book.php patch | blob | history

diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html
index 8a576baccf5c883a2de2e5c290b40ba24b803b84..09bb42534e00d749cd804694a0c6b48ff4f136ad 100644 (file)
--- a/fluidbook/compile/index.html
+++ b/fluidbook/compile/index.html
@@ -1,33 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="$lang" lang="$lang">\r
-<head>\r
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta http-equiv="Cache-Control" content="max-age=0" />\r
-<meta http-equiv="Cache-Control" content="no-cache" />\r
-<meta http-equiv="Expires" content="0" />\r
-<meta http-equiv="Expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />\r
-<meta http-equiv="Pragma" content="no-cache" />\r
-$favicon\r
-$robots\r
-$facebook\r
-<title>$title</title>\r
-<link href="style.css?junk=$junk" rel="stylesheet" type="text/css" />\r
-<script type="text/javascript" src="fluidbook.js?junk=$junk"></script>\r
-<script type="text/javascript">FB_DEFAULT_LANG='$lang';</script>\r
-$redirectScript\r
-</head>\r
-<body style="background-color:#$bgcolor" onload="this.focus();">\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
-</div>\r
-<script type="text/javascript">\r
-if(isMobile()){\r
-       $redirectMobile\r
-}else{\r
-       swfobject.embedSWF("$pathToIndex?junk=$junk", "fluidbook", "100%", "100%", "10.0.22","", getFlashvars($junk),   {"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#$bgcolor"});\r
-}\r
-</script>\r
-$ga\r
-</body>\r
+       <head>\r
+               <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
+               <meta http-equiv="Cache-Control" content="max-age=0" />\r
+               <meta http-equiv="Cache-Control" content="no-cache" />\r
+               <meta http-equiv="Expires" content="0" />\r
+               <meta http-equiv="Expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />\r
+               <meta http-equiv="Pragma" content="no-cache" />\r
+               <meta http-equiv="X-UA-Compatible" content="IE=9" />\r
+               $favicon\r
+               $robots\r
+               $facebook\r
+               <title>$title</title>\r
+               <link href="style.css?junk=$junk" rel="stylesheet" type="text/css" />\r
+               <script type="text/javascript" src="fluidbook.js?junk=$junk"></script>\r
+               <script type="text/javascript">FB_DEFAULT_LANG='$lang';</script>\r
+               $redirectScript\r
+       </head>\r
+       <body style="background-color:#$bgcolor" onload="this.focus();">\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
+               </div>\r
+               <script type="text/javascript">\r
+                       if(isMobile()){\r
+                               $redirectMobile\r
+                       }else{\r
+                               swfobject.embedSWF("$pathToIndex?junk=$junk", "fluidbook", "100%", "100%", "10.0.22","", getFlashvars($junk),   {"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#$bgcolor"});\r
+                       }\r
+               </script>\r
+               $ga\r
+       </body>\r
 </html>
\ No newline at end of file
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index da97b6cd2e58abb516b90d747865d90163b2bf5e..9d66d59e0f1533a8beac025acee6cc75d3863faf 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -832,7 +832,6 @@ class wsDAOBook extends commonDAO {
                $this->makeTextsIndexes($book, $pages, $index, $textes);\r
                $daoDoc->getLinksAndRulers($book_id, $links, $rulers);\r
 \r
-\r
                $imagesassets = array();\r
                $id = 1;\r
                foreach ($links as $id => $link) {\r
@@ -887,7 +886,7 @@ class wsDAOBook extends commonDAO {
                        $allTraductions[$lang->lang_id] = $lang->traductions;\r
                }\r
 \r
-               $flex->addVariable('traductions', $traductions, false, true, 'JSONObject');\r
+               $flex->addVariable('traductions', $traductions, false, true, 'JSONObject', false);\r
                $flex->addVariable('allTraductions', $allTraductions, false, true, 'JSONObject');\r
                $flex->addVariable('chapters', $book->chapters, false, true, 'JSONObject');\r
                $flex->addVariable('extras', '<extras>' . $book->extras . '</extras>', false, true, 'XML');\r
@@ -897,8 +896,8 @@ class wsDAOBook extends commonDAO {
                $flexLight->addVariable('fwidth', round($size[0], 4), false, true, 'Number');\r
                $flexLight->addVariable('fheight', round($size[1], 4), false, true, 'Number');\r
                $flexLight->addVariable('pagesInDatas', $complete, false, true, 'Boolean');\r
-               $flex->addVariable('index', $index, false, true, 'JSONObject');\r
-               $flex->addVariable('textes', $textes, false, true, 'JSONObject');\r
+               $flex->addVariable('index', $index, false, true, 'JSONObject', false,false);\r
+               $flex->addVariable('textes', $textes, false, true, 'JSONObject', false,false);\r
 \r
                $rasterized = array();\r
                $sizes = array();\r
Unnamed repository; edit this file 'description' to name the repository.