tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 16:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/line-breaks-in-comments-10603'

Browse Source 
fixes #10603
This commit is contained in:
Eric Lippmann 2015-12-21 09:39:12 +01:00
commit 11e7d1050f
14 changed files with 287 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/Icinga/Web/View/helpers/string.php
View File

@ -6,3 +6,7 @@ use Icinga\Util\String;
$this->addHelperFunction('ellipsis', function ($string, $maxLength, $ellipsis = '...') { $this->addHelperFunction('ellipsis', function ($string, $maxLength, $ellipsis = '...') {
return String::ellipsis($string, $maxLength, $ellipsis); return String::ellipsis($string, $maxLength, $ellipsis);
}); });
$this->addHelperFunction('nl2br', function ($string) {
return str_replace(array('\r\n', '\r', '\n'), '<br>', $string);
});

143
modules/doc/application/views/scripts/style/guide.phtml
View File

@ -1,47 +1,112 @@
<div class="controls"> <div class="controls">
<?= $this->tabs ?> <?= $this->tabs ?>
</div> </div>
<div class="content styleguide"> <div class="content styleguide">
<h1>Header h1</h1> <div class="section">
<h2>Header h2</h2> <h1>Icinga Web 2 Design Guidelines</h1>
<h3>Header h3</h3>
<h4>Header h4</h4>
<h5>Header h5</h5>
<h6>Header h6</h6>
<p>This is a paragraph. This is a paragraph. This is a paragraph. This is a paragraph. This is a paragraph. This is a paragraph. A <a href="#">link pointing somewhere</a>. This is a paragraph. This is a paragraph. This is a paragraph. This is a paragraph. This is a paragraph.</p> <ul class="toc">
<li><a href="#headings">Headings</a></li>
<li><a href="#block-content">Block Content</a></li>
<li><a href="#tables">Tables</a></li>
<li><a href="#comment-list">Comment List</a></li>
<li><a href="#blockquote">Blockquote</a></li>
</ul>
</div>
<table class="avp"> <div class="section">
<thead> <h2 id="headings">Headings</h2>
<tr> <h1>Header h1</h1>
<th>Table Head - th in thead</th> <h2>Header h2</h2>
<td>td in thead<td> <h3>Header h3</h3>
</tr> <h4>Header h4</h4>
</thead> <h5>Header h5</h5>
<tbody> <h6>Header h6</h6>
<tr> </div>
<th>Tbody - th</th>
<td>Tbody - td</td>
</tr>
<tr>
<th>Tbody - th</th>
<td>Tbody - td</td>
</tr>
<tr>
<th>Tbody - th</th>
<td>Tbody - td</td>
</tr>
</tbody>
</table>
<blockquote> <div class="section">
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor <h2 id="block-content">Block Content</h2>
invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. <h3>Paragraph</h3>
At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, <p>
no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, This is a paragraph. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor
consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo
magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. A <a href="#">link inside a paragraph</a>.
</blockquote> Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et
dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.
Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
</p>
</div>
<div class="section">
<h2 id="tables">Tables</h2>
<table class="common-table">
<thead>
<tr>
<th>Table Head - th in thead</th>
<td>td in thead<td>
</tr>
</thead>
<tbody>
<tr>
<th>Tbody - th</th>
<td>Tbody - td</td>
</tr>
<tr>
<th>Tbody - th</th>
<td>Tbody - td</td>
</tr>
<tr>
<th>Tbody - th</th>
<td>Tbody - td</td>
</tr>
</tbody>
</table>
</div>
<div class="section">
<h2 id="comment-list"><?= $this->translate('Comment List') ?></h2>
<dl class="comment-list">
<dt>
John Doe
<span class="comment-time">
<?= $this->translate('commented') ?>
<span class="relative-time"><?= $this->translate('some time ago') ?></span>
</span>
<i class="remove-action icon-cancel"></i>
</dt>
<dd>
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore
<br>
et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.
</dd>
<dt>
Richard Roe
<span class="comment-time">
<?= $this->translate('commented') ?>
<span class="relative-time"><?= $this->translate('some time ago') ?></span>
</span>
<i class="remove-action icon-cancel"></i>
</dt>
<dd>
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore
<br>
et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.
</dd>
</dl>
</div>
<div class="section">
<h2 id="blockquote"><?= $this->translate('Blockquote') ?></h2>
<blockquote>
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor
invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,
no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet,
consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore
magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.
Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
</blockquote>
</div>
</div> </div>

