Index: lams_tool_larsrc/conf/language/ApplicationResources.properties
===================================================================
diff -u -r5c046644c57d0a0bfe3d85644a387a86331ee70c -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5c046644c57d0a0bfe3d85644a387a86331ee70c)
+++ lams_tool_larsrc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -131,6 +131,7 @@
 monitoring.label.user.loginname=Login name
 monitoring.label.user.name=Name
 monitoring.label.hidden=Hidden
+monitoring.label.access.time=Access time
 
 label.monitoring.edit.activity.cancel  =Cancel
 label.monitoring.edit.activity.update  =Update
Index: lams_tool_larsrc/db/sql/activity_insert.sql
===================================================================
diff -u -r0a704617c31a5847217132f6b7cd73a4b9b43c9f -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/db/sql/activity_insert.sql	(.../activity_insert.sql)	(revision 0a704617c31a5847217132f6b7cd73a4b9b43c9f)
+++ lams_tool_larsrc/db/sql/activity_insert.sql	(.../activity_insert.sql)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -45,7 +45,7 @@
 (
 NULL
 , 'Share Resources'
-, 'Share Resoruces'
+, 'Share Resources'
 , 'Put some help text here.'
 , NULL
 , NULL
Index: lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql
===================================================================
diff -u -rf44c4b85fd2563394f045ad28218d3c0b5cbb9da -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql	(.../create_lams_tool_rsrc.sql)	(revision f44c4b85fd2563394f045ad28218d3c0b5cbb9da)
+++ lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql	(.../create_lams_tool_rsrc.sql)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -106,5 +106,5 @@
 
 
 INSERT INTO `tl_larsrc11_resource` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`, `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `allow_add_files`, `allow_add_urls`, `mini_view_resource_number`, `allow_auto_run`) VALUES
-  (2,NULL,NULL,NULL,'LAMS Shared Resources','0','0','Instruction','Online instruction','Offline instruction',1,1,${default_content_id},1,1,1,1);
+  (2,NULL,NULL,NULL,'LAMS Shared Resources','0','0','Instruction','Online instruction','Offline instruction',0,1,${default_content_id},1,1,1,1);
 SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_larsrc/library_licenses.txt
===================================================================
diff -u
--- lams_tool_larsrc/library_licenses.txt	(revision 0)
+++ lams_tool_larsrc/library_licenses.txt	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -0,0 +1,10 @@
+Tigra Tree Javascript license description:
+There is no license fee or royalty fee to be paid at any time for using the Tigra Tree Menu v1.x
+You may include the source code or modified source code within your own projects for either personal or commercial use but excluding the restrictions outlined below. The following restrictions apply to all parts of the component, including all source code, samples and documentation.
+
+    * Header block of script file (tree.js) CAN NOT be modified or removed.
+    * The above items CAN NOT be sold as are, either individually or together.
+    * The above items CAN NOT be modified and then sold as a library component, either individually or together. 
+
+
+For more detail, http://www.softcomplex.com/products/tigra_tree_menu/docs/
\ No newline at end of file
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/Summary.java
===================================================================
diff -u -r6f9ce8030c9939df344a3aa7f5894116491a90d8 -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/Summary.java	(.../Summary.java)	(revision 6f9ce8030c9939df344a3aa7f5894116491a90d8)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/Summary.java	(.../Summary.java)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -185,6 +185,4 @@
 		this.isInitGroup = isInitGroup;
 	}
 	
-	
-	
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java
===================================================================
diff -u -rc8f42df13810316bf19cfe3239ad45fe881b886e -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	(.../Resource.java)	(revision c8f42df13810316bf19cfe3239ad45fe881b886e)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	(.../Resource.java)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -23,11 +23,14 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.rsrc.model;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.log4j.Logger;
@@ -81,6 +84,8 @@
 	private IToolContentHandler toolContentHandler;
 
 	private String miniViewNumberStr;
