Index: lams_tool_forum/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/build.xml,v
diff -u -r1.39 -r1.40
--- lams_tool_forum/build.xml	12 May 2006 05:14:21 -0000	1.39
+++ lams_tool_forum/build.xml	8 Jun 2006 07:37:34 -0000	1.40
@@ -271,6 +271,7 @@
 				<include name="includes/**"/>
 				<include name="images/**"/>
 				<include name="jsps/**"/> 
+				<include name="common/**"/> 
 			</fileset>
 		</war>
 	</target>
Index: lams_tool_forum/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.4 -r1.5
--- lams_tool_forum/conf/language/ApplicationResources.properties	12 May 2006 05:14:21 -0000	1.4
+++ lams_tool_forum/conf/language/ApplicationResources.properties	8 Jun 2006 07:37:34 -0000	1.5
@@ -142,4 +142,5 @@
 #======= End labels: Exported 130 labels for en AU =====
 #======= New labels: after 12/05/2006 =============
 authoring.msg.cancel.save=Do you want to close this window without saving?
-
+define.later.message=Please wait for the teacher to define this part.
+run.offline.message=This activity is not being done on the computer. Please see your instructor for details.
Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/xdoclet/struts-actions.xml,v
diff -u -r1.29 -r1.30
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	12 May 2006 05:14:21 -0000	1.29
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	8 Jun 2006 07:37:32 -0000	1.30
@@ -9,7 +9,7 @@
 		</action>
    		
 		<!-- ========== BEGIN: Authroing Definitions ============================== -->
-		<action path="/authoring/init"
+		<action path="/authoring"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
 			scope="session" 
@@ -67,17 +67,17 @@
 		<action path="/authoring/newTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			parameter="newTopic">
-			<forward name="success" path="tiles:/authoring/forum/newTopic" />
+			<forward name="success" path="/jsps/authoring/message/create.jsp" />
 		</action>
 		
 		<action path="/authoring/createTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="messageForm" 
 			validate="true"
-			input="tiles:/authoring/forum/newTopic" 
+			input="/jsps/authoring/message/create.jsp" 
 			parameter="createTopic"
 			scope="request">
-			<forward name="success" path="tiles:/authoring/forum/newTopic" />
+			<forward name="success" path="/jsps/authoring/message/create.jsp" />
 		</action>
 		
 		<action path="/authoring/deleteTopic"
@@ -92,7 +92,7 @@
 			validate="false"
 			parameter="viewTopic"
 			scope="request">
-			<forward name="success" path="tiles:/authoring/forum/viewTopic" />
+			<forward name="success" path="/jsps/authoring/message/view.jsp" />
 		</action>
 		
 		<action path="/authoring/editTopic"
@@ -101,7 +101,7 @@
 			validate="false"
 			parameter="editTopic"
 			scope="session">
-			<forward name="success" path="tiles:/authoring/forum/editTopic" />
+			<forward name="success" path="/jsps/authoring/message/edit.jsp" />
 			<forward name="forbidden" path="tiles:/authoring/forum/forbiddenEditTopic" />
 		</action>
 		
@@ -111,14 +111,14 @@
 			validate="false"
 			parameter="deleteAttachment"
 			scope="session">
-			<forward name="success" path="tiles:/authoring/forum/editTopic" />
+			<forward name="success" path="/jsps/authoring/message/edit.jsp" />
 		</action>
 		
 		<action path="/authoring/updateTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="messageForm" 
 			validate="true"
-			input="tiles:/authoring/forum/editTopic" 
+			input="/jsps/authoring/message/edit.jsp" 
 			parameter="updateTopic"
 			scope="session">
 			<forward name="success" path="/authoring/viewTopic.do" />
@@ -148,6 +148,8 @@
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
 			parameter="viewForum" scope="request" name="emptyForm">
 			<forward name="success" path="tiles:/learning/forum/viewForum" />
+			<forward name="defineLater" path="tiles:/learning/forum/defineLater" />
+			<forward name="runOffline" path="tiles:/learning/forum/runOffline" />
 		</action>
 		<action path="/learning/viewTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
@@ -285,6 +287,7 @@
 			parameter="viewTopic">
 			<forward name="success" path="tiles:/monitoring/forum/viewTopic" />
 		</action>
+
 		<!-- ========== END: Monitoring  Definitions ============================== -->
 		<!-- System level actions -->
 		<action path="/index" type="org.apache.struts.actions.ForwardAction"
Index: lams_tool_forum/db/sql/tool_insert.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/tool_insert.sql,v
diff -u -r1.19 -r1.20
--- lams_tool_forum/db/sql/tool_insert.sql	27 Mar 2006 22:24:32 -0000	1.19
+++ lams_tool_forum/db/sql/tool_insert.sql	8 Jun 2006 07:37:35 -0000	1.20
@@ -42,7 +42,7 @@
 'tool/lafrum11/learning/viewForum.do?mode=learner',
 'tool/lafrum11/learning/viewForum.do?mode=author',
 'tool/lafrum11/learning/viewForum.do?mode=teacher',