2
modules/monitoring/application/views/scripts/downtime/show.phtml
View File

@ -45,7 +45,7 @@
</tr> </tr>
<tr title="<?= $this->translate('A comment, as entered by the author, associated with the scheduled downtime'); ?>"> <tr title="<?= $this->translate('A comment, as entered by the author, associated with the scheduled downtime'); ?>">
<th><?= $this->translate('Comment') ?></th> <th><?= $this->translate('Comment') ?></th>
<td class="comment-text"><?= $this->escape($this->downtime->comment) ?></td> <td class="comment-text"><?= $this->nl2br($this->escape($this->downtime->comment)) ?></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

68
modules/monitoring/application/views/scripts/list/comments.phtml
View File

@ -1,5 +1,5 @@
<?php if (! $this->compact): ?> <?php if (! $this->compact): ?>
<div class="controls separated"> <div class="controls">
<?= $tabs ?> <?= $tabs ?>
<?= $this->render('list/components/selectioninfo.phtml') ?> <?= $this->render('list/components/selectioninfo.phtml') ?>
<div class="grid"> <div class="grid">
@ -11,40 +11,44 @@
</div> </div>
<?php endif ?> <?php endif ?>
<div class="content"> <div class="content">
<table data-base-target="_next" <?php if (! $comments->hasResult()): ?>
class="table-row-selectable common-table multiselect" <p><?= $this->translate('No comments found matching the filter') ?></p>
data-icinga-multiselect-url="<?= $this->href('monitoring/comments/show'); ?>" </div>
data-icinga-multiselect-related="<?= $this->href("monitoring/comments") ?>" <?php return; endif ?>
data-icinga-multiselect-data="comment_id"> <table data-base-target="_next"
class="table-row-selectable common-table multiselect"
data-icinga-multiselect-url="<?= $this->href('monitoring/comments/show') ?>"
data-icinga-multiselect-related="<?= $this->href("monitoring/comments") ?>"
data-icinga-multiselect-data="comment_id">
<tbody> <tbody>
<?php foreach ($comments->peekAhead($this->compact) as $comment): ?> <?php foreach ($comments->peekAhead($this->compact) as $comment): ?>
<tr href="<?= $this->href('monitoring/comment/show', array('comment_id' => $comment->id)) ?>"> <tr href="<?= $this->href('monitoring/comment/show', array('comment_id' => $comment->id)) ?>">
<td class="icon-col"> <td class="icon-col">
<?= $this->partial('partials/comment/comment-description.phtml', array('comment' => $comment)); ?> <?= $this->partial('partials/comment/comment-description.phtml', array('comment' => $comment)) ?>
</td> </td>
<td> <td>
<?= $this->partial( <?= $this->partial(
'partials/comment/comment-detail.phtml', 'partials/comment/comment-detail.phtml',
array( array(
'comment' => $comment, 'comment' => $comment,
'delCommentForm' => $delCommentForm // Form is unset if the current user lacks the respective permission 'delCommentForm' => $delCommentForm // Form is unset if the current user lacks the respective permission
)) ?> )) ?>
</td> </td>
</tr> </tr>
<?php endforeach ?> <?php endforeach ?>
</tbody> </tbody>
</table> </table>
<?php if (! $comments->hasResult()): ?> <?php if ($comments->hasMore()): ?>
<?= $this->translate('No comments found matching the filter'); ?> <div class="action-links">
<?php elseif ($comments->hasMore()): ?> <?= $this->qlink(
<?= $this->qlink( $this->translate('Show More'),
$this->translate('Show More'), $this->url()->without(array('view', 'limit')),
$this->url()->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>

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

@ -16,7 +16,7 @@ if (! $this->compact): ?>
<?php endif ?> <?php endif ?>
<div class="content"> <div class="content">
<table data-base-target="_next" <table data-base-target="_next"
class="table-row-selectable state-table multiselect" class="table-row-selectable state-table multiselect common-table"
data-icinga-multiselect-url="<?= $this->href('monitoring/downtimes/show'); ?>" data-icinga-multiselect-url="<?= $this->href('monitoring/downtimes/show'); ?>"
data-icinga-multiselect-controllers="<?= $this->href("monitoring/downtimes") ?>" data-icinga-multiselect-controllers="<?= $this->href("monitoring/downtimes") ?>"
data-icinga-multiselect-data="downtime_id"> data-icinga-multiselect-data="downtime_id">

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

@ -1,10 +1,11 @@
<div class="comment-header"> <div class="comment-author">
<?php if ($comment->objecttype === 'service'): ?> <?php if ($comment->objecttype === 'service') {
<?= $this->icon('service', $this->translate('Service')) ?> <?= $this->qlink( echo $this->icon('service', $this->translate('Service'));
echo $this->qlink(
$comment->host_display_name . ': ' . $comment->service_display_name, $comment->host_display_name . ': ' . $comment->service_display_name,
'monitoring/service/show', 'monitoring/service/show',
array( array(
'host' => $comment->host_name, 'host' => $comment->host_name,
'service' => $comment->service_description 'service' => $comment->service_description
), ),
array( array(
@ -14,9 +15,10 @@
$comment->host_display_name $comment->host_display_name
) )
) )
) ?> );
<?php else: ?> } else {
<?= $this->icon('host', $this->translate('Host')) ?> <?= $this->qlink( echo $this->icon('host', $this->translate('Host'));
echo $this->qlink(
$comment->host_display_name, $comment->host_display_name,
'monitoring/host/show', 'monitoring/host/show',
array('host' => $comment->host_name), array('host' => $comment->host_name),
@ -26,33 +28,33 @@
$comment->host_display_name $comment->host_display_name
) )
) )
) ?> );
<?php endif ?> } ?>
<span class="comment-meta"> <span class="comment-time">
<?= $this->translate('by') ?> <?= $this->translate('by') ?>
<?= $this->escape($comment->author) ?> <?= $this->escape($comment->author) ?>
<?= $this->timeAgo($comment->timestamp) ?> <?= $this->timeAgo($comment->timestamp) ?>
<span class="meta-icons" data-base-target="_self"> </span>
<?= $comment->persistent ? $this->icon('attach', 'This comment is persistent.') : '' ?> <span class="comment-icons" data-base-target="_self">
<?= $comment->expiration ? $this->icon('clock', sprintf( <?= $comment->persistent ? $this->icon('attach', 'This comment is persistent.') : '' ?>
$this->translate('This comment expires %s.'), <?= $comment->expiration ? $this->icon('clock', sprintf(
$this->timeUntil($comment->expiration) $this->translate('This comment expires %s.'),
)) : '' ?> $this->timeUntil($comment->expiration)
<?php if (isset($delCommentForm)) { )) : '' ?>
$deleteButton = clone $delCommentForm; <?php if (isset($delCommentForm)) {
/** @var \Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm $deleteButton */ $deleteButton = clone $delCommentForm;
$deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action'); /** @var \Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm $deleteButton */
$deleteButton->populate( $deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action');
array( $deleteButton->populate(
'comment_id' => $comment->id, array(
'comment_is_service' => isset($comment->service_description) 'comment_id' => $comment->id,
) 'comment_is_service' => isset($comment->service_description)
); )
echo $deleteButton; );
} ?> echo $deleteButton;
</span> } ?>
</span> </span>
</div> </div>
<p class="comment-text"> <p class="comment-text">
<?= $this->escape($comment->comment) ?> <?= $this->nl2br($this->escape($comment->comment)) ?>
</p> </p>

