WIP #1707 @1

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 7fff9f666347498de19b7817ce252b18e8f142b9..16df2c0e18a3c80b72ada95fcdcc49e32bb6e068 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -139,9 +139,10 @@ class wsBookParametres extends wsParametres {
                $this->fields['navExtraImage'] = array('type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Nav extra image (desktop)'), 'fileFilter' => $imageExtraFilter);
                $this->fields['navExtraImageMobile'] = array('type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Nav extra image (mobile, optional)'), 'fileFilter' => $imageExtraFilter);
                $this->fields['navExtraLink'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("URL for Nav extra image"));
+               $this->fields['navExtraTooltip'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Tooltip for Nav extra image"));
 
                $this->forms['general'] = array('label' => __('Fonctionnalités générales'),
-                                               'fieldsnames' => array('navOrder', 'navExtraImage', 'navExtraImageMobile', 'navExtraLink', 'tooltipTimer', 'preload', 'pages', 'width', 'height'));
+                                               'fieldsnames' => array('navOrder', 'navExtraImage', 'navExtraImageMobile', 'navExtraLink', 'navExtraTooltip', '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 99f9682458bdb4cfb24d16d4220883b3cddb7a0e..1541e237ba68f2ea31fb2e6b22f44359dcc6ce05 100644 (file)
--- a/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php
@@ -835,6 +835,13 @@ class wsHTML5Compiler {
                                continue;
                        }
 
+                       // Make old "aftersearch" link compatible with new "extra" menu option by extracting link URL
+            if ($link->page == 'aftersearch') {
+                           $this->config->afterSearchLink = $link->to;
+                           $this->config->afterSearchTooltip = $link->infobulle;
+            }
+
+
                        $c = $link->getHTMLContainer();
                        $css[] = $link->getCSSContainer();
                        if (!isset($pages[$link->page])) {