Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java	(.../MessageDTO.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java	(.../MessageDTO.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -73,8 +73,8 @@
 	 * @param msgList
 	 * @return
 	 */
-	public static List getMessageDTO(List msgList){
-		List retSet = new ArrayList();
+	public static List<MessageDTO> getMessageDTO(List msgList){
+		List<MessageDTO> retSet = new ArrayList<MessageDTO>();
 		if(msgList == null || msgList.isEmpty())
 			return retSet;
 		
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r427a3b63491fb2f3206a785705ac247af49e1360 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -750,7 +750,7 @@
 
 		return content;
 	}
-	public List getAllTopicsFromSession(Long sessionID) {
+	public List<MessageDTO> getAllTopicsFromSession(Long sessionID) {
 		return MessageDTO.getMessageDTO(messageDao.getBySession(sessionID));
 	}
     //***************************************************************************************************************
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
diff -u -r12f7e39b451ed00ce91cffcf66efd129252d2cfc -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 12f7e39b451ed00ce91cffcf66efd129252d2cfc)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -27,6 +27,7 @@
 import java.util.List;
 
 import org.apache.struts.upload.FormFile;
+import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
 import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession;
@@ -225,7 +226,7 @@
 	 * @param sessionID
 	 * @return
 	 */
-	public List getAllTopicsFromSession(Long sessionID);
+	public List<MessageDTO> getAllTopicsFromSession(Long sessionID);
 	//************************************************************************************
 	// User  Method
 	//************************************************************************************
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -red34ad93e720126f7473b282585c411c8acf7dbe -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision ed34ad93e720126f7473b282585c411c8acf7dbe)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -235,7 +235,8 @@
 	public ActionForward updateContent(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 
-		ToolAccessMode mode = (ToolAccessMode) request.getSession().getAttribute(AttributeNames.ATTR_MODE);
+		
+		ToolAccessMode mode = getAccessMode(request); 
 		ForumForm forumForm = (ForumForm)(form);
 		
 		Forum forum = forumForm.getForum();
@@ -919,4 +920,19 @@
 		}
 		return list;
 	}
+	/**
+	 * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode.
+	 * @param request
+	 * @return
+	 */
+	private ToolAccessMode getAccessMode(HttpServletRequest request) {
+		ToolAccessMode mode;
+		String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
+		if(StringUtils.equalsIgnoreCase(modeStr,ToolAccessMode.TEACHER.toString()))
+			mode = ToolAccessMode.TEACHER;
+		else
+			mode = ToolAccessMode.AUTHOR;
+		return mode;
+	}
+	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java	(.../ExportServlet.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java	(.../ExportServlet.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -87,15 +87,7 @@
             throw new ForumException(error);
         }
         
-       Forum content = forumService.getForumByContentId(toolSessionID);
-        
-        if (content == null)
-        {
-            String error="The content for this activity has not been defined yet.";
-            logger.error(error);
-            throw new ForumException(error);
-        }
-        List topicList = forumService.getAllTopicsFromSession(toolSessionID);
+        List<MessageDTO> topicList = forumService.getAllTopicsFromSession(toolSessionID);
 		Map topicsByUser = getTopicsSortedByAuthor(topicList);	
 		request.getSession().setAttribute("report",topicsByUser);
     }
Index: lams_tool_forum/web/jsps/authoring/definelater.jsp
===================================================================
diff -u -red34ad93e720126f7473b282585c411c8acf7dbe -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_forum/web/jsps/authoring/definelater.jsp	(.../definelater.jsp)	(revision ed34ad93e720126f7473b282585c411c8acf7dbe)
+++ lams_tool_forum/web/jsps/authoring/definelater.jsp	(.../definelater.jsp)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -10,6 +10,7 @@
 <html:form action="authoring/update" method="post" styleId="authoringForm">
 	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 	<html:hidden property="toolContentID" />
+	<html:hidden property="mode" value="teacher"/>
 
 	<!-- start tabs -->
 	<lams:Tabs collection="${tabs}" useKey="true" control="true" />
@@ -20,7 +21,7 @@
 		<!-- end of content (Basic) -->
 
 		<!-- Button Row -->
-		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ForumConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" defineLater="yes"/>
+		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ForumConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" accessMode="teacher" defineLater="yes"/>
 
 		<lams:HTMLEditor />
 	</div>
Index: lams_tool_forum/web/jsps/export/exportportfolio.jsp
===================================================================
diff -u -r6852794f79069c9b70ee194f74677323d0bf14b7 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_forum/web/jsps/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
+++ lams_tool_forum/web/jsps/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -1,83 +1,115 @@
-<%@ include file="/common/taglibs.jsp" %>
+<%@ include file="/common/taglibs.jsp"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html:html locale="true">
-  <head>    
-		<%@ include file="/common/header.jsp" %>
-  </head>  
-  <body>
-  
-	<table width="100%"  border="0" cellspacing="3" cellpadding="3">
-	<c:forEach items="${report}"  var ="userList" >		
-		<c:set var="user" value="${userList.key}"/>
-		<c:set var="markList" value="${userList.value}"/>
-		<c:set var="first" value="true"/>
-		<c:forEach items="${markList}"  var ="topic" >			
-			<span><p>			
-				<c:if test="${first}">
-					<c:set var="first" value="false"/>
-				    <tr>
-				    	<td colspan="2">
-				    	<c:out value="${user.firstName}"/> <c:out value="${user.lastName}"/> ,
-				    	<c:out value="${user.loginName}"/>,
-				    	 provides following submisstion:
-				    	</td>
-				    <tr>
-			    </c:if>
+<head>
+	<%@ include file="/common/header.jsp"%>
+</head>
+<body>
+	<c:if test="${empty report}">
+		<div align="center"><b><fmt:message key="message.not.avaliable"/></b></div>
+	</c:if>
+	<c:forEach items="${report}" var="userList">
+		<table width="90%" border="1" cellspacing="3" cellpadding="3" align="center">
 			<tr>
-				<td valign="MIDDLE" width="48%">
-					<c:set var="viewtopic">
-						<html:rewrite page="/monitoring/viewTopic.do?messageID=${topic.message.uid}&create=${topic.message.created.time}" />
-					</c:set> 
-					<html:link href="javascript:launchPopup('${viewtopic}');">
-						<c:out value="${topic.message.subject}" />
-					</html:link>
-				</td>
-				<td width="2%">
-					<c:if test="${topic.hasAttachment}">
-						<img src="<html:rewrite page="/images/paperclip.gif"/>">
-					</c:if>
-				</td>
 				<td>
-					<c:out value="${topic.author}"/>
+					<table width="100%" border="0" cellspacing="3" cellpadding="3">
+						<c:set var="user" value="${userList.key}" />
+						<c:set var="markList" value="${userList.value}" />
+						<c:set var="first" value="true" />
+						<c:set var="postNum" value="${fn:length(markList)}" />
+						<c:forEach items="${markList}" var="topic" varStatus="status">
+							<c:if test="${status.index == 0}">
+								<tr>
+									<td colspan="2">
+										<c:out value="${user.firstName}" />
+										<c:out value="${user.lastName}" />
+										,
+										<c:out value="${user.loginName}" />
+										,
+										<fmt:message key="monitoring.user.post.topic" />
+									</td>
+								<tr>
+							</c:if>
+							<tr>
+								<td width="150">
+									<b><fmt:message key="lable.topic.title.subject" /></b>
+								</td>
+								<td>
+									<c:out value="${topic.message.subject}" />
+								</td>
+							</tr>
+							<tr>
+								<td>
+									<b><fmt:message key="button.on" /></b>
+								</td>
+								<td>
+									<fmt:formatDate value="${topic.message.updated}" type="time" timeStyle="short" />
+									<fmt:formatDate value="${topic.message.updated}" type="date" dateStyle="full" />
+								</td>
+							</tr>
+							<c:forEach var="file" items="${topic.message.attachments}">
+								<tr>
+									<td>
+										<b><fmt:message key="message.label.attachment" /></b>
+									</td>
+									<td>
+										<c:set var="downloadURL">
+											<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
+										</c:set>
+										<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <c:out value="${file.fileName}" /> </a>
+									</td>
+								</tr>
+							</c:forEach>
+							<tr>
+								<td>
+									<b><fmt:message key="lable.topic.title.body" /></b>
+								</td>
+								<td>
+									<c:out value="${topic.message.body}" escapeXml="false" />
+								</td>
+							</tr>
+							<tr>
+								<td>
+									<b><fmt:message key="lable.topic.title.mark" /></b>
+								</td>
+								<td>
+									<c:choose>
+										<c:when test="${empty topic.message.report.mark}">
+											<fmt:message key="message.not.avaliable" />
+										</c:when>
+										<c:otherwise>
+											<c:out value="${topic.message.report.mark}" escapeXml="false" />
+										</c:otherwise>
+									</c:choose>
+								</td>
+							</tr>
+							<tr>
+								<td>
+									<b><fmt:message key="lable.topic.title.comment" /></b>
+								</td>
+								<td>
+									<c:choose>
+										<c:when test="${empty topic.message.report.comment}">
+											<fmt:message key="message.not.avaliable" />
+										</c:when>
+										<c:otherwise>
+											<c:out value="${topic.message.report.comment}" escapeXml="false" />
+										</c:otherwise>
+									</c:choose>
+								</td>
+							</tr>
+							<c:if test="${status.count != postNum}">
+								<tr>
+									<td colspan="2">
+										<hr>
+									</td>
+								</tr>
+							</c:if>
+						</c:forEach>
+					</table>
 				</td>
-				<td>
-					<c:out value="${topic.message.replyNumber}"/>
-				</td>
-				<td>
-					<fmt:formatDate value="${topic.message.updated}" type="time" timeStyle="short" />
-					<fmt:formatDate value="${topic.message.updated}" type="date" dateStyle="full" />
-				</td>
 			</tr>
-		 <tr>
-			<tr>
-				<td>Marks:</td>
-				<td colspan="3"> 	
-						<c:choose>
-									<c:when test="${empty topic.message.report.mark}">
-										<c:out value="Not Available"/>
-									</c:when>
-									<c:otherwise>
-										<c:out value="${topic.message.report.mark}" escapeXml="false"/>
-									</c:otherwise>
-								</c:choose>
-				</td>
-			</tr>			
-			<tr>
-				<td>Comments:</td>
-				<td  colspan="3">
-								<c:choose>
-									<c:when test="${empty topic.message.report.comment}">
-										<c:out value="Not Available"/>								
-									</c:when>
-									<c:otherwise>
-										<c:out value="${topic.message.report.comment}" escapeXml="false"/>
-									</c:otherwise>
-								</c:choose>
-				</td>
-			</tr>
-			</span>
-		</c:forEach>
+		</table>
 	</c:forEach>
-	</table>						
 </body>
-</html:html>
\ No newline at end of file
+</html:html>
Index: lams_tool_larsrc/conf/language/ApplicationResources.properties
===================================================================
diff -u -r7d117b285f81648e6f16ad1e70cc84bcb59d80e4 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_larsrc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7d117b285f81648e6f16ad1e70cc84bcb59d80e4)
+++ lams_tool_larsrc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -182,3 +182,4 @@
 #======= New labels: after 08/06/2006 =============
 define.later.message=Please wait for the teacher to define this part.
 run.offline.message=This activity is not being done on the computer. Please see your instructor for details.
