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.24 -r1.25
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	23 Aug 2006 05:42:17 -0000	1.24
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	28 Aug 2006 04:59:13 -0000	1.25
@@ -521,6 +521,7 @@
 			
 		boolean isForumEditable = ForumWebUtils.isForumEditable(forum);
 		request.setAttribute(ForumConstants.PAGE_EDITABLE, new Boolean(isForumEditable));
+		request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentID);
 		request.setAttribute("title", title);
 		request.setAttribute("instruction", instruction);
 		return mapping.findForward("success");
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 -r1.7 -r1.8
--- lams_tool_forum/web/jsps/authoring/definelater.jsp	18 Aug 2006 06:59:43 -0000	1.7
+++ lams_tool_forum/web/jsps/authoring/definelater.jsp	28 Aug 2006 04:59:13 -0000	1.8
@@ -11,9 +11,8 @@
 <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" />
-	<html:hidden property="mode" value="teacher" />
 	<html:hidden property="sessionMapID"/>
-	<input type="hidden" name="mode" value="teacher">
+	<html:hidden property="mode" value="teacher" />
 	
 	<div id="header">
 		<lams:Tabs collection="${tabs}" useKey="true" control="true" />
Index: lams_tool_forum/web/jsps/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/Attic/instructions.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_forum/web/jsps/authoring/instructions.jsp	18 Aug 2006 06:59:43 -0000	1.13
+++ lams_tool_forum/web/jsps/authoring/instructions.jsp	28 Aug 2006 04:59:13 -0000	1.14
@@ -59,7 +59,7 @@
 		<!-- Instructions Row -->
 		<tr>
 			<td colspan="2">
-				<lams:SetEditor id="onlineInstruction" small="true" text="${formBean.forum.onlineInstructions}" key="label.authoring.online.instruction" />
+				<lams:SetEditor id="forum.onlineInstructions" small="true" text="${formBean.forum.onlineInstructions}" key="label.authoring.online.instruction" />
 			</td>
 		</tr>
 		<tr>
@@ -86,7 +86,7 @@
 		<!-- Offline Instructions -->
 		<tr>
 			<td colspan="2">
-			<lams:SetEditor id="offlineInstruction" small="true"  text="${formBean.forum.offlineInstructions}" key="label.authoring.offline.instruction"/>
+			<lams:SetEditor id="forum.offlineInstructions" small="true"  text="${formBean.forum.offlineInstructions}" key="label.authoring.offline.instruction"/>
 			</td>
 		</tr>
 		<tr>
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.12 -r1.13
--- lams_tool_forum/web/jsps/monitoring/editactivity.jsp	30 Jun 2006 00:20:01 -0000	1.12
+++ lams_tool_forum/web/jsps/monitoring/editactivity.jsp	28 Aug 2006 04:59:13 -0000	1.13
@@ -1,6 +1,5 @@
 <%@ include file="/includes/taglibs.jsp"%>
 <html:errors />
-
 <table cellpadding="0">
 	<tr>
 		<td class="field-name" width="30%">
Index: lams_tool_forum/web/jsps/monitoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/Attic/instructions.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_forum/web/jsps/monitoring/instructions.jsp	30 Jun 2006 00:20:01 -0000	1.7
+++ lams_tool_forum/web/jsps/monitoring/instructions.jsp	28 Aug 2006 04:59:13 -0000	1.8
@@ -1,38 +1,32 @@
 <%@ include file="/includes/taglibs.jsp"%>
 <html:errors />
 <table cellpadding="0">
-	<c:set var="formBean" value="${requestScope.forumBean}" />
 	<!-- Instructions Row -->
 	<tr>
 		<td class="field-name" width="30%">
 			<fmt:message key="label.authoring.online.instruction" />
 			:
 		</td>
 		<td>
-			<c:out value="${formBean.forum.onlineInstructions}" escapeXml="false" />
+			<c:out value="${forumBean.forum.onlineInstructions}" escapeXml="false" />
 		</td>
 	</tr>
 	<tr>
 		<td colspan="2">
 			<div id="onlinefile">
 				<ul>
-					<c:forEach var="file" items="${formBean.onlineFileList}">
+					<c:forEach var="file" items="${forumBean.onlineFileList}">
 						<li>
 							<c:out value="${file.fileName}" />
 							<c:set var="viewURL">
 								<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
 							</c:set>
 							<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"> <fmt:message key="label.view" /> </a> &nbsp;
+							&nbsp;&nbsp;
 							<c:set var="downloadURL">
 								<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
 							</c:set>
 							<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <fmt:message key="label.download" /> </a> &nbsp;
-							<c:set var="deleteonline">
-								<html:rewrite page="/authoring/deleteOnline.do?toolContentID=${formBean.toolContentID}&uuID=${file.fileUuid}&versionID=${file.fileVersionId}" />
-							</c:set>
-							<html:link href="javascript:loadDoc('${deleteonline}','onlinefile')">
-								<fmt:message key="label.authoring.online.delete" />
-							</html:link>
 						</li>
 					</c:forEach>
 				</ul>
@@ -46,34 +40,28 @@
 			:
 		</td>
 		<td>
-			<c:out value="${formBean.forum.offlineInstructions}" escapeXml="false" />
+			<c:out value="${forumBean.forum.offlineInstructions}" escapeXml="false" />
 		</td>
 	</tr>
 	<tr>
 		<td colspan="2">
 			<div id="offlinefile">
 				<ul>
-					<c:forEach var="file" items="${formBean.offlineFileList}">
+					<c:forEach var="file" items="${forumBean.offlineFileList}">
 						<li>
 							<c:out value="${file.fileName}" />
 							<c:set var="viewURL">
 								<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
 							</c:set>
 							<html:link href="javascript:launchInstructionsPopup('${viewURL}')">
 								<fmt:message key="label.view" />
-							</html:link>
+							</html:link>&nbsp;&nbsp;
 							<c:set var="downloadURL">
 								<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
 							</c:set>
 							<html:link href="${downloadURL}">
 								<fmt:message key="label.download" />
 							</html:link>
-							<c:set var="deleteoffline">
-								<html:rewrite page="/authoring/deleteOffline.do?toolContentID=${formBean.toolContentID}&uuID=${file.fileUuid}&versionID=${file.fileVersionId}" />
-							</c:set>
-							<html:link href="javascript:loadDoc('${deleteoffline}','offlinefile')">
-								<fmt:message key="label.authoring.offline.delete" />
-							</html:link>
 						</li>
 					</c:forEach>
 				</ul>