49
modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
View File

@ -8,7 +8,7 @@
<?php endif; ?> <?php endif; ?>
</td> </td>
<td> <td>
<div class="comment-header"> <div class="comment-author">
<?php if ($isService): ?> <?php if ($isService): ?>
<?= $this->icon('service', $this->translate('Service')); ?> <?= $this->qlink( <?= $this->icon('service', $this->translate('Service')); ?> <?= $this->qlink(
$downtime->host_display_name . ': ' . $downtime->service_display_name, $downtime->host_display_name . ': ' . $downtime->service_display_name,
@ -38,36 +38,35 @@
) )
); ?> ); ?>
<?php endif ?> <?php endif ?>
<span class="comment-meta"> <span class="comment-time">
<?= $this->translate('by') ?> <?= $this->translate('by') ?>
<?= $this->escape($downtime->author_name) ?> <?= $this->escape($downtime->author_name) ?>
<span class="meta-icons"> </span>
<?php if ($downtime->is_flexible): ?> <span class="comment-icons">
<?= $this->icon('magic', $this->translate('This downtime is flexible')); ?> <?php if ($downtime->is_flexible): ?>
<?php endif ?> <?= $this->icon('magic', $this->translate('This downtime is flexible')); ?>
<?php endif ?>
<?php if ($downtime->is_in_effect): ?> <?php if ($downtime->is_in_effect): ?>
<?= $this->icon('plug', $this->translate('This downtime is in effect')); ?> <?= $this->icon('plug', $this->translate('This downtime is in effect')); ?>
<?php endif ?> <?php endif ?>
<?php if (isset($delDowntimeForm)): // Form is unset if the current user lacks the respective permission ?> <?php if (isset($delDowntimeForm)) {
<?php // Form is unset if the current user lacks the respective permission
$deleteButton = clone $delDowntimeForm; $deleteButton = clone $delDowntimeForm;
/** @var \Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm $deleteButton */ /** @var \Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm $deleteButton */
$deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action'); $deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action');
$deleteButton->populate( $deleteButton->populate(
array( array(
'downtime_id' => $downtime->id, 'downtime_id' => $downtime->id,
'downtime_is_service' => isset($downtime->service_description) 'downtime_is_service' => isset($downtime->service_description)
) )
); );
echo $deleteButton; echo $deleteButton;
?> } ?>
<?php endif ?>
</span>
</span> </span>
</div> </div>
<p class="comment-text"> <p class="comment-text">
<?= $this->escape($downtime->comment) ?> <?= $this->nl2br($this->escape($downtime->comment)) ?>
</p> </p>
</td> </td>

