Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r1079ea24a56ed171c7d70985cf72de279765d386 -rcaa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision caa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab)
@@ -219,6 +219,7 @@
 		</action>
 		<action path="/monitoring/downloadMarks"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			input="tiles:/monitoring/forum/listContentUsers"
 			name="emptyForm"
 			scope="request"
 			validate="false"
@@ -231,7 +232,7 @@
 			scope="request"
 			validate="false"
 			parameter="viewAllMarks" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+			<forward name="success" path="tiles:/monitoring/forum/viewAllMarks" />
 		</action>
 		
 		<!--  EDIT MARK		 -->
@@ -303,6 +304,11 @@
 			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
 		</action>
 		
+		<action path="/monitoring/viewTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			parameter="viewTopic">
+			<forward name="success" path="tiles:/monitoring/forum/viewTopic" />
+		</action>
 		<!-- ========== END: Monitoring  Definitions ============================== -->
 		<!-- System level actions -->
 		<action path="/index" type="org.apache.struts.actions.ForwardAction"
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java
===================================================================
diff -u -r7e3a5a06958382ab32f15969c971d7b3e1599626 -rcaa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	(.../MessageDao.java)	(revision 7e3a5a06958382ab32f15969c971d7b3e1599626)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	(.../MessageDao.java)	(revision caa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab)
@@ -16,13 +16,19 @@
 public class MessageDao extends HibernateDaoSupport {
 	private static final String SQL_QUERY_FIND_ROOT_TOPICS = "from " + Message.class.getName() 
 					+ " where parent_uid is null and forum_session_uid=?";
+	
 	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=?";
+	
 	private static final String SQL_QUERY_BY_USER_SESSION = "from " + Message.class.getName() + " m "
 					+ " where m.createdBy.uid = ? and  m.toolSession.uid=?";
 	
+	private static final String SQL_QUERY_BY_SESSION = "from " + Message.class.getName() + " m "
+					+ " where m.toolSession.uid=?";
+	
 	public void saveOrUpdate(Message message) {
 		message.updateModificationData();
 		this.getHibernateTemplate().saveOrUpdate(message);
@@ -83,6 +89,11 @@
 	public List getByUserAndSession(Long userId, Long sessionId) {
 		return this.getHibernateTemplate().find(SQL_QUERY_BY_USER_SESSION, new Object[]{userId,sessionId});
 	}
+	
+	public List getBySession(Long sessionId) {
+		return this.getHibernateTemplate().find(SQL_QUERY_BY_SESSION, sessionId);
+	}
+	
 
 
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r7e3a5a06958382ab32f15969c971d7b3e1599626 -rcaa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 7e3a5a06958382ab32f15969c971d7b3e1599626)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision caa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab)
@@ -546,6 +546,16 @@
 		this.forumToolContentHandler = toolContentHandler;
 	}
 
+	public void releaseMarksForSession(Long sessionID) {
+		List list = messageDao.getBySession(sessionID);
+		Iterator iter = list.iterator();
+		while(iter.hasNext()){
+			Message msg = (Message) iter.next();
+			ForumReport report = msg.getReport();
+			if(report != null)
+				report.setDateMarksReleased(new Date());
+			messageDao.saveOrUpdate(msg);
+		}
+	}
 
-
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
diff -u -r7e3a5a06958382ab32f15969c971d7b3e1599626 -rcaa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 7e3a5a06958382ab32f15969c971d7b3e1599626)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision caa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab)
@@ -219,7 +219,13 @@
 	 */
 	public ForumUser getUser(Long userUid);
 	
+	
 	//************************************************************************************
 	// Report  Method
+	//************************************************************************************
+	
+	//************************************************************************************
+	// Miscellaneous Method
 	//************************************************************************************	
+	public void releaseMarksForSession(Long sessionID);
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties
===================================================================
diff -u -r1079ea24a56ed171c7d70985cf72de279765d386 -rcaa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision caa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab)
@@ -49,6 +49,7 @@
 page.title.monitoring.view.activity=View Activity
 page.title.monitoring.edit.activity=Edit Activity
 page.title.monitoring.view.instructions=View Instructions
+page.title.monitoring.view.topic=View topic
 ## errors
 errors.header=<b class="error">
 errors.footer=</b>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
diff -u -r1079ea24a56ed171c7d70985cf72de279765d386 -rcaa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision caa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab)
@@ -20,6 +20,10 @@
  */
 package org.lamsfoundation.lams.tool.forum.web.actions;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -29,8 +33,12 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
-import org.apache.poi.util.StringUtil;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
@@ -102,10 +110,14 @@
 		 if (param.equals("statistic")) {
 			 return statistic(mapping,form, request, response);
 		 }
-		 
+		 //***************** Miscellaneous ********************		 
+		 if (param.equals("viewTopic")) {
+			 return viewTopic(mapping,form, request, response);
+		 }
 		 return mapping.findForward("error");
 	 }
 
+
 	private ActionForward listContentUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
 		//get content ID from URL	
@@ -130,23 +142,135 @@
 
 	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.getRootTopics(sessionID);
 		
-		
+		Map topicsByUser = getTopicsSortedByAuthor(topicList);
+		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
+		request.setAttribute("report",topicsByUser);
 		return mapping.findForward("success");
 	}
 
+
 	private ActionForward releaseMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
+
 		
+		Long sessionID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
+		//get service then update report table
+		forumService = getForumService();
+		forumService.releaseMarksForSession(sessionID);
 		
 		return mapping.findForward("success");
 	}
 
 	private ActionForward downloadMarks(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.getRootTopics(sessionID);
+		//construct Excel file format and download
+		ActionMessages errors = new ActionMessages();
+		try {
+			//create an empty excel file
+			HSSFWorkbook wb = new HSSFWorkbook();
+			HSSFSheet sheet = wb.createSheet("Marks");
+			sheet.setColumnWidth((short)0,(short)5000);
+			HSSFRow row,row1=null,row2=null,row3=null,row4=null,row5=null;
+			HSSFCell cell;
+			Iterator iter = getTopicsSortedByAuthor(topicList).values().iterator();
+			Iterator dtoIter; 
+			boolean first = true;
+			int idx = 0;
+			int fileCount = 0;
+			while(iter.hasNext()){
+				List list = (List) iter.next();
+				dtoIter = list.iterator();
+				first = true;
+				
+				while(dtoIter.hasNext()){
+					MessageDTO dto = (MessageDTO) dtoIter.next();
+					if(first){
+						first = false;
+						row1 = sheet.createRow(0);
+						cell = row1.createCell((short) idx);
+						cell.setCellValue("Subject");
+						sheet.setColumnWidth((short)idx,(short)8000);
+						++idx;
+						
+						cell = row1.createCell((short) idx);
+						cell.setCellValue("Author");
+						sheet.setColumnWidth((short)idx,(short)8000);
+						++idx;
+						
+						cell = row1.createCell((short) idx);
+						cell.setCellValue("Date");
+						sheet.setColumnWidth((short)idx,(short)8000);
+						++idx;
+						
+						cell = row1.createCell((short) idx);
+						cell.setCellValue("Marks");
+						sheet.setColumnWidth((short)idx,(short)8000);
+						++idx;
+						
+						cell = row1.createCell((short) idx);
+						cell.setCellValue("Comments");
+						sheet.setColumnWidth((short)idx,(short)8000);
+						++idx;
+					}
+					++fileCount;
+					idx = 0;
+					row1 = sheet.createRow(fileCount);
+					cell = row1.createCell((short) idx++);
+					cell.setCellValue(dto.getMessage().getSubject());
+					
+					cell = row1.createCell((short) idx++);
+					cell.setCellValue(dto.getAuthor());
+					
+					cell = row1.createCell((short) idx++);
+					cell.setCellValue(DateFormat.getInstance().format(dto.getMessage().getCreated()));
+					
+					cell = row1.createCell((short) idx++);
+					
+					if(dto.getMessage() != null && dto.getMessage().getReport() != null)
+						cell.setCellValue(new Double(dto.getMessage().getReport().getMark()).doubleValue());
+					else
+						cell.setCellValue("");
+					
+					cell = row1.createCell((short) idx++);
+					if(dto.getMessage() != null && dto.getMessage().getReport() != null)
+						cell.setCellValue(dto.getMessage().getReport().getComment());
+					else
+						cell.setCellValue("");
+				}
+			}
+			ByteArrayOutputStream bos = new ByteArrayOutputStream();
+			wb.write(bos);
+			//construct download file response header
+			String fileName = "marks" + sessionID+".xls";
+			String mineType = "application/vnd.ms-excel";
+			String header = "attachment; filename=\"" + fileName + "\";";
+			response.setContentType(mineType);
+			response.setHeader("Content-Disposition",header);
+
+			byte[] data = bos.toByteArray();
+			response.getOutputStream().write(data,0,data.length);
+			response.getOutputStream().flush();
+		} catch (IOException e) {
+			log.error(e);
+			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("monitoring.download.error",e.toString()));
+		}
+
+		if(!errors.isEmpty()){
+			saveErrors(request,errors);
+			request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
+			return mapping.getInputForward();
+		}
+			
 		
