Index: lams_admin/web/WEB-INF/lams.tld
===================================================================
diff -u -r62ffc2985a40f544eb48a69f2ad7f124b19a43fa -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_admin/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 62ffc2985a40f544eb48a69f2ad7f124b19a43fa)
+++ lams_admin/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -1,53 +1,103 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<taglib>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-jsptaglibrary_2_0.xsd"
+    version="2.0">
 
-   <tlibversion>1.0</tlibversion>
-   <jspversion>1.1</jspversion>
-   <shortname>lams</shortname>
+   <tlib-version>1.0</tlib-version>
+   <short-name>lams</short-name>
 
-   <info><![CDATA[LAMS custom tags]]></info>
+   <display-name>LAMSTags</display-name>
+   <description><![CDATA[LAMS custom tags]]></description>
 
    <tag>
 
+      <description>Output the Server URL as defined in the lams.xml configuration file.</description>
+      <display-name>LAMS URL</display-name>
+      <icon>    
+      </icon>
       <name>LAMSURL</name>
-      <tagclass>org.lamsfoundation.lams.web.tag.LAMSURLTag</tagclass>
-      <info><![CDATA[Output the Server URL as defined in the lams.xml configuration file.]]></info>
+      <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
+      <body-content>empty</body-content>
 
    </tag>
    <tag>
 
+      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
+      <display-name>generate unique ID</display-name>
+      <icon>    
+      </icon>
+      <name>generateID</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
+         <name>id</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
+      <description>Output details from the shared session UserDTO object</description>
+      <display-name>user details</display-name>
+      <icon>    
+      </icon>
       <name>user</name>
-      <tagclass>org.lamsfoundation.lams.web.tag.UserTag</tagclass>
-      <info><![CDATA[Output details from the shared session UserDTO object]]></info>
+      <tag-class>org.lamsfoundation.lams.web.tag.UserTag</tag-class>
+      <body-content>empty</body-content>
 
       <attribute>
+         <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-         <rtexprvalue>true</rtexprvalue>
 
+           <rtexprvalue>true</rtexprvalue>
+
       </attribute>
 
    </tag>
    <tag>
 
+      <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
+      <display-name>Base URL for the current web app</display-name>
+      <icon>    
+      </icon>
       <name>WebAppURL</name>
-      <tagclass>org.lamsfoundation.lams.web.tag.WebAppURLTag</tagclass>
-      <info><![CDATA[Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/]]></info>
+      <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
+      <body-content>empty</body-content>
 
    </tag>
    <tag>
 
+      <description>Output stylesheet based on the user preferences.</description>
+      <display-name>User's chosen stylesheet</display-name>
+      <icon>    
+      </icon>
       <name>css</name>
-      <tagclass>org.lamsfoundation.lams.web.tag.CssTag</tagclass>
-      <info><![CDATA[Output stylesheet based on the user preferences.]]></info>
+      <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
+      <body-content>empty</body-content>
 
+      <attribute>
+         <description>Output stylesheet based on the user preferences.</description>
+         <name>localLinkPath</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
 
   	<tag>
 		<name>STRUTS-textarea</name>
 		<tagclass>org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag</tagclass>
+		<body-content>empty</body-content>
 		<attribute>
 			<name>accesskey</name>
 			<required>false</required>
@@ -224,5 +274,44 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 	</tag>
-
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>HTMLEditor</name>
+       <path>/WEB-INF/tags/HTMLEditor.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>SetEditor</name>
+       <path>/WEB-INF/tags/SetEditor.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>AuthoringButton</name>
+       <path>/WEB-INF/tags/AuthoringButton.tag</path>
+   	</tag-file>   	
+   	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file>   	
+   	<tag-file>
+       <name>Passon</name>
+       <path>/WEB-INF/tags/Passon.tag</path>
+   	</tag-file>  
+	<tag-file>
+	    <name>ExportPortOutput</name>
+		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
+   	</tag-file>  
+	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
 </taglib>
Index: lams_central/web/WEB-INF/lams.tld
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -310,5 +310,8 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-
+	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
 </taglib>
Index: lams_central/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u
--- lams_central/web/WEB-INF/tags/DefineLater.tag	(revision 0)
+++ lams_central/web/WEB-INF/tags/DefineLater.tag	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -0,0 +1,55 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * DefineLater.tag
+  *	Author: Fiona Malikoff
+  *	Description: Layout for "Define Later" screens - to be used in learning.
+  *  A suggested layout - unless the tool has special requirements, this layout should be used.
+  *  Expects to be used inside <div id="content"></div>
+  */
+%>
+
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true" %>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty defineLaterMessageKey}">
+	<c:set var="defineLaterMessageKey" value="define.later.message"/>
+</c:if>
+<c:if test="${empty buttonTryAgainKey}">
+	<c:set var="buttonTryAgainKey" value="button.try.again"/>
+</c:if>
+
+<p>&nbsp;</p>
+
+<p><fmt:message key="${defineLaterMessageKey}" />
+
+<div class="right-buttons">
+	<a href="javascript:location.reload(true);" class="button"><fmt:message key="${buttonTryAgainKey}" /></a>
+</div>
Index: lams_learning/web/WEB-INF/lams.tld
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_learning/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_learning/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -310,5 +310,8 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-
+	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
 </taglib>
Index: lams_learning/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u
--- lams_learning/web/WEB-INF/tags/DefineLater.tag	(revision 0)
+++ lams_learning/web/WEB-INF/tags/DefineLater.tag	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -0,0 +1,55 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * DefineLater.tag
+  *	Author: Fiona Malikoff
+  *	Description: Layout for "Define Later" screens - to be used in learning.
+  *  A suggested layout - unless the tool has special requirements, this layout should be used.
+  *  Expects to be used inside <div id="content"></div>
+  */
+%>
+
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true" %>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty defineLaterMessageKey}">
+	<c:set var="defineLaterMessageKey" value="define.later.message"/>
+</c:if>
+<c:if test="${empty buttonTryAgainKey}">
+	<c:set var="buttonTryAgainKey" value="button.try.again"/>
+</c:if>
+
+<p>&nbsp;</p>
+
+<p><fmt:message key="${defineLaterMessageKey}" />
+
+<div class="right-buttons">
+	<a href="javascript:location.reload(true);" class="button"><fmt:message key="${buttonTryAgainKey}" /></a>
+</div>
Index: lams_monitoring/web/WEB-INF/lams.tld
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_monitoring/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_monitoring/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -310,5 +310,8 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-
+	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
 </taglib>
