Index: lams_tool_forum/web/common/taglibs.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/common/taglibs.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/web/common/taglibs.jsp	8 Jun 2006 07:37:32 -0000	1.1
+++ lams_tool_forum/web/common/taglibs.jsp	11 Aug 2006 02:36:53 -0000	1.2
@@ -8,5 +8,5 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-xml" prefix="x" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="fck-editor" prefix="FCK"%>
+<%@ taglib uri="fck-editor" prefix="fck"%>
 
Index: lams_tool_forum/web/includes/taglibs.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/Attic/taglibs.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_forum/web/includes/taglibs.jsp	9 Jun 2006 00:35:07 -0000	1.12
+++ lams_tool_forum/web/includes/taglibs.jsp	11 Aug 2006 02:36:53 -0000	1.13
@@ -6,5 +6,5 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="fck-editor" prefix="FCK"%>
+<%@ taglib uri="fck-editor" prefix="fck"%>
 
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/create.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	29 Jun 2006 08:36:30 -0000	1.20
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	11 Aug 2006 02:36:53 -0000	1.21
@@ -43,8 +43,15 @@
 				<tr>
 					<td>
 						<b><bean:message key="message.label.body" />*</b><BR>
-						<FCK:editor id="message.body" basePath="/lams/fckeditor/" height="150" width="600">
-						</FCK:editor>
+						<fck:editor id="message.body" 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">
+						</fck:editor>							
 						<html:errors property="message.body" />
 					</td>
 				</tr>
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/edit.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	29 Jun 2006 08:36:30 -0000	1.9
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	11 Aug 2006 02:36:53 -0000	1.10
@@ -33,9 +33,17 @@
 					<td>
 						<b><bean:message key="message.label.body" />*</b>
 						<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-						<FCK:editor id="message.body" basePath="/lams/fckeditor/" height="150" width="600">
+						<fck:editor id="message.body" 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">
 							<c:out value="${formBean.message.body}" escapeXml="false" />
-						</FCK:editor>
+						</fck:editor>							
+						
 						<html:errors property="message.body" />
 					</td>
 				</tr>
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.5 -r1.6
--- lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	2 Jul 2006 04:14:27 -0000	1.5
+++ lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	11 Aug 2006 02:36:53 -0000	1.6
@@ -4,10 +4,16 @@
 <c:choose>
 	<c:when test="${allowRichEditor}">
 		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-		
-		<lams:SetEditor id="message.body" text="${formBean.message.body}" />
-		<lams:HTMLEditor />
-		
+		<fck:editor id="message.body" 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">
+			<c:out value="${formBean.message.body}" escapeXml="false"/>
+		</fck:editor>		
 	</c:when>
 	<c:otherwise>
 		<lams:STRUTS-textarea rows="10" cols="40" tabindex="2" property="message.body" styleId="messageBody" />
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.9 -r1.10
--- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	9 Aug 2006 05:17:32 -0000	1.9
+++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	11 Aug 2006 02:36:53 -0000	1.10
@@ -1,29 +1,21 @@
 <table cellpadding="0">
 	<tr>
-		<td class="field-name">
-			<bean:message key="message.label.subject" />
-			*
-		</td>
 		<td>
+			<span  class="field-name"><bean:message key="message.label.subject" /></span><BR>
 			<html:text size="30" tabindex="1" property="message.subject" />
 			<html:errors property="message.subject" />
 		</td>
 	</tr>
 	<tr>
-		<td class="field-name">
-			<bean:message key="message.label.body" />
-			*
-		</td>
 		<td>
+			<span  class="field-name"><bean:message key="message.label.body" />*</span><BR>
 			<%@include file="bodyarea.jsp"%>
 		</td>
 	</tr>
 	<c:if test="${topic.hasAttachment || allowUpload}">
 		<tr>
-			<td class="field-name">
-				<bean:message key="message.label.attachment" />
-			</td>
 			<td>
+				<span class="field-name"><bean:message key="message.label.attachment" /></span>
 				<c:if test="${topic.hasAttachment}">
 					<c:forEach var="file" items="${topic.message.attachments}">
 						<c:set var="downloadURL">
