Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r626edac7e22ded609d12f8df41fd7f776c129779 -r8e454f8298f642d44db16ee5ade01b0c0afde504
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 626edac7e22ded609d12f8df41fd7f776c129779)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8e454f8298f642d44db16ee5ade01b0c0afde504)
@@ -205,6 +205,6 @@
 error.email.does.not.match  =The email address does not match your saved email address. Please try again.
 error.support.email.not.set  =Email could not be sent. The LAMS server has not been configured to handle emails. Please contact your System Administrator.
 error.password.request.expired  =This request for a new password has expired. Please click the "Forgot your Password" link again to make a new request.
+error.forgot.password.fields  =Both fields are required. Please try again.
 
-
 #======= End labels: Exported 199 labels for en AU =====
Index: lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
===================================================================
diff -u -re9d226f1680751f53da50848214c85df0e1f06fb -r8e454f8298f642d44db16ee5ade01b0c0afde504
--- lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java	(.../ForgotPasswordServlet.java)	(revision e9d226f1680751f53da50848214c85df0e1f06fb)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java	(.../ForgotPasswordServlet.java)	(revision 8e454f8298f642d44db16ee5ade01b0c0afde504)
@@ -44,16 +44,17 @@
 	private static Logger log = Logger.getLogger(ForgotPasswordServlet.class);
 	
 	// states
-	public static int SMTP_SERVER_NOT_SET 		= 100;
-	public static int EMAIL_DOES_NOT_MATCH 		= 101;
-	public static int USER_NOT_FOUND 			= 102;
-	public static int PASSWORD_REQUEST_EXPIRED 	= 103;
-	public static int SUCCESS_REQUEST_EMAIL 	= 104;
-	public static int SUCCESS_CHANGE_PASS 		= 105;
+	public static String SMTP_SERVER_NOT_SET 		= "error.support.email.not.set";
+	public static String EMAIL_DOES_NOT_MATCH 		= "error.email.does.not.match";
+	public static String USER_NOT_FOUND 			= "error.user.not.found";
+	public static String PASSWORD_REQUEST_EXPIRED 	= "error.password.request.expired";
+	public static String SUCCESS_REQUEST_EMAIL 		= "forgot.password.email.sent";
+	public static String SUCCESS_CHANGE_PASS 		= "heading.password.changed.screen";
 	
 	public static int MILLISECONDS_IN_A_DAY 	= 86400000;
 	
-	private static String STATE = "?state=";
+	private static String STATE = "&state=";
+	private static String LANGUAGE_KEY = "&languageKey=";
 	
 	public void doGet(HttpServletRequest request, HttpServletResponse response) 
 		throws ServletException, IOException 
@@ -79,11 +80,24 @@
 		
 	}
 	
+	/**
+	 * Handles the first step of the forgot login process, sending the email to the user.
+	 * An email is sent with a link and key attached to identify the forgot login request
+	 * @param login
+	 * @param email
+	 * @param response
+	 * @throws ServletException
+	 * @throws IOException
+	 */
 	public void handleEmailRequest(String login, String email, HttpServletResponse response)
 		throws ServletException, IOException
 	{
+
+		int success=0;
+		String languageKey = "";
 		
-		String state = STATE;
+		
+		
 		boolean err = false;
 		
 		if (login==null||login.equals("")||email==null||email.equals(""))
@@ -99,8 +113,8 @@
 		
 		if (SMPTServer==null||SMPTServer.equals("")||supportEmail==null||supportEmail.equals(""))
 		{
-			// Validate
-			state += this.SMTP_SERVER_NOT_SET;
+			// Validate SMTP not set up
+			languageKey = this.SMTP_SERVER_NOT_SET;
 		}
 		else
 		{
@@ -138,7 +152,8 @@
 							email,
 							body
 							);
-						  state += this.SUCCESS_REQUEST_EMAIL;
+						  languageKey = this.SUCCESS_REQUEST_EMAIL;
+						  success = 1;
 					}
 					catch (AddressException e) 
 			        {
@@ -163,18 +178,22 @@
 				else
 				{
 					// validate email does not match user
-					state += this.EMAIL_DOES_NOT_MATCH;
+					languageKey = this.EMAIL_DOES_NOT_MATCH;
 				}
 				
 			}
 			else
 			{
 				// validate user is not found
-				state += this.USER_NOT_FOUND;
+				languageKey = this.USER_NOT_FOUND;
 			}
 		}
 
