mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-07-23 05:44:36 +02:00
Merge branch 'bugfix/escape-special-characters-correctly-for-tooltips-10277'
fixes #10277
This commit is contained in:
commit
d17d1ec836
@ -82,7 +82,7 @@ $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . '
|
|||||||
$service->host_display_name
|
$service->host_display_name
|
||||||
),
|
),
|
||||||
'class' => 'bg-color-' . Service::getStateText($service->service_state) . ($service->service_handled ? ' handled' : ''),
|
'class' => 'bg-color-' . Service::getStateText($service->service_state) . ($service->service_handled ? ' handled' : ''),
|
||||||
'title' => $this->escape($service->service_output)
|
'title' => $service->service_output
|
||||||
)
|
)
|
||||||
) ?>
|
) ?>
|
||||||
</td>
|
</td>
|
||||||
|
@ -36,10 +36,11 @@
|
|||||||
<?= $this->timeAgo($comment->timestamp) ?>
|
<?= $this->timeAgo($comment->timestamp) ?>
|
||||||
</span>
|
</span>
|
||||||
<span class="comment-icons" data-base-target="_self">
|
<span class="comment-icons" data-base-target="_self">
|
||||||
<?= $comment->persistent ? $this->icon('attach', 'This comment is persistent.') : '' ?>
|
<?= $comment->persistent ? $this->icon('attach', 'This comment is persistent') : '' ?>
|
||||||
<?= $comment->expiration ? $this->icon('clock', sprintf(
|
<?= $comment->expiration ? $this->icon('clock', sprintf(
|
||||||
$this->translate('This comment expires %s.'),
|
$this->translate('This comment expires on %s at %s'),
|
||||||
$this->timeUntil($comment->expiration)
|
$this->formatDate($comment->expiration),
|
||||||
|
$this->formatTime($comment->expiration)
|
||||||
)) : '' ?>
|
)) : '' ?>
|
||||||
<?php if (isset($delCommentForm)) {
|
<?php if (isset($delCommentForm)) {
|
||||||
$deleteButton = clone $delCommentForm;
|
$deleteButton = clone $delCommentForm;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user