diff --git a/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml b/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml index ab6961ebb..05ffd290d 100644 --- a/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml +++ b/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml @@ -49,7 +49,6 @@ $service_problems = ( statusSummary->hosts_down || $this->statusSummary->hosts_unreachable): ?>
- translate('Services'); ?> partial( 'tactical/components/parts/servicestatesummarybyhoststate.phtml', array( diff --git a/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml b/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml index f06170c7a..6374ff83d 100644 --- a/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml +++ b/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml @@ -47,7 +47,6 @@
- translate('Services'); ?> partial( 'tactical/components/parts/servicestatesummarybyhoststate.phtml', array( diff --git a/modules/monitoring/application/views/scripts/tactical/index.phtml b/modules/monitoring/application/views/scripts/tactical/index.phtml index b23872960..6639b0c1b 100644 --- a/modules/monitoring/application/views/scripts/tactical/index.phtml +++ b/modules/monitoring/application/views/scripts/tactical/index.phtml @@ -11,7 +11,5 @@ statusSummary->hosts_up || $this->statusSummary->hosts_pending): ?> render('tactical/components/ok_hosts.phtml'); ?> - render('tactical/components/monitoringfeatures.phtml'); ?> - render('tactical/components/hostservicechecks.phtml'); ?>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less index 5a357f795..fff6cbe73 100644 --- a/modules/monitoring/public/css/module.less +++ b/modules/monitoring/public/css/module.less @@ -102,8 +102,6 @@ } .boxview div.box.badge { - border-radius: 3px; - margin: 5px; padding: 5px; } @@ -117,26 +115,41 @@ /* Tactical overview element styles */ .tactical > .boxview > div.box { - min-height: 30em; + min-height: 45em; + padding: 0px; } .tactical div.box.header { - min-height: 5em; - border-bottom:1px solid @gray-lighter; + margin: 10px; + min-height: 8em; + color: @text-color-inverted; + font-size: @font-size-dashboard; +} + +.tactical div.box.badge { + border-radius: 0.0em; } div.box.ok_hosts.state_up { - border: 1px solid @gray-lighter; - border-left: 15px solid @color-ok; + background-color: @color-ok; + border: 1px solid white; } div.box.problem_hosts.state_down { - border: 1px solid @gray-lighter; - border-left: 15px solid @color-critical; + background-color: @color-critical; + border: 1px solid white; } div.box.ok_hosts div.box.entry, div.box.problem_hosts div.box.entry { - min-width: 11.1em; + min-width: 8em; + min-height: 4em; +} + +.tactical div.box.contents { + background-color: white; + min-height: 13em; + font-size: @font-size-dashboard-small; + text-align: left; } div.box.monitoringfeatures { diff --git a/public/css/icinga/base.less b/public/css/icinga/base.less index b2909b18f..595618022 100644 --- a/public/css/icinga/base.less +++ b/public/css/icinga/base.less @@ -39,6 +39,8 @@ // Font sizes @font-size: 0.750em; // 12px @font-size-small: 0.917em; // 11px +@font-size-dashboard: 3.5em; // 56px +@font-size-dashboard-small: 1.1em; // 17px @font-weight-bold: 600; // Set line-height w/o unit so that the line-height is dynamically calculated as font-size * line-height