Index: lams_tool_forum/web/jsps/learning/create.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/create.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_forum/web/jsps/learning/create.jsp	16 Jan 2006 00:00:49 -0000	1.5
+++ lams_tool_forum/web/jsps/learning/create.jsp	30 Jun 2006 01:47:44 -0000	1.6
@@ -1,11 +1,6 @@
-<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/includes/taglibs.jsp"%>
 
 <html:errors property="error" />
-<div align="center">
 <html:form action="/learning/createTopic.do" method="post" focus="message.subject" enctype="multipart/form-data">
-
-<fieldset>
-<%@ include file="/jsps/learning/message/topicform.jsp" %>
- </fieldset>
- </html:form>
-</div>
+	<%@ include file="/jsps/learning/message/topicform.jsp"%>
+</html:form>
Index: lams_tool_forum/web/jsps/learning/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/definelater.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/web/jsps/learning/definelater.jsp	14 Jun 2006 23:53:08 -0000	1.2
+++ lams_tool_forum/web/jsps/learning/definelater.jsp	30 Jun 2006 01:47:44 -0000	1.3
@@ -1,8 +1,6 @@
 <%@ include file="/includes/taglibs.jsp"%>
-<meta http-equiv="refresh" content="60">
-<div align="center">
-	<P>
-		<b><fmt:message key="define.later.message" /></b>
-	<P>
-		<a href="javascript:location.reload(true);" class="button"><b><fmt:message key="button.try.again" /></b></a>
-</div>
+
+<fmt:message key="define.later.message" />
+
+<a href="javascript:location.reload(true);" class="button"><b><fmt:message key="button.try.again" /></b></a>
+
Index: lams_tool_forum/web/jsps/learning/edit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/edit.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/web/jsps/learning/edit.jsp	10 Nov 2005 05:11:37 -0000	1.1
+++ lams_tool_forum/web/jsps/learning/edit.jsp	30 Jun 2006 01:47:44 -0000	1.2
@@ -1,10 +1,8 @@
-<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/includes/taglibs.jsp"%>
+
 <html:errors property="error" />
-<div align="center">
-<html:form action="/learning/updateTopic.do" focus="message.subject"
-	onsubmit="return validateMessageForm(this);"  enctype="multipart/form-data">
-	<fieldset>
-		<%@ include file="/jsps/learning/message/topiceditform.jsp" %>
-	 </fieldset>
- </html:form>
-</div>
+
+<html:form action="/learning/updateTopic.do" focus="message.subject" onsubmit="return validateMessageForm(this);" enctype="multipart/form-data">
+	<%@ include file="/jsps/learning/message/topiceditform.jsp"%>
+</html:form>
+
Index: lams_tool_forum/web/jsps/learning/reply.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/reply.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/web/jsps/learning/reply.jsp	9 Nov 2005 05:28:26 -0000	1.2
+++ lams_tool_forum/web/jsps/learning/reply.jsp	30 Jun 2006 01:47:44 -0000	1.3
@@ -1,11 +1,6 @@
-<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/includes/taglibs.jsp"%>
 
 <html:errors property="error" />
