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

monitoring: Fix notification overview markup 

refs #5543
This commit is contained in:
Eric Lippmann 2015-11-02 11:08:15 +01:00
parent ecfeb4fbe6
commit fee77af5e8
2 changed files with 85 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
modules/monitoring/application/views/scripts/list/notifications.phtml
View File

@ -2,8 +2,6 @@
use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\Host;
use Icinga\Module\Monitoring\Object\Service; use Icinga\Module\Monitoring\Object\Service;
$notifications->peekAhead($this->compact);
if (! $this->compact): ?> if (! $this->compact): ?>
<div class="controls separated dont-print"> <div class="controls separated dont-print">
<?= $tabs ?> <?= $tabs ?>
@ -16,22 +14,32 @@ if (! $this->compact): ?>
</div> </div>
<?php endif ?> <?php endif ?>
<div class="content"> <div class="content">
<table data-base-target="_next" class="action action-table"> <?php if (! $notifications->hasResult()): ?>
<p><?= $this->translate('No notifications found matching the filter.') ?></p>
</div>
<?php return; endif ?>
<table data-base-target="_next" class="action-table">
<tbody> <tbody>
<?php foreach ($notifications as $notification): <?php foreach ($notifications->peekAhead($this->compact) as $notification):
if (isset($notification->service_description)) { if (isset($notification->service_description)) {
$isService = true; $isService = true;
$stateLabel = Service::getStateText($notification->notification_state, true);
$stateName = Service::getStateText($notification->notification_state); $stateName = Service::getStateText($notification->notification_state);
} else { } else {
$isService = false; $isService = false;
$stateLabel = Host::getStateText($notification->notification_state, true);
$stateName = Host::getStateText($notification->notification_state); $stateName = Host::getStateText($notification->notification_state);
} }
?> ?>
<tr> <tr>
<td class="state-col state-<?= $stateName ?>"> <td class="state-col state-<?= $stateName ?>">
<?= $this->timeAgo($notification->notification_start_time, $this->compact) ?> <div class="state-label"><?= $stateLabel ?></div>
<div class="state-meta">
<?= $this->timeAgo($notification->notification_start_time, $this->compact) ?>
</div>
</td> </td>
<td> <td>
<div class="state-header">
<?php if ($isService): ?> <?php if ($isService): ?>
<?= $this->icon('service', $this->translate('Service')); ?> <?= $this->icon('service', $this->translate('Service')); ?>
<?= $this->link()->service( <?= $this->link()->service(
@ -45,24 +53,24 @@ if (! $this->compact): ?>
<?= $this->icon('host', $this->translate('Host')); ?> <?= $this->icon('host', $this->translate('Host')); ?>
<?= $this->link()->host($notification->host_name, $notification->host_display_name) ?> <?= $this->link()->host($notification->host_name, $notification->host_display_name) ?>
<?php endif ?> <?php endif ?>
<?php if (! $this->contact): ?> <?php if (! $this->contact): ?>
<span class="pull-right text-small"> <div class="notification-recipient">
<?php if ($notification->notification_contact_name): ?> <?php if ($notification->notification_contact_name): ?>
<?= sprintf( <?= sprintf(
$this->translate('Sent to %s'), $this->translate('Sent to %s'),
$this->qlink( $this->qlink(
$notification->notification_contact_name, $notification->notification_contact_name,
'monitoring/show/contact', 'monitoring/show/contact',
array('contact_name' => $notification->notification_contact_name) array('contact_name' => $notification->notification_contact_name)
) )
) ?> ) ?>
<?php else: ?> <?php else: ?>
<?= $this->translate('This notification was not sent out to any contact.'); ?> <?= $this->translate('Sent out to any contact') ?>
<?php endif ?> <?php endif ?>
</span> </div>
<?php endif ?> <?php endif ?>
<p class="plugin-output"> </div>
<p class="overview-plugin-output">
<?= $this->pluginOutput($this->ellipsis($notification->notification_output, 10000), true) ?> <?= $this->pluginOutput($this->ellipsis($notification->notification_output, 10000), true) ?>
</p> </p>
</td> </td>
@ -70,17 +78,17 @@ if (! $this->compact): ?>
<?php endforeach ?> <?php endforeach ?>
</tbody> </tbody>
</table> </table>
<?php if (! $notifications->hasResult()): ?> <?php if ($notifications->hasMore()): ?>
<?= $this->translate('No notifications found matching the filter'); ?> <div class="text-right">
<?php elseif ($notifications->hasMore()): ?> <?= $this->qlink(
<?= $this->qlink( $this->translate('Show More'),
$this->translate('Show More'), $this->url(isset($notificationsUrl) ? $notificationsUrl : null)->without(array('view', 'limit')),
$this->url(isset($notificationsUrl) ? $notificationsUrl : null)->without(array('view', 'limit')), null,
null, array(
array( 'class' => 'action-link',
'data-base-target' => '_next', 'data-base-target' => '_next'
'class' => 'pull-right action-link' )
) ); ?>
); ?> </div>
<?php endif ?> <?php endif ?>
</div> </div>

64
modules/monitoring/public/css/tables.less
View File

@ -2,10 +2,50 @@
@border-left-width: 6px; @border-left-width: 6px;
// Check source reachable information in the host and service detail views
.check-source-meta {
font-size: @font-size-small;
}
// Column for counts, e.g. host group members
.count-col { .count-col {
width: 4em; width: 4em;
} }
// Host name and IP addresses in the host and service detail view
.host-meta {
color: @text-color-light;
font-size: @font-size-small;
}
// Link to unhandled services in the hosts overview
.host-services-incidents {
color: @color-critical;
font-family: @font-family-wide;
font-size: @font-size-small;
}
// Notification recipient in the notifications overview
.notification-recipient {
color: @text-color-light;
float: right;
font-size: @font-size-small;
}
// Plugin output in overviews
.overview-plugin-output {
color: @text-color-light;
font-family: @font-family-fixed;
font-size: @font-size-small;
}
// Service description if in the service detail view
.service-meta {
color: @text-color-light;
font-size: @font-size-small;
}
// State column for label and duration in overviews
.state-col { .state-col {
&.state-ok, &.state-ok,
&.state-up { &.state-up {
@ -69,40 +109,24 @@
width: 8em; width: 8em;
} }
.host-meta, .service-meta { // Wraps links, icons and meta in overviews
color: @text-color-light;
font-size: @font-size-small;
}
// Link to unhandled services in the hosts overview
.host-services-incidents {
color: @color-critical;
font-family: @font-family-wide;
font-size: @font-size-small;
}
// Plugin output in overviews
.overview-plugin-output {
color: @text-color-light;
font-family: @font-family-fixed;
font-size: @font-size-small;
}
.state-header { .state-header {
.clearfix(); .clearfix();
} }
// State icons, e.g. acknowledged in overviews
.state-icons { .state-icons {
float: right; float: right;
} }
// State label in overviews
.state-label { .state-label {
font-family: @font-family-wide; font-family: @font-family-wide;
font-size: @font-size-small; font-size: @font-size-small;
letter-spacing: 1px; letter-spacing: 1px;
} }
.check-source-meta, // State duration and state type information in overviews
.state-meta { .state-meta {
font-size: @font-size-small; font-size: @font-size-small;
} }