4
modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
View File

@ -2,7 +2,7 @@
use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\Host;
use Icinga\Module\Monitoring\Object\Service; use Icinga\Module\Monitoring\Object\Service;
?> ?>
<table class="action" data-base-target="_next"> <table class="state-table common-table" data-base-target="_next">
<tbody> <tbody>
<?php <?php
foreach ($this->downtimes as $i => $downtime): foreach ($this->downtimes as $i => $downtime):
@ -37,4 +37,4 @@ use Icinga\Module\Monitoring\Object\Service;
) )
) ?> ) ?>
</p> </p>
<?php endif ?> <?php endif ?>

25
modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
View File

@ -16,9 +16,9 @@ $acknowledgement = $object->acknowledgement;
<td data-base-target="_self"> <td data-base-target="_self">
<?php if ($acknowledgement): ?> <?php if ($acknowledgement): ?>
<dl class="comment-list"> <dl class="comment-list">
<dt class="comment-header"> <dt>
<?= $this->escape($acknowledgement->getAuthor()) ?> <?= $this->escape($acknowledgement->getAuthor()) ?>
<span class="comment-meta"> <span class="comment-time">
<?= $this->translate('acknowledged') ?> <?= $this->translate('acknowledged') ?>
<?= $this->timeAgo($acknowledgement->getEntryTime()) ?> <?= $this->timeAgo($acknowledgement->getEntryTime()) ?>
<?php if ($acknowledgement->expires()): ?> <?php if ($acknowledgement->expires()): ?>
@ -28,6 +28,7 @@ $acknowledgement = $object->acknowledgement;
$this->timeUntil($acknowledgement->getExpirationTime()) $this->timeUntil($acknowledgement->getExpirationTime())
) ?> ) ?>
<?php endif ?> <?php endif ?>
</span>
<?php if ($acknowledgement->getSticky()): ?> <?php if ($acknowledgement->getSticky()): ?>
<?= $this->icon('pin', sprintf( <?= $this->icon('pin', sprintf(
$this->translate( $this->translate(
@ -36,18 +37,14 @@ $acknowledgement = $object->acknowledgement;
$object->getType(true) $object->getType(true)
)) ?> )) ?>
<?php endif ?> <?php endif ?>
<?php if (isset($removeAckForm)): // Form is unset if the current user lacks the respective permission ?> <?php if (isset($removeAckForm)) {
<span class="meta-icons"> // Form is unset if the current user lacks the respective permission
<?php $removeAckForm->setAttrib('class', $removeAckForm->getAttrib('class') . ' remove-action');
$removeAckForm->setAttrib('class', $removeAckForm->getAttrib('class') . ' remove-action'); echo $removeAckForm;
echo $removeAckForm; } ?>
?>
</span>
<?php endif ?>
</span>
</dt> </dt>
<dd class="comment-text"> <dd>
<p><?= nl2br($this->createTicketLinks($this->escape($acknowledgement->getComment())), false) ?></p> <?= $this->nl2br($this->createTicketLinks($this->escape($acknowledgement->getComment()))) ?>
</dd> </dd>
</dl> </dl>
<?php else: ?> <?php else: ?>
@ -88,7 +85,7 @@ $acknowledgement = $object->acknowledgement;
'Acknowledge this problem, suppress all future notifications for it and tag it as being handled' 'Acknowledge this problem, suppress all future notifications for it and tag it as being handled'
) )
) )
); ?> ) ?>
<?php } else { <?php } else {
echo '&#45;'; echo '&#45;';
} // endif ?> } // endif ?>

