tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-26 23:34:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

monitoring: Fix comment-detail markup

Browse Source 
refs #5543
This commit is contained in:
Eric Lippmann 2015-09-30 16:39:24 +02:00
parent 05f14a4f97
commit adbc6ee852
1 changed files with 46 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
<span class="comment-header"> <span class="comment-header">
<?php if ($comment->objecttype === 'service'): ?> <?php if ($comment->objecttype === 'service'): ?>
<?= $this->icon('service', $this->translate('Service')); ?> <?= $this->qlink( <?= $this->icon('service', $this->translate('Service')) ?> <?= $this->qlink(
$this->escape($comment->host_display_name) . ': ' . $this->escape($comment->service_display_name), $this->escape($comment->host_display_name) . ': ' . $this->escape($comment->service_display_name),
'monitoring/comment/show', 'monitoring/comment/show',
array('comment_id' => $comment->id), array('comment_id' => $comment->id),
@ -9,12 +9,11 @@
$this->translate('Show detailed information for this comment about service %s on host %s'), $this->translate('Show detailed information for this comment about service %s on host %s'),
$comment->service_display_name, $comment->service_display_name,
$comment->host_display_name $comment->host_display_name
),
'class' => 'rowaction'
) )
); ?> )
<?php else: ?> ) ?>
<?= $this->icon('host', $this->translate('Host')); ?> <?= $this->qlink( <?php else: ?>
<?= $this->icon('host', $this->translate('Host')) ?> <?= $this->qlink(
$this->escape($comment->host_display_name), $this->escape($comment->host_display_name),
'monitoring/comment/show', 'monitoring/comment/show',
array('comment_id' => $comment->id), array('comment_id' => $comment->id),
@ -25,21 +24,18 @@
), ),
'class' => 'rowaction' 'class' => 'rowaction'
) )
); ?> ) ?>
<?php endif ?> <?php endif ?>
<?= $this->translate('by') ?> <?= $this->translate('by') ?>
<?= $this->escape($comment->author) ?> <?= $this->escape($comment->author) ?>
<?= $this->timeAgo($comment->timestamp) ?> <?= $this->timeAgo($comment->timestamp) ?>
<span class="pull-right" data-base-target="_self"> <span class="pull-right" 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 %s.'),
$this->timeUntil($comment->expiration) $this->timeUntil($comment->expiration)
)) : '' ?> )) : '' ?>
<?php <?php if (isset($delCommentForm)) {
if (isset($delCommentForm)) {
$delCommentForm = clone $delCommentForm; $delCommentForm = clone $delCommentForm;
$delCommentForm->populate( $delCommentForm->populate(
array( array(
@ -48,12 +44,9 @@
) )
); );
echo $delCommentForm; echo $delCommentForm;
} } ?>
?>
</span> </span>
</span> </span>
<p class="comment-text">
<br>
<span class="comment-content">
<?= $this->escape($comment->comment) ?> <?= $this->escape($comment->comment) ?>
</span> </p>