diff --git a/events.xml b/events.xml index 1f067e648179a7b7b79464dd5f9462583126890c..195edba75261b32235d33445490177b17caef227 100644 --- a/events.xml +++ b/events.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <events> <event on="onSiteSave" fire="\QUI\Menu\EventHandler::onSiteSave"/> + <event on="onProjectConfigSave" fire="\QUI\Menu\EventHandler::onProjectConfigSave"/> <event on="onSmartyInit" fire="\QUI\Menu\EventHandler::onSmartyInit"/> <event on="onAdminLoadFooter" fire="\QUI\Menu\EventHandler::onAdminLoadFooter"/> <event on="onQuiqqerMenuIndependentClear" fire="\QUI\Menu\EventHandler::onQuiqqerMenuIndependentClear"/> diff --git a/settings.xml b/settings.xml index 1bdd95b4115ab90ecad289d79eb62b4da971d102..9be59eb2c653f726c2934630b90c2cdca27d272b 100644 --- a/settings.xml +++ b/settings.xml @@ -16,7 +16,7 @@ <section name="mobileMenu.settings"> <conf name="type"> <type><![CDATA[string]]></type> - <defaultvalue>standard</defaultvalue> + <defaultvalue>slideout</defaultvalue> </conf> </section> <section name="mobileMenu.standard.settings"> @@ -24,18 +24,17 @@ <type><![CDATA[bool]]></type> </conf> <conf name="showLevel"> - <type><![CDATA[string]]></type> + <type><![CDATA[number]]></type> <defaultvalue>1</defaultvalue> </conf> </section> <section name="mobileMenu.slideoutAdvanced.settings"> <conf name="homeLink"> - <type><![CDATA[bool]]></type> - <defaultvalue>true</defaultvalue> + <type><![CDATA[number]]></type> + <defaultvalue>1</defaultvalue> </conf> <conf name="shortDesc"> <type><![CDATA[number]]></type> - <defaultvalue>1</defaultvalue> </conf> </section> </config> @@ -96,7 +95,7 @@ <text> <locale group="quiqqer/menu" var="mobileMenu.settings.type"/> </text> - <option value="slideout"> + <option value="slideout" selected="selected"> <locale group="quiqqer/menu" var="mobileMenu.settings.template.slideout"/> </option> <option value="slideoutAdvanced"> diff --git a/src/QUI/Menu/EventHandler.php b/src/QUI/Menu/EventHandler.php index 16dd66cfc03f0fe6a6c669ecabd690d3c4b67795..a2fd33456422433c8911e29af4044296d6200c70 100644 --- a/src/QUI/Menu/EventHandler.php +++ b/src/QUI/Menu/EventHandler.php @@ -30,6 +30,16 @@ public static function onSiteSave(Site $Site) QUI\Cache\Manager::clear(self::menuCacheName()); } + /** + * Clear system cache on project save + * + * @return void + */ + public static function onProjectConfigSave() + { + QUI\Cache\Manager::clear(self::menuCacheName()); + } + /** * Event : on smarty init * add new brickarea function diff --git a/src/QUI/Menu/SlideOut.php b/src/QUI/Menu/SlideOut.php index 4ea1d6e5ea9f1a0255c3bab29077cd373663efcb..1e0b4a3da7771b14f4147c14b8b8562b26914269 100644 --- a/src/QUI/Menu/SlideOut.php +++ b/src/QUI/Menu/SlideOut.php @@ -23,9 +23,11 @@ class SlideOut extends QUI\Control public function __construct($attributes = []) { $this->setAttributes([ - 'showHomeLink' => true, - 'menuId' => false, // if set independent menu template will be used - 'showFirstLevelIcons' => false // current it works only for independent menu + 'showHomeLink' => true, + 'menuId' => false, // if set independent menu template will be used + 'showFirstLevelIcons' => false, // current it works only for independent menu + 'collapseMobileSubmenu' => false, + 'showLevel' => 1 ]); parent::__construct($attributes); @@ -52,18 +54,18 @@ public function getBody() if ($this->getAttribute('menuId')) { $IndependentMenu = Independent\Handler::getMenu($this->getAttribute('menuId')); - $template = dirname(__FILE__) . '/Menu.Independent.html'; - $params['FileMenu'] = dirname(__FILE__) . '/Menu.Children.Independent.html'; + $template = dirname(__FILE__).'/Menu.Independent.html'; + $params['FileMenu'] = dirname(__FILE__).'/Menu.Children.Independent.html'; $params['IndependentMenu'] = $IndependentMenu; $params['Site'] = $this->getSite(); $params['collapseMobileSubmenu'] = $collapseMobileSubmenu; $params['showLevel'] = $showLevel; $params['showFirstLevelIcons'] = $this->getAttribute('showFirstLevelIcons'); } else { - $template = dirname(__FILE__) . '/Menu.html'; + $template = dirname(__FILE__).'/Menu.html'; $params['collapseMobileSubmenu'] = $collapseMobileSubmenu; $params['showLevel'] = $showLevel; - $params['FileMenu'] = dirname(__FILE__) . '/Menu.Children.html'; + $params['FileMenu'] = dirname(__FILE__).'/Menu.Children.html'; $params['Site'] = $this->getSite(); }