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

Merge branch 'bugfix/escape-special-characters-correctly-for-tooltips-10277' 

fixes #10277
This commit is contained in:
Eric Lippmann 2016-02-22 14:44:47 +01:00
parent f853eb31a5 38a752b0ac
commit d17d1ec836
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,7 @@ $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . '
$service->host_display_name
),
'class' => 'bg-color-' . Service::getStateText($service->service_state) . ($service->service_handled ? ' handled' : ''),
'title' => $this->escape($service->service_output)
'title' => $service->service_output
)
) ?>
</td>

7
modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
View File

@ -36,10 +36,11 @@
<?= $this->timeAgo($comment->timestamp) ?>
</span>
<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(
$this->translate('This comment expires %s.'),
$this->timeUntil($comment->expiration)
$this->translate('This comment expires on %s at %s'),
$this->formatDate($comment->expiration),
$this->formatTime($comment->expiration)
)) : '' ?>
<?php if (isset($delCommentForm)) {
$deleteButton = clone $delCommentForm;