Index: lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -ra7fed1be51941ace379dbb695d52bd08a315dae6 -r56d116683b7554e8ad3677cd0e12866ac3feb834
--- lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a7fed1be51941ace379dbb695d52bd08a315dae6)
+++ lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 56d116683b7554e8ad3677cd0e12866ac3feb834)
@@ -89,7 +89,7 @@
 label.monitoring.vieawallmarks.false  =False
 label.monitoring.vieawallmarks.marks  =Marks:
 label.monitoring.vieawallmarks.comments  =Comments:
-
+label.monitoring.vieawallmarks.update.marks  =Update Marks
 label.reviewitem.spreadsheet.sent.by  =Spreadsheet sent by
 label.reviewitem.user.hasnot.sent.spreadsheet  =User hasn't sent spreadsheet yet.
 label.reviewitem.title  =Review User's Spreadsheet
Index: lams_tool_spreadsheet/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -ra7fed1be51941ace379dbb695d52bd08a315dae6 -r56d116683b7554e8ad3677cd0e12866ac3feb834
--- lams_tool_spreadsheet/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision a7fed1be51941ace379dbb695d52bd08a315dae6)
+++ lams_tool_spreadsheet/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 56d116683b7554e8ad3677cd0e12866ac3feb834)
@@ -101,7 +101,7 @@
 			validate="false" 
 			input="/pages/learning/learning.jsp" 
 			scope="request">
-			<forward name="saveUserSpreadsheet" redirect="true" path="/pages/learning/learning.jsp" />
+			<forward name="initPage" redirect="true" path="/learning/init.do" />
 			<forward name="continueReflect" redirect="true" path="/learning/newReflection.do" />			
 			<forward name="finishSession" redirect="true" path="/learning/finish.do" />
 		</action>
@@ -139,12 +139,12 @@
 		<action path="/monitoring/doStatistic"
 			type="org.lamsfoundation.lams.tool.spreadsheet.web.action.MonitoringAction"
 			parameter="doStatistic" >
-			<forward name="success" path="/pages/monitoring/statisticspart.jsp" />
+			<forward name="success" path="/pages/monitoring/parts/statisticspart.jsp" />
 		</action>
 		<action path="/monitoring/viewAllMarks"
 			type="org.lamsfoundation.lams.tool.spreadsheet.web.action.MonitoringAction"
 			parameter="viewAllMarks" >
-			<forward name="viewAllMarks" path="/pages/monitoring/viewallmarks.jsp" />
+			<forward name="viewAllMarks" path="/pages/monitoring/parts/viewallmarks.jsp" />
 		</action>
 		<action path="/monitoring/releaseMarks"
 			type="org.lamsfoundation.lams.tool.spreadsheet.web.action.MonitoringAction"
@@ -160,21 +160,21 @@
 			name="markForm" 
 			validate="false" 
 			scope="request">
-			<forward name="success" path="/pages/monitoring/editmark.jsp" />
+			<forward name="success" path="/pages/monitoring/parts/editmark.jsp" />
 		</action>
 		<action path="/monitoring/saveMark"
 			type="org.lamsfoundation.lams.tool.spreadsheet.web.action.MonitoringAction"
 			parameter="saveMark" 
 			name="markForm" 
 			validate="false" 
 			scope="request">
-            <forward name="editMark" path="/pages/monitoring/editmark.jsp" />
-			<forward name="success" path="/pages/monitoring/summarylist.jsp" />            			
+            <forward name="editMark" path="/pages/monitoring/parts/editmark.jsp" />
+			<forward name="success" path="/pages/monitoring/parts/summarylist.jsp" />            			
 		</action>		
 		<action path="/monitoring/viewReflection"
 			type="org.lamsfoundation.lams.tool.spreadsheet.web.action.MonitoringAction"
 			parameter="viewReflection">
