tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

monitoring/CSS: Don't use clearfix and pull-right in the hosts overview

Browse Source 
refs #5543
This commit is contained in:
Eric Lippmann 2015-10-28 10:23:31 +01:00
parent 2702e70a9c
commit ea91ca9dc4
2 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
modules/monitoring/application/views/scripts/list/hosts.phtml
View File

@ -32,61 +32,63 @@ if (! $this->compact): ?>
$hostLink = $this->href('monitoring/host/show', array('host' => $host->host_name)); ?> $hostLink = $this->href('monitoring/host/show', array('host' => $host->host_name)); ?>
<tr> <tr>
<td class="state-col state-<?= $hostStateName ?><?= $host->host_handled ? ' handled' : '' ?>"> <td class="state-col state-<?= $hostStateName ?><?= $host->host_handled ? ' handled' : '' ?>">
<p> <div class="state-label"><?= Host::getStateText($host->host_state, true) ?></div>
<span class="state-label"><?= Host::getStateText($host->host_state, true) ?></span>
<?php if ((int) $host->host_state !== 99): ?> <?php if ((int) $host->host_state !== 99): ?>
<br> <div class="state-meta">
<?= $this->timeSince($host->host_last_state_change, $this->compact) ?> <?= $this->timeSince($host->host_last_state_change, $this->compact) ?>
<?php if ((int) $host->host_state > 0 && (int) $host->host_state_type === 0): ?> <?php if ((int) $host->host_state > 0 && (int) $host->host_state_type === 0): ?>
<br> <div>Soft <?= $host->host_attempt ?></div>
<span class="text-small">Soft <?= $host->host_attempt ?></span> <?php endif ?>
</div>
<?php endif ?> <?php endif ?>
<?php endif ?>
</p>
</td> </td>
<td class="clearfix"> <td>
<?= $this->iconImage()->host($host) ?> <div class="state-header">
<span class="pull-right"><?= implode(' ', $this->hostFlags($host)) ?></span> <?= $this->iconImage()->host($host) ?>
<?= $this->qlink( <?= $this->qlink(
$host->host_display_name, $host->host_display_name,
$hostLink, $hostLink,
null, null,
array( array(
'title' => sprintf( 'title' => sprintf(
$this->translate('Show detailed information for host %s'), $this->translate('Show detailed information for host %s'),
$host->host_display_name $host->host_display_name
), ),
'class' => 'rowaction' 'class' => 'rowaction'
) )
) ?> ) ?>
<?php if (isset($summary[$host->host_name])): ?> <?php if (isset($summary[$host->host_name])): ?>
<span class="host-services-incidents"> (<?= $this->qlink( <span class="host-services-incidents"> (<?= $this->qlink(
sprintf( sprintf(
$this->translatePlural(
'%u unhandled service', '%u unhandled services', $summary[$host->host_name]
),
$summary[$host->host_name]
),
'monitoring/list/services',
array(
'host' => $host->host_name,
'service_problem' => 1,
'service_handled' => 0
),
array(
'title' => sprintf(
$this->translatePlural( $this->translatePlural(
'List %s unhandled service problem on host %s', '%u unhandled service', '%u unhandled services', $summary[$host->host_name]
'List %s unhandled service problems on host %s',
$summary[$host->host_name]
), ),
$summary[$host->host_name], $summary[$host->host_name]
$host->host_name ),
'monitoring/list/services',
array(
'host' => $host->host_name,
'service_problem' => 1,
'service_handled' => 0
),
array(
'title' => sprintf(
$this->translatePlural(
'List %s unhandled service problem on host %s',
'List %s unhandled service problems on host %s',
$summary[$host->host_name]
),
$summary[$host->host_name],
$host->host_name
)
) )
) ) ?>)</span>
) ?>)</span> <?php endif ?>
<?php endif ?> <span class="state-icons"><?= implode(' ', $this->hostFlags($host)) ?></span>
<p class="plugin-output"><?= $this->pluginOutput($this->ellipsis($host->host_output, 10000), true) ?></p> </div>
<p class="overview-plugin-output">
<?= $this->pluginOutput($this->ellipsis($host->host_output, 10000), true) ?>
</p>
</td> </td>
<?php foreach($this->addColumns as $col): ?> <?php foreach($this->addColumns as $col): ?>
<td><?= $this->escape($host->$col) ?></td> <td><?= $this->escape($host->$col) ?></td>

2
modules/monitoring/application/views/scripts/list/services.phtml
View File

@ -45,7 +45,7 @@ if (! $this->compact): ?>
$serviceStateName = Service::getStateText($service->service_state); ?> $serviceStateName = Service::getStateText($service->service_state); ?>
<tr> <tr>
<td class="state-col state-<?= $serviceStateName ?><?= $service->service_handled ? ' handled' : '' ?>"> <td class="state-col state-<?= $serviceStateName ?><?= $service->service_handled ? ' handled' : '' ?>">
<span class="state-label"><?= Service::getStateText($service->service_state, true) ?></span> <div class="state-label"><?= Service::getStateText($service->service_state, true) ?></div>
<?php if ((int) $service->service_state !== 99): ?> <?php if ((int) $service->service_state !== 99): ?>
<div class="state-meta"> <div class="state-meta">
<?= $this->timeSince($service->service_last_state_change, $this->compact) ?> <?= $this->timeSince($service->service_last_state_change, $this->compact) ?>