From 8b733dde5c57d5df2af11e01701c3a046064d702 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 20 Jun 2017 15:37:16 +0000 Subject: [PATCH] #1392 --- inc/ws/Metier/class.ws.book.parametres.php | 3 ++- inc/ws/Util/html5/slider/class.ws.html5.compiler.php | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index 45c97d250..defe08102 100644 --- a/inc/ws/Metier/class.ws.book.parametres.php +++ b/inc/ws/Metier/class.ws.book.parametres.php @@ -121,8 +121,9 @@ class wsBookParametres extends wsParametres { $this->fields['navOrder'] = array('type' => 'textarea', 'default' => 'index, chapters, print, friend, bookmark, pdf, archives, basket, fullscreen, sound, 3d, lang, help', 'editable' => true, 'label' => __('Ordre des icônes dans la nav'), 'grade' => 3); $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', 'preload', 'pages', 'width', 'height')); + 'fieldsnames' => array('navOrder', 'tooltipTimer', 'tooltipMaxWidth', 'preload', 'pages', 'width', 'height')); //. // 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 9dc60a5e5..4e7c70a67 100644 --- a/inc/ws/Util/html5/slider/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/slider/class.ws.html5.compiler.php @@ -1128,10 +1128,10 @@ class wsHTML5Compiler { if ($page == 1) { $this->_makeCover($docdir . 'html/t36-' . $infos['document_page'] . '.jpg'); - } - $this->makeThumbSprites($thumbs); + } + $this->makeThumbSprites($thumbs); $this->log('Copied image ' . $page); - } + } } public function makeThumbSprites(array $thumbs) { @@ -1398,13 +1398,13 @@ 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) . ';}'; - $this->_writeLess($lessVariables); $res = array_chunk($res, 3500); -- 2.39.5