wait #4571 @0.5

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 6a6f64e27a6e99f1b2474aa43aee47924ab3b916..41b9898f630eeb9eab172d21f5d63e640a16b987 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -150,7 +150,7 @@ class wsThemeParametres extends wsParametres
             'label' => __("Couleur de l'étoile activée"));\r
 \r
         $this->forms['book'] = array('label' => __('Personnalisation de la publication'),\r
-            'fieldsnames' => array('interfaceFont','interfaceFontUppercase','|','pageReflection', 'shadeAlpha',\r
+            'fieldsnames' => array('interfaceFont', 'interfaceFontUppercase', '|', 'pageReflection', 'shadeAlpha',\r
                 '|', 'usePageEdges', 'pageEdgeOpacity', 'pageEdgeLeftOffset', 'pageEdgeRightOffset', 'pageEdgeColor', 'pageEdgeThickness',\r
                 '|', 'bookShadeColor',\r
                 '|', 'displayPageNumber', 'colorPageNumber',\r
@@ -279,13 +279,15 @@ class wsThemeParametres extends wsParametres
         /* Pages bar */\r
         $this->fields['pagesBar'] = array('type' => 'boolean', 'default' => true, 'editable' => true,\r
             'label' => __("Afficher la barre d'accès rapide aux pages"));\r
+        $this->fields['sliderBackground'] = ['type' => 'couleurAlpha', 'default' => '1A000000', 'editable' => true, 'label' => __('Couleur de la barre du slider')];\r
+        $this->fields['sliderHandle'] = ['type' => 'couleur', 'default' => 'ffffff', 'editable' => true, 'label' => __('Couleur de la poignée')];\r
         $this->fields['pageBarThumbBack'] = array('type' => 'couleurAlpha', 'default' => '80000000', 'editable' => true,\r
             'label' => __("Couleur de fond de la boîte"));\r
         $this->fields['bookmarkColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
             'label' => __("Couleur des marques-pages"));\r
 \r
         $this->forms['pagesbar'] = array('label' => __('Personnalisation de la barre des pages'),\r
-            'fieldsnames' => array('pagesBar', 'pageBarThumbBack', '|', 'bookmarkColor'));\r
+            'fieldsnames' => array('pagesBar', '|', 'sliderBackground', 'sliderHandle', '|', 'pageBarThumbBack', '|', 'bookmarkColor'));\r
 \r
         /* Paramètres non implémentés */\r
         /* $this->fields['extraXSpace'] = array('type' => 'integer', 'default' => '0', '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 9c53e7a443acb6d3b07d007f20d6fac792896821..3084618b3107571066692172a3121d875862460b 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -2298,6 +2298,9 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
         $this->lessVariables['text-transform'] = $this->theme->parametres->interfaceFontUppercase ? 'uppercase' : 'inherit';
 
         $this->lessVariables['css-scale'] = $this->cssScale;
+
+        $this->lessVariables['slider-background'] = wsHTML5::colorToCSS($this->theme->parametres->sliderBackground);
+        $this->lessVariables['slider-handle'] = wsHTML5::colorToCSS($this->theme->parametres->sliderHandle);
         $this->lessVariables['slider-display'] = $this->_lessBoolean($this->theme->parametres->pagesBar);
         $this->lessVariables['slider-thumb-background'] = wsHTML5::colorToCSS($this->theme->parametres->pageBarThumbBack);
         $this->lessVariables['pages-background'] = $this->book->parametres->forceWhiteBackground ? '#ffffff' : 'transparent';