Index: lams_tool_forum/conf/language/ApplicationResources.properties
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -44,7 +44,7 @@
 lable.topic.title.replies  =Replies
 lable.topic.title.mark  =Mark
 lable.topic.subject.by  =By
-label.back.to.forum  =Go back to froum
+label.back.to.forum  =Go back to forum
 lable.topic.title.message.number  =# of Msg
 lable.topic.title.average.mark  =Aver mark
 authoring.exception  =There is a problem in forum authoring page, the reason is {0}
@@ -65,7 +65,7 @@
 message.monitoring.edit.activity.not.editable  =This Activity is no longer editable
 errors.header  =<b class="error">
 errors.footer  =</b>
-error.valueReqd  =Value Required
+error.valueReqd  =Value required
 error.inputFileTooLarge  =Input File size is too large!
 error.uploading  =error uploading
 error.mark.needNumber  =Mark must be int value
@@ -142,5 +142,6 @@
 #======= End labels: Exported 130 labels for en AU =====
 #======= New labels: after 12/05/2006 =============
 authoring.msg.cancel.save=Do you want to close this window without saving?
+#======= New labels: after 08/06/2006 =============
 define.later.message=Please wait for the teacher to define this part.
 run.offline.message=This activity is not being done on the computer. Please see your instructor for details.
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -r12f7e39b451ed00ce91cffcf66efd129252d2cfc -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 12f7e39b451ed00ce91cffcf66efd129252d2cfc)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -80,5 +80,7 @@
 	public static final String TITLE = "title";
 	public static final String INSTRUCTIONS = "instructions";
 	public static final String PAGE_EDITABLE = "isPageEditable";
+
+	public static final String ROOT_TOPIC_UID = "rootUid";
 	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -303,6 +303,7 @@
 		setAuthorMark(msgDtoList);
 
 		request.setAttribute(ForumConstants.AUTHORING_TOPIC_THREAD, msgDtoList);
+		request.getSession().setAttribute(ForumConstants.ROOT_TOPIC_UID,topicId);
 		return mapping.findForward("success");
 
 	}
@@ -362,7 +363,7 @@
 	private ActionForward newReplyTopic(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 		Long parentId = new Long(WebUtil.readLongParam(request, "parentId"));
-
+		
 		// get parent topic, it can decide default subject of reply.
 		MessageDTO topic = getTopic(parentId);
 
@@ -375,6 +376,7 @@
 
 		// cache this parentId in order to create reply
 		request.getSession().setAttribute("parentId", parentId);
+		
 		return mapping.findForward("success");
 	}
 
@@ -390,6 +392,7 @@
 	private ActionForward replyTopic(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 		Long parentId = (Long) request.getSession().getAttribute("parentId");
+		
 		Long sessionId = (Long) request.getSession().getAttribute(
 				AttributeNames.PARAM_TOOL_SESSION_ID);
 		MessageForm messageForm = (MessageForm) form;
@@ -412,8 +415,9 @@
 		Long rootTopicId = forumService.getRootTopicId(parentId);
 		List msgDtoList = forumService.getTopicThread(rootTopicId);
 		setAuthorMark(msgDtoList);
+		
 		request.setAttribute(ForumConstants.AUTHORING_TOPIC_THREAD, msgDtoList);
-
+		
 		return mapping.findForward("success");
 	}
 
@@ -460,6 +464,7 @@
 			throws PersistenceException {
 		// get value from HttpSession
 		Long topicId = (Long) request.getSession().getAttribute("topicId");
+		
 		forumService = getForumManager();
 
 		MessageForm messageForm = (MessageForm) form;
@@ -495,7 +500,7 @@
 		List msgDtoList = forumService.getTopicThread(rootTopicId);
 		setAuthorMark(msgDtoList);
 		request.setAttribute(ForumConstants.AUTHORING_TOPIC_THREAD, msgDtoList);
-
+		
 		return mapping.findForward("success");
 	}
 
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r427a3b63491fb2f3206a785705ac247af49e1360 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -25,23 +25,15 @@
 	<!--
 		This is a default layout which has a header and body
 	-->
-	<definition name="tiles:defaultLayout" path="/includes/defaultLayout.jsp">
-    	<put name="body" value=""/>
-    	<put name="header" value="/includes/header.jsp"/>
-	</definition>
-
 	<definition name="tiles:layout" path="/includes/layout.jsp">
     	<put name="pageTitleKey" value=""/>
     	<put name="body" value=""/>
-    	<put name="header" value="/includes/header.jsp"/>
-    	<put name="footer" value="/includes/footer.jsp"/>
 	</definition>
 
 	<definition name="tiles:tab:layout" path="/includes/tablayout.jsp">
     	<put name="pageTitleKey" value=""/>
     	<put name="body" value=""/>
     	<put name="header" value=""/>
-    	<put name="footer" value="/includes/footer.jsp"/>
 	</definition>
 
 	<!-- B: Generic -->
@@ -57,29 +49,10 @@
 	<!-- B: Authoring -->
 	<definition name="tiles:/authoring/forum/main" extends="tiles:tab:layout">
     	<put name="pageTitleKey" value="page.title.authoring.init"/>
-    	<put name="header" value="/includes/authoringHeader.jsp"/>
+    	<put name="header" value="/jsps/authoring/header.jsp"/>
     	<put name="body" value="/jsps/authoring/authoring.jsp"/>
 	</definition>
 	
-	<!-- 
-    <definition name="tiles:/authoring/forum/newTopic" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.add"/>
-    	<put name="body" value="/jsps/authoring/message/create.jsp"/>
-	</definition>
-	<definition name="tiles:/authoring/forum/viewTopic" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.view"/>
-    	<put name="body" value="/jsps/authoring/message/view.jsp"/>
-	</definition>
-	<definition name="tiles:/authoring/forum/editTopic" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.edit"/>
-    	<put name="body" value="/jsps/authoring/message/edit.jsp"/>
-	</definition>
-	<definition name="tiles:/authoring/forum/forbiddenEditTopic" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.edit"/>
-    	<put name="body" value="/jsps/authoring/message/forbiddenedit.jsp"/>
-	</definition>
-	
-	-->
 	<!-- E: Authoring -->
 
 	<!-- B: Learning -->
@@ -119,16 +92,14 @@
 	<!-- E: Learning -->
 	
 	<!-- B: Monitoring -->
-	
 	<definition name="tiles:/monitoring/forum/main" extends="tiles:tab:layout">
     	<put name="pageTitleKey" value="page.title.monitoring.init"/>
-		<put name="header" value="/includes/header.jsp"/>    	
+		<put name="header" value="/jsps/monitoring/header.jsp"/>    	
     	<put name="body" value="/jsps/monitoring/monitoring.jsp"/>
 	</definition>
-	
 	<definition name="tiles:/monitoring/forum/defineLater" extends="tiles:tab:layout">
     	<put name="pageTitleKey" value="page.title.monitoring.definelater"/>
-    	<put name="header" value="/includes/authoringHeader.jsp"/>
+    	<put name="header" value="/jsps/authoring/header.jsp"/>
     	<put name="body" value="/jsps/authoring/definelater.jsp"/>
 	</definition>
 	
Index: lams_tool_forum/web/common/header.jsp
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/common/header.jsp	(.../header.jsp)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/web/common/header.jsp	(.../header.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -27,7 +27,8 @@
 <script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
 <script type="text/javascript" src="${tool}includes/javascript/xmlrequest.js"></script>
+<script type="text/javascript" src="${tool}includes/javascript/forum.js"></script>
 
 
+<%@ include file="/common/fckeditorheader.jsp"%>
 
-
Fisheye: Tag 6852794f79069c9b70ee194f74677323d0bf14b7 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/authoringHeader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6852794f79069c9b70ee194f74677323d0bf14b7 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6852794f79069c9b70ee194f74677323d0bf14b7 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/header.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/includes/javascript/forum.js
===================================================================
diff -u
--- lams_tool_forum/web/includes/javascript/forum.js	(revision 0)
+++ lams_tool_forum/web/includes/javascript/forum.js	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -0,0 +1,9 @@
+	function launchPopup(url,title) {
+		var wd = null;
+		if(wd && wd.open && !wd.closed){
+			wd.close();
+		}
+		wd = window.open(url,title,'resizable,width=796,height=570,scrollbars');
+		wd.window.focus();
+	}
+	
\ No newline at end of file
Index: lams_tool_forum/web/includes/layout.jsp
===================================================================
diff -u -r0eacb8f457bdd45c0ee25040bb1a793635e24dbf -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/includes/layout.jsp	(.../layout.jsp)	(revision 0eacb8f457bdd45c0ee25040bb1a793635e24dbf)
+++ lams_tool_forum/web/includes/layout.jsp	(.../layout.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -9,7 +9,7 @@
 		<title>
 			<bean:message key="activity.title" />
 	  	</title>
-		<tiles:insert attribute="header" />
+	  	<%@ include file="/common/header.jsp"%>
 	</head>
 	<body>
 	
@@ -22,6 +22,5 @@
 		</logic:notEmpty>
 
 		<tiles:insert attribute="body" />
-		<tiles:insert attribute="footer" />
 	</body>
 </html>
Fisheye: Tag 6852794f79069c9b70ee194f74677323d0bf14b7 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/scripts.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/includes/tablayout.jsp
===================================================================
diff -u -r9d22cc9e548d46405f0b12cd1eddb4ae460ef289 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/includes/tablayout.jsp	(.../tablayout.jsp)	(revision 9d22cc9e548d46405f0b12cd1eddb4ae460ef289)
+++ lams_tool_forum/web/includes/tablayout.jsp	(.../tablayout.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -1,11 +1,19 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
 	"http://www.w3.org/TR/html4/loose.dtd">
 
-<%@ include file="/includes/taglibs.jsp"%>
+<%@ include file="/common/taglibs.jsp"%>
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
 
 <html>
-	<tiles:insert attribute="header" />
+	<head>
+		<title>
+			<bean:message key="activity.title" />
+	  	</title>
+	  	<%@ include file="/common/header.jsp"%>
+	  	
+		<tiles:insert attribute="header" />
+	</head>
+	
 	<body onLoad="init()">
 		<tiles:useAttribute name="pageTitleKey" scope="request" />
 		<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
@@ -16,6 +24,5 @@
 		</logic:notEmpty>
 
 		<tiles:insert attribute="body" />
-		<tiles:insert attribute="footer" />
 	</body>
 </html>
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -r427a3b63491fb2f3206a785705ac247af49e1360 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -45,7 +45,7 @@
 	<tr>
 		<td colspan="2" class="formlabel">
 			<div id="messageListArea">
-				<%@ include file="/jsps/message/topiclist.jsp"%>
+				<%@ include file="/jsps/authoring/message/topiclist.jsp"%>
 			</div>
 		</td>
 	</tr>
Index: lams_tool_forum/web/jsps/authoring/header.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/header.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/header.jsp	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -0,0 +1,43 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+<script type="text/javascript">
+     //<![CDATA[
+	var imgRoot="${lams}images/";
+	var themeName="aqua";
+        
+	function init(){
+		initTabSize(3);
+            
+		var tag = document.getElementById("currentTab");
+		if(tag == null || tag.value != "")
+			selectTab(tag.value);
+        else
+			selectTab(1);
+
+	   initEditor("forum.title");
+	   initEditor("forum.instructions");
+	   initEditor("forum.onlineInstructions");
+	   initEditor("forum.offlineInstructions");
+	}  
+        
+	function doSelectTab(tabId) {
+		var tag = document.getElementById("currentTab");
+		tag.value = tabId;
+		selectTab(tabId);
+	}
+
+	function doSubmit(method, tabId) {
+		var authorForm = document.getElementById("authoringForm");
+		if(tabId != null)
+			authorForm.currentTab.value=tabId;
+		authorForm.action=method;
+		authorForm.submit();
+	}
+	
+	//]]>        
+</script>
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -14,20 +14,63 @@
 			}
 			success();
 		</script>
-		
+
 	</head>
 	<body class="tabpart">
 		<script type="text/javascript">
 			success();
-		</script>	
+		</script>
 		<table class="forms">
 			<!-- Basic Info Form-->
 			<tr>
 				<td>
 					<div align="center">
-						<%@ include file="/common/messages.jsp" %>
+						<%@ include file="/common/messages.jsp"%>
 						<html:form action="/authoring/createTopic.do" focus="message.subject" enctype="multipart/form-data">
-							<%@ include file="/jsps/message/topicform.jsp"%>
+							<table width="100%" cellspacing="8" border="0" align="left">
+								<tr>
+									<td>
+										<b><bean:message key="message.label.subject" /><b class="required">*</b></b>
+									</td>
+									<td align="left">
+										<html:text size="30" tabindex="1" property="message.subject" />
+										<BR>
+										<html:errors property="message.subject" />
+									</td>
+								</tr>
+								<tr>
+									<td>
+										<b><bean:message key="message.label.body" /></b><b class="required">*</b>
+									</td>
+									<td>
+										<FCK:editor id="message.body" basePath="/lams/fckeditor/" height="200" width="100%">
+										</FCK:editor>
+										<BR>
+										<html:errors property="message.body" />
+									</td>
+								</tr>
+								<tr>
+									<td>
+										<b><bean:message key="message.label.attachment" /></b>
+									</td>
+									<td>
+										<html:file tabindex="3" property="attachmentFile" />
+										<html:errors property="message.attachment" />
+									</td>
+								</tr>
+								<tr>
+									<td></td>
+									<td align="left" valign="bottom">
+										<html:submit style="width:120px" styleClass="buttonStyle">
+											<bean:message key="button.add" />
+										</html:submit>
+										<html:button property="cancel" onclick="javascript:window.parent.hideMessage()" styleClass="buttonStyle" style="width:120px">
+											<bean:message key="button.cancel" />
+										</html:button>
+									</td>
+								</tr>
+							</table>
+
 						</html:form>
 					</div>
 				</td>
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
diff -u -r427a3b63491fb2f3206a785705ac247af49e1360 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -13,7 +13,68 @@
 						<html:form action="/authoring/updateTopic.do" focus="message.subject" enctype="multipart/form-data">
 							<fieldset>
 								<input type="hidden" name="topicIndex" value="<c:out value="${topicIndex}"/>">
-								<%@ include file="/jsps/message/topiceditform.jsp"%>
+
+								<table width="80%" cellspacing="8" border="0" align="left" class="innerforms">
+									<tr>
+										<td>
+											<b><bean:message key="message.label.subject" /><b class="required">*</b></b>
+										</td>
+										<td>
+											<html:text size="30" tabindex="1" property="message.subject" />
+											<BR>
+											<html:errors property="message.subject" />
+										</td>
+									</tr>
+									<tr>
+										<td>
+											<b><bean:message key="message.label.body" /><b class="required">*</b></b>
+										</td>
+										<td>
+											<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+											<FCK:editor id="message.body" basePath="/lams/fckeditor/" height="200" width="100%">
+												<c:out value="${formBean.message.body}" escapeXml="false" />
+											</FCK:editor>										
+											<BR>
+											<html:errors property="message.body" />
+										</td>
+									</tr>
+									<tr>
+										<td>
+											<b><bean:message key="message.label.attachment" /></b>
+										</td>
+										<td>
+											<c:if test="${topic.hasAttachment}">
+												<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:set var="deleteURL">
+														<html:rewrite page="/authoring/deleteAttachment.do?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&topicIndex=${topicIndex}" />
+													</c:set>
+													<a href="<c:out value='${deleteURL}'/>" class="button" style="float: none"> <fmt:message key="label.delete" /> </a>
+												</c:forEach>
+											</c:if>
+											<c:if test="${not topic.hasAttachment}">
+												<html:file tabindex="3" property="attachmentFile" />
+											</c:if>
+
+										</td>
+									</tr>
+									<tr>
+										<td></td>
+										<td align="left" valign="bottom">
+											<BR>
+											<html:submit style="width:120px" styleClass="buttonStyle">
+												<bean:message key="button.submit" />
+											</html:submit>
+											<html:button property="cancel" onclick="javascript:window.parent.hideMessage()" styleClass="buttonStyle" style="width:120px">
+												<bean:message key="button.cancel" />
+											</html:button>
+										</td>
+									</tr>
+								</table>
+
 							</fieldset>
 						</html:form>
 					</div>
Index: lams_tool_forum/web/jsps/authoring/message/topiclist.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -0,0 +1,42 @@
+<%@ include file="/includes/taglibs.jsp" %>
+	
+<div align="center">
+<div id="topiclist">
+	<div id="datatablecontainer">
+	<table width="100%" align="CENTER" 	class="form">
+		<tr>
+			<td colspan="4"  valign="MIDDLE"><b><fmt:message key="title.message.view"/></b></td>
+		</tr>
+		<tr>
+			<th scope="col" width="50%" colspan="2"><fmt:message key="lable.topic.title.subject"/></th>
+			<th scope="col" width="25%"><fmt:message key="lable.topic.title.startedby"/></th>
+			<th scope="col" width="25%"><fmt:message key="lable.topic.title.update"/></th>
+		</tr>
+		<c:forEach items="${topicList}" var="topic" varStatus="status">
+			<tr>
+				<td align="left" width="48%">
+					<c:set var="viewtopic">
+						<html:rewrite page="/authoring/viewTopic.do?topicIndex=${status.index}&create=${topic.message.updated.time}" />
+					</c:set> 
+					<html:link href="javascript:showMessage('${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>
+					<fmt:formatDate value="${topic.message.updated}" type="time" timeStyle="short" />
+					<fmt:formatDate value="${topic.message.updated}" type="date" dateStyle="full" />
+				</td>
+			</tr>
+		</c:forEach>
+	</table>
+	</div>
+</div>
+</div>
Index: lams_tool_forum/web/jsps/authoring/message/view.jsp
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -24,7 +24,67 @@
 			<tr>
 				<td>
 					<div align="center">
-						<%@ include file="/jsps/message/topicview.jsp"%>
+						<div align="center">
+
+							<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>
+										<tr>
+											<td align="right">
+												<br>
+												<html:link href="javascript:window.parent.hideMessage()" styleClass="button">
+													<b><fmt:message key="button.cancel" /></b>
+												</html:link>
+												<c:set var="deletetopic">
+													<html:rewrite page="/authoring/deleteTopic.do?topicIndex=${topicIndex}" />
+												</c:set>
+												<html:link href="${deletetopic}" styleClass="button">
+													<b><fmt:message key="label.delete" /></b>
+												</html:link>
+												<c:set var="edittopic">
+													<html:rewrite page="/authoring/editTopic.do?topicIndex=${topicIndex}&create=${topic.message.created.time}" />
+												</c:set>
+												<html:link href="${edittopic}" styleClass="button">
+													<b><fmt:message key="label.edit" /></b>
+												</html:link>
+											</td>
+										</tr>
+									</table>
+								</div>
+							</div>
+						</div>
 					</div>
 				</td>
 			</tr>
Index: lams_tool_forum/web/jsps/export/exportportfolio.jsp
===================================================================
diff -u -rde672e5125377cd876df4bf2e9e624ffcfac30a4 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision de672e5125377cd876df4bf2e9e624ffcfac30a4)
+++ lams_tool_forum/web/jsps/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -1,11 +1,8 @@
-<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/common/taglibs.jsp" %>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html:html locale="true">
   <head>    
-    <title>Learner Topics Details</title>
-    <html:base/>
-    <c:set var="lams"><lams:LAMSURL/></c:set>
-  	<link href="<c:out value="${lams}"/>css/aqua.css" rel="stylesheet" type="text/css">
+		<%@ include file="/common/header.jsp" %>
   </head>  
   <body>
   
Index: lams_tool_forum/web/jsps/learning/message/bodyarea.jsp
===================================================================
diff -u -ra1bba4a6e2e8937726524cf853f5cb54932c47c2 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	(.../bodyarea.jsp)	(revision a1bba4a6e2e8937726524cf853f5cb54932c47c2)
+++ lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	(.../bodyarea.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -1,36 +1,43 @@
-	<b class="required">*</b>
-		<c:choose>
-			<c:when test="${allowRichEditor}">
-				<FCK:editor id="message.body"
-					basePath="/lams/fckeditor/" height="150" width="85%">
-					<c:out value="${formBean.message.body}" escapeXml="false" />
-				</FCK:editor>
-			</c:when>
-			<c:otherwise>
-				<lams:STRUTS-textarea rows="10" cols="60" tabindex="2" property="message.body" styleId="messageBody"/> 
-				<BR>
-				<fmt:message key="lable.char.left"/>
-				<input type="text" name="limitCount" id="limitCount" disabled="true"/>
-				<script type="text/javascript">
+
+<c:choose>
+	<c:when test="${allowRichEditor}">
+		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+		<FCK:editor id="message.body" basePath="/lams/fckeditor/" height="200" width="100%">
+			<c:out value="${formBean.message.body}" escapeXml="false" />
+		</FCK:editor>
+	</c:when>
+	<c:otherwise>
+		<lams:STRUTS-textarea rows="10" cols="60" tabindex="2" property="message.body" styleId="messageBody" />
+		<BR>
+		<fmt:message key="lable.char.left" />:  
+		<span id="charleftDiv"></span>
+		<input type="hidden" name="limitCount" id="limitCount" />
+		<script type="text/javascript">
 					<!--
 					var limit = <c:out value="${limitedChars}"/>;
 					var bodyTxt = document.getElementById("messageBody");
 					var limitCount = document.getElementById("limitCount");
+					
+					var showDiv = document.getElementById("charleftDiv");
 					limitCount.value=limit - bodyTxt.value.length;
+					showDiv.innerHTML=limitCount.value;
 					function calculateLeft(){
 						if(this.value.length > limit){
 							this.value = this.value.substring(0,limit);
 							//fix a bug: when change "this.value", onchange event won't be fired any more. So this will 
 							//manually handle onchange event. It is a kind of crack coding!
 							filterData(document.getElementById('messageBody'),document.getElementById('message.body__lamshidden'));
-						}else
+						}else{
 							limitCount.value = limit - this.value.length;
+							showDiv.innerHTML=limitCount.value;							
+						}
 					}
 					
 					bodyTxt.onkeydown = calculateLeft;
 					bodyTxt.onkeyup = calculateLeft;
 					-->
 				</script>
-			</c:otherwise>
-		</c:choose>
-		<BR><html:errors property="message.body" />
\ No newline at end of file
+	</c:otherwise>
+</c:choose>
+<BR>
+<html:errors property="message.body" />
Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
===================================================================
diff -u -r4a636f089ddb22f51c9277aa191e90ab61880515 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 4a636f089ddb22f51c9277aa191e90ab61880515)
+++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -1,49 +1,58 @@
-
-<table width="80%" cellspacing="8" align="CENTER" class="forms">
+<table width="90%" cellspacing="8" align="CENTER">
 	<tr>
