Index: lams_tool_larsrc/conf/language/ApplicationResources.properties
===================================================================
diff -u -r229b7cbba0b3121880c4dc69818e46d6589fd31e -r962368626dedf96b0d7c3bf5028905a97988356b
--- lams_tool_larsrc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 229b7cbba0b3121880c4dc69818e46d6589fd31e)
+++ lams_tool_larsrc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 962368626dedf96b0d7c3bf5028905a97988356b)
@@ -115,6 +115,8 @@
 #---------------------------------Monitoring ----------------------------------#
 monitoring.tab.summary=Summary
 monitoring.tab.statistics=Statistic
+monitoring.tab.instructions=Instruction
+monitoring.tab.edit.activity=Edit Activity
 
 monitoring.label.group=Group
 monitoring.summary.note=Note: number of learners is the number of learners who have viewed the resource.
@@ -128,6 +130,10 @@
 monitoring.label.user.name=Name
 monitoring.label.hidden=Hidden
 
+label.monitoring.edit.activity.cancel  =Cancel
+label.monitoring.edit.activity.update  =Update
+label.monitoring.edit.activity.edit  =Edit
+
 message.monitoring.edit.activity.not.editable=This Activity is no longer editable
 #------------------------------End Monitoring ----------------------------------#
 export.label.resource=Resource
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -r00546fef27c802810d1b2ac3d621f9c3e2d64cb0 -r962368626dedf96b0d7c3bf5028905a97988356b
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 00546fef27c802810d1b2ac3d621f9c3e2d64cb0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 962368626dedf96b0d7c3bf5028905a97988356b)
@@ -75,7 +75,6 @@
 	public static final String ERROR_MSG_UPLOAD_FAILED = "error.upload.failed";
 	
 	
-	
+	public static final String PAGE_EDITABLE = "isPageEditable";
 
-
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
===================================================================
diff -u -r00546fef27c802810d1b2ac3d621f9c3e2d64cb0 -r962368626dedf96b0d7c3bf5028905a97988356b
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 00546fef27c802810d1b2ac3d621f9c3e2d64cb0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 962368626dedf96b0d7c3bf5028905a97988356b)
@@ -25,27 +25,33 @@
 package org.lamsfoundation.lams.tool.rsrc.web.action;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
 import org.lamsfoundation.lams.tool.rsrc.dto.Summary;
+import org.lamsfoundation.lams.tool.rsrc.model.Resource;
 import org.lamsfoundation.lams.tool.rsrc.service.IResourceService;
+import org.lamsfoundation.lams.tool.rsrc.service.ResourceApplicationException;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import sun.util.logging.resources.logging;
+
 public class MonitoringAction extends Action {
+	private 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();
@@ -121,6 +127,11 @@
 		
 		//put it into HTTPSession
 		request.getSession().setAttribute(ResourceConstants.ATTR_SUMMARY_LIST, groupList);
+		
+		Resource resource = service.getResourceByContentId(contentId);
+		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);
 		return mapping.findForward(ResourceConstants.SUCCESS);
 	}
 
@@ -146,4 +157,19 @@
 				.getServletContext());
 		return (IResourceService) wac.getBean(ResourceConstants.RESOURCE_SERVICE);
 	}
+	
+	private boolean isResourceEditable(Resource resource) {
+        if ( (resource.isDefineLater() == true) && (resource.isContentInUse()==true) )
+        {
+//            throw new ResourceApplicationException("An exception has occurred: There is a bug in this tool, conflicting flags are set");
+        	 log.error("An exception has occurred: There is a bug in this tool, conflicting flags are set");
+             return false;
+        }
+        else if ( (resource.isDefineLater() == true) && (resource.isContentInUse() == false))
+            return true;
+        else if ( (resource.isDefineLater() == false) && (resource.isContentInUse() == false))
+            return true;
+        else //  (content.isContentInUse()==true && content.isDefineLater() == false)
+            return false;
+	}	
 }