+message.monitoring.summary.no.resource.for.group=No resource available for this group.
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/Summary.java
===================================================================
diff -u -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/Summary.java	(.../Summary.java)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/Summary.java	(.../Summary.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -72,15 +72,18 @@
 	public Summary(Long sessionId, String sessionName, ResourceItem item){
 		this.sessionId = sessionId;
 		this.sessionName = sessionName;
-		this.itemUid = item.getUid();
-		this.itemType = item.getType();
-		this.itemCreateByAuthor = item.isCreateByAuthor();
-		this.itemHide = item.isHide();
-		this.itemTitle = item.getTitle();
-		this.username = item.getCreateBy() == null?"":item.getCreateBy().getLoginName();
-		this.url = item.getUrl();
-		this.fileUuid = item.getFileUuid();
-		this.fileVersionId = item.getFileVersionId();
+		if(item != null){
+			this.itemUid = item.getUid();
+			this.itemType = item.getType();
+			this.itemCreateByAuthor = item.isCreateByAuthor();
+			this.itemHide = item.isHide();
+			this.itemTitle = item.getTitle();
+			this.username = item.getCreateBy() == null?"":item.getCreateBy().getLoginName();
+			this.url = item.getUrl();
+			this.fileUuid = item.getFileUuid();
+			this.fileVersionId = item.getFileVersionId();
+		}else
+			this.itemUid = new Long(-1);
 	}
 	/**
 	 * Contruction method for export profolio function. 
@@ -92,16 +95,18 @@
 	 */
 	public Summary(String sessionName, ResourceItem item,boolean isInitGroup){
 		this.sessionName = sessionName;
-		this.itemUid = item.getUid();
-		this.itemType = item.getType();
-		this.itemCreateByAuthor = item.isCreateByAuthor();
-		this.itemHide = item.isHide();
-		this.itemTitle = item.getTitle();
-		this.username = item.getCreateBy() == null?"":item.getCreateBy().getLoginName();
-		this.url = item.getUrl();
-		this.fileUuid = item.getFileUuid();
-		this.fileVersionId = item.getFileVersionId();
-		
+		if(item != null){
+			this.itemUid = item.getUid();
+			this.itemType = item.getType();
+			this.itemCreateByAuthor = item.isCreateByAuthor();
+			this.itemHide = item.isHide();
+			this.itemTitle = item.getTitle();
+			this.username = item.getCreateBy() == null?"":item.getCreateBy().getLoginName();
+			this.url = item.getUrl();
+			this.fileUuid = item.getFileUuid();
+			this.fileVersionId = item.getFileVersionId();
+		}else
+			this.itemUid = new Long(-1);
 		this.isInitGroup = isInitGroup;
 	}
 	public boolean isItemCreateByAuthor() {
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
===================================================================
diff -u -r00546fef27c802810d1b2ac3d621f9c3e2d64cb0 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	(.../IResourceService.java)	(revision 00546fef27c802810d1b2ac3d621f9c3e2d64cb0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	(.../IResourceService.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -169,7 +169,12 @@
 
 	ResourceItem getResourceItemByUid(Long itemUid);
 
-	List<List> getSummary(Long contentId);
+	/**
+	 * Return monitoring summary list. The return value is list of resource summaries for each groups.
+	 * @param contentId
+	 * @return
+	 */
+	List<List<Summary>> getSummary(Long contentId);
 
 	List<ResourceUser> getUserListBySessionItem(Long sessionId, Long itemUid);
 
@@ -189,6 +194,6 @@
 	 * @return
 	 */
 	public List<Summary> exportBySessionId(Long sessionId, boolean skipHide);
-	public List<List> exportByContentId(Long contentId); 
+	public List<List<Summary>> exportByContentId(Long contentId); 
 }
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -re280cd832df020c33df6730fbee453add9e6caee -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision e280cd832df020c33df6730fbee453add9e6caee)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -37,6 +37,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.apache.poi.hpsf.SummaryInformation;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.contentrepository.AccessDeniedException;
 import org.lamsfoundation.lams.contentrepository.ICredentials;
@@ -315,7 +316,7 @@
 		for(ResourceItem item:resList){
 			if(skipHide && item.isHide())
 				continue;
-			//if item is ha
+			//if item is create by author
 			if(item.isCreateByAuthor()){
 				Summary sum = new Summary(session.getSessionName(),item,false);
 				itemList.add(sum);
@@ -337,9 +338,9 @@
 		
 		return itemList;
 	}
-	public List<List> exportByContentId(Long contentId) {
+	public List<List<Summary>> exportByContentId(Long contentId) {
 		Resource resource = resourceDao.getByContentId(contentId);
-		List<List> groupList = new ArrayList();
+		List<List<Summary>> groupList = new ArrayList();
 		
 		//create init resource items list
 		List<Summary> initList = new ArrayList();
@@ -365,6 +366,9 @@
 					group.add(sum);
 				}
 			}
+			if(group.size() == 0){
+				group.add(new Summary(session.getSessionName(),null,false));
+			}
 			groupList.add(group);
 		}
 		
@@ -465,8 +469,8 @@
 	public ResourceItem getResourceItemByUid(Long itemUid) {
 		return resourceItemDao.getByUid(itemUid);
 	}
-	public List<List> getSummary(Long contentId) {
-		List<List> groupList = new ArrayList<List>();
+	public List<List<Summary>> getSummary(Long contentId) {
+		List<List<Summary>> groupList = new ArrayList<List<Summary>>();
 		List<Summary> group = new ArrayList<Summary>();
 		
 		//get all item which is accessed by user
@@ -501,8 +505,11 @@
 					group.add(sum);
 				}
 			}
+			//so far no any item available, so just put session name info to Summary
+			if(group.size() == 0)
+				group.add(new Summary(session.getSessionId(),session.getSessionName(),null));
 			groupList.add(group);
-		}
+		} 
 		
 		return groupList;
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -r7d117b285f81648e6f16ad1e70cc84bcb59d80e4 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 7d117b285f81648e6f16ad1e70cc84bcb59d80e4)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -410,7 +410,7 @@
 	private ActionForward updateContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
 		ResourceForm resourceForm = (ResourceForm)(form);