Index: lams_monitoring/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u
--- lams_monitoring/web/WEB-INF/tags/DefineLater.tag	(revision 0)
+++ lams_monitoring/web/WEB-INF/tags/DefineLater.tag	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -0,0 +1,55 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * DefineLater.tag
+  *	Author: Fiona Malikoff
+  *	Description: Layout for "Define Later" screens - to be used in learning.
+  *  A suggested layout - unless the tool has special requirements, this layout should be used.
+  *  Expects to be used inside <div id="content"></div>
+  */
+%>
+
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true" %>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty defineLaterMessageKey}">
+	<c:set var="defineLaterMessageKey" value="define.later.message"/>
+</c:if>
+<c:if test="${empty buttonTryAgainKey}">
+	<c:set var="buttonTryAgainKey" value="button.try.again"/>
+</c:if>
+
+<p>&nbsp;</p>
+
+<p><fmt:message key="${defineLaterMessageKey}" />
+
+<div class="right-buttons">
+	<a href="javascript:location.reload(true);" class="button"><fmt:message key="${buttonTryAgainKey}" /></a>
+</div>
Index: lams_tool_chat/conf/language/ApplicationResources.properties
===================================================================
diff -u -re6472b62de8c3447e47cdd35c60d47f92d118074 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_chat/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e6472b62de8c3447e47cdd35c60d47f92d118074)
+++ lams_tool_chat/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -49,7 +49,7 @@
 # ========== Learner Page ==========
 pageTitle.learning=Online Chat
 
-message.defineLaterSet=Please wait for the teacher to complete the contents of this activity
+message.defineLaterSet=Please wait for the teacher to complete the contents of this activity.
 message.runOfflineSet=This activity is not being done on the computer. Please see your instructor for details
 
 # ========== Monitoring Page ==========
Index: lams_tool_chat/web/WEB-INF/lams.tld
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_chat/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_chat/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -310,5 +310,8 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-
+	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
 </taglib>
Index: lams_tool_chat/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_chat/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_chat/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -21,6 +21,10 @@
       name="authoringForm"
       type="org.lamsfoundation.lams.tool.chat.web.forms.AuthoringForm"
     />
+    <form-bean
+      name="learningForm"
+      type="org.lamsfoundation.lams.tool.chat.web.forms.LearningForm"
+    />
 
   </form-beans>
 
@@ -40,6 +44,8 @@
     <action
       path="/learning"
       type="org.lamsfoundation.lams.tool.chat.web.actions.LearningAction"
+      name="learningForm"
+      scope="request"
       parameter="dispatch"
       unknown="false"
       validate="true"
@@ -50,10 +56,15 @@
         redirect="false"
       />
       <forward
-        name="message_page"
-        path="tiles:/generic/message"
+        name="runOffline"
+        path="tiles:/learning/runOffline"
         redirect="false"
       />
+      <forward
+        name="defineLater"
+        path="tiles:/learning/defineLater"
+        redirect="false"
+      />
     </action>
     <action
       path="/monitoring"
Index: lams_tool_chat/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/DefineLater.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/DefineLater.tag	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -0,0 +1,55 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * DefineLater.tag
+  *	Author: Fiona Malikoff
+  *	Description: Layout for "Define Later" screens - to be used in learning.
+  *  A suggested layout - unless the tool has special requirements, this layout should be used.
+  *  Expects to be used inside <div id="content"></div>
+  */
+%>
+
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true" %>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty defineLaterMessageKey}">
+	<c:set var="defineLaterMessageKey" value="define.later.message"/>
+</c:if>
+<c:if test="${empty buttonTryAgainKey}">
+	<c:set var="buttonTryAgainKey" value="button.try.again"/>
+</c:if>
+
+<p>&nbsp;</p>
+
+<p><fmt:message key="${defineLaterMessageKey}" />
+
+<div class="right-buttons">
+	<a href="javascript:location.reload(true);" class="button"><fmt:message key="${buttonTryAgainKey}" /></a>
+</div>
Index: lams_tool_chat/web/pages/learning/defineLater.jsp
===================================================================
diff -u -rdeaca84b3059ab928c655a3b46e29abcc3c1e0b5 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_chat/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision deaca84b3059ab928c655a3b46e29abcc3c1e0b5)
+++ lams_tool_chat/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -5,17 +5,7 @@
 </h1>
 <div id="header-no-tabs-learner"></div>
 <div id="content-learner">
-	<table>
-		<tr>
-			<td>
-				<fmt:message>message.defineLaterSet</fmt:message>
-			</td>
-		</tr>
-	</table>
-
-	<div class="right-buttons">
-		<a href="javascript:location.reload(true);" class="button"><fmt:message key="button.try.again" /></a>
-	</div>
+	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet"/>
 </div>
 
 <div id="footer-learner"></div>
Index: lams_tool_example/web/WEB-INF/lams.tld
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_example/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_example/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -310,5 +310,8 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-
+	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
 </taglib>
Index: lams_tool_example/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u
--- lams_tool_example/web/WEB-INF/tags/DefineLater.tag	(revision 0)
+++ lams_tool_example/web/WEB-INF/tags/DefineLater.tag	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -0,0 +1,55 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * DefineLater.tag
+  *	Author: Fiona Malikoff
+  *	Description: Layout for "Define Later" screens - to be used in learning.
+  *  A suggested layout - unless the tool has special requirements, this layout should be used.
+  *  Expects to be used inside <div id="content"></div>
+  */
+%>
+
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true" %>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty defineLaterMessageKey}">
+	<c:set var="defineLaterMessageKey" value="define.later.message"/>
+</c:if>
+<c:if test="${empty buttonTryAgainKey}">
+	<c:set var="buttonTryAgainKey" value="button.try.again"/>
+</c:if>
+
+<p>&nbsp;</p>
+
+<p><fmt:message key="${defineLaterMessageKey}" />
+
+<div class="right-buttons">
+	<a href="javascript:location.reload(true);" class="button"><fmt:message key="${buttonTryAgainKey}" /></a>
+</div>
Index: lams_tool_forum/conf/language/ApplicationResources.properties
===================================================================
diff -u -r7eefe8fd25639f40b8465fd808e35491007d77a6 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_forum/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7eefe8fd25639f40b8465fd808e35491007d77a6)
+++ lams_tool_forum/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -143,6 +143,6 @@
 #======= New labels: after 12/05/2006 =============
 authoring.msg.cancel.save=Do you want to close this window without saving?
 #======= New labels: after 08/06/2006 =============
-define.later.message=Please wait for the teacher to define this part.
+define.later.message=Please wait for the teacher to complete the contents of this activity.
 run.offline.message=This activity is not being done on the computer. Please see your instructor for details.
 button.try.again=Try again
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/lams.tld
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_forum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_forum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -310,5 +310,8 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-
+	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
 </taglib>
Index: lams_tool_forum/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/DefineLater.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/DefineLater.tag	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -0,0 +1,55 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * DefineLater.tag
+  *	Author: Fiona Malikoff
+  *	Description: Layout for "Define Later" screens - to be used in learning.
+  *  A suggested layout - unless the tool has special requirements, this layout should be used.
+  *  Expects to be used inside <div id="content"></div>
+  */
+%>
+
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true" %>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty defineLaterMessageKey}">
+	<c:set var="defineLaterMessageKey" value="define.later.message"/>
+</c:if>
+<c:if test="${empty buttonTryAgainKey}">
+	<c:set var="buttonTryAgainKey" value="button.try.again"/>
+</c:if>
+
+<p>&nbsp;</p>
+
+<p><fmt:message key="${defineLaterMessageKey}" />
+
+<div class="right-buttons">
+	<a href="javascript:location.reload(true);" class="button"><fmt:message key="${buttonTryAgainKey}" /></a>
+</div>
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -r6bb2802253132bb7da7aa0e9dba50f94dd617f3a -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 6bb2802253132bb7da7aa0e9dba50f94dd617f3a)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -220,7 +220,7 @@
 
 	</jsp-config>
 
