Index: lams_central/web/forgotPasswordChange.jsp =================================================================== diff -u -r28c71544b366ccf9a4b9ca97b7d841c6896f26f5 -rcfaad805a2e6c23b476f8966e7be15bc7b7f1baa --- lams_central/web/forgotPasswordChange.jsp (.../forgotPasswordChange.jsp) (revision 28c71544b366ccf9a4b9ca97b7d841c6896f26f5) +++ lams_central/web/forgotPasswordChange.jsp (.../forgotPasswordChange.jsp) (revision cfaad805a2e6c23b476f8966e7be15bc7b7f1baa) @@ -1,5 +1,5 @@ -<%@ page language="java" pageEncoding="UTF-8" - contentType="text/html;charset=utf-8"%> + +<%@ page contentType="text/html; charset=utf-8" language="java"%> <%@page import="org.apache.struts.action.ActionMessages"%> <%@ page import="org.lamsfoundation.lams.util.Configuration"%> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> @@ -10,49 +10,98 @@ <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-core" prefix="c"%> - +<%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%> +<%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%> +<%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%> +<%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%> + + + + + + <fmt:message key="title.forgot.password" /> @@ -72,24 +121,46 @@

- +
+ + : + +
    +
  • + +
    • + +
    • +     + +
    • +     + +
    • +     +
+ +
+ key="label.password.new.password" />
+ type="password" id="confirmNewPassword" class="form-control" + name="confirmNewPassword" maxlength="25" />
-
- +
+ - +
Index: lams_central/web/signup/singupTab.jsp =================================================================== diff -u -r98666a6b28e6779400925a3e009c9eb13de9893d -rcfaad805a2e6c23b476f8966e7be15bc7b7f1baa --- lams_central/web/signup/singupTab.jsp (.../singupTab.jsp) (revision 98666a6b28e6779400925a3e009c9eb13de9893d) +++ lams_central/web/signup/singupTab.jsp (.../singupTab.jsp) (revision cfaad805a2e6c23b476f8966e7be15bc7b7f1baa) @@ -1,141 +1,268 @@ - + + + - $('form input[name="confirmPassword"]').blur(function () { - var password = $('form input[name="password"]').val(); - var confirmPassword = $('form input[name="confirmPassword"]').val(); - if (password != confirmPassword) { - $('.confirmPassword').show(); - $('form input[name="password"]').focus(); - $('form input[name="password"]').select(); - } else { - $('.confirmPassword').hide(); - } - - }); - - $('form input[name="lastName"]').blur(function () { - var lastName = $(this).val(); - var re = /^[^<>^*@%$]*$/; - if (re.test(lastName)) { - $('.last').hide(); - } else { - $('.last').show(); - $(this).focus(); - $(this).select(); - } - - }); - $('form input[name="firstName"]').blur(function () { - var firstName = $(this).val(); - var re = /^[^<>^*@%$]*$/; - if (re.test(firstName)) { - $('.first').hide(); - } else { - $('.first').show(); - $(this).focus(); - $(this).select(); - } - - }); - $('form input[name="email"]').blur(function () { - var email = $(this).val(); - var re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; - if (re.test(email)) { - $('.email').hide(); - } else { - $('.email').show(); - $(this).focus(); - $(this).select(); - } - - }); - - $('form input[name="confirmEmail"]').blur(function () { - var email = $('form input[name="email"]').val(); - var confirmEmail = $('form input[name="confirmEmail"]').val(); - if (email != confirmEmail) { - $('.confirmEmail').show(); - $(this).focus(); - $(this).select(); - } else { - $('.confirmEmail').hide(); - } - - }); - + -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
:
:
:
:
:
:
:
:
- + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
:
: +
    +
  • + +
    • + + +
    • +     + + +
    • +     + + + +
    • +     + +
+
:
:
:
:
: +
:
:
+ +
+