Index: lams_tool_wiki/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/conf/language/ApplicationResources.properties,v
diff -u -r1.3 -r1.4
--- lams_tool_wiki/conf/language/ApplicationResources.properties	21 Oct 2008 03:40:56 -0000	1.3
+++ lams_tool_wiki/conf/language/ApplicationResources.properties	14 Nov 2008 07:29:52 -0000	1.4
@@ -111,6 +111,8 @@
 label.wiki.add.title.required  =A title is required for the Wiki page.
 label.wiki.last.edit  =Last edited by {0}, at {1}
 label.wiki.view  =View
+label.wiki.refresh  =Refresh
+label.wiki.refresh.toolTip  =Refresh the page to get the current content
 label.wiki.view.toolTip  =View this Wiki page
 label.wiki.remove  =Remove
 label.wiki.remove.toolTip  =Remove this Wiki page
Index: lams_tool_wiki/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.3 -r1.4
--- lams_tool_wiki/conf/language/lams/ApplicationResources.properties	21 Oct 2008 03:40:56 -0000	1.3
+++ lams_tool_wiki/conf/language/lams/ApplicationResources.properties	14 Nov 2008 07:29:52 -0000	1.4
@@ -110,6 +110,8 @@
 label.wiki.add.title.exists  =A Wiki page with title "{0}" already exists, please choose a different title.
 label.wiki.add.title.required  =A title is required for the Wiki page.
 label.wiki.last.edit  =Last edited by {0}, at {1}
+label.wiki.refresh  =Refresh
+label.wiki.refresh.toolTip  =Refresh the page to get the current content
 label.wiki.view  =View
 label.wiki.view.toolTip  =View this Wiki page
 label.wiki.remove  =Remove
Index: lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.5 -r1.6
--- lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties	21 Oct 2008 03:40:56 -0000	1.5
+++ lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties	14 Nov 2008 07:29:52 -0000	1.6
@@ -110,6 +110,8 @@
 label.wiki.add.title.exists  =A Wiki page with title "{0}" already exists, please choose a different title.
 label.wiki.add.title.required  =A title is required for the Wiki page.
 label.wiki.last.edit  =Last edited by {0}, at {1}
+label.wiki.refresh  =Refresh
+label.wiki.refresh.toolTip  =Refresh the page to get the current content
 label.wiki.view  =View
 label.wiki.view.toolTip  =View this Wiki page
 label.wiki.remove  =Remove
Index: lams_tool_wiki/conf/language/rams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/conf/language/rams/Attic/ApplicationResources.properties,v
diff -u -r1.3 -r1.4
--- lams_tool_wiki/conf/language/rams/ApplicationResources.properties	21 Oct 2008 03:40:55 -0000	1.3
+++ lams_tool_wiki/conf/language/rams/ApplicationResources.properties	14 Nov 2008 07:29:52 -0000	1.4
@@ -110,6 +110,8 @@
 label.wiki.add.title.exists  =A Wiki page with title "{0}" already exists, please choose a different title.
 label.wiki.add.title.required  =A title is required for the Wiki page.
 label.wiki.last.edit  =Last edited by {0}, at {1}
+label.wiki.refresh  =Refresh
+label.wiki.refresh.toolTip  =Refresh the page to get the current content
 label.wiki.view  =View
 label.wiki.view.toolTip  =View this Wiki page
 label.wiki.remove  =Remove
Index: lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/conf/language/rams/Attic/ApplicationResources_en_AU.properties,v
diff -u -r1.8 -r1.9
--- lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties	21 Oct 2008 03:40:56 -0000	1.8
+++ lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties	14 Nov 2008 07:29:52 -0000	1.9
@@ -110,6 +110,8 @@
 label.wiki.add.title.exists  =A Wiki page with title "{0}" already exists, please choose a different title.
 label.wiki.add.title.required  =A title is required for the Wiki page.
 label.wiki.last.edit  =Last edited by {0}, at {1}
+label.wiki.refresh  =Refresh
+label.wiki.refresh.toolTip  =Refresh the page to get the current content
 label.wiki.view  =View
 label.wiki.view.toolTip  =View this Wiki page
 label.wiki.remove  =Remove
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java,v
diff -u -r1.7 -r1.8
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java	21 Oct 2008 03:20:19 -0000	1.7
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java	14 Nov 2008 07:29:52 -0000	1.8
@@ -159,6 +159,7 @@
 	    HttpServletResponse response) {
 
 	Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
 
 	if (wikiService == null) {
 	    wikiService = WikiServiceProxy.getWikiService(this.getServlet().getServletContext());
@@ -216,6 +217,7 @@
 	    currentWikiPageHistoryDTOs.add(new WikiPageContentDTO(wikiPageContentHistoryItem));
 	}
 	request.setAttribute(WikiConstants.ATTR_WIKI_PAGE_CONTENT_HISTORY, currentWikiPageHistoryDTOs);
+	request.setAttribute(WikiConstants.ATTR_CONTENT_FOLDER_ID, contentFolderID);
 
 	return mapping.findForward("wiki_display");
     }
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/MonitoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/MonitoringForm.java,v
diff -u -r1.2 -r1.3
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/MonitoringForm.java	10 Oct 2008 01:18:47 -0000	1.2
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/MonitoringForm.java	14 Nov 2008 07:29:52 -0000	1.3
@@ -35,7 +35,8 @@
     String dispatch;
     boolean teacherVisible;
     Long toolSessionID;