-  	<!--  Security Constraint -->
+    	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>
 	    	<web-resource-name>Secure Content</web-resource-name>
@@ -299,12 +299,44 @@
     	</auth-constraint>
     </security-constraint>
 
+  <!-- ======================================================== -->
+	<!--  Security Roles -->
+    <!-- ======================================================== -->
+	<security-role>
+		<description>Student</description>
+		<role-name>LEARNER</role-name>
+	</security-role>
+	<security-role>
+		<description>Student</description>
+		<role-name>TEACHER</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can create/modify a learning design</description>
+		<role-name>AUTHOR</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can running and monitoring a learning session</description>
+		<role-name>STAFF</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can add/remove users to the system, set up classes of users for sessions</description>
+		<role-name>ADMIN</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can add/remove users to the system, set up classes of users for sessions</description>
+		<role-name>SYSADMIN</role-name>
+	</security-role>
 	<!--  Login Configuration -->
   	<login-config>
    		<auth-method>FORM</auth-method>
 		<realm-name>LAMS</realm-name>
    		<form-login-config>
     		<form-login-page>/login.jsp</form-login-page>
+			<form-error-page>/login.jsp?failed=y</form-error-page>    		
    		</form-login-config>
    	</login-config>
 
Index: lams_tool_forum/web/jsps/learning/definelater.jsp
===================================================================
diff -u -r9719695d2ad2c0dbe06c93d032eef994f634b9d5 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_forum/web/jsps/learning/definelater.jsp	(.../definelater.jsp)	(revision 9719695d2ad2c0dbe06c93d032eef994f634b9d5)
+++ lams_tool_forum/web/jsps/learning/definelater.jsp	(.../definelater.jsp)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -1,23 +1,11 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
-<h1 class="no-tabs-below">
-	<fmt:message key="activity.title" />
-</h1>
+<h1 class="no-tabs-below">&nbsp;</h1>
 
 <div id="header-no-tabs-learner"></div>
 
 <div id="content-learner">
-	<table>
-		<tr>
-			<td>
-				<fmt:message key="define.later.message" />
-			</td>
-		</tr>
-	</table>
-
-	<div class="right-buttons">
-		<a href="javascript:location.reload(true);" class="button"><fmt:message key="button.try.again" /></a>
-	</div>
+	<lams:DefineLater/>
 </div>
 
 <div id="footer-learner"></div>
Index: lams_tool_lamc/conf/language/ApplicationResources.properties
===================================================================
diff -u -ra150ab0b4ee3b39e6ddd0ce322801a2963b91996 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_lamc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a150ab0b4ee3b39e6ddd0ce322801a2963b91996)
+++ lams_tool_lamc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -189,7 +189,7 @@
 label.response  =Response
 label.learning.forceOfflineMessage  =This is setup to be carried out offline. Plase see your instructor for details.
 label.learning.runOffline  =This activity is not being done on the computer. Please see your instructor for details.
-error.defineLater  =Sorry, the activity's content is not ready yet. Please wait for the teacher to define this part.
+error.defineLater  =Please wait for the teacher to complete the contents of this activity
 error.toolSessionId.required  =Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a toolSession id.
 error.contentId.required  =Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a content id.
 error.authoringUser.notAvailable  =Tool Activity Error! Can't continue. Tool Activity expects a user id.
@@ -255,4 +255,6 @@
 
 #======= End labels: Exported 226 labels for en AU =====
 #======= Add on 16/05/2006 =====
-authoring.msg.cancel.save=Do you want to close this window without saving?
\ No newline at end of file
+authoring.msg.cancel.save=Do you want to close this window without saving?
+#======= Add on 14/07/2006 =====
+button.try.again =Try again
\ No newline at end of file
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
diff -u -r4a1085fc82d8e6273b9b800fb6852bcbd2c7baea -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision 4a1085fc82d8e6273b9b800fb6852bcbd2c7baea)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -301,7 +301,6 @@
     public static final String USER_EXCEPTION_CONTENT_IN_USE			="userExceptionContentInUse";
     public static final String USER_EXCEPTION_CONTENT_BEING_MODIFIED	="userExceptionContentBeingModified";
     public static final String USER_EXCEPTION_CONTENT_RUNOFFLINE		="userExceptionContentRunOffline";
-    public static final String USER_EXCEPTION_CONTENT_DEFINE_LATER		="userExceptionContentDefineLater";
     public static final String USER_EXCEPTION_MODE_INVALID				="userExceptionModeInvalid";
     public static final String USER_EXCEPTION_QUESTION_EMPTY			="userExceptionQuestionEmpty";
     public static final String USER_EXCEPTION_ANSWER_EMPTY				="userExceptionAnswerEmpty";
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java
===================================================================
diff -u -r8f4ede3494f8c087de161a50616e511dd22d1605 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision 8f4ede3494f8c087de161a50616e511dd22d1605)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -771,7 +771,6 @@
     	request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_IN_USE);
     	request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_BEING_MODIFIED);
     	request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_RUNOFFLINE);
-    	request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_DEFINE_LATER);
     	request.getSession().removeAttribute(USER_EXCEPTION_MODE_INVALID);
     	request.getSession().removeAttribute(USER_EXCEPTION_QUESTION_EMPTY);
     	request.getSession().removeAttribute(USER_EXCEPTION_ANSWER_EMPTY);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
diff -u -rf3ac4d016e5d13cd5b07a5dccf8e371823bb0691 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision f3ac4d016e5d13cd5b07a5dccf8e371823bb0691)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -143,6 +143,12 @@
 	  	/>
 	  	
 	  	<forward
+		    name="defineLater"
+	        path="/learning/defineLater.jsp"
+		    redirect="false"
+	  	/>
+
+	  	<forward
 		    name="errorList"
 		    path=".mcErrorBox"
 		    redirect="true"
