tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-30 17:24:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove remaining usages of the ElementWrapper- and HelpText-Decorator

Browse Source 
refs #5525
This commit is contained in:
Johannes Meyer 2014-09-02 16:50:59 +02:00
parent 5464321a1b
commit 95c839a8bd
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/forms/Config/Resource/DbResourceForm.php
View File

@ -9,8 +9,6 @@ use Zend_Config;
use Icinga\Web\Form; use Icinga\Web\Form;
use Icinga\Web\Request; use Icinga\Web\Request;
use Icinga\Web\Form\Element\Number; use Icinga\Web\Form\Element\Number;
use Icinga\Web\Form\Decorator\HelpText;
use Icinga\Web\Form\Decorator\ElementWrapper;
use Icinga\Data\ResourceFactory; use Icinga\Data\ResourceFactory;
/** /**
@ -62,13 +60,7 @@ class DbResourceForm extends Form
'name' => 'port', 'name' => 'port',
'label' => t('Port'), 'label' => t('Port'),
'helptext' => t('The port to use'), 'helptext' => t('The port to use'),
'value' => 3306, 'value' => 3306
'decorators' => array( // The order is important!
'ViewHelper',
'Errors',
new ElementWrapper(),
new HelpText()
)
) )
), ),
$this->createElement( $this->createElement(

10
application/forms/Config/Resource/LdapResourceForm.php
View File

@ -9,8 +9,6 @@ use Zend_Config;
use Icinga\Web\Form; use Icinga\Web\Form;
use Icinga\Web\Request; use Icinga\Web\Request;
use Icinga\Web\Form\Element\Number; use Icinga\Web\Form\Element\Number;
use Icinga\Web\Form\Decorator\HelpText;
use Icinga\Web\Form\Decorator\ElementWrapper;
use Icinga\Data\ResourceFactory; use Icinga\Data\ResourceFactory;
/** /**
@ -48,13 +46,7 @@ class LdapResourceForm extends Form
'name' => 'port', 'name' => 'port',
'label' => t('Port'), 'label' => t('Port'),
'helptext' => t('The port of the LDAP server to use for authentication'), 'helptext' => t('The port of the LDAP server to use for authentication'),
'value' => 389, 'value' => 389
'decorators' => array( // The order is important!
'ViewHelper',
'Errors',
new ElementWrapper(),
new HelpText()
)
) )
), ),
$this->createElement( $this->createElement(

2
library/Icinga/Web/Form.php
View File

@ -8,9 +8,7 @@ use LogicException;
use Zend_Form; use Zend_Form;
use Zend_View_Interface; use Zend_View_Interface;
use Icinga\Application\Icinga; use Icinga\Application\Icinga;
use Icinga\Web\Form\Decorator\HelpText;
use Icinga\Web\Form\Decorator\NoScriptApply; use Icinga\Web\Form\Decorator\NoScriptApply;
use Icinga\Web\Form\Decorator\ElementWrapper;
use Icinga\Web\Form\Element\CsrfCounterMeasure; use Icinga\Web\Form\Element\CsrfCounterMeasure;
/** /**