-			<forward name="success" path="/pages/monitoring/notebook.jsp" />
+			<forward name="success" path="/pages/monitoring/parts/notebook.jsp" />
 		</action>
 		
 		<!-- ========== BEGIN: Common ============================== -->
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java
===================================================================
diff -u -ra7fed1be51941ace379dbb695d52bd08a315dae6 -r56d116683b7554e8ad3677cd0e12866ac3feb834
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java	(.../LearningAction.java)	(revision a7fed1be51941ace379dbb695d52bd08a315dae6)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java	(.../LearningAction.java)	(revision 56d116683b7554e8ad3677cd0e12866ac3feb834)
@@ -221,10 +221,8 @@
 		ISpreadsheetService service = getSpreadsheetService();
 		Spreadsheet spreadsheet = (Spreadsheet) sessionMap.get(SpreadsheetConstants.ATTR_RESOURCE);
 		SpreadsheetUser spreadsheetUser = getCurrentUser(service, sessionId);		
-		if(spreadsheet.isLearnerAllowedToSave() && !mode.isTeacher()){
-			if (spreadsheetUser.getUserModifiedSpreadsheet() != null) {
-				spreadsheet.setCode(spreadsheetUser.getUserModifiedSpreadsheet().getUserModifiedSpreadsheet());
-			}
+		if(spreadsheet.isLearnerAllowedToSave() && !mode.isTeacher() && (spreadsheetUser.getUserModifiedSpreadsheet() != null)){
+			spreadsheet.setCode(spreadsheetUser.getUserModifiedSpreadsheet().getUserModifiedSpreadsheet());
 		}
 
 		SpreadsheetForm spreadsheetForm = (SpreadsheetForm)form;
@@ -280,11 +278,12 @@
 		} else if ("continueReflect".equals(typeOfAction)) {
 			conf = mapping.findForwardConfig("continueReflect");
 		} else {
-			conf = mapping.findForwardConfig("saveUserSpreadsheet");
+			conf = mapping.findForwardConfig("initPage");
 		}
 		ActionRedirect redirect = new ActionRedirect(conf);
 		redirect.addParameter(SpreadsheetConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 		redirect.addParameter(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+		redirect.addParameter(AttributeNames.ATTR_MODE, mode);
 		return  redirect;
 	}
 	
Index: lams_tool_spreadsheet/web/includes/javascript/simple_spreadsheet/spreadsheet.js
===================================================================
diff -u -r7f9f772433a7fd55c4475241d4e3bc0765f474e8 -r56d116683b7554e8ad3677cd0e12866ac3feb834
--- lams_tool_spreadsheet/web/includes/javascript/simple_spreadsheet/spreadsheet.js	(.../spreadsheet.js)	(revision 7f9f772433a7fd55c4475241d4e3bc0765f474e8)
+++ lams_tool_spreadsheet/web/includes/javascript/simple_spreadsheet/spreadsheet.js	(.../spreadsheet.js)	(revision 56d116683b7554e8ad3677cd0e12866ac3feb834)
@@ -347,6 +347,7 @@
 	  }
 	}
   }
+
   out += "</tr>";
   out += "<tr><th id='-1_-1' ondblclick='editCell(-1,-1,0);' onclick='mouseoverCell(-1,-1);'>"+htmlEscape(showCell(-1,-1,0),true)+"</th>";
   for (var i=col0; i<cols+col0; i++) {
@@ -389,6 +390,7 @@
     }
     out += "</tr>";
   }
+
   out += "<tr id='spacer'><th class='empty'></th>";
   for (var i=col0; i<cols+col0; i++) out += "<th class='empty'><img src='' style='width:"+col_min_width+"; height:0px;'></th>";
   out += "</tr>";
@@ -415,7 +417,6 @@
   getObj("data").innerHTML = out;
   getObj("content").scrollLeft = scrollX;
   getObj("content").scrollTop = scrollY;
-
   mouseoverCell(currRow,currCol);
   if (clipboard_mode!="") {
     var color = "#DDDDFF"
@@ -535,12 +536,45 @@
   return setCells(arr[0],arr[1],item,value);
 }
 
