From 5c0441bc06a1f7ef3ab3725a639a58127cf63684 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Tue, 11 Mar 2014 17:13:42 +0100
Subject: [PATCH] Re-design configuration interface

---
 .../views/scripts/config/authentication.phtml |  2 +-
 .../views/scripts/config/index.phtml          | 80 ++++++++++---------
 2 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/application/views/scripts/config/authentication.phtml b/application/views/scripts/config/authentication.phtml
index e9bc1f0a1..a86e97600 100644
--- a/application/views/scripts/config/authentication.phtml
+++ b/application/views/scripts/config/authentication.phtml
@@ -2,7 +2,7 @@
 <?= $this->tabs ?>
 </div>
 
-<div class="content">
+<div class="content" data-base-target="_next">
 <?php
 
 if (isset($this->messageBox)) {
diff --git a/modules/monitoring/application/views/scripts/config/index.phtml b/modules/monitoring/application/views/scripts/config/index.phtml
index 34e928563..462cfc8a8 100644
--- a/modules/monitoring/application/views/scripts/config/index.phtml
+++ b/modules/monitoring/application/views/scripts/config/index.phtml
@@ -3,7 +3,7 @@
     <?= $this->tabs->render($this); ?>
 </div>
 
-<div class="content">
+<div class="content" data-base-target="_next">
     <h1>Monitoring Backends</h1>
 
     <?php if (isset($this->messageBox)): ?>
@@ -16,23 +16,28 @@
         </a>
     </p>
 
-    <table class="configTable">
-        <?php foreach ($this->backends as $backendName => $config): ?>
-            <tr>
-                <td class="configTable">
-                    <?php
-                    $removeUrl = Url::fromPath('/monitoring/config/removebackend', array('backend' => $backendName));
-                    $editUrl = Url::fromPath('/monitoring/config/editbackend', array('backend' => $backendName));
-                    ?>
-                    <b><?= $this->escape($backendName); ?></b>
-                    <small>(Type: <?= $this->escape($config['type'] === 'ido' ? 'IDO' : ucfirst($config['type'])); ?>)</small>
-                    <div>
-                        <a href="<?= $removeUrl; ?>"><?= $this->icon('remove.png'); ?> Remove</a>&emsp;
-                        <a href="<?= $editUrl; ?>"><?= $this->icon('edit.png'); ?> Edit</a>
-                    </div>
-                </td>
-            </tr>
-        <?php endforeach; ?>
+    <table class="action">
+        <thead>
+            <th>Monitoring Backend</th>
+            <th style="width: 5em">Remove</th>
+        </thead>
+        <tbody>
+            <?php foreach ($this->backends as $backendName => $config): ?>
+                <?php
+                $removeUrl = Url::fromPath('/monitoring/config/removebackend', array('backend' => $backendName));
+                $editUrl = Url::fromPath('/monitoring/config/editbackend', array('backend' => $backendName));
+                ?>
+                <tr>
+                    <td>
+                        <a href="<?= $editUrl; ?>"><?= $this->icon('edit.png'); ?> <?= $this->escape($backendName); ?></a>
+                        <small>(Type: <?= $this->escape($config['type'] === 'ido' ? 'IDO' : ucfirst($config['type'])); ?>)</small>
+                    </td>
+                    <td>
+                        <a href="<?= $removeUrl; ?>"><?= $this->icon('remove.png'); ?></a>
+                    </td>
+                </tr>
+            <?php endforeach; ?>
+        </tbody>
     </table>
 
     <h1>Monitoring Instances</h1>
@@ -43,24 +48,27 @@
         </a>
     </p>
 
-    <table class="configTable">
-        <?php foreach ($this->instances as $instanceName => $config): ?>
-            <tr>
-                <td class="configTable">
-                    <?php
-                    $removeUrl = Url::fromPath('/monitoring/config/removeinstance', array('instance' => $instanceName));
-                    $editUrl = Url::fromPath('/monitoring/config/editinstance', array('instance' => $instanceName));
-                    ?>
-                    <div>
-                        <b><?= $this->escape($instanceName); ?></b>
+    <table class="action">
+        <thead>
+            <th>Instance</th>
+            <th style="width: 5em">Remove</th>
+        </thead>
+        <tbody>
+            <?php foreach ($this->instances as $instanceName => $config): ?>
+                <?php
+                $removeUrl = Url::fromPath('/monitoring/config/removeinstance', array('instance' => $instanceName));
+                $editUrl = Url::fromPath('/monitoring/config/editinstance', array('instance' => $instanceName));
+                ?>
+                <tr>
+                    <td>
+                        <a href="<?= $editUrl; ?>"><?= $this->icon('edit.png'); ?> <?= $this->escape($instanceName); ?></a>
                         <small>(Type: <?= isset($config['host']) ? 'Remote' : 'Local'; ?>)</small>
-                        <div>
-                            <a href="<?= $removeUrl; ?>"><?= $this->icon('remove.png'); ?> Remove</a>&emsp;
-                            <a href="<?= $editUrl; ?>"><?= $this->icon('edit.png'); ?> Edit</a>
-                        </div>
-                    </div>
-                </td>
-            </tr>
-        <?php endforeach; ?>
+                    </td>
+                    <td>
+                        <a href="<?= $removeUrl; ?>"><?= $this->icon('remove.png'); ?></a>
+                    </td>
+                </tr>
+            <?php endforeach; ?>
+        </tbody>
     </table>
 </div>