Skip to content
Code-Schnipsel Gruppen Projekte
Commit 8f791ff4 erstellt von Michael Danielczok's avatar Michael Danielczok
Dateien durchsuchen

Merge branch 'master' into 2.8

Übergeordnete 108b1bdf c723c1bb
No related branches found
No related tags found
Keine zugehörigen Merge Requests gefunden
<?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"/>
......
......@@ -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">
......
......@@ -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
......
......@@ -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();
}
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren