From 6bac561bf8cdbdb979417326173ace7a05ea391b Mon Sep 17 00:00:00 2001
From: Loui Chang <louipc.ist@gmail.com>
Date: Sat, 24 Jan 2009 00:40:30 -0500
Subject: Rework login form.

Correct some xhtml validation errors.
Correct translation usage.

Signed-off-by: Loui Chang <louipc.ist@gmail.com>
---
 web/template/header.php     |  2 --
 web/template/login_form.php | 50 +++++++++++++++++++++++----------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'web/template')

diff --git a/web/template/header.php b/web/template/header.php
index 94e7109..610338d 100644
--- a/web/template/header.php
+++ b/web/template/header.php
@@ -68,7 +68,6 @@ if (isset($_COOKIE["AURSID"])) {
       </div>
     </div>
     <div id="lang_login_sub">
-	    <span id="lang_bar">
         <ul>
           <li>Lang: </li>
 <?php
@@ -81,7 +80,6 @@ foreach ($SUPPORTED_LANGS as $lang => $lang_name) {
 }
 ?>
         </ul>
-        </span>
 	<?php include("login_form.php"); ?>
     </div>
     <div id="maincontent">
diff --git a/web/template/login_form.php b/web/template/login_form.php
index 1eba5cf..6ada88b 100644
--- a/web/template/login_form.php
+++ b/web/template/login_form.php
@@ -1,27 +1,29 @@
-<span id="login_bar">
-  <?php
-  if (isset($_COOKIE["AURSID"])) {
-    print __("Logged-in as: %h%s%h", array("<b>", username_from_sid($_COOKIE["AURSID"]), "</b>"));
+<div id="login_bar">
+<?php
+if (isset($_COOKIE["AURSID"])) {
+	print __("Logged-in as: %s", '<b>' . username_from_sid($_COOKIE["AURSID"]) . '</b>');
 ?>
-<br /><a href="logout.php"><?php print __("Logout"); ?></a>
+ <a href="logout.php">[<?php print __("Logout"); ?>]</a>
 <?php
-  }
-  else {
-    if ($login_error) {
-      print "<span class='error'>" . $login_error . "</span><br />\n";
-    } 
-  ?>
-  <form method="post">
-    <label><?php print __('Username') . ':'; ?></label>
-    <input type="text" name="user" size="30" maxlength="<?php print USERNAME_MAX_LEN; ?>" value="<?php
-      if (isset($_POST['user'])) {
-        print htmlspecialchars($_POST['user'], ENT_QUOTES);
-      } ?>" />
-    <label><?php print __('Password') . ':'; ?></label>
-    <input type="password" name="passwd" size="30" maxlength="<?php print PASSWD_MAX_LEN; ?>" />
-    <input type="checkbox" name="remember_me" /><?php print __("Remember me"); ?>
-    <input type="submit" class="button" value="<?php  print __("Login"); ?>" />
-  </form>
-  <?php } ?>
-</span>
+}
+else {
+	if ($login_error) {
+		print "<span class='error'>" . $login_error . "</span><br />\n";
+	} 
+?>
+<form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
+	<div>
+	<?php print __('Username') . ':'; ?>
+	<input type="text" name="user" size="30" maxlength="<?php print USERNAME_MAX_LEN; ?>" value="<?php
+	if (isset($_POST['user'])) {
+		print htmlspecialchars($_POST['user'], ENT_QUOTES);
+	} ?>" />
+	<?php print __('Password') . ':'; ?>
+	<input type="password" name="passwd" size="30" maxlength="<?php print PASSWD_MAX_LEN; ?>" />
+	<input type="checkbox" name="remember_me" /><?php print __("Remember me"); ?>
+	<input type="submit" class="button" value="<?php  print __("Login"); ?>" />
+	</div>
+</form>
+<?php } ?>
+</div>
 
-- 
cgit v1.2.3-70-g09d2