From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 14 Jul 2011 13:37:57 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=6522eb75900813ea3fc98be908a4fdcbbc338b02;p=cubeextranet.git

---

diff --git a/inc/ws/Util/packager/html5/class.ws.packager.html5.links.php b/inc/ws/Util/packager/html5/class.ws.packager.html5.links.php
index 71013df06..1b68c923a 100644
--- a/inc/ws/Util/packager/html5/class.ws.packager.html5.links.php
+++ b/inc/ws/Util/packager/html5/class.ws.packager.html5.links.php
@@ -109,7 +109,15 @@ class wsPackagerHTML5Link {
 class normalLink extends wsPackagerHTML5Link {
 
 	public function getHTMLContent() {
-		return '<a href="' . $this->getURL() . '" target="' . $this->getTarget() . '"></a>';
+		$class = array();
+		if ($this->display_area) {
+			$class[] = 'displayArea';
+		}
+		$c = '';
+		if (count($class)) {
+			$c = ' class="' . implode(' ', $class) . '"';
+		}
+		return '<a href="' . $this->getURL() . '" target="' . $this->getTarget() . '"' . $c . '></a>';
 	}
 
 	public function getURL() {
@@ -157,11 +165,15 @@ class mailLink extends normalLink {
 class internalLink extends normalLink {
 
 	public function getURL() {
-		return '#/pages/' . $this->getPage();
+		return '#/page/' . $this->getPage();
 	}
 
 	public function getPage() {
-		return $this->to;
+		if ($this->numerotation == 'physical') {
+			return $this->to;
+		} else {
+			return $this->to;
+		}
 	}
 
 }
@@ -171,10 +183,16 @@ class videoLink extends wsPackagerHTML5Link {
 	public function getHTMLContent() {
 		$res = '<video width="' . $this->width . '" height="' . $this->height . '"';
 		if ($this->video_auto_start) {
-			$res.=' autoplay';
+			$res.=' autoplay="autoplay"';
 		}
 		if ($this->video_controls) {
-			$res.=' controls';
+			$res.=' controls="controls"';
+		}
+		if ($this->video_loop) {
+			$res.=' loop="loop"';
+		}
+		if (!$this->video_sound_on) {
+			$res.=' audio="muted"';
 		}
 		$res.='>';
 
diff --git a/inc/ws/Util/packager/html5/class.ws.packager.html5.php b/inc/ws/Util/packager/html5/class.ws.packager.html5.php
index 996c509c4..56d70f1e5 100644
--- a/inc/ws/Util/packager/html5/class.ws.packager.html5.php
+++ b/inc/ws/Util/packager/html5/class.ws.packager.html5.php
@@ -93,8 +93,12 @@ class wsPackagerHTML5 extends wsPackager {
 			$i++;
 		}
 
-		foreach ($pages as $n => $c) {
-			file_put_contents($this->vdir . '/data/links/pages/p' . $n . '.html', $c);
+		for ($i = 0; $i <= $this->book->parametres->pages + 1; $i++) {
+			$c = '';
+			if (isset($pages[$i])) {
+				$c = $pages[$i];
+			}
+			file_put_contents($this->vdir . '/data/links/pages/p' . $i . '.html', $c);
 		}
 		return $css;
 	}
@@ -102,6 +106,7 @@ class wsPackagerHTML5 extends wsPackager {
 	protected function writeConfig() {
 		$config = cubeObject::merge($this->book->parametres->toStandardObject(), $this->theme->parametres->toStandardObject());
 		$config->id = $this->book->book_id;
+		$config->cacheDate = TIME;
 		return 'DATAS=' . json_encode($config) . ';';
 	}
 
@@ -357,6 +362,7 @@ class wsPackagerHTML5 extends wsPackager {
 
 		// Links Styles
 		$res = array_merge($res, $links);
+		$res[] = '.link a.displayArea:hover,.link a.displayArea.animating{background-color:' . self::colorToCSS($this->theme->parametres->linksColor, 0.4) . ';}';
 
 		// Pages styles
 		foreach ($this->cssColor as $color => $index) {
@@ -581,7 +587,18 @@ class wsPackagerHTML5 extends wsPackager {
 		
 	}
 
-	public static function colorToCSS($color) {
+	public static function colorToCSS($color, $forceAlpha=null) {
+
+		if (!is_null($forceAlpha)) {
+			$a = $forceAlpha * 255;
+			$a = base_convert($a, 10, 16);
+			if (strlen($color) == 6) {
+				$color = $a . $color;
+			} else {
+				$color = $a . substr($color, 2, 6);
+			}
+		}
+
 		if (strlen($color) == 6) {
 			return '#' . $color;
 		} else {