From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 30 Jan 2018 16:35:40 +0000 (+0000)
Subject: wait #1903 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=986cd2519b85a12dee442c4361ee223c5998de85;p=cubeextranet.git

wait #1903 @0.5
---

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 4f67a1618..0865c654e 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -69,6 +69,10 @@ class wsBookParametres extends wsParametres {
 			__('Navigation burger') => 'burger',
 			__('Navigations horizontale et burger') => 'both'];
 
+		$extraType = [
+			__('Icône + Label') => 'icon',
+			__('Image') => 'image'];
+
 		$this->fields['mobileLVersion'] = array('type' => 'combo', 'default' => 'stable', 'editable' => true,
 		                                        'label' => __('Version logicielle'), 'grade' => 1,
 		                                        'datas' => $branches
@@ -158,9 +162,10 @@ class wsBookParametres extends wsParametres {
 			if ($i > 0) {
 				$j = $i;
 				$this->fields['navExtraIcon' . $j] = array('type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Icône supplémentaire') . ' ' . $j, 'fileFilter' => $imageExtraFilter);
+				$this->fields['navExtraType' . $j] = array('type' => 'combo', 'datas' => $extraType, 'default' => 'icon', 'editable' => true, 'label' => __('Type'));
 				$this->fields['navExtraLink' . $j] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("URL") . ' ' . $j);
 				$this->fields['navExtraVisibility' . $j] = array('type' => 'combo', 'datas' => $extraVisibility, 'default' => 'both', 'editable' => true, 'label' => __("Visible") . ' ' . $j);
-				$this->forms['menu']['fieldsnames'] = array_merge($this->forms['menu']['fieldsnames'], ['navExtraIcon' . $j, 'navExtraLink' . $j, 'navExtraVisibility' . $j, '|']);
+				$this->forms['menu']['fieldsnames'] = array_merge($this->forms['menu']['fieldsnames'], ['navExtraIcon' . $j, 'navExtraType' . $j, 'navExtraLink' . $j, 'navExtraVisibility' . $j, '|']);
 			} else {
 				$j = '';
 				$this->fields['navExtraImage' . $j] = array('type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Image pour navigation'), 'fileFilter' => $imageExtraFilter);
@@ -172,8 +177,8 @@ class wsBookParametres extends wsParametres {
 		}
 
 
-        $this->fields['landingPage'] = array('type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Landing Page content'), 'grade' => 3);
-        $this->forms['landing'] = array('label' => __('Custom Landing Page'), 'fieldsnames' => array('landingPage'));
+		$this->fields['landingPage'] = array('type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Landing Page content'), 'grade' => 3);
+		$this->forms['landing'] = array('label' => __('Custom Landing Page'), 'fieldsnames' => array('landingPage'));
 
 
 		$this->fields['fullscreen'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le mode plein-écran'));