Index: lams_central/web/login.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/login.jsp,v diff -u -r1.51.2.12 -r1.51.2.13 --- lams_central/web/login.jsp 11 Feb 2016 17:47:41 -0000 1.51.2.12 +++ lams_central/web/login.jsp 6 Mar 2016 22:34:12 -0000 1.51.2.13 @@ -1,13 +1,12 @@ <%@page import="org.springframework.web.context.request.SessionScope"%> -<%@ page language="java" pageEncoding="UTF-8" - contentType="text/html;charset=utf-8"%> +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-lams" prefix="lams"%> -<%@ page import="org.lamsfoundation.lams.util.Configuration" %> -<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> -<%@ page import="org.lamsfoundation.lams.web.session.SessionManager" %> -<%@ page import="org.lamsfoundation.lams.usermanagement.dto.UserDTO" %> +<%@ page import="org.lamsfoundation.lams.util.Configuration"%> +<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> +<%@ page import="org.lamsfoundation.lams.web.session.SessionManager"%> +<%@ page import="org.lamsfoundation.lams.usermanagement.dto.UserDTO"%> <%-- Attributes in request come from sysadmin LoginAs action while in session from LoginRequestServlet @@ -35,6 +34,7 @@ <fmt:message key="title.login.window" /> + @@ -44,62 +44,72 @@ function submitForm() { $('#loginForm').submit(); } - + function onEnter(event) { intKeyCode = event.keyCode; if (intKeyCode == 13) { submitForm(); } } - - $(document).ready(function(){ + + $(document).ready(function() { $('#j_username').focus(); $('#news').load('www/news.html'); }); - +

 

- +
- +

- LAMS - Learning Activity Management System + LAMS - Learning Activity Management System

- + - +
- +

@@ -113,54 +123,49 @@

- + - +

- : + :

- +

- : + :

- +
- +
- + @@ -169,35 +174,40 @@
- + <%-- This is version for integrations and LoginAs authentication. --%> - + - + -
-

- - -

- + + +
+ +

+ +

+
+ +
- - - +
-
- - <% - // invalidate session so a new user can be logged in - SessionManager.removeSession(((UserDTO) SessionManager.getSession().getAttribute("user")).getLogin(), true); - %> + + + <% + // invalidate session so a new user can be logged in + SessionManager.removeSession(((UserDTO) SessionManager + .getSession().getAttribute("user")).getLogin(), + true); + %>