- CSS improvements: use form functions wrapped in a <div> instead of

  hard-coded form elements.  Modified patch by Kristjan.

  I added some CSS to drupal.css to center the text and ordered the
  list of CSS tags alphabetically.

1 files changed, 12 insertions, 9 deletions

diff --git a/modules/user/user.module b/modules/user/user.module
index 369c1cc0a..fc5333c36 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -311,8 +311,8 @@ function user_block($op = "list", $delta = 0) {
     switch ($delta) {
       case 0:
         if (!$user->uid) {
-          $output = "<div align=\"center\">\n";
-          $output .= "<form action=\"". url("user/login") ."\" method=\"post\">\n";
+          $output = "<div class=\"user-login-block\">\n";
+
           /*
           ** Save the referer.  We record where the user came from such
           ** that we/ can redirect him after having completed the login
@@ -324,19 +324,22 @@ function user_block($op = "list", $delta = 0) {
           }
           // NOTE: special care needs to be taken because on pages with forms, such as node and comment submission pages, the $edit variable might already be set.
 
-          $output .= "<input name=\"edit[destination]\" type=\"hidden\" value=\"" . $edit["destination"] . "\" />";
-          $output .= "<b>". t("Username") .":</b><br /><input name=\"edit[name]\" size=\"15\" /><br />\n";
-          $output .= "<b>". t("Password") .":</b><br /><input name=\"edit[pass]\" size=\"15\" type=\"password\" /><br />\n";
+          $form = form_hidden("destination", $edit["destination"]);
+          $form .= form_textfield(t("Username"), "name", $edit["name"], 15, 64);
+          $form .= form_password(t("Password"), "pass", $pass, 15, 64);
 
           if (variable_get("user_remember", 0) == 0) {
-            $output .= "<input name=\"edit[remember_me]\" type=\"checkbox\" />". t("Remember me");
+            $form .= form_checkbox(t("Remember me"), "remember_me", 1, 0, 0);
           }
           elseif (variable_get("user_remember", 1) == 1) {
-            $output .= form_hidden("remember_me", 1);
+            $form .= form_hidden("remember_me", 1);
           }
 
-          $output .= "<br />\n<input name=\"edit[op]\" type=\"submit\" value=\"". t("Log in") ."\" /><br />\n";
-          $output .= "</form></div>\n";
+          $form .= form_submit(t("Log in"));
+
+          $output .= form($form, "post", url("user/login"));
+
+          $output .= "</div>\n";
 
           if (variable_get("user_register", 1)) {
             $items[] = l(t("Create new account"), "user/register", array("title" => t("Create a new user account.")));