Merge slider branch & master | done #1392 @1.5

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index fb2abe86e6e03f59c93a2da5d4d1e431f297e6bd..7b67d3e859006a057931d192037f6dae37c68189 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1359,11 +1359,10 @@ class wsHTML5Compiler {
                        $res[] = '#shadow>div{' . wsHTML5::writeCSSUA('box-shadow', '0 0 20px ' . $shadowColor) . '}';
                }
 
+               $lessVariables['links-color']=wsHTML5::colorToCSS($this->theme->parametres->linksColor);
+
                // Links Styles
                $res = array_merge($res, $links);
-               $res[] = '.link a.displayArea:hover,.link a.displayArea.animating{background-color:' . wsHTML5::colorToCSS($this->theme->parametres->linksColor, 0.4) . ';}';
-               $res[] = '.link a.displayArea:hover{opacity:1 !important;}';
-               $res[] = '.link a.displayArea{-webkit-tap-highlight-color:' . wsHTML5::colorToCSS($this->theme->parametres->linksColor, 0.4) . ';background-color:' . wsHTML5::colorToCSS($this->theme->parametres->linksColor, 0.0001) . ';}';
 
                // Bookmarks
                if (!isset($this->book->parametres->bookmarkCornerSize)) {
@@ -1400,8 +1399,9 @@ class wsHTML5Compiler {
                $this->config->thumbHeight = $thumbh;
                $lessVariables['thumb-height'] = $thumbh . 'px';
 
-               # Tooltip
-               $res[] = '#tooltip{background-color:' . wsHTML5::colorToCSS($this->theme->parametres->tooltipBackColor) . ';color:' . wsHTML5::colorToCSS($this->theme->parametres->tooltipTextColor) . ';}';
+               #tooltip
+               $lessVariables['tooltip-background'] = wsHTML5::colorToCSS($this->theme->parametres->tooltipBackColor);
+               $lessVariables['tooltip-color'] = wsHTML5::colorToCSS($this->theme->parametres->tooltipTextColor);
 
                # ZoomPopup close button background
                $res[] = '.zoomPopupClose {background-color:' . wsHTML5::colorToCSS($this->theme->parametres->couleurB) . ';}';

diff --git a/inc/ws/Util/html5/slider/class.ws.html5.compiler.php b/inc/ws/Util/html5/slider/class.ws.html5.compiler.php
index 524c6b831d9954a28074ca677eee96db629e22d8..b32b48c2df8cf8aedf01f8e0cf4534cb36da7d02 100644 (file)
--- a/inc/ws/Util/html5/slider/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/slider/class.ws.html5.compiler.php
@@ -1114,6 +1114,7 @@ class wsHTML5Compiler {
                                if (!$ok && $r = 300) {
                                        $this->maxRes = 150;
                                }
+                       $this->copy(WS_DOCS . '/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', $this->vdir . '/data/thumbnails/p' . $page . '.jpg');
                        }
 
                        $thumb = false;

diff --git a/inc/ws/Util/html5/slider/class.ws.html5.links.php b/inc/ws/Util/html5/slider/class.ws.html5.links.php
index ab8d64e9e039f3d69dcf8614efd8799d2b37c454..4d3bc7704c0424628649f0b42d206a473f843fe2 100644 (file)
--- a/inc/ws/Util/html5/slider/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/slider/class.ws.html5.links.php
@@ -22,6 +22,7 @@ class wsHTML5Link {
        public $video_service;
        public $inline;
        public $display_area;
+       public $read_mode;
        public $infobulle;
        public $extra;
        public $id;
@@ -85,9 +86,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:
 
@@ -389,13 +387,18 @@ class htmlMultimediaPopupImage extends normalLink {
 
        public function getURL() {
                $this->copyExternalFile($this->alternative);
-               return '#/multimedia/' . md5($this->alternative);
+               $read = ($this->read_mode) ? 'r_' : '';
+               return '#/multimedia/' . $read . md5($this->alternative);
        }
 
        public function getAdditionnalContent() {
                $dim = getimagesize($this->wdir . '/' . $this->alternative);
                $markup = '<div  class="multimediaContainer"><img data-width="' . $dim[0] . '" data-height="' . $dim[1] . '" src="' . wsHTML5Link::getUniversalLocation($this->alternative) . '" width="' . $dim[0] . '" height="' . $dim[1] . '" class="multimedia" /></div>';
-               return ' data-multimedia="' . rawurlencode($markup) . '" ';
+               $read = '';
+               if ($this->read_mode) {
+                       $read = ' data-readmode="1"';
+               }
+               return $read . ' data-multimedia="' . rawurlencode($markup) . '" ';
        }
 
        public function keep() {
@@ -726,11 +729,8 @@ 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;
-       }
 
        public function getClasses() {
                if (in_array($this->to, $this->_share)) {
@@ -744,7 +744,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 . '" ';
                }
        }
 
@@ -1202,6 +1202,10 @@ class haguenauManifLink extends internalLink {
 
 class zoomLink extends normalLink {
 
+       public function getHTMLContainerClass() {
+               return parent::getHTMLContainerClass() . ' zoomarea';
+       }
+
        public function getDefaultTooltip() {
                return 'zoom in';
        }