From: stephen@cubedesigners.com <stephen@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 2 Oct 2017 15:21:44 +0000 (+0000)
Subject: WIP #1707 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ef76184d7d93720265bd5d5b475c53bc07772d16;p=cubeextranet.git

WIP #1707 @1
---

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 7fff9f666..16df2c0e1 100644
--- 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 99f968245..1541e237b 100644
--- 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])) {