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

monitoring: Don't use pull-right in the comment overview for the show more link 

Further, indent the view script w/ 4 spaces, remove class separated and don't render the table if there are no comments.
This commit is contained in:
Eric Lippmann 2015-11-20 15:14:54 +01:00
parent 668ea95f1a
commit b3587b7439
1 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 dont-print"> <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>