Header: Change position because of dashboard rendering

refs #7976
This commit is contained in:
Marius Hein 2015-02-23 15:35:56 +01:00
parent 62866e5fb1
commit 316582c0d3
7 changed files with 20 additions and 15 deletions

View File

@ -2,7 +2,7 @@
use Icinga\Data\Filter\Filter;
use Icinga\Web\Widget\Chart\HistoryColorGrid;
?>
<? if (! $compact): ?>
<?php if (! $compact): ?>
<div class="controls">
<?= $this->tabs->render($this); ?>
<div class="fake-controls">
@ -12,10 +12,11 @@ use Icinga\Web\Widget\Chart\HistoryColorGrid;
<?= $form ?>
</div>
</div>
<? endif; ?>
<div class="content" data-base-target="_next">
<h1 tabindex="-1"><?= $this->translate('Event Grid') ?></h1>
<div class="content" data-base-target="_next">
<h1 tabindex="-1"><?= $this->translate('Event Grid'); ?></h1>
<?php else: ?>
<div class="content" data-base-target="_next">
<?php endif; ?>
<?php
$settings = array(

View File

@ -11,11 +11,14 @@ use Icinga\Module\Monitoring\Object\Service;
<?= $this->widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?>
<?= $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
</div>
<?php endif ?>
<div class="content">
<?= $this->filterEditor ?>
<h1 tabindex="-1"><?= $this->translate('Event History') ?></h1>
<?= $this->filterEditor ?>
<h1 tabindex="-1"><?= $this->translate('Event History') ?></h1>
<?php else: ?>
<div class="content">
<?php endif; ?>
<?php if (empty($history)): ?>
<?= $this->translate('No history events matching the filter') ?>
</div>

View File

@ -9,8 +9,8 @@
</div>
<div class="content">
<?= $this->filterEditor; ?>
<?php endif ?>
<h1 tabindex="-1"><?= $this->translate('Host Groups') ?></h1>
<?php endif ?>
<?php
if (count($hostgroups) === 0) {
echo $this->translate('No host groups matching the filter');

View File

@ -18,6 +18,7 @@ if ($this->compact): ?>
<div class="content">
<?= $this->filterEditor ?>
<h1 tabindex="-1"><?= $this->translate('Hosts') ?></h1>
<?php
endif;
@ -30,7 +31,6 @@ if ($hosts->count() === 0) {
return;
}
?>
<h1 tabindex="-1"><?= $this->translate('Hosts') ?></h1>
<table
data-base-target="_next"
class="action multiselect"

View File

@ -11,10 +11,11 @@ use Icinga\Module\Monitoring\Object\Service;
<?= $this->widget('limiter') ?>
<?= $this->paginationControl($notifications, null, null, array('preserve' => $this->preserve)) ?>
</div>
<?php endif ?>
<div class="content">
<h1 tabindex="-1"><?= $this->translate('Notifications'); ?></h1>
<?php else: ?>
<div class="content">
<?php endif ?>
<?php if (count($notifications) === 0): ?>
<?= $this->translate('No notifications matching the filter') ?>
<?php return; endif ?>

View File

@ -9,8 +9,8 @@
</div>
<div class="content">
<?= $this->filterEditor; ?>
<?php endif ?>
<h1 tabindex="-1"><?= $this->translate('Service Groups') ?></h1>
<?php endif ?>
<?php
if (count($servicegroups) === 0) {
echo $this->translate('No service groups matching the filter');

View File

@ -22,11 +22,11 @@ if (!$this->compact): ?>
<div class="content">
<?= $this->filterEditor ?>
<h1 tabindex="-1"><?= $this->translate('Services') ?></h1>
<?php else: ?>
<div class="content">
<?php endif ?>
<h1 tabindex="-1"><?= $this->translate('Services') ?></h1>
<table data-base-target="_next"
class="action multiselect <?php if ($this->compact): ?> compact<?php endif ?>" style="table-layout: auto;"
data-icinga-multiselect-url="<?= $this->href("monitoring/services/show") ?>"