Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.100.2.13 -r1.100.2.14
--- lams_admin/conf/language/lams/ApplicationResources.properties	2 Oct 2016 00:31:25 -0000	1.100.2.13
+++ lams_admin/conf/language/lams/ApplicationResources.properties	26 Oct 2016 15:29:15 -0000	1.100.2.14
@@ -522,5 +522,10 @@
 server.monitor.title  =Server Monitoring
 user.course.title=User and Course Configuration
 config.site.name =Site name
+config.password.minimum.characters=Minimum number of characters 
+config.password.uppercase=Must contain uppercase letter(s)
+config.password.lowercase=Must contain lowercase letter(s)
+config.password.numerics=Must contain at least a number
+config.password.symbols=Must contain at least one symbol(s)
 
 #======= End labels: Exported 515 labels for en AU =====
Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.92.2.6 -r1.92.2.7
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	27 Sep 2016 06:18:50 -0000	1.92.2.6
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	26 Oct 2016 15:29:15 -0000	1.92.2.7
@@ -529,4 +529,9 @@
 sysadmin.serversecret  =Secret
 label.tool.consumers.count  =LTI Tool Consumers(s) in total
 
+config.password.minimum.characters=Minimum number of characters 
+config.password.uppercase=Must contain uppercase letter(s)
+config.password.lowercase=Must contain lowercase letter(s)
+config.password.numerics=Must contain at least a number
+config.password.symbols=Must contain at least one symbol(s)
 #======= End labels: Exported 515 labels for en AU =====
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.138.2.28 -r1.138.2.29
--- lams_central/conf/language/lams/ApplicationResources.properties	27 Jun 2016 10:01:31 -0000	1.138.2.28
+++ lams_central/conf/language/lams/ApplicationResources.properties	26 Oct 2016 15:29:14 -0000	1.138.2.29
@@ -689,4 +689,15 @@
 label.private.notifications.read.hint =Mark notification as read
 label.private.notifications.read.all.hint =Mark all notifications as read
 label.select.groups =Select groups 
+
+label.password.max.length =must be less than 25 characters
+label.password.min.length =must be at least {0} characters long
+label.password.old.must.entered =Old password must be entered
+label.password.symbols.allowed =Only these symbols are allowed
+label.password.restrictions =Password must follow the restrictions shown above
+label.password.must.contain =Password must contain
+label.password.must.ucase =at least 1 upper case letter
+label.password.must.number=at least 1 number
+label.password.must.symbol =at least 1 symbol
+
 #======= End labels: Exported 439 labels for en AU =====
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.111.2.13 -r1.111.2.14
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	25 Oct 2016 12:29:39 -0000	1.111.2.13
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	26 Oct 2016 15:29:14 -0000	1.111.2.14
@@ -689,5 +689,15 @@
 label.lesson.not.completed  =Lesson is not yet completed.
 label.you.completed.activities  =You have completed {0} activities
 
+label.password.max.length =must be less than 25 characters
+label.password.min.length =must be at least {0} characters long
+label.password.old.must.entered =Old password must be entered
+label.password.symbols.allowed =Only these symbols are allowed
+label.password.restrictions =Password must follow the restrictions shown above
+label.password.must.contain =Password must contain
+label.password.must.ucase =at least 1 upper case letter
+label.password.must.number=at least 1 number
+label.password.must.symbol =at least 1 symbol
 
+
 #======= End labels: Exported 439 labels for en AU =====
Index: lams_central/web/passwordChangeContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/passwordChangeContent.jsp,v
diff -u -r1.10.12.3 -r1.10.12.4
--- lams_central/web/passwordChangeContent.jsp	24 Oct 2016 14:55:28 -0000	1.10.12.3
+++ lams_central/web/passwordChangeContent.jsp	26 Oct 2016 15:29:14 -0000	1.10.12.4
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
@@ -9,7 +8,15 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ page import="org.apache.struts.action.ActionMessages"
 	import="org.lamsfoundation.lams.web.PasswordChangeActionForm"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
