Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/xdoclet/struts-actions.xml,v
diff -u -r1.18 -r1.19
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	23 Nov 2005 04:07:30 -0000	1.18
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	23 Nov 2005 05:24:36 -0000	1.19
@@ -225,56 +225,69 @@
 			parameter="downloadMarks" >
 			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
 		</action>
-		<action path="/monitoring/viewUserMark"
+		<action path="/monitoring/viewAllMarks"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			name="emptyForm"
 			scope="request"
 			validate="false"
-			parameter="viewUserMark" >
-			<forward name="success" path="tiles:/monitoring/forum/viewUserMark" />
+			parameter="viewAllMarks" >
+			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
 		</action>
-		<action path="/monitoring/viewAllMarks"
+		
+		<!--  EDIT MARK		 -->
+		<action path="/monitoring/viewUserMark"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			name="emptyForm"
 			scope="request"
 			validate="false"
-			parameter="viewAllMarks" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+			parameter="viewUserMark" >
+			<forward name="success" path="tiles:/monitoring/forum/viewUserMark" />
 		</action>
 		<action path="/monitoring/editMark"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			name="markForm"
 			scope="request"
-			validate="true"			
+			validate="false"			
 			parameter="editMark" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+			<forward name="success" path="tiles:/monitoring/forum/editUserMark" />
 		</action>
 		<action path="/monitoring/updateMark"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			name="markForm"
 			scope="request"
 			validate="true"
 			parameter="updateMark" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+			<forward name="success" path="tiles:/monitoring/forum/editUserMark" />
 		</action>
 		
+		<action path="/monitoring/viewActivity"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			name="emptyForm"
+			scope="request"
+			validate="false"
+			parameter="viewActivity" >
+			<forward name="success" path="tiles:/monitoring/forum/viewActivity" />
+		</action>
+		
 		<action path="/monitoring/editActivity"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			parameter="editActivity" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+			<forward name="success" path="tiles:/monitoring/forum/editActivity" />
 		</action>
+		
 		<action path="/monitoring/updateActivity"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			name="emptyForm"
 			scope="request"
 			validate="false"
 			parameter="updateActivity" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+			<forward name="success" path="tiles:/monitoring/forum/viewActivity" />
 		</action>
+		
 		<action path="/monitoring/viewInstructions"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			parameter="viewInstructions" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+			<forward name="success" path="tiles:/monitoring/forum/viewInstructions" />
 		</action>
 		<action path="/monitoring/statistic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java,v
diff -u -r1.10 -r1.11
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	15 Nov 2005 05:57:41 -0000	1.10
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	23 Nov 2005 05:24:36 -0000	1.11
@@ -19,7 +19,9 @@
 	private static final String SQL_QUERY_FIND_TOPICS_FROM_AUTHOR = "from " + Message.class.getName()
 					+ " where is_authored = true and forum_uid=?";
 	private static final String SQL_QUERY_FIND_CHILDREN = "from " + Message.class.getName()
-	+ " where parent=?";
+					+ " where parent=?";
+	private static final String SQL_QUERY_BY_USER_SESSION = "from " + Message.class.getName() + " m "
+					+ " where m.createdBy.uid = ? and  m.toolSession.uid=?";
 	
 	public void saveOrUpdate(Message message) {
 		message.updateModificationData();
@@ -78,5 +80,9 @@
 		return this.getHibernateTemplate().find(SQL_QUERY_FIND_CHILDREN, parentId);
 	}
 
+	public List getByUserAndSession(Long userId, Long sessionId) {
+		return this.getHibernateTemplate().find(SQL_QUERY_BY_USER_SESSION, new Object[]{userId,sessionId});
+	}
 
+
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v
diff -u -r1.24 -r1.25
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	23 Nov 2005 04:07:30 -0000	1.24
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	23 Nov 2005 05:24:36 -0000	1.25
@@ -281,7 +281,7 @@
 		
 	}
 
-	public ForumUser getUserByUserId(Long userId,Long sessionId) {
+	public ForumUser getUserByUserAndSession(Long userId,Long sessionId) {
 		return  forumUserDao.getByUserIdAndSessionId(userId,sessionId);
 	}
 
@@ -461,11 +461,16 @@
 		}
 	}
 
