From 32c64f7e3dcc1592d9cd9ccdb14c3a5685bd6a03 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 13:47:45 +0100
Subject: [PATCH] layout: Do not duplicate code from layout/menu.phtml in
 navigation.phtml

---
 .../layouts/scripts/parts/navigation.phtml    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml
index bed44ba5f..dc56b9199 100644
--- a/application/layouts/scripts/parts/navigation.phtml
+++ b/application/layouts/scripts/parts/navigation.phtml
@@ -3,7 +3,6 @@
 use Icinga\Web\Url;
 use Icinga\Web\Menu;
 use Icinga\Web\MenuRenderer;
-use Icinga\Web\Widget\SearchDashboard;
 
 // Don't render a menu for unauthenticated users unless menu is auth aware
 if (! $this->auth()->isAuthenticated()) {
@@ -11,15 +10,16 @@ if (! $this->auth()->isAuthenticated()) {
 }
 
 ?>
-<div
-    id="menu" data-last-update="<?= (time() - 14) ?>000" data-base-target="_main" class="container" data-icinga-url="<?=$this->href('layout/menu');?>"
-    data-icinga-refresh="15"
->
-  <? if (SearchDashboard::search('dummy')->getPane('search')->hasDashlets()): ?>
-      <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" />
-      </form>
-  <? endif; ?>
-  <?= new MenuRenderer(Menu::load(), Url::fromRequest()->without('renderLayout')->getRelativeUrl()); ?>
+<div  id="menu" data-last-update="<?= (time() - 14) ?>000" data-base-target="_main" class="container"
+      data-icinga-url="<?= $this->href('layout/menu') ?>"  data-icinga-refresh="15">
+    <?= $this->partial(
+        'layout/menu.phtml',
+        'default',
+        array(
+            'menuRenderer' => new MenuRenderer(
+                Menu::load(),
+                Url::fromRequest()->without('renderLayout')->getRelativeUrl()
+            )
+        )
+    ) ?>
 </div>