-<div align="center">
-<html:form action="/learning/replyTopic.do" focus="message.subject"
-	onsubmit="return validateMessageForm(this);"  enctype="multipart/form-data">
-<fieldset>
-<%@ include file="/jsps/learning/message/topicreplyform.jsp" %>
- </fieldset>
- </html:form>
-</div>
+<html:form action="/learning/replyTopic.do" focus="message.subject" onsubmit="return validateMessageForm(this);" enctype="multipart/form-data">
+	<%@ include file="/jsps/learning/message/topicreplyform.jsp"%>
+</html:form>
Index: lams_tool_forum/web/jsps/learning/runoffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/Attic/runoffline.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/web/jsps/learning/runoffline.jsp	13 Jun 2006 07:28:00 -0000	1.2
+++ lams_tool_forum/web/jsps/learning/runoffline.jsp	30 Jun 2006 01:47:44 -0000	1.3
@@ -1,13 +1,12 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
-<div align="center">
-	<h2><fmt:message key="run.offline.message" /></h2>
-	<p>
-	<c:set var="finish">
-		<html:rewrite page="/learning/finish.do?toolSessionID=${param.toolSessionID}" />
-	</c:set>
-	
-	<html:button property="finish" onclick="javascript:location.href='${finish}';" disabled="${finishedLock}" style="width:120px" styleClass="buttonStyle">
-		<fmt:message key="label.finish" />
-	</html:button>
-</div>
+<h1>
+	<fmt:message key="run.offline.message" />
+</h1>
+<c:set var="finish">
+	<html:rewrite page="/learning/finish.do?toolSessionID=${param.toolSessionID}" />
+</c:set>
+
+<html:button property="finish" onclick="javascript:location.href='${finish}';" disabled="${finishedLock}" style="width:120px" styleClass="buttonStyle">
+	<fmt:message key="label.finish" />
+</html:button>
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/viewforum.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	15 Jun 2006 04:04:37 -0000	1.6
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	30 Jun 2006 01:47:44 -0000	1.7
@@ -1,12 +1,17 @@
 <%@ include file="/includes/taglibs.jsp"%>
 <c:set var="mode" value="${sessionScope.mode}" />
-<h1><c:out value="${title}" escapeXml="false"/></h1>
-<h2><c:out value="${instruction}" escapeXml="false"/></h2>
-<BR>
-<div align="center">
-	<%@ include file="/jsps/learning/message/topiclist.jsp"%>
 
-	<br>
+<h1>
+	<c:out value="${title}" escapeXml="false" />
+</h1>
+<p>
+	<c:out value="${instruction}" escapeXml="false" />
+</p>
+
+
+<%@ include file="/jsps/learning/message/topiclist.jsp"%>
+
+<p>
 	<c:set var="newtopic">
 		<html:rewrite page="/learning/newTopic.do" />
 	</c:set>
@@ -30,4 +35,4 @@
 		</html:button>
 	</c:if>
 
-</div>
+</p>
Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/viewtopic.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_forum/web/jsps/learning/viewtopic.jsp	9 Jun 2006 06:16:38 -0000	1.4
+++ lams_tool_forum/web/jsps/learning/viewtopic.jsp	30 Jun 2006 01:47:44 -0000	1.5
@@ -1,12 +1,12 @@
 <%@ include file="/common/taglibs.jsp"%>
 
+<p>
+	<c:set var="backToForum">
+		<html:rewrite page="/learning/viewForum.do?toolSessionID=${sessionScope.toolSessionID}" />
+	</c:set>
+	<html:button property="backToForum" onclick="javascript:location.href='${backToForum}';" styleClass="buttonStyle">
+		<fmt:message key="label.back.to.forum" />
+	</html:button>
+</p>
 
-<c:set var="backToForum">
-	<html:rewrite page="/learning/viewForum.do?toolSessionID=${sessionScope.toolSessionID}" />
-</c:set>
-<html:button property="backToForum" onclick="javascript:location.href='${backToForum}';" styleClass="buttonStyle">
-	<fmt:message key="label.back.to.forum" />
-</html:button>
-<P>
-
 <%@ include file="/jsps/learning/message/topicview.jsp"%>
Index: lams_tool_forum/web/jsps/learning/message/bodyarea.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/bodyarea.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	9 Jun 2006 06:16:39 -0000	1.3
+++ lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	30 Jun 2006 01:47:44 -0000	1.4
@@ -1,10 +1,13 @@
+<%@ include file="/includes/taglibs.jsp"%>
 
+<div>
 <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>
+		
+		<lams:SetEditor id="message.body" text="${formBean.message.body}" />
+		<lams:HTMLEditor />
+		
 	</c:when>
 	<c:otherwise>
 		<lams:STRUTS-textarea rows="10" cols="60" tabindex="2" property="message.body" styleId="messageBody" />
@@ -41,3 +44,5 @@
 </c:choose>
 <BR>
 <html:errors property="message.body" />
