Fixes Pluginoutput

This commit is contained in:
Bernd Erk 2014-11-17 18:02:16 +01:00
parent 245c247ff3
commit 66ecb2dc9f
4 changed files with 20 additions and 14 deletions

View File

@ -7,6 +7,7 @@ if ($this->compact): ?>
<div class="controls">
<?= $this->tabs ?>
<div style="margin: 1em;" class="dontprint">
<?= $this->render('list/components/selectioninfo.phtml') ?>
<?= $this->render('list/components/hostssummary.phtml') ?>
<?= $this->translate('Sort by') ?> <?= $this->sortControl->render($this) ?>
</div>
@ -14,7 +15,6 @@ if ($this->compact): ?>
<?= $this->widget('limiter')->setMaxLimit($this->hosts->count()) ?>
<?= $this->paginationControl($hosts, null, null, array('preserve' => $this->preserve)) ?>
<?= $this->selectionToolbar('multi', $this->href('monitoring/hosts/show?' . $this->filter->toQueryString())) ?>
<?= $this->render('list/components/selectioninfo.phtml') ?>
</div>
<div class="content">

View File

@ -7,6 +7,7 @@ if (!$this->compact): ?>
<div class="controls">
<?= $this->tabs ?>
<div style="margin: 1em;" class="dontprint">
<?= $this->render('list/components/selectioninfo.phtml') ?>
<?= $this->render('list/components/servicesummary.phtml') ?>
<div style="float: right">
<?= $this->translate('Sort by') ?> <?= $this->sortControl ?>
@ -18,10 +19,6 @@ if (!$this->compact): ?>
<?= $this->widget('limiter')->setCurrentPageCount($this->services->count()) ?>
<?= $this->paginationControl($services, null, null, array('preserve' => $this->preserve)) ?>
<?php endif ?>
<!--
<?= $this->selectionToolbar('multi', $this->href('monitoring/services/show?' . $this->filterEditor->getFilter()->toQueryString())) ?>
<?= $this->render('list/components/selectioninfo.phtml') ?>
-->
</div>
<div class="content">

View File

@ -1,2 +1,5 @@
<div class="pluginoutput">
<h4>Pluginoutput</h4>
<?= $this->pluginOutput($object->output) ?>
<?= $this->pluginOutput($object->long_output) ?>
</div>

View File

@ -20,16 +20,21 @@ p.pluginoutput {
white-space: pre-wrap;
}
pre.pluginoutput {
font-family: Courier;
background: #eee;
font-size: 0.7em;
div.pluginoutput {
border-right: solid 5px @colorPetrol;
overflow: auto;
white-space: pre-wrap;
margin: 0em;
padding: 1em;
margin-bottom: 0.5em;
color: black;
margin-bottom: 1em;
padding: 0.2em;
}
div.pluginoutput h4 {
font-size: 0.875em;
margin: 0em;
}
div.pluginoutput pre{
white-space: pre-wrap;
}
table.objecthistory td {
@ -156,5 +161,6 @@ table.avp .customvar ul {
}
div.selection-info {
padding-top:1em;
padding-top:0.5em;
float: right;
}