-		<td valign="MIDDLE"><b><bean:message key="message.label.subject" /></b></td>
-		<td valign="MIDDLE"><b class="required">*</b><html:text size="30"
-			 tabindex="1" property="message.subject" /> 
-			 <html:errors property="message.subject" /></td>
+		<td valign="MIDDLE">
+			<b><bean:message key="message.label.subject" /><b class="required">*</b></b>
+		</td>
+		<td valign="MIDDLE" align="left">
+			<html:text size="30" tabindex="1" property="message.subject" /><br>
+			<html:errors property="message.subject" />
+		</td>
 	</tr>
 	<tr>
-		<td valign="MIDDLE"><b><bean:message key="message.label.body" /></b></td>
-		<td valign="MIDDLE"><%@include file="bodyarea.jsp"%></td>
+		<td valign="MIDDLE">
+			<b><bean:message key="message.label.body" /></b><b class="required">*</b>
+		</td>
+		<td valign="MIDDLE" align="left">
+			<%@include file="bodyarea.jsp"%>
+		</td>
 	</tr>
 	<tr>
 		<td>
 			<b><bean:message key="message.label.attachment" /></b>
 		</td>
-		<td valign="MIDDLE">&nbsp;
+		<td valign="MIDDLE" align="left">
 			<c:if test="${topic.hasAttachment}">
 				<c:forEach var="file" items="${topic.message.attachments}">
 					<c:set var="downloadURL">
