Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r7e3a5a06958382ab32f15969c971d7b3e1599626 -r1079ea24a56ed171c7d70985cf72de279765d386
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 7e3a5a06958382ab32f15969c971d7b3e1599626)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
@@ -246,22 +246,24 @@
 		<action path="/monitoring/editMark"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			name="markForm"
-			scope="request"
+			scope="session"
 			validate="false"			
 			parameter="editMark" >
 			<forward name="success" path="tiles:/monitoring/forum/editUserMark" />
 		</action>
 		<action path="/monitoring/updateMark"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			input="tiles:/monitoring/forum/editUserMark"
 			name="markForm"
 			scope="request"
 			validate="true"
 			parameter="updateMark" >
-			<forward name="success" path="tiles:/monitoring/forum/editUserMark" />
+			<forward name="success" path="tiles:/monitoring/forum/viewUserMark" />
 		</action>
 		
 		<action path="/monitoring/viewActivity"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			input="tiles:/monitoring/forum/viewActivity"
 			name="emptyForm"
 			scope="request"
 			validate="false"
@@ -271,12 +273,17 @@
 		
 		<action path="/monitoring/editActivity"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			input="tiles:/monitoring/forum/editActivity"
+			name="emptyForm"
+			scope="request"
+			validate="false"			
 			parameter="editActivity" >
 			<forward name="success" path="tiles:/monitoring/forum/editActivity" />
 		</action>
 		
 		<action path="/monitoring/updateActivity"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			input="tiles:/monitoring/forum/editActivity"
 			name="emptyForm"
 			scope="request"
 			validate="false"
@@ -285,6 +292,7 @@
 		</action>
 		
 		<action path="/monitoring/viewInstructions"
+			input="tiles:/monitoring/forum/viewInstructions"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			parameter="viewInstructions" >
 			<forward name="success" path="tiles:/monitoring/forum/viewInstructions" />
Index: lams_tool_forum/conf/xdoclet/taglibs.xml
===================================================================
diff -u -ra2160af2abd41d478e36906531604f57dcc15d13 -r1079ea24a56ed171c7d70985cf72de279765d386
--- lams_tool_forum/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision a2160af2abd41d478e36906531604f57dcc15d13)
+++ lams_tool_forum/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
@@ -78,14 +78,10 @@
 </taglib>
 
 
-	<!--  ======================================================== -->	
-	<!--   Customized Tag Library -->
-	<!--  ======================================================== -->	
-	<taglib>
-	    <taglib-uri>fck-editor</taglib-uri>
-	    <taglib-location>/WEB-INF/fckeditor/FCKeditor.tld</taglib-location>
-	</taglib>
-	<taglib>
-	   <taglib-uri>tags-lams</taglib-uri>
-	   <taglib-location>/WEB-INF/lams.tld</taglib-location>
-	</taglib>
+<!--  ======================================================== -->	
+<!--   Customized Tag Library -->
+<!--  ======================================================== -->	
+<taglib>
+   <taglib-uri>tags-lams</taglib-uri>
+   <taglib-location>/WEB-INF/lams.tld</taglib-location>
+</taglib>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties
===================================================================
diff -u -r7e3a5a06958382ab32f15969c971d7b3e1599626 -r1079ea24a56ed171c7d70985cf72de279765d386
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7e3a5a06958382ab32f15969c971d7b3e1599626)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
@@ -37,14 +37,18 @@
 lable.topic.subject.by=By
 label.back.to.forum=Go back to froum
 
+label.monitoring.edit.activity.cancel=Cancel
+label.monitoring.edit.activity.update=Update
+label.monitoring.edit.activity.edit=Edit
+
 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
-
+page.title.monitoring.view.instructions=View Instructions
 ## errors
 errors.header=<b class="error">
 errors.footer=</b>
@@ -55,6 +59,8 @@
 error.uploading = error uploading
 error.mark.needNumber= Mark must be int value
 error.mark.needInteger= Mark must be int value
+error.fail.get.forum=No Forum available
+error.title.empty=Title can not be blank
 #General Messages
 message.msg.maxFileSize = Max 250K
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
diff -u -r7e3a5a06958382ab32f15969c971d7b3e1599626 -r1079ea24a56ed171c7d70985cf72de279765d386
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7e3a5a06958382ab32f15969c971d7b3e1599626)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
@@ -28,11 +28,16 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.apache.poi.util.StringUtil;
 import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumReport;