+
+<div>
Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topiceditform.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	9 Jun 2006 06:16:39 -0000	1.6
+++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	30 Jun 2006 01:47:44 -0000	1.7
@@ -1,26 +1,27 @@
-<table width="90%" cellspacing="8" align="CENTER">
+<table cellpadding="0">
 	<tr>
-		<td valign="MIDDLE">
-			<b><bean:message key="message.label.subject" /><b class="required">*</b></b>
+		<td class="field-name">
+			<bean:message key="message.label.subject" />*
 		</td>
-		<td valign="MIDDLE" align="left">
-			<html:text size="30" tabindex="1" property="message.subject" /><br>
+		<td>
+			<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><b class="required">*</b>
+		<td class="field-name">
+			<bean:message key="message.label.body" />*
 		</td>
-		<td valign="MIDDLE" align="left">
+		<td>
 			<%@include file="bodyarea.jsp"%>
 		</td>
 	</tr>
+	
 	<tr>
-		<td>
-			<b><bean:message key="message.label.attachment" /></b>
+		<td class="field-name">
+			<bean:message key="message.label.attachment" />
 		</td>
-		<td valign="MIDDLE" align="left">
+		<td>
 			<c:if test="${topic.hasAttachment}">
 				<c:forEach var="file" items="${topic.message.attachments}">
 					<c:set var="downloadURL">
@@ -42,8 +43,7 @@
 	</tr>
 	<tr>
 		<td></td>
-		<td align="left">
-			<BR>
+		<td>
 			<html:submit styleClass="buttonStyle" style="width:120px">
 				<bean:message key="button.submit" />
 			</html:submit>
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicform.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_forum/web/jsps/learning/message/topicform.jsp	9 Jun 2006 06:16:39 -0000	1.4
+++ lams_tool_forum/web/jsps/learning/message/topicform.jsp	30 Jun 2006 01:47:44 -0000	1.5
@@ -1,35 +1,37 @@
-
 <c_rt:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-<table width="90%" cellspacing="8" border="0" align="CENTER">
+
+<table cellpadding="0">
 	<tr>
-		<td valign="MIDDLE">
-			<b><bean:message key="message.label.subject" /><b class="required">*</b></b>
+		<td class="field-name">
+			<bean:message key="message.label.subject" />
+			*
 		</td>
-		<td valign="MIDDLE" align="left">
+		<td>
 			<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 class="required">*</b></b>
+		<td class="field-name">
+			<bean:message key="message.label.body" />
+			*
 		</td>
-		<td valign="TOP" align="left">
+		<td>
 			<%@include file="bodyarea.jsp"%>
 		</td>
 	</tr>
 	<tr>
-		<td valign="MIDDLE">
-			<b><bean:message key="message.label.attachment" /></b>
+		<td class="field-name">
+			<bean:message key="message.label.attachment" />
 		</td>
-		<td valign="MIDDLE" align="left">
+		<td>
 			<html:file tabindex="3" property="attachmentFile" />
 			<html:errors property="message.attachment" />
 		</td>
 	</tr>
 	<tr>
-		<td></td>
+		<td>&nbsp;</td>
 		<td align="left">
 			<BR>
 			<html:submit styleClass="buttonStyle" style="width:120px">
Index: lams_tool_forum/web/jsps/learning/message/topiclist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topiclist.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_forum/web/jsps/learning/message/topiclist.jsp	15 Jun 2006 04:04:37 -0000	1.4
+++ lams_tool_forum/web/jsps/learning/message/topiclist.jsp	30 Jun 2006 01:47:44 -0000	1.5
@@ -1,42 +1,44 @@
 
-<div align="center">
-<div id="topiclist">
-	<div id="datatablecontainer">
-	<table width="100%" align="CENTER" 	class="form">
+<table cellpadding="0" class="alternative-color">
+	<tbody>
 		<tr>
