Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r5e9e3b9c895e932ff86edb7a64cf4b81f59f766c -r782adea1cca29c0a511e5ba358bfefb9a1dcc2c2
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 5e9e3b9c895e932ff86edb7a64cf4b81f59f766c)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2)
@@ -287,6 +287,11 @@
 			parameter="viewTopic">
 			<forward name="success" path="tiles:/monitoring/forum/viewTopic" />
 		</action>
+		<action path="/monitoring/viewTopicTree"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			parameter="viewTopicTree">
+			<forward name="success" path="tiles:/monitoring/forum/viewTopicTree" />
+		</action>
 
 		<!-- ========== END: Monitoring  Definitions ============================== -->
 		<!-- System level actions -->
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
diff -u -r07bc909cfe122031c6236b32088858d4cd295fe9 -r782adea1cca29c0a511e5ba358bfefb9a1dcc2c2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 07bc909cfe122031c6236b32088858d4cd295fe9)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2)
@@ -142,6 +142,9 @@
 		if (param.equals("viewTopic")) {
 			return viewTopic(mapping, form, request, response);
 		}
+		if (param.equals("viewTopicTree")) {
+			return viewTopicTree(mapping, form, request, response);
+		}
 		return mapping.findForward("error");
 	}
 	
@@ -623,6 +626,27 @@
 	}
 
 	/**
+	 * View all messages under one topic.
+	 * 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward viewTopicTree(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) {
+
+		Long rootTopicId = WebUtil.readLongParam(request, ForumConstants.ATTR_TOPIC_ID);
+		forumService = getForumService();
+		// get root topic list
+		List<MessageDTO> msgDtoList = forumService.getTopicThread(rootTopicId);
+		request.setAttribute(ForumConstants.AUTHORING_TOPIC_THREAD, msgDtoList);
+		
+		return mapping.findForward("success");
+	}
+
+	/**
 	 * View topic subject, content and attachement.
 	 * 
 	 * @param mapping
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r5e9e3b9c895e932ff86edb7a64cf4b81f59f766c -r782adea1cca29c0a511e5ba358bfefb9a1dcc2c2
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 5e9e3b9c895e932ff86edb7a64cf4b81f59f766c)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2)
@@ -312,6 +312,11 @@
 			parameter="viewTopic">
 			<forward name="success" path="tiles:/monitoring/forum/viewTopic" />
 		</action>
+		<action path="/monitoring/viewTopicTree"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			parameter="viewTopicTree">
+			<forward name="success" path="tiles:/monitoring/forum/viewTopicTree" />
+		</action>
 
 		<!-- ========== END: Monitoring  Definitions ============================== -->
 		<!-- System level actions -->
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -rbd383652fb10a2e82b00cbcc2ed08ac02183b1d3 -r782adea1cca29c0a511e5ba358bfefb9a1dcc2c2
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision bd383652fb10a2e82b00cbcc2ed08ac02183b1d3)
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2)
@@ -119,8 +119,12 @@
 	</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"/>
+    	<put name="body" value="/jsps/monitoring/message/viewtopic.jsp"/>
 	</definition>
+	<definition name="tiles:/monitoring/forum/viewTopicTree" extends="tiles:layout">
+    	<put name="pageTitleKey" value="page.title.monitoring.view.topic"/>
+    	<put name="body" value="/jsps/monitoring/message/viewtopictree.jsp"/>
+	</definition>
 	
 	<!-- E: Monitoring -->
 	
Index: lams_tool_forum/web/jsps/authoring/message/topiclist.jsp
===================================================================
diff -u -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2 -r782adea1cca29c0a511e5ba358bfefb9a1dcc2c2
--- lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
+++ lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2)
@@ -1,4 +1,7 @@
 <%@ include file="/common/taglibs.jsp" %>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
 <div id="topiclist">
 	<table class="alternative-color">
 		<tr>
Fisheye: Tag 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/monitoring/message/topicview.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/monitoring/message/viewtopic.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/monitoring/message/viewtopic.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/monitoring/message/viewtopic.jsp	(revision 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2)
@@ -0,0 +1,49 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<table class="forum" cellspacing="0">
+	<tbody>
+		<tr>
+			<th class="first" scope="col">
+				<c:out value="${topic.message.subject}" />
+			</th>
+
+		</tr>
+
+		<tr>
+			<td class="first posted-by">
+				<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" />
+
+			</td>
+		</tr>
+		<tr>
+			<td class="first">
+				<c:out value="${topic.message.body}" escapeXml="false" />
+			</td>
+		</tr>
+		<tr>
+			<td align="right">
+				<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>
+	</tbody>
+</table>
+
+
+<table cellpadding="0">
+	<tr>
+		<td>
+			<a href="javascript:window.close();" class="button"><fmt:message key="button.close"/></a>
+		</td>
+	</tr>
+</table>
+
+
Index: lams_tool_forum/web/jsps/monitoring/message/viewtopictree.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/monitoring/message/viewtopictree.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/monitoring/message/viewtopictree.jsp	(revision 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2)
@@ -0,0 +1,73 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+
+<c:forEach var="msgDto" items="${topicThread}">
+	<c:set var="indentSize" value="${msgDto.level*3}" />
+	<div style="margin-left:<c:out value="${indentSize}"/>em;">
+		<table cellspacing="0" class="forum">
+			<tr>
+				<th class="first">
+					<b> <c:out value="${msgDto.message.subject}" /> </b>
+				</th>
+			</tr>
+			<tr>
+				<td class="first posted-by">
+					<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" />
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<c:out value="${msgDto.message.body}" escapeXml="false" />
+				</td>
+			</tr>
+
+			<c:if test="${not empty msgDto.message.attachments}">
+				<tr>
+					<td>
+						<c:forEach var="file" items="${msgDto.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>
+			</c:if>
+			<c:if test="${not empty msgDto.mark}">
+				<tr>
+					<td>
+						<span class="field-name" ><fmt:message key="lable.topic.title.mark"/></span>
+						<BR>
+							${msgDto.mark}
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<span class="field-name" ><fmt:message key="lable.topic.title.comment"/></span>
+						<BR>
+						<c:choose>
+							<c:when test="${empty msgDto.comment}">
+								<fmt:message key="message.not.avaliable"/>
+							</c:when>
+							<c:otherwise>
+								<c:out value="${msgDto.comment}" escapeXml="false" />
+							</c:otherwise>
+						</c:choose>
+					</td>
+				</tr>
+			</c:if>
+		</table>
+	</div>
+</c:forEach>
+
+<table cellpadding="0">
+	<tr>
+		<td>
+			<a href="javascript:window.close();" class="button"><fmt:message key="button.close"/></a>
+		</td>
+	</tr>
+</table>
Index: lams_tool_forum/web/jsps/monitoring/statisticpart.jsp
===================================================================
diff -u -r139523bb20c86ecde4601e198801a737d96d7556 -r782adea1cca29c0a511e5ba358bfefb9a1dcc2c2
--- lams_tool_forum/web/jsps/monitoring/statisticpart.jsp	(.../statisticpart.jsp)	(revision 139523bb20c86ecde4601e198801a737d96d7556)
+++ lams_tool_forum/web/jsps/monitoring/statisticpart.jsp	(.../statisticpart.jsp)	(revision 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2)
@@ -40,7 +40,7 @@
 						<tr>
 							<td valign="MIDDLE" width="48%">
 								<c:set var="viewtopic">
-									<html:rewrite page="/monitoring/viewTopic.do?messageID=${topic.message.uid}&amp;create=${topic.message.created.time}" />
+									<html:rewrite page="/monitoring/viewTopicTree.do?topicID=${topic.message.uid}&create=${topic.message.created.time}" />
 								</c:set>
 								<html:link href="javascript:launchPopup('${viewtopic}');">
 									<c:out value="${topic.message.subject}" />
Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
===================================================================
diff -u -rbd383652fb10a2e82b00cbcc2ed08ac02183b1d3 -r782adea1cca29c0a511e5ba358bfefb9a1dcc2c2
--- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision bd383652fb10a2e82b00cbcc2ed08ac02183b1d3)
+++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2)
@@ -49,7 +49,7 @@
 				<%@ include file="/common/messages.jsp"%>
 			</td>
 		<tr>
-			<td class="field-name" width="100" >
+			<td class="field-name" width="100" style="text-align: left;">
 				<fmt:message key="lable.topic.title.mark" />* 
 			</td>
 			<td>
@@ -58,8 +58,19 @@
 		</tr>
 		<tr>
 			<td colspan="2">
-				<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />					
-				<lams:SetEditor id="comment" small="true" text="${formBean.comment}" key="lable.topic.title.comment" />
+				<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />		
+				<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+				<span  class="field-name"><fmt:message key="lable.topic.title.comment" /><BR></span>
+				<fck:editor id="comment" basePath="/lams/fckeditor/"
+							imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
+							linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
+							flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
+							imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
+							linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
+							flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash"
+							toolbarSet="Default-Learner" defaultLanguage="${language}" autoDetectLanguage="false">
+							<c:out value="${formBean.comment}" escapeXml="false"/>
+				</fck:editor>									
 			</td>
 		</tr>
 		<tr>
@@ -71,5 +82,3 @@
 		</tr>
 	</table>
 </html:form>
-
-<lams:HTMLEditor />
Fisheye: Tag 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/monitoring/viewtopic.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?