wip #1799 @2

diff --git a/inc/ws/Util/html5/socialarticles/class.ws.html5.compiler.php b/inc/ws/Util/html5/socialarticles/class.ws.html5.compiler.php
index 7465e3ad7e8d225086180941b09ca96a98519c13..5363ab4c480224776115da97f66b99b9d3fc7adb 100644 (file)
--- a/inc/ws/Util/html5/socialarticles/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/socialarticles/class.ws.html5.compiler.php
@@ -852,7 +852,7 @@ class wsHTML5Compiler {
        }
 
        public function addSEOArticle($page, $title, $intro, $image) {
-               $this->seoArticles[] = ['title' => $title, 'description' => $intro, 'image' => $image, 'content' => '', 'page' => $page, 'url' => CubeIT_Text::str2URL($title) . '.html'];
+               $this->seoArticles[$title] = ['title' => $title, 'description' => $intro, 'image' => $image, 'content' => '', 'page' => $page, 'url' => CubeIT_Text::str2URL($title) . '.html'];
        }
 
        public function _sortLinks($a, $b) {
@@ -1036,6 +1036,7 @@ class wsHTML5Compiler {
                        }
                }
                $this->config->rasterizePages = cubeArray::parseRange($this->config->rasterizePages);
+               $this->config->seoArticles = $this->seoArticles;
 
                return 'var DATAS=' . json_encode($this->config) . ';' . "\n";
        }

diff --git a/inc/ws/Util/html5/socialarticles/class.ws.html5.links.php b/inc/ws/Util/html5/socialarticles/class.ws.html5.links.php
index 86f1633a657db997896b02103b8f3254c568b7d0..a82a41555b8f26525ffa2a0de590b30ad0f6ced3 100644 (file)
--- a/inc/ws/Util/html5/socialarticles/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/socialarticles/class.ws.html5.links.php
@@ -750,12 +750,18 @@ class actionLink extends internalLink {
        }
 
        public function getAdditionnalContent() {
+               $res = parent::getAdditionnalContent();
+               if ($this->extra) {
+                       $res .= ' data-extra="' . $this->extra . '"';
+               }
+
                if (in_array($this->to, $this->_share)) {
-                       return parent::getAdditionnalContent() . ' data-service="' . $this->to . '" ';
+                       $res .= ' data-service="' . $this->to . '" ';
                } else {
-                       return /*parent::getClasses()*/
+                       $res .= /*parent::getClasses()*/
                                ' data-action="' . $this->to . '" ';
                }
+               return $res;
        }
 
        public function getDefaultTooltip() {