From 95c839a8bdec692d441e77f507192793eb6fb5ba Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Sep 2014 16:50:59 +0200
Subject: [PATCH] Remove remaining usages of the ElementWrapper- and
 HelpText-Decorator

refs #5525
---
 application/forms/Config/Resource/DbResourceForm.php   | 10 +---------
 application/forms/Config/Resource/LdapResourceForm.php | 10 +---------
 library/Icinga/Web/Form.php                            |  2 --
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
index 586544d26..05e946f8e 100644
--- a/application/forms/Config/Resource/DbResourceForm.php
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -9,8 +9,6 @@ use Zend_Config;
 use Icinga\Web\Form;
 use Icinga\Web\Request;
 use Icinga\Web\Form\Element\Number;
-use Icinga\Web\Form\Decorator\HelpText;
-use Icinga\Web\Form\Decorator\ElementWrapper;
 use Icinga\Data\ResourceFactory;
 
 /**
@@ -62,13 +60,7 @@ class DbResourceForm extends Form
                     'name'          => 'port',
                     'label'         => t('Port'),
                     'helptext'      => t('The port to use'),
-                    'value'         => 3306,
-                    'decorators'    => array( // The order is important!
-                        'ViewHelper',
-                        'Errors',
-                        new ElementWrapper(),
-                        new HelpText()
-                    )
+                    'value'         => 3306
                 )
             ),
             $this->createElement(
diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index bdd57ef09..af811c154 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -9,8 +9,6 @@ use Zend_Config;
 use Icinga\Web\Form;
 use Icinga\Web\Request;
 use Icinga\Web\Form\Element\Number;
-use Icinga\Web\Form\Decorator\HelpText;
-use Icinga\Web\Form\Decorator\ElementWrapper;
 use Icinga\Data\ResourceFactory;
 
 /**
@@ -48,13 +46,7 @@ class LdapResourceForm extends Form
                     'name'          => 'port',
                     'label'         => t('Port'),
                     'helptext'      => t('The port of the LDAP server to use for authentication'),
-                    'value'         => 389,
-                    'decorators'    => array( // The order is important!
-                        'ViewHelper',
-                        'Errors',
-                        new ElementWrapper(),
-                        new HelpText()
-                    )
+                    'value'         => 389
                 )
             ),
             $this->createElement(
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index bdbecfc40..2c0fb2a89 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -8,9 +8,7 @@ use LogicException;
 use Zend_Form;
 use Zend_View_Interface;
 use Icinga\Application\Icinga;
-use Icinga\Web\Form\Decorator\HelpText;
 use Icinga\Web\Form\Decorator\NoScriptApply;
-use Icinga\Web\Form\Decorator\ElementWrapper;
 use Icinga\Web\Form\Element\CsrfCounterMeasure;
 
 /**