-							<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
+						<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>
+					<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <c:out value="${file.fileName}" /> </a>
 					<c:set var="deleteURL">
-							<html:rewrite page="/learning/deleteAttachment.do?uuid=${file.fileUuid}&versionID=${file.fileVersionId}"/>
+						<html:rewrite page="/learning/deleteAttachment.do?uuid=${file.fileUuid}&versionID=${file.fileVersionId}" />
 					</c:set>
 					&nbsp;
-					<a href="<c:out value='${deleteURL}'/>">
-						<fmt:message key="label.delete" />
-					</a>					
+					<a href="<c:out value='${deleteURL}'/>"> <fmt:message key="label.delete" /> </a>
 				</c:forEach>
 			</c:if>
 			<c:if test="${not topic.hasAttachment}">
-				<html:file tabindex="3"		property="attachmentFile" /> <html:errors	property="message.attachment" />
+				<html:file tabindex="3" property="attachmentFile" />
+				<html:errors property="message.attachment" />
 			</c:if>
 		</td>
 	</tr>
 	<tr>
-		<td>&nbsp;&nbsp;
-			<html:submit>
+		<td></td>
+		<td align="left">
+			<BR>
+			<html:submit styleClass="buttonStyle" style="width:120px">
 				<bean:message key="button.submit" />
 			</html:submit>
+			<c:set var="backToTopic">
+				<html:rewrite page="/learning/viewTopic.do?topicId=${rootUid}&create=${topic.message.created.time}" />
+			</c:set> 			
+			<html:button property="goback" onclick="javascript:location.href='${backToTopic}';" styleClass="buttonStyle" style="width:120px">
+				<bean:message key="button.cancel" />
+			</html:button>
 		</td>
-		<td>
-		</td>
 	</tr>
 </table>
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp
===================================================================
diff -u -r4a636f089ddb22f51c9277aa191e90ab61880515 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision 4a636f089ddb22f51c9277aa191e90ab61880515)
+++ lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -1,28 +1,46 @@
 
 <c_rt:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-<table width="80%" cellspacing="8" align="CENTER" class="forms">
+<table width="90%" cellspacing="8" border="0" align="CENTER">
 	<tr>
-		<td valign="MIDDLE"><b><bean:message key="message.label.subject" /></b></td>
-		<td valign="MIDDLE"><b class="required">*</b><html:text size="30"
-			 tabindex="1" property="message.subject" /> 
-			 <html:errors property="message.subject" /></td>
+		<td valign="MIDDLE">
+			<b><bean:message key="message.label.subject" /><b class="required">*</b></b>
+		</td>
+		<td valign="MIDDLE" align="left">
+			<html:text size="30" tabindex="1" property="message.subject" />
+			<br>
+			<html:errors property="message.subject" />
+		</td>
 	</tr>
 	<tr>
-		<td valign="MIDDLE"><b><bean:message key="message.label.body" /></b></td>
-		<td valign="TOP"><%@include file="bodyarea.jsp"%></td>
+		<td valign="MIDDLE">
+			<b><bean:message key="message.label.body" /> <b class="required">*</b></b>
+		</td>
+		<td valign="TOP" align="left">
+			<%@include file="bodyarea.jsp"%>
+		</td>
 	</tr>
 	<tr>
-		<td valign="MIDDLE"><b><bean:message key="message.label.attachment" /></b></td>
 		<td valign="MIDDLE">
-			&nbsp;&nbsp;<html:file tabindex="3"
-				property="attachmentFile" /> <html:errors
-				property="message.attachment" />
+			<b><bean:message key="message.label.attachment" /></b>
 		</td>
+		<td valign="MIDDLE" align="left">
+			<html:file tabindex="3" property="attachmentFile" />
+			<html:errors property="message.attachment" />
+		</td>
 	</tr>
-		<td>&nbsp;&nbsp;
-			<html:submit>
+	<tr>
+		<td></td>
+		<td align="left">
+			<BR>
+			<html:submit styleClass="buttonStyle" style="width:120px">
 				<bean:message key="button.submit" />
 			</html:submit>
+			<c:set var="backToForum">
+				<html:rewrite page="/learning/viewForum.do?toolSessionID=${sessionScope.toolSessionID}" />
+			</c:set>
+			<html:button property="goback" onclick="javascript:location.href='${backToForum}';" styleClass="buttonStyle" style="width:120px">
+				<bean:message key="button.cancel" />
+			</html:button>
 		</td>
 	</tr>
 </table>
Index: lams_tool_forum/web/jsps/learning/message/topiclist.jsp
===================================================================
diff -u -r5cf73c3c3892579e89ad206d4d04c97bda7fd949 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
+++ lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -14,7 +14,7 @@
 		</tr>
 		<c:forEach items="${topicList}" var="topic" >
 			<tr>
-				<td valign="MIDDLE" width="48%">
+				<td valign="MIDDLE" width="48%" align="left">
 					<c:set var="viewtopic">
 						<html:rewrite page="/learning/viewTopic.do?topicId=${topic.message.uid}&create=${topic.message.created.time}" />
 					</c:set> 
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
diff -u -r4a636f089ddb22f51c9277aa191e90ab61880515 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision 4a636f089ddb22f51c9277aa191e90ab61880515)
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -1,26 +1,43 @@
 <table width="80%" cellspacing="8" align="CENTER" class="forms">
 	<tr>