@@ -356,10 +362,7 @@
 	    if (isDefineLater == true)
 	    {
 	    	McUtils.cleanUpSessionAbsolute(request);
-	    	request.getSession().setAttribute(USER_EXCEPTION_CONTENT_DEFINE_LATER, new Boolean(true).toString());
-	    	logger.debug("warning to learner: the activity is defineLater, we interpret that the content is being modified.");
-	    	persistError(request,"error.defineLater");
-	    	return (mapping.findForward(ERROR_LIST));
+	    	return (mapping.findForward(DEFINE_LATER));
 	    }
 
 	    /*
Index: lams_tool_lamc/web/WEB-INF/lams.tld
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_lamc/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_lamc/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -310,5 +310,8 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-
+	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
 </taglib>
Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
diff -u -rbe0f74b3d01318467107b6a074df9a097ca56fc1 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -250,6 +250,12 @@
 	  	/>
 	  	
 	  	<forward
+		    name="defineLater"
+	        path="/learning/defineLater.jsp"
+		    redirect="false"
+	  	/>
+
+	  	<forward
 		    name="errorList"
 		    path="/McErrorBox.jsp"
 		    redirect="false"
Index: lams_tool_lamc/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/DefineLater.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/DefineLater.tag	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -0,0 +1,55 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * DefineLater.tag
+  *	Author: Fiona Malikoff
+  *	Description: Layout for "Define Later" screens - to be used in learning.
+  *  A suggested layout - unless the tool has special requirements, this layout should be used.
+  *  Expects to be used inside <div id="content"></div>
+  */
+%>
+
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true" %>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty defineLaterMessageKey}">
+	<c:set var="defineLaterMessageKey" value="define.later.message"/>
+</c:if>
+<c:if test="${empty buttonTryAgainKey}">
+	<c:set var="buttonTryAgainKey" value="button.try.again"/>
+</c:if>
+
+<p>&nbsp;</p>
+
+<p><fmt:message key="${defineLaterMessageKey}" />
+
+<div class="right-buttons">
+	<a href="javascript:location.reload(true);" class="button"><fmt:message key="${buttonTryAgainKey}" /></a>
+</div>
Index: lams_tool_lamc/web/learning/defineLater.jsp
===================================================================
diff -u
--- lams_tool_lamc/web/learning/defineLater.jsp	(revision 0)
+++ lams_tool_lamc/web/learning/defineLater.jsp	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -0,0 +1,65 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<html:html>
+<head>
+	<html:base />
+	<lams:headItems />
+	<title><bean:message key="activity.title" /></title>
+</head>
+
+<body>
+	<div id="page-learner">
+	
+	<h1 class="no-tabs-below">&nbsp;</h1>
+	
+	<div id="header-no-tabs-learner"></div>
+	
+	<div id="content-learner">
+		<lams:DefineLater defineLaterMessageKey="error.defineLater"/>
+	</div>
+	
+	<div id="footer-learner"></div>
+
+
+</div>
+</body>
+</html:html>
+
+
+
+
+
+
+
+
Index: lams_tool_laqa/conf/language/ApplicationResources.properties
===================================================================
diff -u -re48a67de27af42221ddce80419f05c1be4680430 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_laqa/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e48a67de27af42221ddce80419f05c1be4680430)
+++ lams_tool_laqa/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -121,7 +121,7 @@
 label.stats.totalAllGroups  =Total count of all learners:
 label.learning.runOffline  =This activity is not being done on the computer. Please see your instructor for details.
 label.learning.forceOfflineMessage  =This is setup to be carried out offline. Plase see your instructor for details.
-error.defineLater  =Sorry, this activity's content is not ready yet. <br> Please wait for your teacher to make the content ready.
+error.defineLater  =Please wait for the teacher to complete the contents of this activity.
 error.toolSessionId.required  =Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a toolSession id.
 error.contentId.required  =Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a content id.
 error.authoringUser.notAvailable  =Tool Activity Error! Can't continue. Tool Activity expects a user id.
@@ -184,4 +184,6 @@
 #======= End labels: Exported 160 labels for en AU =====
 
 #======= Add on 16/05/2006 =====
-authoring.msg.cancel.save=Do you want to close this window without saving?
\ No newline at end of file
+authoring.msg.cancel.save=Do you want to close this window without saving?
+#======= Add on 14/07/2006 =====
+button.try.again =Try again
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
diff -u -re4b11d5f2ee68909df09e749152768bd5006aa88 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision e4b11d5f2ee68909df09e749152768bd5006aa88)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -145,7 +145,6 @@
     public static final String USER_EXCEPTION_NO_TOOL_SESSIONS			="userExceptionNoToolSessions";
     public static final String USER_EXCEPTION_NO_STUDENT_ACTIVITY		="userExceptionNoStudentActivity";
     public static final String USER_EXCEPTION_CONTENT_IN_USE			="userExceptionContentInUse";
-    public static final String USER_EXCEPTION_CONTENT_DEFINE_LATER		="userExceptionContentDefineLater";
     public static final String USER_EXCEPTION_RUN_OFFLINE				="userExceptionRunOffline";    
     public static final String USER_EXCEPTION_MODE_REQUIRED				="userExceptionModeRequired";    
     public static final String USER_EXCEPTION_MODE_INVALID				="userExceptionModeInvalid";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
===================================================================
diff -u -rcc57114dde638ab1b37c0ac5556c1a2822e79bf3 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	(.../QaUtils.java)	(revision cc57114dde638ab1b37c0ac5556c1a2822e79bf3)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	(.../QaUtils.java)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -554,7 +554,6 @@
 		request.getSession().removeAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS);
 		request.getSession().removeAttribute(USER_EXCEPTION_NO_STUDENT_ACTIVITY);
 		request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_IN_USE);
-		request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_DEFINE_LATER);
 		request.getSession().removeAttribute(USER_EXCEPTION_MODE_REQUIRED);
 		request.getSession().removeAttribute(USER_EXCEPTION_RUN_OFFLINE);
 		request.getSession().removeAttribute(USER_EXCEPTION_MODE_INVALID);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
diff -u -refc1830092f72f7093a111071b0073702f3dd23c -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision efc1830092f72f7093a111071b0073702f3dd23c)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -153,6 +153,12 @@
 	        redirect="true"
 	      />
 	      
+	  	<forward
+		    name="defineLater"
+	        path="/learning/defineLater.jsp"
+		    redirect="false"
+	  	/>
+	      
 		<forward
 		    name="errorListLearner"
 		    path="/QaErrorBox.jsp"
@@ -299,11 +305,15 @@
 	    
 	    logger.debug("IS_USERNAME_VISIBLE: " + qaContent.isUsernameVisible());
 	    request.getSession().setAttribute(IS_USERNAME_VISIBLE, new Boolean(qaContent.isUsernameVisible()));
+	    
 	    /*
 	     * Is the tool activity been checked as Define Later in the property inspector?
 	     */
 	    logger.debug("IS_DEFINE_LATER: " + qaContent.isDefineLater());
-	    request.getSession().setAttribute(IS_DEFINE_LATER, new Boolean(qaContent.isDefineLater()));
+	    if ( qaContent.isDefineLater() ) {
+            QaUtils.cleanUpSessionAbsolute(request);
+	    	return (mapping.findForward(DEFINE_LATER));
+	    }
 	    
 	    /*
 	     * Learning mode requires this setting for jsp to generate the user's report 
@@ -464,20 +474,6 @@
 	    	logger.debug("userId is null, it should not be, report this.");
 	    }
 	    
-        /*
-         * if the content is not ready yet, don't even proceed.
-         * check the define later status
-         */
-        Boolean defineLater=(Boolean)request.getSession().getAttribute(IS_DEFINE_LATER);
-        logger.debug("learning-defineLater: " + defineLater);
-        if (defineLater.booleanValue() == true)
-        {
-            QaUtils.cleanUpSessionAbsolute(request);
-			persistError(request,"error.defineLater");
-			request.getSession().setAttribute(USER_EXCEPTION_CONTENT_DEFINE_LATER, new Boolean(true).toString());
-			return (mapping.findForward(ERROR_LIST_LEARNER));
-        }
-        
     	/*
     	 * present user with the questions.
     	 */
