From 57942c8dbfbe1e6b2f99e2c21860befc2254f25b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 4 Mar 2014 16:24:54 +0100
Subject: [PATCH] Fix style information for tactical overview

refs #3782
---
 ...statussummary.phtml => hostsoffline.phtml} | 142 ++----------------
 .../tactical/components/hostsonline.phtml     | 127 ++++++++++++++++
 .../servicestatesummarybyhoststate.phtml      |  40 ++---
 .../views/scripts/tactical/index.phtml        |   3 +-
 public/css/icinga/layout-colors.less          |   4 +-
 public/css/icinga/monitoring-colors.less      |   4 +
 6 files changed, 168 insertions(+), 152 deletions(-)
 rename modules/monitoring/application/views/scripts/tactical/components/{statussummary.phtml => hostsoffline.phtml} (66%)
 create mode 100644 modules/monitoring/application/views/scripts/tactical/components/hostsonline.phtml

diff --git a/modules/monitoring/application/views/scripts/tactical/components/statussummary.phtml b/modules/monitoring/application/views/scripts/tactical/components/hostsoffline.phtml
similarity index 66%
rename from modules/monitoring/application/views/scripts/tactical/components/statussummary.phtml
rename to modules/monitoring/application/views/scripts/tactical/components/hostsoffline.phtml
index 018a90509..01ed2bb62 100644
--- a/modules/monitoring/application/views/scripts/tactical/components/statussummary.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/components/hostsoffline.phtml
@@ -1,127 +1,11 @@
 <span class="state">
     <table>
-        <caption>Status Summary</caption>
+        <caption>Hosts offline</caption>
         <thead>
             <th>Hosts</th>
             <th>Services</th>
         </thead>
         <tbody>
