From 5196f16bdeef69d408a45e56fe26cdbc61df76b7 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 20 Apr 2015 13:06:45 +0200 Subject: [PATCH] Do not forcibly hide controls in the dashboard Our views respect view=compact now entirely so there is no need for such a generic "solution" since it also prevents some views from being completely displayed in the dashboard such as the host, service and contact detail view. refs #7876 --- public/css/icinga/layout-structure.less | 2 +- public/js/icinga/ui.js | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less index 23a598b522..9d0d38def6 100644 --- a/public/css/icinga/layout-structure.less +++ b/public/css/icinga/layout-structure.less @@ -163,7 +163,7 @@ html { } .dashboard .controls { - display: none; + padding: 0; } /* Not growing larger than 3840px at 1em=16px right now */ diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js index 2c85a2df91..3bfb87c619 100644 --- a/public/js/icinga/ui.js +++ b/public/js/icinga/ui.js @@ -716,8 +716,6 @@ }, initializeControls: function (parent) { - - var self = this; if ($(parent).closest('.dashboard').length) { return; } @@ -747,7 +745,6 @@ }, fixControls: function ($parent) { - var self = this; if ('undefined' === typeof $parent) { @@ -773,6 +770,11 @@ $('.controls', $parent).each(function (idx, el) { var $el = $(el); + + if ($el.closest('.dashboard').length) { + return; + } + var $fake = $el.next('.fake-controls'); var y = $parent.scrollTop();