Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java,v
diff -u -r1.41 -r1.42
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	17 Sep 2006 06:22:30 -0000	1.41
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	29 Sep 2006 06:11:18 -0000	1.42
@@ -30,6 +30,9 @@
  * Time: 10:33:00
  */
 public interface ForumConstants {
+	public static final String TOOL_SIGNATURE = "lafrum11";
+	public static final String TOOL_CONTENT_HANDLER_NAME = "forumToolContentHandler";
+
 	
 	//See LDEV652 
 	// For old style (Fiona's description): The oldest topic is at the top, does not depends the reply date etc.
@@ -40,8 +43,6 @@
 	public static final int COMPLETED = 1;
 	public static final int SESSION_STATUS_FINISHED = 1;
 	
-	public static final String TOOL_SIGNATURE = "lafrum11";
-	
     public final static int MAX_FILE_SIZE = 250 * 1000;
     public final static String FORUM_SERVICE = "forumService";
     
@@ -110,6 +111,7 @@
 	public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions";
 
 
+
 	
 	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java,v
diff -u -r1.10 -r1.11
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java	17 Sep 2006 06:22:30 -0000	1.10
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java	29 Sep 2006 06:11:18 -0000	1.11
@@ -223,7 +223,7 @@
     private ForumToolContentHandler getToolContentHandler() {
   	    if ( handler == null ) {
     	      WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(this.getServletContext());
-    	      handler = (ForumToolContentHandler) wac.getBean("forumToolContentHandler");
+    	      handler = (ForumToolContentHandler) wac.getBean(ForumConstants.TOOL_CONTENT_HANDLER_NAME);
     	    }
     	    return handler;
 	}
Index: lams_tool_forum/web/WEB-INF/tags/FCKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/Attic/FCKEditor.tag,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/web/WEB-INF/tags/FCKEditor.tag	31 Aug 2006 07:51:15 -0000	1.1
+++ lams_tool_forum/web/WEB-INF/tags/FCKEditor.tag	29 Sep 2006 06:11:18 -0000	1.2
@@ -5,7 +5,7 @@
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
-<%@ attribute name="contentFolderID" required="true" rtexprvalue="true"%>
+<%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 
 <c:set var="language">
 	<lams:user property="localeLanguage" />
Index: lams_tool_forum/web/jsps/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/advance.jsp,v
diff -u -r1.17 -r1.18
--- lams_tool_forum/web/jsps/authoring/advance.jsp	30 Aug 2006 06:37:40 -0000	1.17
+++ lams_tool_forum/web/jsps/authoring/advance.jsp	29 Sep 2006 06:11:18 -0000	1.18
@@ -50,7 +50,7 @@
 	</tr>
 	<tr>
 		<td>
-			<lams:STRUTS-textarea property="forum.reflectInstructions" styleId="reflectInstructions" cols="30" rows="3" />
+			<html:textarea property="forum.reflectInstructions" styleId="reflectInstructions" cols="30" rows="3" />
 		</td>
 	</tr>
 	<tr>
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.25 -r1.26
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	28 Sep 2006 23:30:18 -0000	1.25
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	29 Sep 2006 06:11:18 -0000	1.26
@@ -24,16 +24,7 @@
 				<tr>
 					<td>
 						<b><bean:message key="message.label.body" />*</b><BR>
-						<c:set var="language"><lams:user property="localeLanguage"/></c:set>
-						<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" defaultLanguage="${language}" autoDetectLanguage="false">
-						</fck:editor>							
+						<lams:FCKEditor id="message.body" value="" toolbarSet="Default-Learner"></lams:FCKEditor>
 						<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.13 -r1.14
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	28 Sep 2006 23:30:18 -0000	1.13
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	29 Sep 2006 06:11:18 -0000	1.14
@@ -33,18 +33,7 @@
 					<td>
 						<b><bean:message key="message.label.body" />*</b>
 						<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>
-						<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" defaultLanguage="${language}" autoDetectLanguage="false">
-							<c:out value="${formBean.message.body}" escapeXml="false" />
-						</fck:editor>							
-						
+						<lams:FCKEditor id="message.body" value="${formBean.message.body}" toolbarSet="Default-Learner"></lams:FCKEditor>
 						<html:errors property="message.body" />
 					</td>
 				</tr>
Index: lams_tool_forum/web/jsps/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/notebook.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/web/jsps/learning/notebook.jsp	28 Sep 2006 23:30:18 -0000	1.2
+++ lams_tool_forum/web/jsps/learning/notebook.jsp	29 Sep 2006 06:11:18 -0000	1.3
@@ -19,13 +19,13 @@
 				</tr>
 				<tr>
 					<td>
-						${sessionMap.reflectInstructions}
+						<lams:out value="${sessionMap.reflectInstructions}"/>
 					</td>
 				</tr>
 	
 				<tr>
 					<td>
-						<lams:STRUTS-textarea cols="60" rows="8" property="entryText"/>
+						<html:textarea cols="60" rows="8" property="entryText"/>
 					</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.8 -r1.9
--- lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	22 Aug 2006 04:50:35 -0000	1.8
+++ lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	29 Sep 2006 06:11:18 -0000	1.9
@@ -4,19 +4,12 @@
 <c:choose>
 	<c:when test="${sessionMap.allowRichEditor}">
 		<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>
-		<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" defaultLanguage="${language}" autoDetectLanguage="false">
-			<c:out value="${formBean.message.body}" escapeXml="false"/>
-		</fck:editor>		
+		<lams:FCKEditor id="message.body"
+				value="${formBean.message.body}"
+				toolbarSet="Default-Learner"></lams:FCKEditor>
 	</c:when>
 	<c:otherwise>
+		<%-- Does not user general tag becuase this field need keep compatible with FCKEditor's content --%>
 		<lams:STRUTS-textarea rows="10" cols="40" tabindex="2" property="message.body" styleId="messageBody" />
 		<BR>
 		<fmt:message key="lable.char.left" />:  
Index: lams_tool_forum/web/jsps/monitoring/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/Attic/notebook.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/web/jsps/monitoring/notebook.jsp	30 Aug 2006 06:37:40 -0000	1.1
+++ lams_tool_forum/web/jsps/monitoring/notebook.jsp	29 Sep 2006 06:11:18 -0000	1.2
@@ -1,25 +1,17 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<table>
+	${userDTO.fullName}
+<table class="alternative-color">
 	<tr>
-		<td>
-			<h1>
-				${userDTO.fullName}
-			</h1>
-		</td>
+		<th class="first">
+			<lams:out value="${userDTO.reflectInstrctions}"/>
+		</th>
 	</tr>
 	<tr>
 		<td>
-			<h1>
-				${userDTO.reflectInstrctions}
-			</h1>
-		</td>
-	</tr>
-	<tr>
-		<td>
 			<c:choose>
 				<c:when test="${userDTO.finishReflection}">
-					<c:out value="${userDTO.reflect}" escapeXml="false"/>
+					<lams:out value="${userDTO.reflect}"/>
 				</c:when>
 				<c:otherwise>
 					<fmt:message key="message.not.avaliable" />
Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/updatemarks.jsp,v
diff -u -r1.14 -r1.15
--- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	24 Aug 2006 00:05:40 -0000	1.14
+++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	29 Sep 2006 06:11:18 -0000	1.15
@@ -58,18 +58,10 @@
 		<tr>
 			<td colspan="2">
 				<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>									
+				<lams:FCKEditor id="comment"
+					value="${formBean.comment}"
+					toolbarSet="Default-Learner"></lams:FCKEditor>
 			</td>
 		</tr>
 		<tr>
Index: lams_tool_larsrc/web/WEB-INF/tags/FCKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/Attic/FCKEditor.tag,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/web/WEB-INF/tags/FCKEditor.tag	1 Sep 2006 02:47:00 -0000	1.1
+++ lams_tool_larsrc/web/WEB-INF/tags/FCKEditor.tag	29 Sep 2006 06:11:15 -0000	1.2
@@ -5,7 +5,7 @@
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
-<%@ attribute name="contentFolderID" required="true" rtexprvalue="true"%>
+<%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 
 <c:set var="language">
 	<lams:user property="localeLanguage" />
Index: lams_tool_larsrc/web/pages/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/advance.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_larsrc/web/pages/authoring/advance.jsp	31 Aug 2006 06:39:02 -0000	1.8
+++ lams_tool_larsrc/web/pages/authoring/advance.jsp	29 Sep 2006 06:11:15 -0000	1.9
@@ -60,7 +60,7 @@
 		</tr>
 		<tr>
 			<td colspan="2">
-				<lams:STRUTS-textarea property="resource.reflectInstructions" styleId="reflectInstructions" cols="30" rows="3" />
+				<html:textarea property="resource.reflectInstructions" styleId="reflectInstructions" cols="30" rows="3" />
 			</td>
 		</tr>		
 	</table>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/addfile.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	28 Sep 2006 23:31:18 -0000	1.9
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	29 Sep 2006 06:11:15 -0000	1.10
@@ -35,7 +35,7 @@
 					<td valign="top">
 						<fmt:message key="label.learning.comment.or.instruction" />
 						<BR>
-						<lams:STRUTS-textarea rows="5" cols="25" tabindex="2" property="description" />
+						<html:textarea rows="5" cols="25" tabindex="2" property="description" />
 					</td>
 				</tr>
 				<tr>
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/addurl.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	28 Sep 2006 23:31:18 -0000	1.11
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	29 Sep 2006 06:11:15 -0000	1.12
@@ -43,7 +43,7 @@
 					<td valign="top">
 						<fmt:message key="label.learning.comment.or.instruction" />
 						<BR>
-						<lams:STRUTS-textarea rows="5" cols="25" tabindex="4" property="description" />
+						<html:textarea rows="5" cols="25" tabindex="4" property="description" />
 					</td>
 				</tr>
 				<tr>
Index: lams_tool_larsrc/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/notebook.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/web/pages/learning/notebook.jsp	28 Sep 2006 23:31:18 -0000	1.3
+++ lams_tool_larsrc/web/pages/learning/notebook.jsp	29 Sep 2006 06:11:15 -0000	1.4
@@ -28,13 +28,13 @@
 					</tr>
 					<tr>
 						<td>
-							${sessionMap.reflectInstructions}
+							<lams:out value="${sessionMap.reflectInstructions}"/>
 						</td>
 					</tr>
 		
 					<tr>
 						<td>
-							<lams:STRUTS-textarea cols="60" rows="8" property="entryText"/>
+							<html:textarea cols="60" rows="8" property="entryText"/>
 						</td>
 					</tr>
 		
Index: lams_tool_larsrc/web/pages/monitoring/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/Attic/notebook.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/web/pages/monitoring/notebook.jsp	28 Sep 2006 23:31:18 -0000	1.3
+++ lams_tool_larsrc/web/pages/monitoring/notebook.jsp	29 Sep 2006 06:11:15 -0000	1.4
@@ -8,31 +8,23 @@
 	<%@ include file="/common/header.jsp"%>
 </head>
 <body class="stripes">
-			<h1>
-				<fmt:message key="page.title.monitoring.view.reflection"/>
-			</h1>
-			
+		
 			<div id="content">
-				<table>
+				<h1>
+					<fmt:message key="page.title.monitoring.view.reflection"/>
+				</h1>
+				${userDTO.fullName}<BR><BR>
+				<table class="alternative-color">
 					<tr>
-						<td>
-							<h1>
-								${userDTO.fullName}
-							</h1>
-						</td>
+						<th class="first">
+							<lams:out value="${userDTO.reflectInstrctions}"/>
+						</th>
 					</tr>
 					<tr>
 						<td>
-							<h1>
-								${userDTO.reflectInstrctions}
-							</h1>
-						</td>
-					</tr>
-					<tr>
-						<td>
 							<c:choose>
 								<c:when test="${userDTO.finishReflection}">
-									<c:out value="${userDTO.reflect}" escapeXml="false"/>
+									<lams:out value="${userDTO.reflect}"/>
 								</c:when>
 								<c:otherwise>
 									<fmt:message key="message.not.avaliable" />
Index: lams_tool_sbmt/web/WEB-INF/tags/FCKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Attic/FCKEditor.tag,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/web/WEB-INF/tags/FCKEditor.tag	31 Aug 2006 05:48:25 -0000	1.1
+++ lams_tool_sbmt/web/WEB-INF/tags/FCKEditor.tag	29 Sep 2006 06:11:19 -0000	1.2
@@ -5,7 +5,7 @@
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
-<%@ attribute name="contentFolderID" required="true" rtexprvalue="true"%>
+<%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 
 <c:set var="language">
 	<lams:user property="localeLanguage" />
Index: lams_tool_sbmt/web/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/advance.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_sbmt/web/authoring/advance.jsp	5 Sep 2006 04:05:23 -0000	1.8
+++ lams_tool_sbmt/web/authoring/advance.jsp	29 Sep 2006 06:11:19 -0000	1.9
@@ -33,7 +33,7 @@
 	</tr>
 	<tr>
 		<td >
-			<lams:STRUTS-textarea property="reflectInstructions" styleId="reflectInstructions" cols="30" rows="3" />
+			<html:textarea property="reflectInstructions" styleId="reflectInstructions" cols="30" rows="3" />
 		</td>
 	</tr>		
 </table>
Index: lams_tool_sbmt/web/learner/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/notebook.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/web/learner/notebook.jsp	28 Sep 2006 23:32:05 -0000	1.2
+++ lams_tool_sbmt/web/learner/notebook.jsp	29 Sep 2006 06:11:19 -0000	1.3
@@ -28,13 +28,13 @@
 						</tr>
 						<tr>
 							<td>
-								${sessionMap.reflectInstructions}
+								<lams:out value="${sessionMap.reflectInstructions}"/>
 							</td>
 						</tr>
 			
 						<tr>
 							<td>
-								<lams:STRUTS-textarea cols="60" rows="8" property="entryText"/>
+								<html:textarea cols="60" rows="8" property="entryText"/>
 							</td>
 						</tr>
 			
Index: lams_tool_sbmt/web/monitoring/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/notebook.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/web/monitoring/notebook.jsp	28 Sep 2006 23:32:05 -0000	1.4
+++ lams_tool_sbmt/web/monitoring/notebook.jsp	29 Sep 2006 06:11:19 -0000	1.5
@@ -4,37 +4,28 @@
 
 <html:html locale="true">
 <head>
-	<title><fmt:message key="label.learning.title" /></title>
+	<title><fmt:message key="page.title.monitoring.view.reflection" /></title>
 	<%@ include file="/common/header.jsp"%>
 </head>
 <body class="stripes">
 
+
+			<div id="content">
 			<h1>
 				<fmt:message key="page.title.monitoring.view.reflection"/>
 			</h1>
-			
-			<div id="content">
-			<table>
+			${userDTO.firstName} ${userDTO.lastName}<br><br>
+			<table class="alternative-color">
 				<tr>
-					<td>
-						<h1>
-							${userDTO.firstName}
-							${userDTO.lastName}
-						</h1>
-					</td>
+					<th class="first">
+						<lams:out value="${userDTO.reflectInstrctions}"/>
+					</th>
 				</tr>
 				<tr>
 					<td>
-						<h1>
-							${userDTO.reflectInstrctions}
-						</h1>
-					</td>
-				</tr>
-				<tr>
-					<td>
 						<c:choose>
 							<c:when test="${userDTO.finishReflection}">
-								<c:out value="${userDTO.reflect}" escapeXml="false"/>
+								<lams:out value="${userDTO.reflect}"/>
 							</c:when>
 							<c:otherwise>
 								<fmt:message key="label.learner.notAvailable" />
Index: lams_tool_sbmt/web/monitoring/mark/updatemark.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/updatemark.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	28 Sep 2006 23:32:05 -0000	1.4
+++ lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	29 Sep 2006 06:11:19 -0000	1.5
@@ -41,18 +41,10 @@
 							</tr>
 							<tr>
 								<td colspan="2">
-									<c:set var="language"><lams:user property="localeLanguage"/></c:set>
 									<span  class="field-name"><fmt:message key="label.learner.comments" /><BR></span>
-									<FCK:editor id="comments" 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="${fileInfo.comments}" escapeXml="false"/>
-									</FCK:editor>			
+									<lams:FCKEditor id="comments"
+										value="${fileInfo.comments}"
+										toolbarSet="Default-Learner"></lams:FCKEditor>
 								</td>
 							</tr>
 							<tr>