-
-	public List getMessagesByUserUid(Long userId) {
+	public List getMessagesByUserUid(Long userId,Long sessionId) {
+		List list = messageDao.getByUserAndSession(userId,sessionId);
 		
-		return null;
+		return MessageDTO.getMessageDTO(list);
 	}
+
+	public ForumUser getUser(Long userUid) {
+		return forumUserDao.getByUid(userUid);
+	}
+
     //***************************************************************************************************************
     // Get / Set methods
     //***************************************************************************************************************
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java,v
diff -u -r1.19 -r1.20
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	23 Nov 2005 04:07:30 -0000	1.19
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	23 Nov 2005 05:24:36 -0000	1.20
@@ -171,7 +171,7 @@
      * @param userId
      * @return
      */
-    public List getMessagesByUserUid(Long userId);
+    public List getMessagesByUserUid(Long userId, Long sessionId);
 	//************************************************************************************
 	// Session Method
 	//************************************************************************************
@@ -205,13 +205,19 @@
      * @param userId
      * @return
      */
-    public ForumUser getUserByUserId(Long userId,Long sessionId);
+    public ForumUser getUserByUserAndSession(Long userId,Long sessionId);
     /**
      * Get user list by given session ID.
      * @param sessionID
      * @return
      */
 	public List getUsersBySessionId(Long sessionID);
+	/**
+	 * Get user by uid
+	 * @param userId
+	 * @return
+	 */
+	public ForumUser getUser(Long userUid);
 	
 	//************************************************************************************
 	// Report  Method
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/Attic/ApplicationResources.properties,v
diff -u -r1.11 -r1.12
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	22 Nov 2005 04:15:07 -0000	1.11
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	23 Nov 2005 05:24:36 -0000	1.12
@@ -40,6 +40,10 @@
 authoring.exception= There is a problem in forum authoring page, the reason is {0}
 #-------------------------END Authoring Labels END-----------------#
 page.title.monitoring.content.userlist=Monitoring User List
+page.title.monitoring.view.user.mark=View user mark
+page.title.monitoring.edit.user.mark=Edit user mark
+page.title.monitoring.view.activity=View Activity
+page.title.monitoring.edit.activity=Edit Activity
 
 ## errors
 errors.header=<b class="error">
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java,v
diff -u -r1.24 -r1.25
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	22 Nov 2005 04:01:14 -0000	1.24
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	23 Nov 2005 05:24:36 -0000	1.25
@@ -523,7 +523,7 @@
 		message.setUpdated(new Date());
 		message.setLastReplyDate(new Date());
 		//check whether this user exist or not
-		ForumUser forumUser = forumService.getUserByUserId(new Long(user.getUserID().intValue()),null);
+		ForumUser forumUser = forumService.getUserByUserAndSession(new Long(user.getUserID().intValue()),null);
 		if(forumUser == null){
 			//if user not exist, create new one in database
 			forumUser = new ForumUser(user,null);
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v
diff -u -r1.15 -r1.16
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	22 Nov 2005 04:01:14 -0000	1.15
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	23 Nov 2005 05:24:36 -0000	1.16
@@ -420,7 +420,7 @@
 		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 		//check whether this user exist or not
 		Long sessionId = (Long) request.getSession().getAttribute(AttributeNames.PARAM_TOOL_SESSION_ID);
-		ForumUser forumUser = forumService.getUserByUserId(new Long(user.getUserID().intValue()),sessionId);
+		ForumUser forumUser = forumService.getUserByUserAndSession(new Long(user.getUserID().intValue()),sessionId);
 		if(forumUser == null){
 			//if user not exist, create new one in database
 			ForumToolSession session = forumService.getSessionBySessionId(sessionId);
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	23 Nov 2005 04:07:30 -0000	1.3
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	23 Nov 2005 05:24:36 -0000	1.4
@@ -81,6 +81,9 @@
 		 }
 		 
 		 //***************** Activity and Instructions ********************
+		 if (param.equals("viewActivity")) {
+			 return viewActivity(mapping,form, request, response);
+		 }
 		 if (param.equals("editActivity")) {
 			 return editActivity(mapping,form, request, response);
 		 }
@@ -143,12 +146,12 @@
 
 	private ActionForward viewUserMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
-		Long userId = new Long(WebUtil.readLongParam(request,ForumConstants.USER_UID));
+		Long userUid = new Long(WebUtil.readLongParam(request,ForumConstants.USER_UID));
 		Long sessionId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
 		
 		forumService = getForumService();
-		List messageList = forumService.getMessagesByUserUid(userId);
-		ForumUser user = forumService.getUserByUserId(userId,sessionId);
+		List messageList = forumService.getMessagesByUserUid(userUid,sessionId);
+		ForumUser user = forumService.getUser(userUid);
 
 		//each back to web page
 		request.setAttribute("topicList",messageList);
@@ -159,13 +162,13 @@
 
 	private ActionForward editMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
-		Long userId = new Long(WebUtil.readLongParam(request,ForumConstants.USER_UID));
+		Long userUid = new Long(WebUtil.readLongParam(request,ForumConstants.USER_UID));
 		Long messageId = new Long(WebUtil.readLongParam(request,ForumConstants.MESSAGE_UID));
 		Long sessionId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
 		
 		forumService = getForumService();
 		Message msg  = forumService.getMessage(messageId);
-		ForumUser user = forumService.getUserByUserId(userId,sessionId);
+		ForumUser user = forumService.getUser(userUid);
 		
 		//each back to web page
 		if(msg.getReport() != null){
@@ -199,18 +202,33 @@
 		
 		return mapping.findForward("success");
 	}
-
+	
+	private ActionForward viewActivity(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+		forumService = getForumService();
+		Forum forum = forumService.getForum(contentId);
+		String title = forum.getTitle();
+		String instruction = forum.getInstructions();
+		
+		request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID,contentId);
+		request.setAttribute("title",title);
+		request.setAttribute("instruction",instruction);
+		return mapping.findForward("success");
+	}
 	private ActionForward editActivity(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
+		
 		Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
 		forumService = getForumService();
 		Forum forum = forumService.getForum(contentId);
+		
 		String title = forum.getTitle();
 		String instruction = forum.getInstructions();
 		
-		request.setAttribute("contentID",contentId);
 		request.setAttribute("title",title);
 		request.setAttribute("instruction",instruction);
+		request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID,contentId);
 		return mapping.findForward("success");
 	}
 
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.23 -r1.24
--- lams_tool_forum/web/WEB-INF/struts-config.xml	22 Nov 2005 23:19:28 -0000	1.23
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	23 Nov 2005 05:24:37 -0000	1.24
@@ -259,52 +259,64 @@
 			parameter="downloadMarks" >
 			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
 		</action>
-		<action path="/monitoring/viewUserMark"
+		<action path="/monitoring/viewAllMarks"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			name="emptyForm"
 			scope="request"
 			validate="false"
-			parameter="viewUserMark" >
+			parameter="viewAllMarks" >
 			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
 		</action>
-		<action path="/monitoring/viewAllMarks"
+		<!--  EDIT MARK		 -->
+		<action path="/monitoring/viewUserMark"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			name="emptyForm"
 			scope="request"
 			validate="false"
-			parameter="viewAllMarks" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+			parameter="viewUserMark" >
+			<forward name="success" path="tiles:/monitoring/forum/viewUserMark" />
 		</action>
 		<action path="/monitoring/editMark"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			name="markForm"
+			scope="request"
+			validate="false"			
 			parameter="editMark" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+			<forward name="success" path="tiles:/monitoring/forum/editUserMark" />
 		</action>
 		<action path="/monitoring/updateMark"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			name="markForm"
 			scope="request"
 			validate="true"
 			parameter="updateMark" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+			<forward name="success" path="tiles:/monitoring/forum/editUserMark" />
 		</action>
+		<action path="/monitoring/viewActivity"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			name="emptyForm"
+			scope="request"
+			validate="false"
+			parameter="viewActivity" >
+			<forward name="success" path="tiles:/monitoring/forum/viewActivity" />
+		</action>
 		<action path="/monitoring/editActivity"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			parameter="editActivity" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+			<forward name="success" path="tiles:/monitoring/forum/editActivity" />
 		</action>
 		<action path="/monitoring/updateActivity"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			name="emptyForm"
 			scope="request"
 			validate="false"
 			parameter="updateActivity" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+			<forward name="success" path="tiles:/monitoring/forum/viewActivity" />
 		</action>
 		<action path="/monitoring/viewInstructions"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			parameter="viewInstructions" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+			<forward name="success" path="tiles:/monitoring/forum/viewInstructions" />
 		</action>
 		<action path="/monitoring/statistic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.11 -r1.12
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	23 Nov 2005 04:07:30 -0000	1.11
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	23 Nov 2005 05:24:36 -0000	1.12
@@ -79,9 +79,25 @@
     	<put name="body" value="/jsps/monitoring/contentuserlist.jsp"/>
 	</definition>
 	<definition name="tiles:/monitoring/forum/viewUserMark" extends="tiles:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.user.mark"/>
+    	<put name="pageTitleKey" value="page.title.monitoring.view.user.mark"/>
     	<put name="body" value="/jsps/monitoring/usermarklist.jsp"/>
 	</definition>
+	<definition name="tiles:/monitoring/forum/editUserMark" extends="tiles:layout">
+    	<put name="pageTitleKey" value="page.title.monitoring.edit.user.mark"/>
+    	<put name="body" value="/jsps/monitoring/updatemarks.jsp"/>
+	</definition>
+	<definition name="tiles:/monitoring/forum/viewActivity" extends="tiles:layout">
+    	<put name="pageTitleKey" value="page.title.monitoring.view.activity"/>
+    	<put name="body" value="/jsps/monitoring/viewactivity.jsp"/>
+	</definition>
+	<definition name="tiles:/monitoring/forum/editActivity" extends="tiles:layout">
+    	<put name="pageTitleKey" value="page.title.monitoring.edit.activity"/>
+    	<put name="body" value="/jsps/monitoring/editactivity.jsp"/>
+	</definition>
+	<definition name="tiles:/monitoring/forum/viewInstructions" extends="tiles:layout">
+    	<put name="pageTitleKey" value="page.title.monitoring.edit.activity"/>
+    	<put name="body" value="/jsps/monitoring/instructions.jsp"/>
+	</definition>
 	<!-- E: Monitoring -->
 	
 </tiles-definitions>
Index: lams_tool_forum/web/jsps/monitoring/contentuserlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/Attic/contentuserlist.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/web/jsps/monitoring/contentuserlist.jsp	23 Nov 2005 04:07:30 -0000	1.2
+++ lams_tool_forum/web/jsps/monitoring/contentuserlist.jsp	23 Nov 2005 05:24:36 -0000	1.3
@@ -14,7 +14,7 @@
 				<tr>
 				<html:form  action="/monitoring/viewUserMark">
 					<html:hidden property="toolSessionID" value="${toolSessionID}"/>
-					<html:hidden property="userID" value="${user.userId}"/>
+					<html:hidden property="userID" value="${user.uid}"/>
 					<td ><b><c:out value="${user.firstName}"/> <c:out value="${user.lastName}"/></b></td>
 					<td ><b><c:out value="${user.loginName}"/> </b></td>
 					<td class="formcontrol"><b><html:submit property="Mark" value="Mark"/></b></td>
Index: lams_tool_forum/web/jsps/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/editactivity.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/web/jsps/monitoring/editactivity.jsp	23 Nov 2005 04:07:30 -0000	1.2
+++ lams_tool_forum/web/jsps/monitoring/editactivity.jsp	23 Nov 2005 05:24:36 -0000	1.3
@@ -1,4 +1,6 @@
-	<html:form action="monitoring" method="post" >
+<%@ include file="/includes/taglibs.jsp" %>
+
+	<html:form action="/monitoring/updateActivity" method="post" >
 		<html:errors/>
 		<div id="basic">
 		<h1><fmt:message key="label.authoring.heading.basic" /></h1>