+	private List<ResourceAttachment> onlineFileList;
+	private List<ResourceAttachment> offlineFileList;
 	/**
 	 * Default contruction method. 
 	 *
@@ -190,6 +195,19 @@
 		this.setUpdated(new Date(now));
 	}
 
+	public void toDTO(){
+		onlineFileList = new ArrayList<ResourceAttachment>();
+		offlineFileList = new ArrayList<ResourceAttachment>();
+		Set<ResourceAttachment> fileSet = this.getAttachments();
+		if(fileSet != null){
+			for(ResourceAttachment file:fileSet){
+				if(StringUtils.equalsIgnoreCase(file.getFileType(),IToolContentHandler.TYPE_OFFLINE))
+					offlineFileList.add(file);
+				else
+					onlineFileList.add(file);
+			}
+		}
+	}
 	//**********************************************************
 	// get/set methods
 	//**********************************************************
@@ -490,6 +508,18 @@
 	public void setMiniViewNumberStr(String minViewNumber) {
 		this.miniViewNumberStr = minViewNumber;
 	}
+	public List<ResourceAttachment> getOfflineFileList() {
+		return offlineFileList;
+	}
+	public void setOfflineFileList(List<ResourceAttachment> offlineFileList) {
+		this.offlineFileList = offlineFileList;
+	}
+	public List<ResourceAttachment> getOnlineFileList() {
+		return onlineFileList;
+	}
+	public void setOnlineFileList(List<ResourceAttachment> onlineFileList) {
+		this.onlineFileList = onlineFileList;
+	}
 
 
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java
===================================================================
diff -u -rc8f42df13810316bf19cfe3239ad45fe881b886e -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java	(.../ResourceUser.java)	(revision c8f42df13810316bf19cfe3239ad45fe881b886e)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java	(.../ResourceUser.java)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -23,6 +23,8 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.rsrc.model;
 
+import java.util.Date;
+
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.log4j.Logger;
@@ -45,6 +47,10 @@
 	private String loginName;
 	private ResourceSession session;
 	
+	//=============== NON Persisit value: for display use ===========
+	//the user access some reousrce item date time. Use in monitoring summary page
+	private Date accessDate;
+	
 	public ResourceUser(){
 	}
 	public ResourceUser(UserDTO user, ResourceSession session){
@@ -152,5 +158,11 @@
 		.append(lastName).append(loginName)
 		.toHashCode();
 	}
+	public Date getAccessDate() {
+		return accessDate;
+	}
+	public void setAccessDate(Date accessDate) {
+		this.accessDate = accessDate;
+	}
 
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -r5c046644c57d0a0bfe3d85644a387a86331ee70c -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 5c046644c57d0a0bfe3d85644a387a86331ee70c)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -503,7 +503,9 @@
 		List<ResourceItemVisitLog> logList = resourceItemVisitDao.getResourceItemLogBySession(sessionId,itemUid);
 		List<ResourceUser> userList = new ArrayList(logList.size());
 		for(ResourceItemVisitLog visit : logList){
-			userList.add(visit.getUser());
+			ResourceUser user = visit.getUser();
+			user.setAccessDate(visit.getAccessDate());
+			userList.add(user);
 		}
 		return userList;
 	}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -r50d68fddcd33b33903cd4c0119f01080b9314b80 -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -511,6 +511,9 @@
 				service.deleteFromRepository(delAtt.getFileUuid(),delAtt.getFileVersionId());
 			}
 			
+			//if miniview number is bigger than available items, then force it to 1
+			if(resourcePO.getMiniViewResourceNumber() > topics.size())
+				resourcePO.setMiniViewResourceNumber((topics.size()==0?0:1));
 			//**********************************************
 			//finally persist resourcePO again
 			service.saveOrUpdateResource(resourcePO);
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
===================================================================
diff -u -r962368626dedf96b0d7c3bf5028905a97988356b -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 962368626dedf96b0d7c3bf5028905a97988356b)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -129,6 +129,7 @@
 		request.getSession().setAttribute(ResourceConstants.ATTR_SUMMARY_LIST, groupList);
 		
 		Resource resource = service.getResourceByContentId(contentId);
+		resource.toDTO();
 		request.getSession().setAttribute(ResourceConstants.PAGE_EDITABLE, new Boolean(isResourceEditable(resource)));
 		request.getSession().setAttribute(ResourceConstants.ATTR_RESOURCE, resource);
 		request.getSession().setAttribute(ResourceConstants.ATTR_TOOL_CONTENT_ID, contentId);
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
===================================================================
diff -u -rfc7f983fbdc263b826831b5b6f4839290f7ef964 -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java	(.../ViewItemAction.java)	(revision fc7f983fbdc263b826831b5b6f4839290f7ef964)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java	(.../ViewItemAction.java)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -94,7 +94,7 @@
 			//authoring: does not save item yet, so only has ItemList from session and identity by Index
 			List<ResourceItem> resourceList = getResourceItemList(request);
 			item = resourceList.get(itemIdx);
-		}else if(mode.isLearner()){
+		}else if(mode.isLearner() || mode.isTeacher()){
 			Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
 			//save itemUid to HttpSession
 			request.getSession().setAttribute(ResourceConstants.ATTR_RESOURCE_ITEM_UID,itemUid);
Index: lams_tool_larsrc/web/pages/authoring/advance.jsp
===================================================================
diff -u -rc8f42df13810316bf19cfe3239ad45fe881b886e -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision c8f42df13810316bf19cfe3239ad45fe881b886e)
+++ lams_tool_larsrc/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -20,12 +20,17 @@
 		</tr>
 		<tr>
 			<td class="formcontrol">
-				<html:select property="resource.miniViewResourceNumber">
-					<html:option value="1">1</html:option>
-					<html:option value="2">2</html:option>
-					<html:option value="3">3</html:option>
-					<html:option value="4">4</html:option>
-					<html:option value="5">5</html:option>
+				<html:select property="resource.miniViewResourceNumber" styleId="viewNumList">
+					<c:forEach begin="1" end="${fn:length(resourceList)}" varStatus="status">
+						<c:choose>
+							<c:when test="${formBean.resource.miniViewResourceNumber == status.index}">
+								<option value="${status.index}" selected="true">${status.index}</option>
+							</c:when>
+							<c:otherwise>
+								<option value="${status.index}">${status.index}</option>
+							</c:otherwise>
+						</c:choose>
+					</c:forEach>
 				</html:select>
 			</td>
 			<td class="formcontrol"  width="97%">
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r5c046644c57d0a0bfe3d85644a387a86331ee70c -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5c046644c57d0a0bfe3d85644a387a86331ee70c)
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -46,6 +46,10 @@
 	    	tag.value = tabId;
 	    	// end optional tab controller stuff
 	    	selectTab(tabId);
+	    	
+	    	//for advanceTab
+	    	if(tabId == 2)
+	    		changeViewNum();	    	
         } 
 
         function doUploadOnline() {
@@ -59,6 +63,34 @@
         	myForm.submit();
         }
         
+        function changeViewNum(){
+			var tb = document.getElementById("itemTable");
+			var num = tb.getElementsByTagName("tr");
+			var sel = document.getElementById("viewNumList");
+			var newField = sel.options;
+			var len = sel.length;
+			var selIdx=-1;
+			//there is bug in Opera8.5: if add alert before this loop, it will work,weird.
+			for (var idx=0;idx<len;idx++)
+			{
+				if(newField[0].selected && selIdx == -1)
+					selIdx = newField[0].value;
+				sel.removeChild(newField[0]);
+			}
+		
+			for(var i=1;i<=num.length;i++){
+				var opt = document.createElement("option");
+				var optT =document.createTextNode(i);
+				opt.value=i;
+				if(selIdx > 0 && selIdx==i){
+					opt.selected = true;
+				}else{
+					opt.selected = false;
+				}
+				opt.appendChild(optT);
+				sel.appendChild(opt);
+			}
+	}
         
     </script>
 	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
Index: lams_tool_larsrc/web/pages/authoring/basic.jsp
===================================================================
diff -u -r621b9ac2ae89b213fd59faef1de6a66e6edb1efc -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 621b9ac2ae89b213fd59faef1de6a66e6edb1efc)
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -55,6 +55,7 @@
 	function deleteItemComplete(){
 		hideBusy(resourceListTargetDiv);
 	}
+
 </script>
 	<!---------------------------Basic Tab Content ------------------------>
 	<table class="forms">
Index: lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r7086ae4ff560703d2a2859eed9d3b4c25dfdc44e -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 7086ae4ff560703d2a2859eed9d3b4c25dfdc44e)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -3,7 +3,7 @@
 <div id="itemList">
 <h2><fmt:message key="label.authoring.basic.resource.list.title" />
 <img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="resourceListArea_Busy" /></h2>
-<table class="forms">
+<table class="forms" id="itemTable">
 <c:forEach var="resource" items="${resourceList}" varStatus="status">
 	<tr>
 	<%-- Resource Type:1=URL,2=File,3=Website,4=Learning Object --%>
@@ -85,7 +85,10 @@
 </div>
 <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
-	window.top.hideMessage();
-	var obj = window.top.document.getElementById('resourceListArea');
-	obj.innerHTML= document.getElementById("itemList").innerHTML;
+
+	if(window.top != null){
+		window.top.hideMessage();
+		var obj = window.top.document.getElementById('resourceListArea');
+		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	}
 </script>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/export/exportportfolio.jsp
===================================================================
diff -u -r229b7cbba0b3121880c4dc69818e46d6589fd31e -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 229b7cbba0b3121880c4dc69818e46d6589fd31e)
+++ lams_tool_larsrc/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -109,10 +109,8 @@
 									</td>
 									<c:if test="${mode == 'teacher'}">
 										<td align="center">
-											<c:if test="${!item.itemCreateByAuthor}">
-												<c:if test="${item.itemHide}">
-													<fmt:message key="monitoring.label.hidden" />
-												</c:if>
+											<c:if test="${item.itemHide}">
+												<fmt:message key="monitoring.label.hidden" />
 											</c:if>
 										</td>
 									</c:if>
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -rfc7f983fbdc263b826831b5b6f4839290f7ef964 -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision fc7f983fbdc263b826831b5b6f4839290f7ef964)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -73,7 +73,11 @@
 		</tr>
 		<c:forEach var="item" items="${resourceList}">
 			<tr>
-				<td>${item.title}</td>
+				<td>${item.title}
+				<c:if test="${!item.createByAuthor}">
+					[${item.createBy.loginName}]
+				</c:if>
+				</td>
 				<td align="center">
 					<c:if test="${item.complete}">
 						<img src="<html:rewrite page='/includes/images/tick.gif'/>" border="0">
Index: lams_tool_larsrc/web/pages/monitoring/instructions.jsp
===================================================================
diff -u -r962368626dedf96b0d7c3bf5028905a97988356b -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/web/pages/monitoring/instructions.jsp	(.../instructions.jsp)	(revision 962368626dedf96b0d7c3bf5028905a97988356b)
+++ lams_tool_larsrc/web/pages/monitoring/instructions.jsp	(.../instructions.jsp)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -13,14 +13,13 @@
 			</td>
 		</tr>
 		<tr>
-			<td colspan="2">
+			<td>
 				&nbsp;
 			</td>
-			<%--
 			<td class="formcontrol">
 
 				<div id="onlinefile">
-					<c:forEach var="file" items="${formBean.onlineFileList}">
+					<c:forEach var="file" items="${resource.onlineFileList}">
 						<li>
 							<c:out value="${file.fileName}" />
 							<c:set var="viewURL">
@@ -36,18 +35,10 @@
 							<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
 								<fmt:message key="label.download" />
 							</a>
-							&nbsp;
-							<c:set var="deleteonline">
-								<html:rewrite page="/authoring/deleteOnline.do?toolContentID=${toolContentID}&uuID=${file.fileUuid}&versionID=${file.fileVersionId}" />
-							</c:set>
-							<html:link href="javascript:loadDoc('${deleteonline}','onlinefile')">
-								<fmt:message key="label.authoring.online.delete" />
-							</html:link>
 						</li>
 					</c:forEach>
 				</div>
 			</td>
-			--%>
 		</tr>
 
 
@@ -61,13 +52,12 @@
 			</td>
 		</tr>
 		<tr>
-			<td colspan="2">
+			<td >
 				&nbsp;
 			</td>
-			<%--
 			<td class="formcontrol">
 				<div id="offlinefile">
-					<c:forEach var="file" items="${formBean.offlineFileList}">
+					<c:forEach var="file" items="${resource.offlineFileList}">
 						<li>
 							<c:out value="${file.fileName}" />
 							<c:set var="viewURL">
@@ -82,17 +72,10 @@
 							<html:link href="${downloadURL}">
 								<fmt:message key="label.download" />
 							</html:link>
-							<c:set var="deleteoffline">
-								<html:rewrite page="/authoring/deleteOffline.do?toolContentID=${toolContentID}&uuID=${file.fileUuid}&versionID=${file.fileVersionId}" />
-							</c:set>
-							<html:link href="javascript:loadDoc('${deleteoffline}','offlinefile')">
-								<fmt:message key="label.authoring.offline.delete" />
-							</html:link>
 						</li>
 					</c:forEach>
 				</div>
 			</td>
-			--%>
 		</tr>
 		<%--
 		<tr>
Index: lams_tool_larsrc/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r962368626dedf96b0d7c3bf5028905a97988356b -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 962368626dedf96b0d7c3bf5028905a97988356b)
+++ lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -20,7 +20,10 @@
 		    	selectTab(tabId);
 	        } 
 	        
-	        
+		    function viewItem(itemUid){
+				var myUrl = "<c:url value="/reviewItem.do"/>?itemUid=" + itemUid;
+				launchPopup(myUrl,"Review");
+			}
 	    </script>		 
 	</head>
 	<body onLoad="init()">
Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r6f9ce8030c9939df344a3aa7f5894116491a90d8 -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 6f9ce8030c9939df344a3aa7f5894116491a90d8)
+++ lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -56,7 +56,7 @@
 									</c:choose>
 								</td>
 								<td>
-									${item.itemTitle}
+									<a href="javascript:;" onclick="viewItem(${item.itemUid})">${item.itemTitle}</a>
 								</td>
 								<td>
 									<c:if test="${!item.itemCreateByAuthor}">
@@ -77,16 +77,14 @@
 									</c:choose>
 								</td>
 								<td align="center">
-									<c:if test="${!item.itemCreateByAuthor}">
-										<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>
-											</c:when>
-											<c:otherwise>
-												<a href="<c:url value='/monitoring/hideitem.do'/>?itemUid=${item.itemUid}" class="button"> <fmt:message key="monitoring.label.hide" /> </a>
-											</c:otherwise>
-										</c:choose>
-									</c:if>
+									<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>
+										</c:when>
+										<c:otherwise>
+											<a href="<c:url value='/monitoring/hideitem.do'/>?itemUid=${item.itemUid}" class="button"> <fmt:message key="monitoring.label.hide" /> </a>
+										</c:otherwise>
+									</c:choose>
 								</td>
 							</tr>
 				<c:if test="${status.count == groupSize}">
Index: lams_tool_larsrc/web/pages/monitoring/userlist.jsp
===================================================================
diff -u -r6c690985b6e09c8097ee965deaac72752fd3c97f -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34
--- lams_tool_larsrc/web/pages/monitoring/userlist.jsp	(.../userlist.jsp)	(revision 6c690985b6e09c8097ee965deaac72752fd3c97f)
+++ lams_tool_larsrc/web/pages/monitoring/userlist.jsp	(.../userlist.jsp)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
@@ -10,6 +10,9 @@
 				<fmt:message key="monitoring.label.user.loginname" />
 			</th>
 			<th>
+				<fmt:message key="monitoring.label.access.time" />
+			</th>
+			<th>
 				<fmt:message key="monitoring.label.user.name" />
 			</th>
 		</tr>
@@ -19,13 +22,16 @@
 					${user.loginName}
 				</td>
 				<td>
+					<fmt:formatDate value="${user.accessDate}" pattern="hh:mm:ss dd/MM/yy"/>
+				</td>
+				<td>
 					${user.firstName},${user.lastName}
 				</td>
 			</tr>
 		</c:forEach>
 		<tr>
-			<td colspan="2" align="right">
-				<a href="window.close()" style="button">Close</a>
+			<td colspan="3" align="right">
+				<a href="javaqscript:;" onclick="window.close()" style="button">Close</a>
 			</td>
 		</tr>
 	</table>