-<?php if ($this->statusSummary->hosts_up): ?>
-            <tr>
-                <td>
-                    <span class="state up">
-                        <a href="<?= $this->href(
-                            'monitoring/list/hosts',
-                            array('host_state' => 0)
-                        ); ?>">
-                            <?= $this->statusSummary->hosts_up; ?> UP
-                        </a>
-<?php if ($this->statusSummary->hosts_up_not_checked): ?>
-                        <span class="state up not_checked">
-                            <a href="<?= $this->href(
-                                'monitoring/list/hosts',
-                                array(
-                                    'host_state' => 0,
-                                    'host_active_checks_enabled' => 0,
-                                    'host_passive_checks_enabled' => 0
-                                )
-                            ); ?>">
-                                <?= $this->statusSummary->hosts_up_not_checked; ?> disabled
-                            </a>
-                        </span>
-<?php endif ?>
-                    </span>
-                </td>
-                <td>
-                    <?= $this->partial(
-                        'tactical/components/parts/servicestatesummarybyhoststate.phtml',
-                        array(
-                            'hostState'                                 => 0,
-                            'services_ok'                               => $this->statusSummary->services_ok_on_up_hosts,
-                            'services_ok_not_checked'                   => $this->statusSummary->services_ok_not_checked_on_up_hosts,
-                            'services_pending'                          => $this->statusSummary->services_pending_on_up_hosts,
-                            'services_pending_not_checked'              => $this->statusSummary->services_pending_not_checked_on_up_hosts,
-                            'services_warning_handled_active'           => $this->statusSummary->services_warning_handled_active_on_up_hosts,
-                            'services_warning_handled_passive'          => $this->statusSummary->services_warning_handled_passive_on_up_hosts,
-                            'services_warning_handled_not_checked'      => $this->statusSummary->services_warning_handled_not_checked_on_up_hosts,
-                            'services_warning_unhandled_active'         => $this->statusSummary->services_warning_unhandled_active_on_up_hosts,
-                            'services_warning_unhandled_passive'        => $this->statusSummary->services_warning_unhandled_passive_on_up_hosts,
-                            'services_warning_unhandled_not_checked'    => $this->statusSummary->services_warning_unhandled_not_checked_on_up_hosts,
-                            'services_critical_handled_active'          => $this->statusSummary->services_critical_handled_active_on_up_hosts,
-                            'services_critical_handled_passive'         => $this->statusSummary->services_critical_handled_passive_on_up_hosts,
-                            'services_critical_handled_not_checked'     => $this->statusSummary->services_critical_handled_not_checked_on_up_hosts,
-                            'services_critical_unhandled_active'        => $this->statusSummary->services_critical_unhandled_active_on_up_hosts,
-                            'services_critical_unhandled_passive'       => $this->statusSummary->services_critical_unhandled_passive_on_up_hosts,
-                            'services_critical_unhandled_not_checked'   => $this->statusSummary->services_critical_unhandled_not_checked_on_up_hosts,
-                            'services_unknown_handled_active'           => $this->statusSummary->services_unknown_handled_active_on_up_hosts,
-                            'services_unknown_handled_passive'          => $this->statusSummary->services_unknown_handled_passive_on_up_hosts,
-                            'services_unknown_handled_not_checked'      => $this->statusSummary->services_unknown_handled_not_checked_on_up_hosts,
-                            'services_unknown_unhandled_active'         => $this->statusSummary->services_unknown_unhandled_active_on_up_hosts,
-                            'services_unknown_unhandled_passive'        => $this->statusSummary->services_unknown_unhandled_passive_on_up_hosts,
-                            'services_unknown_unhandled_not_checked'    => $this->statusSummary->services_unknown_unhandled_not_checked_on_up_hosts
-                        )
-                    ); ?>
-                </td>
-            </tr>
-<?php endif ?>
-<?php if ($this->statusSummary->hosts_pending): ?>
-            <tr>
-                <td>
-                    <span class="state pending">
-                        <a href="<?= $this->href(
-                            'monitoring/list/hosts',
-                            array('host_state' => 99)
-                        ); ?>">
-                            <?= $this->statusSummary->hosts_pending; ?> PENDING
-                        </a>
-<?php if ($this->statusSummary->hosts_pending_not_checked): ?>
-                        <span class="state pending not_checked">
-                            <a href="<?= $this->href(
-                                'monitoring/list/hosts',
-                                array(
-                                    'host_state' => 99,
-                                    'host_active_checks_enabled' => 0,
-                                    'host_passive_checks_enabled' => 0
-                                )
-                            ); ?>">
-                                <?= $this->statusSummary->hosts_pending_not_checked; ?> disabled
-                            </a>
-                        </span>
-<?php endif ?>
-                    </span>
-                </td>
-                <td>
-                    <?= $this->partial(
-                        'tactical/components/parts/servicestatesummarybyhoststate.phtml',
-                        array(
-                            'hostState'                                 => 99,
-                            'services_ok'                               => $this->statusSummary->services_ok_on_pending_hosts,
-                            'services_ok_not_checked'                   => $this->statusSummary->services_ok_not_checked_on_pending_hosts,
-                            'services_pending'                          => $this->statusSummary->services_pending_on_pending_hosts,
-                            'services_pending_not_checked'              => $this->statusSummary->services_pending_not_checked_on_pending_hosts,
-                            'services_warning_handled_active'           => $this->statusSummary->services_warning_handled_active_on_pending_hosts,
-                            'services_warning_handled_passive'          => $this->statusSummary->services_warning_handled_passive_on_pending_hosts,
-                            'services_warning_handled_not_checked'      => $this->statusSummary->services_warning_handled_not_checked_on_pending_hosts,
-                            'services_warning_unhandled_active'         => $this->statusSummary->services_warning_unhandled_active_on_pending_hosts,
-                            'services_warning_unhandled_passive'        => $this->statusSummary->services_warning_unhandled_passive_on_pending_hosts,
-                            'services_warning_unhandled_not_checked'    => $this->statusSummary->services_warning_unhandled_not_checked_on_pending_hosts,
-                            'services_critical_handled_active'          => $this->statusSummary->services_critical_handled_active_on_pending_hosts,
-                            'services_critical_handled_passive'         => $this->statusSummary->services_critical_handled_passive_on_pending_hosts,
-                            'services_critical_handled_not_checked'     => $this->statusSummary->services_critical_handled_not_checked_on_pending_hosts,
-                            'services_critical_unhandled_active'        => $this->statusSummary->services_critical_unhandled_active_on_pending_hosts,
-                            'services_critical_unhandled_passive'       => $this->statusSummary->services_critical_unhandled_passive_on_pending_hosts,
-                            'services_critical_unhandled_not_checked'   => $this->statusSummary->services_critical_unhandled_not_checked_on_pending_hosts,
-                            'services_unknown_handled_active'           => $this->statusSummary->services_unknown_handled_active_on_pending_hosts,
-                            'services_unknown_handled_passive'          => $this->statusSummary->services_unknown_handled_passive_on_pending_hosts,
-                            'services_unknown_handled_not_checked'      => $this->statusSummary->services_unknown_handled_not_checked_on_pending_hosts,
-                            'services_unknown_unhandled_active'         => $this->statusSummary->services_unknown_unhandled_active_on_pending_hosts,
-                            'services_unknown_unhandled_passive'        => $this->statusSummary->services_unknown_unhandled_passive_on_pending_hosts,
-                            'services_unknown_unhandled_not_checked'    => $this->statusSummary->services_unknown_unhandled_not_checked_on_pending_hosts
-                        )
-                    ); ?>
-                </td>
-            </tr>
-<?php endif ?>
 <?php if ($this->statusSummary->hosts_down): ?>
             <tr>
                 <td>
