Merge branch 'bugfix/state-colors-in-plugin-output-10670'

fixes #10670
Icinga · Dec 21, 2015 · 9f8ee4f · 9f8ee4f
2 parents 772ea10 + b49cefa
commit 9f8ee4f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -20,10 +20,10 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
         "\n",
         "\t",
         "\n",
-        '<span class="state ok">$1OK$2</span>',
-        '<span class="state warning">$1WARNING$2</span>',
-        '<span class="state critical">$1CRITICAL$2</span>',
-        '<span class="state error">$1UNKNOWN$2</span>',
+        '<span class="state-ok">$1OK$2</span>',
+        '<span class="state-warning">$1WARNING$2</span>',
+        '<span class="state-critical">$1CRITICAL$2</span>',
+        '<span class="state-unknown">$1UNKNOWN$2</span>',
         '@@@@@@',
     );
 
@@ -54,9 +54,9 @@ public function pluginOutput($output, $raw = false)
 
         if (! $raw) {
             if ($isHtml) {
-                $output = '<div class="pluginoutput">' . $output . '</div>';
+                $output = '<div class="plugin-output">' . $output . '</div>';
             } else {
-                $output = '<div class="pluginoutput preformatted">' . $output . '</div>';
+                $output = '<div class="plugin-output preformatted">' . $output . '</div>';
             }
         }
         return $output;

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
@@ -415,9 +415,33 @@ form.instance-features span.description, form.object-features span.description {
   }
 }
 
-div.pluginoutput {
+.plugin-output {
   border-left: 5px solid @gray-lighter;
   padding: 0.66em 0.33em;
+
+  .state-critical {
+    background-color: @color-critical;
+    color: @body-bg-color;
+    padding: 0.2em;
+  }
+
+  .state-ok {
+    background-color: @color-ok;
+    color: @body-bg-color;
+    padding: 0.2em;
+  }
+
+  .state-unknown {
+    background-color: @color-unknown;
+    color: @body-bg-color;
+    padding: 0.2em;
+  }
+
+  .state-warning {
+    background-color: @color-warning;
+    color: @body-bg-color;
+    padding: 0.2em;
+  }
 }
 
 .go-ahead > a {