-		
-		return mapping.findForward("success");
+		return null;
 	}
 
 	private ActionForward viewUserMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
@@ -321,6 +445,17 @@
 		return mapping.findForward("success");
 	}
 
+	private ActionForward viewTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+    	
+    	Long msgUid = new Long(WebUtil.readLongParam(request,ForumConstants.MESSAGE_UID));
+		
+    	forumService = getForumService();
+    	Message topic = forumService.getMessage(msgUid);
+    	
+		request.setAttribute(ForumConstants.AUTHORING_TOPIC,MessageDTO.getMessageDTO(topic));
+    	return mapping.findForward("success");
+	}
 
 	//==========================================================================================
 	// Utility methods
@@ -337,4 +472,28 @@
   	    }
   	    return forumService;
   	}
+  	
+
+	/**
+	 * @param topicList
+	 * @return
+	 */
+	private Map getTopicsSortedByAuthor(List topicList) {
+		Map topicsByUser = new HashMap();
+		Iterator iter = topicList.iterator();
+		while(iter.hasNext()){
+			MessageDTO dto = (MessageDTO) iter.next();
+			ForumReport report = dto.getMessage().getReport();
+			if(report != null){
+				log.info("REPROT MARK" + report.getMark());
+			}
+			List list = (List) topicsByUser.get(dto.getMessage().getCreatedBy());
+			if(list == null){
+				list = new ArrayList();
+				topicsByUser.put(dto.getMessage().getCreatedBy(),list);
+			}
+			list.add(dto);
+		}
+		return topicsByUser;
+	}
 }
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r1079ea24a56ed171c7d70985cf72de279765d386 -rcaa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision caa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab)
@@ -253,6 +253,7 @@
 		</action>
 		<action path="/monitoring/downloadMarks"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			input="tiles:/monitoring/forum/listContentUsers"
 			name="emptyForm"
 			scope="request"
 			validate="false"
@@ -265,7 +266,7 @@
 			scope="request"
 			validate="false"
 			parameter="viewAllMarks" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+			<forward name="success" path="tiles:/monitoring/forum/viewAllMarks" />
 		</action>
 		<!--  EDIT MARK		 -->
 		<action path="/monitoring/viewUserMark"
@@ -331,6 +332,11 @@
 			parameter="statistic" >
 			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
 		</action>
