From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 31 Jan 2013 13:08:55 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=29b35b40272aaccae63de9f27d25637079fdfd05;p=cubeextranet.git

---

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index af8ee46a8..144e97027 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -43,13 +43,14 @@ class wsHTML5Compiler {
 		'js/libs/fluidbook/fluidbook.touch.js',
 		'js/libs/fluidbook/fluidbook.loader.js',
 		'js/libs/fluidbook/fluidbook.search.js',
-		'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.stats.js',
 		'js/libs/fluidbook/fluidbook.cache.js',
 		'js/libs/fluidbook/fluidbook.bookmarks.js',
+		'js/libs/fluidbook/views/fluidbook.chapters.js',
+		'js/libs/fluidbook/views/fluidbook.index.js',
 		'js/libs/fluidbook/fluidbook.js',
 		'js/main.js');
 	public $debugJsFiles = array(
@@ -640,8 +641,6 @@ class wsHTML5Compiler {
 		$allpages[] = 'aftersearch';
 		$allpages[] = 'background';
 
-
-
 		foreach ($allpages as $i) {
 			$c = '';
 			$cc = '';
@@ -664,7 +663,7 @@ class wsHTML5Compiler {
 		if ($link['page'] <= 0 || $link['page'] > $this->book->parametres->pages) {
 			continue;
 		}
-		$this->config->bookmarkGroups[] = array('page' => $link['page'], 'nb' => $link['to'], 'name' => $link['extra']);
+		$this->config->bookmarkGroups[] = array('page' => ($link['page'] - 1), 'nb' => $link['to'], 'name' => $link['extra']);
 	}
 
 	protected function writeJs() {
@@ -996,10 +995,12 @@ class wsHTML5Compiler {
 		$res[] = '.link a.displayArea{-webkit-tap-highlight-color:' . self::colorToCSS($this->theme->parametres->linksColor, 0.4) . ';background-color:' . self::colorToCSS($this->theme->parametres->linksColor, 0.0001) . ';}';
 
 		// Bookmarks
-		if(!isset($this->book->parametres->bookmarkCornerSize)){
-			$this->book->parametres->bookmarkCornerSize=10;
+		fb($this->book->parametres->bookmarkCornerSize);
+		if (!isset($this->book->parametres->bookmarkCornerSize)) {
+			$this->book->parametres->bookmarkCornerSize = 10;
 		}
-		$size = round($this->book->parametres->width * $s * 0.0075);
+		$size = round($this->width * $this->book->parametres->bookmarkCornerSize * 0.0075);
+		fb($size);
 		$res[] = '#links .bookmark{width:' . $size . 'px;height:' . $size . 'px;}';
 
 		// Menus