wip #5317 @0.5

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 16829676fa969a50a49c56641a235ad6ffce8241..4241c5ff243dd8043de04fd5f76a59353e270ef2 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -80,7 +80,7 @@ class wsThemeParametres extends wsParametres
             'label' => __("Couleur des icônes"));\r
 \r
         $this->forms['icones'] = array('label' => __('Personnalisation des icônes'),\r
-            'fieldsnames' => array('iconSet','symbols', 'couleurI'));\r
+            'fieldsnames' => array('iconSet', 'symbols', 'couleurI'));\r
 \r
         /* Book */\r
         $this->fields['interfaceFont'] = ['type' => 'combo', 'default' => 'OpenSans', 'datas' => wsBookParametres::$fonts, 'editable' => true, 'label' => __('Police de l\'interface')];\r
@@ -98,6 +98,7 @@ class wsThemeParametres extends wsParametres
             'label' => __('Couleur des numéros de page'));\r
         $this->fields['linksColor'] = array('type' => 'couleur', 'default' => '$couleurA', 'editable' => true,\r
             'label' => __('Couleur des liens'));\r
+        $this->fields['slideshowColor'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Couleur d\'accentuation des slideshow')];\r
         $this->fields['videoBackgroundColor'] = array('type' => 'couleur', 'default' => '000000', 'editable' => true,\r
             'label' => __('Couleur de fond des videos'));\r
 \r
@@ -125,7 +126,7 @@ class wsThemeParametres extends wsParametres
             'fieldsnames' => array('interfaceFont', 'interfaceFontUppercase', '|', 'shadeAlpha',\r
                 '|', 'bookShadeColor', '|', 'usePageEdges',\r
                 '|', 'displayPageNumber', 'colorPageNumber',\r
-                '|', 'linksColor', 'videoBackgroundColor',\r
+                '|', 'linksColor', 'videoBackgroundColor', 'slideshowColor',\r
                 '|', 'tooltipBackColor', 'tooltipTextColor', 'tooltipTextSize', 'tooltipPadding',\r
                 '|', 'bookmarkBackgroundColor', 'bookmarkStarDisabledColor', 'bookmarkStarEnabledColor',\r
                 '|', 'audioplayerBackgroundColor', 'audioplayerStrokeColor', 'audioplayerIconColor'));\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 b4f8247a552cf91114b450d40e2603f5ad945187..cb45b9d06cd893a6b44e832dcf3d7b2e8401a8f2 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -3002,6 +3002,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
         $this->log('CSS 7');
         // Links Styles
         $this->lessVariables['links-color'] = wsHTML5::colorToCSS($this->theme->parametres->linksColor);
+        $this->lessVariables['slideshow-color'] = wsHTML5::colorToCSS($this->theme->parametres->slideshowColor ?: $this->theme->parametres->couleurB);
         $this->lessVariables['inlineslideshow-transition-time'] = (floatval($this->book->parametres->inlineSlideshowTransitionDuration) * 1000) . 'ms';
         $this->lessVariables['slideshow-caption-size'] = $this->book->parametres->slideshowCaptionSize ?: '16px';