@@ -141,7 +25,7 @@
                                 <?= $this->statusSummary->hosts_down_unhandled; ?> unhandled
                             </a>
 <?php if ($this->statusSummary->hosts_down_unhandled_active): ?>
-                            <span class="state down unhandled active">
+                            <span class="state down unhandled check_active">
                                 <a href="<?= $this->href(
                                     'monitoring/list/hosts',
                                     array(
@@ -155,7 +39,7 @@
                             </span>
 <?php endif ?>
 <?php if ($this->statusSummary->hosts_down_unhandled_passive): ?>
-                            <span class="state down unhandled passive">
+                            <span class="state down unhandled check_passive">
                                 <a href="<?= $this->href(
                                     'monitoring/list/hosts',
                                     array(
@@ -170,7 +54,7 @@
                             </span>
 <?php endif ?>
 <?php if ($this->statusSummary->hosts_down_unhandled_not_checked): ?>
-                            <span class="state down unhandled not_checked">
+                            <span class="state down unhandled check_disabled">
                                 <a href="<?= $this->href(
                                     'monitoring/list/hosts',
                                     array(
@@ -195,7 +79,7 @@
                                 <?= $this->statusSummary->hosts_down_handled; ?> handled
                             </a>
 <?php if ($this->statusSummary->hosts_down_handled_active): ?>
-                            <span class="state down handled active">
+                            <span class="state down handled check_active">
                                 <a href="<?= $this->href(
                                     'monitoring/list/hosts',
                                     array(
@@ -209,7 +93,7 @@
                             </span>
 <?php endif ?>
 <?php if ($this->statusSummary->hosts_down_handled_passive): ?>
-                            <span class="state down handled passive">
+                            <span class="state down handled check_passive">
                                 <a href="<?= $this->href(
                                     'monitoring/list/hosts',
                                     array(
@@ -224,7 +108,7 @@
                             </span>
 <?php endif ?>
 <?php if ($this->statusSummary->hosts_down_handled_not_checked): ?>
-                            <span class="state down handled not_checked">
+                            <span class="state down handled check_disabled">
                                 <a href="<?= $this->href(
                                     'monitoring/list/hosts',
                                     array(
@@ -293,7 +177,7 @@
                                 <?= $this->statusSummary->hosts_unreachable_unhandled; ?> unhandled
                             </a>
 <?php if ($this->statusSummary->hosts_unreachable_unhandled_active): ?>
-                            <span class="state unreachable unhandled active">
+                            <span class="state unreachable unhandled check_active">
                                 <a href="<?= $this->href(
                                     'monitoring/list/hosts',
                                     array(
@@ -307,7 +191,7 @@
                             </span>
 <?php endif ?>
 <?php if ($this->statusSummary->hosts_unreachable_unhandled_passive): ?>
-                            <span class="state unreachable unhandled passive">
+                            <span class="state unreachable unhandled check_passive">
                                 <a href="<?= $this->href(
                                     'monitoring/list/hosts',
                                     array(
@@ -322,7 +206,7 @@
                             </span>
 <?php endif ?>
 <?php if ($this->statusSummary->hosts_unreachable_unhandled_not_checked): ?>
-                            <span class="state unreachable unhandled not_checked">
+                            <span class="state unreachable unhandled check_disabled">
                                 <a href="<?= $this->href(
                                     'monitoring/list/hosts',
                                     array(
@@ -347,7 +231,7 @@
                                 <?= $this->statusSummary->hosts_unreachable_handled; ?> handled
                             </a>
 <?php if ($this->statusSummary->hosts_unreachable_handled_active): ?>
-                            <span class="state unreachable handled active">
+                            <span class="state unreachable handled check_active">
                                 <a href="<?= $this->href(
                                     'monitoring/list/hosts',
                                     array(
@@ -361,7 +245,7 @@
                             </span>
 <?php endif ?>
 <?php if ($this->statusSummary->hosts_unreachable_handled_passive): ?>
-                            <span class="state unreachable handled passive">
+                            <span class="state unreachable handled check_passive">
                                 <a href="<?= $this->href(
                                     'monitoring/list/hosts',
                                     array(
@@ -376,7 +260,7 @@
                             </span>
 <?php endif ?>
 <?php if ($this->statusSummary->hosts_unreachable_handled_not_checked): ?>
-                            <span class="state unreachable handled not_checked">
+                            <span class="state unreachable handled check_disabled">
                                 <a href="<?= $this->href(
                                     'monitoring/list/hosts',
                                     array(
diff --git a/modules/monitoring/application/views/scripts/tactical/components/hostsonline.phtml b/modules/monitoring/application/views/scripts/tactical/components/hostsonline.phtml
new file mode 100644
index 000000000..20e254648
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/tactical/components/hostsonline.phtml
@@ -0,0 +1,127 @@
+<span class="state">
+    <table>
+        <caption>Hosts online</caption>
+        <thead>
+            <th>Hosts</th>
+            <th>Services</th>
+        </thead>
+        <tbody>
+<?php if ($this->statusSummary->hosts_up): ?>
+            <tr>
+                <td>
+                    <span class="state up">
+                        <a href="<?= $this->href(
+                            'monitoring/list/hosts',
+                            array('host_state' => 0)
+                        ); ?>">
+                            <?= $this->statusSummary->hosts_up; ?> UP
+                        </a>
+<?php if ($this->statusSummary->hosts_up_not_checked): ?>
+                        <span class="state up check_disabled">
+                            <a href="<?= $this->href(
+                                'monitoring/list/hosts',
+                                array(
+                                    'host_state' => 0,
+                                    'host_active_checks_enabled' => 0,
+                                    'host_passive_checks_enabled' => 0
+                                )
+                            ); ?>">
+                                <?= $this->statusSummary->hosts_up_not_checked; ?> Not checked
+                            </a>
+                        </span>
+<?php endif ?>
+                    </span>
+                </td>
+                <td>
+                    <?= $this->partial(
+                        'tactical/components/parts/servicestatesummarybyhoststate.phtml',
+                        array(
+                            'hostState'                                 => 0,
+                            'services_ok'                               => $this->statusSummary->services_ok_on_up_hosts,
+                            'services_ok_not_checked'                   => $this->statusSummary->services_ok_not_checked_on_up_hosts,
+                            'services_pending'                          => $this->statusSummary->services_pending_on_up_hosts,
+                            'services_pending_not_checked'              => $this->statusSummary->services_pending_not_checked_on_up_hosts,
+                            'services_warning_handled_active'           => $this->statusSummary->services_warning_handled_active_on_up_hosts,
+                            'services_warning_handled_passive'          => $this->statusSummary->services_warning_handled_passive_on_up_hosts,
+                            'services_warning_handled_not_checked'      => $this->statusSummary->services_warning_handled_not_checked_on_up_hosts,
+                            'services_warning_unhandled_active'         => $this->statusSummary->services_warning_unhandled_active_on_up_hosts,
+                            'services_warning_unhandled_passive'        => $this->statusSummary->services_warning_unhandled_passive_on_up_hosts,
+                            'services_warning_unhandled_not_checked'    => $this->statusSummary->services_warning_unhandled_not_checked_on_up_hosts,
+                            'services_critical_handled_active'          => $this->statusSummary->services_critical_handled_active_on_up_hosts,
+                            'services_critical_handled_passive'         => $this->statusSummary->services_critical_handled_passive_on_up_hosts,
+                            'services_critical_handled_not_checked'     => $this->statusSummary->services_critical_handled_not_checked_on_up_hosts,
+                            'services_critical_unhandled_active'        => $this->statusSummary->services_critical_unhandled_active_on_up_hosts,
+                            'services_critical_unhandled_passive'       => $this->statusSummary->services_critical_unhandled_passive_on_up_hosts,
+                            'services_critical_unhandled_not_checked'   => $this->statusSummary->services_critical_unhandled_not_checked_on_up_hosts,
+                            'services_unknown_handled_active'           => $this->statusSummary->services_unknown_handled_active_on_up_hosts,
+                            'services_unknown_handled_passive'          => $this->statusSummary->services_unknown_handled_passive_on_up_hosts,
+                            'services_unknown_handled_not_checked'      => $this->statusSummary->services_unknown_handled_not_checked_on_up_hosts,
+                            'services_unknown_unhandled_active'         => $this->statusSummary->services_unknown_unhandled_active_on_up_hosts,
+                            'services_unknown_unhandled_passive'        => $this->statusSummary->services_unknown_unhandled_passive_on_up_hosts,
+                            'services_unknown_unhandled_not_checked'    => $this->statusSummary->services_unknown_unhandled_not_checked_on_up_hosts
+                        )
+                    ); ?>
+                </td>
+            </tr>
+<?php endif ?>
+<?php if ($this->statusSummary->hosts_pending): ?>
+            <tr>
+                <td>
+                    <span class="state pending">
+                        <a href="<?= $this->href(
+                            'monitoring/list/hosts',
+                            array('host_state' => 99)
+                        ); ?>">
+                            <?= $this->statusSummary->hosts_pending; ?> PENDING
+                        </a>
+<?php if ($this->statusSummary->hosts_pending_not_checked): ?>
+                        <span class="state pending check_disabled">
+                            <a href="<?= $this->href(
+                                'monitoring/list/hosts',
+                                array(
+                                    'host_state' => 99,
+                                    'host_active_checks_enabled' => 0,
+                                    'host_passive_checks_enabled' => 0
+                                )
+                            ); ?>">
+                                <?= $this->statusSummary->hosts_pending_not_checked; ?> Not checked
+                            </a>
+                        </span>
+<?php endif ?>
+                    </span>
+                </td>
+                <td>
+                    <?= $this->partial(
+                        'tactical/components/parts/servicestatesummarybyhoststate.phtml',
+                        array(
+                            'hostState'                                 => 99,
+                            'services_ok'                               => $this->statusSummary->services_ok_on_pending_hosts,
+                            'services_ok_not_checked'                   => $this->statusSummary->services_ok_not_checked_on_pending_hosts,
+                            'services_pending'                          => $this->statusSummary->services_pending_on_pending_hosts,
+                            'services_pending_not_checked'              => $this->statusSummary->services_pending_not_checked_on_pending_hosts,
+                            'services_warning_handled_active'           => $this->statusSummary->services_warning_handled_active_on_pending_hosts,
+                            'services_warning_handled_passive'          => $this->statusSummary->services_warning_handled_passive_on_pending_hosts,
+                            'services_warning_handled_not_checked'      => $this->statusSummary->services_warning_handled_not_checked_on_pending_hosts,
+                            'services_warning_unhandled_active'         => $this->statusSummary->services_warning_unhandled_active_on_pending_hosts,
+                            'services_warning_unhandled_passive'        => $this->statusSummary->services_warning_unhandled_passive_on_pending_hosts,
+                            'services_warning_unhandled_not_checked'    => $this->statusSummary->services_warning_unhandled_not_checked_on_pending_hosts,
+                            'services_critical_handled_active'          => $this->statusSummary->services_critical_handled_active_on_pending_hosts,
+                            'services_critical_handled_passive'         => $this->statusSummary->services_critical_handled_passive_on_pending_hosts,
+                            'services_critical_handled_not_checked'     => $this->statusSummary->services_critical_handled_not_checked_on_pending_hosts,
+                            'services_critical_unhandled_active'        => $this->statusSummary->services_critical_unhandled_active_on_pending_hosts,
+                            'services_critical_unhandled_passive'       => $this->statusSummary->services_critical_unhandled_passive_on_pending_hosts,
+                            'services_critical_unhandled_not_checked'   => $this->statusSummary->services_critical_unhandled_not_checked_on_pending_hosts,
+                            'services_unknown_handled_active'           => $this->statusSummary->services_unknown_handled_active_on_pending_hosts,
+                            'services_unknown_handled_passive'          => $this->statusSummary->services_unknown_handled_passive_on_pending_hosts,
+                            'services_unknown_handled_not_checked'      => $this->statusSummary->services_unknown_handled_not_checked_on_pending_hosts,
+                            'services_unknown_unhandled_active'         => $this->statusSummary->services_unknown_unhandled_active_on_pending_hosts,
+                            'services_unknown_unhandled_passive'        => $this->statusSummary->services_unknown_unhandled_passive_on_pending_hosts,
+                            'services_unknown_unhandled_not_checked'    => $this->statusSummary->services_unknown_unhandled_not_checked_on_pending_hosts
+                        )
+                    ); ?>
+                </td>
+            </tr>
+<?php endif ?>
+        </tbody>
+    </table>
+</span>
diff --git a/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml b/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml
index 51ed78c53..d3538f29b 100644
--- a/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml
@@ -30,7 +30,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
             <?= $services_critical_unhandled; ?> unhandled
         </a>
 <?php if ($services_critical_unhandled_active): ?>
-        <span class="state critical unhandled active">
+        <span class="state critical unhandled check_active">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -45,7 +45,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
         </span>
 <?php endif ?>
 <?php if ($services_critical_unhandled_passive): ?>
-        <span class="state critical unhandled passive">
+        <span class="state critical unhandled check_passive">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -61,7 +61,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
         </span>
 <?php endif ?>
 <?php if ($services_critical_unhandled_not_checked): ?>
-        <span class="state critical unhandled not_checked">
+        <span class="state critical unhandled check_disabled">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -87,7 +87,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
             <?= $services_critical_handled; ?> handled
         </a>
 <?php if ($services_critical_handled_active): ?>
-        <span class="state critical handled active">
+        <span class="state critical handled check_active">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -102,7 +102,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
         </span>
 <?php endif ?>
 <?php if ($services_critical_handled_passive): ?>
-        <span class="state critical handled passive">
+        <span class="state critical handled check_passive">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -118,7 +118,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
         </span>
 <?php endif ?>
 <?php if ($services_critical_handled_not_checked): ?>
-        <span class="state critical handled not_checked">
+        <span class="state critical handled check_disabled">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -154,7 +154,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
             <?= $services_warning_unhandled; ?> unhandled
         </a>
 <?php if ($services_warning_unhandled_active): ?>
-        <span class="state warning unhandled active">
+        <span class="state warning unhandled check_active">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -169,7 +169,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
         </span>
 <?php endif ?>
 <?php if ($services_warning_unhandled_passive): ?>
-        <span class="state warning unhandled passive">
+        <span class="state warning unhandled check_passive">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -185,7 +185,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
         </span>
 <?php endif ?>
 <?php if ($services_warning_unhandled_not_checked): ?>
-        <span class="state warning unhandled not_checked">
+        <span class="state warning unhandled check_disabled">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -211,7 +211,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
             <?= $services_warning_handled; ?> handled
         </a>
 <?php if ($services_warning_handled_active): ?>
-        <span class="state warning handled active">
+        <span class="state warning handled check_active">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -226,7 +226,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
         </span>
 <?php endif ?>
 <?php if ($services_warning_handled_passive): ?>
-        <span class="state warning handled passive">
+        <span class="state warning handled check_passive">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -242,7 +242,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
         </span>
 <?php endif ?>
 <?php if ($services_warning_handled_not_checked): ?>
-        <span class="state warning handled not_checked">
+        <span class="state warning handled check_disabled">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -278,7 +278,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
             <?= $services_unknown_unhandled; ?> unhandled
         </a>
 <?php if ($services_unknown_unhandled_active): ?>
-        <span class="state unknown unhandled active">
+        <span class="state unknown unhandled check_active">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -293,7 +293,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
         </span>
 <?php endif ?>
 <?php if ($services_unknown_unhandled_passive): ?>
-        <span class="state unknown unhandled passive">
+        <span class="state unknown unhandled check_passive">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -309,7 +309,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
         </span>
 <?php endif ?>
 <?php if ($services_unknown_unhandled_not_checked): ?>
-        <span class="state unknown unhandled not_checked">
+        <span class="state unknown unhandled check_disabled">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -335,7 +335,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
             <?= $services_unknown_handled; ?> handled
         </a>
 <?php if ($services_unknown_handled_active): ?>
-        <span class="state unknown handled not_checked">
+        <span class="state unknown handled check_disabled">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -350,7 +350,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
         </span>
 <?php endif ?>
 <?php if ($services_unknown_handled_passive): ?>
-        <span class="state unknown handled not_checked">
+        <span class="state unknown handled check_disabled">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -366,7 +366,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
         </span>
 <?php endif ?>
 <?php if ($services_unknown_handled_not_checked): ?>
-        <span class="state unknown handled not_checked">
+        <span class="state unknown handled check_disabled">
             <a href="<?= $this->href(
                 'monitoring/list/services',
                 array(
@@ -394,7 +394,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
         <?= $services_ok; ?> OK
     </a>
 <?php if ($services_ok_not_checked): ?>
-    <span class="state ok not_checked">
+    <span class="state ok check_disabled">
         <a href="<?= $this->href(
             'monitoring/list/services',
             array(
@@ -419,7 +419,7 @@ $services_unknown = $services_unknown_handled + $services_unknown_unhandled;
         <?= $services_pending; ?> PENDING
     </a>
 <?php if ($services_pending_not_checked): ?>
-    <span class="state pending not_checked">
+    <span class="state pending check_disabled">
         <a href="<?= $this->href(
             'monitoring/list/services',
             array(
diff --git a/modules/monitoring/application/views/scripts/tactical/index.phtml b/modules/monitoring/application/views/scripts/tactical/index.phtml
index 2d650991f..c8b2f2513 100644
--- a/modules/monitoring/application/views/scripts/tactical/index.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/index.phtml
@@ -1,7 +1,8 @@
 <div class="content">
     <div class="summary" data-base-target="col2">
+        <?= $this->render('tactical/components/hostsonline.phtml'); ?>
+        <?= $this->render('tactical/components/hostsoffline.phtml'); ?>
         <?= $this->render('tactical/components/hostservicechecks.phtml'); ?>
         <?= $this->render('tactical/components/monitoringfeatures.phtml'); ?>
-        <?= $this->render('tactical/components/statussummary.phtml'); ?>
     </div>
 </div>
diff --git a/public/css/icinga/layout-colors.less b/public/css/icinga/layout-colors.less
index f4052ba2d..1d9211675 100644
--- a/public/css/icinga/layout-colors.less
+++ b/public/css/icinga/layout-colors.less
@@ -52,8 +52,8 @@
 @colorUnreachableHandled: #ee99ff;
 @colorActiveCheck: #44bb77;
 @colorPassiveCheck: #44ccaa;
-@colorDisabledCheck: #ff5566;
+@colorDisabledCheck: #cccccc;
 @colorEnabled: #44bb77;
 @colorDisabled: #cccccc;
-@colorFlapping: #ff5566;
+@colorFlapping: #16c3cc;
 
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index c1bfa8ae2..0902817e2 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -374,6 +374,10 @@ span.state.flapping {
   color: #333;
 }
 
+.summary span.state.check_disabled > a {
+  color: #333;
+}
+
 .summary span.state {
   width: 26em;
   vertical-align: top;