From d0f13284bfc26b63d0465855302dd45bbdbcdf83 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 5 Dec 2016 07:49:50 +0100
Subject: [PATCH] ldap: pretty up config and fix a help string

---
 src/www/system_authservers.php | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/www/system_authservers.php b/src/www/system_authservers.php
index a695a7192..8f4249bee 100644
--- a/src/www/system_authservers.php
+++ b/src/www/system_authservers.php
@@ -548,21 +548,20 @@ endif; ?>
                 <tr class="auth_ldap auth_options hidden">
                   <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Search scope");?></td>
                   <td>
-                    <div>
-                      <?=gettext("Level:");?><br/>
-                      <select name='ldap_scope' id='ldap_scope' class="formselect selectpicker" data-style="btn-default">
-                          <option value="one" <?=$pconfig['ldap_scope'] == 'one' ?  "selected=\"selected\"" : "";?>>
-                              <?=gettext('One Level');?>
-                          </option>
-                          <option value="subtree" <?=$pconfig['ldap_scope'] == 'subtree' ?  "selected=\"selected\"" : "";?>>
-                              <?=gettext('Entire Subtree');?>
-                          </option>
-                      </select>
-                    </div>
-                    <div>
-                      <?=gettext("Base DN:");?><br/>
-                      <input name="ldap_basedn" type="text" id="ldap_basedn" size="40" value="<?=$pconfig['ldap_basedn'];?>"/>
-                    </div>
+                    <select name='ldap_scope' id='ldap_scope' class="formselect selectpicker" data-style="btn-default">
+                      <option value="one" <?=$pconfig['ldap_scope'] == 'one' ?  "selected=\"selected\"" : "";?>>
+                        <?=gettext('One Level');?>
+                      </option>
+                      <option value="subtree" <?=$pconfig['ldap_scope'] == 'subtree' ?  "selected=\"selected\"" : "";?>>
+                        <?=gettext('Entire Subtree');?>
+                      </option>
+                    </select>
+                  </td>
+                </tr>
+                <tr class="auth_ldap auth_options hidden">
+                  <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Base DN");?></td>
+                  <td>
+                    <input name="ldap_basedn" type="text" id="ldap_basedn" size="40" value="<?=$pconfig['ldap_basedn'];?>"/>
                   </td>
                 </tr>
                 <tr class="auth_ldap auth_options hidden">
@@ -574,9 +573,8 @@ endif; ?>
                     </ul>
                     <br/>
                     <div class="hidden" for="help_for_ldapauthcontainers">
-                        <br/><?=gettext("Semicolon separated. This will be prepended to the search base DN above or you can specify full container path containing a DC= component.");?>
-                        <br /><?=gettext("Example:");?> CN=Users;DC=example,DC=com
-                        <br /><?=gettext("Example:");?> OU=Staff;OU=Freelancers
+                        <br/><?=gettext("Semicolon-separated list of distinguished names or a path containing a DC= component.");?>
+                        <br/><?=gettext("Example:");?> CN=Users,OU=Staff,O=Company;OU=Freelancers,O=Company;DC=example,DC=com
                     </div>
                   </td>
                 </tr>