-			<th scope="col" width="50%" colspan="2"><fmt:message key="lable.topic.title.subject"/></th>
-			<th scope="col" width="15%"><fmt:message key="lable.topic.title.startedby"/></th>
-			<th scope="col" width="10%"><fmt:message key="lable.topic.title.replies"/></th>
-			<th scope="col" width="25%"><fmt:message key="lable.topic.title.update"/></th>
+			<th width="250">
+				<fmt:message key="lable.topic.title.subject" />
+			</th>
+			<th width="90">
+				<fmt:message key="lable.topic.title.startedby" />
+			</th>
+			<th width="70">
+				<fmt:message key="lable.topic.title.replies" />
+			</th>
+			<th>
+				<fmt:message key="lable.topic.title.update" />
+			</th>
 		</tr>
-		<c:forEach items="${topicList}" var="topic" >
+		<c:forEach items="${topicList}" var="topic">
 			<tr>
-				<td valign="MIDDLE" width="48%" align="left">
+				<td class="first">
 					<c:set var="viewtopic">
 						<html:rewrite page="/learning/viewTopic.do?topicId=${topic.message.uid}&create=${topic.message.created.time}" />
-					</c:set> 
+					</c:set>
 					<html:link href="${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 class="first">
+					<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>
 		</c:forEach>
-	</table>
-	</div>
-</div>
-</div>
+	</tbody>
+</table>
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	9 Jun 2006 06:16:39 -0000	1.4
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	30 Jun 2006 01:47:44 -0000	1.5
@@ -1,34 +1,34 @@
-<table width="80%" cellspacing="8" align="CENTER" class="forms">
+<table cellpadding="0">
 	<tr>
-		<td valign="MIDDLE">
-			<b><bean:message key="message.label.subject" /></b><b class="required">*</b>
+		<td class="field-name">
+			<bean:message key="message.label.subject" />*
 		</td>
-		<td valign="MIDDLE" align="left">
+		<td>
 			<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><b class="required">*</b>
+		<td class="field-name">
+			<bean:message key="message.label.body" />*
 		</td>
-		<td valign="TOP" align="left">
+		<td>
 			<%@include file="bodyarea.jsp"%>
 		</td>
 	</tr>
 	<tr>
-		<td valign="MIDDLE">
+		<td class="field-name">
 			<b><bean:message key="message.label.attachment" /></b>
 		</td>
-		<td valign="MIDDLE" align="left">
+		<td>
 			<html:file tabindex="3" property="attachmentFile" />
 			<html:errors property="message.attachment" />
 		</td>
 	</tr>
 	<tr>
 		<td></td>
