Index: lams_tool_larsrc/conf/language/ApplicationResources.properties
===================================================================
diff -u -r7680015a04ac12aafe77a9700c04c0039fb137f6 -r71cccb6c7558909803c2886472385427cdc4a281
--- lams_tool_larsrc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7680015a04ac12aafe77a9700c04c0039fb137f6)
+++ lams_tool_larsrc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 71cccb6c7558909803c2886472385427cdc4a281)
@@ -150,3 +150,4 @@
 
 
 #======= End labels: Exported 141 labels for en AU =====
+label.monitoring.heading.access=Learners list 
\ No newline at end of file
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
===================================================================
diff -u -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888 -r71cccb6c7558909803c2886472385427cdc4a281
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 71cccb6c7558909803c2886472385427cdc4a281)
@@ -45,6 +45,7 @@
 import org.lamsfoundation.lams.tool.rsrc.util.ResourceWebUtils;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -57,9 +58,6 @@
 	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) throws IOException, ServletException {
 		String param = mapping.getParameter();
-		// -----------------------Resource Author function
-		// ---------------------------
-		request.getSession().setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER);
 
 		if (param.equals("summary")) {
 			return summary(mapping, form, request, response);
@@ -86,8 +84,13 @@
 		IResourceService service = getResourceService();
 		service.setItemVisible(itemUid,false);
 		
+		//get back SessionMap
+		String sessionMapID = request.getParameter(ResourceConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+		
 		//update session value
-		List<List> groupList = (List<List>) request.getSession().getAttribute(ResourceConstants.ATTR_SUMMARY_LIST);
+		List<List> groupList = (List<List>) sessionMap.get(ResourceConstants.ATTR_SUMMARY_LIST);
 		if(groupList != null)
 			for(List<Summary> group : groupList){
 				for(Summary sum: group){
@@ -107,8 +110,13 @@
 		IResourceService service = getResourceService();
 		service.setItemVisible(itemUid,true);
 		
+		//get back SessionMap
+		String sessionMapID = request.getParameter(ResourceConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+		
 		//update session value
-		List<List> groupList = (List<List>) request.getSession().getAttribute(ResourceConstants.ATTR_SUMMARY_LIST);
+		List<List> groupList = (List<List>) sessionMap.get(ResourceConstants.ATTR_SUMMARY_LIST);
 		if(groupList != null)
 			for(List<Summary> group : groupList){
 				for(Summary sum: group){
@@ -123,18 +131,24 @@
 
 	private ActionForward summary(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
+		//initial Session Map 
+		SessionMap sessionMap = new SessionMap();
+		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+		request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+		
 		Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 		IResourceService service = getResourceService();
 		List<List<Summary>> groupList = service.getSummary(contentId);
 		
-		//put it into HTTPSession
-		request.getSession().setAttribute(ResourceConstants.ATTR_SUMMARY_LIST, groupList);
-		
 		Resource resource = service.getResourceByContentId(contentId);
 		resource.toDTO();
-		request.getSession().setAttribute(ResourceConstants.PAGE_EDITABLE, new Boolean(ResourceWebUtils.isResourceEditable(resource)));
-		request.getSession().setAttribute(ResourceConstants.ATTR_RESOURCE, resource);
-		request.getSession().setAttribute(ResourceConstants.ATTR_TOOL_CONTENT_ID, contentId);
+
+		//cache into sessionMap
+		sessionMap.put(ResourceConstants.ATTR_SUMMARY_LIST, groupList);
+		sessionMap.put(ResourceConstants.PAGE_EDITABLE, new Boolean(ResourceWebUtils.isResourceEditable(resource)));
+		sessionMap.put(ResourceConstants.ATTR_RESOURCE, resource);
+		sessionMap.put(ResourceConstants.ATTR_TOOL_CONTENT_ID, contentId);
+		
 		return mapping.findForward(ResourceConstants.SUCCESS);
 	}
 
Index: lams_tool_larsrc/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r5ca22e4b948f3f34a5505cedf17cb8ff06490fb4 -r71cccb6c7558909803c2886472385427cdc4a281
--- lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 5ca22e4b948f3f34a5505cedf17cb8ff06490fb4)
+++ lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 71cccb6c7558909803c2886472385427cdc4a281)
@@ -1,4 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="resource" value="${sessionMap.resource}"/>
 
 <table cellpadding="0">
 	<tr>
@@ -23,11 +25,11 @@
 
 	<tr>
 		<td colspan="2">
-			<c:set var="isPageEditable" value="${isPageEditable}" />
+			<c:set var="isPageEditable" value="${sessionMap.isPageEditable}" />
 			<c:choose>
 				<c:when test='${isPageEditable == "true"}'>
-					<c:url value="/definelater.do" var="authoringUrl">
-						<c:param name="toolContentID" value="${toolContentID}" />
+					<c:url  var="authoringUrl" value="/definelater.do">
+						<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 					</c:url>
 					<html:link href="${authoringUrl}" styleClass="button" target="_blank">
 						<fmt:message key="label.monitoring.edit.activity.edit" />
Index: lams_tool_larsrc/web/pages/monitoring/instructions.jsp
===================================================================
diff -u -r91331dfb80134a0a25194610b14304e22c3af422 -r71cccb6c7558909803c2886472385427cdc4a281
--- lams_tool_larsrc/web/pages/monitoring/instructions.jsp	(.../instructions.jsp)	(revision 91331dfb80134a0a25194610b14304e22c3af422)
+++ lams_tool_larsrc/web/pages/monitoring/instructions.jsp	(.../instructions.jsp)	(revision 71cccb6c7558909803c2886472385427cdc4a281)
@@ -1,4 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="resource" value="${sessionMap.resource}"/>
 
 
 <table cellpadding="0">
Index: lams_tool_larsrc/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r91331dfb80134a0a25194610b14304e22c3af422 -r71cccb6c7558909803c2886472385427cdc4a281
--- lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 91331dfb80134a0a25194610b14304e22c3af422)
+++ lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 71cccb6c7558909803c2886472385427cdc4a281)
@@ -20,8 +20,8 @@
 		    	selectTab(tabId);
 	        } 
 	        
-		    function viewItem(itemUid){
-				var myUrl = "<c:url value="/reviewItem.do"/>?mode=teacher&itemUid=" + itemUid;
+		    function viewItem(itemUid,sessionMapID){
+				var myUrl = "<c:url value="/reviewItem.do"/>?mode=teacher&itemUid=" + itemUid + "&sessionMapID="+sessionMapID;
 				launchPopup(myUrl,"MonitoringReview");
 			}
 	    </script>		 
Index: lams_tool_larsrc/web/pages/monitoring/statistic.jsp
===================================================================
diff -u -r91331dfb80134a0a25194610b14304e22c3af422 -r71cccb6c7558909803c2886472385427cdc4a281
--- lams_tool_larsrc/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 91331dfb80134a0a25194610b14304e22c3af422)
+++ lams_tool_larsrc/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 71cccb6c7558909803c2886472385427cdc4a281)
@@ -1,5 +1,8 @@
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="summaryList" value="${sessionMap.summaryList}"/>
 
+
 <table cellspacing="3">
 	<c:if test="${empty summaryList}">
 		<div align="center">
Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r91331dfb80134a0a25194610b14304e22c3af422 -r71cccb6c7558909803c2886472385427cdc4a281
--- lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 91331dfb80134a0a25194610b14304e22c3af422)
+++ lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 71cccb6c7558909803c2886472385427cdc4a281)
@@ -1,9 +1,13 @@
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="summaryList" value="${sessionMap.summaryList}"/>
+
 <c:if test="${empty summaryList}">
 	<div align="center">
 		<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
 	</div>
 </c:if>
