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

monitoring: Reduce header size for multiple selected hosts 

refs #5543
This commit is contained in:
Eric Lippmann 2015-11-10 16:54:02 +01:00
parent 92a2727a0b
commit 317bb24856
2 changed files with 53 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
modules/monitoring/application/controllers/HostsController.php
View File

@ -52,21 +52,18 @@ class HostsController extends Controller
protected function handleCommandForm(ObjectsCommandForm $form)
{
$this->hostList->setColumns(array(
'host_icon_image',
'host_icon_image_alt',
'host_name',
'host_address',
'host_address6',
'host_state',
'host_problem',
'host_handled',
'host_acknowledged',
'host_active_checks_enabled',
'host_display_name',
'host_handled',
'host_in_downtime',
'host_is_flapping',
'host_output',
'host_last_state_change',
'host_name',
'host_notifications_enabled',
'host_active_checks_enabled',
'host_passive_checks_enabled'
'host_passive_checks_enabled',
'host_problem',
'host_state'
));
$form
@ -90,24 +87,18 @@ class HostsController extends Controller
->handleRequest();
$this->view->checkNowForm = $checkNowForm;
$this->hostList->setColumns(array(
'host_icon_image',
'host_icon_image_alt',
'host_name',
'host_address',
'host_address6',
'host_state',
'host_problem',
'host_handled',
'host_acknowledged',
'host_active_checks_enabled',
'host_display_name',
'host_handled',
'host_in_downtime',
'host_is_flapping',
'host_output',
'host_last_state_change',
'host_name',
'host_notifications_enabled',
'host_active_checks_enabled',
'host_passive_checks_enabled'
/*'host_event_handler_enabled',
'host_flap_detection_enabled',
'host_obsessing'*/
'host_passive_checks_enabled',
'host_problem',
'host_state'
));
$acknowledgedObjects = $this->hostList->getAcknowledgedObjects();

81
modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
View File

@ -1,48 +1,41 @@
<?php
use Icinga\Module\Monitoring\Object\Host;
$i = 0;
?>
<?php if (($hostCount = count($objects)) > 0): ?>
<table class="action state statesummary">
<tbody>
<?php foreach ($objects as $host): /** @var Host $host */ ?>
<?php
if (++ $i > 5) {
continue;
}
?>
<tr>
<td class="state-col state-<?= Host::getStateText($host->host_state); ?><?= $host->host_handled ? ' handled' : '' ?>">
<?= Host::getStateText($host->host_state, true); ?>
<br />
</td>
<td>
<?= $this->iconImage()->host($host) ?>
<?= implode(' ', $this->hostFlags($host)) ?>
<b><?= $this->escape($host->getName()); ?></b><br>
<?= $this->escape($host->host_output) ?>
</td>
</tr>
<?php endforeach ?>
</tbody>
</table>
<div class="hbox-item multi-commands">
<?php if ($i > 5): ?>
<?=
$this->qlink(
sprintf($this->translate('show all %d hosts'), $i),
$listAllLink,
null,
array(
'icon' => 'down-open',
'data-base-target' => '_next'
)
);
?>
<?php endif ?>
</div>
if (! ($hostCount = count($objects))): return; endif ?>
<table class="state-table">
<tbody>
<?php foreach ($objects as $i => $host): /** @var Host $host */
if ($i === 5) {
break;
} ?>
<tr>
<td class="state-col state-<?= Host::getStateText($host->host_state); ?><?= $host->host_handled ? ' handled' : '' ?>">
<span class="sr-only"><?= Host::getStateText($host->host_state) ?></span>
<div class="state-meta">
<?= $this->timeSince($host->host_last_state_change, $this->compact) ?>
</div>
</td>
<td>
<?= $this->link()->host(
$host->host_name,
$host->host_display_name
) ?>
<?= implode(' ', $this->hostFlags($host)) ?>
</td>
</tr>
<?php endforeach ?>
</tbody>
</table>
<?php if ($hostCount > 5): ?>
<div class="hosts-link">
<?= $this->qlink(
sprintf($this->translate('List all %d hosts'), $hostCount),
$this->url()->setPath('monitoring/list/hosts'),
null,
array(
'data-base-target' => '_next',
'icon' => 'forward'
)
) ?>
</div>
<?php endif ?>