-		<td valign="MIDDLE"><b><bean:message key="message.label.subject" /></b></td>
-		<td valign="MIDDLE"><b class="required">*</b><html:text size="30"
-			 tabindex="1" property="message.subject" /> 
-			 <html:errors property="message.subject" /></td>
+		<td valign="MIDDLE">
+			<b><bean:message key="message.label.subject" /></b><b class="required">*</b>
+		</td>
+		<td valign="MIDDLE" align="left">
+			<html:text size="30" tabindex="1" property="message.subject" />
+			<html:errors property="message.subject" />
+		</td>
 	</tr>
 	<tr>
-		<td valign="MIDDLE"><b><bean:message key="message.label.body" /></b></td>
-		<td valign="TOP"><%@include file="bodyarea.jsp"%></td>
+		<td valign="MIDDLE">
+			<b><bean:message key="message.label.body" /></b><b class="required">*</b>
+		</td>
+		<td valign="TOP" align="left">
+			<%@include file="bodyarea.jsp"%>
+		</td>
 	</tr>
 	<tr>
-		<td valign="MIDDLE"><b><bean:message key="message.label.attachment" /></b></td>
 		<td valign="MIDDLE">
-			&nbsp;&nbsp;<html:file tabindex="3"
-				property="attachmentFile" /> <html:errors
-				property="message.attachment" />
+			<b><bean:message key="message.label.attachment" /></b>
 		</td>
+		<td valign="MIDDLE" align="left">
+			<html:file tabindex="3" property="attachmentFile" />
+			<html:errors property="message.attachment" />
+		</td>
 	</tr>
-		<td>&nbsp;&nbsp;
-			<html:submit>
+	<tr>
+		<td></td>
+		<td align="left">
+			<BR>
+			<html:submit styleClass="buttonStyle" style="width:120px">
 				<bean:message key="button.submit" />
 			</html:submit>
+			<c:set var="backToTopic">
+				<html:rewrite page="/learning/viewTopic.do?topicId=${rootUid}&create=${message.created.time}" />
+			</c:set>
+			<html:button property="goback" onclick="javascript:location.href='${backToTopic}';" styleClass="buttonStyle" style="width:120px">
+				<bean:message key="button.cancel" />
+			</html:button>
 		</td>
 	</tr>
 </table>
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -rc077bb71b49a314301b3d6e63f70e41c1649f039 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision c077bb71b49a314301b3d6e63f70e41c1649f039)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -1,6 +1,4 @@
 <div id="topicview">
-
-	<br />
 	<c:set var="mode" value="${sessionScope.mode}" />
 	<c:forEach var="msgDto" items="${topicThread}">
 		<div id="datatablecontainer">
@@ -12,9 +10,7 @@
 						<th valign="middle" scope="col">
 							<c:choose>
 								<c:when test='${(mode == "teacher") || (not hidden)}'>
-									<b>
-										<c:out value="${msgDto.message.subject}" />
-									</b>
+									<b> <c:out value="${msgDto.message.subject}" /> </b>
 								</c:when>
 								<c:otherwise>
 									<fmt:message key="topic.message.subject.hidden" />
@@ -24,11 +20,13 @@
 					</tr>
 					<tr>
 						<th scope="col">
-							<fmt:message key="lable.topic.subject.by" />
-							<c:out value="${msgDto.author}" />
-							-
-							<fmt:formatDate value="${msgDto.message.created}" type="time" timeStyle="short" />
-							<fmt:formatDate value="${msgDto.message.created}" type="date" dateStyle="full" />
+							<c:if test='${(mode == "teacher") || (not hidden)}'>
+								<fmt:message key="lable.topic.subject.by" />
+								<c:out value="${msgDto.author}" />
+								-
+								<fmt:formatDate value="${msgDto.message.created}" type="time" timeStyle="short" />
+								<fmt:formatDate value="${msgDto.message.created}" type="date" dateStyle="full" />
+							</c:if>
 						</th>
 					</tr>
 					<tr>
@@ -39,9 +37,7 @@
 							</c:if>
 							<c:if test='${hidden}'>
 								<br />
-								<b>
-									<fmt:message key="topic.message.body.hidden" />
-								</b>
+								<b> <fmt:message key="topic.message.body.hidden" /> </b>
 							</c:if>
 						</td>
 					</tr>
@@ -52,9 +48,7 @@
 								<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>
+								<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <c:out value="${file.fileName}" /> </a>
 							</c:forEach>
 						</td>
 					</tr>
@@ -70,47 +64,41 @@
 										<c:set var="hidetopic">
 											<html:rewrite page="/learning/updateMessageHideFlag.do?msgId=${msgDto.message.uid}&hideFlag=false" />
 										</c:set>
-										<html:link href="${hidetopic}">
-											<b>
-												<fmt:message key="label.show" />
-											</b>
+										<html:link href="${hidetopic}" styleClass="button">
+											<b> <fmt:message key="label.show" /> </b>
 										</html:link>
 									</c:when>
 									<c:otherwise>
 										<!--  display a hide link -->
 										<c:set var="hidetopic">
 											<html:rewrite page="/learning/updateMessageHideFlag.do?msgId=${msgDto.message.uid}&hideFlag=true" />
 										</c:set>
-										<html:link href="${hidetopic}">
-											<b>
-												<fmt:message key="label.hide" />
-											</b>
+										<html:link href="${hidetopic}" styleClass="button">
+											<b> <fmt:message key="label.hide" /> </b>
 										</html:link>
 									</c:otherwise>
 								</c:choose>
 							</c:if>
 
 							<!--  Edit Button -->
-							<c:if test='${(mode == "teacher") || (msgDto.isAuthor && not finishedLock && sessionScope.allowEdit)}'>
-								<c:set var="edittopic">
-									<html:rewrite page="/learning/editTopic.do?topicId=${msgDto.message.uid}&create=${msgDto.message.created.time}" />
-								</c:set>
-								<html:link href="${edittopic}">
-									<b>
+							<c:if test="${not hidden}">
+								<c:if test='${(mode == "teacher") || (msgDto.isAuthor && not finishedLock && sessionScope.allowEdit)}'>
+									<c:set var="edittopic">
+										<html:rewrite page="/learning/editTopic.do?topicId=${msgDto.message.uid}&rootUid=${rootUid}&create=${msgDto.message.created.time}" />
+									</c:set>
+									<html:link href="${edittopic}" styleClass="button">
 										<fmt:message key="label.edit" />
-									</b>
-								</html:link>
+									</html:link>
+								</c:if>
 							</c:if>
 
 							<!--  Reply Button -->
 							<c:if test="${not finishedLock}">
 								<c:set var="replytopic">
-									<html:rewrite page="/learning/newReplyTopic.do?parentId=${msgDto.message.uid}" />
+									<html:rewrite page="/learning/newReplyTopic.do?parentId=${msgDto.message.uid}&rootUid=${rootUid}" />
 								</c:set>
-								<html:link href="${replytopic}">
-									<b>
-										<fmt:message key="label.reply" />
-									</b>
+								<html:link href="${replytopic}"  styleClass="button">
+									<fmt:message key="label.reply" />
 								</html:link>
 							</c:if>
 						</td>
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -rb648e82f0ebdc0178aec9d47c90209b4816c0584 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision b648e82f0ebdc0178aec9d47c90209b4816c0584)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -1,26 +1,30 @@
-<%@ include file="/includes/taglibs.jsp" %>
-
-<html:errors property="error" />
+<%@ include file="/includes/taglibs.jsp"%>
+<c:set var="mode" value="${sessionScope.mode}" />
 <div align="center">
