From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 21 Jun 2017 16:19:27 +0000 (+0000)
Subject: fix #1485 @1.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9133c5436f53da9182a97791607dedfd7c13df9a;p=cubeextranet.git

fix #1485 @1.5
---

diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html
index 1430e7d55..ce2d57de6 100644
--- a/fluidbook/compile/index.html
+++ b/fluidbook/compile/index.html
@@ -21,9 +21,7 @@
 		visibility: hidden;
 		display: none
 	}</style>
-	<style type="text/css">body {
-		background-color: # $ bgcolor;
-	}</style>
+	<style type="text/css">body {background-color:#$bgcolor;}</style>
 	<script type="text/javascript">
         FB_DEFAULT_LANG = '$lang';
         INDEX_EXT = '$index_ext';
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index defe08102..2c29c8c12 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -123,7 +123,7 @@ class wsBookParametres extends wsParametres {
 		$this->fields['tooltipTimer'] = array('type' => 'float', 'default' => 3, "editable" => true, 'label' => __("Temps maximum d'apparition des infos-bulles (en secondes)"));
 
 		$this->forms['general'] = array('label' => __('Fonctionnalités générales'),
-		                                'fieldsnames' => array('navOrder', 'tooltipTimer', 'tooltipMaxWidth', 'preload', 'pages', 'width', 'height'));
+		                                'fieldsnames' => array('navOrder', 'tooltipTimer','preload', 'pages', 'width', 'height'));
 		//.
 		//
 
diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php
index 903dfc445..d6abc17ea 100644
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -85,9 +85,6 @@ class wsHTML5Link {
 					return new webVideoPopupLink($id, $init, $compiler);
 				}
 			case 11:
-				if ($init['to'] == 'fullScreen') {
-					return null;
-				}
 				return new actionLink($id, $init, $compiler);
 			case 12:
 
@@ -725,10 +722,7 @@ class actionLink extends internalLink {
 	protected $_share = array('facebook', 'twitter', 'googleplus', 'linkedin', 'viadeo');
 
 	public function getURL() {
-		if (in_array($this->to, $this->_share)) {
-			return '#';
-		}
-		return '#/' . $this->to;
+		return '#';
 	}
 
 	public function getClasses() {
@@ -743,7 +737,7 @@ class actionLink extends internalLink {
 		if (in_array($this->to, $this->_share)) {
 			return parent::getAdditionnalContent() . ' data-service="' . $this->to . '" ';
 		} else {
-			return parent::getClasses();
+			return parent::getClasses() . ' data-action="' . $this->to . '" ';
 		}
 	}