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

monitoring: Fix list headers, #2 

refs #5543
This commit is contained in:
Eric Lippmann 2015-10-01 22:51:42 +02:00
parent 04dd81103c
commit aadbbe08e1
13 changed files with 57 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,19 +1,11 @@
<?php if (! $this->compact): ?> <?php if (! $this->compact): ?>
<div class="controls dont-print"> <div class="controls separated dont-print">
<?= $tabs ?> <?= $tabs ?>
<div class="text-right">
<?= $this->render('list/components/selectioninfo.phtml'); ?>
</div>
<div class="grid"> <div class="grid">
<div class="col-1-3"> <?= $this->limiter ?>
<?= $this->limiter ?> <?= $this->paginator ?>
</div> <?= $this->render('list/components/selectioninfo.phtml') ?>
<div class="col-1-3"> <?= $this->sortBox ?>
<?= $this->paginator ?>
</div>
<div class="col-1-3 text-right">
<?= $this->sortBox ?>
</div>
</div> </div>
<?= $this->filterEditor ?> <?= $this->filterEditor ?>
</div> </div>

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

@ -7,7 +7,7 @@ if (! $stats instanceof stdClass) {
$stats = $stats->fetchRow(); $stats = $stats->fetchRow();
} }
?> ?>
<div class="v-center"> <div class="hosts-summary">
<?= $this->qlink( <?= $this->qlink(
sprintf($this->translatePlural('%u Host', '%u Hosts', $stats->hosts_total), $stats->hosts_total), sprintf($this->translatePlural('%u Host', '%u Hosts', $stats->hosts_total), $stats->hosts_total),
// @TODO(el): Fix that // @TODO(el): Fix that

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

@ -7,7 +7,7 @@ if (! $stats instanceof stdClass) {
$stats = $stats->fetchRow(); $stats = $stats->fetchRow();
} }
?> ?>
<div class="v-center"> <div class="services-summary">
<?= $this->qlink( <?= $this->qlink(
sprintf($this->translatePlural( sprintf($this->translatePlural(
'%u Service', '%u Services', $stats->services_total), '%u Service', '%u Services', $stats->services_total),

16
modules/monitoring/application/views/scripts/list/contactgroups.phtml
View File

@ -1,18 +1,12 @@
<?php <?php
if (! $this->compact): ?> if (! $this->compact): ?>
<div class="controls"> <div class="controls separated dont-print">
<?= $this->tabs ?> <?= $tabs ?>
<div class="grid"> <div class="grid">
<div class="col-1-3"> <?= $this->limiter ?>
<?= $this->limiter ?> <?= $this->paginator ?>
</div> <?= $this->sortBox ?>
<div class="col-1-3">
<?= $this->paginator ?>
</div>
<div class="col-1-3 text-right">
<?= $this->sortBox ?>
</div>
</div> </div>
<?= $this->filterEditor ?> <?= $this->filterEditor ?>
</div> </div>

14
modules/monitoring/application/views/scripts/list/contacts.phtml
View File

@ -1,16 +1,10 @@
<?php if (! $this->compact): ?> <?php if (! $this->compact): ?>
<div class="controls dont-print"> <div class="controls separated dont-print">
<?= $tabs ?> <?= $tabs ?>
<div class="grid"> <div class="grid">
<div class="col-1-3"> <?= $this->limiter ?>
<?= $this->limiter ?> <?= $this->paginator ?>
</div> <?= $this->sortBox ?>
<div class="col-1-3">
<?= $this->paginator ?>
</div>
<div class="col-1-3 text-right">
<?= $this->sortBox ?>
</div>
</div> </div>
<?= $this->filterEditor ?> <?= $this->filterEditor ?>
</div> </div>

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

@ -3,21 +3,13 @@ use Icinga\Module\Monitoring\Object\Host;
use Icinga\Module\Monitoring\Object\Service; use Icinga\Module\Monitoring\Object\Service;
if (! $this->compact): ?> if (! $this->compact): ?>
<div class="controls dont-print"> <div class="controls separated dont-print">
<?= $tabs ?> <?= $tabs ?>
<div class="text-right">
<?= $this->render('list/components/selectioninfo.phtml'); ?>
</div>
<div class="grid"> <div class="grid">
<div class="col-1-3"> <?= $this->limiter ?>
<?= $this->limiter ?> <?= $this->paginator ?>
</div> <?= $this->render('list/components/selectioninfo.phtml') ?>
<div class="col-1-3"> <?= $this->sortBox ?>
<?= $this->paginator ?>
</div>
<div class="col-1-3 text-right">
<?= $this->sortBox ?>
</div>
</div> </div>
<?= $this->filterEditor ?> <?= $this->filterEditor ?>
</div> </div>

6
modules/monitoring/application/views/scripts/list/eventhistory.phtml
View File

@ -11,14 +11,14 @@ if (! $url->hasParam('page') || ($page = (int) $url->getParam('page')) < 1) {
$history->limit($limit * $page); $history->limit($limit * $page);
if (! $this->compact): ?> if (! $this->compact): ?>
<div class="controls"> <div class="controls dont-print separated">
<?= $this->tabs; ?> <?= $this->tabs; ?>
<div class="grid dont-print"> <div class="grid">
<div class="col-1-3 text-left"> <div class="col-1-3 text-left">
<?= $this->limiter ?> <?= $this->limiter ?>
</div> </div>
<div class="col-1-3"> <div class="col-1-3">
<a href="#load-more"> <a class="action-link" href="#load-more">
<?= $this->translate('Scroll to the bottom of this page to load additional events'); ?> <?= $this->translate('Scroll to the bottom of this page to load additional events'); ?>
</a> </a>
</div> </div>

16
modules/monitoring/application/views/scripts/list/hostgroups.phtml
View File

@ -2,18 +2,12 @@
use Icinga\Module\Monitoring\Web\Widget\StateBadges; use Icinga\Module\Monitoring\Web\Widget\StateBadges;
/** @var \Icinga\Module\Monitoring\DataView\Hostgroup $hostgroups */ /** @var \Icinga\Module\Monitoring\DataView\Hostgroup $hostgroups */
if (! $this->compact): ?> if (! $this->compact): ?>
<div class="controls"> <div class="controls separated dont-print">
<?= $this->tabs ?> <?= $tabs ?>
<div class="grid"> <div class="grid">
<div class="col-1-3"> <?= $this->limiter ?>
<?= $this->limiter ?> <?= $this->paginator ?>
</div> <?= $this->sortBox ?>
<div class="col-1-3">
<?= $this->paginator ?>
</div>
<div class="col-1-3 text-right">
<?= $this->sortBox ?>
</div>
</div> </div>
<?= $this->filterEditor ?> <?= $this->filterEditor ?>
</div> </div>

26
modules/monitoring/application/views/scripts/list/hosts.phtml
View File

@ -2,26 +2,16 @@
use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\Host;
if (! $this->compact): ?> if (! $this->compact): ?>
<div class="controls separated"> <div class="controls separated dont-print">
<?= $this->tabs ?> <?= $this->tabs ?>
<div class="grid dont-print"> <div class="grid">
<div class="col-1-2 text-left"> <?= $this->render('list/components/hostssummary.phtml') ?>
<?= $this->render('list/components/hostssummary.phtml') ?> <?= $this->render('list/components/selectioninfo.phtml') ?>
</div>
<div class="col-1-2 text-right">
<?= $this->render('list/components/selectioninfo.phtml') ?>
</div>
</div> </div>
<div class="grid dont-print"> <div class="grid">
<div class="col-1-3 text-left"> <?= $this->limiter ?>
<?= $this->limiter ?> <?= $this->paginator ?>
</div> <?= $this->sortBox ?>
<div class="col-1-3">
<?= $this->paginator ?>
</div>
<div class="col-1-3 text-right">
<?= $this->sortBox ?>
</div>
</div> </div>
<?= $this->filterEditor ?> <?= $this->filterEditor ?>
</div> </div>

22
modules/monitoring/application/views/scripts/list/notifications.phtml
View File

@ -5,22 +5,14 @@ use Icinga\Module\Monitoring\Object\Service;
$notifications->peekAhead($this->compact); $notifications->peekAhead($this->compact);
if (! $this->compact): ?> if (! $this->compact): ?>
<div class="controls"> <div class="controls separated dont-print">
<div class="controls dont-print"> <?= $tabs ?>
<?= $tabs ?> <div class="grid">
<div class="grid"> <?= $this->limiter ?>
<div class="col-1-3"> <?= $this->paginator ?>
<?= $this->limiter ?> <?= $this->sortBox ?>
</div>
<div class="col-1-3">
<?= $this->paginator ?>
</div>
<div class="col-1-3 text-right">
<?= $this->sortBox ?>
</div>
</div>
<?= $this->filterEditor ?>
</div> </div>
<?= $this->filterEditor ?>
</div> </div>
<?php endif ?> <?php endif ?>
<div class="content"> <div class="content">

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

@ -3,7 +3,7 @@ use Icinga\Module\Monitoring\Object\Service;
use Icinga\Web\Url; use Icinga\Web\Url;
if (! $this->compact): ?> if (! $this->compact): ?>
<div class="controls"> <div class="controls separated">
<?= $this->tabs; ?> <?= $this->tabs; ?>
<div class="grid dont-print"> <div class="grid dont-print">
<div class="col-1-3 text-left"> <div class="col-1-3 text-left">
@ -102,7 +102,7 @@ $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . '
<?php if (! $this->compact && $this->horizontalPaginator->getPages()->pageCount > 1): ?> <?php if (! $this->compact && $this->horizontalPaginator->getPages()->pageCount > 1): ?>
<td> <td>
<?php $expandLink = $this->qlink( <?php $expandLink = $this->qlink(
$this->translate('more …'), $this->translate('Load more'),
Url::fromRequest(), Url::fromRequest(),
array( array(
'limit' => ( 'limit' => (
@ -123,7 +123,7 @@ $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . '
<tr> <tr>
<td colspan="<?= count($pivotHeader['cols']) + 1?>" class="service-grid-table-more"> <td colspan="<?= count($pivotHeader['cols']) + 1?>" class="service-grid-table-more">
<?php echo $this->qlink( <?php echo $this->qlink(
$this->translate('more …'), $this->translate('Load more'),
Url::fromRequest(), Url::fromRequest(),
array( array(
'limit' => $this->horizontalPaginator->getItemCountPerPage() . ',' . 'limit' => $this->horizontalPaginator->getItemCountPerPage() . ',' .

16
modules/monitoring/application/views/scripts/list/servicegroups.phtml
View File

@ -1,18 +1,12 @@
<?php use Icinga\Module\Monitoring\Web\Widget\StateBadges; <?php use Icinga\Module\Monitoring\Web\Widget\StateBadges;
if (! $this->compact): ?> if (! $this->compact): ?>
<div class="controls"> <div class="controls separated dont-print">
<?= $this->tabs ?> <?= $tabs ?>
<div class="grid"> <div class="grid">
<div class="col-1-3"> <?= $this->limiter ?>
<?= $this->limiter ?> <?= $this->paginator ?>
</div> <?= $this->sortBox ?>
<div class="col-1-3">
<?= $this->paginator ?>
</div>
<div class="col-1-3 text-right">
<?= $this->sortBox ?>
</div>
</div> </div>
<?= $this->filterEditor ?> <?= $this->filterEditor ?>
</div> </div>

20
modules/monitoring/application/views/scripts/list/services.phtml
View File

@ -6,23 +6,13 @@ if (! $this->compact): ?>
<div class="controls separated dont-print"> <div class="controls separated dont-print">
<?= $this->tabs ?> <?= $this->tabs ?>
<div class="grid"> <div class="grid">
<div class="col-1-2"> <?= $this->render('list/components/servicesummary.phtml') ?>
<?= $this->render('list/components/servicesummary.phtml') ?> <?= $this->render('list/components/selectioninfo.phtml') ?>
</div>
<div class="col-1-2 text-right">
<?= $this->render('list/components/selectioninfo.phtml') ?>
</div>
</div> </div>
<div class="grid"> <div class="grid">
<div class="col-1-3"> <?= $this->limiter ?>
<?= $this->limiter ?> <?= $this->paginator ?>
</div> <?= $this->sortBox ?>
<div class="col-1-3">
<?= $this->paginator ?>
</div>
<div class="col-1-3 text-right">
<?= $this->sortBox ?>
</div>
</div> </div>
<?= $this->filterEditor ?> <?= $this->filterEditor ?>
</div> </div>