38
modules/monitoring/application/views/scripts/show/components/comments.phtml
View File

@ -45,31 +45,29 @@ if (empty($object->comments) && ! $addLink) {
else: ?> else: ?>
<dl class="comment-list"> <dl class="comment-list">
<?php foreach ($object->comments as $comment): ?> <?php foreach ($object->comments as $comment): ?>
<dt class="comment-header"> <dt>
<?= $this->escape($comment->author) ?> <?= $this->escape($comment->author) ?>
<span class="comment-meta"> <span class="comment-time">
<?= $this->translate('commented') ?> <?= $this->translate('commented') ?>
<?= $this->timeAgo($comment->timestamp) ?> <?= $this->timeAgo($comment->timestamp) ?>
<?php if (isset($delCommentForm)): // Form is unset if the current user lacks the respective permission ?>
<span class="meta-icons">
<?php
$deleteButton = clone($delCommentForm);
/** @var \Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm $deleteButton */
$deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action');
$deleteButton->populate(
array(
'comment_id' => $comment->id,
'comment_is_service' => isset($comment->service_description)
)
);
echo $deleteButton;
?>
</span>
<?php endif ?>
</span> </span>
<?= $comment->persistent ? $this->icon('attach', 'This comment is persistent.') : '' ?>
<?php if (isset($delCommentForm)) {
// Form is unset if the current user lacks the respective permission
$deleteButton = clone($delCommentForm);
/** @var \Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm $deleteButton */
$deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action');
$deleteButton->populate(
array(
'comment_id' => $comment->id,
'comment_is_service' => isset($comment->service_description)
)
);
echo $deleteButton;
} ?>
</dt> </dt>
<dd class="comment-text"> <dd>
<p><?= nl2br($this->createTicketLinks($this->escape($comment->comment)), false) ?></p> <?= $this->nl2br($this->createTicketLinks($this->escape($comment->comment))) ?>
</dd> </dd>
<?php endforeach ?> <?php endforeach ?>
</dl> </dl>

37
modules/monitoring/application/views/scripts/show/components/downtime.phtml
View File

@ -73,33 +73,30 @@ if (empty($object->comments) && ! $addLink) {
} }
} }
?> ?>
<dt class="comment-header"> <dt>
<?= $this->escape($downtime->author_name) ?> <?= $this->escape($downtime->author_name) ?>
<span class="comment-meta"> <span class="comment-time">
<?= $this->translate('created') ?> <?= $this->translate('created') ?>
<?= $this->timeAgo($downtime->entry_time) ?> <?= $this->timeAgo($downtime->entry_time) ?>
<span aria-hidden="true">&#448;</span> <span aria-hidden="true">&#448;</span>
<?= $state ?> <?= $state ?>
<?php if (isset($delDowntimeForm)): // Form is unset if the current user lacks the respective permission ?>
<span class="meta-icons">
<?php
$deleteButton = clone($delDowntimeForm);
/** @var \Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm $deleteButton */
$deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action');
$deleteButton->populate(
array(
'downtime_id' => $downtime->id,
'downtime_is_service' => $object->getType() === $object::TYPE_SERVICE
)
);
echo $deleteButton;
?>
</span>
<?php endif ?>
</span> </span>
<?php if (isset($delDowntimeForm)) {
// Form is unset if the current user lacks the respective permission
$deleteButton = clone($delDowntimeForm);
/** @var \Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm $deleteButton */
$deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action');
$deleteButton->populate(
array(
'downtime_id' => $downtime->id,
'downtime_is_service' => $object->getType() === $object::TYPE_SERVICE
)
);
echo $deleteButton;
} ?>
</dt> </dt>
<dd class="comment-text"> <dd>
<p><?= nl2br($this->createTicketLinks($this->escape($downtime->comment)), false) ?></p> <?= $this->nl2br($this->createTicketLinks($this->escape($downtime->comment))) ?>
</dd> </dd>
<?php endforeach ?> <?php endforeach ?>
</dl> </dl>

