Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java,v
diff -u -r1.16 -r1.17
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java	17 Sep 2006 06:20:52 -0000	1.16
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java	5 Oct 2006 05:03:08 -0000	1.17
@@ -85,6 +85,9 @@
 
 		Long toolContentID = new Long(WebUtil.readLongParam(request,
 				AttributeNames.PARAM_TOOL_CONTENT_ID));
+		
+		String contentFolderID = WebUtil.readStrParam(request,
+				AttributeNames.PARAM_CONTENT_FOLDER_ID);
 
 		// set up chatService
 		if (chatService == null) {
@@ -145,6 +148,8 @@
 			chatDTO.getSessionDTOs().add(sessionDTO);
 		}
 		request.setAttribute("monitoringDTO", chatDTO);
+		request.setAttribute("contentFolderID", contentFolderID);
+		
 		return mapping.findForward("success");
 	}
 
Index: lams_tool_chat/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_chat/web/pages/monitoring/editActivity.jsp	10 Aug 2006 01:33:35 -0000	1.6
+++ lams_tool_chat/web/pages/monitoring/editActivity.jsp	5 Oct 2006 05:03:19 -0000	1.7
@@ -28,6 +28,7 @@
 		<c:url value="/authoring.do" var="authoringUrl">
 			<c:param name="toolContentID" value="${dto.toolContentId}" />
 			<c:param name="mode" value="teacher" />
+			<c:param name="contentFolderID" value="${contentFolderID}"></c:param>
 		</c:url>
 		<html:link href="${fn:escapeXml(authoringUrl)}"
 			styleClass="button right-buttons" target="_blank">
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java,v
diff -u -r1.5 -r1.6
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java	17 Sep 2006 06:27:20 -0000	1.5
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java	5 Oct 2006 05:04:07 -0000	1.6
@@ -38,6 +38,7 @@
 import org.lamsfoundation.lams.tool.notebook.model.NotebookUser;
 import org.lamsfoundation.lams.tool.notebook.service.INotebookService;
 import org.lamsfoundation.lams.tool.notebook.service.NotebookServiceProxy;
+import org.lamsfoundation.lams.tool.notebook.web.forms.MonitoringForm;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -68,6 +69,9 @@
 		Long toolContentID = new Long(WebUtil.readLongParam(request,
 				AttributeNames.PARAM_TOOL_CONTENT_ID));
 		
+		String contentFolderID = WebUtil.readStrParam(request,
+				AttributeNames.PARAM_CONTENT_FOLDER_ID);
+				
 		Notebook notebook = notebookService
 				.getNotebookByContentId(toolContentID);
 
@@ -78,6 +82,7 @@
 		NotebookDTO notebookDT0 = new NotebookDTO(notebook);
 
 		request.setAttribute("notebookDTO", notebookDT0);
+		request.setAttribute("contentFolderID", contentFolderID);
 		return mapping.findForward("success");
 	}
 
Index: lams_tool_notebook/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/web/pages/monitoring/editActivity.jsp	25 Jul 2006 07:15:35 -0000	1.2
+++ lams_tool_notebook/web/pages/monitoring/editActivity.jsp	5 Oct 2006 05:04:07 -0000	1.3
@@ -29,6 +29,7 @@
 			<c:url value="/authoring.do" var="authoringUrl">
 				<c:param name="toolContentID" value="${dto.toolContentId}" />
 				<c:param name="mode" value="teacher" />
+				<c:param name="contentFolderID" value="${contentFolderID}" />
 			</c:url>
 			<html:link href="${authoringUrl}" styleClass="button" target="_blank">
 				<fmt:message key="button.editActivity" />
Index: lams_tool_notebook/web/pages/monitoring/statistics.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/statistics.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_notebook/web/pages/monitoring/statistics.jsp	3 Aug 2006 00:30:49 -0000	1.3
+++ lams_tool_notebook/web/pages/monitoring/statistics.jsp	5 Oct 2006 05:04:07 -0000	1.4
@@ -3,9 +3,15 @@
 <c:set var="dto" value="${notebookDTO}" />
 <c:forEach var="session" items="${dto.sessionDTOs}">
 
-	<h2>
-		${session.sessionName}
-	</h2>
+	<table>
+		<tr>
+			<td>
+				<h2>
+					${session.sessionName}
+				</h2>
+			</td>
+		</tr>
+	</table>
 
 	<table cellpadding="0">
 		<tr>
Index: lams_tool_notebook/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/summary.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_notebook/web/pages/monitoring/summary.jsp	3 Aug 2006 00:30:49 -0000	1.3
+++ lams_tool_notebook/web/pages/monitoring/summary.jsp	5 Oct 2006 05:04:07 -0000	1.4
@@ -3,9 +3,15 @@
 <c:set var="dto" value="${notebookDTO}" />
 <c:forEach var="session" items="${dto.sessionDTOs}">
 
-	<h2>
-		${session.sessionName}
-	</h2>
+	<table>
+		<tr>
+			<td>
+				<h2>
+					${session.sessionName}
+				</h2>
+			</td>
+		</tr>
+	</table>
 
 	<table cellpadding="0">
 		<tr>