-		ToolAccessMode mode = (ToolAccessMode) request.getSession().getAttribute(AttributeNames.ATTR_MODE);
+		ToolAccessMode mode = getAccessMode(request);
     	
 		Resource resource = resourceForm.getResource();
 		try {
@@ -1011,5 +1011,19 @@
 		return errors;
 	}
 
+	/**
+	 * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode.
+	 * @param request
+	 * @return
+	 */
+	private ToolAccessMode getAccessMode(HttpServletRequest request) {
+		ToolAccessMode mode;
+		String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
+		if(StringUtils.equalsIgnoreCase(modeStr,ToolAccessMode.TEACHER.toString()))
+			mode = ToolAccessMode.TEACHER;
+		else
+			mode = ToolAccessMode.AUTHOR;
+		return mode;
+	}
 
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
===================================================================
diff -u -r7d117b285f81648e6f16ad1e70cc84bcb59d80e4 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7d117b285f81648e6f16ad1e70cc84bcb59d80e4)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -53,6 +53,7 @@
 public class MonitoringAction extends Action {
 	public static Logger log = Logger.getLogger(MonitoringAction.class);
 	
+	
 	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) throws IOException, ServletException {
 		String param = mapping.getParameter();
@@ -124,7 +125,7 @@
 			HttpServletResponse response) {
 		Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 		IResourceService service = getResourceService();
-		List<List> groupList = service.getSummary(contentId);
+		List<List<Summary>> groupList = service.getSummary(contentId);
 		
 		//put it into HTTPSession
 		request.getSession().setAttribute(ResourceConstants.ATTR_SUMMARY_LIST, groupList);
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java
===================================================================
diff -u -r229b7cbba0b3121880c4dc69818e46d6589fd31e -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision 229b7cbba0b3121880c4dc69818e46d6589fd31e)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -107,8 +107,10 @@
 			throw new ResourceApplicationException(error);
 		}
 		List<Summary> group = service.exportBySessionId(toolSessionID,true);
