Index: lams_admin/web/user.jsp =================================================================== diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r0aee88559b0d79e0516dd3630c24111361aeb787 --- lams_admin/web/user.jsp (.../user.jsp) (revision d4dec47dab74477560cfee18e74c7e4494bd1426) +++ lams_admin/web/user.jsp (.../user.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) @@ -3,7 +3,11 @@ <%@ include file="/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.util.Configuration"%> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> -<%@ page import="org.apache.struts.action.ActionMessages"%> +<%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%> +<%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%> +<%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%> +<%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%> +<%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%> @@ -16,12 +20,6 @@ - <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%> - <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%> - <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%> - <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%> - <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%> - @@ -153,37 +151,36 @@ - - - ${title}: - + + ${title}: - - + + + - + - : " class="btn btn-default"> + : " class="btn btn-default"> - : " class="btn btn-default"> + : " class="btn btn-default"> - : " class="btn btn-default"> + : " class="btn btn-default"> - + @@ -196,11 +193,11 @@ -
- @@ -268,7 +265,7 @@ *: + class="form-control" value="${userForm.login}"/> @@ -299,102 +296,102 @@ : + id="title" class="form-control" value="${userForm.title}"/> *: + id="firstName" maxlength="128" class="form-control" value="${userForm.firstName}"/> *: + id="lastName" maxlength="128" class="form-control" value="${userForm.lastName}"/> *: + class="form-control" value="${userForm.email}"/> : + maxlength="64" class="form-control" value="${userForm.addressLine1}"/> : + maxlength="64" class="form-control" value="${userForm.addressLine2}"/> : + maxlength="64" class="form-control" value="${userForm.addressLine3}"/> : + class="form-control" value="${userForm.city}"/> : - + : + class="form-control" value="${userForm.state}" /> : + class="form-control" value="${userForm.country}"/> : - + : - + : - + : - + @@ -418,7 +415,7 @@ : - + ${timezoneDto.timeZoneId} - ${timezoneDto.displayName} @@ -467,9 +464,9 @@
-
- &login=" class="btn btn-primary"> +