Index: lams_tool_laqa/web/QaErrorBox.jsp
===================================================================
diff -u -r3ecb833c87586c3a5ea364bbb1632c872f7011cb -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_laqa/web/QaErrorBox.jsp	(.../QaErrorBox.jsp)	(revision 3ecb833c87586c3a5ea364bbb1632c872f7011cb)
+++ lams_tool_laqa/web/QaErrorBox.jsp	(.../QaErrorBox.jsp)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -20,12 +20,6 @@
 --%>
 
 	<table>
-		<c:if test="${userExceptionContentDefineLater == 'true'}"> 			
-			<tr> <td NOWRAP valign=top>
-						<bean:message key="error.defineLater"/> 
-			</td> </tr>
-		</c:if> 				    
-
 		<c:if test="${userExceptionContentDoesNotExist == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
 						 <bean:message key="error.content.doesNotExist"/> 
Index: lams_tool_laqa/web/WEB-INF/lams.tld
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_laqa/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_laqa/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -310,5 +310,8 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-
+	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
 </taglib>
Index: lams_tool_laqa/web/WEB-INF/struts-config.xml
===================================================================
diff -u -re4b11d5f2ee68909df09e749152768bd5006aa88 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_laqa/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision e4b11d5f2ee68909df09e749152768bd5006aa88)
+++ lams_tool_laqa/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -223,6 +223,12 @@
 		    redirect="false"
 	      />
 	      
+	  	<forward
+		    name="defineLater"
+	        path="/learning/defineLater.jsp"
+		    redirect="false"
+	  	/>
+
 		<forward
 		    name="errorListLearner"
 		    path="/QaErrorBox.jsp"
Index: lams_tool_laqa/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/DefineLater.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/DefineLater.tag	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -0,0 +1,55 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * DefineLater.tag
+  *	Author: Fiona Malikoff
+  *	Description: Layout for "Define Later" screens - to be used in learning.
+  *  A suggested layout - unless the tool has special requirements, this layout should be used.
+  *  Expects to be used inside <div id="content"></div>
+  */
+%>
+
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true" %>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty defineLaterMessageKey}">
+	<c:set var="defineLaterMessageKey" value="define.later.message"/>
+</c:if>
+<c:if test="${empty buttonTryAgainKey}">
+	<c:set var="buttonTryAgainKey" value="button.try.again"/>
+</c:if>
+
+<p>&nbsp;</p>
+
+<p><fmt:message key="${defineLaterMessageKey}" />
+
+<div class="right-buttons">
+	<a href="javascript:location.reload(true);" class="button"><fmt:message key="${buttonTryAgainKey}" /></a>
+</div>
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
diff -u -re4b11d5f2ee68909df09e749152768bd5006aa88 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision e4b11d5f2ee68909df09e749152768bd5006aa88)
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -70,40 +70,31 @@
 				<html:errors/>
 			</td></tr>
 
-			<c:if test="${sessionScope.isDefineLater == 'true'}"> 			
+			<c:if test="${sessionScope.isToolActivityOffline == 'true'}"> 			
 				<tr> <td NOWRAP>
-					<bean:message key="error.defineLater"/>
+					<bean:message key="label.learning.forceOfflineMessage"/>
 				</td></tr>
 			</c:if> 		
-
-			
-			<c:if test="${sessionScope.isDefineLater == 'false'}"> 			
-				<c:if test="${sessionScope.isToolActivityOffline == 'true'}"> 			
-					<tr> <td NOWRAP>
-						<bean:message key="label.learning.forceOfflineMessage"/>
-					</td></tr>
-				</c:if> 		
-			
-				<c:if test="${sessionScope.isToolActivityOffline == 'false'}"> 			
-					<tr><td NOWRAP>
-						<c:out value="${sessionScope.activityInstructions}" escapeXml="false"/> 
-					</td></tr>
 		
-					<tr> <td NOWRAP>
-						 <c:out value="${sessionScope.userFeedback}" escapeXml="true"/> 
-					</td></tr>
-				
-					<c:choose> 
-					  <c:when test="${sessionScope.questionListingMode == sessionScope.questionListingModeSequential}" > 
-							<jsp:include page="/learning/SequentialAnswersContent.jsp" /> 
+			<c:if test="${sessionScope.isToolActivityOffline == 'false'}"> 			
+				<tr><td NOWRAP>
+					<c:out value="${sessionScope.activityInstructions}" escapeXml="false"/> 
+				</td></tr>
+	
+				<tr> <td NOWRAP>
+					 <c:out value="${sessionScope.userFeedback}" escapeXml="true"/> 
+				</td></tr>
+			
+				<c:choose> 
+				  <c:when test="${sessionScope.questionListingMode == sessionScope.questionListingModeSequential}" > 
+						<jsp:include page="/learning/SequentialAnswersContent.jsp" /> 
 					  </c:when> 
 
 					  <c:otherwise>
 						  	<jsp:include page="/learning/CombinedAnswersContent.jsp" /> 
-					  </c:otherwise>
-					</c:choose> 
-				</c:if> 		
-		  	</c:if> 		
+				  </c:otherwise>
+				</c:choose> 
+			</c:if> 		
 	 	</table>
 	</html:form>
 </div>
Index: lams_tool_laqa/web/learning/defineLater.jsp
===================================================================
diff -u
--- lams_tool_laqa/web/learning/defineLater.jsp	(revision 0)
+++ lams_tool_laqa/web/learning/defineLater.jsp	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -0,0 +1,65 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<html:html>
+<head>
+	<html:base />
+	<lams:headItems />
+	<title><bean:message key="activity.title" /></title>
+</head>
+
+<body>
+	<div id="page-learner">
+	
+	<h1 class="no-tabs-below">&nbsp;</h1>
+	
+	<div id="header-no-tabs-learner"></div>
+	
+	<div id="content-learner">
+		<lams:DefineLater defineLaterMessageKey="error.defineLater"/>
+	</div>
+	
+	<div id="footer-learner"></div>
+
+
+</div>
+</body>
+</html:html>
+
+
+
+
+
+
+
+
Index: lams_tool_larsrc/conf/language/ApplicationResources.properties
===================================================================
diff -u -rdd8218cfa50710015a253505c93a4070e6b29435 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_larsrc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision dd8218cfa50710015a253505c93a4070e6b29435)
+++ lams_tool_larsrc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -180,7 +180,7 @@
 
 
 #======= New labels: after 08/06/2006 =============
-define.later.message=Please wait for the teacher to define this part.
+define.later.message=Please wait for the teacher to complete the contents of this activity.
 run.offline.message=This activity is not being done on the computer. Please see your instructor for details.
 message.monitoring.summary.no.resource.for.group=No resource available for this group.
 button.try.again=Try again