+		
 		List<List> groupList = new ArrayList<List>();
-		groupList.add(group);
+		if(group.size() > 0)
+			groupList.add(group);
 		request.getSession().setAttribute(ResourceConstants.ATTR_SUMMARY_LIST, groupList);
 	}
 
@@ -130,7 +132,7 @@
 			logger.error(error);
 			throw new ResourceApplicationException(error);
 		}
-		List<List> groupList = service.exportByContentId(toolContentID);
+		List<List<Summary>> groupList = service.exportByContentId(toolContentID);
 		
 		// put it into HTTPSession
 		request.getSession().setAttribute(ResourceConstants.ATTR_SUMMARY_LIST, groupList);
Index: lams_tool_larsrc/web/pages/authoring/definelater.jsp
===================================================================
diff -u -r7d117b285f81648e6f16ad1e70cc84bcb59d80e4 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_larsrc/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision 7d117b285f81648e6f16ad1e70cc84bcb59d80e4)
+++ lams_tool_larsrc/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -41,11 +41,7 @@
 	    	selectTab(tabId);
         } 
         
-        function doSubmit() {
-        	$("authoringForm").submit();
-        }
-
-        
+       
     </script>
 	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
 
@@ -56,7 +52,8 @@
 	<html:form action="authoring/update" method="post" styleId="authoringForm" focus="resource.title" enctype="multipart/form-data">
 		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 		<html:hidden property="toolContentID" />
-
+		<html:hidden property="mode" value="teacher"/>
+		
 		<h1>
 			<fmt:message key="label.authoring.heading" />
 		</h1>
@@ -71,7 +68,7 @@
 
 
 			<!-- Button Row -->
-			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ResourceConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" defineLater="yes" />
+			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ResourceConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}"  accessMode="teacher" defineLater="yes" />
 
 			<lams:HTMLEditor />
 		</div>
Index: lams_tool_larsrc/web/pages/authoring/definelaterforbid.jsp
===================================================================
diff -u -r7d117b285f81648e6f16ad1e70cc84bcb59d80e4 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_larsrc/web/pages/authoring/definelaterforbid.jsp	(.../definelaterforbid.jsp)	(revision 7d117b285f81648e6f16ad1e70cc84bcb59d80e4)
+++ lams_tool_larsrc/web/pages/authoring/definelaterforbid.jsp	(.../definelaterforbid.jsp)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -1,4 +1,18 @@
 <%@ include file="/common/taglibs.jsp"%>
-<div align="center">
-	<B><fmt:message key="message.monitoring.edit.activity.not.editable" /></B>
-</div>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html locale="true">
+<head>
+	<title><fmt:message key="label.author.title" /></title>
+
+	<%@ include file="/common/header.jsp"%>
+</head>
+<body>
+	<div align="center">
+		<h1>
+			<fmt:message key="label.authoring.heading" />
+		</h1>
+
+		<B><fmt:message key="message.monitoring.edit.activity.not.editable" /></B>
+	</div>
+</body>
+</html:html>
Index: lams_tool_larsrc/web/pages/export/exportportfolio.jsp
===================================================================
diff -u -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_larsrc/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
+++ lams_tool_larsrc/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -33,8 +33,7 @@
 									<B><fmt:message key="export.init.resource" /></B>
 								</c:when>
 								<c:otherwise>
-									<B><fmt:message key="monitoring.label.group" />
-									${item.sessionName}</B>
+									<B><fmt:message key="monitoring.label.group" /> ${item.sessionName}</B>
 								</c:otherwise>
 							</c:choose>
 						</td>
@@ -62,59 +61,70 @@
 									</c:if>
 								</tr>
 								</c:if>