@@ -35,5 +37,3 @@
 		</table>
 		</div>
 	</html:form>
-</body>
-</html:html>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/monitoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/Attic/instructions.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/web/jsps/monitoring/instructions.jsp	23 Nov 2005 04:07:30 -0000	1.2
+++ lams_tool_forum/web/jsps/monitoring/instructions.jsp	23 Nov 2005 05:24:36 -0000	1.3
@@ -1,3 +1,5 @@
+<%@ include file="/includes/taglibs.jsp" %>
+
 	<h1><fmt:message key="label.authoring.heading.instructions" /></h1>
 	<h2><fmt:message key="label.authoring.heading.instructions.desc" /></h2>
 	<table class="forms">
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/monitoring/showactivity.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/monitoring/success.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/updatemarks.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	23 Nov 2005 04:07:30 -0000	1.2
+++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	23 Nov 2005 05:24:36 -0000	1.3
@@ -1,3 +1,4 @@
+<%@ include file="/includes/taglibs.jsp" %>
   <b>Please assign a mark and a comment for the report by 
   		 <c:out value="${user.login}" /> , <c:out value="${user.firstName}" />  <c:out value="${user.lastName}" /> 	
   </b></p>
Index: lams_tool_forum/web/jsps/monitoring/usermarklist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/Attic/usermarklist.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/web/jsps/monitoring/usermarklist.jsp	23 Nov 2005 04:07:30 -0000	1.1
+++ lams_tool_forum/web/jsps/monitoring/usermarklist.jsp	23 Nov 2005 05:24:36 -0000	1.2
@@ -1,5 +1,5 @@
-	<c:set var="filesUploaded" value ="${userReport}"/>
-	<c:set var="user" value="${user}" />
+<%@ include file="/includes/taglibs.jsp" %>
+	
 	<b>Following files have been submitted by 
 		 <c:out value="${user.loginName}" /> , <c:out value="${user.firstName}" />  <c:out value="${user.lastName}" /> 	
 	</b>
@@ -33,12 +33,13 @@
 			</tr>
 		 <tr>
 			<td colspan="2">
-			<form action="<html:rewrite page='/monitoring/editMark'/>" method="post">
+			<br>
+			<html:form action="/monitoring/editMark" method="post">
 					<input type="hidden" name="messageID" value=<c:out value='${topic.message.uid}' /> >
 					<input type="hidden" name="toolSessionID" value=<c:out value='${toolSessionID}' /> >
 					<input type="hidden" name="userID" value=<c:out value='${user.uid}' /> >
 					<input type="submit" value="Update Marks"/>
-			</form>
+			</html:form>
 			</td>
 		</tr>
 		</c:forEach>
Index: lams_tool_forum/web/jsps/monitoring/viewactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/viewactivity.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/web/jsps/monitoring/viewactivity.jsp	23 Nov 2005 05:24:36 -0000	1.1
@@ -0,0 +1,30 @@
+<html:form action="/monitoring/editActivity" method="post" >
+	<div id="basic">
+	<h1><fmt:message key="label.authoring.heading.basic" /></h1>
+	<h1><fmt:message key="label.authoring.heading.basic.desc" /></h1>
+	<table class="forms">
+		<!--hidden field contentID passed by flash-->
+		<input type="hidden" name="toolContentID" value="<c:out value='${authoring.contentID}'/>"/>
+		<input type="hidden" name="method" value="editActivity"/>
+		<!-- Title Row -->
+		<tr>
+			<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
+			<td class="formcontrol">
+				<c:out value="${authoring.title}" escapeXml="false"/>
+			</td>
+		</tr>
+		<!-- Instructions Row -->
+		<tr>
+			<td class="formlabel"><fmt:message key="label.authoring.basic.instruction" />:</td>
+			<td class="formcontrol">
+				<c:out value="${authoring.instruction}" escapeXml="false"/>
+			</td>
+		</tr>
+		<tr><td colspan="2">
+			<html:submit>
+				<fmt:message key="label.monitoring.edit.activity.edit"/>
+			</html:submit>
+		</td></tr>
+	</table>
+	</div>
+</html:form>