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

Replace usages of the helptext' form element option with description'

Browse Source 
refs #5525
This commit is contained in:
Johannes Meyer 2014-09-02 17:03:32 +02:00
parent c7a4098c04
commit 5ce9bef689
12 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/forms/Config/Authentication/AutologinBackendForm.php
View File

@ -32,7 +32,7 @@ class AutologinBackendForm extends Form
array( array(
'required' => true, 'required' => true,
'label' => t('Backend Name'), 'label' => t('Backend Name'),
'helptext' => t('The name of this authentication backend'), 'description' => t('The name of this authentication backend'),
'validators' => array( 'validators' => array(
array( array(
'Regex', 'Regex',
@ -53,7 +53,7 @@ class AutologinBackendForm extends Form
array( array(
'required' => true, 'required' => true,
'label' => t('Backend Domain Pattern'), 'label' => t('Backend Domain Pattern'),
'helptext' => t('The domain pattern of this authentication backend'), 'description' => t('The domain pattern of this authentication backend'),
'value' => '/\@[^$]+$/', 'value' => '/\@[^$]+$/',
'validators' => array( 'validators' => array(
new Zend_Validate_Callback(function ($value) { new Zend_Validate_Callback(function ($value) {

4
application/forms/Config/Authentication/DbBackendForm.php
View File

@ -55,7 +55,7 @@ class DbBackendForm extends Form
array( array(
'required' => true, 'required' => true,
'label' => t('Backend Name'), 'label' => t('Backend Name'),
'helptext' => t('The name of this authentication provider'), 'description' => t('The name of this authentication provider'),
) )
), ),
$this->createElement( $this->createElement(
@ -64,7 +64,7 @@ class DbBackendForm extends Form
array( array(
'required' => true, 'required' => true,
'label' => t('Database Connection'), 'label' => t('Database Connection'),
'helptext' => t('The database connection to use for authenticating with this provider'), 'description' => t('The database connection to use for authenticating with this provider'),
'multiOptions' => false === empty($this->resources) 'multiOptions' => false === empty($this->resources)
? array_combine($this->resources, $this->resources) ? array_combine($this->resources, $this->resources)
: array() : array()

20
application/forms/Config/Authentication/LdapBackendForm.php
View File

@ -54,7 +54,7 @@ class LdapBackendForm extends Form
array( array(
'required' => true, 'required' => true,
'label' => t('Backend Name'), 'label' => t('Backend Name'),
'helptext' => t('The name of this authentication backend') 'description' => t('The name of this authentication backend')
) )
), ),
$this->createElement( $this->createElement(
@ -63,7 +63,7 @@ class LdapBackendForm extends Form
array( array(
'required' => true, 'required' => true,
'label' => t('LDAP Resource'), 'label' => t('LDAP Resource'),
'helptext' => t('The resource to use for authenticating with this provider'), 'description' => t('The resource to use for authenticating with this provider'),
'multiOptions' => false === empty($this->resources) 'multiOptions' => false === empty($this->resources)
? array_combine($this->resources, $this->resources) ? array_combine($this->resources, $this->resources)
: array() : array()
@ -73,20 +73,20 @@ class LdapBackendForm extends Form
'text', 'text',
'user_class', 'user_class',
array( array(
'required' => true, 'required' => true,
'label' => t('LDAP User Object Class'), 'label' => t('LDAP User Object Class'),
'helptext' => t('The object class used for storing users on the ldap server'), 'description' => t('The object class used for storing users on the ldap server'),
'value' => 'inetOrgPerson' 'value' => 'inetOrgPerson'
) )
), ),
$this->createElement( $this->createElement(
'text', 'text',
'user_name_attribute', 'user_name_attribute',
array( array(
'required' => true, 'required' => true,
'label' => t('LDAP User Name Attribute'), 'label' => t('LDAP User Name Attribute'),
'helptext' => t('The attribute name used for storing the user name on the ldap server'), 'description' => t('The attribute name used for storing the user name on the ldap server'),
'value' => 'uid' 'value' => 'uid'
) )
), ),
$this->createElement( $this->createElement(

20
application/forms/Config/AuthenticationBackendConfigForm.php
View File

@ -266,10 +266,10 @@ class AuthenticationBackendConfigForm extends ConfigForm
'checkbox', 'checkbox',
'force_creation', 'force_creation',
array( array(
'order' => 0, 'order' => 0,
'ignore' => true, 'ignore' => true,
'label' => t('Force Changes'), 'label' => t('Force Changes'),
'helptext' => t('Check this box to enforce changes without connectivity validation') 'description' => t('Check this box to enforce changes without connectivity validation')
) )
); );
} }
@ -304,12 +304,12 @@ class AuthenticationBackendConfigForm extends ConfigForm
'select', 'select',
'type', 'type',
array( array(
'ignore' => true, 'ignore' => true,
'required' => true, 'required' => true,
'autosubmit' => true, 'autosubmit' => true,
'label' => t('Backend Type'), 'label' => t('Backend Type'),
'helptext' => t('The type of the resource to use for this authenticaton backend'), 'description' => t('The type of the resource to use for this authenticaton backend'),
'multiOptions' => $backendTypes 'multiOptions' => $backendTypes
) )
); );

10
application/forms/Config/General/ApplicationConfigForm.php
View File

@ -41,7 +41,7 @@ class ApplicationConfigForm extends Form
'label' => t('Default Language'), 'label' => t('Default Language'),
'required' => true, 'required' => true,
'multiOptions' => $languages, 'multiOptions' => $languages,
'helptext' => t( 'description' => t(
'Select the language to use by default. Can be overwritten by a user in his preferences.' 'Select the language to use by default. Can be overwritten by a user in his preferences.'
) )
) )
@ -59,7 +59,7 @@ class ApplicationConfigForm extends Form
'label' => t('Default Application Timezone'), 'label' => t('Default Application Timezone'),
'required' => true, 'required' => true,
'multiOptions' => $tzList, 'multiOptions' => $tzList,
'helptext' => t( 'description' => t(
'Select the timezone to be used as the default. User\'s can set their own timezone if' 'Select the timezone to be used as the default. User\'s can set their own timezone if'
. ' they like to, but this is the timezone to be used as the default setting .' . ' they like to, but this is the timezone to be used as the default setting .'
), ),
@ -71,9 +71,9 @@ class ApplicationConfigForm extends Form
'text', 'text',
'global_modulePath', 'global_modulePath',
array( array(
'label' => t('Module Path'), 'label' => t('Module Path'),
'required' => true, 'required' => true,
'helptext' => t( 'description' => t(
'Contains the directories that will be searched for available modules, separated by ' 'Contains the directories that will be searched for available modules, separated by '
. 'colons. Modules that don\'t exist in these directories can still be symlinked in ' . 'colons. Modules that don\'t exist in these directories can still be symlinked in '
. 'the module folder, but won\'t show up in the list of disabled modules.' . 'the module folder, but won\'t show up in the list of disabled modules.'

10
application/forms/Config/General/LoggingConfigForm.php
View File

@ -31,7 +31,7 @@ class LoggingConfigForm extends Form
array( array(
'required' => true, 'required' => true,
'label' => t('Logging Level'), 'label' => t('Logging Level'),
'helptext' => t('The maximum loglevel to emit.'), 'description' => t('The maximum loglevel to emit.'),
'multiOptions' => array( 'multiOptions' => array(
0 => t('None'), 0 => t('None'),
1 => t('Error'), 1 => t('Error'),
@ -48,7 +48,7 @@ class LoggingConfigForm extends Form
'required' => true, 'required' => true,
'class' => 'autosubmit', 'class' => 'autosubmit',
'label' => t('Logging Type'), 'label' => t('Logging Type'),
'helptext' => t('The type of logging to utilize.'), 'description' => t('The type of logging to utilize.'),
'multiOptions' => array( 'multiOptions' => array(
'syslog' => 'Syslog', 'syslog' => 'Syslog',
'file' => t('File') 'file' => t('File')
@ -63,7 +63,7 @@ class LoggingConfigForm extends Form
array( array(
'required' => true, 'required' => true,
'label' => t('Application Prefix'), 'label' => t('Application Prefix'),
'helptext' => t('The name of the application by which to prefix syslog messages.'), 'description' => t('The name of the application by which to prefix syslog messages.'),
'value' => 'icingaweb', 'value' => 'icingaweb',
'validators' => array( 'validators' => array(
array( array(
@ -85,7 +85,7 @@ class LoggingConfigForm extends Form
array( array(
'required' => true, 'required' => true,
'label' => t('Facility'), 'label' => t('Facility'),
'helptext' => t('The Syslog facility to utilize.'), 'description' => t('The Syslog facility to utilize.'),
'multiOptions' => array( 'multiOptions' => array(
'LOG_USER' => 'LOG_USER' 'LOG_USER' => 'LOG_USER'
) )
@ -98,7 +98,7 @@ class LoggingConfigForm extends Form
array( array(
'required' => true, 'required' => true,
'label' => t('Filepath'), 'label' => t('Filepath'),
'helptext' => t('The logfile to write messages to.'), 'description' => t('The logfile to write messages to.'),
'value' => $this->getDefaultLogDir(), 'value' => $this->getDefaultLogDir(),
'validators' => array(new WritablePathValidator()) 'validators' => array(new WritablePathValidator())
) )

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

@ -36,11 +36,11 @@ class DbResourceForm extends Form
array( array(
'required' => true, 'required' => true,
'label' => t('Database Type'), 'label' => t('Database Type'),
'helptext' => t('The type of SQL database'), 'description' => t('The type of SQL database'),
'multiOptions' => array( 'multiOptions' => array(
'mysql' => 'MySQL', 'mysql' => 'MySQL',
'pgsql' => 'PostgreSQL' 'pgsql' => 'PostgreSQL'
//'oracle' => 'Oracle' //'oracle' => 'Oracle'
) )
) )
), ),
@ -48,10 +48,10 @@ class DbResourceForm extends Form
'text', 'text',
'host', 'host',
array ( array (
'required' => true, 'required' => true,
'label' => t('Host'), 'label' => t('Host'),
'helptext' => t('The hostname of the database'), 'description' => t('The hostname of the database'),
'value' => 'localhost' 'value' => 'localhost'
) )
), ),
new Number( new Number(
@ -59,7 +59,7 @@ class DbResourceForm extends Form
'required' => true, 'required' => true,
'name' => 'port', 'name' => 'port',
'label' => t('Port'), 'label' => t('Port'),
'helptext' => t('The port to use'), 'description' => t('The port to use'),
'value' => 3306 'value' => 3306
) )
), ),
@ -67,18 +67,18 @@ class DbResourceForm extends Form
'text', 'text',
'dbname', 'dbname',
array( array(
'required' => true, 'required' => true,
'label' => t('Database Name'), 'label' => t('Database Name'),
'helptext' => t('The name of the database to use') 'description' => t('The name of the database to use')
) )
), ),
$this->createElement( $this->createElement(
'text', 'text',
'username', 'username',
array ( array (
'required' => true, 'required' => true,
'label' => t('Username'), 'label' => t('Username'),
'helptext' => t('The user name to use for authentication') 'description' => t('The user name to use for authentication')
) )
), ),
$this->createElement( $this->createElement(
@ -88,7 +88,7 @@ class DbResourceForm extends Form
'required' => true, 'required' => true,
'renderPassword' => true, 'renderPassword' => true,
'label' => t('Password'), 'label' => t('Password'),
'helptext' => t('The password to use for authentication') 'description' => t('The password to use for authentication')
) )
) )
); );

8
application/forms/Config/Resource/FileResourceForm.php
View File

@ -32,7 +32,7 @@ class FileResourceForm extends Form
array( array(
'required' => true, 'required' => true,
'label' => t('Filepath'), 'label' => t('Filepath'),
'helptext' => t('The filename to fetch information from'), 'description' => t('The filename to fetch information from'),
'validators' => array(new ReadablePathValidator()) 'validators' => array(new ReadablePathValidator())
) )
), ),
@ -40,9 +40,9 @@ class FileResourceForm extends Form
'text', 'text',
'fields', 'fields',
array( array(
'required' => true, 'required' => true,
'label' => t('Pattern'), 'label' => t('Pattern'),
'helptext' => t('The regular expression by which to identify columns') 'description' => t('The regular expression by which to identify columns')
) )
) )
); );

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

@ -36,7 +36,7 @@ class LdapResourceForm extends Form
array( array(
'required' => true, 'required' => true,
'label' => t('Host'), 'label' => t('Host'),
'helptext' => t('The hostname or address of the LDAP server to use for authentication'), 'description' => t('The hostname or address of the LDAP server to use for authentication'),
'value' => 'localhost' 'value' => 'localhost'
) )
), ),
@ -45,7 +45,7 @@ class LdapResourceForm extends Form
'required' => true, 'required' => true,
'name' => 'port', 'name' => 'port',
'label' => t('Port'), 'label' => t('Port'),
'helptext' => t('The port of the LDAP server to use for authentication'), 'description' => t('The port of the LDAP server to use for authentication'),
'value' => 389 'value' => 389
) )
), ),
@ -53,18 +53,18 @@ class LdapResourceForm extends Form
'text', 'text',
'root_dn', 'root_dn',
array( array(
'required' => true, 'required' => true,
'label' => t('Root DN'), 'label' => t('Root DN'),
'helptext' => t('The path where users can be found on the ldap server') 'description' => t('The path where users can be found on the ldap server')
) )
), ),
$this->createElement( $this->createElement(
'text', 'text',
'bind_dn', 'bind_dn',
array( array(
'required' => true, 'required' => true,
'label' => t('Bind DN'), 'label' => t('Bind DN'),
'helptext' => t('The user dn to use for querying the ldap server') 'description' => t('The user dn to use for querying the ldap server')
) )
), ),
$this->createElement( $this->createElement(
@ -74,7 +74,7 @@ class LdapResourceForm extends Form
'required' => true, 'required' => true,
'renderPassword' => true, 'renderPassword' => true,
'label' => t('Bind Password'), 'label' => t('Bind Password'),
'helptext' => t('The password to use for querying the ldap server') 'description' => t('The password to use for querying the ldap server')
) )
) )
); );

