Index: lams_tool_scribe/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.6 -r1.7
--- lams_tool_scribe/conf/language/ApplicationResources.properties	4 Oct 2006 09:44:52 -0000	1.6
+++ lams_tool_scribe/conf/language/ApplicationResources.properties	5 Oct 2006 01:36:43 -0000	1.7
@@ -107,6 +107,7 @@
 button.agree = Agree
 button.submitReport = Submit Report
 button.forceComplete = Force Complete
+button.submit = Submit
 
 message.voteStatistics = {0} out of {1} agree
 
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java,v
diff -u -r1.5 -r1.6
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java	4 Oct 2006 06:06:30 -0000	1.5
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java	5 Oct 2006 01:36:43 -0000	1.6
@@ -77,6 +77,11 @@
 		Long toolContentID = new Long(WebUtil.readLongParam(request,
 				AttributeNames.PARAM_TOOL_CONTENT_ID));
 
+		String contentFolderID = WebUtil.readStrParam(request,
+				AttributeNames.PARAM_CONTENT_FOLDER_ID);
+		MonitoringForm monForm = (MonitoringForm)form;
+		monForm.setContentFolderID(contentFolderID);
+		
 		// set up scribeService
 		if (scribeService == null) {
 			scribeService = ScribeServiceProxy.getScribeService(this.getServlet()
@@ -87,6 +92,8 @@
 		ScribeDTO scribeDTO = setupScribeDTO(scribe);
 		
 		request.setAttribute("monitoringDTO", scribeDTO);
+		request.setAttribute("contentFolderID", contentFolderID);
+		
 		return mapping.findForward("success");
 	}
 	
@@ -120,6 +127,8 @@
 		ScribeDTO scribeDTO = setupScribeDTO(session.getScribe());
 		
 		request.setAttribute("monitoringDTO", scribeDTO);
+		request.setAttribute("contentFolderID", monForm.getContentFolderID());
+		
 		return mapping.findForward("success");
 	}
 	
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/MonitoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/MonitoringForm.java,v
diff -u -r1.3 -r1.4
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/MonitoringForm.java	1 Oct 2006 06:44:17 -0000	1.3
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/MonitoringForm.java	5 Oct 2006 01:36:43 -0000	1.4
@@ -36,6 +36,7 @@
 	
 	String dispatch;
 	Long toolSessionID;
+	String contentFolderID;
 	Long appointedScribeUID;
 
 	public String getDispatch() {
@@ -56,4 +57,10 @@
 	public void setAppointedScribeUID(Long appointedScribeUID) {
 		this.appointedScribeUID = appointedScribeUID;
 	}
+	public String getContentFolderID() {
+		return contentFolderID;
+	}
+	public void setContentFolderID(String contentFolderID) {
+		this.contentFolderID = contentFolderID;
+	}
 }
Index: lams_tool_scribe/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_scribe/web/pages/monitoring/editActivity.jsp	15 Sep 2006 03:09:52 -0000	1.1
+++ lams_tool_scribe/web/pages/monitoring/editActivity.jsp	5 Oct 2006 01:36:43 -0000	1.2
@@ -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_scribe/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/monitoring/summary.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_scribe/web/pages/monitoring/summary.jsp	4 Oct 2006 06:06:30 -0000	1.7
+++ lams_tool_scribe/web/pages/monitoring/summary.jsp	5 Oct 2006 01:36:43 -0000	1.8
@@ -24,6 +24,7 @@
 									<html:hidden property="toolSessionID"
 										value="${session.sessionID}" />
 									<html:hidden property="dispatch" value="appointScribe" />
+									<html:hidden property="contentFolderID"/>
 
 									<fmt:message key="heading.selectScribe" />
 
@@ -37,7 +38,9 @@
 									</html:select>
 
 									<div>
-										<html:submit></html:submit>
+										<html:submit styleClass="button">
+											<fmt:message key="button.submit"/>
+										</html:submit>
 									</div>
 
 								</html:form>