-'tool/lafrum11/authoring/init.do',
+'tool/lafrum11/authoring.do',
 'tool/lafrum11/monitoring.do',
 'tool/lafrum11/defineLater.do',
 'tool/lafrum11/exportPortfolio?mode=learner',
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v
diff -u -r1.51 -r1.52
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	7 Jun 2006 06:05:48 -0000	1.51
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	8 Jun 2006 07:37:34 -0000	1.52
@@ -568,6 +568,7 @@
 			throw new ToolException("No found tool content by given content ID:" + toolContentId);
 		}
 		forum.setDefineLater(true);
+		forum.setContentInUse(false);
 		forumDao.flush();
 	}
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java,v
diff -u -r1.37 -r1.38
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	12 May 2006 05:14:21 -0000	1.37
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	8 Jun 2006 07:37:34 -0000	1.38
@@ -51,6 +51,7 @@
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
 import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
@@ -83,13 +84,15 @@
 		String param = mapping.getParameter();
 		//-----------------------Forum Author function ---------------------------
 	  	if (param.equals("initPage")) {
-	  		request.getSession().setAttribute(ForumConstants.MODE,ForumConstants.AUTHOR_MODE);
+	  		request.getSession().setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.AUTHOR);
        		return initPage(mapping, form, request, response);
         }
-	  	if (param.equals("monitoringInitPage")) {
-	  		request.getSession().setAttribute(ForumConstants.MODE,ForumConstants.MONITOR_MODE);
-	  		return initPage(mapping, form, request, response);
-	  	}
+
+		// ***************** Monitoring define later screen ********************
+		if (param.equals("defineLater")){
+			request.getSession().setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.TEACHER);
+       		return initPage(mapping, form, request, response);
+		}
         if (param.equals("updateContent")) {
        		return updateContent(mapping, form, request, response);
         }
@@ -138,6 +141,7 @@
 	//******************************************************************************************************************
 	//              Forum Author functions
 	//******************************************************************************************************************
+
 	/**
 	 * This page will display initial submit tool content. Or just a blank page if the toolContentID does not
 	 * exist before. 
@@ -212,6 +216,7 @@
 	public ActionForward updateContent(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 
+		ToolAccessMode mode = (ToolAccessMode) request.getSession().getAttribute(AttributeNames.ATTR_MODE);
 		ForumForm forumForm = (ForumForm)(form);
 		
 		Forum forum = forumForm.getForum();
@@ -236,10 +241,16 @@
 				forumPO = forum;
 				forumPO.setContentId(forumForm.getToolContentID());
 			}else{
-				Long uid = forumPO.getUid();
-				PropertyUtils.copyProperties(forumPO,forum);
-				//get back UID
-				forumPO.setUid(uid);
+				if(mode.isAuthor()){
+					Long uid = forumPO.getUid();
+					PropertyUtils.copyProperties(forumPO,forum);
+					//get back UID
+					forumPO.setUid(uid);
+				}else{
+//					if it is Teacher, then just update basic tab content (definelater)
+					forumPO.setInstructions(forum.getInstructions());
+					forumPO.setTitle(forum.getTitle());
+				}
 			}
 			forumPO.setCreatedBy(forumUser);
 			
@@ -323,9 +334,9 @@
 			log.error(e);
 		}
 		
-    	String mode = (String) request.getSession().getAttribute(ForumConstants.MODE);
+		
     	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,Boolean.TRUE);
-    	if(StringUtils.equals(mode,ForumConstants.AUTHOR_MODE))
+    	if(mode.isAuthor())
     		return mapping.findForward("author");
     	else
     		return mapping.findForward("monitor");
@@ -802,8 +813,8 @@
     public ActionForward refreshTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
     		HttpServletResponse response) throws PersistenceException {
 
-    	String mode = (String) request.getSession().getAttribute(ForumConstants.MODE);
-    	if(StringUtils.equals(mode,ForumConstants.AUTHOR_MODE))
+    	ToolAccessMode mode = (ToolAccessMode) request.getSession().getAttribute(AttributeNames.ATTR_MODE);
+    	if(mode.isAuthor())
     		return mapping.findForward("author");
     	else
     		return mapping.findForward("monitor");
@@ -824,8 +835,8 @@
 		}
     	forum.setMessages(msgSet);
     	
-    	String mode = (String) request.getSession().getAttribute(ForumConstants.MODE);
-    	if(StringUtils.equals(mode,ForumConstants.AUTHOR_MODE))
+    	ToolAccessMode mode = (ToolAccessMode) request.getSession().getAttribute(AttributeNames.ATTR_MODE);
+    	if(mode.isAuthor())
     		return mapping.findForward("author");
     	else
     		return mapping.findForward("monitor");
@@ -892,5 +903,4 @@
 		}
 		return list;
 	}
-
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v
diff -u -r1.29 -r1.30
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	8 Jun 2006 01:01:04 -0000	1.29
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	8 Jun 2006 07:37:33 -0000	1.30
@@ -169,10 +169,20 @@
 					+ sessionId);
 			return mapping.findForward("error");
 		}
-		Long forumId = session.getForum().getUid();
-		Boolean allowEdit = new Boolean(session.getForum().isAllowEdit());
-		Boolean allowRichEditor = new Boolean(session.getForum()
-				.isAllowRichEditor());
+		
+		Forum forum = session.getForum();
+		//add define later support
+		if(forum.isDefineLater()){
+			return mapping.findForward("defineLater");
+		}
+		//add run offline support
+		if(forum.getRunOffline()){
+			return mapping.findForward("runOffline");
+		}
+		
+		Long forumId = forum.getUid();
+		Boolean allowEdit = new Boolean(forum.isAllowEdit());
+		Boolean allowRichEditor = new Boolean(forum.isAllowRichEditor());
 		int allowNumber = session.getForum().getLimitedChar();
 		request.getSession().setAttribute(ForumConstants.FORUM_ID, forumId);
 		request.getSession().setAttribute(ForumConstants.ALLOW_EDIT, allowEdit);
@@ -190,6 +200,12 @@
 		// get all root topic to display on init page
 		List rootTopics = forumService.getRootTopics(sessionId);
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, rootTopics);
+		
+		//set contentInUse flag to true!
+		forum.setContentInUse(true);
+		forum.setDefineLater(false);
+		forumService.updateForum(forum);
+		
 		return mapping.findForward("success");
 	}
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java,v
diff -u -r1.17 -r1.18
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	6 Apr 2006 06:40:40 -0000	1.17
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	8 Jun 2006 07:37:33 -0000	1.18
@@ -106,12 +106,8 @@
 		return mapping.findForward("error");
 	}
 	
-    /**
-     * Default ActionForward for Monitor
-     *  (non-Javadoc)
-     * @see org.apache.struts.actions.DispatchAction#unspecified(org.apache.struts.action.ActionMapping, org.apache.struts.action.ActionForm, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
-     */
-	
+
+
 	/**
 	 * The initial method for monitoring
 	 */
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_forum/web/lams.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.33 -r1.34
--- lams_tool_forum/web/WEB-INF/struts-config.xml	12 May 2006 05:14:21 -0000	1.33
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	8 Jun 2006 07:37:34 -0000	1.34
@@ -57,7 +57,7 @@
 			<forward name="success" path="tiles:/monitoring/forum/defineLater" />
 		</action>
 		<!-- ========== BEGIN: Authroing Definitions ============================== -->