-								<tr>
-									<td>
-										<c:choose>
-											<c:when test="${item.itemType == 1}">
-												<fmt:message key="label.authoring.basic.resource.url" />
-											</c:when>
-											<c:when test="${item.itemType == 2}">
-												<fmt:message key="label.authoring.basic.resource.file" />
-											</c:when>
-											<c:when test="${item.itemType == 3}">
-												<fmt:message key="label.authoring.basic.resource.website" />
-											</c:when>
-											<c:when test="${item.itemType == 4}">
-												<fmt:message key="label.authoring.basic.resource.learning.object" />
-											</c:when>
-										</c:choose>
-									</td>
-									<td>
-										${item.itemTitle}
-									</td>
-									<td>
-										${item.username}
-									</td>
-									<td align="center">
-										<c:choose>
-											<c:when test="${item.itemType == 1}">
-												<a href="javascript:;" onclick="launchPopup('${item.url}','openurl');"> <fmt:message key="label.authoring.basic.resource.preview" /> </a>
-											</c:when>
-											<c:when test="${item.itemType == 2}">
-												<c:set var="downloadUrl">
-													<html:rewrite page="/download/?uuid=${item.fileUuid}&versionID=${item.fileVersionId}&preferDownload=false" />
-												</c:set>
-												<a href="${downloadUrl}"> <fmt:message key="label.download" /> </a>
-											</c:when>
-											<c:when test="${item.itemType == 3}">
-												<c:set var="downloadUrl">
-													<html:rewrite page="/download/?uuid=${item.fileUuid}&versionID=${item.fileVersionId}&preferDownload=false" />
-												</c:set>
-												<a href="${downloadUrl}"> <fmt:message key="label.download" /> </a>
-											</c:when>
-											<c:when test="${item.itemType == 4}">
-												<fmt:message key="export.label.no.learning.object" />
-											</c:when>
-										</c:choose>
-									</td>
-									<c:if test="${mode == 'teacher'}">
+								<c:if test="${item.itemUid == -1}">
+									<tr>
+										<td colspan="4">
+											<div align="left">
+												<b> <fmt:message key="message.monitoring.summary.no.resource.for.group" /> </b>
+											</div>
+										</td>
+									</tr>
+								</c:if>
+								<c:if test="${item.itemUid != -1}">
+									<tr>
+										<td>
+											<c:choose>
+												<c:when test="${item.itemType == 1}">
+													<fmt:message key="label.authoring.basic.resource.url" />
+												</c:when>
+												<c:when test="${item.itemType == 2}">
+													<fmt:message key="label.authoring.basic.resource.file" />
+												</c:when>
+												<c:when test="${item.itemType == 3}">
+													<fmt:message key="label.authoring.basic.resource.website" />
+												</c:when>
+												<c:when test="${item.itemType == 4}">
+													<fmt:message key="label.authoring.basic.resource.learning.object" />
+												</c:when>
+											</c:choose>
+										</td>
+										<td>
+											${item.itemTitle}
+										</td>
+										<td>
+											${item.username}
+										</td>
 										<td align="center">
-											<c:if test="${item.itemHide}">
-												<fmt:message key="monitoring.label.hidden" />
-											</c:if>
+											<c:choose>
+												<c:when test="${item.itemType == 1}">
+													<a href="javascript:;" onclick="launchPopup('${item.url}','openurl');"> <fmt:message key="label.authoring.basic.resource.preview" /> </a>
+												</c:when>
+												<c:when test="${item.itemType == 2}">
+													<c:set var="downloadUrl">
+														<html:rewrite page="/download/?uuid=${item.fileUuid}&versionID=${item.fileVersionId}&preferDownload=false" />
+													</c:set>
+													<a href="${downloadUrl}"> <fmt:message key="label.download" /> </a>
+												</c:when>
+												<c:when test="${item.itemType == 3}">
+													<c:set var="downloadUrl">
+														<html:rewrite page="/download/?uuid=${item.fileUuid}&versionID=${item.fileVersionId}&preferDownload=false" />
+													</c:set>
+													<a href="${downloadUrl}"> <fmt:message key="label.download" /> </a>
+												</c:when>
+												<c:when test="${item.itemType == 4}">
+													<fmt:message key="export.label.no.learning.object" />
+												</c:when>
+											</c:choose>
 										</td>
-									</c:if>
-								</tr>
+										<c:if test="${mode == 'teacher'}">
+											<td align="center">
+												<c:if test="${item.itemHide}">
+													<fmt:message key="monitoring.label.hidden" />
+												</c:if>
+											</td>
+										</c:if>
+									</tr>
+								</c:if>
 								<c:if test="${status.count == groupSize}">
 							</table>
 						</td>
Index: lams_tool_larsrc/web/pages/learning/definelater.jsp
===================================================================
diff -u -r7d117b285f81648e6f16ad1e70cc84bcb59d80e4 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_larsrc/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 7d117b285f81648e6f16ad1e70cc84bcb59d80e4)
+++ lams_tool_larsrc/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -7,10 +7,23 @@
 </head>
 
 <body>
+	<table border="0" align="center" class="forms" width="95%">
+		<tr>
+			<td>
+				<h1>
+					${resource.title}
+				</h1>
+				<h2>
+					${resource.instructions}
+				</h2>
+			</td>
+		</tr>
+	</table>
+	
 	<div align="center">
-		<h2>
+		<b>
 			<fmt:message key="define.later.message" />
-		</h2>
+		</b>
 	</div>
 
 </body>
Index: lams_tool_larsrc/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r962368626dedf96b0d7c3bf5028905a97988356b -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 962368626dedf96b0d7c3bf5028905a97988356b)
+++ lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -13,15 +13,15 @@
 		</tr>
 
 		<tr>
-			<td class="formlabel"> 
+			<td class="formlabel">
 				<fmt:message key="label.authoring.basic.instruction" />
 				:
 			</td>
 			<td class="formcontrol">
 				<c:out value="${resource.instructions}" escapeXml="false" />
 			</td>
 		</tr>
-		
+
 		<tr>
 			<td class="formlabel" colspan="2">
 				<c:set var="isPageEditable" value="${isPageEditable}" />
@@ -35,9 +35,9 @@
 						</html:link>
 					</c:when>
 					<c:otherwise>
-						<SPAN style="font-size: 12px;">
-							<fmt:message key="message.monitoring.edit.activity.not.editable" />
-						</SPAN>
+						<div align="center">
+							<b> <fmt:message key="message.monitoring.edit.activity.not.editable" /> </b>
+						</div>
 					</c:otherwise>
 				</c:choose>
 			</td>
Index: lams_tool_larsrc/web/pages/monitoring/statistic.jsp
===================================================================
diff -u -r962368626dedf96b0d7c3bf5028905a97988356b -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_larsrc/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 962368626dedf96b0d7c3bf5028905a97988356b)
+++ lams_tool_larsrc/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -1,20 +1,21 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <table border="0" cellspacing="3" width="98%">
-	<c:forEach var="group" items="${summaryList}"  varStatus="firstGroup">
-		<c:set var="groupSize" value="${fn:length(group)}"/>
+	<c:if test="${empty summaryList}">
+		<div align="center">
+			<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
+		</div>
+	</c:if>
+	<c:forEach var="group" items="${summaryList}" varStatus="firstGroup">
+		<c:set var="groupSize" value="${fn:length(group)}" />
 		<c:forEach var="item" items="${group}" varStatus="status">
 			<%-- display group name on first row--%>
 			<c:if test="${status.index == 0}">
 				<tr>
 					<td>