-function loadScriptFile(location){
+function loadScriptFileAndCode(location, spreadsheetCode){
   var script = document.createElement("script");
   script.type = "text/javascript";
+  var code = spreadsheetCode.value;
+  
+  if (window.addEventListener) {
+    window.addEventListener("load",function() { load(code); },false);
+  } else {
+	  script.onreadystatechange = function() {
+		  if ((this.readyState == 'loaded') || (this.readyState == 'complete'))  {
+				    load(code); 
+			    }
+	  	   }
+	}
+  
   script.src = location;
   document.getElementsByTagName("head").item(0).appendChild(script);
 }
+
+function loadLamsCode(code) {
+  var script = document.createElement("script");
+  script.type = "text/javascript";
+
+    if (window.addEventListener) {
+    window.addEventListener("load",function() { load(code); },false);
+  } else {
+	  script.onreadystatechange = function() {
+//		  alert("onreadystatechange "+ this.readyState + "!");
+		  if ((this.readyState == 'loaded') || (this.readyState == 'complete'))  {
+				    load(code); 
+			    }
+	  	   }
+	}
+
+  document.getElementsByTagName("head").item(0).appendChild(script);
+}
+
+
+
 function loadStyleFile(location){
   var script = document.createElement("link");
   script.type = "text/css";
@@ -587,6 +621,7 @@
 	  return;
     }
   }
+  
   if (typeof cells[-2] != "undefined") showColumnGroups = true; else showColumnGroups = false;
   active = "content";
   getObj("source").style.display = "none";
@@ -767,21 +802,14 @@
 function loadSheetFromUrl(location) {
   var script = document.createElement("script");
   script.type = "text/javascript";
-//  if (window.addEventListener) {
-//    window.addEventListener("load",function() { load("// dbCells"); },false);
-//  } else {
-//    script.onreadystatechange = function() { if (this.readyState == 'loaded') load("// dbCells"); }
-//  }
-  window.addEventListener("load",function() { load("// dbCells"); },false);
+  if (window.addEventListener) {
+    window.addEventListener("load",function() { load("// dbCells"); },false);
+  } else {
+    script.onreadystatechange = function() { if (this.readyState == 'loaded') load("// dbCells"); }
+  }
   script.src = location;
   document.getElementsByTagName("head").item(0).appendChild(script);
-}
 