-	<%@ include file="/jsps/learning/message/topiclist.jsp" %>
+	<%@ include file="/jsps/learning/message/topiclist.jsp"%>
+
+	<br>
+	<c:set var="newtopic">
+		<html:rewrite page="/learning/newTopic.do" />
+	</c:set>
+	<c:set var="refresh">
+		<html:rewrite page="/learning/viewForum.do?toolSessionID=${param.toolSessionID}" />
+	</c:set>
+	<c:set var="finish">
+		<html:rewrite page="/learning/finish.do?toolSessionID=${param.toolSessionID}" />
+	</c:set>
+	<c:if test='${mode != "teacher"}'>
+		<html:button property="newtopic" onclick="javascript:location.href='${newtopic}';" disabled="${finishedLock}" style="width:120px" styleClass="buttonStyle">
+			<fmt:message key="label.newtopic" />
+		</html:button>
+	</c:if>
+	<html:button property="refresh" onclick="javascript:location.href='${refresh}';" disabled="${finishedLock}" style="width:120px" styleClass="buttonStyle">
+		<fmt:message key="label.refresh" />
+	</html:button>
+	<c:if test='${mode != "teacher"}'>
+		<html:button property="finish" onclick="javascript:location.href='${finish}';" disabled="${finishedLock}" style="width:120px" styleClass="buttonStyle">
+			<fmt:message key="label.finish" />
+		</html:button>
+	</c:if>
+
 </div>
-<br>
-<c:set var="newtopic">
-	<html:rewrite page="/learning/newTopic.do" />
-</c:set> 
-<c:set var="refresh">
-	<html:rewrite page="/learning/viewForum.do?toolSessionID=${param.toolSessionID}" />
-</c:set> 
-<c:set var="finish">
-	<html:rewrite page="/learning/finish.do?toolSessionID=${param.toolSessionID}" />
-</c:set> 
-	
-<html:button property="newtopic" onclick="javascript:location.href='${newtopic}';" disabled="${finishedLock}" >
-	<fmt:message key="label.newtopic"/>
-</html:button>
-<html:button property="refresh" onclick="javascript:location.href='${refresh}';" disabled="${finishedLock}" >
-	<fmt:message key="label.refresh"/>
-</html:button>
-<html:button property="finish" onclick="javascript:location.href='${finish}';" disabled="${finishedLock}" >
-	<fmt:message key="label.finish"/>
-</html:button>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp
===================================================================
diff -u -r5cf73c3c3892579e89ad206d4d04c97bda7fd949 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
+++ lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -1,11 +1,12 @@
-<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/common/taglibs.jsp"%>
 
-<html:errors property="error" />
+
 <c:set var="backToForum">
 	<html:rewrite page="/learning/viewForum.do?toolSessionID=${sessionScope.toolSessionID}" />
-</c:set> 
-<html:button property="backToForum" onclick="javascript:location.href='${backToForum}';">
-	<fmt:message key="label.back.to.forum"/>
+</c:set>
+<html:button property="backToForum" onclick="javascript:location.href='${backToForum}';" styleClass="buttonStyle">
+	<fmt:message key="label.back.to.forum" />
 </html:button>
-<br>
-<%@ include file="/jsps/learning/message/topicview.jsp" %>
+<P>
+
+<%@ include file="/jsps/learning/message/topicview.jsp"%>
Fisheye: Tag 6852794f79069c9b70ee194f74677323d0bf14b7 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/message/topiceditform.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6852794f79069c9b70ee194f74677323d0bf14b7 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/message/topicform.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6852794f79069c9b70ee194f74677323d0bf14b7 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/message/topiclist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6852794f79069c9b70ee194f74677323d0bf14b7 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/message/topicreplyform.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6852794f79069c9b70ee194f74677323d0bf14b7 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/message/topicview.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6852794f79069c9b70ee194f74677323d0bf14b7 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/monitoring/contentuserlist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/monitoring/editactivity.jsp
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/web/jsps/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -36,7 +36,7 @@
 						</html:link>
 					</c:when>
 					<c:otherwise>
-						<fmt:message key="message.monitoring.edit.activity.not.editable" />
+						<div align="center"><B><fmt:message key="message.monitoring.edit.activity.not.editable" /></B></div>
 					</c:otherwise>
 				</c:choose>
 			</td>
Index: lams_tool_forum/web/jsps/monitoring/header.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/monitoring/header.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/monitoring/header.jsp	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -0,0 +1,26 @@
+<%@ include file="/includes/taglibs.jsp"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<script type="text/javascript">
+     //<![CDATA[
+	var imgRoot="${lams}images/";
+	var themeName="aqua";
+        
+	function init(){
+		initTabSize(4);
+		selectTab(1);
+	}  
+        
+	function doSelectTab(tabId) {
+		var tag = document.getElementById("currentTab");
+		tag.value = tabId;
+		selectTab(tabId);
+	}
+
+	//]]>        
+</script>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/monitoring/message/topicview.jsp
===================================================================
diff -u -rcaa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/monitoring/message/topicview.jsp	(.../topicview.jsp)	(revision caa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab)
+++ lams_tool_forum/web/jsps/monitoring/message/topicview.jsp	(.../topicview.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -15,13 +15,13 @@
 			</th>
 		</tr>
 		<tr>
-			<td>
+			<td align="left">
 				<br>
 				<c:out value="${topic.message.body}" escapeXml="false" />
 			</td>
 		</tr>
 		<tr>
-			<td>
+			<td align="left">
 				<br>
 				<c:forEach var="file" items="${topic.message.attachments}">
 					<c:set var="downloadURL">
Index: lams_tool_forum/web/jsps/monitoring/monitoring.jsp
===================================================================
diff -u -r907a7ec20d8251fde30699bc3b52d64ed9071ea4 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 907a7ec20d8251fde30699bc3b52d64ed9071ea4)
+++ lams_tool_forum/web/jsps/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -1,16 +1,16 @@
-<%@ include file="/includes/taglibs.jsp"%>
+<%@ include file="/common/taglibs.jsp"%>
 