-		<action path="/authoring/init"
+		<action path="/authoring"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
 			scope="session" 
@@ -110,7 +110,7 @@
 		<action path="/authoring/newTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			parameter="newTopic">
-			<forward name="success" path="tiles:/authoring/forum/newTopic" />
+			<forward name="success" path="/jsps/authoring/message/create.jsp" />
 		</action>
 		<action path="/authoring/createTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
@@ -119,7 +119,7 @@
 			input="tiles:/authoring/forum/newTopic" 
 			parameter="createTopic"
 			scope="request">
-			<forward name="success" path="tiles:/authoring/forum/newTopic" />
+			<forward name="success" path="/jsps/authoring/message/create.jsp" />
 		</action>
 		<action path="/authoring/deleteTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
@@ -132,15 +132,15 @@
 			validate="false"
 			parameter="viewTopic"
 			scope="request">
-			<forward name="success" path="tiles:/authoring/forum/viewTopic" />
+			<forward name="success" path="/jsps/authoring/message/view.jsp" />
 		</action>
 		<action path="/authoring/editTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="messageForm" 
 			validate="false"
 			parameter="editTopic"
 			scope="session">
-			<forward name="success" path="tiles:/authoring/forum/editTopic" />
+			<forward name="success" path="/jsps/authoring/message/edit.jsp" />
 			<forward name="forbidden" path="tiles:/authoring/forum/forbiddenEditTopic" />
 		</action>
 		<action path="/authoring/deleteAttachment"
@@ -149,13 +149,13 @@
 			validate="false"
 			parameter="deleteAttachment"
 			scope="session">
-			<forward name="success" path="tiles:/authoring/forum/editTopic" />
+			<forward name="success" path="/jsps/authoring/message/edit.jsp" />
 		</action>
 		<action path="/authoring/updateTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="messageForm" 
 			validate="true"
-			input="tiles:/authoring/forum/editTopic" 
+			input="/jsps/authoring/message/edit.jsp" 
 			parameter="updateTopic"
 			scope="session">
 			<forward name="success" path="/authoring/viewTopic.do" />
@@ -182,6 +182,8 @@
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
 			parameter="viewForum" scope="request" name="emptyForm">
 			<forward name="success" path="tiles:/learning/forum/viewForum" />
+			<forward name="defineLater" path="tiles:/learning/forum/defineLater" />
+			<forward name="runOffline" path="tiles:/learning/forum/runOffline" />
 		</action>
 		<action path="/learning/viewTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
@@ -311,6 +313,7 @@
 			parameter="viewTopic">
 			<forward name="success" path="tiles:/monitoring/forum/viewTopic" />
 		</action>
+
 		<!-- ========== END: Monitoring  Definitions ============================== -->
 		<!-- System level actions -->
 		<action path="/index" type="org.apache.struts.actions.ForwardAction"
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.22 -r1.23
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	7 Apr 2006 00:37:08 -0000	1.22
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	8 Jun 2006 07:37:35 -0000	1.23
@@ -61,11 +61,7 @@
     	<put name="body" value="/jsps/authoring/authoring.jsp"/>
 	</definition>
 	
-	<definition name="tiles:/monitoring/forum/defineLater" extends="tiles:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.definelater"/>
-    	<put name="body" value="/jsps/monitoring/definelater.jsp"/>
-	</definition>
-	
+	<!-- 
     <definition name="tiles:/authoring/forum/newTopic" extends="tiles:layout">
     	<put name="pageTitleKey" value="title.message.add"/>
     	<put name="body" value="/jsps/authoring/message/create.jsp"/>
@@ -78,10 +74,12 @@
     	<put name="pageTitleKey" value="title.message.edit"/>
     	<put name="body" value="/jsps/authoring/message/edit.jsp"/>
 	</definition>
+	-->
 	<definition name="tiles:/authoring/forum/forbiddenEditTopic" extends="tiles:layout">
     	<put name="pageTitleKey" value="title.message.edit"/>
     	<put name="body" value="/jsps/authoring/message/forbiddenedit.jsp"/>
 	</definition>
+	
 	<!-- E: Authoring -->
 
 	<!-- B: Learning -->
@@ -90,6 +88,14 @@
     	<put name="pageTitleKey" value="title.message.view"/>
     	<put name="body" value="/jsps/learning/viewforum.jsp"/>
 	</definition>
+	<definition name="tiles:/learning/forum/runOffline" extends="tiles:layout">
+    	<put name="pageTitleKey" value="title.message.view"/>
+    	<put name="body" value="/jsps/learning/runoffline.jsp"/>
+	</definition>
+	<definition name="tiles:/learning/forum/defineLater" extends="tiles:layout">
+    	<put name="pageTitleKey" value="title.message.view"/>
+    	<put name="body" value="/jsps/learning/definelater.jsp"/>
+	</definition>
 	
 	<definition name="tiles:/learning/forum/viewTopic" extends="tiles:layout">
     	<put name="pageTitleKey" value="title.message.view.topic"/>
@@ -119,6 +125,13 @@
 		<put name="header" value="/includes/header.jsp"/>    	
     	<put name="body" value="/jsps/monitoring/monitoring.jsp"/>
 	</definition>
+	
+	<definition name="tiles:/monitoring/forum/defineLater" extends="tiles:tab:layout">
+    	<put name="pageTitleKey" value="page.title.monitoring.definelater"/>
+    	<put name="header" value="/includes/authoringHeader.jsp"/>
+    	<put name="body" value="/jsps/authoring/definelater.jsp"/>
+	</definition>
+	
 	<definition name="tiles:/monitoring/forum/viewAllMarks" extends="tiles:layout">
     	<put name="pageTitleKey" value="page.title.monitoring.view.user.mark"/>
     	<put name="body" value="/jsps/monitoring/viewallmarks.jsp"/>
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	19 May 2006 00:16:16 -0000	1.2
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	8 Jun 2006 07:37:32 -0000	1.3
@@ -44,6 +44,7 @@
 <%@ attribute name="cancelButtonLabelKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="cancelConfirmMsgKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="defineLater" required="false" rtexprvalue="false" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty cancelButtonLabelKey}">
@@ -62,22 +63,22 @@
 <!-- begin tab content -->
 <script type="text/javascript">
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+       	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}'/>";
+	}
+    function doSubmit_Form_Only() {
+    	document.getElementById("${formID}").submit();
+    }
+    function doCancel() {
+    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}'/>";
+        	//just for depress alert window when call window.close()
+        	//only available for IE browser
+        	var userAgent=navigator.userAgent;
+        	if(userAgent.indexOf('MSIE') != -1)
+	        	window.opener = "authoring"
+        	window.close();
 		}
-        function doSubmit_Form_Only() {
-        	document.getElementById("${formID}").submit();
-        }
-        function doCancel() {
-        	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-	        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}'/>";
-	        	//just for depress alert window when call window.close()
-	        	//only available for IE browser
-	        	var userAgent=navigator.userAgent;
-	        	if(userAgent.indexOf('MSIE') != -1)
-		        	window.opener = "authoring"
-	        	window.close();
-			}
-        }  				
+    }  				
 </script>				
 <p align="right">
 	<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button">