-						<B><fmt:message key="monitoring.label.group" />
-						${item.sessionName}</B>
-						<SPAN style="font-size: 12px;">
-							<c:if test="${firstGroup.index==0}">
+						<B><fmt:message key="monitoring.label.group" /> ${item.sessionName}</B> <SPAN style="font-size: 12px;"> <c:if test="${firstGroup.index==0}">
 								<fmt:message key="monitoring.summary.note" />
-							</c:if>
-						</SPAN>						
+							</c:if> </SPAN>
 					</td>
 				</tr>
 				<tr>
@@ -34,51 +35,62 @@
 									<fmt:message key="monitoring.label.number.learners" />
 								</th>
 							</tr>
-				</c:if>
-							<tr>
-								<td>
-									<c:choose>
-										<c:when test="${item.itemType == 1}">
-											<fmt:message key="label.authoring.basic.resource.url"/>
-										</c:when>
-										<c:when test="${item.itemType == 2}">
-											<fmt:message key="label.authoring.basic.resource.file"/>
-										</c:when>
-										<c:when test="${item.itemType == 3}">
-											<fmt:message key="label.authoring.basic.resource.website"/>
-										</c:when>
-										<c:when test="${item.itemType == 4}">
-											<fmt:message key="label.authoring.basic.resource.learning.object"/>
-										</c:when>
-									</c:choose>
-								</td>
-								<td>
-									${item.itemTitle}
-								</td>
-								<td>
-									<c:if test="${!item.itemCreateByAuthor}">
+							</c:if>
+							<c:if test="${item.itemUid == -1}">
+								<tr>
+									<td colspan="4">
+										<div align="left">
+											<b> <fmt:message key="message.monitoring.summary.no.resource.for.group" /> </b>
+										</div>
+									</td>
+								</tr>
+							</c:if>
+							<c:if test="${item.itemUid != -1}">
+								<tr>
+									<td>
+										<c:choose>
+											<c:when test="${item.itemType == 1}">
+												<fmt:message key="label.authoring.basic.resource.url" />
+											</c:when>
+											<c:when test="${item.itemType == 2}">
+												<fmt:message key="label.authoring.basic.resource.file" />
+											</c:when>
+											<c:when test="${item.itemType == 3}">
+												<fmt:message key="label.authoring.basic.resource.website" />
+											</c:when>
+											<c:when test="${item.itemType == 4}">
+												<fmt:message key="label.authoring.basic.resource.learning.object" />
+											</c:when>
+										</c:choose>
+									</td>
+									<td>
+										${item.itemTitle}
+									</td>
+									<td>
+										<c:if test="${!item.itemCreateByAuthor}">
 										${item.username}
 									</c:if>
-								</td>
-								<td align="center">
-									<c:choose>
-										<c:when test="${item.viewNumber > 0}">
-											<c:set var="listUrl">
-												<c:url value='/monitoring/listuser.do?toolSessionID=${item.sessionId}&itemUid=${item.itemUid}'/>
-											</c:set>
-											<a href="#" onclick="launchPopup('${listUrl}','listuser')"> ${item.viewNumber}<a>
-										</c:when>
-										<c:otherwise>
+									</td>
+									<td align="center">
+										<c:choose>
+											<c:when test="${item.viewNumber > 0}">
+												<c:set var="listUrl">
+													<c:url value='/monitoring/listuser.do?toolSessionID=${item.sessionId}&itemUid=${item.itemUid}' />
+												</c:set>
+												<a href="#" onclick="launchPopup('${listUrl}','listuser')"> ${item.viewNumber}<a>
+											</c:when>
+											<c:otherwise>
 											0
 										</c:otherwise>
-									</c:choose>
-								</td>
-							</tr>
-				<c:if test="${status.count == groupSize}">
+										</c:choose>
+									</td>
+								</tr>
+							</c:if>
+							<c:if test="${status.count == groupSize}">
 						</table>
 					</td>
 				</tr>
-				</c:if>
+			</c:if>
 		</c:forEach>
 	</c:forEach>
 </table>
Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rcfa9126e592b7e05b7856cd137d634ce6ba1bb34 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision cfa9126e592b7e05b7856cd137d634ce6ba1bb34)
+++ lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -1,20 +1,21 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <table border="0" cellspacing="3" width="98%">
+	<c:if test="${empty summaryList}">
+		<div align="center">
+			<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
+		</div>
+	</c:if>
 	<c:forEach var="group" items="${summaryList}" varStatus="firstGroup">
-		<c:set var="groupSize" value="${fn:length(group)}"/>
+		<c:set var="groupSize" value="${fn:length(group)}" />
 		<c:forEach var="item" items="${group}" varStatus="status">
 			<%-- display group name on first row--%>
 			<c:if test="${status.index == 0}">
 				<tr>
 					<td>
-						<B><fmt:message key="monitoring.label.group" />
-						${item.sessionName}</B>
-						<SPAN style="font-size: 12px;">
-							<c:if test="${firstGroup.index==0}">
+						<B><fmt:message key="monitoring.label.group" /> ${item.sessionName}</B> <SPAN style="font-size: 12px;"> <c:if test="${firstGroup.index==0}">
 								<fmt:message key="monitoring.summary.note" />
-							</c:if>
-						</SPAN>
+							</c:if> </SPAN>
 					</td>
 				</tr>
 				<tr>
@@ -37,61 +38,73 @@
 									<!--hide/show-->
 								</th>
 							</tr>
