diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp index 9053d67..d115064 100644 --- a/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/src/main/webapp/WEB-INF/jsp/login.jsp @@ -92,7 +92,7 @@
- +
@@ -129,7 +129,7 @@ function login() { password:$("#password").val(), institute:"default" }; - json.post({ + ajax.post({ url:wctx.url("/login.do"), data:params, success:function(resp) { @@ -150,6 +150,8 @@ function login() { $(function(){ $("#formAuthentication input").onEnterPress(login); + if ($("#userId").val()) + $("#password").focus(); }); diff --git a/src/main/webapp/resources/js/base/base.js b/src/main/webapp/resources/js/base/base.js index 4604ed5..e687158 100644 --- a/src/main/webapp/resources/js/base/base.js +++ b/src/main/webapp/resources/js/base/base.js @@ -302,13 +302,17 @@ $.fn.onEnterPress = function(handler) { } function labelFor(input) { - var selector = "label[for='{id}']", - key = "string" == typeof(input) ? input - : $(input).attr("id") || $(input).attr("name"); + let selector = "label[for='{id}']", + str = "string" == typeof(input), + obj = $(input), + key = str ? input + : obj.attr("id") || obj.attr("name"); if (!key) return ""; selector = selector.replace(/{id}/gi, key); - return $(selector).text(); + return $(selector).text() + || obj.attr("title") + || obj.attr("placeholder"); } function validationFailureHandler() {