Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r77e263b43c7aed360e8dcc46af273db55123bc83 -r1c995cd6d87591d824ddde103a6138f2632e8f71
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 1c995cd6d87591d824ddde103a6138f2632e8f71)
@@ -300,6 +300,7 @@
 			validate="false"
 			parameter="updateMark" >
 			<forward name="success" path="tiles:/monitoring/forum/viewMark" />
+			<forward name="viewTopic" path="/learning/viewTopic.do" />
 		</action>
 	
 		<action path="/monitoring/viewTopic"
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -r4526bc668178760326017e561b75a0358e10b4fb -r1c995cd6d87591d824ddde103a6138f2632e8f71
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 4526bc668178760326017e561b75a0358e10b4fb)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 1c995cd6d87591d824ddde103a6138f2632e8f71)
@@ -77,8 +77,6 @@
 
 	public static final String USER_UID = "userID";
 
-	public static final String MESSAGE_UID = "messageID";
-
 	public static final String ATTR_FINISHED_LOCK = "finishedLock";
 	
 	// used in monitoring 
@@ -109,6 +107,10 @@
 	public static final String ATTR_TOPIC_ID = "topicID";
 	public static final String ATTR_REFLECTION_ON = "reflectOn";
 	public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions";
+	
+	public static final String MARK_UPDATE_FROM_SESSION = "listAllMarks";
+	public static final String MARK_UPDATE_FROM_USER = "listMarks";
+	public static final String MARK_UPDATE_FROM_FORUM = "viewForum";
 
 
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
diff -u -r2700025047410d38f40b3bd7c56966a9fc08bb29 -r1c995cd6d87591d824ddde103a6138f2632e8f71
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 2700025047410d38f40b3bd7c56966a9fc08bb29)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 1c995cd6d87591d824ddde103a6138f2632e8f71)
@@ -76,6 +76,7 @@
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -238,30 +239,6 @@
 	}
 
 	/**
-	 * View all user marks for a special Session ID
-	 * 
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	private ActionForward viewAllMarks(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-
-		Long sessionID = new Long(WebUtil.readLongParam(request,
-				AttributeNames.PARAM_TOOL_SESSION_ID));
-		forumService = getForumService();
-		List topicList = forumService.getAllTopicsFromSession(sessionID);
-
-		Map topicsByUser = getTopicsSortedByAuthor(topicList);
-		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
-		request.setAttribute(ForumConstants.ATTR_REPORT, topicsByUser);
-		request.setAttribute(ForumConstants.PARAM_UPDATE_MODE, "listAllMarks");
-		return mapping.findForward("success");
-	}
-
-	/**
 	 * Download marks for all users in a speical session.
 	 * 
 	 * @param mapping
@@ -386,165 +363,6 @@
 	}
 
 	/**
-	 * View a special user's mark
-	 * 
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	private ActionForward viewUserMark(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		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<MessageDTO> messageList = forumService.getMessagesByUserUid(userUid, sessionId);
-		ForumUser user = forumService.getUser(userUid);
-
-		// each back to web page
-		Map<ForumUser,List<MessageDTO>> report = new TreeMap(this.new ForumUserComparator());
-		report.put(user,messageList);
-		request.setAttribute(ForumConstants.ATTR_REPORT, report);
-		
-		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
-		request.setAttribute(ForumConstants.PARAM_UPDATE_MODE, "listMarks");
-		return mapping.findForward("success");
-	}
-
-	/**
-	 * Edit a special user's mark.
-	 * 
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	private ActionForward editMark(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		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));
-		String updateMode = request.getParameter(ForumConstants.PARAM_UPDATE_MODE);
-		
-		// get Message and User from database
-		forumService = getForumService();
-		Message msg = forumService.getMessage(messageId);
-		ForumUser user = forumService.getUser(userUid);
-
-		// echo back to web page
-		MarkForm markForm = (MarkForm) form;
-		if (msg.getReport() != null) {
-			if (msg.getReport().getMark() != null)
-				markForm.setMark(msg.getReport().getMark().toString());
-			else
-				markForm.setMark("");
-			markForm.setComment(msg.getReport().getComment());
-		}
-		
-		// each back to web page
-		request.setAttribute(ForumConstants.ATTR_TOPIC, MessageDTO.getMessageDTO(msg));
-		request.setAttribute(ForumConstants.ATTR_USER, user);
-		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
-		request.setAttribute(ForumConstants.PARAM_UPDATE_MODE, updateMode);
-		
-		return mapping.findForward("success");
-	}
-
-	/**
-	 * Update mark for a special user
-	 * 
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	private ActionForward updateMark(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		MarkForm markForm = (MarkForm) form;
-		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));
-		String updateMode = request.getParameter(ForumConstants.PARAM_UPDATE_MODE);
-		request.setAttribute(ForumConstants.PARAM_UPDATE_MODE, updateMode);
-		
-		String mark = markForm.getMark();
-        ActionMessages errors = new ActionMessages();
-        if (StringUtils.isBlank(mark)) {
-          ActionMessage error = new ActionMessage("error.valueReqd");
-          errors.add("report.mark", error);
-        }else if(!NumberUtils.isNumber(mark)){
-        	ActionMessage error = new ActionMessage("error.mark.needNumber");
-        	errors.add("report.mark", error);
-        }else {
-        	try{
-        		Float.parseFloat(mark);
-        	}catch(Exception e){
-              	ActionMessage error = new ActionMessage("error.mark.invalid.number");
-            	errors.add("report.mark", error);
-        	}
-        }
-        
-		forumService = getForumService();
-		// echo back to web page
-		ForumUser user = forumService.getUser(userUid);
-		Message msg = forumService.getMessage(messageId);
-		
-		request.setAttribute(ForumConstants.ATTR_USER, user);
-		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
-		if(!errors.isEmpty()){
-			// each back to web page
-			request.setAttribute(ForumConstants.ATTR_TOPIC, MessageDTO.getMessageDTO(msg));
-        	saveErrors(request, errors);
-        	return mapping.getInputForward();
-        }
-
-		//update message report
-		
-		forumService = getForumService();
-		ForumReport report = msg.getReport();
-		if (report == null) {
-			report = new ForumReport();
-			msg.setReport(report);
-		}
-		//only session has been released mark, the data of mark release will have value.
-		ForumToolSession toolSession = forumService.getSessionBySessionId(sessionId);
-		if(toolSession.isMarkReleased())
-			report.setDateMarksReleased(new Date());
-		
-		report.setMark(new Float(Float.parseFloat(mark)));
-		report.setComment(markForm.getComment());
-		forumService.updateTopic(msg);
-		
-		//echo back to topic list page: it depends which screen is come from: view special user mark, or view all user marks. 
-		if(StringUtils.equals(updateMode, "listAllMarks")){
-			List topicList = forumService.getAllTopicsFromSession(sessionId);
-			Map topicsByUser = getTopicsSortedByAuthor(topicList);
-			request.setAttribute(ForumConstants.ATTR_REPORT, topicsByUser);
-		}else{
-			List<MessageDTO> messageList = forumService.getMessagesByUserUid(userUid, sessionId);
-			Map<ForumUser,List<MessageDTO>> topicMap = new TreeMap(this.new ForumUserComparator());
-			topicMap.put(user,messageList);
-			request.setAttribute(ForumConstants.ATTR_REPORT, topicMap);
-		}
-
-		//listMark or listAllMark.
-		return mapping.findForward("success");
-
-	}
-
-	/**
 	 * View activity for content.
 	 * 
 	 * @param mapping
@@ -740,7 +558,7 @@
 			HttpServletRequest request, HttpServletResponse response) {
 
 		Long msgUid = new Long(WebUtil.readLongParam(request,
-				ForumConstants.MESSAGE_UID));
+				ForumConstants.ATTR_TOPIC_ID));
 
 		forumService = getForumService();
 		Message topic = forumService.getMessage(msgUid);
@@ -771,7 +589,203 @@
 		return null;
 	}
 
+	// ==========================================================================================
+	// View and update marks methods
+	// ==========================================================================================
 
+	/**
+	 * View all user marks for a special Session ID
+	 * 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward viewAllMarks(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) {
+		//only one param for session scope marks
+		Long sessionID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
+		
+		//create sessionMap
+		SessionMap<String, Object> sessionMap = new SessionMap<String,Object>();
+		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+		sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
+		sessionMap.put(ForumConstants.PARAM_UPDATE_MODE, ForumConstants.MARK_UPDATE_FROM_SESSION);
+		
+		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+		
+		//get tool session scope topics
+		forumService = getForumService();
+		List topicList = forumService.getAllTopicsFromSession(sessionID);
+
+		Map topicsByUser = getTopicsSortedByAuthor(topicList);
+		request.setAttribute(ForumConstants.ATTR_REPORT, topicsByUser);
+		return mapping.findForward("success");
+	}
+	/**
+	 * View a special user's mark
+	 * 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward viewUserMark(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) {
+		Long userUid = new Long(WebUtil.readLongParam(request,ForumConstants.USER_UID));
+		Long sessionId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
+
+		//create sessionMap
+		SessionMap<String, Object> sessionMap = new SessionMap<String,Object>();
+		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+		
+		sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+		sessionMap.put(ForumConstants.PARAM_UPDATE_MODE, ForumConstants.MARK_UPDATE_FROM_USER);
+		
+		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+		//get this user's all topics
+		forumService = getForumService();
+		List<MessageDTO> messageList = forumService.getMessagesByUserUid(userUid, sessionId);
+		ForumUser user = forumService.getUser(userUid);
+
+		// each back to web page
+		Map<ForumUser,List<MessageDTO>> report = new TreeMap(this.new ForumUserComparator());
+		report.put(user,messageList);
+		request.setAttribute(ForumConstants.ATTR_REPORT, report);
+		
+		return mapping.findForward("success");
+	}
+
+
+	/**
+	 * Edit a special user's mark.
+	 * 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward editMark(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) {
+		MarkForm markForm = (MarkForm) form;
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(markForm.getSessionMapID());
+		String updateMode = (String) sessionMap.get(ForumConstants.PARAM_UPDATE_MODE);
+		//view forum mode
+		if(StringUtils.isBlank(updateMode)){
+			sessionMap.put(ForumConstants.PARAM_UPDATE_MODE, ForumConstants.MARK_UPDATE_FROM_FORUM);
+			sessionMap.put(ForumConstants.ATTR_ROOT_TOPIC_UID,markForm.getTopicID());
+		}
+		
+		// get Message and User from database
+		forumService = getForumService();
+		Message msg = forumService.getMessage(markForm.getTopicID());
+		ForumUser user = msg.getCreatedBy();
+
+		// echo back to web page
+		if (msg.getReport() != null) {
+			if (msg.getReport().getMark() != null)
+				markForm.setMark(msg.getReport().getMark().toString());
+			else
+				markForm.setMark("");
+			markForm.setComment(msg.getReport().getComment());
+		}
+		
+		// each back to web page
+		request.setAttribute(ForumConstants.ATTR_TOPIC, MessageDTO.getMessageDTO(msg));
+		request.setAttribute(ForumConstants.ATTR_USER, user);
+		
+		return mapping.findForward("success");
+	}
+
+	/**
+	 * Update mark for a special user
+	 * 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward updateMark(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) {
+		MarkForm markForm = (MarkForm) form;
+		
+		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, markForm.getSessionMapID());
+		String mark = markForm.getMark();
+        ActionMessages errors = new ActionMessages();
+        if (StringUtils.isBlank(mark)) {
+          ActionMessage error = new ActionMessage("error.valueReqd");
+          errors.add("report.mark", error);
+        }else if(!NumberUtils.isNumber(mark)){
+        	ActionMessage error = new ActionMessage("error.mark.needNumber");
+        	errors.add("report.mark", error);
+        }else {
+        	try{
+        		Float.parseFloat(mark);
+        	}catch(Exception e){
+              	ActionMessage error = new ActionMessage("error.mark.invalid.number");
+            	errors.add("report.mark", error);
+        	}
+        }
+        
+		forumService = getForumService();
+		// echo back to web page
+		Message msg = forumService.getMessage(markForm.getTopicID());
+		ForumUser user = msg.getCreatedBy();
+		
+		request.setAttribute(ForumConstants.ATTR_USER, user);
+		if(!errors.isEmpty()){
+			// each back to web page
+			request.setAttribute(ForumConstants.ATTR_TOPIC, MessageDTO.getMessageDTO(msg));
+        	saveErrors(request, errors);
+        	return mapping.getInputForward();
+        }
+
+		//update message report
+		
+		forumService = getForumService();
+		ForumReport report = msg.getReport();
+		if (report == null) {
+			report = new ForumReport();
+			msg.setReport(report);
+		}
+		
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(markForm.getSessionMapID());
+		Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+		String updateMode = (String) sessionMap.get(ForumConstants.PARAM_UPDATE_MODE);
+		
+		//only session has been released mark, the data of mark release will have value.
+		ForumToolSession toolSession = forumService.getSessionBySessionId(sessionId);
+		if(toolSession.isMarkReleased())
+			report.setDateMarksReleased(new Date());
+		
+		report.setMark(new Float(Float.parseFloat(mark)));
+		report.setComment(markForm.getComment());
+		forumService.updateTopic(msg);
+		
+		//echo back to topic list page: it depends which screen is come from: view special user mark, or view all user marks. 
+		if(StringUtils.equals(updateMode, ForumConstants.MARK_UPDATE_FROM_SESSION)){
+			List topicList = forumService.getAllTopicsFromSession(sessionId);
+			Map topicsByUser = getTopicsSortedByAuthor(topicList);
+			request.setAttribute(ForumConstants.ATTR_REPORT, topicsByUser);
+			//listMark or listAllMark.
+			return mapping.findForward("success");
+		}else if(StringUtils.equals(updateMode, ForumConstants.MARK_UPDATE_FROM_USER)){
+			List<MessageDTO> messageList = forumService.getMessagesByUserUid(user.getUid(), sessionId);
+			Map<ForumUser,List<MessageDTO>> topicMap = new TreeMap(this.new ForumUserComparator());
+			topicMap.put(user,messageList);
+			request.setAttribute(ForumConstants.ATTR_REPORT, topicMap);
+			//listMark or listAllMark.
+			return mapping.findForward("success");
+		}else{  //mark from view forum
+			return mapping.findForward("viewTopic");
+		}
+
+	}
+
 	// ==========================================================================================
 	// Utility methods
 	// ==========================================================================================
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MarkForm.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r1c995cd6d87591d824ddde103a6138f2632e8f71
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MarkForm.java	(.../MarkForm.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MarkForm.java	(.../MarkForm.java)	(revision 1c995cd6d87591d824ddde103a6138f2632e8f71)
@@ -25,7 +25,6 @@
 
 package org.lamsfoundation.lams.tool.forum.web.forms;
 
-import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 /**
  * @struts.form name="markForm"
@@ -38,6 +37,10 @@
 	
 	private String mark;
 	private String comment;
+	
+	private Long topicID;
+	private String sessionMapID;
+	
 	public String getComment() {
 		return comment;
 	}
@@ -50,4 +53,16 @@
 	public void setMark(String mark) {
 		this.mark = mark;
 	}
+	public String getSessionMapID() {
+		return sessionMapID;
+	}
+	public void setSessionMapID(String sessionMapID) {
+		this.sessionMapID = sessionMapID;
+	}
+	public Long getTopicID() {
+		return topicID;
+	}
+	public void setTopicID(Long topicID) {
+		this.topicID = topicID;
+	}
 }
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r77e263b43c7aed360e8dcc46af273db55123bc83 -r1c995cd6d87591d824ddde103a6138f2632e8f71
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 1c995cd6d87591d824ddde103a6138f2632e8f71)
@@ -327,6 +327,7 @@
 			validate="false"
 			parameter="updateMark" >
 			<forward name="success" path="tiles:/monitoring/forum/viewMark" />
+			<forward name="viewTopic" path="/learning/viewTopic.do" />
 		</action>
 		<action path="/monitoring/viewTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -r4526bc668178760326017e561b75a0358e10b4fb -r1c995cd6d87591d824ddde103a6138f2632e8f71
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 4526bc668178760326017e561b75a0358e10b4fb)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 1c995cd6d87591d824ddde103a6138f2632e8f71)
@@ -241,6 +241,7 @@
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -251,6 +252,8 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
+    		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
     <security-constraint>
@@ -281,6 +284,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>ADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
     <security-constraint>
@@ -303,6 +307,7 @@
     		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -338,6 +343,10 @@
 		<description>Can add/remove users to the system, set up classes of users for sessions</description>
 		<role-name>SYSADMIN</role-name>
 	</security-role>
+	<security-role>
+		<description>Can create/modify a learning design and edit default tool content</description>
+		<role-name>AUTHOR ADMIN</role-name>
+	</security-role>
 	<!--  Login Configuration -->
   	<login-config>
    		<auth-method>FORM</auth-method>
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
diff -u -r77eb2c44ff2c1c9b5956d01bb7f931f27ca71a24 -r1c995cd6d87591d824ddde103a6138f2632e8f71
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 77eb2c44ff2c1c9b5956d01bb7f931f27ca71a24)
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1c995cd6d87591d824ddde103a6138f2632e8f71)
@@ -10,8 +10,7 @@
 	<input type="hidden" name="mode" value="author">
 
 	<c:set var="formBean"
-		value="<%=request
-										.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+		value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	<div id="header">
 
 
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -r5ae6f3520b0637edf05fb6398db68fbed528cf34 -r1c995cd6d87591d824ddde103a6138f2632e8f71
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 5ae6f3520b0637edf05fb6398db68fbed528cf34)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 1c995cd6d87591d824ddde103a6138f2632e8f71)
@@ -98,6 +98,14 @@
 					<div class="right-buttons">
 						<!--  Hide/Unhide Button -->
 						<c:if test='${sessionMap.mode == "teacher"}'>
+							<c:set var="updateMark">
+								<html:rewrite
+									page="/monitoring/editMark.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&updateMode=viewForum" />
+							</c:set>
+						
+							<html:link href="${updateMark}" styleClass="button">
+								<fmt:message key="lable.topic.title.mark" />
+							</html:link>
 							<!--  call the hide action -->
 							<c:choose>
 								<c:when test="${hidden}">
Index: lams_tool_forum/web/jsps/monitoring/summary.jsp
===================================================================
diff -u -rf0b23329d610084fa257009e4a660a35e401033b -r1c995cd6d87591d824ddde103a6138f2632e8f71
--- lams_tool_forum/web/jsps/monitoring/summary.jsp	(.../summary.jsp)	(revision f0b23329d610084fa257009e4a660a35e401033b)
+++ lams_tool_forum/web/jsps/monitoring/summary.jsp	(.../summary.jsp)	(revision 1c995cd6d87591d824ddde103a6138f2632e8f71)
@@ -130,6 +130,7 @@
 						</html:submit>
 					</html:form>
 				</div>
+				<!-- 
 				<div style="float:left;padding:5px;margin-left:5px">
 					<html:form action="/monitoring/viewAllMarks" target="_blank">
 						<html:hidden property="toolSessionID" value="${toolSessionDto.sessionID}" />
@@ -138,6 +139,7 @@
 						</html:submit>
 					</html:form>
 				</div>
+				 -->
 				<div style="float:left;padding:5px;margin-left:5px">
 					<html:button property="releaseMarks" onclick="releaseMarks(${toolSessionDto.sessionID})" styleClass="button">
 						<fmt:message key="button.release.mark" />
Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
===================================================================
diff -u -r467d38ce63854f33b9ee6794c67ba250b52fa7ba -r1c995cd6d87591d824ddde103a6138f2632e8f71
--- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision 467d38ce63854f33b9ee6794c67ba250b52fa7ba)
+++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision 1c995cd6d87591d824ddde103a6138f2632e8f71)
@@ -1,10 +1,12 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
+
 <html:form action="/monitoring/updateMark" method="post">
-		<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.uid}'/>" />
-		<input type="hidden" name="updateMode" value="${updateMode}" />
+	<c:set var="formBean"
+		value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
+	<html:hidden property="sessionMapID"/>
+	<html:hidden property="topicID"/>
 
 	<table cellpadding="0">
 		<tr>
@@ -20,7 +22,7 @@
 		<tr>
 			<td>
 				<c:set var="viewtopic">
-					<html:rewrite page="/monitoring/viewTopic.do?messageID=${topic.message.uid}&create=${topic.message.created.time}" />
+					<html:rewrite page="/monitoring/viewTopic.do?topicID=${topic.message.uid}&create=${topic.message.created.time}" />
 				</c:set>
 				<html:link href="javascript:launchPopup('${viewtopic}','viewtopic')">
 					<c:out value="${topic.message.subject}" />
@@ -74,16 +76,21 @@
 			<td colspan="2">
 				<input type="submit" value="<fmt:message key="lable.update.mark"/>" class="button" />
 				&nbsp;&nbsp;
-				<c:if test="${updateMode == 'listMarks'}">
+				<c:if test="${sessionMap.updateMode == 'listMarks'}">
 					<c:set var="cancelUrl">
-						<c:url value="/monitoring/viewUserMark.do"/>?userID=${user.uid}&toolSessionID=${toolSessionID}
+						<c:url value="/monitoring/viewUserMark.do"/>?userID=${user.uid}&toolSessionID=${sessionMap.toolSessionID}
 					</c:set>
 				</c:if>
-				<c:if test="${updateMode == 'listAllMarks'}">
+				<c:if test="${sessionMap.updateMode == 'listAllMarks'}">
 					<c:set var="cancelUrl">
-						<c:url value="/monitoring/viewAllMarks.do"/>?toolSessionID=${toolSessionID}
+						<c:url value="/monitoring/viewAllMarks.do"/>?toolSessionID=${sessionMap.toolSessionID}
 					</c:set>
 				</c:if>
+				<c:if test="${sessionMap.updateMode == 'viewForum'}">
+					<c:set var="cancelUrl">
+						<c:url value="/learning/viewTopic.do"/>?sessionMapID=${formBean.sessionMapID}&topicID=${sessionMap.rootUid}
+					</c:set>
+				</c:if>
 				<input type="button" onclick="location.href='${cancelUrl}';" class="button" value="<fmt:message key="button.cancel"/>">
 			</td>
 		</tr>
Index: lams_tool_forum/web/jsps/monitoring/viewmarks.jsp
===================================================================
diff -u -r2700025047410d38f40b3bd7c56966a9fc08bb29 -r1c995cd6d87591d824ddde103a6138f2632e8f71
--- lams_tool_forum/web/jsps/monitoring/viewmarks.jsp	(.../viewmarks.jsp)	(revision 2700025047410d38f40b3bd7c56966a9fc08bb29)
+++ lams_tool_forum/web/jsps/monitoring/viewmarks.jsp	(.../viewmarks.jsp)	(revision 1c995cd6d87591d824ddde103a6138f2632e8f71)
@@ -38,7 +38,7 @@
 			<tr>
 				<td>
 					<c:set var="viewtopic">
-						<html:rewrite page="/monitoring/viewTopic.do?messageID=${topic.message.uid}&create=${topic.message.created.time}" />
+						<html:rewrite page="/monitoring/viewTopic.do?topicID=${topic.message.uid}&create=${topic.message.created.time}" />
 					</c:set>
 					<html:link href="javascript:launchPopup('${viewtopic}','viewtopic');">
 						<c:out value="${topic.message.subject}" />
@@ -101,10 +101,8 @@
 			<tr>
 				<td colspan="5">
 					<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="hidden" name="updateMode" value="${updateMode}" />
+						<html:hidden property="sessionMapID" value="${sessionMapID}"/>
+						<html:hidden property="topicID" value="${topic.message.uid}"/>
 						<input type="submit" value="<fmt:message key="lable.update.mark"/>" class="button" />
 					</html:form>
 				</td>