-		<td align="left">
-			<BR>
+		<td>
+			
 			<html:submit styleClass="buttonStyle" style="width:120px">
 				<bean:message key="button.submit" />
 			</html:submit>
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicview.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	9 Jun 2006 06:16:39 -0000	1.8
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	30 Jun 2006 01:47:44 -0000	1.9
@@ -1,110 +1,108 @@
-<div id="topicview">
-	<c:set var="mode" value="${sessionScope.mode}" />
-	<c:forEach var="msgDto" items="${topicThread}">
-		<div id="datatablecontainer">
-			<c:set var="indentSize" value="${msgDto.level*3}" />
-			<c:set var="hidden" value="${msgDto.message.hideFlag}" />
-			<div style="margin-left:<c:out value="${indentSize}"/>em;">
-				<table class="form" border="0" cellspacing="0">
-					<tr>
-						<th valign="middle" scope="col">
-							<c:choose>
-								<c:when test='${(mode == "teacher") || (not hidden)}'>
-									<b> <c:out value="${msgDto.message.subject}" /> </b>
-								</c:when>
-								<c:otherwise>
-									<fmt:message key="topic.message.subject.hidden" />
-								</c:otherwise>
-							</c:choose>
-						</th>
-					</tr>
-					<tr>
-						<th scope="col">
-							<c:if test='${(mode == "teacher") || (not hidden)}'>
-								<fmt:message key="lable.topic.subject.by" />
-								<c:out value="${msgDto.author}" />
+<c:set var="mode" value="${sessionScope.mode}" />
+<c:forEach var="msgDto" items="${topicThread}">
+	<c:set var="indentSize" value="${msgDto.level*3}" />
+	<c:set var="hidden" value="${msgDto.message.hideFlag}" />
+	<div style="margin-left:<c:out value="${indentSize}"/>em;">
+		<table cellspacing="0" class="forum">
+			<tr>
+				<th class="first">
+					<c:choose>
+						<c:when test='${(mode == "teacher") || (not hidden)}'>
+							<b> <c:out value="${msgDto.message.subject}" /> </b>
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="topic.message.subject.hidden" />
+						</c:otherwise>
+					</c:choose>
+				</th>
+			</tr>
+			<tr>
+				<td class="first posted-by">
+					<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>
-						<td>
-							<br>
-							<c:if test='${(not hidden) || (hidden && mode == "teacher")}'>
-								<c:out value="${msgDto.message.body}" escapeXml="false" />
-							</c:if>
-							<c:if test='${hidden}'>
-								<br />
-								<b> <fmt:message key="topic.message.body.hidden" /> </b>
-							</c:if>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<br />
-							<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>
-					<tr>
-						<td align="right">
-							<br />
-							<!--  Hide/Unhide Button -->
-							<c:if test='${mode == "teacher"}'>
-								<!--  call the hide action -->
-								<c:choose>
-									<c:when test="${hidden}">
-										<!--  display a show link  -->
-										<c:set var="hidetopic">
-											<html:rewrite page="/learning/updateMessageHideFlag.do?msgId=${msgDto.message.uid}&hideFlag=false" />
-										</c:set>
-										<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}" styleClass="button">
-											<b> <fmt:message key="label.hide" /> </b>
-										</html:link>
-									</c:otherwise>
-								</c:choose>
-							</c:if>
+						<fmt:formatDate value="${msgDto.message.created}" type="date" dateStyle="full" />
+					</c:if>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<c:if test='${(not hidden) || (hidden && mode == "teacher")}'>
+						<c:out value="${msgDto.message.body}" escapeXml="false" />
+					</c:if>
+					<c:if test='${hidden}'>
+						<fmt:message key="topic.message.body.hidden" />
+					</c:if>
+				</td>
+			</tr>
 
-							<!--  Edit Button -->
-							<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" />
-									</html:link>
-								</c:if>
-							</c:if>
+			<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>
 
-							<!--  Reply Button -->
-							<c:if test="${not finishedLock}">
-								<c:set var="replytopic">
-									<html:rewrite page="/learning/newReplyTopic.do?parentId=${msgDto.message.uid}&rootUid=${rootUid}" />
+			<tr>
+				<td align="right">
+					<br />
+					<!--  Hide/Unhide Button -->
+					<c:if test='${mode == "teacher"}'>
+						<!--  call the hide action -->
+						<c:choose>
+							<c:when test="${hidden}">
+								<!--  display a show link  -->
+								<c:set var="hidetopic">
+									<html:rewrite page="/learning/updateMessageHideFlag.do?msgId=${msgDto.message.uid}&hideFlag=false" />
 								</c:set>
-								<html:link href="${replytopic}"  styleClass="button">
-									<fmt:message key="label.reply" />
+								<html:link href="${hidetopic}" styleClass="button">
+									<b> <fmt:message key="label.show" /> </b>
 								</html:link>
-							</c:if>
-						</td>
-					</tr>
-				</table>
-			</div>
-		</div>
-	</c:forEach>
-</div>
+							</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}" styleClass="button">
+									<b> <fmt:message key="label.hide" /> </b>
+								</html:link>
+							</c:otherwise>
+						</c:choose>
+					</c:if>
+
+					<!--  Edit Button -->
+					<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" />
+							</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}&rootUid=${rootUid}" />
+						</c:set>
+						<html:link href="${replytopic}" styleClass="button">
+							<fmt:message key="label.reply" />
+						</html:link>
+					</c:if>
+				</td>
+			</tr>
+		</table>
+	</div>
+</c:forEach>
+