From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 10 Jul 2012 09:50:29 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9d4738e6f999a03548739c0622d3d2a371070125;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 6ef0672d8..2e9f87e72 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -22,10 +22,12 @@ class wsHTML5Compiler {
 		'js/libs/fluidbook/fluidbook.nav.js',
 		'js/libs/fluidbook/fluidbook.touch.js',
 		'js/libs/fluidbook/fluidbook.loader.js',
+		'js/libs/fluidbook/fluidbook.search.js',
 		'js/libs/fluidbook/fluidbook.js',
 		'js/main.js');
 	protected static $debugJsFiles = array(
-		'js/libs/Three.js'
+		'js/libs/Three.js',
+		'data/search.js'
 	);
 	protected static $testJsFiles = array(
 		'js/libs/cube/fb.js',
@@ -290,11 +292,29 @@ class wsHTML5Compiler {
 	}
 
 	protected function writeIndex($numCSS) {
+		global $core;
+		
 		$html = file_get_contents($this->assets . '/_index.html');
 		$uhtml = $html;
 
 		$titre = $this->book->parametres->title;
+
+
+		$daoSignature = new wsDAOSignature($core->con);
+		$signature = $daoSignature->selectById($this->book->parametres->signature);
+
+		$exportSignature = array('main' => $signature->main,
+			'mainLink' => $signature->mainLink,
+			'partner' => $signature->partner,
+			'partnerLink' => $signature->partnerLink);
+
 		$credits = '';
+		if ($signature->partner != '') {
+			$credits = '<a href="' . $signature->partnerLink . '" target="_blank">' . $signature->partner . '</a> ';
+		}
+		$credits.='<a href="' . $signature->mainLink . '" target="_blank">' . $signature->main . '</a>';
+
+
 		// Google analytics
 		$ga = '';
 		if ($this->book->parametres->googleAnalytics != '') {
@@ -313,7 +333,8 @@ class wsHTML5Compiler {
 
 		$pagesContents = '';
 
-		$script = '<script type="text/javascript" src="data/fluidbook.js"></script>';
+		$script = '<script type="text/javascript" src="data/fluidbook.js"></script>' . "\n";
+		$script .= '<script type="text/javascript" src="data/search.js"></script>' . "\n";
 
 		$description = '';
 		if ($this->book->parametres->seoDescription) {
@@ -577,6 +598,7 @@ class wsHTML5Compiler {
 		$res[] = '.portrait .doublePage._2d.prev{' . $this->writeCSSUA('transform', 'translate3d(-' . $w . ',0,0)') . '}';
 		$res[] = '.doublePage._3d{left:' . $w . ';}';
 		$res[] = '.landscape #shadow.single.right{left: ' . $w . ';}';
+		$res[] = '.landscape #shadow.single.right{left: ' . $w . ';}';
 		$res[] = '.landscape .page.right{left:' . $w . '}';
 		if ($this->theme->parametres->displayPageNumber) {
 			$res[] = '#pagesnumbers{top:' . $h . ';color:' . self::colorToCSS($this->theme->parametres->colorPageNumber) . '}';