Index: lams_tool_larsrc/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/DefineLater.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/DefineLater.tag	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -0,0 +1,55 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * DefineLater.tag
+  *	Author: Fiona Malikoff
+  *	Description: Layout for "Define Later" screens - to be used in learning.
+  *  A suggested layout - unless the tool has special requirements, this layout should be used.
+  *  Expects to be used inside <div id="content"></div>
+  */
+%>
+
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true" %>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty defineLaterMessageKey}">
+	<c:set var="defineLaterMessageKey" value="define.later.message"/>
+</c:if>
+<c:if test="${empty buttonTryAgainKey}">
+	<c:set var="buttonTryAgainKey" value="button.try.again"/>
+</c:if>
+
+<p>&nbsp;</p>
+
+<p><fmt:message key="${defineLaterMessageKey}" />
+
+<div class="right-buttons">
+	<a href="javascript:location.reload(true);" class="button"><fmt:message key="${buttonTryAgainKey}" /></a>
+</div>
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -310,5 +310,8 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-
+	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
 </taglib>
Index: lams_tool_larsrc/web/pages/learning/definelater.jsp
===================================================================
diff -u -rdd8218cfa50710015a253505c93a4070e6b29435 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_larsrc/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision dd8218cfa50710015a253505c93a4070e6b29435)
+++ lams_tool_larsrc/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -7,23 +7,23 @@
 </head>
 
 <body>
-	<table border="0" align="center" class="forms" width="95%">
-		<tr>
-			<td>
-				<h1>
-					${resource.title}
-				</h1>
-				<h2>
-					${resource.instructions}
-				</h2>
-			</td>
-		</tr>
-	</table>
 
-	<div align="center">
-		<b> <fmt:message key="define.later.message" /> </b>
-		<P>
-			<a href="javascript:location.reload(true);" class="button"><b><fmt:message key="button.try.again" /></b></a>
+	<div id="page-learner">
+		<h1 class="no-tabs-below">
+			${resource.title}
+		</h1>
+		<div id="header-no-tabs-learner">
+		</div>
+		<!--closes header-->
+
+		<div id="content-learner">
+			<lams:DefineLater/>
+		</div>
+		
+		<div id="footer-learner">
+		</div>
+		<!--closes footer-->
+
 	</div>
 
 </body>
Index: lams_tool_nb/conf/language/ApplicationResources.properties
===================================================================
diff -u -r8d197d915eef154832e3bd8073e35bd974ec2c5a -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_nb/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8d197d915eef154832e3bd8073e35bd974ec2c5a)
+++ lams_tool_nb/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -29,7 +29,7 @@
 link.view  =View
 link.download  =Download
 link.delete  =Delete
-message.defineLaterSet  =Please wait for the teacher to complete the contents of this activity
+message.defineLaterSet  =Please wait for the teacher to complete the contents of this activity.
 message.runOfflineSet  =This activity is not being done on the computer. Please see your instructor for details
 message.author.defineLaterSet1  =This feature is not available in the preview mode.
 message.author.defineLaterSet2  =The teacher will set the content of this noticeboard once the lesson is in progress. Please click on the "NEXT" button below to continue
@@ -64,3 +64,5 @@
 #===== New Labels added 28/06/06
 label.save=Save
 label.cancel=Cancel
+#======= Add on 14/07/2006 =====
+button.try.again =Try again
\ No newline at end of file
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java
===================================================================
diff -u -r3743012683d8ece971118e4bfc03996fc829aa2f -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java	(.../NbLearnerStarterAction.java)	(revision 3743012683d8ece971118e4bfc03996fc829aa2f)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java	(.../NbLearnerStarterAction.java)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -75,6 +75,7 @@
  *                          handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
  * @struts:action-forward name="displayLearnerContent" path=".learnerContent"
  * @struts:action-forward name="displayMessage" path=".message"
+ * @struts:action-forward name="defineLater" path=".defineLater"
  * ----------------XDoclet Tags--------------------
  */
 
@@ -142,8 +143,12 @@
 
 	    nbUser = nbService.retrieveNbUserBySession(userID, toolSessionID);
 	    
+	    if ( isFlagSet(nbContent, NoticeboardConstants.FLAG_DEFINE_LATER) ) {
+            return mapping.findForward(NoticeboardConstants.DEFINE_LATER);
+	    }
+
 	    /*
-         * Checks to see if the defineLater or runOffline flag is set.
+         * Checks to see if the runOffline flag is set.
          * If the particular flag is set, control is forwarded to jsp page
          * displaying to the user the message according to what flag is set.
          */
Index: lams_tool_nb/web/WEB-INF/lams.tld
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_nb/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_nb/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -310,5 +310,8 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-
+	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
 </taglib>
Index: lams_tool_nb/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r160d995179aec345c5f37711392035bd1514b586 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_nb/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 160d995179aec345c5f37711392035bd1514b586)
+++ lams_tool_nb/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -76,6 +76,11 @@
         path=".message"
         redirect="false"
       />
+      <forward
+        name="defineLater"
+        path=".defineLater"
+        redirect="false"
+      />
     </action>
     <action
       path="/clearsession"
Index: lams_tool_nb/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u
--- lams_tool_nb/web/WEB-INF/tags/DefineLater.tag	(revision 0)
+++ lams_tool_nb/web/WEB-INF/tags/DefineLater.tag	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -0,0 +1,55 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * DefineLater.tag
+  *	Author: Fiona Malikoff
+  *	Description: Layout for "Define Later" screens - to be used in learning.
+  *  A suggested layout - unless the tool has special requirements, this layout should be used.
+  *  Expects to be used inside <div id="content"></div>
+  */
+%>
+
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true" %>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty defineLaterMessageKey}">
+	<c:set var="defineLaterMessageKey" value="define.later.message"/>
+</c:if>
+<c:if test="${empty buttonTryAgainKey}">
+	<c:set var="buttonTryAgainKey" value="button.try.again"/>
+</c:if>
+
+<p>&nbsp;</p>
+
+<p><fmt:message key="${defineLaterMessageKey}" />
+
+<div class="right-buttons">
+	<a href="javascript:location.reload(true);" class="button"><fmt:message key="${buttonTryAgainKey}" /></a>
+</div>
Index: lams_tool_nb/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
diff -u -r989e035306310a329c4b82e6a4f846c0ba2d3a2a -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_nb/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 989e035306310a329c4b82e6a4f846c0ba2d3a2a)
+++ lams_tool_nb/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -24,39 +24,32 @@
 <tiles-definitions>
 <!-- ============= template Definitions ====================== -->
 	<definition name=".baseDef" path="/template/template.jsp">
-		<put name="title" value="Base Template Page"/>
-		<put name="pageHeader" value = "Base Template"/>
 		<put name="header" value="/header.jsp"/>
 		<put name="content" value="/template/baseContent.jsp" />	
 		<put name="footer" value="/footer.jsp"/>	
 	</definition>
 	
 <!-- ============= Exception Page Definitions ====================== -->	
 	<definition name=".error" extends=".baseDef" >
-		<put name="title" value="System Error Page"/>
-		<put name="pageHeader" value = "System Exception"/>
 		<put name="content" value="/errorbox.jsp" />	
 	</definition>
 
 <!-- ============= Exception Page Definitions ====================== -->	
 	<definition name=".message" extends=".baseDef" >
