summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/user/views/login.html.php4
-rw-r--r--themes/default/js/user.js7
2 files changed, 5 insertions, 6 deletions
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index 27591721..78e03b46 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -5,11 +5,11 @@
<ul>
<li>
<label for="gUsername"><?= _("Username") ?></label>
- <input type="text" id="gUsername" />
+ <input type="text" name="username" id="gUsername" />
</li>
<li>
<label for="gPassword"><?= _("Password") ?></label>
- <input type="password" id="gPassword" />
+ <input type="password" name="password" id="gPassword" />
</li>
<li>
<input type="submit" value="<?= _("Login")?>" />
diff --git a/themes/default/js/user.js b/themes/default/js/user.js
index 5acc711f..427523ee 100644
--- a/themes/default/js/user.js
+++ b/themes/default/js/user.js
@@ -11,6 +11,7 @@ $(document).ready(function() {
function show_login() {
$("#gLoginLink").css({display: "none"});
+ $("#gLoginText").css({display: "inline"});
$("#gLoginClose").css({display: "inline"});
var url = $("#gLoginForm").attr("formSrc");
$.get(url, null, function(data, textStatus) {
@@ -23,19 +24,17 @@ function close_login() {
$("#gLoginLink").css({display: "inline"});
$("#gLoginForm").css({display: "none"});
$("#gLoginForm").html("");
+ $("#gLoginText").css({display: "none"});
$("#gLoginClose").css({display: "none"});
$("input#gUsername").val("");
$("input#gPassword").val("");
}
function process_login() {
- var username = $("input#gUsername").val();
- var password = $("input#gPassword").val();
- var data = 'username=' + username + '&password=' + password;
$.ajax({
url: $("#gLogin").attr("action"),
type: "POST",
- data: data,
+ data: $("#gLogin").serialize(),
dataType: "json",
error: function(XMLHttpRequest, textStatus, errorThrown) {
alert("textStatus: " + textStatus + "\nerrorThrown: " + errorThrown);