From 3e195501ac268ae3682e99156cc36814278bc611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jannis=20Mo=C3=9Fhammer?= <jannis.mosshammer@netways.de>
Date: Sat, 21 Sep 2013 17:59:27 +0200
Subject: [PATCH] Fixed issues with click targets

refs #4611
---
 application/layouts/scripts/parts/topbar.phtml | 1 -
 public/js/icinga/components/container.js       | 4 +++-
 public/js/icinga/icinga.js                     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/layouts/scripts/parts/topbar.phtml b/application/layouts/scripts/parts/topbar.phtml
index 2eb0029b4..5dc98a3a5 100755
--- a/application/layouts/scripts/parts/topbar.phtml
+++ b/application/layouts/scripts/parts/topbar.phtml
@@ -21,7 +21,6 @@
         <b class="caret"></b>
       </a>
       <ul class="dropdown-menu">
-        test
         <li id="icinga_app_nav_preferences">
           <a href="<?= $this->href('/preference'); ?>"><?= $this->translate('Preferences'); ?> </a>
         </li>
diff --git a/public/js/icinga/components/container.js b/public/js/icinga/components/container.js
index 7a31a3a46..623b66067 100644
--- a/public/js/icinga/components/container.js
+++ b/public/js/icinga/components/container.js
@@ -422,7 +422,9 @@ define(['jquery', 'logging', 'icinga/componentLoader', 'URIjs/URI', 'URIjs/URITe
             } else {
                 var container = new Container($(targetEl));
                 // detail links render to main by default;
-                Icinga.replaceBodyFromUrl(URI($(targetEl).attr('href')).href());
+                Icinga.replaceBodyFromUrl(
+                    container.updateContainerHref(URI($(targetEl).attr('href')).href())
+                );
 
                 ev.preventDefault();
                 ev.stopPropagation();
diff --git a/public/js/icinga/icinga.js b/public/js/icinga/icinga.js
index 977d67767..1d2636579 100755
--- a/public/js/icinga/icinga.js
+++ b/public/js/icinga/icinga.js
@@ -90,7 +90,7 @@ define([
         };
 
         if (Modernizr.history) {
-            $(document.body).on('click', '#icinganavigation, #icingatopbar', function(ev) {
+            $(document.body).on('click', '#icinganavigation', function(ev) {
                 var targetEl = ev.target || ev.toElement || ev.relatedTarget;
                 if (targetEl.tagName.toLowerCase() !== 'a') {
                     return true;