-				</c:if>
-							<tr>
-								<td>
-									<c:choose>
-										<c:when test="${item.itemType == 1}">
-											<fmt:message key="label.authoring.basic.resource.url"/>
-										</c:when>
-										<c:when test="${item.itemType == 2}">
-											<fmt:message key="label.authoring.basic.resource.file"/>
-										</c:when>
-										<c:when test="${item.itemType == 3}">
-											<fmt:message key="label.authoring.basic.resource.website"/>
-										</c:when>
-										<c:when test="${item.itemType == 4}">
-											<fmt:message key="label.authoring.basic.resource.learning.object"/>
-										</c:when>
-									</c:choose>
-								</td>
-								<td>
-									<a href="javascript:;" onclick="viewItem(${item.itemUid})">${item.itemTitle}</a>
-								</td>
-								<td>
-									<c:if test="${!item.itemCreateByAuthor}">
-										${item.username}
-									</c:if>
-								</td>
-								<td align="center">
-									<c:choose>
-										<c:when test="${item.viewNumber > 0}">
-											<c:set var="listUrl">
-												<c:url value='/monitoring/listuser.do?toolSessionID=${item.sessionId}&itemUid=${item.itemUid}'/>
-											</c:set>
-											<a href="#" onclick="launchPopup('${listUrl}','listuser')"> ${item.viewNumber}<a>
-										</c:when>
-										<c:otherwise>
-											0
-										</c:otherwise>
-									</c:choose>
-								</td>
-								<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>
-										</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}">
+							<%-- End group title display --%>
+							</c:if>
+							<c:if test="${item.itemUid == -1}">
+								<tr>
+									<td colspan="5">
+										<div align="left">
+											<b> <fmt:message key="message.monitoring.summary.no.resource.for.group" /> </b>
+										</div>
+									</td>
+								</tr>
+							</c:if>
+							<c:if test="${item.itemUid != -1}">
+								<tr>
+									<td>
+										<c:choose>
+											<c:when test="${item.itemType == 1}">
+												<fmt:message key="label.authoring.basic.resource.url" />
+											</c:when>
+											<c:when test="${item.itemType == 2}">
+												<fmt:message key="label.authoring.basic.resource.file" />
+											</c:when>
+											<c:when test="${item.itemType == 3}">
+												<fmt:message key="label.authoring.basic.resource.website" />
+											</c:when>
+											<c:when test="${item.itemType == 4}">
+												<fmt:message key="label.authoring.basic.resource.learning.object" />
+											</c:when>
+										</c:choose>
+									</td>
+									<td>
+										<a href="javascript:;" onclick="viewItem(${item.itemUid})">${item.itemTitle}</a>
+									</td>
+									<td>
+										<c:if test="${!item.itemCreateByAuthor}">
+											${item.username}
+										</c:if>
+									</td>
+									<td align="center">
+										<c:choose>
+											<c:when test="${item.viewNumber > 0}">
+												<c:set var="listUrl">
+													<c:url value='/monitoring/listuser.do?toolSessionID=${item.sessionId}&itemUid=${item.itemUid}' />
+												</c:set>
+												<a href="#" onclick="launchPopup('${listUrl}','listuser')"> ${item.viewNumber}<a>
+											</c:when>
+											<c:otherwise>
+												0
+											</c:otherwise>
+										</c:choose>
+									</td>
+									<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>
+											</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>
+							<c:if test="${status.count == groupSize}">
 						</table>
 					</td>
 				</tr>
-				</c:if>
+			</c:if>
 		</c:forEach>
 	</c:forEach>
 </table>
Index: lams_tool_sbmt/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r7d117b285f81648e6f16ad1e70cc84bcb59d80e4 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_sbmt/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 7d117b285f81648e6f16ad1e70cc84bcb59d80e4)
+++ lams_tool_sbmt/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -1,23 +1,9 @@
-		<!-- ========== Action Mapping Definitions ============================== -->
-		<action path="/definelater"
-			type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction"
-			name="emptyForm" 
-			scope="request" 
-			parameter="method" 
-			validate="false">
-			      <forward
-			        name="definelater"
-			        path="/authoring/definelater.jsp"
-			        redirect="false"
-			      />
-			      <forward
-			        name="forbidden"
-			        path="/authoring/definelaterforbid.jsp"
-			        redirect="false"
-			      />
-		</action>
+<!-- ========== Action Mapping Definitions ============================== -->
+<action path="/definelater" type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction" 
+		name="SbmtAuthoringForm" scope="request" parameter="dispatch" validate="false">
+	<forward name="success" path="/authoring/definelater.jsp"/>
+	<forward name="forbidden" path="/authoring/definelaterforbid.jsp"/>
+</action>
 
-		<!-- ========== BEGIN: Common ============================== -->
-		<action path="/clearsession"
-			type="org.lamsfoundation.lams.tool.sbmt.web.ClearSessionAction">
-		</action>
\ No newline at end of file
+<!-- ========== BEGIN: Common ============================== -->
+<action path="/clearsession" type="org.lamsfoundation.lams.tool.sbmt.web.ClearSessionAction"></action>
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
diff -u -r7d117b285f81648e6f16ad1e70cc84bcb59d80e4 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 7d117b285f81648e6f16ad1e70cc84bcb59d80e4)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -310,7 +310,7 @@
 		authForm.set(AttributeNames.PARAM_TOOL_CONTENT_ID,contentID);
 		authForm.set("title",persistContent.getTitle());
 		authForm.set("lockOnFinished",persistContent.isLockOnFinished()?"1":null);
-		return mapping.getInputForward();
+		return mapping.findForward("success");
 	}
 
 	//***********************************************************
@@ -400,13 +400,15 @@
 		return list;
 	}
 	
+
 	/**
+	 * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode.
 	 * @param request
 	 * @return
 	 */
 	private ToolAccessMode getAccessMode(HttpServletRequest request) {
 		ToolAccessMode mode;
-		String modeStr = request.getParameter("mode");
+		String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
 		if(StringUtils.equalsIgnoreCase(modeStr,ToolAccessMode.TEACHER.toString()))
 			mode = ToolAccessMode.TEACHER;
 		else
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r7d117b285f81648e6f16ad1e70cc84bcb59d80e4 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 7d117b285f81648e6f16ad1e70cc84bcb59d80e4)
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -192,29 +192,16 @@
       />
     </action>
 
-   		<!-- ========== Action Mapping Definitions ============================== -->
-		<action path="/definelater"
-			type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction"
-			name="emptyForm" 
-			scope="request" 
-			parameter="method" 
-			validate="false">
-			      <forward
-			        name="definelater"
-			        path="/authoring/definelater.jsp"
-			        redirect="false"
-			      />
-			      <forward
-			        name="forbidden"
-			        path="/authoring/definelaterforbid.jsp"
-			        redirect="false"
-			      />
-		</action>
+   <!-- ========== Action Mapping Definitions ============================== -->
+<action path="/definelater" type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction" 
+		name="SbmtAuthoringForm" scope="request" parameter="dispatch" validate="false">
+	<forward name="success" path="/authoring/definelater.jsp"/>
+	<forward name="forbidden" path="/authoring/definelaterforbid.jsp"/>
+</action>
 
-		<!-- ========== BEGIN: Common ============================== -->
-		<action path="/clearsession"
-			type="org.lamsfoundation.lams.tool.sbmt.web.ClearSessionAction">
-		</action>
+<!-- ========== BEGIN: Common ============================== -->
+<action path="/clearsession" type="org.lamsfoundation.lams.tool.sbmt.web.ClearSessionAction"></action>
+
   </action-mappings>
 
    <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r2b3d7902eba19ec19df28ddfdab299f6a794d15b -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 2b3d7902eba19ec19df28ddfdab299f6a794d15b)
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -44,6 +44,7 @@
 <%@ attribute name="cancelButtonLabelKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="cancelConfirmMsgKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="defineLater" required="false" rtexprvalue="false" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty cancelButtonLabelKey}">
@@ -62,22 +63,22 @@
 <!-- begin tab content -->
 <script type="text/javascript">
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+       	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}'/>";
+	}
+    function doSubmit_Form_Only() {
+    	document.getElementById("${formID}").submit();
+    }
+    function doCancel() {
+    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}'/>";
+        	//just for depress alert window when call window.close()
+        	//only available for IE browser
+        	var userAgent=navigator.userAgent;
+        	if(userAgent.indexOf('MSIE') != -1)
+	        	window.opener = "authoring"
+        	window.close();
 		}
-        function doSubmit_Form_Only() {
-        	document.getElementById("${formID}").submit();
-        }
-        function doCancel() {
-        	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-	        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}'/>";
-	        	//just for depress alert window when call window.close()
-	        	//only available for IE browser
-	        	var userAgent=navigator.userAgent;
-	        	if(userAgent.indexOf('MSIE') != -1)
-		        	window.opener = "authoring"
-	        	window.close();
-			}
-        }  				
+    }  				
 </script>				
 <p align="right">
 	<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button">
Index: lams_tool_sbmt/web/authoring/definelater.jsp
===================================================================
diff -u -r7d117b285f81648e6f16ad1e70cc84bcb59d80e4 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_sbmt/web/authoring/definelater.jsp	(.../definelater.jsp)	(revision 7d117b285f81648e6f16ad1e70cc84bcb59d80e4)
+++ lams_tool_sbmt/web/authoring/definelater.jsp	(.../definelater.jsp)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -48,19 +48,14 @@
 	    	selectTab(tabId);
         } 
         
-        function doSubmit(method) {
-        	document.getElementById("authoringForm").dispatch.value=method;
-        	document.getElementById("authoringForm").submit();
-        }
-        
     </script>
 	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
 
 
 </head>
 <body onLoad="init()">
 
-	<html:form action="authoring" method="post" focus="title" styleId="authoringForm" enctype="multipart/form-data">
+	<html:form action="definelater" method="post" focus="title" styleId="authoringForm" enctype="multipart/form-data">
 		<html:hidden property="mode" value="teacher" />
 		<html:hidden property="toolContentID" />
 		<html:hidden property="currentTab" styleId="currentTab" />
@@ -85,7 +80,8 @@
 			<!-- tab content 1 (Basic) -->
 			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
 
-			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=SbmtConstants.TOOL_SIGNATURE%>" toolContentID="${toolContentID}" definelater="yes" />
+			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" accessMode="teacher"
+					toolSignature="<%=SbmtConstants.TOOL_SIGNATURE%>" toolContentID="${toolContentID}" defineLater="true" />
 
 		</div>
 		<lams:HTMLEditor />
Index: lams_tool_sbmt/web/authoring/definelaterforbid.jsp
===================================================================
diff -u -r7d117b285f81648e6f16ad1e70cc84bcb59d80e4 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_sbmt/web/authoring/definelaterforbid.jsp	(.../definelaterforbid.jsp)	(revision 7d117b285f81648e6f16ad1e70cc84bcb59d80e4)
+++ lams_tool_sbmt/web/authoring/definelaterforbid.jsp	(.../definelaterforbid.jsp)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -1,4 +1,15 @@
 <%@ include file="/common/taglibs.jsp"%>
-<div align="center">
-	<B><fmt:message key="message.monitoring.edit.activity.not.editable" /></B>
-</div>
+<html:html locale="true">
+<head>
+	<lams:headItems />
+<head>
+<body>
+	<div align="center">
+		<h1>
+			<fmt:message key="label.authoring.heading" />
+		</h1>
+		<P>	
+		<B><fmt:message key="message.monitoring.edit.activity.not.editable" /></B>
+	</div>
+</body>
+</html:html>
\ No newline at end of file
Index: lams_tool_sbmt/web/learner/definelater.jsp
===================================================================
diff -u -r7d117b285f81648e6f16ad1e70cc84bcb59d80e4 -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888
--- lams_tool_sbmt/web/learner/definelater.jsp	(.../definelater.jsp)	(revision 7d117b285f81648e6f16ad1e70cc84bcb59d80e4)
+++ lams_tool_sbmt/web/learner/definelater.jsp	(.../definelater.jsp)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
@@ -2,11 +2,16 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html:html locale="true">
 <head>
+	<%@include file="/common/header.jsp"%>
 </head>
 
 <body>
 	<div align="center">
-		<fmt:message key="define.later.message" />
+		<h1>
+			<fmt:message key="label.authoring.heading" />
+		</h1>
+		<P>		
+		<b><fmt:message key="define.later.message" /></b>
 	</div>
 
 </body>