@@ -166,29 +171,33 @@
 		Long messageId = new Long(WebUtil.readLongParam(request,ForumConstants.MESSAGE_UID));
 		Long sessionId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
 		
+		//get Message and User from database
 		forumService = getForumService();
 		Message msg  = forumService.getMessage(messageId);
 		ForumUser user = forumService.getUser(userUid);
 		
-		//each back to web page
+		//echo back to web page
+		MarkForm markForm = (MarkForm) form;
 		if(msg.getReport() != null){
-			MarkForm markForm = (MarkForm) form;
 			markForm.setMark(new Integer(msg.getReport().getMark()).toString());
 			markForm.setComment(msg.getReport().getComment());
 		}
-		request.setAttribute("message",MessageDTO.getMessageDTO(msg));
-		request.setAttribute("user",user);
-		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionId);
+		markForm.setUser(user);
+		markForm.setMessageDto(MessageDTO.getMessageDTO(msg));
+		markForm.setSessionId(sessionId);
 		return mapping.findForward("success");
 	}
 
 	private ActionForward updateMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
 		Long messageId = new Long(WebUtil.readLongParam(request,ForumConstants.MESSAGE_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();
 		Message msg  = forumService.getMessage(messageId);
 		
+		//save it into database
 		MarkForm markForm = (MarkForm) form;
 		forumService = getForumService();
 		ForumReport report = msg.getReport();
@@ -200,14 +209,29 @@
 		report.setComment(markForm.getComment());
 		forumService.updateTopic(msg);
 		
+		//echo back to web page
+		forumService = getForumService();
+		List messageList = forumService.getMessagesByUserUid(userUid,sessionId);
+		ForumUser user = forumService.getUser(userUid);
+		request.setAttribute("topicList",messageList);
+		request.setAttribute("user",user);
+		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionId);
 		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);
+		Forum forum = forumService.getForumByContentId(contentId);
+		//if can not find out forum, echo back error message
+		if(forum == null){
+			ActionErrors errors = new ActionErrors();
+			errors.add("activity.globel", new ActionMessage("error.fail.get.forum"));
+			this.addErrors(request,errors);
+			return mapping.getInputForward();
+		}
 		String title = forum.getTitle();
 		String instruction = forum.getInstructions();
 		
@@ -221,11 +245,19 @@
 		
 		Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
 		forumService = getForumService();
-		Forum forum = forumService.getForum(contentId);
+		Forum forum = forumService.getForumByContentId(contentId);
+		//if can not find out forum, echo back error message
+		if(forum == null){
+			ActionErrors errors = new ActionErrors();
+			errors.add("activity.globel", new ActionMessage("error.fail.get.forum"));
+			this.addErrors(request,errors);
+			//echo back to screen
+			request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID,contentId);
+			return mapping.getInputForward();
+		}
 		
 		String title = forum.getTitle();
 		String instruction = forum.getInstructions();
-		
 		request.setAttribute("title",title);
 		request.setAttribute("instruction",instruction);
 		request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID,contentId);
@@ -239,7 +271,23 @@
 		String instruction = request.getParameter("instruction");
 		
 		forumService = getForumService();
-		Forum forum = forumService.getForum(contentId);
+		Forum forum = forumService.getForumByContentId(contentId);
+		//if can not find out forum, echo back error message
+		ActionErrors errors = new ActionErrors();
+		if(forum == null){
+			errors.add("activity.globel", new ActionMessage("error.fail.get.forum"));
+		}
+		if(StringUtils.isEmpty(title)){
+			errors.add("activity.title", new ActionMessage("error.title.empty"));
+		}
+		//echo back to screen
+		request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID,contentId);
+		request.setAttribute("title",title);
+		request.setAttribute("instruction",instruction);			
+		if(!errors.isEmpty()){
+			this.addErrors(request,errors);
+			return mapping.getInputForward();
+		}
 		forum.setTitle(title);
 		forum.setInstructions(instruction);
 		forumService.updateForum(forum);
@@ -252,7 +300,14 @@
 		Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
 		
 		forumService = getForumService();