-		<put name="title" value="Alert"/>
-		<put name="pageHeader" value = "Noticeboard Alert"/>
 		<put name="content" value="/message.jsp" />	
 	</definition>
 	
 <!-- ============= Noticeboard Learner Page Definitions ====================== -->	
 	<definition name=".learnerContent"  path="/template/learnerTemplate.jsp" >
-		<put name="title" value="Noticeboard"/>
-		<put name="pageHeader" value = "Noticeboard"/>
 		<put name="content" value="/learnerContent.jsp" />	
 	</definition>
+	<definition name=".defineLater"  path="/template/learnerTemplate.jsp" >
+		<put name="content" value="/defineLater.jsp" />	
+	</definition>
 	
 <!-- ============= Noticeboard Export Page Definitions ====================== -->	
 
 <definition name=".exportPortfolio" extends=".baseDef" >
-		<put name="title" value="Noticeboard"/>
-		<put name="pageHeader" value = "Noticeboard"/>
 		<put name="content" value="/exportPortfolio.jsp" />	
 	</definition>
 </tiles-definitions>
\ No newline at end of file
Index: lams_tool_nb/web/defineLater.jsp
===================================================================
diff -u
--- lams_tool_nb/web/defineLater.jsp	(revision 0)
+++ lams_tool_nb/web/defineLater.jsp	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -0,0 +1,16 @@
+<%@ include file="/includes/taglibs.jsp"%>
+
+<h1 class="no-tabs-below">&nbsp;</h1>
+
+<div id="header-no-tabs-learner"></div>
+
+<div id="content-learner">
+
+	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet"/>
+
+</div>
+
+<div id="footer-learner"></div>
+
+
+
Index: lams_tool_nb/web/header.jsp
===================================================================
diff -u -rd496758b1ea374494a5860a724b0597bf2836a68 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_nb/web/header.jsp	(.../header.jsp)	(revision d496758b1ea374494a5860a724b0597bf2836a68)
+++ lams_tool_nb/web/header.jsp	(.../header.jsp)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -1,26 +1 @@
-<%@ include file="/includes/taglibs.jsp"%>
 
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-
-<!--<tr>-->
-<!--	<td>-->
-<!--		<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="This table is being used for layout purposes only">-->
-<!--			<tr>-->
-<!--				<td width="136" height="10"></td>-->
-<!--				<td width="92%" height="10"></td>-->
-<!--			</tr>-->
-<!--			<tr bgcolor="#282871">-->
-<!--				<td width="50%" height="15" align="left">-->
-<!--					<img height=8 width=8 src="<c:out value="${lams}"/>/images/spacer.gif">-->
-<!--					<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif"><c:out value="${pageheader}" /> </font>-->
-<!--				</td>-->
-<!--				<td width="50%" height="15" align="right">-->
-<!--					<a href="<c:out value="${lams}"/>/doc/LAMS_Learner_Guide_b60.pdf" target=0> <font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif">[HELP]</font> </a>-->
-<!--					<img height=8 width=8 src="<c:out value="${lams}"/>/images/spacer.gif" alt="space image">-->
-<!--				</td>-->
-<!--			</tr>-->
-<!--		</table>-->
-<!--	</td>-->
-<!--</tr>-->
Index: lams_tool_nb/web/message.jsp
===================================================================
diff -u -rd496758b1ea374494a5860a724b0597bf2836a68 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision d496758b1ea374494a5860a724b0597bf2836a68)
+++ lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -1,21 +1,13 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
-<table cellpadding="0">
 	<logic:messagesPresent message="true">
 		<html:messages id="message" message="true">
-			<tr>
-				<td>
-					<bean:write name="message" />
-				</td>
-			</tr>
+			<p class="warning"><bean:write name="message" /></p>
 		</html:messages>
 	</logic:messagesPresent>
 
-	<tr>
-		<td align="right">
-			<html:button property="closeWindow" onclick="window.close()" styleClass="button">
+	<p align="right">
+		<html:button property="closeWindow" onclick="window.close()" styleClass="button">
 				<fmt:message key="button.next" />
-			</html:button>
-		</td>
-	</tr>
-</table>
+		</html:button>
+	</p>
Index: lams_tool_nb/web/template/learnerTemplate.jsp
===================================================================
diff -u -r989e035306310a329c4b82e6a4f846c0ba2d3a2a -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_nb/web/template/learnerTemplate.jsp	(.../learnerTemplate.jsp)	(revision 989e035306310a329c4b82e6a4f846c0ba2d3a2a)
+++ lams_tool_nb/web/template/learnerTemplate.jsp	(.../learnerTemplate.jsp)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -12,14 +12,14 @@
 
 <html:html>
 <head>
-	<html:base />
-	<lams:headItems />
-	<title><fmt:message key="activity.title" /></title>
+	<lams:css />
+	<title><fmt:message key="activity.title"/></title>
 </head>
 
 <body>
-	<div id="page-learner">
-		<tiles:insert attribute="content" />
-	</div>
+<div id="page-learner"><!--main box 'page'-->
+
+	<tiles:insert attribute="content" />
+	
 </body>
 </html:html>
Index: lams_tool_nb/web/template/template.jsp
===================================================================
diff -u -rd496758b1ea374494a5860a724b0597bf2836a68 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_nb/web/template/template.jsp	(.../template.jsp)	(revision d496758b1ea374494a5860a724b0597bf2836a68)
+++ lams_tool_nb/web/template/template.jsp	(.../template.jsp)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -12,28 +12,25 @@
 
 <html:html>
 <head>
-	<html:base />
 	<lams:headItems />
 	<title><fmt:message key="activity.title" /></title>
 </head>
 
 <body>
-	<div id="page">
-		<c:set var="pageheader" scope="session">
-			<tiles:getAsString name="pageHeader" />
-		</c:set>
+	<div id="page-learner">
 
 		<h1 class="no-tabs-below">
-			<c:out value="${sessionScope.pageheader}" />
+			<fmt:message key="activity.title" />
 		</h1>
 
-		<div id="header-no-tabs"></div>
+		<div id="header-no-tabs-learner">
+		</div>
 
 		<div id="content">
 			<tiles:insert attribute="content" />
 		</div>
 
-		<div id="footer">
+		<div id="footer-learner">
 		</div>
 	</div>
 </body>
Index: lams_tool_sbmt/conf/language/ApplicationResources.properties
===================================================================
diff -u -rfa9a7729c95cc646e7bb7597de25a426f77815a2 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_sbmt/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision fa9a7729c95cc646e7bb7597de25a426f77815a2)
+++ lams_tool_sbmt/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -103,7 +103,7 @@
 authoring.msg.cancel.save=Do you want to close this window without saving?
 
 #======= New labels: after 08/06/2006 =============
-define.later.message=Please wait for the teacher to define this part.
+define.later.message=Please wait for the teacher to complete the contents of this activity.
 run.offline.message=This activity is not being done on the computer. Please see your instructor for details.
 message.monitoring.edit.activity.not.editable=This Activity is no longer editable
 button.try.again=Try again