Index: lams_tool_forum/web/common/fckeditorheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/common/Attic/fckeditorheader.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/web/common/fckeditorheader.jsp	8 Jun 2006 07:37:32 -0000	1.1
@@ -0,0 +1,5 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
+<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
Index: lams_tool_forum/web/common/footer.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/common/footer.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/web/common/footer.jsp	8 Jun 2006 07:37:32 -0000	1.1
@@ -0,0 +1 @@
+<br />
Index: lams_tool_forum/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/common/header.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/web/common/header.jsp	8 Jun 2006 07:37:32 -0000	1.1
@@ -0,0 +1,33 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
+
+
+<!-- HTTP 1.1 -->
+<meta http-equiv="Cache-Control" content="no-store" />
+<!-- HTTP 1.0 -->
+<meta http-equiv="Pragma" content="no-cache" />
+<!-- Prevents caching at the Proxy Server -->
+<meta http-equiv="Expires" content="0" />
+
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+<!-- ********************  CSS ********************** -->
+<lams:css />
+
+<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
+
+<!-- ********************  javascript ********************** -->
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+<script type="text/javascript" src="${tool}includes/javascript/xmlrequest.js"></script>
+
+
+
+
Index: lams_tool_forum/web/common/messages.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/common/messages.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/web/common/messages.jsp	8 Jun 2006 07:37:32 -0000	1.1
@@ -0,0 +1,20 @@
+<%-- Error Messages --%>
+<logic:messagesPresent>
+    <div class="error" id="errorMessages">
+        <html:messages id="error">
+            <html:img page="/includes/images/iconWarning.gif" 
+               styleClass="icon"/>
+            <c:out value="${error}" escapeXml="false"/><br/>
+        </html:messages>
+    </div>
+</logic:messagesPresent>
+
+<%-- Success Messages --%>
+<logic:messagesPresent message="true">
+    <div class="message" id="successMessages">
+        <html:messages id="message" message="true">
+            <html:img page="/includes/images/iconInformation.gif" styleClass="icon"/>
+            <c:out value="${message}" escapeXml="false"/><br/>
+        </html:messages>
+    </div>
+</logic:messagesPresent>
\ No newline at end of file
Index: lams_tool_forum/web/common/taglibs.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/common/taglibs.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/web/common/taglibs.jsp	8 Jun 2006 07:37:32 -0000	1.1
@@ -0,0 +1,12 @@
+<%@ page language="java" errorPage="/error.jsp" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-tiles" prefix="tiles" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-xml" prefix="x" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="fck-editor" prefix="FCK"%>
+
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/authoringHeader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/blank.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/defaultLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/error.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.14 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/header.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.9 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/layout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/message_display.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/scripts.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/tablayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.11 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/taglibs.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/javascript/fckcontroller.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/javascript/tabcontroller.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/javascript/xmlrequest.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/authoring.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	12 May 2006 05:14:21 -0000	1.19
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	8 Jun 2006 07:37:32 -0000	1.20
@@ -1,4 +1,5 @@
 <%@ include file="/includes/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.tool.forum.util.ForumConstants"%>
 
 <html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
 	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
@@ -16,16 +17,7 @@
 		<lams:TabBody id="2" titleKey="authoring.tab.advanced" page="advance.jsp" />
 		<lams:TabBody id="3" titleKey="authoring.tab.instructions" page="instructions.jsp" />
 		<!-- Button Row -->
-		<%--  Default value 
-				cancelButtonLabelKey="label.authoring.cancel.button"
-				saveButtonLabelKey="label.authoring.save.button"
-				cancelConfirmMsgKey="authoring.msg.cancel.save"
-				accessMode="author"
-		--%>
-		<c:set var="toolSignature">
-			<fmt:message key="signature" />
-		</c:set>
-		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="${toolSignature}" toolContentID="${formBean.toolContentID}" />
+		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ForumConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" />
 		
 	</div>
 
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/basic.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_forum/web/jsps/authoring/basic.jsp	12 May 2006 05:14:21 -0000	1.15
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	8 Jun 2006 07:37:32 -0000	1.16
@@ -51,7 +51,7 @@
 	</tr>
 	<tr>
 		<td colspan="2" align="left">
-			<a href="javascript:showMessage('<html:rewrite page="/authoring/newTopic.do"/>');">
+			<a href="javascript:showMessage('<html:rewrite page="/authoring/newTopic.do"/>');" class="button">
 				<fmt:message key="label.authoring.create.new.topic" />
 			</a>
 		</td>
@@ -63,7 +63,9 @@
 	</tr>
 	<tr>
 		<td colspan="2">
-			<iframe onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'" id="messageArea" name="messageArea" style="width:0px;height:0px;border:0px;display:none" frameborder="no" scrolling="no">
+			<iframe onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'" 
+			id="messageArea" name="messageArea" 
+			style="width:0px;height:0px;border:0px;display:none" frameborder="no" scrolling="no">
 			</iframe>
 		</td>
 	</tr>
