Index: lams_learning/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.9 -r1.10
--- lams_learning/conf/language/ApplicationResources.properties	21 Jun 2006 12:03:18 -0000	1.9
+++ lams_learning/conf/language/ApplicationResources.properties	23 Jun 2006 07:58:00 -0000	1.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/error-pages.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/conf/xdoclet/error-pages.xml	13 Oct 2005 07:42:38 -0000	1.1
+++ lams_learning/conf/xdoclet/error-pages.xml	23 Jun 2006 07:58:00 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/web/WEB-INF/Attic/web.xml,v
diff -u -r1.5 -r1.6
--- lams_learning/test/web/WEB-INF/web.xml	14 Apr 2006 06:41:27 -0000	1.5
+++ lams_learning/test/web/WEB-INF/web.xml	23 Jun 2006 07:58:00 -0000	1.6
@@ -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 1.2 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/error.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/error.jsp,v
diff -u -r1.4 -r1.5
--- lams_learning/web/error.jsp	5 Apr 2006 23:08:07 -0000	1.4
+++ lams_learning/web/error.jsp	23 Jun 2006 07:58:00 -0000	1.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/login.jsp,v
diff -u -r1.3 -r1.4
--- lams_learning/web/login.jsp	24 Apr 2006 04:26:35 -0000	1.3
+++ lams_learning/web/login.jsp	23 Jun 2006 07:58:00 -0000	1.4
@@ -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>
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/web.xml,v
diff -u -r1.25 -r1.26
--- lams_learning/web/WEB-INF/web.xml	21 Jun 2006 12:03:17 -0000	1.25
+++ lams_learning/web/WEB-INF/web.xml	23 Jun 2006 07:58:00 -0000	1.26
@@ -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 -->