From: vincent@cubedesigners.com Date: Wed, 3 Jun 2020 18:34:56 +0000 (+0000) Subject: wip #3679 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=48d308cf31ddb34b803042d0f7ad767eea9f66ee;p=cubeextranet.git wip #3679 @0.5 --- diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index 9a3f8f113..94c145d88 100644 --- a/inc/ws/Metier/class.ws.book.parametres.php +++ b/inc/ws/Metier/class.ws.book.parametres.php @@ -431,9 +431,9 @@ class wsBookParametres extends wsParametres $this->fields['product_zoom_references'] = array('type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Références produits'), 'grade' => 3, 'fileFilter' => $basketFilter, 'hint' => __('Fichier contenant les références produits'), 'dir' => 'commerce'); - $icons = [__('Aucune') => 'none', __('Partage') => 'nav-share', __('Ecran') => 'icon-site', __('Télécharger') => 'nav-download', 'PDF' => 'icon-pdf']; + $icons = [__('Aucune') => 'none', __('Partage') => 'nav-share', __('Ecran') => 'icon-site', __('Télécharger') => 'nav-download', 'PDF' => 'icon-pdf', 'Video' => 'icon-video', __('Lien') => 'icon-link']; $f = []; - for ($i = 1; $i <= 2; $i++) { + for ($i = 1; $i <= 3; $i++) { $this->fields['product_zoom_label_' . $i] = ['type' => 'text', 'label' => __('Label du bouton') . ' ' . $i, 'default' => '', 'editable' => true, 'grade' => 3]; $this->fields['product_zoom_tooltip_' . $i] = ['type' => 'text', 'label' => __('Label de l\'infobulle') . ' ' . $i, 'default' => '', 'editable' => true, 'grade' => 3]; $this->fields['product_zoom_icon_' . $i] = ['type' => 'combo', 'datas' => $icons, 'label' => __('Icône du bouton') . ' ' . $i, 'default' => 'click', 'editable' => true, 'grade' => 3]; 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 e5eff0a8b..7dabb7c02 100644 --- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php @@ -2383,6 +2383,9 @@ class wsHTML5Compiler public function writeArticles() { + $this->lessVariables['articles-title-color'] = '#000000'; + $this->lessVariables['articles-font'] = 'OpenSans'; + $list = []; $f = $this->book->parametres->articlesFile; if ($f === '') {