From 21379cb24d5f3faa5c8d34e7bb846f48064fd28e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 15 Oct 2014 15:46:54 +0200
Subject: [PATCH] Show ldap discovery results in a nice table

refs #7163
---
 .../forms/Setup/LdapDiscoveryConfirmPage.php    | 17 ++++++++---------
 public/css/icinga/setup.less                    |  6 ++++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/application/forms/Setup/LdapDiscoveryConfirmPage.php b/application/forms/Setup/LdapDiscoveryConfirmPage.php
index 0464a6036..a7d867f86 100644
--- a/application/forms/Setup/LdapDiscoveryConfirmPage.php
+++ b/application/forms/Setup/LdapDiscoveryConfirmPage.php
@@ -20,15 +20,14 @@ class LdapDiscoveryConfirmPage extends Form
     const TYPE_MISC = 'LDAP';
 
     private $infoTemplate = <<< 'EOT'
-<br/>
-  Found LDAP server on {domain}
-<ul>
-  <li><b>Type:</b>    {type}</li>
-  <li><b>Port:</b>    {port}</li>
-  <li><b>Root DN:</b> {root_dn}</li>
-  <li><b>User-Class:</b> {user_class}</li>
-  <li><b>User-Attribue:</b> {user_attribute}</li>
-</ul>
+Found LDAP server on {domain}
+<table><tbody>
+  <tr><td><strong>Type:</strong></td><td>{type}</td></tr>
+  <tr><td><strong>Port:</strong></td><td>{port}</td></tr>
+  <tr><td><strong>Root DN:</strong></td><td>{root_dn}</td></tr>
+  <tr><td><strong>User Object Class:</strong></td><td>{user_class}</td></tr>
+  <tr><td><strong>User Name Attribute:</strong></td><td>{user_attribute}</td></tr>
+</tbody></table>
 EOT;
 
     /**
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index da92dc89f..fe9f02b1a 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -134,6 +134,12 @@
   }
 }
 
+#setup_ldap_discovery_confirm table {
+  margin: 1em 0;
+  border-collapse: separate;
+  border-spacing: 1em 0.2em;
+}
+
 #setup_admin_account {
   div.instructions {
     width: 30.2em;