-		Forum forum = forumService.getForum(contentId);
+		Forum forum = forumService.getForumByContentId(contentId);
+		//if can not find out forum, echo back error message
+		if(forum == null){
+			ActionErrors errors = new ActionErrors();
+			errors.add("instruction.globel", new ActionMessage("error.fail.get.forum"));
+			this.addErrors(request,errors);
+			return mapping.getInputForward();
+		}
 		
 		ForumForm forumForm = new ForumForm();
 		forumForm.setForum(forum);
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MarkForm.java
===================================================================
diff -u -r7845ea9e982f5c1ff7502401352b7aacd6865221 -r1079ea24a56ed171c7d70985cf72de279765d386
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MarkForm.java	(.../MarkForm.java)	(revision 7845ea9e982f5c1ff7502401352b7aacd6865221)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MarkForm.java	(.../MarkForm.java)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
@@ -26,6 +26,8 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.validator.ValidatorForm;
+import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
+import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
 /**
  * @struts.form name="markForm"
  * @author Steve.Ni
@@ -38,7 +40,11 @@
 	
 	private String mark;
 	private String comment;
-    /**
+	private ForumUser user;
+	private MessageDTO messageDto;
+	private Long sessionId;
+
+	/**
      * MessageForm validation method from STRUCT interface.
      * 
      */
@@ -48,16 +54,16 @@
         try{
             if ("".equals(mark)) {
               ActionMessage error = new ActionMessage("error.valueReqd");
-              errors.add("message.mark", error);
+              errors.add("report.mark", error);
             }else if(!NumberUtils.isNumber(mark)){
             	ActionMessage error = new ActionMessage("error.mark.needNumber");
-            	errors.add("message.mark", error);
+            	errors.add("report.mark", error);
             }else {
             	try{
             		Integer.parseInt(mark);
             	}catch(Exception e){
                   	ActionMessage error = new ActionMessage("error.mark.needInteger");
-                	errors.add("message.mark", error);
+                	errors.add("report.mark", error);
             	}
             }
         } catch (Exception e) {
@@ -78,4 +84,27 @@
 	public void setMark(String mark) {
 		this.mark = mark;
 	}
+	
+    public MessageDTO getMessageDto() {
+		return messageDto;
+	}
+
+	public void setMessageDto(MessageDTO message) {
+		this.messageDto = message;
+	}
+
+	public ForumUser getUser() {
+		return user;
+	}
+
+	public void setUser(ForumUser user) {
+		this.user = user;
+	}
+	public Long getSessionId() {
+		return sessionId;
+	}
+
+	public void setSessionId(Long sessionId) {
+		this.sessionId = sessionId;
+	}
 }
Fisheye: Tag 1079ea24a56ed171c7d70985cf72de279765d386 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/fckeditor/FCKeditor.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(revision 0)
+++ lams_tool_forum/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+
+<taglib>
+	<tlibversion>2.2</tlibversion>
+	<jspversion>1.1</jspversion>
+	<shortname>FCKeditor</shortname>
+	<uri>http://fckeditor.net/tags-fckeditor</uri>
+	<info>FCKeditor taglib</info>
+	<tag>
+		<name>editor</name>
+		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
+		<bodycontent>JSP</bodycontent>
+		<attribute>
+			<name>id</name>
+			<required>true</required>
+  		</attribute>
+		<attribute>
+			<name>basePath</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>toolbarSet</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>width</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>height</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>customConfigurationsPath</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>editorAreaCSS</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>baseHref</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>skinPath</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>pluginsPath</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>fullPage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>debug</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>autoDetectLanguage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>defaultLanguage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>contentLangDirection</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>enableXHTML</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>enableSourceXHTML</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>fillEmptyBlocks</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>formatSource</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>formatOutput</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>formatIndentator</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>geckoUseSPAN</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>startupFocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>forcePasteAsPlainText</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>forceSimpleAmpersand</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>tabSpaces</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>useBROnCarriageReturn</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>toolbarStartExpanded</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>toolbarCanCollapse</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>fontColors</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>fontNames</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>fontSizes</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>fontFormats</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>stylesXmlPath</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>linkBrowserURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>imageBrowserURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute> 		
+	</tag>
+</taglib>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r7e3a5a06958382ab32f15969c971d7b3e1599626 -r1079ea24a56ed171c7d70985cf72de279765d386
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 7e3a5a06958382ab32f15969c971d7b3e1599626)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
@@ -279,21 +279,23 @@
 		<action path="/monitoring/editMark"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			name="markForm"
-			scope="request"
+			scope="session"
 			validate="false"			
 			parameter="editMark" >
 			<forward name="success" path="tiles:/monitoring/forum/editUserMark" />
 		</action>
 		<action path="/monitoring/updateMark"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			input="tiles:/monitoring/forum/editUserMark"
 			name="markForm"
 			scope="request"
 			validate="true"
 			parameter="updateMark" >
