fix #1485 @1.5

diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html
index 1430e7d559b7c5b0c1f935ecbfa4387784626c54..ce2d57de6c3ab73f717bc99b42f8ed3b5bcacddc 100644 (file)
--- 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 defe081026561e2cb0fc707be45802f0c592de48..2c29c8c127f5c55124392ad856d5beb1be76930e 100644 (file)
--- 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 903dfc445d65b577e1508424ea1e90313976abb2..d6abc17ea93984d8dc2296f14e0ad816724b130d 100644 (file)
--- 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 . '" ';
                }
        }