From 016593c0a8113361e90cd9ee3d94a1bbde44b776 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 14 Oct 2013 13:13:48 +0000
Subject: [PATCH]

---
 fluidbook/compile/index.html                  |  3 +-
 inc/ws/Metier/class.ws.book.parametres.php    |  6 +-
 inc/ws/Util/html5/class.ws.html5.compiler.php |  8 +--
 inc/ws/Util/html5/class.ws.html5.links.php    | 62 ++++++++++++++++++-
 .../Util/packager/class.ws.packager.html.php  |  8 ++-
 5 files changed, 78 insertions(+), 9 deletions(-)

diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html
index cf1ec2134..d6c0b76fc 100644
--- a/fluidbook/compile/index.html
+++ b/fluidbook/compile/index.html
@@ -12,6 +12,7 @@
 		$robots
 		$facebook
 		$description
+		$keywords
 		<title>$title</title>
 		<link href="$spstyle.css?junk=$junk" rel="stylesheet" type="text/css">
 		<style type="text/css" media="print">*{ visibility: hidden; display: none }</style>
@@ -19,7 +20,7 @@
 		<script type="text/javascript">
 			FB_DEFAULT_LANG = '$lang';
 			var backgroundColor = "$bgcolor";
-			if (isMobile()) {
+			if (isMobile() || $alwaysHTML5) {
 				$redirectMobile
 			} else if (isBadMobile()) {
 				$redirectPDF
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 5a45c1325..46bea3969 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -270,6 +270,7 @@ class wsBookParametres extends wsParametres {
 		$this->forms['offline'] = array('label' => __('Version offline'),
 			'fieldsnames' => array('offlineTitle', 'offlineLink'));
 
+		$this->fields['alwaysHTML5'] = array('type' => 'boolean', 'default' => 'false', 'editable' => true, 'label' => __('Toujours utiliser la version HTML5'), 'grade' => 3);
 		$this->fields['mobileVersion'] = array('type' => 'combo', 'default' => 'html5-images', 'editable' => true, 'label' => __('Version mobile'), 'grade' => 3,
 			'datas' => array(__('Rediriger vers le PDF') => 'pdf',
 				__('Version HTML5') => 'html5',
@@ -306,7 +307,7 @@ class wsBookParametres extends wsParametres {
 		$this->fields['mobileNavScale'] = array('type' => 'integer', 'default' => '100', 'editable' => true, 'label' => __('Taille du menu (en %)'), 'grade' => 3);
 
 		$this->forms['mobile'] = array('label' => __('Version mobile'),
-			'fieldsnames' => array('mobileLVersion', 'mobileVersion', 'mobileNavigationType', '|', 'mobileNavScale', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'navOrderH', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath', '|', 'mobileExtraXSpace'));
+			'fieldsnames' => array('alwaysHTML5','mobileLVersion', 'mobileVersion', 'mobileNavigationType', '|', 'mobileNavScale', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'navOrderH', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath', '|', 'mobileExtraXSpace'));
 
 		$this->fields['phonegapId'] = array('type' => 'text', 'default' => 'com.fluidbook.phonegap.$id', 'editable' => true, 'label' => __("Identifiant de l'identifiant"), 'grade' => 5, 'hint' => __('De la forme') . ' com.fluidbook.phonegap.xxxxx');
 		$this->fields['phonegapVersion'] = array('type' => 'text', 'default' => '1.0.0', 'editable' => true, 'label' => __("Version de l'application"), 'grade' => 5, 'hint' => __('De la forme') . ' 1.2.3');
@@ -325,9 +326,10 @@ class wsBookParametres extends wsParametres {
 		$this->fields['seoVersion'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Générer une version pour les moteurs de recherche'));
 		$this->fields['seoRobots'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Autoriser le parcours par les moteurs de recherche'));
 		$this->fields['seoDescription'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Meta tag Description'));
+		$this->fields['seoKeywords'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Meta tag Keywords'));
 
 		$this->forms['seo'] = array('label' => __('Optimisation pour les moteurs de recherche'),
-			'fieldsnames' => array('seoVersion', 'seoRobots', 'seoDescription'));
+			'fieldsnames' => array('seoVersion', 'seoRobots', 'seoDescription', "seoKeywords"));
 
 		$this->fields['home'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Accueil de l'interface multibrochure"), 'grade' => 5);
 		$this->fields['multilang'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Langues'), 'hint' => __('Code langue') . ',' . __('Code pays') . ',' . __('URL'));
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 67c9a6aa8..04ad4fcc2 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -14,8 +14,8 @@ class wsHTML5Compiler {
 			return new wsHTML5Compiler($book_id, 'stable', $phonegap, $phonegapVersion, $dir, $standalone, $appcache, $home);
 		} else {
 			return new wsHTML5CompilerDev($book_id, 'dev', $phonegap, $phonegapVersion, $dir, $standalone, $appcache, $home);
-		}
-	}
+		} 
+	} 
 
 	protected static $resolutions = array(150, 300);
 	protected $maxRes = 300;
@@ -477,8 +477,8 @@ class wsHTML5Compiler {
 		$cache = '';
 		if ($this->appcache) {
 			$cache = ' manifest="cache.appcache"';
-		}
-
+		} 
+			
 		$script = '';
 		if ($this->phonegap) {
 			//$script .= '<script type="text/javascript" charset="utf-8" src="data/cordova.js"></script>' . "\n";
diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index e7a862315..ca9dfa691 100644
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -59,6 +59,8 @@ class wsHTML5Link {
 					return new haguenauManifLink($id, $init, $compiler);
 				} else if ($compiler->book->parametres->customLinkClass == 'FLFLink') {
 					return new flfLink($id, $init, $compiler);
+				} else if ($compiler->book->parametres->customLinkClass == 'InpesPopinLink') {
+					return new inpesPopinLink($id, $init, $compiler);
 				}
 			case 8:
 			case 9:
@@ -524,6 +526,7 @@ class htmlMultimediaLink extends wsHTML5Link {
 
 	protected $_config = null;
 	protected $_content = '';
+	protected $_url;
 
 	public function getHTMLContent() {
 		if ($this->_content == '') {
@@ -538,11 +541,12 @@ class htmlMultimediaLink extends wsHTML5Link {
 
 			$w = $this->width * $this->getCssScale();
 			$h = $this->height * $this->getCssScale();
+			$this->_url = $d['fdir'] . '/' . $this->_config['html'];
 
 			$iw = $this->_config['width'];
 			$ih = $this->_config['height'];
 
-			$res = '<iframe width="' . $iw . '" height="' . $ih . '" src="' . $d['fdir'] . '/' . $this->_config['html'] . '" frameborder="0" marginwidth="0" marginheight="0" scrolling="no"></iframe>';
+			$res = '<iframe width="' . $iw . '" height="' . $ih . '" src="' . $this->_url . '" frameborder="0" marginwidth="0" marginheight="0" scrolling="no"></iframe>';
 			$this->copyExternalDir($d['dir']);
 			$this->_content = $res;
 		}
@@ -638,6 +642,62 @@ class wescoLink extends normalLink {
 
 }
 
+class inpesPopinLink extends htmlMultimediaLink {
+
+	public function getHTMLContent() {
+		$this->alternative = $this->to;
+		$c = parent::getHTMLContent();
+
+
+
+		$class = $this->getClasses();
+		if ($this->display_area) {
+			$class[] = 'displayArea';
+		}
+		$c = '';
+		if (count($class)) {
+			$c = ' class="' . implode(' ', $class) . '"';
+		}
+		$tooltip = '';
+		$t = $this->getTooltip();
+		if ($t !== false) {
+			$tooltip = ' data-tooltip="' . $t . '"';
+		}
+		return '<a href="#" ' . $tooltip . $c . $this->getAdditionnalContent() . '></a>';
+	}
+
+	public function getCSSContainer() {
+		if (!($this instanceof contentLink) && $this->page % 2 == 1) {
+			$this->page--;
+			$this->left+=$this->compiler->width;
+		}
+
+		$css = '#l_' . $this->id . '{';
+		$css.='left:' . $this->left * $this->getCssScale() . 'px;top:' . $this->top * $this->getCssScale() . 'px;';
+		$css.='width:' . $this->width * $this->getCssScale() . 'px;height:' . $this->height * $this->getCssScale() . 'px;';
+		$css.=$this->getCSS();
+		$css.='}';
+		return $css;
+	}
+
+	public function getCSS() {
+		return "";
+	}
+
+	public function getClasses() {
+		$res = parent::getClasses();
+		$res[] = 'popin';
+		return $res;
+	}
+
+	public function getAdditionnalContent() {
+		$res = parent::getAdditionnalContent();
+		$res.=' data-src="' . $this->_url . '" data-width="900" data-height="650"';
+		return $res;
+	}
+
+}
+
 class flfLink extends wescoLink {
 
 	public function getURL() {
diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index 290380ebb..c9c2eb4ad 100644
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -95,6 +95,10 @@ class wsPackagerHTML extends wsPackager {
 		if ($this->book->parametres->seoDescription) {
 			$description = '<meta name="description" content="' . self::escape($this->book->parametres->seoDescription) . '">';
 		}
+		$keywords = '';
+		if ($this->book->parametres->seoKeywords) {
+			$keywords = '<meta name="keywords" content="' . self::escape($this->book->parametres->seoKeywords) . '">';
+		}
 
 		// Stuffs to replace in html
 		$toReplace = array('lang' => strtolower($this->book->lang),
@@ -108,7 +112,9 @@ class wsPackagerHTML extends wsPackager {
 			'robots' => $robots,
 			'favicon' => $favicon,
 			'flashversion' => $this->getMinFlashVersion(),
-			'fv' => json_encode($this->getFlashvars()));
+			'fv' => json_encode($this->getFlashvars()),
+			'alwaysHTML5' => $this->book->parametres->alwaysHTML5,
+			'keywords' => $keywords);
 
 
 		$this->origHTML = file_get_contents($this->vdir . '/index.html');
-- 
2.39.5