-			<forward name="success" path="tiles:/monitoring/forum/editUserMark" />
+			<forward name="success" path="tiles:/monitoring/forum/viewUserMark" />
 		</action>
 		<action path="/monitoring/viewActivity"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			input="tiles:/monitoring/forum/viewActivity"
 			name="emptyForm"
 			scope="request"
 			validate="false"
@@ -302,18 +304,24 @@
 		</action>
 		<action path="/monitoring/editActivity"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			input="tiles:/monitoring/forum/editActivity"
+			name="emptyForm"
+			scope="request"
+			validate="false"			
 			parameter="editActivity" >
 			<forward name="success" path="tiles:/monitoring/forum/editActivity" />
 		</action>
 		<action path="/monitoring/updateActivity"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			input="tiles:/monitoring/forum/editActivity"
 			name="emptyForm"
 			scope="request"
 			validate="false"
 			parameter="updateActivity" >
 			<forward name="success" path="tiles:/monitoring/forum/viewActivity" />
 		</action>
 		<action path="/monitoring/viewInstructions"
+			input="tiles:/monitoring/forum/viewInstructions"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			parameter="viewInstructions" >
 			<forward name="success" path="tiles:/monitoring/forum/viewInstructions" />
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r7e3a5a06958382ab32f15969c971d7b3e1599626 -r1079ea24a56ed171c7d70985cf72de279765d386
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 7e3a5a06958382ab32f15969c971d7b3e1599626)
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
@@ -95,7 +95,7 @@
     	<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="pageTitleKey" value="page.title.monitoring.view.instructions"/>
     	<put name="body" value="/jsps/monitoring/instructions.jsp"/>
 	</definition>
 	<!-- E: Monitoring -->
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -r1d178e94bec7d2c17be92d2ae7690135deb2ff54 -r1079ea24a56ed171c7d70985cf72de279765d386
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 1d178e94bec7d2c17be92d2ae7690135deb2ff54)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
@@ -225,17 +225,13 @@
     <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
 </taglib>
 
-	<!--  ======================================================== -->	
-	<!--   Customized Tag Library -->
-	<!--  ======================================================== -->	
-	<taglib>
-	    <taglib-uri>fck-editor</taglib-uri>
-	    <taglib-location>/WEB-INF/fckeditor/FCKeditor.tld</taglib-location>
-	</taglib>
-	<taglib>
-	   <taglib-uri>tags-lams</taglib-uri>
-	   <taglib-location>/WEB-INF/lams.tld</taglib-location>
-	</taglib>
+<!--  ======================================================== -->	
+<!--   Customized Tag Library -->
+<!--  ======================================================== -->	
+<taglib>
+   <taglib-uri>tags-lams</taglib-uri>
+   <taglib-location>/WEB-INF/lams.tld</taglib-location>
+</taglib>
 
    <!--
    To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
Index: lams_tool_forum/web/includes/taglibs.jsp
===================================================================
diff -u -ra2160af2abd41d478e36906531604f57dcc15d13 -r1079ea24a56ed171c7d70985cf72de279765d386
--- lams_tool_forum/web/includes/taglibs.jsp	(.../taglibs.jsp)	(revision a2160af2abd41d478e36906531604f57dcc15d13)
+++ lams_tool_forum/web/includes/taglibs.jsp	(.../taglibs.jsp)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
@@ -3,6 +3,8 @@
 <%@ taglib uri="tags-tiles" prefix="tiles" %>
 <%@ taglib uri="tags-html-el" prefix="html" %>
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-core-rt" prefix="c_rt"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fck-editor" prefix="FCK"%>
 
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -r1079ea24a56ed171c7d70985cf72de279765d386
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
@@ -1,5 +1,5 @@
 <%@include file="../sharing/share.jsp" %>