+		<action path="/monitoring/viewTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			parameter="viewTopic">
+			<forward name="success" path="tiles:/monitoring/forum/viewTopic" />
+		</action>
 		<!-- ========== END: Monitoring  Definitions ============================== -->
 		<!-- System level actions -->
 		<action path="/index" type="org.apache.struts.actions.ForwardAction"
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r1079ea24a56ed171c7d70985cf72de279765d386 -rcaa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 1079ea24a56ed171c7d70985cf72de279765d386)
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision caa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab)
@@ -78,6 +78,10 @@
     	<put name="pageTitleKey" value="page.title.monitoring.content.userlist"/>
     	<put name="body" value="/jsps/monitoring/contentuserlist.jsp"/>
 	</definition>
+	<definition name="tiles:/monitoring/forum/viewAllMarks" extends="tiles:layout">
+    	<put name="pageTitleKey" value="page.title.monitoring.view.user.mark"/>
+    	<put name="body" value="/jsps/monitoring/viewallmarks.jsp"/>
+	</definition>
 	<definition name="tiles:/monitoring/forum/viewUserMark" extends="tiles:layout">
     	<put name="pageTitleKey" value="page.title.monitoring.view.user.mark"/>
     	<put name="body" value="/jsps/monitoring/usermarklist.jsp"/>
@@ -98,6 +102,11 @@
     	<put name="pageTitleKey" value="page.title.monitoring.view.instructions"/>
     	<put name="body" value="/jsps/monitoring/instructions.jsp"/>
 	</definition>
+	
+	<definition name="tiles:/monitoring/forum/viewTopic" extends="tiles:layout">
+    	<put name="pageTitleKey" value="page.title.monitoring.view.topic"/>
+    	<put name="body" value="/jsps/monitoring/viewtopic.jsp"/>
+	</definition>
 	<!-- E: Monitoring -->
 	
 </tiles-definitions>
Index: lams_tool_forum/web/includes/header.jsp
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -rcaa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab
--- lams_tool_forum/web/includes/header.jsp	(.../header.jsp)	(revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/web/includes/header.jsp	(.../header.jsp)	(revision caa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab)
@@ -6,8 +6,8 @@
 <head>
 <title><bean:message key="appName" /></title>
 
-<link href="<c:out value="${lams}"/>/css/aqua.css" rel="stylesheet" type="text/css">
-<script src='<c:out value="${lams}"/>/includes/javascript/common.js'></script>
+<link href="<c:out value="${lams}"/>css/aqua.css" rel="stylesheet" type="text/css">
+<script src='<c:out value="${lams}"/>includes/javascript/common.js'></script>
 
 <script lang="javascript">
 <html:javascript dynamicJavascript="false" staticJavascript="true"/>
Index: lams_tool_forum/web/includes/scripts.jsp
===================================================================
diff -u -r3de24b3fb4e2ead20d187f4b5000464ae2791262 -rcaa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab
--- lams_tool_forum/web/includes/scripts.jsp	(.../scripts.jsp)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
+++ lams_tool_forum/web/includes/scripts.jsp	(.../scripts.jsp)	(revision caa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab)
@@ -6,6 +6,17 @@
 		window.opener.parent.location.href = "<html:rewrite page='/authoring/finishTopic.do'/>";
 		window.close();
 	}
-
-
+	function launchPopup(url) {
+		var instructionsWindow = null;
+// add the mac test back in when we have the platform detection working.
+//		if(mac){
+//			window.open(url,'instructions','resizable,width=796,height=570,scrollbars');
+//		}else{
+			if(instructionsWindow && instructionsWindow.open && !instructionsWindow.closed){
+				instructionsWindow.close();
+			}
+			instructionsWindow = window.open(url,'newtopic','resizable,width=796,height=570,scrollbars');
+			instructionsWindow.window.focus();
+//		}	
+	}
 //-->