Index: lams_tool_forum/web/jsps/authoring/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/definelater.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/web/jsps/authoring/definelater.jsp	8 Jun 2006 07:37:32 -0000	1.1
@@ -0,0 +1,28 @@
+<%@ include file="/includes/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.tool.forum.util.ForumConstants"%>
+<%@ page import="java.util.HashSet"%>
+<%@ page import="java.util.Set"%>
+
+<%Set tabs = new HashSet();
+			tabs.add("authoring.tab.basic");
+			pageContext.setAttribute("tabs", tabs);
+			%>
+<html:form action="authoring/update" method="post" styleId="authoringForm">
+	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+	<html:hidden property="toolContentID" />
+
+	<!-- start tabs -->
+	<lams:Tabs collection="${tabs}" useKey="true" control="true" />
+	<!-- end tab buttons -->
+	<div class="tabbody">
+		<!-- tab content 1 (Basic) -->
+		<lams:TabBody id="1" titleKey="authoring.tab.basic" page="basic.jsp" />
+		<!-- end of content (Basic) -->
+
+		<!-- Button Row -->
+		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ForumConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" defineLater="yes"/>
+
+		<lams:HTMLEditor />
+	</div>
+
+</html:form>
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/create.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	2 Mar 2006 01:12:24 -0000	1.15
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	8 Jun 2006 07:37:32 -0000	1.16
@@ -1,23 +1,38 @@
-<%@ include file="/includes/taglibs.jsp" %>
-<script type="text/javascript" src="<html:rewrite page='/includes/javascript/xmlrequest.js'/>"></script>
-<script type="text/javascript">
-	function success(){
-		var flag = "<c:out value="${SUCCESS_FLAG}"/>";
-		if(flag == "CREATE_SUCCESS"){
-			var d = new Date()
-			var t = d.getTime()
-			loadDoc("<html:rewrite page='/authoring/refreshTopic.do'/>"+"?reqID="+escape(t),window.parent.document.getElementById("messageListArea"));
-			window.parent.hideMessage();
-		}
-	}
-	success();
-</script>
+<%@ include file="/common/taglibs.jsp"%>
+<html>
+	<head>
+		<%@ include file="/common/header.jsp"%>
+		<script type="text/javascript">
+			function success(){
+				var flag = "<c:out value="${SUCCESS_FLAG}"/>";
+				if(flag == "CREATE_SUCCESS"){
+					var d = new Date()
+					var t = d.getTime()
+					loadDoc("<html:rewrite page='/authoring/refreshTopic.do'/>"+"?reqID="+escape(t),window.parent.document.getElementById("messageListArea"));
+					window.parent.hideMessage();
+				}
+			}
+			success();
+		</script>
+		
+	</head>
+	<body class="tabpart">
+		<script type="text/javascript">
+			success();
+		</script>	
+		<table class="forms">
+			<!-- Basic Info Form-->
+			<tr>
+				<td>
+					<div align="center">
+						<%@ include file="/common/messages.jsp" %>
+						<html:form action="/authoring/createTopic.do" focus="message.subject" enctype="multipart/form-data">
+							<%@ include file="/jsps/message/topicform.jsp"%>
+						</html:form>
+					</div>
+				</td>
+			</tr>
+		</table>
 
-<html:errors property="error" />
-<div align="center">
-<html:form action="/authoring/createTopic.do" focus="message.subject" enctype="multipart/form-data">
-	<fieldset>
-		<%@ include file="/jsps/message/topicform.jsp" %>
-	 </fieldset>
-</html:form>
-</div>
+	</body>
+</html>
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/edit.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	12 Jan 2006 06:19:40 -0000	1.4
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	8 Jun 2006 07:37:32 -0000	1.5
@@ -1,14 +1,27 @@
-<%@ include file="/includes/taglibs.jsp" %>
-<script type="text/javascript" src="<html:rewrite page='/includes/javascript/xmlrequest.js'/>"></script>
+<%@ include file="/common/taglibs.jsp"%>
+<html>
+	<head>
+		<%@ include file="/common/header.jsp"%>
+	</head>
+	<body class="tabpart">
+		<table class="forms">
+			<!-- Basic Info Form-->
+			<tr>
+				<td>
+					<div align="center">
+						<div align="center">
+							<%@ include file="/common/messages.jsp" %>
+							<html:form action="/authoring/updateTopic.do" focus="message.subject" enctype="multipart/form-data">
+								<fieldset>
+									<input type="hidden" name="topicIndex" value="<c:out value="${topicIndex}"/>">
+									<%@ include file="/jsps/message/topiceditform.jsp"%>
+								</fieldset>
+							</html:form>
+						</div>
+					</div>
+				</td>
+			</tr>
+		</table>
 