-<%@ taglib uri="fck-editor" prefix="FCK"%>
+<%@ taglib uri="tags-fck-editor" prefix="FCK"%>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html:html locale="true">
Index: lams_tool_forum/web/jsps/monitoring/editactivity.jsp
===================================================================
diff -u -r7e3a5a06958382ab32f15969c971d7b3e1599626 -r1079ea24a56ed171c7d70985cf72de279765d386
--- lams_tool_forum/web/jsps/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 7e3a5a06958382ab32f15969c971d7b3e1599626)
+++ lams_tool_forum/web/jsps/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
@@ -1,39 +1,41 @@
-<%@ include file="/includes/taglibs.jsp" %>
+<%@ 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>
-		<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='${contentID}'/>"/>
-			<input type="hidden" name="method" value="updateActivity"/>
-			<!-- Title Row -->
-			<tr>
-				<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
-				<td class="formcontrol">
-					<input type="text" name="title" value="<c:out value='${title}' escapeXml='false'/>" />
-				</td>
-			</tr>
-			<!-- Instructions Row -->
-			<tr>
-				<td class="formlabel"><fmt:message key="label.authoring.basic.instruction" />:</td>
-				<td class="formcontrol">
-					<FCK:editor id="instructions"
-						basePath="/lams/fckeditor/" height="150" width="85%">
-						<c:out value="${instruction}" escapeXml="false"/>
-					</FCK:editor>
-				</td>
-			</tr>
-			<tr><td colspan="2">
-				<html:cancel>
-					<fmt:message key="label.monitoring.edit.activity.cancel"/>
-				</html:cancel>
-				<html:submit>
-					<fmt:message key="label.monitoring.edit.activity.update"/>
-				</html:submit>
-			</td></tr>
-		</table>
-		</div>
-	</html:form>
+<html:form action="/monitoring/updateActivity" 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='${toolContentID}'/>" />
+		<!-- Title Row -->
+		<tr>
+			<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
+			<td class="formcontrol"><input type="text" name="title"
+				value="<c:out value='${title}' escapeXml='false'/>" /></td>
+			<td><html:errors property="activity.title" /></td>
+		</tr>
+		<!-- Instructions Row -->
+		<tr>
+			<td class="formlabel"><fmt:message
+				key="label.authoring.basic.instruction" />:</td>
+			<td class="formcontrol"><FCK:editor id="instruction"
+				basePath="/lams/fckeditor/" height="150" width="85%">
+				<c:out value="${instruction}" escapeXml="false" />
+			</FCK:editor></td>
+			<td><html:errors property="activity.instruction" /></td>
+		</tr>
+		<tr>
+			<td class="formlabel" colspan="3"><html:errors
+				property="activity.globel" /></td>
+		</tr>
+		<tr>
+			<td colspan="3"><html:cancel>
+				<fmt:message key="label.monitoring.edit.activity.cancel" />
+			</html:cancel> <html:submit>
+				<fmt:message key="label.monitoring.edit.activity.update" />
+			</html:submit></td>
+		</tr>
+	</table>
+	</div>
+</html:form>
Index: lams_tool_forum/web/jsps/monitoring/instructions.jsp
===================================================================
diff -u -r7e3a5a06958382ab32f15969c971d7b3e1599626 -r1079ea24a56ed171c7d70985cf72de279765d386
--- lams_tool_forum/web/jsps/monitoring/instructions.jsp	(.../instructions.jsp)	(revision 7e3a5a06958382ab32f15969c971d7b3e1599626)
+++ lams_tool_forum/web/jsps/monitoring/instructions.jsp	(.../instructions.jsp)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
@@ -81,7 +81,11 @@
 				</div>
 			</td>
 		</tr>
-	
+		<tr>
+			 <td class="formlabel" colspan="2">
+				  	<html:errors property="instruction.globel"/>
+			  </td>
+		</tr>					
 		</tr>
 
 	</table>
Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
===================================================================
diff -u -r7e3a5a06958382ab32f15969c971d7b3e1599626 -r1079ea24a56ed171c7d70985cf72de279765d386
--- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision 7e3a5a06958382ab32f15969c971d7b3e1599626)
+++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
@@ -1,63 +1,70 @@
 <%@ include file="/includes/taglibs.jsp" %>
+
+<html:form action="/monitoring/updateMark"  method="post">	
+<c_rt:set var="formBean" value="<%= session.getAttribute("markForm") %>" />
   <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}" /> 	
+  		 <c:out value="${formBean.user.loginName}" /> , <c:out value="${formBean.user.firstName}" />  <c:out value="${formBean.user.lastName}" /> 	
   </b></p>
  <table width="100%"  border="0" cellspacing="0" cellpadding="0">
 	<tr>
 		<td valign="MIDDLE" width="48%">
 			<c:set var="viewtopic">
-				<html:rewrite page="/learning/viewTopic.do?topicId=${topic.message.uid}&create=${topic.message.created.time}" />
+				<html:rewrite page="/learning/viewTopic.do?topicId=${formBean.messageDto.message.uid}&create=${formBean.messageDto.message.created.time}" />
 			</c:set> 
 			<html:link href="${viewtopic}">
-				<c:out value="${topic.message.subject}" />
+				<c:out value="${formBean.messageDto.message.subject}" />
 			</html:link>
 		</td>
 		<td width="2%">