Index: lams_tool_larsrc/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u
--- lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	(revision 0)
+++ lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	(revision 962368626dedf96b0d7c3bf5028905a97988356b)
@@ -0,0 +1,46 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<div class="datatablecontainer">
+	<table class="forms">
+		<tr>
+			<td class="formlabel">
+				<fmt:message key="label.authoring.basic.title" />
+				:
+			</td>
+			<td class="formcontrol">
+				<c:out value="${resource.title}" escapeXml="false" />
+			</td>
+		</tr>
+
+		<tr>
+			<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}" />
+				<c:choose>
+					<c:when test='${isPageEditable == "true"}'>
+						<c:url value="/authoring/init.do" var="authoringUrl">
+							<c:param name="toolContentID" value="${toolContentID}" />
+						</c:url>
+						<html:link href="${authoringUrl}" styleClass="button" target="_blank">
+							<fmt:message key="label.monitoring.edit.activity.edit" />
+						</html:link>
+					</c:when>
+					<c:otherwise>
+						<SPAN style="font-size: 12px;">
+							<fmt:message key="message.monitoring.edit.activity.not.editable" />
+						</SPAN>
+					</c:otherwise>
+				</c:choose>
+			</td>
+		</tr>
+	</table>
+</div>
Index: lams_tool_larsrc/web/pages/monitoring/instructions.jsp
===================================================================
diff -u
--- lams_tool_larsrc/web/pages/monitoring/instructions.jsp	(revision 0)
+++ lams_tool_larsrc/web/pages/monitoring/instructions.jsp	(revision 962368626dedf96b0d7c3bf5028905a97988356b)
@@ -0,0 +1,107 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<div class="datatablecontainer"  cellspacing="3">
+	<table class="forms" border="0">
+		<!-- Instructions Row -->
+		<tr>
+			<td width="200">
+				<fmt:message key="label.authoring.online.instruction" />
+				:
+			</td>
+			<td>
+				<c:out value="${resource.onlineInstructions}" escapeXml="false" />
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2">
+				&nbsp;
+			</td>
+			<%--
+			<td class="formcontrol">
+
+				<div id="onlinefile">
+					<c:forEach var="file" items="${formBean.onlineFileList}">
+						<li>
+							<c:out value="${file.fileName}" />
+							<c:set var="viewURL">
+								<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
+							</c:set>
+							<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+								<fmt:message key="label.view" />
+							</a>
+							&nbsp;
+							<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'/>">
+								<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>
+
+
+		<tr>
+			<td width="200">
+				<fmt:message key="label.authoring.offline.instruction" />
+				:
+			</td>
+			<td>
+				<c:out value="${resource.offlineInstructions}" escapeXml="false" />
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2">
+				&nbsp;
+			</td>
+			<%--
+			<td class="formcontrol">
+				<div id="offlinefile">
+					<c:forEach var="file" items="${formBean.offlineFileList}">
+						<li>
+							<c:out value="${file.fileName}" />
+							<c:set var="viewURL">
+								<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
+							</c:set>
+							<html:link href="javascript:launchInstructionsPopup('${viewURL}')">
+								<fmt:message key="label.view" />
+							</html:link>
+							<c:set var="downloadURL">
+								<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
+							</c:set>
+							<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>
+			<td class="formlabel" colspan="2">
+				<html:errors property="instruction.globel" />
+			</td>
+		</tr>
+		--%>
+	</table>
+</div>
+
+
Index: lams_tool_larsrc/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r13f904eca7f8ea334801f65d1d6be6bdeb950df0 -r962368626dedf96b0d7c3bf5028905a97988356b
--- lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 13f904eca7f8ea334801f65d1d6be6bdeb950df0)
+++ lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 962368626dedf96b0d7c3bf5028905a97988356b)
@@ -10,7 +10,7 @@
 	        
 	        function init(){
 	        
-	            initTabSize(2);
+	            initTabSize(4);
 	            
                 selectTab(1); //select the default tab;
 	        }     
@@ -26,13 +26,17 @@
 	<body onLoad="init()">
 		<lams:Tabs>
 			<lams:Tab id="1" key="monitoring.tab.summary" />
-			<lams:Tab id="2" key="monitoring.tab.statistics" />
+			<lams:Tab id="2" key="monitoring.tab.instructions" />
+			<lams:Tab id="3" key="monitoring.tab.edit.activity" />			
+			<lams:Tab id="4" key="monitoring.tab.statistics" />
 		</lams:Tabs>
 
 
 		<div class="tabbody">
 			<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
-			<lams:TabBody id="2" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
+			<lams:TabBody id="2" titleKey="monitoring.tab.instructions" page="instructions.jsp"/>
+			<lams:TabBody id="3" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
+			<lams:TabBody id="4" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
 		</div>
 	</body>
 </html>
Index: lams_tool_larsrc/web/pages/monitoring/statistic.jsp
===================================================================
diff -u -r6f9ce8030c9939df344a3aa7f5894116491a90d8 -r962368626dedf96b0d7c3bf5028905a97988356b
--- lams_tool_larsrc/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 6f9ce8030c9939df344a3aa7f5894116491a90d8)
+++ lams_tool_larsrc/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 962368626dedf96b0d7c3bf5028905a97988356b)
@@ -1,7 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <table border="0" cellspacing="3" width="98%">
-	<c:forEach var="group" items="${summaryList}">
+	<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--%>
@@ -10,6 +10,11 @@
 					<td>
 						<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>						
 					</td>
 				</tr>
 				<tr>