-
+    String contentFolderID;
+    
     // editing message page.
     Long messageUID;
     String messageBody;
@@ -97,4 +98,12 @@
     public void setMode(String mode) {
         this.mode = mode;
     }
+
+    public String getContentFolderID() {
+        return contentFolderID;
+    }
+
+    public void setContentFolderID(String contentFolderID) {
+        this.contentFolderID = contentFolderID;
+    }
 }
Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/learning/wiki.jsp,v
diff -u -r1.14 -r1.15
--- lams_tool_wiki/web/pages/learning/wiki.jsp	4 Nov 2008 05:41:45 -0000	1.14
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	14 Nov 2008 07:29:52 -0000	1.15
@@ -130,7 +130,12 @@
 			
 				<c:if test="${contentEditable}">
 				
+					<a href="javascript:refreshPage();" title='<fmt:message key="label.wiki.refresh.toolTip"></fmt:message>'>
+						<fmt:message key="label.wiki.refresh"></fmt:message>
+					</a> 
+					
 					<c:if test="${editableFlag or addFlag}">
+						&nbsp;
 						<a href="javascript:changeDiv('view');" title='<fmt:message key="label.wiki.view.toolTip"></fmt:message>'>
 							<fmt:message key="label.wiki.view"></fmt:message>
 						</a>
@@ -476,6 +481,12 @@
 		
 		editorInstance.wikiLinkArray = wikiLinkArray;
 	}
+	
+	function refreshPage()
+	{
+		var url = "<lams:WebAppURL/>/learning.do?mode=${mode}&toolSessionID=${lrnForm.toolSessionID}&currentWikiPageId=${currentWikiPage.uid}"
+		window.location=url;
+	}
 
 -->
 </script>
Index: lams_tool_wiki/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/monitoring/summary.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_wiki/web/pages/monitoring/summary.jsp	10 Oct 2008 04:35:04 -0000	1.3
+++ lams_tool_wiki/web/pages/monitoring/summary.jsp	14 Nov 2008 07:29:52 -0000	1.4
@@ -203,7 +203,7 @@
 			<c:forEach var="session" items="${dto.sessionDTOs}">
 			<tr>
 				<td>
-					<a href='javascript:openViewWindow("./monitoring.do?dispatch=showWiki&amp;toolSessionID=${session.sessionID}");'>${session.sessionName}</a>
+					<a href='javascript:openViewWindow("./monitoring.do?dispatch=showWiki&amp;toolSessionID=${session.sessionID}&contentFolderID=${contentFolderID}");'>${session.sessionName}</a>
 				</td>	
 				<td>
 					${session.numberOfLearners}
Index: lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	4 Nov 2008 05:41:45 -0000	1.12
+++ lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	14 Nov 2008 07:29:52 -0000	1.13
@@ -10,6 +10,7 @@
 	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	<html:hidden property="dispatch" styleId="dispatch" />
 	<html:hidden property="toolSessionID" />
+	<html:hidden property="contentFolderID" />
 	<!--<html:hidden property="mode"/>-->
 	<html:hidden property="currentWikiPage" value="${currentWikiPage.uid}" styleId="currentWikiPage" />
 	<input type="hidden" id="wikiLinks" />
@@ -29,6 +30,10 @@
 		</div>
 
 		<div id="buttons" style="float: right; width: 50%; text-align:right;">
+			<a href="javascript:refreshPage();" title='<fmt:message key="label.wiki.refresh.toolTip"></fmt:message>'>
+				<fmt:message key="label.wiki.refresh"></fmt:message>
+			</a> 
+			&nbsp;
 			<a href="javascript:changeDiv('view');" title='<fmt:message key="label.wiki.view.toolTip"></fmt:message>'>
 				<fmt:message key="label.wiki.view"></fmt:message>
 			</a> 
@@ -302,7 +307,6 @@
 	<div id="finishButtonDiv"></div>
 </html:form>
 
-
 <script type="text/javascript">
 <!--
 	var wikiLinkArray = new Array();
@@ -365,6 +369,12 @@
 		editorInstance.wikiLinkArray = wikiLinkArray;
 	}
 	
+	function refreshPage()
+	{
+		var url = "<lams:WebAppURL/>/monitoring.do?dispatch=showWiki&toolSessionID=${sessionDTO.sessionID}&currentWikiPageId=${currentWikiPage.uid}&contentFolderID=${contentFolderID}"
+		window.location=url;
+	}
+	
 -->
 </script>