-		response.sendRedirect(Configuration.get("ServerURL") + "forgotPasswordProc.jsp" + state);
+		response.sendRedirect(Configuration.get("ServerURL") + "forgotPasswordProc.jsp?" + 
+				STATE + 
+				success + 
+				LANGUAGE_KEY + 
+				languageKey);
 
 	}
 	
@@ -185,7 +204,8 @@
 	public void handlePasswordChange(String newPassword, String key, HttpServletResponse response)
 		throws ServletException, IOException
 	{
-		String state = STATE;
+		int success=0;
+		String languageKey = "";
 		
 		if (key==null||key.equals("")||newPassword==null||newPassword.equals(""))
 		{
@@ -205,15 +225,20 @@
 		{
 			User user = (User)userService.findById(User.class, fp.getUserId());
 			userService.updatePassword(user.getLogin(), newPassword);
-			state += this.SUCCESS_CHANGE_PASS;
+			languageKey = this.SUCCESS_CHANGE_PASS;
+			success = 1;
 		}
 		else
 		{
 			// validate password request expired
-			state += this.PASSWORD_REQUEST_EXPIRED;
+			languageKey = this.PASSWORD_REQUEST_EXPIRED;
 		}
 		
-		response.sendRedirect(Configuration.get("ServerURL") + "forgotPasswordProc.jsp" + state);
+		response.sendRedirect(Configuration.get("ServerURL") + "forgotPasswordProc.jsp?" + 
+				STATE + 
+				success + 
+				LANGUAGE_KEY + 
+				languageKey);
 	}
 	
 	/**
@@ -233,8 +258,4 @@
 		return ((String) uuidGen.generate(null, null)).toLowerCase();
 	}
 	
-	
-	
-	
-	
 }
Index: lams_central/web/forgotPassword.jsp
===================================================================
diff -u -re9d226f1680751f53da50848214c85df0e1f06fb -r8e454f8298f642d44db16ee5ade01b0c0afde504
--- lams_central/web/forgotPassword.jsp	(.../forgotPassword.jsp)	(revision e9d226f1680751f53da50848214c85df0e1f06fb)
+++ lams_central/web/forgotPassword.jsp	(.../forgotPassword.jsp)	(revision 8e454f8298f642d44db16ee5ade01b0c0afde504)
@@ -1,6 +1,7 @@
 <%@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" %>
@@ -16,65 +17,109 @@
     <link rel="icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 <script language="javascript" type="text/javascript">
+<!--        
+        
         function toHome() {window.location="<lams:LAMSURL/>index.do";};
         
-        function validateForm() 
-        {
-            // TODO: need to do validation
         
+        function validateForm()
+        {
+            var login = document.getElementById("login").value;
+            var email = document.getElementById("email").value;
+            var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+            
+            if (login == null || login=="" || email == null || email =="")
+            {
+                alert('<fmt:message key="error.forgot.password.fields" />');
+            }
+            else if (!filter.test(email)) 
+            {
+                alert('<fmt:message key="error.valid.email.required" />');
+                return false;
+
+            }
+            else
+            {
+                document.forgotForm.submit();
+            }
         }
         
+        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;
+		}
         
+        
+//-->        
 </script>
 </lams:head>
 
 
 <body class="stripes" >
-<form action="<lams:LAMSURL/>/ForgotPasswordRequest" method="get">
-    <input type="hidden" name="method" id="method" value="requestEmail" />
-    
-    <p><p><p>
-    <table><tr><td align="center">    
-	<div id="content">
-	
-	            <div id="title" align="left">
-		            <h1><fmt:message key="label.forgot.password"/></h1>
-		            <br/>
+
+	<div id="page"><!--main box 'page'-->
+	<form action="<lams:LAMSURL/>/ForgotPasswordRequest" method="get" name="forgotForm">
+	    <input type="hidden" name="method" id="method" value="requestEmail" />
+	    
+	    <h1 class="no-tabs-below"><fmt:message key="label.forgot.password"/></h1>  
+		<div id="header-no-tabs"></div>
+		<div id="content">
+		            <table border="0"><tr><td>
 		            <fmt:message key="label.forgot.password.instructions"/>
-	            </div>
-	            
-	            <table >
-	                <tr>
-	                    <td class="align-right">
-	                        <fmt:message key="label.username"/>:
-	                    </td>
-	                    <td class="align-left">
-	                        <input type="text" name="login" id="login" />
-	                    </td>
-	                </tr>
-	                <tr>
-	                    <td class="align-right">
-	                        <fmt:message key="label.email"/>:
-	                    </td>
-	                    <td class="align-left">
-	                        <input type="text" name="email" id="email" />
-	                        
-	                    </td>
-	                </tr>
-	                
-	                <tr>
-	                    <td>&nbsp;</td>
-	                
-	                    <td>
-	                        <html:submit styleClass="button" onclick="javascript:validateForm();"><fmt:message key="label.ok"/></html:submit>     
-	                        <html:button property="cancel" styleClass="button" onclick="javascript:toHome();"><fmt:message key="button.cancel"/></html:button>
-	                    
-	                    </td>
-	                </tr>
-	            </table>
-	</div>
-	</td></tr></table>
-<form>
+		            </td></tr></table>
+		            
+		            <table border="0">
+		                <tr>
+		                    <td class="align-right" width="35%">
+		                        <fmt:message key="label.username"/>:
+		                    </td>
+		                    <td class="align-left" width="65%">
+		                        <input type="text" name="login" id="login" size="50" maxlength="50" tabindex="1" onKeyPress="return submitenter(this,event)" />
+		                    </td>
+		                </tr>
+		                <tr>
+		                    <td class="align-right" width="35%">
+		                        <fmt:message key="label.email"/>:
+		                    </td>
+		                    <td class="align-left" width="65%">
+		                        <input type="text" name="email" id="email" size="50" maxlength="50" tabindex="2" onKeyPress="return submitenter(this,event)" />
+		                        
+		                    </td>
+		                </tr>
+		                
+		                <tr>
+		                    <td>&nbsp;</td>
+		                
+		                    <td align="left">
+		                        
+		                        <html:button property="ok" styleClass="button" onclick="javascript:validateForm();"><fmt:message key="label.ok"/></html:button>     
+		                        <html:button property="cancel" styleClass="button" onclick="javascript:toHome();"><fmt:message key="button.cancel"/></html:button>
+		                    
+		                    </td>
+		                </tr>
+		            </table>
+		
+	
+		</div> <!--closes content-->
+		
+	</form>  
+    <div id="footer"></div><!--closes footer-->
+	
+</div><!--closes page-->
+
+
+
 </body> 
 
 </lams:html>          
\ No newline at end of file
Index: lams_central/web/forgotPasswordChange.jsp
===================================================================
diff -u -re9d226f1680751f53da50848214c85df0e1f06fb -r8e454f8298f642d44db16ee5ade01b0c0afde504
--- lams_central/web/forgotPasswordChange.jsp	(.../forgotPasswordChange.jsp)	(revision e9d226f1680751f53da50848214c85df0e1f06fb)
+++ lams_central/web/forgotPasswordChange.jsp	(.../forgotPasswordChange.jsp)	(revision 8e454f8298f642d44db16ee5ade01b0c0afde504)
@@ -1,6 +1,7 @@
 <%@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" %>
@@ -19,59 +20,91 @@
     <link rel="icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 <script language="javascript" type="text/javascript">
+<!--  
+        
         function toHome() {window.location="<lams:LAMSURL/>index.do";};
         
         function validateForm() 
         {
-            // TODO: need to do validation
-            // Check password and confirm are the same
+            var pass = document.getElementById("newPassword").value;
+            var passConfirm = document.getElementById("confirmNewPassword").value;
+            
+            if (pass == null || pass=="" || passConfirm == null || passConfirm =="")
+            {
+                alert('<fmt:message key="error.forgot.password.fields" />');
+            }
+            else if (pass != passConfirm)
+            {
+                alert('<fmt:message key="error.newpassword.mismatch" />');
+            }
+            else
+            {
+                document.changePass.submit();
+            }
         }
         
+        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;
+        }
         
+//-->        
 </script>
 </lams:head>
 
 
 <body class="stripes" >
-<form action="<lams:LAMSURL/>/ForgotPasswordRequest" method="get">
-    <input type="hidden" name="method" id="method" value="requestPasswordChange" />
-    <input type="hidden" name="key" id="key" value="<%=key %>" />
-    <p><p><p>
-    <table><tr><td align="center">    
-    <div id="content">
+	<div id="page"><!--main box 'page'-->
+	<form action="<lams:LAMSURL/>/ForgotPasswordRequest" method="get" name="changePass">
+	    <input type="hidden" name="method" id="method" value="requestPasswordChange" />
+	    <input type="hidden" name="key" id="key" value="<%=key %>" />
+	    <h1 class="no-tabs-below"><fmt:message key="label.forgot.password"/></h1>
+	    <div id="header-no-tabs"></div>
+	    <div id="content">
+	                
+	                <table class="body">
+	                <tr>
+	                    <td class="align-right">
+	                        <fmt:message key="label.password.new.password"/>:
+	                    </td>
+	                    <td class="align-left">
+	                        <input type="password" id="newPassword" name="newPassword" size="50" maxlength="50" onKeyPress="return submitenter(this,event)"/>
+	                    </td>
+	                </tr>
+	                <tr>
+	                    <td class="align-right">
+	                        <fmt:message key="label.password.confirm.new.password"/>:
+	                    </td>
+	                    <td class="align-left">
+	                        <input type="password" id="confirmNewPassword" name="confirmNewPassword" size="50" maxlength="50" onKeyPress="return submitenter(this,event)"/>                   
+	                    </td>
+	                </tr>
+	                <tr>
+	                    <td>&nbsp;</td>
+	                
+	                    <td>
+	                        <html:button property="save" styleClass="button" onclick="javascript:validateForm();"><fmt:message key="button.save"/></html:button>     
+	                    </td>
+	                </tr>
+	            </table>
+	    </div> <!--closes content-->
+	    </form>
+	
+	    <div id="footer"></div><!--closes footer-->
     
-                <div id="title" align="left">
-                    <h1><fmt:message key="label.forgot.password"/></h1>
-                </div>
-                
-                <table class="body">
-                <tr>
-                    <td class="align-right">
-                        <fmt:message key="label.password.new.password"/>:
-                    </td>
-                    <td class="align-left">
-                        <input type="password" id="newPassword" name="newPassword" size="50" maxlength="50"/>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="align-right">
-                        <fmt:message key="label.password.confirm.new.password"/>:
-                    </td>
-                    <td class="align-left">
-                        <input type="password" id="confirmNewPassword" name="confirmNewPassword" size="50" maxlength="50"/>                   
-                    </td>
-                </tr>
-                <tr>
-                    <td>&nbsp;</td>
-                
-                    <td>
-                        <html:submit styleClass="button"><fmt:message key="button.save"/></html:submit>     
-                    </td>
-                </tr>
-            </table>
-    </div>
-    </td></tr></table>
-<form>
+</div><!--closes page-->
+
 </body> 
 
 </lams:html>          
\ No newline at end of file
Index: lams_central/web/forgotPasswordProc.jsp
===================================================================
diff -u -re9d226f1680751f53da50848214c85df0e1f06fb -r8e454f8298f642d44db16ee5ade01b0c0afde504
--- lams_central/web/forgotPasswordProc.jsp	(.../forgotPasswordProc.jsp)	(revision e9d226f1680751f53da50848214c85df0e1f06fb)
+++ lams_central/web/forgotPasswordProc.jsp	(.../forgotPasswordProc.jsp)	(revision 8e454f8298f642d44db16ee5ade01b0c0afde504)
@@ -3,32 +3,17 @@
 <%@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" %>
 
 <%
-
-String message="";
-
+String languageKey = request.getParameter("languageKey");
 String stateStr = request.getParameter("state");
-int state = Integer.parseInt(stateStr);
-
-WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(this.getServletContext());
-MessageService messageService = (MessageService)ctx.getBean("centralMessageService");
-
-switch (state)
-{
-case 100: message = "<font color='red'>" + messageService.getMessage("error.support.email.not.set") + "</font>"; break;
-case 101: message = "<font color='red'>" + messageService.getMessage("error.email.does.not.match") + "</font>"; break;
-case 102: message = "<font color='red'>" + messageService.getMessage("error.user.not.found") + "</font>"; break;
-case 103: message = "<font color='red'>" + messageService.getMessage("error.password.request.expired") + "</font>"; break;
-case 104: message = messageService.getMessage("forgot.password.email.sent"); break;
-case 105: message = messageService.getMessage("heading.password.changed.screen"); break;
-}
-
 %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -39,25 +24,43 @@
     <title><fmt:message key="title.forgot.password"/></title>
     <link rel="icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
+</lams:head>
+
 <script language="javascript" type="text/javascript">
-        function toHome() {window.location="<lams:LAMSURL/>index.do";};
+        function toHome() 
+        {
+            var isSuccess = <%=stateStr%>;
+            if (isSuccess == "1")
+            {
+                window.location="<lams:LAMSURL/>index.do";
+            }
+            else
+            {
+                window.location="<lams:LAMSURL/>forgotPassword.jsp";
+            }
+        };
 </script>
-</lams:head>
 
-
 <body class="stripes" >
-<br>
-<table class="body"><tr><td align="center">
-<div id="content">
-    <div id="title" align="left">
-                    <h1><fmt:message key="label.forgot.password.confirm"/></h1>
-    </div>
-    <br>
-    <%=message %>
-    <br><br>
-    <html:button property="cancel" styleClass="button" onclick="javascript:toHome();"><fmt:message key="label.ok"/></html:button>
+    <div id="page"><!--main box 'page'-->
+
+    
+    <h1 class="no-tabs-below"><fmt:message key="label.forgot.password.confirm"/></h1>
+    
+    <div id="header-no-tabs"></div>
+    <div id="content" align="center">
+	    <table border="0" class="body"><tr><td>
+		    <%if (stateStr.equals("0")){out.print("<font color='Red'>");}%>
+		    <fmt:message key="<%=languageKey %>"/>
+		    <%if (stateStr.equals("0")){out.print("</font>");}%>
+	    </td></tr></table>
+	    <br><br>
+	    <html:button property="cancel" styleClass="button" onclick="javascript:toHome();"><fmt:message key="label.ok"/></html:button>
+	</div>
+    
+    <div id="footer"><div id="footer"></div><!--closes footer-->
+    
 </div>
-</td></tr></table>
 </body> 
 
 </lams:html>          
\ No newline at end of file
Index: lams_central/web/login.jsp
===================================================================
diff -u -re9d226f1680751f53da50848214c85df0e1f06fb -r8e454f8298f642d44db16ee5ade01b0c0afde504
--- lams_central/web/login.jsp	(.../login.jsp)	(revision e9d226f1680751f53da50848214c85df0e1f06fb)
+++ lams_central/web/login.jsp	(.../login.jsp)	(revision 8e454f8298f642d44db16ee5ade01b0c0afde504)
@@ -134,13 +134,13 @@
 					 </p>
 				</form>	
 				<p class="login-button">
-				   <a href="<lams:LAMSURL/>/www/help/troubleshoot-<%=Configuration.get(ConfigurationKeys.SERVER_LANGUAGE)%>.pdf">
-				   	<fmt:message key="label.help"/>
-				   </a>
-				   &nbsp;
 				   <a href="<lams:LAMSURL/>forgotPassword.jsp">
                     <fmt:message key="label.forgot.password"/>
                    </a>
+				   &nbsp;
+				   <a href="<lams:LAMSURL/>/www/help/troubleshoot-<%=Configuration.get(ConfigurationKeys.SERVER_LANGUAGE)%>.pdf">
+                    <fmt:message key="label.help"/>
+                   </a>
 				</p>   
 				</div><!--closes right col-->