-
-<html:errors property="error" />
-<div align="center">
-<html:form action="/authoring/updateTopic.do" focus="message.subject"
-	 enctype="multipart/form-data">
-	<fieldset>
-		<input type="hidden" name="topicIndex" value="<c:out value="${topicIndex}"/>">
-		<%@ include file="/jsps/message/topiceditform.jsp" %>
-	 </fieldset>
- </html:form>
-</div>
+	</body>
+</html>
Index: lams_tool_forum/web/jsps/authoring/message/view.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/Attic/view.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_forum/web/jsps/authoring/message/view.jsp	12 Jan 2006 06:19:40 -0000	1.4
+++ lams_tool_forum/web/jsps/authoring/message/view.jsp	8 Jun 2006 07:37:32 -0000	1.5
@@ -1,21 +1,35 @@
-<%@ include file="/includes/taglibs.jsp" %>
-<script type="text/javascript" src="<html:rewrite page='/includes/javascript/xmlrequest.js'/>"></script>
-<script type="text/javascript">
-	function success(){
-		var flag = "<c:out value="${SUCCESS_FLAG}"/>";
-		if(flag == "EDIT_SUCCESS"){
-			var d = new Date()
-			var t = d.getTime()
-			loadDoc("<html:rewrite page='/authoring/refreshTopic.do'/>"+"?="+escape(t),window.parent.document.getElementById("messageListArea"));
-			window.parent.hideMessage();
-		}
-	}
+<%@ include file="/common/taglibs.jsp"%>
+<html>
+	<head>
+		<%@ include file="/common/header.jsp"%>
+		<script type="text/javascript">
+			function success(){
+				var flag = "<c:out value="${SUCCESS_FLAG}"/>";
+				if(flag == "EDIT_SUCCESS"){
+					var d = new Date()
+					var t = d.getTime()
+					loadDoc("<html:rewrite page='/authoring/refreshTopic.do'/>"+"?="+escape(t),window.parent.document.getElementById("messageListArea"));
+					window.parent.hideMessage();
+				}
+			}
+		</script>
+
+	</head>
+	<body class="tabpart">
+		<script type="text/javascript">
 	success();
 </script>
+		<table class="forms">
+			<!-- Basic Info Form-->
+			<tr>
+				<td>
+					<div align="center">
+						<%@ include file="/jsps/message/topicview.jsp"%>
+					</div>
+				</td>
+			</tr>
+		</table>
 
+	</body>
+</html>
 
-<div align="center">
-<fieldset>
-	<%@ include file="/jsps/message/topicview.jsp" %>
- </fieldset>
-</div>
Index: lams_tool_forum/web/jsps/learning/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/definelater.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/web/jsps/learning/definelater.jsp	8 Jun 2006 07:37:33 -0000	1.1
@@ -0,0 +1,5 @@
+<%@ include file="/includes/taglibs.jsp" %>
+
+<div align="center">
+	<fmt:message key="define.later.message"/>
+</div>
Index: lams_tool_forum/web/jsps/learning/runoffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/Attic/runoffline.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/web/jsps/learning/runoffline.jsp	8 Jun 2006 07:37:33 -0000	1.1
@@ -0,0 +1,5 @@
+<%@ include file="/includes/taglibs.jsp" %>
+
+<div align="center">
+	<fmt:message key="run.offline.message"/>
+</div>
Index: lams_tool_forum/web/jsps/message/topiceditform.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/message/Attic/topiceditform.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_forum/web/jsps/message/topiceditform.jsp	12 Jan 2006 06:19:42 -0000	1.5
+++ lams_tool_forum/web/jsps/message/topiceditform.jsp	8 Jun 2006 07:37:34 -0000	1.6
@@ -1,46 +1,52 @@
 
-<table width="80%" cellspacing="8" align="CENTER" class="forms">
+<table width="80%" cellspacing="8" border="0" align="left" class="innerforms">
 	<tr>
-		<td valign="MIDDLE"><b><bean:message key="message.label.subject" /></b></td>
-		<td valign="MIDDLE"><b class="required">*</b><html:text size="30"
-			 tabindex="1" property="message.subject" /> 
-			 <html:errors property="message.subject" /></td>
+		<td>
+			<b><bean:message key="message.label.subject" /></b>
+		</td>
+		<td>
+			<b class="required">*</b>
+			<html:text size="30" tabindex="1" property="message.subject" />
+			<html:errors property="message.subject" />
+		</td>
 	</tr>
 	<tr>
-		<td valign="MIDDLE"><b><bean:message key="message.label.body" /></b></td>
-		<td valign="MIDDLE"><b class="required">*</b><lams:STRUTS-textarea rows="10" cols="60"
-			tabindex="2" property="message.body" /> 
-			<BR><html:errors property="message.body" /></td>
+		<td>
+			<b><bean:message key="message.label.body" /></b>
+		</td>
+		<td>
+			<b class="required">*</b>
+			<lams:STRUTS-textarea rows="10" cols="60" tabindex="2" property="message.body" />
+			<BR>
+			<html:errors property="message.body" />
+		</td>
 	</tr>
 	<tr>
 		<td>
 			<b><bean:message key="message.label.attachment" /></b>
 		</td>
-		<td valign="MIDDLE">&nbsp;
+		<td>
 			<c:if test="${topic.hasAttachment}">
 				<c:forEach var="file" items="${topic.message.attachments}">
 					<c:set var="downloadURL">
-							<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
+						<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
 					</c:set>
