(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index a048a334caae611e928b5687d2a04c08cc2b0a57..dd1bd3ea36c18d9aa1596272ded0d1b85a48050d 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -253,7 +253,7 @@ class wsUrl {
                                if (!isset($infos['pattern'])) {\r
                                        $infos['pattern'] = '$1_$2';\r
                                }\r
-                               $res .= '<li><a class="popupFSBar" rel="toolbar=yes" rev="' . $infos['version'] . '_$1" href="' . SITE_PATH . $infos['version'] . '/' . $infos['pattern'] . '/' . $infos['file'] . '">' . $infos['icon'] . $infos['title'] . '</a></li>';\r
+                               $res .= '<li><a class="popupFSBar" rel="toolbar=1,scrollbars=1" rev="' . $infos['version'] . '_$1" href="' . SITE_PATH . $infos['version'] . '/' . $infos['pattern'] . '/' . $infos['file'] . '">' . $infos['icon'] . $infos['title'] . '</a></li>';\r
                        }\r
                }\r
                $res .= '</ul></div>';\r
@@ -1024,7 +1024,7 @@ html{height:100%}' . "\n";
 \r
                header('Content-type: text/plain');\r
                ob_end_clean();\r
-               echo $dao->compile($args[1], 3, isset($args[2]));\r
+               echo $dao->compile($args[1], 3, false,true);\r
                exit;\r
        }\r
 \r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 99681573b767c287da2dfe348def685102a11b05..c74f8155a1395a530ca0b025ff5339b770d9111a 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -789,7 +789,7 @@ class wsDAOBook extends commonDAO {
                $pages = $this->getPagesOfBook($book_id);\r
        }\r
 \r
-       public function compile($book_id, $version = 'all', $complete = false) {\r
+       public function compile($book_id, $version = 'all', $complete = false, $force = false) {\r
                if (is_null($book_id) || !$book_id) {\r
                        return;\r
                }\r
@@ -810,9 +810,16 @@ class wsDAOBook extends commonDAO {
                $book = $this->selectById($book_id);\r
                $pages = $this->getPagesOfBook($book_id);\r
 \r
-               $v1 = $v1 && !$this->isUpToDate($book, 1);\r
-               $v2 = $v2 && !$this->isUpToDate($book, 2);\r
-               $html5 = $html5 && !$this->isUpToDate($book, 'html5');\r
+               if (!$force) {\r
+\r
+                       $v1 = $v1 && !$this->isUpToDate($book, 1);\r
+                       $v2 = $v2 && !$this->isUpToDate($book, 2);\r
+                       $html5 = $html5 && !$this->isUpToDate($book, 'html5');\r
+               } else {\r
+                       $v1 = false;\r
+                       $html5 = false;\r
+                       $v2 = true;\r
+               }\r
 \r
 \r
 \r
@@ -829,7 +836,7 @@ class wsDAOBook extends commonDAO {
                }\r
                if ($html5) {\r
                        fb(time(), 'Compile HTML5');\r
-                       $res.=$this->compileHTML5($book_id,$book);\r
+                       $res.=$this->compileHTML5($book_id, $book);\r
                        $this->touchCompile($book_id, 'html5');\r
                }\r
                if ($v1 || $v2) {\r
@@ -1014,7 +1021,7 @@ class wsDAOBook extends commonDAO {
                        }\r
                }\r
 \r
-               $externalsOptions = array('ongletsSWF', 'tabs2DSWF','externalChapters','externalArchives');\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
@@ -1263,8 +1270,8 @@ class wsDAOBook extends commonDAO {
                }\r
        }\r
 \r
-       public function compileHTML5($book_id,$book) {\r
-               $htmlCompiler = wsHTML5Compiler::factory($book_id,$book->parametres->mobileLVersion);\r
+       public function compileHTML5($book_id, $book) {\r
+               $htmlCompiler = wsHTML5Compiler::factory($book_id, $book->parametres->mobileLVersion);\r
                $htmlCompiler->compile();\r
        }\r
 \r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 1ebc70dc49bf116378d772f4d186224dfdeac3f1..97f41fcbfa60ddf266cca39c2bf9a92d8ea2d8a9 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -36,6 +36,7 @@ class wsHTML5Compiler {
                'js/libs/fluidbook/fluidbook.chapters.js',
                'js/libs/fluidbook/fluidbook.help.js',
                'js/libs/fluidbook/fluidbook.resize.js',
+               'js/libs/fluidbook/fluidbook.coquillette.js',
                'js/libs/fluidbook/fluidbook.js',
                'js/main.js');
        protected static $debugJsFiles = array(
@@ -517,6 +518,8 @@ class wsHTML5Compiler {
                $this->config->optimalWidth = $this->optimalWidth;
                $this->config->optimalHeight = $this->optimalHeight;
                $this->config->chapters = $this->book->chapters;
+               $this->config->coquilletteBack = $this->colorToCSS($this->theme->parametres->couleurA);
+               $this->config->coquilletteFront = $this->colorToCSS($this->theme->parametres->arrowsColor);
                foreach ($this->additionalConfig as $k => $v) {
                        $this->config->$k = $v;
                }
@@ -938,7 +941,7 @@ class wsHTML5CompilerDev extends wsHTML5Compiler {
                $res[] = $shade;
 
                // Background
-               $body = '#main{';
+               $body = '#main,#view.index{';
                $body.='background-color:#' . $this->theme->parametres->backgroundColor . ';';
                switch ($this->theme->parametres->repeat) {
                        case wsTheme::REPEAT: