2 files changed, 17 insertions, 34 deletions
diff --git a/modules/user/js/user.js b/modules/user/js/user.js
index c3f292bf..021163b1 100644
--- a/modules/user/js/user.js
+++ b/modules/user/js/user.js
@@ -1,39 +1,23 @@
 /**
- * Display user login form 
- * 
- * @todo Close link should be reusable
+ * Ajaxify user login form
  */
-$("document").ready(function() {
-  $("#gLoginLink").click(function() {
-    var url = $("#gLoginLink a").attr("href");
-    $.get(url, function(data) {
-      $('#gLoginLink').hide();
-      $("#gLoginMenu").append('<li><a href="#">X</a></li>');
-      $("#gLoginMenu li:last").addClass("gClose").show();
-      $("#gLoginMenu .gClose a").click(function() {
-        $("#gLoginForm").remove();
-        $("#gLoginMenu .gClose").remove();
-        $("#gLoginFormContainer").hide();
-        $("#gLoginLink").show();
-        $("input#gUsername").val("");
-        $("input#gPassword").val("");
-      });
-      $("#gLoginFormContainer").html(data).hide().fadeIn();
-      ajaxify_login_form();
-    });
-    return false;
-  });
-});
-
-function ajaxify_login_form() {
+function ajaxify_login_form(event) {
+  event.preventDefault();
   $("#gLoginForm").ajaxForm({
-    target: "#gLoginFormContainer",
+    target: "#gDialog",
     success: function(responseText, statusText) {
       if (!responseText) {
         window.location.reload();
       } else {
-        ajaxify_login_form();
+        ajaxify_login_form(event);
       }
     }
   });
+  return false;
 }
+
+$("document").ready(function() {
+    $.listen("submit", "#gLoginForm", function(event) {
+      ajaxify_login_form(event);
+    });
+});
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index 95de362c..53f67641 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -1,12 +1,11 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
 <ul id="gLoginMenu">
   <? if ($user->guest): ?>
-    <li id="gLoginFormContainer"></li>
-    <li id="gLoginLink"><a href="<?= url::site("login") ?>">Login</a></li>
+    <li><a href="<?= url::site("login") ?>" id="gLoginLink"><?= _("Login") ?></a></li>
   <? else: ?>
-    <li><a href="<?= url::site("user/{$user->id}?continue=" . url::current(true))?>">
-      <?= _("Modify Profile") ?></a></li>
-    <li><a href="<?= url::site("logout?continue=" . url::current(true)) ?>" id="gLogoutLink">
-      <?= _("Logout") ?></a></li>
+    <li><a href="<?= url::site("user/{$user->id}?continue=" . url::current(true))?>"
+        id="gUserProfileLink"><?= _("Modify Profile") ?></a></li>
+    <li><a href="<?= url::site("logout?continue=" . url::current(true)) ?>" 
+        id="gLogoutLink"><?= _("Logout") ?></a></li>
   <? endif; ?>
 </ul>