tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AdminAccountPage: Do not put an element's description at the top of the form

This commit is contained in:
Johannes Meyer 2015-06-30 15:10:17 +02:00
parent b61c9708bb
commit 0dc604029a
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/setup/application/forms/AdminAccountPage.php
View File

@ -89,9 +89,6 @@ class AdminAccountPage extends Form
} }
if (count($choices) > 1) { if (count($choices) > 1) {
$this->addDescription($this->translate(
'Below are several options you can choose from for how to define the desired account.'
));
$this->addElement( $this->addElement(
'select', 'select',
'user_type', 'user_type',
@ -99,6 +96,7 @@ class AdminAccountPage extends Form
'required' => true, 'required' => true,
'autosubmit' => true, 'autosubmit' => true,
'label' => $this->translate('Type Of Definition'), 'label' => $this->translate('Type Of Definition'),
'description' => $this->translate('Choose how to define the desired account.'),
'multiOptions' => $choices, 'multiOptions' => $choices,
'value' => $choice 'value' => $choice
) )
@ -124,7 +122,7 @@ class AdminAccountPage extends Form
'label' => $this->translate('Username'), 'label' => $this->translate('Username'),
'description' => $this->translate( 'description' => $this->translate(
'Define the initial administrative account by providing a username that reflects' 'Define the initial administrative account by providing a username that reflects'
. ' a user created later or one that is authenticated using external mechanisms' . ' a user created later or one that is authenticated using external mechanisms.'
) )
) )
); );
@ -139,7 +137,7 @@ class AdminAccountPage extends Form
'label' => $this->translate('Username'), 'label' => $this->translate('Username'),
'description' => sprintf( 'description' => sprintf(
$this->translate( $this->translate(
'Choose a user reported by the %s backend as the initial administrative account', 'Choose a user reported by the %s backend as the initial administrative account.',
'setup.admin' 'setup.admin'
), ),
$this->backendConfig['backend'] === 'db' $this->backendConfig['backend'] === 'db'
@ -159,7 +157,7 @@ class AdminAccountPage extends Form
'required' => true, 'required' => true,
'label' => $this->translate('Username'), 'label' => $this->translate('Username'),
'description' => $this->translate( 'description' => $this->translate(
'Enter the username to be used when creating an initial administrative account' 'Enter the username to be used when creating an initial administrative account.'
) )
) )
); );
@ -169,7 +167,7 @@ class AdminAccountPage extends Form
array( array(
'required' => true, 'required' => true,
'label' => $this->translate('Password'), 'label' => $this->translate('Password'),
'description' => $this->translate('Enter the password to assign to the newly created account') 'description' => $this->translate('Enter the password to assign to the newly created account.')
) )
); );
$this->addElement( $this->addElement(
@ -179,7 +177,7 @@ class AdminAccountPage extends Form
'required' => true, 'required' => true,
'label' => $this->translate('Repeat password'), 'label' => $this->translate('Repeat password'),
'description' => $this->translate( 'description' => $this->translate(
'Please repeat the password given above to avoid typing errors' 'Please repeat the password given above to avoid typing errors.'
), ),
'validators' => array( 'validators' => array(
array('identical', false, array('new_user_password')) array('identical', false, array('new_user_password'))