Index: lams_learning/conf/language/ApplicationResources.properties
===================================================================
diff -u -r250486f86b66ac04cece0001879c3dc39c96ed98 -rdff0b0618eea86d86bdf3d5d3f56d85c8569f6fe
--- lams_learning/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 250486f86b66ac04cece0001879c3dc39c96ed98)
+++ lams_learning/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision dff0b0618eea86d86bdf3d5d3f56d85c8569f6fe)
@@ -6,6 +6,10 @@
 error.system.learner=An internal error has occured and this function cannot be completed. If reporting this error, please report: <br/> <b>{0}</b>
 # General error displayed if a page cannot be found. 
 error.message.404=The page you have requested can not be found.
+# General error displayed if you try to go directly to a learning related page before logging in properly 
+error.message.login=You need login <a href="/lams/index.jsp">here</a>
+# General heading for an error - used as the alternative text for the error picture in error messages
+error.title=Error occured
 
 # Message which appears when the learner window is opened or between activities.
 message.activity.loading=The next task is loading. Please wait....
Index: lams_learning/conf/xdoclet/error-pages.xml
===================================================================
diff -u -r01e9227db8d63e8273bb20a34ec2ffa9d8458d60 -rdff0b0618eea86d86bdf3d5d3f56d85c8569f6fe
--- lams_learning/conf/xdoclet/error-pages.xml	(.../error-pages.xml)	(revision 01e9227db8d63e8273bb20a34ec2ffa9d8458d60)
+++ lams_learning/conf/xdoclet/error-pages.xml	(.../error-pages.xml)	(revision dff0b0618eea86d86bdf3d5d3f56d85c8569f6fe)
@@ -1,4 +1 @@
-<error-page>
-	<error-code>403</error-code>
-	<location>/403.html</location>
-</error-page>  
\ No newline at end of file
Index: lams_learning/test/web/WEB-INF/web.xml
===================================================================
diff -u -rcdab8186de5e9c75a9d6774616ead602dbf9cb69 -rdff0b0618eea86d86bdf3d5d3f56d85c8569f6fe
--- lams_learning/test/web/WEB-INF/web.xml	(.../web.xml)	(revision cdab8186de5e9c75a9d6774616ead602dbf9cb69)
+++ lams_learning/test/web/WEB-INF/web.xml	(.../web.xml)	(revision dff0b0618eea86d86bdf3d5d3f56d85c8569f6fe)
@@ -157,11 +157,6 @@
    <!ELEMENT mime-mapping (extension, mime-type)>
    -->
 
-  <error-page>
-	<error-code>403</error-code>
-	<location>/403.html</location>
-</error-page>  
-
   	<jsp-config>
 		<!--  ======================================================== -->	
 		<!-- Struts Tag Library Descriptors -->
Fisheye: Tag dff0b0618eea86d86bdf3d5d3f56d85c8569f6fe refers to a dead (removed) revision in file `lams_learning/web/403.html'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -r250486f86b66ac04cece0001879c3dc39c96ed98 -rdff0b0618eea86d86bdf3d5d3f56d85c8569f6fe
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 250486f86b66ac04cece0001879c3dc39c96ed98)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision dff0b0618eea86d86bdf3d5d3f56d85c8569f6fe)
@@ -158,11 +158,6 @@
    <!ELEMENT mime-mapping (extension, mime-type)>
    -->
 
-  <error-page>
-	<error-code>403</error-code>
-	<location>/403.html</location>
-</error-page>  
-
   	<jsp-config>
 		<!--  ======================================================== -->	
 		<!-- Struts Tag Library Descriptors -->
Index: lams_learning/web/error.jsp
===================================================================
diff -u -rcdb910b6cd3de106725e2c22ded380c5c0fab650 -rdff0b0618eea86d86bdf3d5d3f56d85c8569f6fe
--- lams_learning/web/error.jsp	(.../error.jsp)	(revision cdb910b6cd3de106725e2c22ded380c5c0fab650)
+++ lams_learning/web/error.jsp	(.../error.jsp)	(revision dff0b0618eea86d86bdf3d5d3f56d85c8569f6fe)
@@ -22,6 +22,7 @@
 <%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ page import="org.apache.struts.action.Action" %>
 <%
 String cprotocol = request.getProtocol();
@@ -37,7 +38,7 @@
 <table border="0" cellspacing="2" cellpadding="2" summary="This table is being used for layout purposes only">
 <tr>
 	<td width="10%"  align="right" >
-		<img src="<%=pathToShare%>/images/error.jpg" alt="Error occured"/>
+		<img src="<%=pathToShare%>/images/error.jpg" alt='<fmt:message key="error.title"/>'/>
 	</td>
 	<td width="90%" valign="middle" class="body" colspan="2">
 		 <html:messages id="error" message="false"> 
Index: lams_learning/web/login.jsp
===================================================================
diff -u -r66f147e9d94ea10fa2c2cea70a78d6479096ddc7 -rdff0b0618eea86d86bdf3d5d3f56d85c8569f6fe
--- lams_learning/web/login.jsp	(.../login.jsp)	(revision 66f147e9d94ea10fa2c2cea70a78d6479096ddc7)
+++ lams_learning/web/login.jsp	(.../login.jsp)	(revision dff0b0618eea86d86bdf3d5d3f56d85c8569f6fe)
@@ -20,6 +20,7 @@
 --%>
 
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%
 String path = request.getContextPath();
 String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
@@ -28,17 +29,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
-    <base href="<%=basePath%>">
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-    <title>System logon required</title>
-
-    <!--
-    <link rel="stylesheet" type="text/css" href="styles.css">
-    -->
   </head>
   
   <body>
-	You need login <a href="/lams/index.jsp">here</a>.
-
+  	<fmt:message key="error.message.login"/>
   </body>
 </html>