Index: lams_tool_forum/web/jsps/monitoring/contentuserlist.jsp
===================================================================
diff -u -r7e3a5a06958382ab32f15969c971d7b3e1599626 -rcaa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab
--- lams_tool_forum/web/jsps/monitoring/contentuserlist.jsp	(.../contentuserlist.jsp)	(revision 7e3a5a06958382ab32f15969c971d7b3e1599626)
+++ lams_tool_forum/web/jsps/monitoring/contentuserlist.jsp	(.../contentuserlist.jsp)	(revision caa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab)
@@ -28,19 +28,19 @@
 				<tr>
 	  			<td class="formcontrol">
 	  			<html:form  action="/monitoring/viewAllMarks">
-					<html:hidden property="toolSessionID" value="${sessionID}"/>
+					<html:hidden property="toolSessionID" value="${toolSessionID}"/>
 		  			<html:submit property="viewAllMarks" value="View all marks"/>
   				</html:form>
 	  			</td>
 	  			<td class="formcontrol">
 	  			<html:form  action="/monitoring/releaseMarks">
-					<html:hidden property="toolSessionID" value="${sessionID}"/>
+					<html:hidden property="toolSessionID" value="${toolSessionID}"/>
 		  			<html:submit property="releaseMarks" value="Release marks"/>
   				</html:form>
 	  			</td>
 	  			<td class="formcontrol">
 	  			<html:form  action="/monitoring/downloadMarks">
-					<html:hidden property="toolSessionID" value="${sessionID}"/>
+					<html:hidden property="toolSessionID" value="${toolSessionID}"/>
 		  			<html:submit property="downloadMarks" value="Download marks"/>
   				</html:form>
 	  			</td>
Index: lams_tool_forum/web/jsps/monitoring/message/topicview.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/monitoring/message/topicview.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/monitoring/message/topicview.jsp	(revision caa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab)
@@ -0,0 +1,39 @@
+<div id="topicview">
+	<div id="datatablecontainer">
+	<BR>
+	<table width="100%" align="CENTER" class="form" border="0" cellspacing="0">
+		<tr>
+			<th valign="MIDDLE" scope="col" >
+				<span style="font-size:25px"><c:out value="${topic.message.subject}" /></span>
+			</th>
+		</tr>
+		<tr>
+			<th scope="col" >
+				<fmt:message key="lable.topic.subject.by"/> <c:out value="${topic.author}"/> - 
+				<fmt:formatDate value="${topic.message.created}" type="time" timeStyle="short" />
+				<fmt:formatDate value="${topic.message.created}" type="date" dateStyle="full" />
+			</th>
+		</tr>
+		<tr>
+			<td>
+				<br>
+				<c:out value="${topic.message.body}" escapeXml="false" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<br>
+				<c:forEach var="file" items="${topic.message.attachments}">
+					<c:set var="downloadURL">
+								<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
+						</c:set>
+						<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+							<c:out value="${file.fileName}" />
+						</a>
+				</c:forEach>
+			</td>
+		</tr>
+	</table>
+	</div>
+</div>
+</div>
Index: lams_tool_forum/web/jsps/monitoring/usermarklist.jsp
===================================================================
diff -u -r7e3a5a06958382ab32f15969c971d7b3e1599626 -rcaa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab
--- lams_tool_forum/web/jsps/monitoring/usermarklist.jsp	(.../usermarklist.jsp)	(revision 7e3a5a06958382ab32f15969c971d7b3e1599626)
+++ lams_tool_forum/web/jsps/monitoring/usermarklist.jsp	(.../usermarklist.jsp)	(revision caa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab)
@@ -1,4 +1,5 @@
 <%@ include file="/includes/taglibs.jsp" %>
+<script type="text/javascript" src="<html:rewrite page='/includes/scripts.jsp'/>"></script>
 	
 	<b>Following files have been submitted by 
 		 <c:out value="${user.loginName}" /> , <c:out value="${user.firstName}" />  <c:out value="${user.lastName}" /> 	
