Index: lams_central/web/forgotPasswordProc.jsp =================================================================== diff -u -rabff8dcc2af4d1607d0306af02edb795fe62d13b -r5f4bc2d10944b6f6fffcfa066fbdb9497e1cbf0c --- lams_central/web/forgotPasswordProc.jsp (.../forgotPasswordProc.jsp) (revision abff8dcc2af4d1607d0306af02edb795fe62d13b) +++ lams_central/web/forgotPasswordProc.jsp (.../forgotPasswordProc.jsp) (revision 5f4bc2d10944b6f6fffcfa066fbdb9497e1cbf0c) @@ -1,17 +1,18 @@ -<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> -<%@page import="org.apache.struts.action.ActionMessages" %> -<%@page import="org.apache.commons.lang.StringEscapeUtils" %> -<%@page import="org.lamsfoundation.lams.web.ForgotPasswordServlet" %> -<%@page import="org.lamsfoundation.lams.util.MessageService" %> -<%@page import="org.springframework.web.context.WebApplicationContext" %> -<%@page import="org.springframework.web.context.support.WebApplicationContextUtils" %> -<%@ page import="org.lamsfoundation.lams.util.Configuration" %> -<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> +<%@page import="org.apache.struts.action.ActionMessages"%> +<%@page import="org.apache.commons.lang.StringEscapeUtils"%> +<%@page import="org.lamsfoundation.lams.web.ForgotPasswordServlet"%> +<%@page import="org.lamsfoundation.lams.util.MessageService"%> +<%@page import="org.springframework.web.context.WebApplicationContext"%> +<%@page import="org.springframework.web.context.support.WebApplicationContextUtils"%> +<%@ page import="org.lamsfoundation.lams.util.Configuration"%> +<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> -<%@ taglib uri="tags-html" prefix="html" %> -<%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-lams" prefix="lams"%> +<%@ taglib uri="tags-core" prefix="c"%> <% String languageKey = StringEscapeUtils.escapeHtml(request.getParameter("languageKey")); @@ -23,63 +24,66 @@ - - <fmt:message key="title.forgot.password"/> - - + + <fmt:message key="title.forgot.password" /> + + - -
- -
-
-

- - - <% + +
+ + +
+
+

+ +

+ + + <% if (stateStr.equals("0")) { %> -

- <% +

+ <% } else { %> -

- <% +

+ <% } %> - + - <% + <% if (emailStr!=null && !emailStr.equals("")) { out.print(emailStr); } - %> -

+ %> +

-
- -
- - - +
+ + + +
- + + + +