-function loadLamsCode(code) {
-  var script = document.createElement("script");
-  script.type = "text/javascript";
-  window.addEventListener("load",function() { load(code); },false);
-  document.getElementsByTagName("head").item(0).appendChild(script);
 }
 
 function loadCode() {
Index: lams_tool_spreadsheet/web/includes/javascript/simple_spreadsheet/spreadsheet_offline.html
===================================================================
diff -u -r7f9f772433a7fd55c4475241d4e3bc0765f474e8 -r56d116683b7554e8ad3677cd0e12866ac3feb834
--- lams_tool_spreadsheet/web/includes/javascript/simple_spreadsheet/spreadsheet_offline.html	(.../spreadsheet_offline.html)	(revision 7f9f772433a7fd55c4475241d4e3bc0765f474e8)
+++ lams_tool_spreadsheet/web/includes/javascript/simple_spreadsheet/spreadsheet_offline.html	(.../spreadsheet_offline.html)	(revision 56d116683b7554e8ad3677cd0e12866ac3feb834)
@@ -32,17 +32,7 @@
   <link media="all" href="styles.css" rel="stylesheet" type="text/css" />
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <script src="spreadsheet.js" type="text/javascript"></script>
-  <script>
-	var lang = "en";
-	if (m = /lang=([^&]*)/.exec(document.location.href)) {
-	  if (m[1]) lang = m[1];
-	}
-	loadScriptFile("translations/"+lang+".js");
-	
-	var spreadsheetCode = parent.document.getElementById("spreadsheet.code").value;
-	loadLamsCode(spreadsheetCode);
 
-  </script>
   
 </head>
 <body>
@@ -56,6 +46,27 @@
 <div class="data" id="data"></div>
 <div id="source" align="center">
 
+  <script>
+	var lang = "en";
+	if (m = /lang=([^&]*)/.exec(document.location.href)) {
+	  if (m[1]) lang = m[1];
+	}
+	
+	var spreadsheetCode = parent.document.getElementById("spreadsheet.code");
+	loadScriptFileAndCode("translations/"+lang+".js", spreadsheetCode);
+	
+  </script>
+
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
+
+
+
+
+
+
+
+
+
+
Fisheye: Tag 56d116683b7554e8ad3677cd0e12866ac3feb834 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/pages/monitoring/editmark.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 56d116683b7554e8ad3677cd0e12866ac3feb834 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/pages/monitoring/notebook.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp
===================================================================
diff -u
--- lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp	(revision 0)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp	(revision 56d116683b7554e8ad3677cd0e12866ac3feb834)
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+		"http://www.w3.org/TR/html4/loose.dtd">
+<%@ include file="/common/taglibs.jsp"%>
+
+<lams:html>
+	<lams:head>
+		<%@ include file="/common/header.jsp"%>
+		<lams:css style="tabbed" />
+	</lams:head>
+	<body class="tabpart">
+		<!-- Basic Info Form-->
+		<%@ include file="/common/messages.jsp"%>
+
+		<html:form action="/monitoring/saveMark" method="post" styleId="markForm" focus="marks">
+			<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+			<c:set var="sessionMapID" value="${formBean.sessionMapID}" />				
+			<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+			<html:hidden property="sessionMapID" />
+			<html:hidden property="userUid" />
+			
+			<h2 class="no-space-left">
+				<fmt:message key="label.monitoring.summary.marking.marking" />
+			</h2>
+
+			<div class="field-name">
+            	<fmt:message key="label.monitoring.summary.marking.marks" />
+			</div>
+
+			<div class="small-space-bottom">
+         		<html:text property="marks" size="55"/>
+			</div>
+
+			<div class="field-name">
+            	<fmt:message key="label.monitoring.summary.marking.comments" />
+			</div>
+
+			<div class="small-space-bottom" >
+				<lams:FCKEditor id="comments" value="${formBean.comments}" contentFolderID="${sessionMap.contentFolderID}" />
+			</div>
+			
+		</html:form>
+
+		<lams:ImgButtonWrapper>
+			<a href="#" onclick="markForm.submit();" class="button space-left">
+				<fmt:message key="label.monitoring.summary.marking.update.marks" /> 
+			</a>
+			<a href="javascript:;" onclick="window.top.hideMessage();" class="button space-left">
+				<fmt:message key="label.cancel" /> 
+			</a>
+		</lams:ImgButtonWrapper>
+	</body>
+</lams:html>
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/notebook.jsp
===================================================================
diff -u
--- lams_tool_spreadsheet/web/pages/monitoring/parts/notebook.jsp	(revision 0)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/notebook.jsp	(revision 56d116683b7554e8ad3677cd0e12866ac3feb834)
@@ -0,0 +1,48 @@
+<%@ include file="/common/taglibs.jsp"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<lams:html>
+<lams:head>
+	<title><fmt:message key="label.learning.title" /></title>
+	<%@ include file="/common/header.jsp"%>
+</lams:head>
+<body class="stripes">
+		
+			<div id="content">
+				<h1>
+					<fmt:message key="page.title.monitoring.view.reflection"/>
+				</h1>
+				${userDTO.fullName}<BR><BR>
+				<table class="alternative-color" cellspacing="0">
+					<tr>
+						<th class="first">
+							<lams:out value="${userDTO.reflectInstrctions}"/>
+						</th>
+					</tr>
+					<tr>
+						<td>
+							<c:choose>
+								<c:when test="${userDTO.finishReflection}">
+									<lams:out value="${userDTO.reflect}"/>
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="message.no.reflection.available" />
+								</c:otherwise>
+							</c:choose>
+						</td>
+					</tr>
+				</table>
+				<table cellpadding="0">
+					<tr>
+						<td>
+							<a href="javascript:window.close();" class="button"><fmt:message key="button.close"/></a>
+						</td>
+					</tr>
+				</table>
+			</div>
+		<div id="footer">
+		</div>
+		<!--closes footer-->
+</body>
+</lams:html>
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/statisticspart.jsp
===================================================================
diff -u
--- lams_tool_spreadsheet/web/pages/monitoring/parts/statisticspart.jsp	(revision 0)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/statisticspart.jsp	(revision 56d116683b7554e8ad3677cd0e12866ac3feb834)
@@ -0,0 +1,35 @@
+<%-- This is for AJAX call to refresh statistic page  --%>
+<%@ include file="/common/taglibs.jsp"%>
+<c:forEach var="statistic" items="${statisticList}">
+	<table cellpadding="0">
+		<tr>
+			<th colspan="2">
+				<fmt:message key="label.monitoring.statistics.session.name" /> <c:out value="${statistic.sessionName}" />
+			</th>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="label.monitoring.statistics.marked" />
+			</td>
+			<td>
+				<c:out value="${statistic.markedCounter}" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="label.monitoring.statistics.not.marked" />
+			</td>
+			<td>
+				<c:out value="${statistic.notMarkedCounter}" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="label.monitoring.statistics.total.spreadsheets.sent.by.learners" />
+			</td>
+			<td>
+				<c:out value="${statistic.totalSpreadsheetsSentByLearners}" />
+			</td>
+		</tr>
+	</table>
+</c:forEach>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp
===================================================================
diff -u
--- lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp	(revision 0)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp	(revision 56d116683b7554e8ad3677cd0e12866ac3feb834)
@@ -0,0 +1,155 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="summaryList" value="${sessionMap.summaryList}"/>
+<c:set var="spreadsheet" value="${sessionMap.spreadsheet}"/>
+
+<c:if test="${empty summaryList}">
+	<div align="center">
+		<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
+	</div>
+</c:if>
+
+<div id="summaryList2">
+	<c:forEach var="summary" items="${summaryList}" varStatus="firstGroup">
+		<h1><fmt:message key="monitoring.label.group" /> ${summary.sessionName}	</h1>
+		<h2 style="color:black; margin-left: 20px;"><fmt:message key="label.monitoring.summary.overall.summary" />	</h2>
+		<table cellpadding="0" class="alternative-color" >
+	
+			<tr>
+				<th width="60%" align="left">
+					<fmt:message key="label.monitoring.summary.learner" />
+				</th>
+				<c:if test="${spreadsheet.markingEnabled}">			
+					<th width="40px" align="center">
+						<fmt:message key="label.monitoring.summary.marked" />
+					</th>
+					<th width="20px" align="left">
+					</th>
+				</c:if>
+			</tr>
+	
+			<c:forEach var="user" items="${summary.users}" varStatus="userStatus">
+				<tr>
+					<td>
+						<c:choose>
+							<c:when test="${spreadsheet.learnerAllowedToSave}">
+								<c:set var="reviewItem">
+									<c:url value="/reviewItem.do?userUid=${user.uid}"/>
+								</c:set>
+								<html:link href="javascript:launchPopup('${reviewItem}')">
+									${user.loginName}
+								</html:link>
+							</c:when>
+							<c:otherwise>
+								${user.loginName}
+							</c:otherwise>
+						</c:choose>					
+					</td>
+					
+					<c:if test="${spreadsheet.markingEnabled}">					
+						<td align="center">
+							<c:choose>
+								<c:when test="${(user.userModifiedSpreadsheet != null) && (user.userModifiedSpreadsheet.mark != null)}">
+									<img src="<lams:LAMSURL/>/images/tick.gif" alt="tick" border="0"/>
+								</c:when>
+									
+								<c:otherwise>
+									<img src="<lams:LAMSURL/>/images/cross.gif" alt="cross" border="0"/>
+								</c:otherwise>
+							</c:choose>
+						</td>
+						
+						
+						
+						
+							<c:choose>
+								<c:when test="${user.userModifiedSpreadsheet != null}">
+									<td align="left">								
+										<html:link
+											href="javascript:editMark(${user.uid});"
+											property="Mark" styleClass="button" >
+											<fmt:message key="label.monitoring.summary.mark.button" />
+										</html:link>
+									</td>										
+								</c:when>
+									
+								<c:otherwise>
+									<td align="center">
+										<fmt:message key="label.monitoring.summary.mark.button" />
+									</td>
+								</c:otherwise>
+							</c:choose>						
+						
+						
+
+
+					</c:if>				
+				</tr>
+			</c:forEach>
+			
+		</table>
+		<c:if test="${spreadsheet.markingEnabled}">	
+			<div style="position:relative; left:30px; ">
+				<html:link href="javascript:viewAllMarks(${summary.sessionId});"
+					property="viewAllMarks" styleClass="button">
+					<fmt:message key="label.monitoring.summary.viewAllMarks.button" />
+				</html:link>
+				<html:link href="javascript:releaseMarks(${summary.sessionId});"
+					property="releaseMarks" styleClass="button">
+					<fmt:message key="label.monitoring.summary.releaseMarks.button" />
+				</html:link>
+ 				<html:link href="javascript:downloadMarks(${summary.sessionId});"
+					property="downloadMarks" styleClass="button">
+					<fmt:message key="label.monitoring.summary.downloadMarks.button" />
+				</html:link>
+			</div>
+		</c:if>
+		
+		<%-- Reflection list  --%>
+		
+		<c:if test="${sessionMap.spreadsheet.reflectOnActivity}">
+		
+			<h2 style="color:black; margin-left: 20px; " ><fmt:message key="label.monitoring.summary.title.reflection"/>	</h2>
+			<table cellpadding="0"  class="alternative-color"  >
+	
+				<tr>
+					<th>
+						<fmt:message key="label.monitoring.summary.user"/>
+					</th>
+					<th>
+						<fmt:message key="label.monitoring.summary.reflection"/>
+					</th>
+				</tr>				
+							
+				<c:forEach var="user" items="${summary.users}">
+					<tr>
+						<td>
+							${user.loginName}
+						</td>
+						<td >
+							<c:set var="viewReflection">
+								<c:url value="/monitoring/viewReflection.do?userUid=${user.uid}"/>
+							</c:set>
+							<html:link href="javascript:launchPopup('${viewReflection}')">
+								<fmt:message key="label.view" />
+							</html:link>
+						</td>
+					</tr>
+				</c:forEach>
+							
+			</table>
+		</c:if>
+		<br>
+		
+		
+	</c:forEach>
+</div>
+
+<%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
+<script lang="javascript">
+	if(window.top != null){
+		window.top.hideMessage();
+		var obj = window.top.document.getElementById('summariesArea');
+		obj.innerHTML= document.getElementById("summaryList2").innerHTML;
+	}
+</script>
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/viewallmarks.jsp
===================================================================
diff -u
--- lams_tool_spreadsheet/web/pages/monitoring/parts/viewallmarks.jsp	(revision 0)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/viewallmarks.jsp	(revision 56d116683b7554e8ad3677cd0e12866ac3feb834)
@@ -0,0 +1,121 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@include file="/common/taglibs.jsp"%>
+<lams:html>
+<lams:head>
+	<title><fmt:message key="activity.title" /></title>
+	<lams:css/>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/common.js"></script>
+	<script type="text/javascript">
+		function updateMark(userUid){
+			window.opener.editMark(userUid);
+			window.close();
+		}
+		function closeWindow() {
+			window.close();
+		}  				
+	</script>
+</lams:head>
+<body class="stripes">
+
+		<div id="content">
+		<h1>
+			<fmt:message key="label.monitoring.vieawallmarks.heading.marking"/>
+		</h1>
+
+			<table cellpadding="0">
+				<c:forEach var="user" items="${userList}" varStatus="status">
+						
+						
+					<tr>
+						<td class="field-name">
+							<fmt:message key="label.monitoring.vieawallmarks.learner" />
+						</td>
+						<td>
+							<c:out value="${user.loginName}" />
+						</td>
+					</tr>	
+					
+					<tr>
+						<td class="field-name">
+							<fmt:message key="label.monitoring.vieawallmarks.spreadsheet.submitted" />
+						</td>
+						<td>
+							<c:choose>
+								<c:when test="${user.userModifiedSpreadsheet != null}">
+									<fmt:message key="label.monitoring.vieawallmarks.true" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="label.monitoring.vieawallmarks.false" />
+								</c:otherwise>
+							</c:choose>
+						</td>
+					</tr>					
+					
+					<tr>
+						<td class="field-name">
+							<fmt:message key="label.monitoring.vieawallmarks.marks" />
+						</td>
+						<td>
+							<c:choose>
+								<c:when test="${(user.userModifiedSpreadsheet != null) && (user.userModifiedSpreadsheet.mark != null)}">
+									<c:out value="${user.userModifiedSpreadsheet.mark.marks}" escapeXml="false" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="label.learning.not.available" />
+								</c:otherwise>
+							</c:choose>
+							<c:choose>
+								<c:when test="${user.userModifiedSpreadsheet != null}">
+									<html:link href="javascript:updateMark(${user.uid});" 
+										property="submit" styleClass="button">
+										<fmt:message key="label.monitoring.vieawallmarks.update.marks" />
+									</html:link>
+								</c:when>
+								<c:otherwise>
+										<fmt:message key="label.monitoring.vieawallmarks.update.marks" />
+								</c:otherwise>
+							</c:choose>							
+
+						</td>
+					</tr>
+					
+					<tr>
+						<td class="field-name">
+							<fmt:message key="label.monitoring.vieawallmarks.comments" />
+						</td>
+						<td>
+							<c:choose>
+								<c:when test="${(user.userModifiedSpreadsheet != null) && (user.userModifiedSpreadsheet.mark != null)}">
+									<c:out value="${user.userModifiedSpreadsheet.mark.comments}" escapeXml="false" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="label.learning.not.available" />
+								</c:otherwise>
+							</c:choose>
+						</td>
+					</tr>
+					
+					
+					<tr>
+						<td colspan="2">
+							<hr size="1" style="width:500px"/>
+						</td>
+					</tr>
+					<br><br>
+						
+				</c:forEach>
+				<tr>
+					<td colspan="2">
+						<html:link href="javascript:closeWindow();" property="submit" styleClass="button">
+							<fmt:message key="button.close" />
+						</html:link>
+					</td>
+				</tr>
+			</table>
+		</div>
+		<div id="footer"></div>
+
+</body>
+</lams:html>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/pages/monitoring/statistics.jsp
===================================================================
diff -u -r7f9f772433a7fd55c4475241d4e3bc0765f474e8 -r56d116683b7554e8ad3677cd0e12866ac3feb834
--- lams_tool_spreadsheet/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 7f9f772433a7fd55c4475241d4e3bc0765f474e8)
+++ lams_tool_spreadsheet/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 56d116683b7554e8ad3677cd0e12866ac3feb834)
@@ -1,5 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
 <img src="${tool}/images/indicator.gif" style="display:none" id="statisticArea_Busy" />
 <div id="statisticArea">
