[icinga-checkins] icinga.org: icingaweb2/master: Header: Change position because of dashboard rendering

git at icinga.org git at icinga.org
Mon Feb 23 16:08:20 CET 2015


Module: icingaweb2
Branch: master
Commit: 316582c0d36202e9b7c3490e106062c480dff78d
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=316582c0d36202e9b7c3490e106062c480dff78d

Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Feb 23 15:35:56 2015 +0100

Header: Change position because of dashboard rendering

refs #7976

---

 .../application/views/scripts/list/eventgrid.phtml          |   11 ++++++-----
 .../application/views/scripts/list/eventhistory.phtml       |   11 +++++++----
 .../application/views/scripts/list/hostgroups.phtml         |    2 +-
 .../monitoring/application/views/scripts/list/hosts.phtml   |    2 +-
 .../application/views/scripts/list/notifications.phtml      |    5 +++--
 .../application/views/scripts/list/servicegroups.phtml      |    2 +-
 .../application/views/scripts/list/services.phtml           |    2 +-
 7 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/eventgrid.phtml b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
index efabac2..168bac9 100644
--- a/modules/monitoring/application/views/scripts/list/eventgrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
@@ -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(
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 84baabb..035be6c 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -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>
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index ee5973a..671ccb4 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -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');
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 509cf57..0af16c2 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -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"
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index bd2af81..b8dc479 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -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 ?>
diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index 3c35d8c..87baf32 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -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');
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 5b8edca..0f4933f 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -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") ?>"



More information about the icinga-checkins mailing list