Commit 1b1a2d77 authored by Steven Wittens's avatar Steven Wittens

- Restore user login block alignment (form api patch undid some recent class/id changes)

parent d747ec82
......@@ -517,6 +517,7 @@ function user_block($op = 'list', $delta = 0, $edit = array()) {
case 0:
// For usability's sake, avoid showing two login forms on one page.
if (!$user->uid && !(arg(0) == 'user' && !is_numeric(arg(1)))) {
$form['#attributes'] = array('id' => 'user-login-form');
$form['name'] = array('#type' => 'textfield', '#title' => t('Username'), '#maxlength' => 64, '#size' => 15);
$form['pass'] = array('#type' => 'password', '#title' => t('Password'), '#maxlength' => 64, '#size' => 15);
$form['submit'] = array('#type' => 'submit', '#value' => t('Log in'));
......@@ -591,15 +592,6 @@ function user_block($op = 'list', $delta = 0, $edit = array()) {
}
}
function theme_user_login_block($form) {
$output = "<div class=\"user-login-block\">\n";
$output .= form_render($form);
$output .= "</div>\n";
return $output;
}
function theme_user_picture($account) {
if (variable_get('user_pictures', 0)) {
if ($account->picture && file_exists($account->picture)) {
......
......@@ -517,6 +517,7 @@ function user_block($op = 'list', $delta = 0, $edit = array()) {
case 0:
// For usability's sake, avoid showing two login forms on one page.
if (!$user->uid && !(arg(0) == 'user' && !is_numeric(arg(1)))) {
$form['#attributes'] = array('id' => 'user-login-form');
$form['name'] = array('#type' => 'textfield', '#title' => t('Username'), '#maxlength' => 64, '#size' => 15);
$form['pass'] = array('#type' => 'password', '#title' => t('Password'), '#maxlength' => 64, '#size' => 15);
$form['submit'] = array('#type' => 'submit', '#value' => t('Log in'));
......@@ -591,15 +592,6 @@ function user_block($op = 'list', $delta = 0, $edit = array()) {
}
}
function theme_user_login_block($form) {
$output = "<div class=\"user-login-block\">\n";
$output .= form_render($form);
$output .= "</div>\n";
return $output;
}
function theme_user_picture($account) {
if (variable_get('user_pictures', 0)) {
if ($account->picture && file_exists($account->picture)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment