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

Improve detail view layout 

refs #8902
This commit is contained in:
Matthias Jentsch 2015-04-23 16:55:59 +02:00
parent 07c5e67304
commit 400f351ea5
2 changed files with 30 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/monitoring/application/views/scripts/downtime/show.phtml
View File

@ -76,8 +76,17 @@
</td> </td>
</tr> </tr>
</table> </table>
</div>
<h1 data-base-target="_next"> <div class="content">
<h3><?= $this->translate('Downtime detail information') ?></h3>
<table class="avp">
<tbody>
<tr>
<th>
<?= $this->isService ? $this->translate('Service') : $this->translate('Host') ?>
</th>
<td data-base-target="_next">
<?php if ($this->isService): ?> <?php if ($this->isService): ?>
<?php <?php
$link = $this->link()->service( $link = $this->link()->service(
@ -94,27 +103,17 @@
$link = $this->link()->host($downtime->host_name, $downtime->host_display_name) $link = $this->link()->host($downtime->host_name, $downtime->host_display_name)
?> ?>
<?php endif ?> <?php endif ?>
<?= sprintf(
$this->translate(
'Downtime on %s',
'Downtime for host or service.'
),
$link
); ?>
<?= $icon ?> <?= $icon ?>
</h1> <?= $link ?>
</div> </td>
</tr>
<div class="content">
<table class="avp">
<tbody>
<tr title="<?= $this->translate('The name of the person who scheduled this downtime'); ?>"> <tr title="<?= $this->translate('The name of the person who scheduled this downtime'); ?>">
<th><?= $this->translate('Author') ?></th> <th><?= $this->translate('Author') ?></th>
<td><?= $this->icon('user') ?> <?= $this->escape($this->downtime->author_name) ?></td> <td><?= $this->icon('user', $this->translate('User')) ?> <?= $this->escape($this->downtime->author_name) ?></td>
</tr> </tr>
<tr title="<?= $this->translate('A comment, as entered by the author, associated with the scheduled downtime'); ?>"> <tr title="<?= $this->translate('A comment, as entered by the author, associated with the scheduled downtime'); ?>">
<th><?= $this->translate('Comment') ?></th> <th><?= $this->translate('Comment') ?></th>
<td><?= $this->icon('comment') ?> <?= $this->escape($this->downtime->comment) ?></td> <td><?= $this->icon('comment', $this->translate('Comment')) ?> <?= $this->escape($this->downtime->comment) ?></td>
</tr> </tr>
<tr title="<?= $this->translate('Date and time this downtime was entered'); ?>"> <tr title="<?= $this->translate('Date and time this downtime was entered'); ?>">
<th><?= $this->translate('Entry Time') ?></th> <th><?= $this->translate('Entry Time') ?></th>

12
modules/monitoring/application/views/scripts/downtimes/show.phtml
View File

@ -8,14 +8,6 @@
<?php if (! $this->compact): ?> <?php if (! $this->compact): ?>
<?= $this->tabs; ?> <?= $this->tabs; ?>
<?php endif ?> <?php endif ?>
<h1>
<?= sprintf($this->translate('%d Downtimes'), count($downtimes)) ?>
<?= count($downtimes) > 5 ?
sprintf($this->translate('(%d not shown)'), count ($downtimes) - 5)
: '';
?>
</h1>
<p> <p>
<table class="action"> <table class="action">
<tbody> <tbody>
@ -40,10 +32,10 @@
</td> </td>
<td class="name oneline"> <td class="name oneline">
<?php if ($downtime->isService): ?> <?php if ($downtime->isService): ?>
<?= $this->icon('service') ?> <?= $this->icon('service', $this->translate('Service')) ?>
<b><?= $downtime->service ?> on <?= $downtime->host_name ?>.</b> <b><?= $downtime->service ?> on <?= $downtime->host_name ?>.</b>
<?php else: ?> <?php else: ?>
<?= $this->icon('host') ?> <?= $this->icon('host', $this->translate('Host')) ?>
<b><?= $downtime->host_name ?>.</b> <b><?= $downtime->host_name ?>.</b>
<?php endif; ?> <?php endif; ?>