-					<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-						<c:out value="${file.fileName}" />
-					</a>
+					<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <c:out value="${file.fileName}" /> </a>
 					<c:set var="deleteURL">
-							<html:rewrite page="/authoring/deleteAttachment.do?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&topicIndex=${topicIndex}"/>
+						<html:rewrite page="/authoring/deleteAttachment.do?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&topicIndex=${topicIndex}" />
 					</c:set>
 					&nbsp;
-					<a href="<c:out value='${deleteURL}'/>">
-						<fmt:message key="label.delete" />
-					</a>					
+					<a href="<c:out value='${deleteURL}'/>"> <fmt:message key="label.delete" /> </a>
 				</c:forEach>
 			</c:if>
 			<c:if test="${not topic.hasAttachment}">
-				<html:file tabindex="3"		property="attachmentFile" /> <html:errors	property="message.attachment" />
+				<html:file tabindex="3" property="attachmentFile" />
+				<html:errors property="message.attachment" />
 			</c:if>
 		</td>
 	</tr>
 	<tr>
-		<td>&nbsp;&nbsp;
+		<td>
 			<html:submit>
 				<bean:message key="button.submit" />
 			</html:submit>
Index: lams_tool_forum/web/jsps/message/topicform.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/message/Attic/topicform.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_forum/web/jsps/message/topicform.jsp	12 Jan 2006 06:19:42 -0000	1.5
+++ lams_tool_forum/web/jsps/message/topicform.jsp	8 Jun 2006 07:37:34 -0000	1.6
@@ -1,31 +1,42 @@
-<table width="80%" cellspacing="8" align="CENTER" class="forms">
+<table width="100%" cellspacing="8" border="0" align="left">
 	<tr>
-		<td valign="MIDDLE"><b><bean:message key="message.label.subject" /></b></td>
-		<td valign="MIDDLE"><b class="required">*</b><html:text size="30"
-			 tabindex="1" property="message.subject" /> 
-			 <html:errors property="message.subject" /></td>
+		<td>
+			<b><bean:message key="message.label.subject" /></b>
+		</td>
+		<td align="left">
+			<b class="required">*</b>
+			<html:text size="30" tabindex="1" property="message.subject" />
+			<html:errors property="message.subject" />
+		</td>
 	</tr>
 	<tr>
-		<td valign="MIDDLE"><b><bean:message key="message.label.body" /></b></td>
-		<td valign="TOP"><b class="required">*</b><lams:STRUTS-textarea rows="10" cols="60"
-			tabindex="2" property="message.body" /> 
-			<BR><html:errors property="message.body" /></td>
+		<td>
+			<b><bean:message key="message.label.body" /></b>
+		</td>
+		<td>
+			<b class="required">*</b>
+			<lams:STRUTS-textarea rows="10" cols="60" tabindex="2" property="message.body" />
+			<BR>
+			<html:errors property="message.body" />
+		</td>
 	</tr>
 	<tr>
-		<td valign="MIDDLE"><b><bean:message key="message.label.attachment" /></b></td>
-		<td valign="MIDDLE">
-			&nbsp;&nbsp;<html:file tabindex="3"
-				property="attachmentFile" /> <html:errors
-				property="message.attachment" />
+		<td>
+			<b><bean:message key="message.label.attachment" /></b>
 		</td>
-	</tr>
-		<td>&nbsp;&nbsp;
-			<html:submit>
-				<bean:message key="button.add" />
-			</html:submit>
-			<html:button property="cancel" onclick="javascript:window.parent.hideMessage()">
-				<bean:message key="button.cancel" />
-			</html:button>
+		<td>
+			&nbsp;&nbsp;
+			<html:file tabindex="3" property="attachmentFile" />
+			<html:errors property="message.attachment" />
 		</td>
 	</tr>
+	<td colspan="2" align="right" valign="bottom">
+		<html:submit style="width:120px" styleClass="buttonStyle">
+			<bean:message key="button.add" />
+		</html:submit>
+		<html:button property="cancel" onclick="javascript:window.parent.hideMessage()"  styleClass="buttonStyle" style="width:120px" >
+			<bean:message key="button.cancel" />
+		</html:button>
+	</td>
+	</tr>
 </table>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/monitoring/definelater.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/editactivity.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_forum/web/jsps/monitoring/editactivity.jsp	16 Mar 2006 03:23:54 -0000	1.9
+++ lams_tool_forum/web/jsps/monitoring/editactivity.jsp	8 Jun 2006 07:37:32 -0000	1.10
@@ -28,7 +28,7 @@
 				<c:set var="isPageEditable" value="${isPageEditable}" />
 				<c:choose>
 					<c:when test='${isPageEditable == "true"}'>
-						<c:url value="/authoring/init.do" var="authoringUrl">
+						<c:url value="/defineLater.do" var="authoringUrl">
 							<c:param name="toolContentID" value="${toolContentID}" />
 						</c:url>
 						<html:link href="${authoringUrl}" styleClass="button" target="_blank">