tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 08:14:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change Menu load from config ini files to self provided configuration

Browse Source 
refs #6639
This commit is contained in:
Alexander Fuhr 2014-08-22 11:10:17 +02:00
parent 7e0047d00e
commit f757f69bd1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/controllers/LayoutController.php
View File

@ -18,8 +18,9 @@ class LayoutController extends ActionController
*/ */
public function menuAction() public function menuAction()
{ {
$this->_helper->layout()->disableLayout();
$this->view->menuRenderer = new MenuRenderer( $this->view->menuRenderer = new MenuRenderer(
Menu::fromConfig()->order(), Url::fromRequest()->without('renderLayout')->getRelativeUrl() Menu::load(), Url::fromRequest()->without('renderLayout')->getRelativeUrl()
); );
} }

2
application/layouts/scripts/parts/navigation.phtml
View File

@ -14,5 +14,5 @@ if (! $this->auth()->isAuthenticated()) {
<form action="<?= $this->href('search') ?>" method="get" role="search"> <form action="<?= $this->href('search') ?>" method="get" role="search">
<input type="text" name="q" class="search autofocus" placeholder="<?= $this->translate('Search...') ?>" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" /> <input type="text" name="q" class="search autofocus" placeholder="<?= $this->translate('Search...') ?>" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
</form> </form>
<?= new MenuRenderer(Menu::fromConfig()->order(), Url::fromRequest()->without('renderLayout')->getRelativeUrl()); ?> <?= new MenuRenderer(Menu::load(), Url::fromRequest()->without('renderLayout')->getRelativeUrl()); ?>
</div> </div>