From bca86dde4b23666b85731421bdb68a3df7867539 Mon Sep 17 00:00:00 2001 From: "stephen@cubedesigners.com" Date: Wed, 6 Sep 2017 17:06:44 +0000 Subject: [PATCH] WIP #1647 @2 --- inc/ws/Metier/class.ws.book.parametres.php | 12 ++++++++++-- .../html5/burgermenu/class.ws.html5.compiler.php | 9 +++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index 150f62ddd..f944b0326 100644 --- a/inc/ws/Metier/class.ws.book.parametres.php +++ b/inc/ws/Metier/class.ws.book.parametres.php @@ -38,6 +38,10 @@ class wsBookParametres extends wsParametres { $epsFilter->name = __('Fichier vectoriel') . ' (*.ai, *.eps)'; $epsFilter->extensions = '*.ai;*.eps'; + $svgFilter = new stdClass(); + $svgFilter->name = __('Fichier SVG') . ' (*.svg)'; + $svgFilter->extensions = '*.svg'; + $soundFilter = new stdClass(); $soundFilter->name = __('Fichier sonore') . ' (*.mp3, *.wav)'; $soundFilter->extensions = '*.mp3;*.wav'; @@ -125,11 +129,15 @@ class wsBookParametres extends wsParametres { $this->fields['preload'] = array('type' => 'integer', 'default' => 16, 'editable' => true, 'label' => __('Nombre de pages à précharger'), 'grade' => 3); - $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['navOrder'] = array('type' => 'textarea', 'default' => 'index, chapters, print, friend, bookmark, pdf, archives, basket, fullscreen, sound, 3d, help, lang', '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->fields['navExtraImage'] = array('type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Nav extra image (desktop)'), 'fileFilter' => $svgFilter); + $this->fields['navExtraImageMobile'] = array('type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Nav extra image (mobile, optional)'), 'fileFilter' => $svgFilter); + $this->fields['navExtraLink'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("URL for Nav extra image")); + $this->forms['general'] = array('label' => __('Fonctionnalités générales'), - 'fieldsnames' => array('navOrder', 'tooltipTimer', 'preload', 'pages', 'width', 'height')); + 'fieldsnames' => array('navOrder', 'navExtraImage', 'navExtraImageMobile', 'navExtraLink', 'tooltipTimer', 'preload', 'pages', 'width', 'height')); //. // diff --git a/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php b/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php index 39019d374..d9a1b7435 100644 --- a/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php @@ -771,6 +771,15 @@ class wsHTML5Compiler { $this->addFilesInfos('archives', $this->wdir . '/' . $this->book->parametres->externalArchives); $this->copy($this->wdir . '/' . $this->book->parametres->externalArchives, $this->vdir . '/data/images/' . $this->book->parametres->externalArchives); } + + if ($this->book->parametres->navExtraImage != '') { + $this->copy($this->wdir . '/' . $this->book->parametres->navExtraImage, $this->vdir . '/data/images/' . $this->book->parametres->navExtraImage); + } + + if ($this->book->parametres->navExtraImageMobile != '') { + $this->copy($this->wdir . '/' . $this->book->parametres->navExtraImageMobile, $this->vdir . '/data/images/' . $this->book->parametres->navExtraImageMobile); + } + } protected function writeLinks() { -- 2.39.5