WIP #1647 @2

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 150f62dddaea283d2970ef743afbc95d2403a6c1..f944b03264469d2f80fde583c32e1e54f48d2777 100644 (file)
--- 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 39019d374b99c880dbd69ff31e0b97db59a0446b..d9a1b7435be3cec9cbb568e5a3756efd1cd45114 100644 (file)
--- 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() {