Index: lams_central/web/forgotPassword.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/forgotPassword.jsp,v diff -u -r1.7.2.1 -r1.7.2.2 --- lams_central/web/forgotPassword.jsp 9 Feb 2016 18:52:57 -0000 1.7.2.1 +++ lams_central/web/forgotPassword.jsp 27 Feb 2016 11:54:05 -0000 1.7.2.2 @@ -1,161 +1,146 @@ -<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> -<%@page import="org.apache.struts.action.ActionMessages" %> -<%@ 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.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"%> - - <fmt:message key="title.forgot.password"/> - - - + if (email == null || email == "") { + alert(""); + return false; + } else if (!filter.test(email)) { + alert(""); + return false; + } else { + document.forgotForm.submit(); + } + } + } + + function radioSelected() { + if (document.forgotForm.selectType[0].checked) { + document.forgotForm.login.disabled = false; + document.forgotForm.email.disabled = true; + } else if (document.forgotForm.selectType[1].checked) { + document.forgotForm.login.disabled = true; + document.forgotForm.email.disabled = false; + } + } + + function submitenter(myfield, e) { + var keycode; + if (window.event) + keycode = window.event.keyCode; + else if (e) + keycode = e.which; + else + return true; + + if (keycode == 13) { + validateForm(); + return false; + } else + return true; + } + //--> + + + + -
-
- - - -
-
-

- -

- -

- -

- -

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

+ +

+

+ +

- +

+ +

- \ No newline at end of file +
+
+
+ +
+ + +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+ + + + + + +
+ +
+
+
+ +
+ + + + + Index: lams_central/web/forgotPasswordChange.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/forgotPasswordChange.jsp,v diff -u -r1.5.2.1 -r1.5.2.2 --- lams_central/web/forgotPasswordChange.jsp 9 Feb 2016 18:52:57 -0000 1.5.2.1 +++ lams_central/web/forgotPasswordChange.jsp 27 Feb 2016 11:54:05 -0000 1.5.2.2 @@ -1,112 +1,99 @@ -<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> -<%@page import="org.apache.struts.action.ActionMessages" %> -<%@ 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.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"%> <% -String key = request.getParameter("key"); + String key = request.getParameter("key"); %> - - <fmt:message key="title.forgot.password"/> - - - + + <fmt:message key="title.forgot.password" /> + + + + + + - -
-
- - - -
-
-

- - - - - - - - - - - - - - - -
- : - - -
- : - - -
  - -
-
-
- - - -
- + + +
+ - \ No newline at end of file +

+ +

+ +
+ +
+
+ +
+
+ + + +
+ +
+ + + + + + + Index: lams_central/web/forgotPasswordProc.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/forgotPasswordProc.jsp,v diff -u -r1.6.2.2 -r1.6.2.3 --- lams_central/web/forgotPasswordProc.jsp 9 Feb 2016 18:52:57 -0000 1.6.2.2 +++ lams_central/web/forgotPasswordProc.jsp 27 Feb 2016 11:54:05 -0000 1.6.2.3 @@ -15,11 +15,23 @@ <%@ taglib uri="tags-core" prefix="c"%> <% -String languageKey = StringEscapeUtils.escapeHtml(request.getParameter("languageKey")); -String stateStr = request.getParameter("state"); -String emailStr = request.getParameter("emailSent"); + String languageKey = StringEscapeUtils.escapeHtml(request + .getParameter("languageKey")); + String stateStr = request.getParameter("state"); + String emailStr = request.getParameter("emailSent"); %> + + <%=languageKey%> + + + <%=stateStr%> + + + <%=emailStr%> + + + @@ -41,49 +53,34 @@ }; + + + + -
- + +

+ +

-
-
-

- -

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

- <% - } else { - %> -

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

+ -
- - - -
+ + + - +