@@ -9,9 +10,9 @@
 			<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="/monitoring/viewTopic.do?messageID=${topic.message.uid}&create=${topic.message.created.time}" />
 					</c:set> 
-					<html:link href="${viewtopic}">
+					<html:link href="javascript:launchPopup('${viewtopic}');">
 						<c:out value="${topic.message.subject}" />
 					</html:link>
 				</td>
Index: lams_tool_forum/web/jsps/monitoring/viewallmarks.jsp
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -rcaa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab
--- lams_tool_forum/web/jsps/monitoring/viewallmarks.jsp	(.../viewallmarks.jsp)	(revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/web/jsps/monitoring/viewallmarks.jsp	(.../viewallmarks.jsp)	(revision caa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab)
@@ -1,96 +1,87 @@
-<%@include file="../sharing/share.jsp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html:html locale="true">
-  <head>    
-    <title>All Learner Submission Details</title>
-    <html:base/>
-  	<link href="<%=LAMS_WEB_ROOT%>/css/aqua.css" rel="stylesheet" type="text/css">
-	<script type="text/javascript" src="<%=LAMS_WEB_ROOT%>/includes/javascript/common.js"></script>
-  	
-  </head>  
-  <body>
+<%@ include file="/includes/taglibs.jsp" %>
+<script type="text/javascript" src="<html:rewrite page='/includes/scripts.jsp'/>"></script>
 
-		<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-		<c:forEach items="${report}"  var ="user" >		
-			<c:set var="filesUploaded" value="${user.value}"/>
-			<c:set var="first" value="true"/>
-			<c:forEach items="${filesUploaded}"  var ="details" >			
-				<span><p>			
-					<c:if test="${first}">
-						<c:set var="first" value="false"/>
-					    <tr>
-					    	<td colspan="2">
-					    	<c:out value="${details.userDTO.firstName}"/> <c:out value="${details.userDTO.lastName}"/>,
-					    	<c:out value="${details.userDTO.login}"/>, provides following submisstion:
-					    	</td>
-					    <tr>
-				    </c:if>
-				<tr>
-					<td>File Path: </td>
-						<td>
-						File Path: </td><td><c:out value="${details.filePath}" /> 
-						<c:set var="viewURL">
-							<html:rewrite page="/download/?uuid=${details.uuID}&versionID=${details.versionID}&preferDownload=false"/>
-						</c:set>
-						<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-									<fmt:message key="label.view"/>
-						</a>&nbsp;
-						<c:set var="downloadURL">
-							<html:rewrite page="/download/?uuid=${details.uuID}&versionID=${details.versionID}&preferDownload=true"/>
-						</c:set>
-						<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-									<fmt:message key="label.download"/>
-						</a>
-						</td>					
-					
-				</tr>
-				<tr>
-					<td>File Description: </td><td><c:out value="${details.fileDescription}"  escapeXml="false"/></td>
-				</tr>
-				<tr>
-					<td>Date of Submission: </td><td><c:out value="${details.dateOfSubmission}" /></td>
-				</tr>
-				<tr>
-					<td>Marks:</td>
-					<td> 		<c:choose>
-										<c:when test="${empty details.marks}">
-											<c:out value="Not Available"/>
-										</c:when>
-										<c:otherwise>
-											<c:out value="${details.marks}" escapeXml="false"/>
-										</c:otherwise>
-									</c:choose>
-					</td>
-				</tr>			
-				<tr>
-					<td>Comments:</td>
-					<td>
-									<c:choose>
-										<c:when test="${empty details.comments}">
-											<c:out value="Not Available"/>								
-										</c:when>
-										<c:otherwise>
-											<c:out value="${details.comments}" escapeXml="false"/>
-										</c:otherwise>
-									</c:choose>
-					</td>
-				</tr>
-		
-				<tr>
-					<td colspan="2">
-					<form action="<html:rewrite page='/monitoring.do?method=markFile'/>" method="post">
-							<input type="hidden" name="detailID" value=<c:out value='${details.submissionID}' /> >
-							<input type="hidden" name="reportID" value=<c:out value='${details.reportID}' /> >
-							<input type="hidden" name="userID" value=<c:out value='${details.userID}' /> >
+	<table width="100%"  border="0" cellspacing="3" cellpadding="3">
+	<c:forEach items="${report}"  var ="userList" >		
+		<c:set var="user" value="${userList.key}"/>
+		<c:set var="markList" value="${userList.value}"/>
+		<c:set var="first" value="true"/>
+		<c:forEach items="${markList}"  var ="topic" >			
+			<span><p>			
+				<c:if test="${first}">
+					<c:set var="first" value="false"/>
+				    <tr>
+				    	<td colspan="2">
+				    	<c:out value="${user.firstName}"/> <c:out value="${user.lastName}"/> ,
+				    	<c:out value="${user.loginName}"/>,
+				    	 provides following submisstion:
+				    	</td>
+				    <tr>
+			    </c:if>
+			<tr>
+				<td valign="MIDDLE" width="48%">
+					<c:set var="viewtopic">
+						<html:rewrite page="/monitoring/viewTopic.do?messageID=${topic.message.uid}&create=${topic.message.created.time}" />
+					</c:set> 
+					<html:link href="javascript:launchPopup('${viewtopic}');">
+						<c:out value="${topic.message.subject}" />
+					</html:link>
+				</td>
+				<td width="2%">
+					<c:if test="${topic.hasAttachment}">
+						<img src="<html:rewrite page="/images/paperclip.gif"/>">
+					</c:if>
+				</td>
+				<td>
+					<c:out value="${topic.author}"/>
+				</td>
+				<td>
+					<c:out value="${topic.message.replyNumber}"/>
+				</td>
+				<td>
+					<fmt:formatDate value="${topic.message.updated}" type="time" timeStyle="short" />
+					<fmt:formatDate value="${topic.message.updated}" type="date" dateStyle="full" />
+				</td>
+			</tr>
+		 <tr>
+			<tr>
+				<td>Marks:</td>
+				<td colspan="3"> 	
+						<c:choose>
+									<c:when test="${empty topic.message.report.mark}">
+										<c:out value="Not Available"/>
+									</c:when>
+									<c:otherwise>
+										<c:out value="${topic.message.report.mark}" escapeXml="false"/>
+									</c:otherwise>
+								</c:choose>
+				</td>
+			</tr>			
+			<tr>
+				<td>Comments:</td>
+				<td  colspan="3">
+								<c:choose>
+									<c:when test="${empty topic.message.report.comment}">
+										<c:out value="Not Available"/>								
+									</c:when>
+									<c:otherwise>
+										<c:out value="${topic.message.report.comment}" escapeXml="false"/>
+									</c:otherwise>
+								</c:choose>
+				</td>
+			</tr>
+	
+			<tr>
+				<td colspan="2">
+					<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>
-					</td>
-				</tr>
-				</span>
-			</c:forEach>
+					</html:form>
+				</td>
+			</tr>
+			</span>
 		</c:forEach>
-		</table>						
-  </body>
-</html:html>
-
+	</c:forEach>
+	</table>						
Index: lams_tool_forum/web/jsps/monitoring/viewtopic.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/monitoring/viewtopic.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/monitoring/viewtopic.jsp	(revision caa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab)
@@ -0,0 +1,8 @@
+
+<%@ include file="/includes/taglibs.jsp" %>
+<script type="text/javascript" src="<html:rewrite page='/includes/scripts.jsp'/>"></script>
+<div align="center">
+	<%@ include file="message/topicview.jsp" %>
+<br>
+<a href="javascript:window.close();">close</a>
+</div>