Index: lams_tool_sbmt/web/learner/definelater.jsp
===================================================================
diff -u -r57ad9e30968d656d121271f57faab209df611255 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_sbmt/web/learner/definelater.jsp	(.../definelater.jsp)	(revision 57ad9e30968d656d121271f57faab209df611255)
+++ lams_tool_sbmt/web/learner/definelater.jsp	(.../definelater.jsp)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -25,18 +25,7 @@
 		<div id="header-no-tabs-learner"></div>
 
 		<div id="content-learner">
-			<table>
-				<tr>
-					<td>
-						<p>
-							<fmt:message key="define.later.message" />
-						</p>
-						<div class="right-buttons">
-							<a href="javascript:location.reload(true);" class="button"><fmt:message key="button.try.again" /></a>
-						</div>
-					</td>
-				</tr>
-			</table>
+			<lams:DefineLater/>
 		</div>
 		<div id="footer-learner"></div>
 	</div>
Index: lams_tool_vote/conf/language/ApplicationResources.properties
===================================================================
diff -u -re48a67de27af42221ddce80419f05c1be4680430 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_vote/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e48a67de27af42221ddce80419f05c1be4680430)
+++ lams_tool_vote/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -91,7 +91,7 @@
 label.learner.nominations  =Your nominations are:
 label.learning.forceOfflineMessage  =This is an offline activity. Please see your instructor for details.
 label.learning.runOffline  =This activity is not being done on the computer. Please see your instructor for details.
-error.defineLater  =Sorry, the activity's content is not ready yet. Please wait for the teacher to define this part.
+error.defineLater  =Please wait for the teacher to complete the contents of this activity.
 error.toolSessionId.required  =Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a toolSession id.
 error.contentId.required  =Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a content id.
 error.defaultContent.notSetup  =Tool Activity Error! Can't continue. The default content for the tool has not been setup properly.
@@ -139,4 +139,6 @@
 
 #======= End labels: Exported 96 labels for en AU =====
 #======= Add on 16/05/2006 =====
-authoring.msg.cancel.save=Do you want to close this window without saving?
\ No newline at end of file
+authoring.msg.cancel.save=Do you want to close this window without saving?
+#======= Add on 14/07/2006 =====
+button.try.again=Try again
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
===================================================================
diff -u -r6ccf686e9130dce846ee9229dd7a607277f02437 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	(.../VoteAppConstants.java)	(revision 6ccf686e9130dce846ee9229dd7a607277f02437)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	(.../VoteAppConstants.java)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -277,7 +277,6 @@
     public static final String USER_EXCEPTION_CONTENT_IN_USE			="userExceptionContentInUse";
     public static final String USER_EXCEPTION_CONTENT_BEING_MODIFIED	="userExceptionContentBeingModified";
     public static final String USER_EXCEPTION_CONTENT_RUNOFFLINE		="userExceptionContentRunOffline";
-    public static final String USER_EXCEPTION_CONTENT_DEFINE_LATER		="userExceptionContentDefineLater";
     public static final String USER_EXCEPTION_MODE_INVALID				="userExceptionModeInvalid";
     public static final String USER_EXCEPTION_QUESTION_EMPTY			="userExceptionQuestionEmpty";
     public static final String USER_EXCEPTION_ANSWER_EMPTY				="userExceptionAnswerEmpty";
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java
===================================================================
diff -u -r578183182c3aa8d836f7c4ff61886137fb71bcf2 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java	(.../VoteUtils.java)	(revision 578183182c3aa8d836f7c4ff61886137fb71bcf2)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java	(.../VoteUtils.java)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -517,7 +517,6 @@
     	request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_IN_USE);
     	request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_BEING_MODIFIED);
     	request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_RUNOFFLINE);
-    	request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_DEFINE_LATER);
     	request.getSession().removeAttribute(USER_EXCEPTION_MODE_INVALID);
     	request.getSession().removeAttribute(USER_EXCEPTION_QUESTION_EMPTY);
     	request.getSession().removeAttribute(USER_EXCEPTION_ANSWER_EMPTY);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java
===================================================================
diff -u -r6ccf686e9130dce846ee9229dd7a607277f02437 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision 6ccf686e9130dce846ee9229dd7a607277f02437)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -266,10 +266,7 @@
     if (isDefineLater == true)
     {
     	VoteUtils.cleanUpSessionAbsolute(request);
-    	request.getSession().setAttribute(USER_EXCEPTION_CONTENT_DEFINE_LATER, new Boolean(true).toString());
-    	logger.debug("warning to learner: the activity is defineLater, we interpret that the content is being modified.");
-    	persistInRequestError(request,"error.defineLater");
-    	return (mapping.findForward(ERROR_LIST));
+	    return (mapping.findForward(DEFINE_LATER));
     }
 
     /*
Index: lams_tool_vote/web/WEB-INF/lams.tld
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_vote/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_vote/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -310,5 +310,8 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-
+	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
 </taglib>
Index: lams_tool_vote/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r6ccf686e9130dce846ee9229dd7a607277f02437 -r9393c098e5dfd603e2d37347cd1e531a25aa424a
--- lams_tool_vote/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 6ccf686e9130dce846ee9229dd7a607277f02437)
+++ lams_tool_vote/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -270,6 +270,12 @@
 	      
 
 	  	<forward
+		    name="defineLater"
+	        path="/learning/defineLater.jsp"
+		    redirect="false"
+	  	/>
+
+	  	<forward
 		    name="errorList"
 	        path="/VoteErrorBox.jsp"
 		    redirect="false"
Index: lams_tool_vote/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/DefineLater.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/DefineLater.tag	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -0,0 +1,55 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * DefineLater.tag
+  *	Author: Fiona Malikoff
+  *	Description: Layout for "Define Later" screens - to be used in learning.
+  *  A suggested layout - unless the tool has special requirements, this layout should be used.
+  *  Expects to be used inside <div id="content"></div>
+  */
+%>
+
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true" %>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty defineLaterMessageKey}">
+	<c:set var="defineLaterMessageKey" value="define.later.message"/>
+</c:if>
+<c:if test="${empty buttonTryAgainKey}">
+	<c:set var="buttonTryAgainKey" value="button.try.again"/>
+</c:if>
+
+<p>&nbsp;</p>
+
+<p><fmt:message key="${defineLaterMessageKey}" />
+
+<div class="right-buttons">
+	<a href="javascript:location.reload(true);" class="button"><fmt:message key="${buttonTryAgainKey}" /></a>
+</div>
Index: lams_tool_vote/web/learning/defineLater.jsp
===================================================================
diff -u
--- lams_tool_vote/web/learning/defineLater.jsp	(revision 0)
+++ lams_tool_vote/web/learning/defineLater.jsp	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
@@ -0,0 +1,65 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<html:html>
+<head>
+	<html:base />
+	<lams:headItems />
+	<title><bean:message key="activity.title" /></title>
+</head>
+
+<body>
+	<div id="page-learner">
+	
+	<h1 class="no-tabs-below">&nbsp;</h1>
+	
+	<div id="header-no-tabs-learner"></div>
+	
+	<div id="content-learner">
+		<lams:DefineLater defineLaterMessageKey="error.defineLater"/>
+	</div>
+	
+	<div id="footer-learner"></div>
+
+
+</div>
+</body>
+</html:html>
+
+
+
+
+
+
+
+