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

Separate icon and event output in the history views

This commit is contained in:
Eric Lippmann 2019-07-15 16:38:32 +02:00 committed by Johannes Meyer
parent 213e7a3c13
commit aa293f54bd
2 changed files with 51 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
modules/monitoring/application/views/scripts/partials/event-history.phtml
View File

@ -179,38 +179,47 @@ $rowAction = Url::fromPath('monitoring/event/show');
<div class="state-meta"><?= $this->formatTime($event->timestamp) ?></div>
</td>
<td>
<?php if ($this->isOverview): ?>
<?= $this->qlink(
$event->host_display_name,
'monitoring/host/show',
array(
'host' => $event->host_name,
),
array('title' => sprintf(
$this->translate('Show detailed information for host %s'),
$event->host_display_name
))
) ?><?php if ($isService): ?>&#58;
<div class="history-message-container">
<?php if ($icon): ?>
<div class="history-message-icon">
<?= $this->icon($icon, $iconTitle) ?>
</div>
<?php endif ?>
<div class="history-message-output">
<?php if ($this->isOverview): ?>
<?= $this->qlink(
$event->service_display_name,
'monitoring/service/show',
array(
'host' => $event->host_name,
'service' => $event->service_description
),
array(
$event->host_display_name,
'monitoring/host/show',
[
'host' => $event->host_name,
],
[
'title' => sprintf(
$this->translate('Show detailed information for service %s on host %s'),
$event->service_display_name,
$this->translate('Show detailed information for host %s'),
$event->host_display_name
)
)
) ?>
]
) ?><?php if ($isService): ?>&#58;
<?= $this->qlink(
$event->service_display_name,
'monitoring/service/show',
[
'host' => $event->host_name,
'service' => $event->service_description
],
[
'title' => sprintf(
$this->translate('Show detailed information for service %s on host %s'),
$event->service_display_name,
$event->host_display_name
)
]
) ?>
<?php endif ?>
<?php endif ?>
<?php endif ?>
<?php if ($icon) {
echo $this->icon($icon, $iconTitle);
} ?><?= $this->nl2br($this->createTicketLinks($this->markdown($msg, ['class' => 'overview-plugin-output']))) ?>
<?= $this->nl2br($this->createTicketLinks($this->markdown($msg, ['class' => 'overview-plugin-output']))) ?>
</div>
</div>
</td>
</tr>
<?php endforeach ?>

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

@ -241,3 +241,18 @@
cursor: pointer;
}
}
// Event history
.history-message-container {
display: flex;
align-items: center;
justify-content: center;
> .history-message-icon {
padding: 0.25em;
}
> .history-message-output {
flex: 1;
}
}