+<c:set var="minNumChars"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%></c:set>
+<c:set var="mustHaveUppercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%></c:set>
+<c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
+<c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
+	
+
 <lams:html>
 <lams:head>
 	<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" />
@@ -19,11 +26,70 @@
 	<script type="text/javascript" src="includes/javascript/groupDisplay.js"></script>
 	<script type="text/javascript" src="includes/javascript/jquery.validate.js"></script>
 	<script type="text/javascript">
-		function checkPasswordField(field) {
-			if (/^\s*$/.test(field.value)) {
-				alert("Password cannot be empty");
-			}
-		};
+		$.validator.addMethod("pwcheck", function(value) {
+			   return /[a-z]/.test(value) // has a lowercase letter
+					<c:if test="${mustHaveUppercase}">	
+						&& /[A-Z]/.test(value) // has uppercase letters 
+					</c:if>
+					<c:if test="${mustHaveNumerics}">
+						&& /\d/.test(value) // has a digit
+					</c:if>
+					<c:if test="${mustHaveSymbols}">	
+						&& /[`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]/.test(value) //has symbols
+					</c:if>
+			});
+			
+			
+		$.validator.addMethod("charactersAllowed", function(value) {
+				return /^[A-Za-z0-9\d`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]*$/.test(value)
+			
+			});
+	
+		$(function() {
+	
+		  // Setup form validation 
+		  $("#change-password").validate({
+		  		debug: true,
+		  		errorClass: 'help-block',
+		      //  validation rules
+		      rules: {
+		          	oldPassword: "required",
+		          password: {
+		              required: true,
+		              minlength: <c:out value="${minNumChars}"/>,
+		              maxlength: 25,
+		              charactersAllowed: true,
+		              pwcheck: true              
+		          },
+		          passwordConfirm: {
+		        	  equalTo: "#password"
+		          }
+		      },
+		      
+		      // Specify the validation error messages
+		      messages: {
+		          oldPassword: {
+		        	 	required: "<fmt:message key='label.password.old.must.entered'/>" 
+		          },
+		          password: {
+		              required: "<fmt:message key='error.password.empty'/>",
+		              minlength: "<fmt:message key='label.password.min.length'><fmt:param value='${minNumChars}'/></fmt:message>",
+		              maxlength: "<fmt:message key='label.password.max.length'/>",
+		              charactersAllowed: "<fmt:message key='label.password.symbols.allowed'/> ` ~ ! @ # $ % ^ & * ( ) _ - + = { } [ ] \ | : ; \" ' < > , . ? /",
+		              pwcheck: "<fmt:message key='label.password.restrictions'/>"
+		          },
+		          passwordConfirm: {
+		        	  equalTo: "<fmt:message key='error.newpassword.mismatch'/>"
+		          },
+		      },
+		      
+		      submitHandler: function(form) {
+		          form.submit();
+		      }
+		  });
+	
+		});
+	
 		
 		$(document).ready(function () {
 			//update dialog's height and title
@@ -33,7 +99,7 @@
 </lams:head>
 
 <body>
-<html:form action="/passwordChanged" method="post">
+<html:form styleId="change-password" action="/passwordChanged" method="post">
 
 	<div style="clear: both"></div>
 
@@ -54,39 +120,49 @@
 							<html:hidden name="<%=PasswordChangeActionForm.formName%>"
 								property="login" />
 							<div class="form-group">
-								<b><label><fmt:message
-											key="label.password.old.password" />:</label></b>
-								<html:password name="<%=PasswordChangeActionForm.formName%>"
-									property="oldPassword" size="50" maxlength="50"
-									onblur="checkPasswordField(this)" styleClass="form-control" />
+								<label for="oldPassword"><fmt:message key="label.password.old.password" />:</label>
+								<input class="form-control" type="password" maxlength="50" placeholder="<fmt:message key="label.password.old.password" />" name="oldPassword" id="oldPassword"/>			
 							</div>
+							
+							<div class="col-xs-12">
+								 <lams:Alert type="info"  id="passwordConditions" close="false">
+								 <strong><fmt:message key='label.password.must.contain'/>:</strong> <c:out value="${mustHaveUppercase}"/>
+								 <ul class="list-unstyled" style="line-height: 1.2">
+								  	<li><span class="fa fa-check"></span> <fmt:message key='label.password.min.length'><fmt:param value='${minNumChars}'/></fmt:message></li>
+								  <c:if test="${mustHaveUppercase}">
+										<li><span class="fa fa-check"></span> <fmt:message key='label.password.must.ucase'/></li>
+								  </c:if>	
+								  <c:if test="${mustHaveNumerics}">
+										<li><span class="fa fa-check"></span> <fmt:message key='label.password.must.number'/></li>
+								  </c:if>	
+								  <c:if test="${mustHaveSymbols}">
+										<li><span class="fa fa-check"></span> <fmt:message key='label.password.must.symbol'/></li>
+								  </c:if>	
+								  </ul>
+								 </lams:Alert> 
+							</div>
+							
 
-							<div class="form-group">
-								<b><label><fmt:message
-											key="label.password.new.password" />:</label></b>
-								<html:password name="<%=PasswordChangeActionForm.formName%>"
-									property="password" size="50" maxlength="50"
-									onblur="checkPasswordField(this)" styleClass="form-control" />
+							<div class="input-group voffset5">
+								<span class="input-group-addon"><i class="fa fa-lock"></i></span>
+								<input class="form-control" type="password"  
+									placeholder="<fmt:message key='label.password.new.password' />" id="password" name="password" maxlength="25"/> 			
 							</div>
-							<div class="form-group">
-								<b><label><fmt:message
-											key="label.password.confirm.new.password" />:</label></b>
-								<html:password name="<%=PasswordChangeActionForm.formName%>"
-									property="passwordConfirm" size="50" maxlength="50"
-									onblur="checkPasswordField(this)" styleClass="form-control" />
+							<div class="input-group voffset5">
+								<span class="input-group-addon"><i class="fa fa-lock"></i></span>
+								<input class="form-control" type="password" id="passwordConfirm" name="passwordConfirm"
+									placeholder="<fmt:message key='label.password.confirm.new.password' />" maxlength="25"/>
 							</div>
-
 							<div class="form-group" align="right">
 								<html:cancel styleClass="btn btn-sm btn-default voffset5">
 									<fmt:message key="button.cancel" />
 								</html:cancel>
 								&nbsp;&nbsp;
-								<html:submit styleClass="btn btn-sm btn-default voffset5">
+								<html:submit styleClass="btn btn-sm btn-primary voffset5">
 									<fmt:message key="button.save" />
 								</html:submit>
 
 							</div>
-
 						</form>
 					</div>
 
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040072.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/Attic/patch2040072.sql,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java,v
diff -u -r1.53.2.10 -r1.53.2.11
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	2 Oct 2016 00:24:29 -0000	1.53.2.10
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	26 Oct 2016 15:29:16 -0000	1.53.2.11
@@ -262,5 +262,16 @@
 
     // LDEV-3961
     public static String SITE_NAME = "SiteName";
+    
+    // LDEV-4023 Password policy    
+    public static String PASSWORD_POLICY_MINIMUM_CHARACTERS = "PasswordPolicyMinChars";
 
+    public static String PASSWORD_POLICY_UPPERCASE = "PasswordPolicyUppercase";
+    
+    public static String PASSWORD_POLICY_LOWERCASE = "PasswordPolicyLowercase";
+    
+    public static String PASSWORD_POLICY_NUMERICS = "PasswordPolicyNumerics";
+    
+    public static String PASSWORD_POLICY_SYMBOLS = "PasswordPolicySymbols";
+
 }