From b34d1977d8dd5bb3b110ef9c765d2ecadb584fbb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@icinga.com>
Date: Wed, 7 Jun 2017 14:22:51 +0200
Subject: [PATCH] Fix discover domain btn

refs #2153
---
 .../Config/UserBackend/LdapBackendForm.php    | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/application/forms/Config/UserBackend/LdapBackendForm.php b/application/forms/Config/UserBackend/LdapBackendForm.php
index b23509859..b08a7b5a3 100644
--- a/application/forms/Config/UserBackend/LdapBackendForm.php
+++ b/application/forms/Config/UserBackend/LdapBackendForm.php
@@ -226,14 +226,6 @@ class LdapBackendForm extends Form
                 'label'         => $this->translate('Domain'),
                 'description'   => $this->translate(
                     'The domain the LDAP server is responsible for.'
-                ),
-                'decorators'    => array(
-                    array('Label', array('tag'=>'span', 'separator' => '', 'class' => 'control-label')),
-                    array('Help', array('placement' => 'APPEND')),
-                    array(array('labelWrap' => 'HtmlTag'), array('tag' => 'div', 'class' => 'control-label-group')),
-                    array('ViewHelper', array('separator' => '')),
-                    array('Errors', array('separator' => '')),
-                    array('HtmlTag', array('tag' => 'div', 'class' => 'control-group', 'openOnly' => true))
                 )
             )
         );
@@ -242,18 +234,19 @@ class LdapBackendForm extends Form
             'button',
             'btn_discover_domain',
             array(
-                'escape'        => false,
-                'ignore'        => true,
-                'label'         => $this->getView()->icon('binoculars'),
-                'type'          => 'submit',
-                'title'         => $this->translate('Discover the domain'),
-                'value'         => $this->translate('Discover'),
-                'decorators'    => array(
-                    array('Help', array('placement' => 'APPEND')),
+                'class'             => 'control-button',
+                'type'              => 'submit',
+                'value'             => 'discovery_btn',
+                'label'             => $this->translate('Discover the domain'),
+                'title'             => $this->translate(
+                    'Push to disover and fill in the domain of the LDAP server.'
+                ),
+                'decorators'        => array(
                     array('ViewHelper', array('separator' => '')),
-                    array('Errors', array('separator' => '')),
-                    array('HtmlTag', array('tag' => 'div', 'class' => 'control-group', 'closeOnly' => true))
-                )
+                    array('Spinner'),
+                    array('HtmlTag', array('tag' => 'div', 'class' => 'control-group form-controls'))
+                ),
+                'formnovalidate'    => 'formnovalidate'
             )
         );
     }