Index: lams_central/web/WEB-INF/tags/Page.tag =================================================================== diff -u -re013a41f32a92bfe506bc332a90c9838ea50e777 -r7faaf5bb2b7086a63c209eb9402f79744442425e --- lams_central/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision e013a41f32a92bfe506bc332a90c9838ea50e777) +++ lams_central/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7faaf5bb2b7086a63c209eb9402f79744442425e) @@ -13,19 +13,19 @@
-
- + +
- - - - -
+ + + +
+
Index: lams_central/web/index.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r7faaf5bb2b7086a63c209eb9402f79744442425e --- lams_central/web/index.jsp (.../index.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_central/web/index.jsp (.../index.jsp) (revision 7faaf5bb2b7086a63c209eb9402f79744442425e) @@ -1,34 +1,35 @@ -<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> -<%@ taglib uri="tags-lams" prefix="lams" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> +<%@ taglib uri="tags-lams" prefix="lams"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-core" prefix="c"%> - + <fmt:message key="index.welcome" /> - + - -
-

+ + + +
+ +

+ +

- - + + + - + \ No newline at end of file Index: lams_central/web/login.jsp =================================================================== diff -u -rf69f8e072ccb7e566732d6c5419a85a2a90ae6a1 -r7faaf5bb2b7086a63c209eb9402f79744442425e --- lams_central/web/login.jsp (.../login.jsp) (revision f69f8e072ccb7e566732d6c5419a85a2a90ae6a1) +++ lams_central/web/login.jsp (.../login.jsp) (revision 7faaf5bb2b7086a63c209eb9402f79744442425e) @@ -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); + %>