8
application/forms/Config/Resource/LivestatusResourceForm.php
View File

@ -34,10 +34,10 @@ class LivestatusResourceForm extends Form
'text', 'text',
'socket', 'socket',
array( array(
'required' => true, 'required' => true,
'label' => t('Socket'), 'label' => t('Socket'),
'helptext' => t('The path to your livestatus socket used for querying monitoring data'), 'description' => t('The path to your livestatus socket used for querying monitoring data'),
'value' => realpath(Icinga::app()->getApplicationDir() . '/../var/rw/livestatus') 'value' => realpath(Icinga::app()->getApplicationDir() . '/../var/rw/livestatus')
) )
) )
); );

4
application/forms/Config/Resource/StatusdatResourceForm.php
View File

@ -33,7 +33,7 @@ class StatusdatResourceForm extends Form
array( array(
'required' => true, 'required' => true,
'label' => t('Filepath'), 'label' => t('Filepath'),
'helptext' => t('Location of your icinga status.dat file'), 'description' => t('Location of your icinga status.dat file'),
'value' => realpath(Icinga::app()->getApplicationDir() . '/../var/status.dat'), 'value' => realpath(Icinga::app()->getApplicationDir() . '/../var/status.dat'),
'validators' => array(new ReadablePathValidator()) 'validators' => array(new ReadablePathValidator())
) )
@ -44,7 +44,7 @@ class StatusdatResourceForm extends Form
array( array(
'required' => true, 'required' => true,
'label' => t('Filepath'), 'label' => t('Filepath'),
'helptext' => t('Location of your icinga objects.cache file'), 'description' => t('Location of your icinga objects.cache file'),
'value' => realpath(Icinga::app()->getApplicationDir() . '/../var/objects.cache'), 'value' => realpath(Icinga::app()->getApplicationDir() . '/../var/objects.cache'),
'validators' => array(new ReadablePathValidator()) 'validators' => array(new ReadablePathValidator())
) )