-<lams:Tabs>
-	<lams:Tab id="1" key="monitoring.tab.summary" />
-	<lams:Tab id="2" key="monitoring.tab.instructions" />
-	<lams:Tab id="3" key="monitoring.tab.edit.activity" />
-	<lams:Tab id="4" key="monitoring.tab.statistics" />
-</lams:Tabs>
-
-
-<div class="tabbody">
-	<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="contentuserlist.jsp" />
-	<lams:TabBody id="2" titleKey="monitoring.tab.instructions" page="instructions.jsp"/>
-	<lams:TabBody id="3" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />
-	<lams:TabBody id="4" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
-</div>
+	<lams:Tabs>
+		<lams:Tab id="1" key="monitoring.tab.summary" />
+		<lams:Tab id="2" key="monitoring.tab.instructions" />
+		<lams:Tab id="3" key="monitoring.tab.edit.activity" />
+		<lams:Tab id="4" key="monitoring.tab.statistics" />
+	</lams:Tabs>
+	
+	
+	<div class="tabbody">
+		<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
+		<lams:TabBody id="2" titleKey="monitoring.tab.instructions" page="instructions.jsp"/>
+		<lams:TabBody id="3" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />
+		<lams:TabBody id="4" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
+	</div>
Index: lams_tool_forum/web/jsps/monitoring/summary.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/monitoring/summary.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/monitoring/summary.jsp	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -0,0 +1,90 @@
+<%@ include file="/includes/taglibs.jsp"%>
+<html:errors />
+
+<div class="datatablecontainer">
+	<c:forEach var="element" items="${sessionUserMap}">
+		<c:set var="toolSessionDto" value="${element.key}" />
+		<c:set var="userlist" value="${element.value}" />
+		<c:set var="toolAccessMode" value="${mode}" />
+
+		<br />
+
+		<table class="forms">
+			<tr>
+				<th style="border-bottom:1px #000 solid;" colspan="3">
+					<b> <fmt:message key="message.session.name" /> : </b>
+					<c:out value="${toolSessionDto.sessionName}" />
+				</th>
+			</tr>
+			<c:forEach var="user" items="${userlist}">
+				<tr>
+					<td>
+						<c:out value="${user.firstName}" />
+						<c:out value="${user.lastName}" />
+					</td>
+					<td>
+						<c:out value="${user.loginName}" />
+					</td>
+					<td> 
+						<c:url value="/monitoring/viewUserMark.do" var="viewuserurl">
+							<c:param name="userID" value="${user.uid}" />
+							<c:param name="toolSessionID" value="${toolSessionDto.sessionID}" />
+						</c:url>
+						<html:link href="javascript:launchPopup('${viewuserurl}')" styleClass="button">
+							<fmt:message key="lable.topic.title.mark" />
+						</html:link>
+					</td>
+				</tr>
+			</c:forEach>
+
+			<c:if test="${empty userlist}">
+				<tr>
+					<td>
+						<b><fmt:message key="message.monitoring.summary.no.users" /></b>
+					</td>
+				</tr>
+			</c:if>
+
+			<tr>
+				<td colspan="3">
+					<hr />
+				</td>
+			</tr>
+			<tr>
+				<td align="right">
+					<html:form action="/learning/viewForum.do" target="_blank">
+						<html:hidden property="mode" value="${toolAccessMode}" />
+						<html:hidden property="toolSessionID" value="${toolSessionDto.sessionID}" />
+						<html:submit property="viewForum" style="width:120px" styleClass="buttonStyle">
+							<fmt:message key="label.monitoring.summary.view.forum" />
+						</html:submit>
+					</html:form>
+				</td>
+
+				<td align="center">
+					<html:form action="/monitoring/viewAllMarks" target="_blank">
+						<html:hidden property="toolSessionID" value="${toolSessionDto.sessionID}" />
+						<html:submit property="Mark" style="width:120px"  styleClass="buttonStyle">
+							<fmt:message key="lable.topic.title.mark" />
+						</html:submit>
+					</html:form>
+				</td>
+				<td align="left">
+					<html:form action="/monitoring/downloadMarks">
+						<html:hidden property="toolSessionID" value="${toolSessionDto.sessionID}" />
+						<html:submit property="downloadMarks"  style="width:120px" styleClass="buttonStyle">
+							<fmt:message key="message.download.marks" />
+						</html:submit>
+					</html:form>
+				</td>
+
+
+			</tr>
+		</table>
+
+		<br />
+	</c:forEach>
+	<c:if test="${empty sessionUserMap}">
+		<fmt:message key="message.monitoring.summary.no.session" />
+	</c:if>
+</div>
Fisheye: Tag 6852794f79069c9b70ee194f74677323d0bf14b7 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/monitoring/tabmenu.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
===================================================================
diff -u -r907a7ec20d8251fde30699bc3b52d64ed9071ea4 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision 907a7ec20d8251fde30699bc3b52d64ed9071ea4)
+++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -1,71 +1,76 @@
-<%@ include file="/includes/taglibs.jsp" %>
-<script type="text/javascript" src="<html:rewrite page='/includes/scripts.jsp'/>"></script>
+<%@ include file="/includes/taglibs.jsp"%>
 
-<html:form action="/monitoring/updateMark"  method="post">	
-<c:set var="formBean" value="<%= session.getAttribute("markForm") %>" />
-  <b><fmt:message key="message.assign.mark"/>
-  		 <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="/monitoring/viewTopic.do?messageID=${formBean.messageDto.message.uid}&create=${formBean.messageDto.message.created.time}" />
-			</c:set> 
-			<html:link href="javascript:launchPopup('${viewtopic}')">
-				<c:out value="${formBean.messageDto.message.subject}" />
-			</html:link>
-		</td>
-		<td width="2%">
-			<c:if test="${formBean.messageDto.hasAttachment}">
-				<img src="<html:rewrite page="/images/paperclip.gif"/>">
-			</c:if>
-		</td>
-		<td>
-			<c:out value="${formBean.messageDto.author}"/>
-		</td>
-		<td>
-			<c:out value="${formBean.messageDto.message.replyNumber}"/>
-		</td>
-		<td>
-			<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">
-				 <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"><fmt:message key="lable.topic.title.mark"/>:</td>
-			            <td class="formcontrol">
-			        		<input type="text"  name="mark" value="<c:out value='${formBean.mark}'/>"/>
-			        	</td>
-			        	<td><html:errors property="report.mark" /></td>
-			    </tr>
-			    <tr>
-		    		<td class="formlabel"><fmt:message key="lable.topic.title.comment"/>:</td>
-			        <td class="formcontrol">
-			            <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="formlabel" colspan="3">
-				  	<html:errors property="report.globel"/>
-				  </td>
-			</tr>
-			<tr>
-				  <td class="formcontrol" colspan="3">
-					<input type="submit" value="<fmt:message key="lable.update.mark"/>" />
-				  </td>
-			</tr>
+<html:form action="/monitoring/updateMark" method="post">
+	<c:set var="formBean" value="<%= session.getAttribute("markForm") %>" />
+	<b><fmt:message key="message.assign.mark" /> <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="/monitoring/viewTopic.do?messageID=${formBean.messageDto.message.uid}&create=${formBean.messageDto.message.created.time}" />
+				</c:set>
+				<html:link href="javascript:launchPopup('${viewtopic}','viewtopic')">
+					<c:out value="${formBean.messageDto.message.subject}" />
+				</html:link>
+			</td>
+			<td width="2%">
+				<c:if test="${formBean.messageDto.hasAttachment}">
+					<img src="<html:rewrite page="/images/paperclip.gif"/>">
+				</c:if>
+			</td>
+			<td>
+				<c:out value="${formBean.messageDto.author}" />
+			</td>
+			<td>
+				<c:out value="${formBean.messageDto.message.replyNumber}" />
+			</td>
+			<td>
+				<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">
+		<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">
+				<fmt:message key="lable.topic.title.mark" />*
+				:
+			</td>
+			<td class="formcontrol">
+				<input type="text" name="mark" value="<c:out value='${formBean.mark}'/>" />
+			</td>
+			<td>
+				<html:errors property="report.mark" />
+			</td>
+		</tr>
+		<tr>
+			<td class="formlabel">
+				<fmt:message key="lable.topic.title.comment" />
+				:
+			</td>
+			<td class="formcontrol">
+				<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="formlabel" colspan="3">
+				<html:errors property="report.globel" />
+			</td>
+		</tr>
+		<tr>
+			<td class="formcontrol" colspan="3">
+				<input type="submit" value="<fmt:message key="lable.update.mark"/>" style="width:120px" class="buttonStyle" />
+			</td>
+		</tr>
 		</span>
-</table>
+	</table>
 </html:form>