-	<%@ include file="statisticspart.jsp"%>
+	<%@ include file="parts/statisticspart.jsp"%>
 </div>
\ No newline at end of file
Fisheye: Tag 56d116683b7554e8ad3677cd0e12866ac3feb834 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/pages/monitoring/statisticspart.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/web/pages/monitoring/summary.jsp
===================================================================
diff -u -ra7fed1be51941ace379dbb695d52bd08a315dae6 -r56d116683b7554e8ad3677cd0e12866ac3feb834
--- lams_tool_spreadsheet/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision a7fed1be51941ace379dbb695d52bd08a315dae6)
+++ lams_tool_spreadsheet/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 56d116683b7554e8ad3677cd0e12866ac3feb834)
@@ -143,7 +143,7 @@
 <%@ include file="/common/messages.jsp"%>
 
 <div id="summariesArea">
-	<%@ include file="/pages/monitoring/summarylist.jsp"%>
+	<%@ include file="/pages/monitoring/parts/summarylist.jsp"%>
 </div>
 
 <c:if test="${spreadsheet.markingEnabled}">	
Fisheye: Tag 56d116683b7554e8ad3677cd0e12866ac3feb834 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/pages/monitoring/summarylist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 56d116683b7554e8ad3677cd0e12866ac3feb834 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/pages/monitoring/userlist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 56d116683b7554e8ad3677cd0e12866ac3feb834 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/pages/monitoring/viewallmarks.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?