From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 12 Oct 2021 16:09:22 +0000 (+0000)
Subject: wait #4775 @0.25
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=d3218e1508f90a9c8ec37a328e6f0f2037bab4d3;p=cubeextranet.git

wait #4775 @0.25
---

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index a9e77ba84..c54521b7e 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -2016,5 +2016,4 @@ html,body{height:100%;cursor: wait;font-family: "Open Sans", Arial;background-co
 
         wsMaintenance::exportPublicationSettings($books,$title);
     }
-
 }
\ No newline at end of file
diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 3b9382438..d89ab0b62 100644
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -95,9 +95,9 @@ class wsThemeParametres extends wsParametres
             'label' => __("Couleur de fond des infobulles"));
         $this->fields['tooltipTextColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,
             'label' => __("Couleur du texte des infobulles"));
-        $this->fields['tooltipTextSize'] = array('type' => 'integer', 'default' => 100, 'editable' => true,
+        $this->fields['tooltipTextSize'] = array('type' => 'integer', 'default' => 14, 'editable' => true,
             'label' => __('Taille du texte des infobulles'));
-        $this->fields['tooltipPaddingSize'] = array('type' => 'integer', 'default' => 20, 'editable' => true,
+        $this->fields['tooltipPadding'] = array('type' => 'integer', 'default' => 20, 'editable' => true,
             'label' => __('Marge intérieure des infobulles'));
         $this->fields['bookmarkBackgroundColor'] = array('type' => 'couleurAlpha', 'default' => 'ffadadad', 'editable' => true,
             'label' => __("Couleur de fond des marques-pages"));
@@ -111,7 +111,7 @@ class wsThemeParametres extends wsParametres
                 '|', 'bookShadeColor', '|', 'usePageEdges',
                 '|', 'displayPageNumber', 'colorPageNumber',
                 '|', 'linksColor', 'videoBackgroundColor',
-                '|', 'tooltipBackColor', 'tooltipTextColor', 'tooltipTextSize','tooltipPaddingSize',
+                '|', 'tooltipBackColor', 'tooltipTextColor', 'tooltipTextSize','tooltipPadding',
                 '|', 'bookmarkBackgroundColor', 'bookmarkStarDisabledColor', 'bookmarkStarEnabledColor'));
         /* Credits */
         $this->fields['creditsColor'] = array('type' => 'couleurAlpha', 'default' => '80ffffff', 'editable' => true,
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 fbe1160ce..21863dc19 100644
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -2578,7 +2578,8 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
         #tooltip
         $this->lessVariables['tooltip-background'] = wsHTML5::colorToCSS($this->theme->parametres->tooltipBackColor);
         $this->lessVariables['tooltip-color'] = wsHTML5::colorToCSS($this->theme->parametres->tooltipTextColor);
-        $this->lessVariables['tooltip-font-size'] = 14 * (($this->theme->parametres->tooltipTextSize ?: 100) / 100);
+        $this->lessVariables['tooltip-font-size'] = $this->theme->parametres->tooltipTextSize == 100 ? 14 : $this->theme->parametres->tooltipTextSize;
+        $this->lessVariables['tooltip-padding'] = $this->theme->parametres->tooltipPadding ?: 20;
         $this->log('CSS 12');
         #Videos
         if ($this->book->parametres->bigPlayImage) {