summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Wittens <steven@10.no-reply.drupal.org>2007-01-11 03:24:42 +0000
committerSteven Wittens <steven@10.no-reply.drupal.org>2007-01-11 03:24:42 +0000
commit36cd6b2b21a61cc73d837bcac22b163a39ef5e44 (patch)
tree0fe2d5d23534aa9d5506faefdba9c398abf4df33
parent8bd8a972829839f16a6234e7d93e7c6d9077f004 (diff)
downloadbrdo-36cd6b2b21a61cc73d837bcac22b163a39ef5e44.tar.gz
brdo-36cd6b2b21a61cc73d837bcac22b163a39ef5e44.tar.bz2
#107966: Make login fields consistent size.
-rw-r--r--includes/form.inc4
-rw-r--r--modules/system/system.module2
-rw-r--r--modules/user/user.module2
3 files changed, 7 insertions, 1 deletions
diff --git a/includes/form.inc b/includes/form.inc
index 7eb461883..087b77df9 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -1102,6 +1102,10 @@ function expand_password_confirm($element) {
$element['#validate'] = array('password_confirm_validate' => array());
$element['#tree'] = TRUE;
+ if (isset($element['#size'])) {
+ $element['pass1']['#size'] = $element['pass2']['#size'] = $element['#size'];
+ }
+
return $element;
}
diff --git a/modules/system/system.module b/modules/system/system.module
index b735f5689..5bb4f67ae 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -62,7 +62,7 @@ function system_elements() {
$type['submit'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#executes_submit_callback' => TRUE);
$type['button'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#executes_submit_callback' => FALSE);
$type['textfield'] = array('#input' => TRUE, '#size' => 60, '#maxlength' => 128, '#autocomplete_path' => FALSE);
- $type['password'] = array('#input' => TRUE, '#size' => 30);
+ $type['password'] = array('#input' => TRUE, '#size' => 60);
$type['password_confirm'] = array('#input' => TRUE, '#process' => array('expand_password_confirm' => array()));
$type['textarea'] = array('#input' => TRUE, '#cols' => 60, '#rows' => 5);
$type['radios'] = array('#input' => TRUE, '#process' => array('expand_radios' => array()));
diff --git a/modules/user/user.module b/modules/user/user.module
index f2ffe0fac..dde3049db 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1312,6 +1312,7 @@ function user_edit_form($uid, $edit, $register = FALSE) {
if (!$register) {
$form['account']['pass'] = array('#type' => 'password_confirm',
'#description' => t('To change the current user password, enter the new password in both fields.'),
+ '#size' => 25,
);
}
elseif (!variable_get('user_email_verification', TRUE) || $admin) {
@@ -1319,6 +1320,7 @@ function user_edit_form($uid, $edit, $register = FALSE) {
'#type' => 'password_confirm',
'#description' => t('Provide a password for the new account in both fields.'),
'#required' => TRUE,
+ '#size' => 25,
);
}
if ($admin) {