From db22945f1e78825c221863bea23292dcefe4d2b6 Mon Sep 17 00:00:00 2001 From: Alexander Klimov Date: Thu, 23 Jan 2014 17:09:46 +0100 Subject: [PATCH] Add close button to details resolves #4925 --- application/views/helpers/MainDetail.php | 9 +++++++++ public/js/icinga/components/container.js | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/application/views/helpers/MainDetail.php b/application/views/helpers/MainDetail.php index 398e93352..28c021381 100644 --- a/application/views/helpers/MainDetail.php +++ b/application/views/helpers/MainDetail.php @@ -46,6 +46,15 @@ class Zend_View_Helper_MainDetail extends Zend_View_Helper_Abstract {{MAIN_CONTENT}} +
{{DETAIL_CONTENT}}
diff --git a/public/js/icinga/components/container.js b/public/js/icinga/components/container.js index 4f326359c..c10997099 100644 --- a/public/js/icinga/components/container.js +++ b/public/js/icinga/components/container.js @@ -411,6 +411,7 @@ define(['jquery', 'logging', 'icinga/componentLoader', 'URIjs/URI', 'URIjs/URITe * Available as a static method on the Container object or as an instance method */ Container.prototype.showDetail = Container.showDetail = function() { + $('#icingadetailClose').removeClass('hidden'); var mainDom = Container.getMainContainer().containerDom, detailDom = Container.getDetailContainer().containerDom; @@ -435,6 +436,7 @@ define(['jquery', 'logging', 'icinga/componentLoader', 'URIjs/URI', 'URIjs/URITe * Available as a static method on the Container object or as an instance method */ Container.prototype.hideDetail = Container.hideDetail = function() { + $('#icingadetailClose').addClass('hidden'); cancelPendingRequest(); urlMgr.setDetailUrl(''); var mainDom = Container.getMainContainer().containerDom, @@ -491,5 +493,9 @@ define(['jquery', 'logging', 'icinga/componentLoader', 'URIjs/URI', 'URIjs/URITe Container.getDetailContainer().replaceDomAsync(urlMgr.detailUrl); } + $('#icingadetailClose').click(function(){ + detailContainer.hideDetail(); + }); + return Container; });