26
application/forms/Config/ResourceConfigForm.php
View File

@ -197,10 +197,10 @@ class ResourceConfigForm extends ConfigForm
'checkbox', 'checkbox',
'force_creation', 'force_creation',
array( array(
'order' => 0, 'order' => 0,
'ignore' => true, 'ignore' => true,
'label' => t('Force Changes'), 'label' => t('Force Changes'),
'helptext' => t('Check this box to enforce changes without connectivity validation') 'description' => t('Check this box to enforce changes without connectivity validation')
) )
); );
} }
@ -229,21 +229,21 @@ class ResourceConfigForm extends ConfigForm
'text', 'text',
'name', 'name',
array( array(
'required' => true, 'required' => true,
'label' => t('Resource Name'), 'label' => t('Resource Name'),
'helptext' => t('The unique name of this resource') 'description' => t('The unique name of this resource')
) )
), ),
$this->createElement( $this->createElement(
'select', 'select',
'type', 'type',
array( array(
'required' => true, 'required' => true,
'autosubmit' => true, 'autosubmit' => true,
'label' => t('Resource Type'), 'label' => t('Resource Type'),
'helptext' => t('The type of resource'), 'description' => t('The type of resource'),
'multiOptions' => $resourceTypes, 'multiOptions' => $resourceTypes,
'value' => $resourceType 'value' => $resourceType
) )
) )
); );