From 715cad86d548a16974850d2e2ea8799c3ddee784 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 4 Mar 2014 10:52:37 +0000 Subject: [PATCH] No more layout container handling outside of layout.phtml * Also added a few base-targets to get rid of hard-coded JS rules --- application/layouts/scripts/body.phtml | 7 ++----- application/layouts/scripts/layout.phtml | 3 +++ .../layouts/scripts/parts/navigation.phtml | 18 +++++++++++------- .../views/scripts/authentication/login.phtml | 6 ++---- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml index 995d3baae..1c26c4117 100644 --- a/application/layouts/scripts/body.phtml +++ b/application/layouts/scripts/body.phtml @@ -1,9 +1,8 @@ isAuthenticated()): ?> -
-
render('inline.phtml') ?> - diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml index 8c675365f..f8da646e5 100644 --- a/application/layouts/scripts/layout.phtml +++ b/application/layouts/scripts/layout.phtml @@ -41,7 +41,10 @@ $jsfiles = array( +

+

 render('body.phtml') ?>
+

 
 
 
diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml
index 99c8e07c4..176c71bc3 100644
--- a/application/layouts/scripts/parts/navigation.phtml
+++ b/application/layouts/scripts/parts/navigation.phtml
@@ -1,20 +1,24 @@
 auth()->isAuthenticated()) {
     return;
 }
 
 // Current url
-$url = Icinga\Web\Url::fromRequest()->getRelativeUrl();
-$menu = Icinga\Web\Menu::fromConfig();
-
+$url = Url::fromRequest()->remove('_render')->getRelativeUrl();
+$menu = Menu::fromConfig();
 ?>
-