wait #4775 @0.25

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index a9e77ba8497d758710dfccaf872e212642fbd993..c54521b7e0e4019012bdfd33c597f5491d662d1b 100644 (file)
--- 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 3b938243881f0752bae4e896271e6adca550f107..d89ab0b622c8befc10ad5dda43c48c8cb21e5405 100644 (file)
--- 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"));\r
         $this->fields['tooltipTextColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
             'label' => __("Couleur du texte des infobulles"));\r
-        $this->fields['tooltipTextSize'] = array('type' => 'integer', 'default' => 100, 'editable' => true,\r
+        $this->fields['tooltipTextSize'] = array('type' => 'integer', 'default' => 14, 'editable' => true,\r
             'label' => __('Taille du texte des infobulles'));\r
-        $this->fields['tooltipPaddingSize'] = array('type' => 'integer', 'default' => 20, 'editable' => true,\r
+        $this->fields['tooltipPadding'] = array('type' => 'integer', 'default' => 20, 'editable' => true,\r
             'label' => __('Marge intérieure des infobulles'));\r
         $this->fields['bookmarkBackgroundColor'] = array('type' => 'couleurAlpha', 'default' => 'ffadadad', 'editable' => true,\r
             'label' => __("Couleur de fond des marques-pages"));\r
@@ -111,7 +111,7 @@ class wsThemeParametres extends wsParametres
                 '|', 'bookShadeColor', '|', 'usePageEdges',\r
                 '|', 'displayPageNumber', 'colorPageNumber',\r
                 '|', 'linksColor', 'videoBackgroundColor',\r
-                '|', 'tooltipBackColor', 'tooltipTextColor', 'tooltipTextSize','tooltipPaddingSize',\r
+                '|', 'tooltipBackColor', 'tooltipTextColor', 'tooltipTextSize','tooltipPadding',\r
                 '|', 'bookmarkBackgroundColor', 'bookmarkStarDisabledColor', 'bookmarkStarEnabledColor'));\r
         /* Credits */\r
         $this->fields['creditsColor'] = array('type' => 'couleurAlpha', 'default' => '80ffffff', 'editable' => true,\r

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 fbe1160ce5561d9e5534c7b26d23f8df0eea33bc..21863dc196ef9dd104dfe4676bafac7f6f4a60e0 100644 (file)
--- 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) {