From 02f3c333ebe83aa7dc3bd0fef1945d5b52d0d58b Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 16:53:39 +0200
Subject: [PATCH] monitoring/object/show: reorder elements

---
 .../application/views/scripts/host/show.phtml       | 13 ++++++++-----
 .../application/views/scripts/service/show.phtml    | 13 ++++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/host/show.phtml b/modules/monitoring/application/views/scripts/host/show.phtml
index 3c100b440..07cb09d61 100644
--- a/modules/monitoring/application/views/scripts/host/show.phtml
+++ b/modules/monitoring/application/views/scripts/host/show.phtml
@@ -11,18 +11,21 @@
 
     <table class="avp newsection">
         <tbody>
-        <?= $this->render('show/components/notes.phtml') ?>
+        <tr><td colspan="2"><h2><?= $this->translate('Problem handling') ?></h2></td></tr>
         <?= $this->render('show/components/acknowledgement.phtml') ?>
         <?= $this->render('show/components/comments.phtml') ?>
-        <?= $this->render('show/components/notifications.phtml') ?>
         <?= $this->render('show/components/downtime.phtml') ?>
-        <?= $this->render('show/components/flapping.phtml') ?>
+        <?= $this->render('show/components/notes.phtml') ?>
         <?= $this->render('show/components/actions.phtml') ?>
+        <?= $this->render('show/components/flapping.phtml') ?>
         <?= $this->render('show/components/perfdata.phtml') ?>
-        <?= $this->render('show/components/checksource.phtml') ?>
-        <?= $this->render('show/components/command.phtml') ?>
         <?= $this->render('show/components/hostgroups.phtml') ?>
+        <tr><td colspan="2"><h2><?= $this->translate('Notifications') ?></h2></td></tr>
+        <?= $this->render('show/components/notifications.phtml') ?>
         <?= $this->render('show/components/contacts.phtml') ?>
+        <tr><td colspan="2"><h2><?= $this->translate('Check execution') ?></h2></td></tr>
+        <?= $this->render('show/components/command.phtml') ?>
+        <?= $this->render('show/components/checksource.phtml') ?>
         <?= $this->render('show/components/checkstatistics.phtml') ?>
         <?= $this->render('show/components/customvars.phtml') ?>
         <?= $this->render('show/components/flags.phtml') ?>
diff --git a/modules/monitoring/application/views/scripts/service/show.phtml b/modules/monitoring/application/views/scripts/service/show.phtml
index 57e42d842..03c6b213d 100644
--- a/modules/monitoring/application/views/scripts/service/show.phtml
+++ b/modules/monitoring/application/views/scripts/service/show.phtml
@@ -11,18 +11,21 @@
 
     <table class="avp newsection">
         <tbody>
-        <?= $this->render('show/components/notes.phtml') ?>
+        <tr><td colspan="2"><h2><?= $this->translate('Problem handling') ?></h2></td></tr>
         <?= $this->render('show/components/acknowledgement.phtml') ?>
         <?= $this->render('show/components/comments.phtml') ?>
-        <?= $this->render('show/components/notifications.phtml') ?>
         <?= $this->render('show/components/downtime.phtml') ?>
+        <?= $this->render('show/components/notes.phtml') ?>
+        <?= $this->render('show/components/actions.phtml') ?>
         <?= $this->render('show/components/flapping.phtml') ?>
         <?= $this->render('show/components/perfdata.phtml') ?>
-        <?= $this->render('show/components/checksource.phtml') ?>
-        <?= $this->render('show/components/actions.phtml') ?>
-        <?= $this->render('show/components/command.phtml') ?>
         <?= $this->render('show/components/servicegroups.phtml') ?>
+        <tr><td colspan="2"><h2><?= $this->translate('Notifications') ?></h2></td></tr>
+        <?= $this->render('show/components/notifications.phtml') ?>
         <?= $this->render('show/components/contacts.phtml') ?>
+        <tr><td colspan="2"><h2><?= $this->translate('Check execution') ?></h2></td></tr>
+        <?= $this->render('show/components/command.phtml') ?>
+        <?= $this->render('show/components/checksource.phtml') ?>
         <?= $this->render('show/components/checkstatistics.phtml') ?>
         <?= $this->render('show/components/customvars.phtml') ?>
         <?= $this->render('show/components/flags.phtml') ?>