+
 <table cellpadding="0">
 	<c:forEach var="group" items="${summaryList}" varStatus="firstGroup">
 		<c:set var="groupSize" value="${fn:length(group)}" />
@@ -64,7 +68,7 @@
 						</c:choose>
 					</td>
 					<td>
-						<a href="javascript:;" onclick="viewItem(${item.itemUid})">${item.itemTitle}</a>
+						<a href="javascript:;" onclick="viewItem(${item.itemUid},'${sessionMapID}')">${item.itemTitle}</a>
 					</td>
 					<td>
 						<c:if test="${!item.itemCreateByAuthor}">
@@ -87,10 +91,10 @@
 					<td align="center">
 						<c:choose>
 							<c:when test="${item.itemHide}">
-								<a href="<c:url value='/monitoring/showitem.do'/>?itemUid=${item.itemUid}" class="button"> <fmt:message key="monitoring.label.show" /> </a>
+								<a href="<c:url value='/monitoring/showitem.do'/>?sessionMapID=${sessionMapID}&itemUid=${item.itemUid}" class="button"> <fmt:message key="monitoring.label.show" /> </a>
 							</c:when>
 							<c:otherwise>
-								<a href="<c:url value='/monitoring/hideitem.do'/>?itemUid=${item.itemUid}" class="button"> <fmt:message key="monitoring.label.hide" /> </a>
+								<a href="<c:url value='/monitoring/hideitem.do'/>?sessionMapID=${sessionMapID}&itemUid=${item.itemUid}" class="button"> <fmt:message key="monitoring.label.hide" /> </a>
 							</c:otherwise>
 						</c:choose>
 					</td>
Index: lams_tool_larsrc/web/pages/monitoring/userlist.jsp
===================================================================
diff -u -r4fa9a710e5680a5d0f363bd840c2ddeda43bca46 -r71cccb6c7558909803c2886472385427cdc4a281
--- lams_tool_larsrc/web/pages/monitoring/userlist.jsp	(.../userlist.jsp)	(revision 4fa9a710e5680a5d0f363bd840c2ddeda43bca46)
+++ lams_tool_larsrc/web/pages/monitoring/userlist.jsp	(.../userlist.jsp)	(revision 71cccb6c7558909803c2886472385427cdc4a281)
@@ -1,9 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+
 <%@ include file="/common/taglibs.jsp"%>
-<htm>
+<html>
 <head>
 	    <%@ include file="/common/header.jsp" %>
 </head>
 <body>
+	<div id="page-learner">
+		<h1 class="no-tabs-below">
+			<fmt:message key="label.monitoring.heading.access"/>
+		</h1>
+		<div id="header-no-tabs-learner">
+		</div>
+		<div id="content-learner">
 	<table border="0" cellspacing="3" width="98%">
 		<tr>
 			<th>
@@ -31,9 +42,13 @@
 		</c:forEach>
 		<tr>
 			<td colspan="3" align="right">
-				<a href="javaqscript:;" onclick="window.close()" style="button">Close</a>
+				<a href="javaqscript:;" onclick="window.close()" class="button">Close</a>
 			</td>
 		</tr>
 	</table>
+</div>
+		<div id="footer-learner"></div>
+		</div>
+	</div>
 </body>
-</html>
+</html>
\ No newline at end of file