tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

fixes #10670
This commit is contained in:
Eric Lippmann 2015-12-21 13:06:43 +01:00
parent 772ea1026b b49cefa45d
commit 9f8ee4fb69
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/monitoring/application/views/helpers/PluginOutput.php
View File

@ -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 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
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;

26
modules/monitoring/public/css/module.less
View File

@ -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 {