From 076b8a9af934e4a33db2dd42864f8746970cb426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jannis=20Mo=C3=9Fhammer?= Date: Thu, 20 Jun 2013 14:02:58 +0200 Subject: [PATCH] Add rule for 'body' container and QLink property 'target' QLinks can now define the target for their link. Additionally, the targte 'body' is now always the tag. This allows the modulemanager to reload the whole page (with the navigation bar). refs #4092 --- .../layouts/scripts/just-the-body.phtml | 8 --- application/layouts/scripts/layout.phtml | 4 +- .../layouts/scripts/parts/navigation.phtml | 3 +- application/views/helpers/Qlink.php | 5 +- public/js/icinga/modules/mainDetail.js | 71 ++++++++++--------- public/js/icinga/util/async.js | 8 +-- 6 files changed, 49 insertions(+), 50 deletions(-) diff --git a/application/layouts/scripts/just-the-body.phtml b/application/layouts/scripts/just-the-body.phtml index e243e63ed..ee29c44e6 100755 --- a/application/layouts/scripts/just-the-body.phtml +++ b/application/layouts/scripts/just-the-body.phtml @@ -12,14 +12,6 @@
-
- - - - - - -
diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml index cfe89626c..d70627d1b 100755 --- a/application/layouts/scripts/layout.phtml +++ b/application/layouts/scripts/layout.phtml @@ -21,12 +21,12 @@ ICINGA_DEBUG = true; - + - + render('parts/topbar.phtml') ?>
diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml index 1184d1830..e7de8f369 100755 --- a/application/layouts/scripts/parts/navigation.phtml +++ b/application/layouts/scripts/parts/navigation.phtml @@ -5,7 +5,8 @@ $item = $this->navigation->listAll("menu"); ?> -auth()->isAuthenticated()): ?> +auth()->isAuthenticated()): ?> +
    view->baseUrl($url) : $baseUrl . $url; } } -// @codingStandardsIgnoreEnd \ No newline at end of file +// @codingStandardsIgnoreEnd diff --git a/public/js/icinga/modules/mainDetail.js b/public/js/icinga/modules/mainDetail.js index 9a207c933..368c5c5f7 100755 --- a/public/js/icinga/modules/mainDetail.js +++ b/public/js/icinga/modules/mainDetail.js @@ -16,45 +16,52 @@ define(['jquery','logging','icinga/util/async'],function($,log,async) { href = a.attr("href"); ev.stopImmediatePropagation(); collapseDetailView(); + async.loadToTarget("icinga-main",href); + return false; +}; + +var onLinkTagClick = function(ev) { + + var a = $(ev.currentTarget), + target = a.attr("target"), + href = a.attr("href"); + + // check for protocol:// + if(/^[A-Z]{2,10}\:\/\//i.test(href)) { + window.open(href); + ev.stopImmediatePropagation(); + return false; + } + + // check for link in table header + if(a.parents('th').length > 0) { + ev.stopImmediatePropagation(); + return false; + } + + if(typeof target === "undefined") { + if(a.parents("#icinga-detail").length) { + log.debug("Parent is detail, loading into detail"); + async.loadToTarget("icinga-detail",href); + } else { + log.debug("Parent is not detail, loading into main"); async.loadToTarget("icinga-main",href); - return false; - }; - - var onLinkTagClick = function(ev) { - - var a = $(ev.currentTarget), - target = a.attr("target"), - href = a.attr("href"); - - // check for protocol:// - if(/^[A-Z]{2,10}\:\/\//i.test(href)) { - window.open(href); - ev.stopImmediatePropagation(); - return false; - } - - // check for link in table header - if(a.parents('th').length > 0) { - ev.stopImmediatePropagation(); - return false; - } - - if(typeof target === "undefined") { - if(a.parents("#icinga-detail").length) { - async.loadToTarget("icinga-detail",href); - } else { - async.loadToTarget("icinga-main",href); - } - } else { - switch(target) { + } + } else { + switch(target) { + case "body": + async.loadToTarget("body", href); + break; case "main": async.loadToTarget("icinga-main",href); collapseDetailView(); break; case "detail": + log.debug("Target: detail"); async.loadToTarget("icinga-detail",href); break; case "popup": + log.debug("No target"); async.loadToTarget(null,href); break; default: @@ -67,7 +74,7 @@ define(['jquery','logging','icinga/util/async'],function($,log,async) { var expandDetailView = function() { $("#icinga-detail").parents(".collapsed").removeClass('collapsed'); - }; + }; var collapseDetailView = function(elementInDetailView) { $("#icinga-detail").parents(".layout-main-detail").addClass('collapsed'); @@ -88,7 +95,5 @@ define(['jquery','logging','icinga/util/async'],function($,log,async) { } }; }; - return new MainDetailBehaviour(); }); - diff --git a/public/js/icinga/util/async.js b/public/js/icinga/util/async.js index efab52ed7..8e015b45a 100644 --- a/public/js/icinga/util/async.js +++ b/public/js/icinga/util/async.js @@ -5,11 +5,9 @@ define(['icinga/container','logging','icinga/behaviour','jquery'],function(containerMgr,log,behaviour,$) { - var pending = { }; - var getDOMForDestination = function(destination) { var target = destination; if(typeof destination === "string") { @@ -84,13 +82,14 @@ this.loadToTarget = function(destination,url,data) { if(destination) { + log.debug("Laoding to container", destination, url); this.clearPendingRequestsFor(destination); } var req = this.createRequest(url,data); if(destination) { pending.push({ request: req, - DOM: getDOMForDestination(destination) + DOM: getDOMForDestination(destination) }); req.destination = destination; } @@ -105,5 +104,4 @@ }; return new CallInterface(); }); - -})(); \ No newline at end of file +})();