summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/user/controllers/login.php1
-rw-r--r--themes/default/js/ui.init.js13
2 files changed, 10 insertions, 4 deletions
diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php
index f214ff48..4226ef9c 100644
--- a/modules/user/controllers/login.php
+++ b/modules/user/controllers/login.php
@@ -23,7 +23,6 @@ class Login_Controller extends Controller {
$group = $form->group("login_form")->label(_("Login"));
$group->input("name")->label(_("Name"))->id("gName")->class(null);
$group->password("password")->label(_("Password"))->id("gPassword")->class(null);
- $group->submit(_("Login"));
$group->inputs["name"]->error_messages("invalid_login", _("Invalid name or password"));
if ($form->validate()) {
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 7fef7ec6..5c75fb02 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -74,9 +74,16 @@ function openDialog(element) {
var buttons = {};
buttons["Submit"] = function() {
var form = $("#gDialog").find("form");
- form.ajaxSubmit(function(data, textStatus) {
- form.html(data);
- });
+ var options =
+ $(form).ajaxSubmit({
+ success: function(data, textStatus) {
+ if (data == "") {
+ window.location.reload()
+ $("#gDialog").dialog("close");
+ }
+ $("#gDialog").html(data);
+ }
+ });
}
buttons["Reset"] = function() {
var form = $("#gDialog").find("form");