From f46aada71106a9d5aa4c2da9da37762f3ef20579 Mon Sep 17 00:00:00 2001 From: "stephen@cubedesigners.com" Date: Fri, 6 Oct 2017 09:39:46 +0000 Subject: [PATCH] WIP #1715 @0.5 --- inc/ws/Metier/class.ws.book.parametres.php | 4 +++- inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index 1f89a9ebc..5c6103513 100644 --- a/inc/ws/Metier/class.ws.book.parametres.php +++ b/inc/ws/Metier/class.ws.book.parametres.php @@ -366,6 +366,8 @@ class wsBookParametres extends wsParametres { $this->fields['navOrderH'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Ordre des icônes dans la nav') . ' (' . __('Si différente') . ')', 'grade' => 3); + $this->fields['menuBreakpoint'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Override menu breakpoint'), 'hint' => 'eg. 1080px / 67.5em', 'grade' => 3); + $this->fields['mobileTransitions'] = array('type' => 'combo', 'default' => 'flip', 'editable' => true, 'label' => __('Transitions entre les pages'), 'grade' => 3, 'datas' => array(__('Aucune transition') => 'none', @@ -397,7 +399,7 @@ class wsBookParametres extends wsParametres { $this->fields['mobileIgnoreBackgroundLinks'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Ignorer les liens de background')); $this->forms['mobile'] = array('label' => __('Version mobile'), - 'fieldsnames' => array('alwaysHTML5', 'html5priority', 'mobileNavigationType', '|', 'rasterizePages', 'vectorPages', '|', 'mobileNavScale', '|', 'mobileTransitions', 'mobileTransitionDuration', "mobileLinksRevealAnim", '|', 'navOrderH', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath', '|', 'mobileExtraXSpace', '|', 'mobileIgnoreBackgroundLinks')); + 'fieldsnames' => array('alwaysHTML5', 'html5priority', 'mobileNavigationType', '|', 'rasterizePages', 'vectorPages', '|', 'mobileNavScale', '|', 'mobileTransitions', 'mobileTransitionDuration', "mobileLinksRevealAnim", '|', 'menuBreakpoint', 'navOrderH', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath', '|', 'mobileExtraXSpace', '|', 'mobileIgnoreBackgroundLinks')); $this->fields['phonegapId'] = array('type' => 'text', 'default' => 'com.fluidbook.phonegap.$id', 'editable' => true, 'label' => __("Identifiant de l'identifiant"), 'grade' => 5, 'hint' => __('De la forme') . ' com.fluidbook.phonegap.xxxxx'); 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 53fe21393..2f99a62a0 100644 --- a/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php @@ -1328,7 +1328,9 @@ class wsHTML5Compiler { $menuColor = new CubeIT_Graphics_Color($this->theme->parametres->couleurB); $menuColor->setAlpha(1); $menuTextColor = wsHTML5::colorToCSS($this->theme->parametres->subTextColor); + $menuBreakpoint = empty($this->book->parametres->menuBreakpoint) ? '1080px' : $this->book->parametres->menuBreakpoint; + $lessVariables['menu-breakpoint'] = $menuBreakpoint; $lessVariables['menu-background'] = $menuColor->toCSS(); $lessVariables['menu-text'] = $menuTextColor; $lessVariables['menu-field-background'] = wsHTML5::colorToCSS($this->theme->parametres->subFieldColor); -- 2.39.5