Index: lams_central/web/forgotPassword.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/forgotPassword.jsp,v
diff -u -r1.5 -r1.5.6.1
--- lams_central/web/forgotPassword.jsp	8 Sep 2008 06:42:10 -0000	1.5
+++ lams_central/web/forgotPassword.jsp	20 May 2009 06:05:40 -0000	1.5.6.1
@@ -13,7 +13,7 @@
 <lams:html>
 
 <lams:head>
-    <lams:css  style="core"/>
+    <lams:css />
     <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" />
@@ -104,47 +104,49 @@
 	<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.1"/>
-		            <br><br>
-		            <fmt:message key="label.forgot.password.instructions.2"/>
-		            </td></tr></table>
-		            
-		            <table border="0">
-		                <tr>
-		                    <td class="align-right" width="35%">
-	                            <fmt:message key="label.forgot.password.username"/> &nbsp; 
-	                            <input type="radio" name="selectType" value="radioUsername" onclick="radioSelected();" checked>
-		                    <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.forgot.password.email"/> &nbsp;
-                                <input type="radio" name="selectType" value="radioEmail" onclick="radioSelected();">
-                            </td>
-                            <td class="align-left" width="65%">
-                                <input type="text" name="email" id="email" size="50" maxlength="50" tabindex="1" 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>
-		
-	
+            <h1 class="no-tabs-below"><fmt:message key="label.forgot.password"/></h1>  
+            
+            <p>
+            	<fmt:message key="label.forgot.password.instructions.1"/>
+           	</p>
+           	
+           	<p>
+           		<fmt:message key="label.forgot.password.instructions.2"/>
+            </p>
+            
+            <table border="0">
+                <tr>
+                    <td class="align-right" width="35%">
+                           <fmt:message key="label.forgot.password.username"/> &nbsp; 
+                           <input type="radio" name="selectType" value="radioUsername" onclick="radioSelected();" checked>
+                    <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.forgot.password.email"/> &nbsp;
+                              <input type="radio" name="selectType" value="radioEmail" onclick="radioSelected();">
+                          </td>
+                          <td class="align-left" width="65%">
+                              <input type="text" name="email" id="email" size="50" maxlength="50" tabindex="1" 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>  
Index: lams_central/web/forgotPasswordChange.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/forgotPasswordChange.jsp,v
diff -u -r1.3 -r1.3.6.1
--- lams_central/web/forgotPasswordChange.jsp	8 Sep 2008 06:42:10 -0000	1.3
+++ lams_central/web/forgotPasswordChange.jsp	20 May 2009 06:05:42 -0000	1.3.6.1
@@ -16,7 +16,7 @@
 <lams:html>
 
 <lams:head>
-    <lams:css  style="core"/>
+    <lams:css />
     <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" />
@@ -70,35 +70,36 @@
 	<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>
+            <h1 class="no-tabs-below"><fmt:message key="label.forgot.password"/></h1>
+            
+        	<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>
 	
Index: lams_central/web/forgotPasswordProc.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/forgotPasswordProc.jsp,v
diff -u -r1.4 -r1.4.6.1
--- lams_central/web/forgotPasswordProc.jsp	8 Sep 2008 06:42:10 -0000	1.4
+++ lams_central/web/forgotPasswordProc.jsp	20 May 2009 06:05:39 -0000	1.4.6.1
@@ -22,7 +22,7 @@
 <lams:html>
 
 <lams:head>
-    <lams:css  style="core"/>
+    <lams:css />
     <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" />
@@ -45,27 +45,34 @@
 
 <body class="stripes" >
     <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"))
+	    <h1 class="no-tabs-below"><fmt:message key="label.forgot.password.confirm"/></h1>
+	    
+	    
+	    <%
+	    	if (stateStr.equals("0")) {
+	    %>
+	    	<p class="warning">
+	    <%
+	    	} else {
+	    %>
+			<p class="info">
+	    <% 
+	    	}
+	    %>
+	   	<fmt:message key="<%=languageKey %>"/>
+	   	
+	   	<%
+	   		if (emailStr!=null && !emailStr.equals(""))
 		    {
-		    	out.print("</font>");
-		    }
-		    else if (emailStr!=null && !emailStr.equals(""))
-		    {
 		    	out.print(emailStr);
 		    }
-		    %>
-	    </td></tr></table>
-	    <br><br>
+		%>	
+	    </p>
+
+	    <br>
 	    <html:button property="cancel" styleClass="button" onclick="javascript:toHome();"><fmt:message key="label.ok"/></html:button>
 	</div>