2 files changed, 43 insertions, 16 deletions
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index f63f5bc4..6c646dde 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -1,13 +1,23 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
-<form id="gLogin">
-  <label for="username">Username</label>
-  <input type="text" class="text" id="username" />
-  <label for="password">Password</label>
-  <input type="password" class="password" id="password" />
-  <input type="submit" class="submit" value="<?= _("Login")?>" />
-  <? if (!empty($error_message)): ?>
-    <p class="error">
-      <?= $error_message ?>
-    </p>
-  <? endif;?>
-</form>
+<fieldset id="gLogin">
+  <ul>
+    <li>
+      <label for="username">Username</label>
+      <input type="text" class="text" id="username" />
+    </li>
+    <li>
+      <label for="password">Password</label>
+      <input type="password" class="password" id="password" />
+    </li>
+    <li>
+      <input type="submit" class="submit" value="<?= _("Login")?>" />
+    </li>
+    <? if (!empty($error_message)): ?>
+      <li>
+        <p class="error" id="login_message">
+          <?= $error_message ?>
+       </p>
+      </li>
+    <? endif;?>
+  </ul>
+</fieldset>
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 1dee6f35..c524a2d0 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -365,18 +365,35 @@ table.gMetadata td.toggle {
   padding: 5px;
   text-align: right;
 }
-#gLoginMenu form {
+
+#gLoginMenu fieldset {
+  border-width: 0;
+  margin: 0;
+  padding: 0;
+}
+
+#gLoginForm {
   margin-top: 5px;
 }
 #gLoginMenu label {
   font-size: .8em;
 }
-#gLoginMenu input.text,
-#gLoginMenu input.password {
+
+#gLoginMenu ul {
+  margin: 0;
+}
+
+#gLoginMenu li {
+  float: left;
+  list-style-type: none;
+}
+
+#gLoginMenu li input.text,
+#gLoginMenu li input.password {
   padding: 0 0 .1em 0;
   width: 80px;
 }
-#gLoginMenu input.submit {
+#gLoginMenu li input.submit {
   font-size: .9em;
   font-weight: bold;
 }