1
modules/monitoring/library/Monitoring/Object/MonitoredObject.php
View File

@ -322,6 +322,7 @@ abstract class MonitoredObject implements Filterable
'comment' => 'comment_data', 'comment' => 'comment_data',
'expiration' => 'comment_expiration', 'expiration' => 'comment_expiration',
'id' => 'comment_internal_id', 'id' => 'comment_internal_id',
'persistent' => 'comment_is_persistent',
'timestamp' => 'comment_timestamp', 'timestamp' => 'comment_timestamp',
'type' => 'comment_type' 'type' => 'comment_type'
)); ));

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

@ -7,6 +7,22 @@
font-size: @font-size-small; font-size: @font-size-small;
} }
// Object link and comment author in the comment overview
.comment-author {
margin-bottom: 0.25em;
}
// Comment icons, e.g. persistent in the comment overview
.comment-icons {
float: right;
}
// Comment text in the comment overview
.comment-text {
// Reset margin
margin: 0;
}
// Type information for backends in the monitoring config // Type information for backends in the monitoring config
.config-label-meta { .config-label-meta {
font-size: @font-size-small; font-size: @font-size-small;

41
public/css/icinga/main.less
View File

@ -56,6 +56,10 @@
} }
} }
.section {
margin-bottom: 2em;
}
a:hover > .icon-cancel { a:hover > .icon-cancel {
color: @color-critical; color: @color-critical;
} }
@ -88,49 +92,40 @@ a:hover > .icon-cancel {
.comment-list { .comment-list {
margin: 0; margin: 0;
.comment-header { > dt {
border-bottom: 1px solid @gray-lighter; border-bottom: 1px solid @gray-lighter;
margin-bottom: 0.25em;
&:hover { &:hover {
background-color: @gray-lightest; background-color: @gray-lightest;
> .comment-meta > .meta-icons > .remove-action { > .remove-action {
visibility: visible; visibility: visible;
} }
} }
> .comment-meta > .meta-icons > .remove-action { > .remove-action {
visibility: hidden; visibility: hidden;
} }
} }
}
.comment-header { > dd {
.clearfix(); margin: 0 0 1em 0;
}
.comment-meta {
color: @text-color-light;
font-size: @font-size-small;
> .meta-icons {
float: right;
margin-top: 0.2em;
} }
} }
.comment-text { .comment-time {
// Reset margin color: @text-color-light;
margin: 0; font-size: @font-size-small;
} }
.name-value-list { .name-value-list {
dd { > dd {
// Reset default margin // Reset default margin
margin: 0; margin: 0;
} }
dt { > dt {
color: @text-color-light; color: @text-color-light;
font-size: @font-size-small; font-size: @font-size-small;
} }
@ -190,7 +185,11 @@ a:hover > .icon-cancel {
} }
} }
.name-value-table th { .name-value-table {
width: 100%;
}
.name-value-table > tbody > tr > th {
color: @text-color-light; color: @text-color-light;
// Reset default font-weight // Reset default font-weight
font-weight: normal; font-weight: normal;