Index: lams_tool_forum/web/jsps/monitoring/usermarklist.jsp
===================================================================
diff -u -r0cfeb3255c7e2a66440d8e49efe6cef75a13f053 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/monitoring/usermarklist.jsp	(.../usermarklist.jsp)	(revision 0cfeb3255c7e2a66440d8e49efe6cef75a13f053)
+++ lams_tool_forum/web/jsps/monitoring/usermarklist.jsp	(.../usermarklist.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -1,76 +1,87 @@
-<%@ include file="/includes/taglibs.jsp" %>
-<script type="text/javascript" src="<html:rewrite page='/includes/scripts.jsp'/>"></script>
-	
-	<b>
-		 <c:out value="${user.loginName}" /> , <c:out value="${user.firstName}" />  <c:out value="${user.lastName}" /> 	
-		 <fmt:message key="monitoring.user.post.topic"/>
-	</b>
-	</p>
-<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-		<c:forEach items="${topicList}" var="topic" >
-			<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><fmt:message key="lable.topic.title.mark"/>:</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><fmt:message key="lable.topic.title.comment"/>:</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>
+<%@ include file="/common/taglibs.jsp"%>
+
+<b> <c:out value="${user.loginName}" /> , <c:out value="${user.firstName}" /> <c:out value="${user.lastName}" /> <fmt:message key="monitoring.user.post.topic" /> </b>
+</p>
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+	<c:if test="${empty topicList}">
+		<tr>
+			<td>
+				<div align="center">
+					<b><fmt:message key="message.not.avaliable" /></b>
+				</div>
+			</td>
+		</tr>
+	</c:if>
+	<c:forEach items="${topicList}" var="topic">
+		<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}','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>
+				<fmt:message key="lable.topic.title.mark" />
+				:
+			</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>
+				<fmt:message key="lable.topic.title.comment" />
+				:
+			</td>
+			<td colspan="3">
+				<c:choose>
+					<c:when test="${empty topic.message.report.comment}">
+						<fmt:message key="message.not.avaliable" />
+					</c:when>
+					<c:otherwise>
+						<c:out value="${topic.message.report.comment}" escapeXml="false" />
+					</c:otherwise>
+				</c:choose>
+			</td>
+		</tr>
+		<tr>
 			<td colspan="2">
-			<br>
-			<html:form action="/monitoring/editMark" method="post">
-					<input type="hidden" name="messageID" value=<c:out value='${topic.message.uid}' /> >
-					<input type="hidden" name="toolSessionID" value=<c:out value='${toolSessionID}' /> >
-					<input type="hidden" name="userID" value=<c:out value='${user.uid}' /> >
-					<input type="submit" value="<fmt:message key="lable.update.mark"/>"/>
-			</html:form>
+				<br>
+				<html:form action="/monitoring/editMark" method="post">
+					<input type="hidden" name="messageID" value=<c:out value='${topic.message.uid}' />>
+					<input type="hidden" name="toolSessionID" value=<c:out value='${toolSessionID}' />>
+					<input type="hidden" name="userID" value=<c:out value='${user.uid}' />>
+					<input type="submit" value="<fmt:message key="lable.update.mark"/>" style="width:120px" class="buttonStyle" />
+				</html:form>
 			</td>
 		</tr>
-		</c:forEach>
-</table>						
+	</c:forEach>
+</table>
 
Index: lams_tool_forum/web/jsps/monitoring/viewallmarks.jsp
===================================================================
diff -u -r0cfeb3255c7e2a66440d8e49efe6cef75a13f053 -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/monitoring/viewallmarks.jsp	(.../viewallmarks.jsp)	(revision 0cfeb3255c7e2a66440d8e49efe6cef75a13f053)
+++ lams_tool_forum/web/jsps/monitoring/viewallmarks.jsp	(.../viewallmarks.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -1,29 +1,40 @@
-<%@ include file="/includes/taglibs.jsp" %>
-<script type="text/javascript" src="<html:rewrite page='/includes/scripts.jsp'/>"></script>
+<%@ include file="/includes/taglibs.jsp"%>
 
-	<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}"/>,
-				    	 <fmt:message key="monitoring.user.post.topic"/>
-				    	</td>
-				    <tr>
-			    </c:if>
+<table width="100%" border="0" cellspacing="3" cellpadding="3">
+	<c:if test="${empty report}">
+		<tr>
+			<td>
+				<div align="center">
+					<b><fmt:message key="message.not.avaliable" /></b>
+				</div>
+			</td>
+		</tr>
+	</c:if>
+	<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}" />
+								,
+								<fmt:message key="monitoring.user.post.topic" />
+							</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:set>
+					<html:link href="javascript:launchPopup('${viewtopic}','viewtopic');">
 						<c:out value="${topic.message.subject}" />
 					</html:link>
 				</td>
@@ -33,55 +44,61 @@
 					</c:if>
 				</td>
 				<td>
-					<c:out value="${topic.author}"/>
+					<c:out value="${topic.author}" />
 				</td>
 				<td>
-					<c:out value="${topic.message.replyNumber}"/>
+					<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> <fmt:message key="lable.topic.title.mark"/>:</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>
+			<tr>
+				<td>
+					<fmt:message key="lable.topic.title.mark" />
+					:
 				</td>
-			</tr>			
+				<td colspan="3">
+					<c:choose>
+						<c:when test="${empty topic.message.report.mark}">
+							<fmt:message key="message.not.avaliable" />
+						</c:when>
+						<c:otherwise>
+							<c:out value="${topic.message.report.mark}" escapeXml="false" />
+						</c:otherwise>
+					</c:choose>
+				</td>
+			</tr>
 			<tr>
-				<td><fmt:message key="lable.topic.title.comment"/>:</td>
-				<td  colspan="3">
-								<c:choose>
-									<c:when test="${empty topic.message.report.comment}">
-										<fmt:message key="message.not.avaliable"/>								
-									</c:when>
-									<c:otherwise>
-										<c:out value="${topic.message.report.comment}" escapeXml="false"/>
-									</c:otherwise>
-								</c:choose>
+				<td>
+					<fmt:message key="lable.topic.title.comment" />
+					:
 				</td>
+				<td colspan="3">
+					<c:choose>
+						<c:when test="${empty topic.message.report.comment}">
+							<fmt:message key="message.not.avaliable" />
+						</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="<fmt:message key="lable.update.mark"/>"/>
+						<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="<fmt:message key="lable.update.mark"/>" style="width:120px" class="buttonStyle" />
 					</html:form>
 				</td>
 			</tr>
 			</span>
 		</c:forEach>
 	</c:forEach>
-	</table>						
+</table>
Index: lams_tool_forum/web/jsps/monitoring/viewtopic.jsp
===================================================================
diff -u -rcaa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab -r6852794f79069c9b70ee194f74677323d0bf14b7
--- lams_tool_forum/web/jsps/monitoring/viewtopic.jsp	(.../viewtopic.jsp)	(revision caa9a3e6d7c7a51d0852c6b350f05ee2a7d3fbab)
+++ lams_tool_forum/web/jsps/monitoring/viewtopic.jsp	(.../viewtopic.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
@@ -1,8 +1,7 @@
 
-<%@ include file="/includes/taglibs.jsp" %>
-<script type="text/javascript" src="<html:rewrite page='/includes/scripts.jsp'/>"></script>
+<%@ include file="/common/taglibs.jsp"%>
 <div align="center">
-	<%@ include file="message/topicview.jsp" %>
-<br>
-<a href="javascript:window.close();">close</a>
+	<%@ include file="message/topicview.jsp"%>
+	<br>
+	<a href="javascript:window.close();" class="button">close</a>
 </div>