-			<c:if test="${topic.hasAttachment}">
+			<c:if test="${formBean.messageDto.hasAttachment}">
 				<img src="<html:rewrite page="/images/paperclip.gif"/>">
 			</c:if>
 		</td>
 		<td>
-			<c:out value="${topic.author}"/>
+			<c:out value="${formBean.messageDto.author}"/>
 		</td>
 		<td>
-			<c:out value="${topic.message.replyNumber}"/>
+			<c:out value="${formBean.messageDto.message.replyNumber}"/>
 		</td>
 		<td>
-			<fmt:formatDate value="${topic.message.updated}" type="time" timeStyle="short" />
-			<fmt:formatDate value="${topic.message.updated}" type="date" dateStyle="full" />
+			<fmt:formatDate value="${formBean.messageDto.message.updated}" type="time" timeStyle="short" />
+			<fmt:formatDate value="${formBean.messageDto.message.updated}" type="date" dateStyle="full" />
 		</td>
 	</tr>
 </table>
 <table class="forms">
-			<tr><td colspan="2"><html:errors/></td></tr>
-			<html:form action="/monitoring/updateMark"  method="post">	
-				<c_rt:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-				 <input type="hidden" name="toolSessionID" value="<c:out value='${toolSessionID}'/>" />						
-				 <input type="hidden" name="messageID" value="<c:out value='${topic.message.uid}'/>" />						
-				 <input type="hidden" name="userID" value="<c:out value='${user.userID}'/>" />
+				 <input type="hidden" name="toolSessionID" value="<c:out value='${formBean.sessionId}'/>" />						
+				 <input type="hidden" name="messageID" value="<c:out value='${formBean.messageDto.message.uid}'/>" />						
+				 <input type="hidden" name="userID" value="<c:out value='${formBean.user.uid}'/>" />
 				 <tr>						 
 			            <td class="formlabel">Marks:</td>
 			            <td class="formcontrol">
-			        		<html:input property="mark"/>
+			        		<input type="text"  name="mark" value="<c:out value='${formBean.mark}'/>"/>
 			        	</td>
+			        	<td><html:errors property="report.mark" /></td>
 			    </tr>
 			    <tr>
-			    		<td class="formlabel">Comments:</td>
+		    		<td class="formlabel">Comments:</td>
 			        <td class="formcontrol">
-			            <FCK:editor id="comments" 
+			            <FCK:editor id="comment" 
 			    			basePath="/lams/fckeditor/"
 			    			height="150"    
 			    			width="85%">
 									<c:out value="${formBean.comment}" escapeXml="false"/>
 						</FCK:editor>
 			            </td>
+			            <td><html:errors property="report.comment" /></td>
 	        </tr>
 			<tr>
-				  <td class="formcontrol" colspan="2">
+				  <td class="formlabel" colspan="3">
+				  	<html:errors property="report.globel"/>
+				  </td>
+			</tr>
+			<tr>
+				  <td class="formcontrol" colspan="3">
 					<input type="submit" value="Update Marks" />
 				  </td>
 			</tr>
-			</html:form>
 		</span>
 </table>
+</html:form>
Index: lams_tool_forum/web/jsps/monitoring/viewactivity.jsp
===================================================================
diff -u -r7e3a5a06958382ab32f15969c971d7b3e1599626 -r1079ea24a56ed171c7d70985cf72de279765d386
--- lams_tool_forum/web/jsps/monitoring/viewactivity.jsp	(.../viewactivity.jsp)	(revision 7e3a5a06958382ab32f15969c971d7b3e1599626)
+++ lams_tool_forum/web/jsps/monitoring/viewactivity.jsp	(.../viewactivity.jsp)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
@@ -1,25 +1,31 @@
+<%@ include file="/includes/taglibs.jsp" %>
+
 <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"/>
+		<input type="hidden" name="toolContentID" value="<c:out value='${toolContentID}'/>"/>
 		<!-- Title Row -->
 		<tr>
 			<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
 			<td class="formcontrol">
-				<c:out value="${authoring.title}" escapeXml="false"/>
+				<c:out value="${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"/>
+				<c:out value="${instruction}" escapeXml="false"/>
 			</td>
 		</tr>
+		<tr>
+				  <td class="formlabel" colspan="2">
+				  	<html:errors property="activity.globel"/>
+				  </td>
+		</tr>
 		<tr><td colspan="2">
 			<html:submit>
 				<fmt:message key="label.monitoring.edit.activity.edit"/>