From 54d3cac5a035bf832db0eca5f30dcffe36d755da Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 28 Oct 2014 13:34:45 +0000
Subject: [PATCH]

---
 inc/ws/Util/html5/class.ws.html5.compiler.php | 11 +++++++++--
 inc/ws/Util/html5/class.ws.html5.links.php    |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 45929af1e..ccd735446 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -502,6 +502,13 @@ class wsHTML5Compiler {
 			$description = '<meta name="description" content="' . html::escapeHTML($this->book->parametres->seoDescription) . '">';
 		}
 
+
+		$favicon = '';
+		if ($this->theme->parametres->favicon != '') {
+			copy($this->themeRoot . '/' . $this->theme->parametres->favicon, $this->vdir . '/data/favicon.png');
+			$favicon = '<link rel="apple-touch-icon" href="data/favicon.png" />';
+		}
+
 		$print = $this->writePrint();
 		$message = sprintf($this->__('Your browser is not up to date and is not able to run this publication. %sLearn more%s'), '<br /><a href="http://www.whatbrowser.org/intl/' . $this->config->defaultLang . '/" target="_blank">', '</a>');
 
@@ -514,7 +521,7 @@ class wsHTML5Compiler {
 			}
 		}
 
-		$vars = array('titre', 'credits', 'ga', 'style', 'script', 'pagesContents', 'description', 'print', 'hiddenContents', 'splash', 'cache', 'bgcolor', 'message');
+		$vars = array('titre', 'credits', 'ga', 'style', 'script', 'pagesContents', 'description', 'print', 'hiddenContents', 'splash', 'cache', 'bgcolor', 'message', 'favicon');
 		foreach ($vars as $v) {
 			$html = str_replace('<!-- $' . $v . ' -->', $$v, $html);
 		}
@@ -543,7 +550,7 @@ class wsHTML5Compiler {
 
 		$thtml = $uhtml;
 
-		$vars = array('titre', 'credits', 'ga', 'style', 'script', 'pagesContents', 'print', 'hiddenContents', 'splash', 'cache', 'bgcolor', 'message');
+		$vars = array('titre', 'credits', 'ga', 'style', 'script', 'pagesContents', 'print', 'hiddenContents', 'splash', 'cache', 'bgcolor', 'message', 'favicon');
 		foreach ($vars as $v) {
 			$uhtml = str_replace('<!-- $' . $v . ' -->', $$v, $uhtml);
 		}
diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index 85087c29b..0b3d3ad1c 100644
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -455,7 +455,7 @@ class videoPopupLink extends normalLink {
 	}
 
 	public function getAdditionnalContent() {
-		return ' data-video="' . rawurlencode(videoLink::makeVideoTag($this, null, null, $this->compiler)) . '" ';
+		return ' data-video="' . rawurlencode(videoLink::makeVideoTag($this, $this->video_width, $this->video_height, $this->compiler)) . '" ';
 	}
 
 	public function keep() {
-- 
2.39.5