@@ -34,7 +26,7 @@
 							<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}'/>"  class="button"> <fmt:message key="label.delete" /> </a>
 					</c:forEach>
 				</c:if>
 				<c:if test="${not topic.hasAttachment && allowUpload}">
@@ -44,9 +36,8 @@
 			</td>
 		</tr>
 	</c:if>
-	<tr>
-		<td></td>
-		<td>
+</table>
+<div class="right-buttons">
 			<html:submit styleClass="button">
 				<bean:message key="button.submit" />
 			</html:submit>
@@ -56,6 +47,4 @@
 			<html:button property="goback" onclick="javascript:location.href='${backToTopic}';" styleClass="button">
 				<bean:message key="button.cancel" />
 			</html:button>
-		</td>
-	</tr>
-</table>
+</div>
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.7 -r1.8
--- lams_tool_forum/web/jsps/learning/message/topicform.jsp	9 Aug 2006 05:17:32 -0000	1.7
+++ lams_tool_forum/web/jsps/learning/message/topicform.jsp	11 Aug 2006 02:36:53 -0000	1.8
@@ -2,31 +2,23 @@
 
 <table cellpadding="0">
 	<tr>
-		<td class="field-name">
-			<bean:message key="message.label.subject" />
-			*
-		</td>
 		<td>
+			<span  class="field-name"><bean:message key="message.label.subject" /></span><BR>		
 			<html:text size="30" tabindex="1" property="message.subject" />
 			<br>
 			<html:errors property="message.subject" />
 		</td>
 	</tr>
 	<tr>
-		<td class="field-name">
-			<bean:message key="message.label.body" />
-			*
-		</td>
 		<td>
+			<span  class="field-name"><bean:message key="message.label.body" />*</span><BR>
 			<%@include file="bodyarea.jsp"%>
 		</td>
 	</tr>
 	<c:if test="${allowUpload}">
 		<tr>
-			<td class="field-name">
-				<bean:message key="message.label.attachment" />
-			</td>
 			<td>
+				<span class="field-name"><bean:message key="message.label.attachment" /></span>
 				<html:file tabindex="3" property="attachmentFile" />
 				<html:errors property="message.attachment" />
 			</td>
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.7 -r1.8
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	9 Aug 2006 05:17:32 -0000	1.7
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	11 Aug 2006 02:36:53 -0000	1.8
@@ -1,36 +1,28 @@
 <table cellpadding="0">
 	<tr>
-		<td class="field-name">
-			<bean:message key="message.label.subject" />*
-		</td>
 		<td>
+			<span  class="field-name"><bean:message key="message.label.subject" /></span><BR>		
 			<html:text size="30" tabindex="1" property="message.subject" />
 			<html:errors property="message.subject" />
 		</td>
 	</tr>
 	<tr>
-		<td class="field-name">
-			<bean:message key="message.label.body" />*
-		</td>
 		<td>
+			<span  class="field-name"><bean:message key="message.label.body" />*</span><BR>		
 			<%@include file="bodyarea.jsp"%>
 		</td>
 	</tr>
 	<c:if test="${allowUpload}">
 		<tr>
-			<td class="field-name">
-				<b><bean:message key="message.label.attachment" /></b>
-			</td>
 			<td>
+				<span class="field-name"><bean:message key="message.label.attachment" /></span>
 				<html:file tabindex="3" property="attachmentFile" />
 				<html:errors property="message.attachment" />
 			</td>
 		</tr>
 	</c:if>
-	<tr>
-		<td></td>
-		<td>
-			
+</table>
+<div class="right-buttons">
 			<html:submit styleClass="button">
 				<bean:message key="button.submit" />
 			</html:submit>
@@ -40,6 +32,4 @@
 			<html:button property="goback" onclick="javascript:location.href='${backToTopic}';" styleClass="button">
 				<bean:message key="button.cancel" />
 			</html:button>
-		</td>
-	</tr>
-</table>
+</div>
\ No newline at end of file