Index: lams_tool_chat/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e -rd8995652544c9412e237362533c95ee99c8683c1
--- lams_tool_chat/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
+++ lams_tool_chat/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision d8995652544c9412e237362533c95ee99c8683c1)
@@ -1,58 +1,58 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * HTMLEditor.tag
-  *	Author: Mitchell Seaton
-  *	Description: Creates a single instance of FCK Editor used over multiple fields.
-  * Wiki: 
-  */
- 
- %>
-<%@ tag body-content="empty" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<c:set var="lams"><lams:LAMSURL/></c:set>
+<%/****************************************************************
+			 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+			 * =============================================================
+			 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+			 * 
+			 * This program is free software; you can redistribute it and/or modify
+			 * it under the terms of the GNU General Public License version 2.0
+			 * as published by the Free Software Foundation.
+			 * 
+			 * This program is distributed in the hope that it will be useful,
+			 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+			 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+			 * GNU General Public License for more details.
+			 * 
+			 * You should have received a copy of the GNU General Public License
+			 * along with this program; if not, write to the Free Software
+			 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+			 * USA
+			 * 
+			 * http://www.gnu.org/licenses/gpl.txt
+			 * ****************************************************************
+			 */
 
-<div id="wyswygEditorScreen" style="visibility: hidden"> <!-- position: absolute; z-index: 1000; top: 16px; left: 230px; -->
-        <div id="wyswygEditor">
-            <div>
-               <FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/"
-                    imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&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&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">
-         		</FCK:editor>  
-            </div>
-            <div style="text-align: center">
-                <a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)" ><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>"/></a>
-                &nbsp;&nbsp;&nbsp;&nbsp;
-                <a href="#" onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>"/></a>
-            </div>
-        </div>
+			/**
+			 * HTMLEditor.tag
+			 *	Author: Mitchell Seaton
+			 *	Description: Creates a single instance of FCK Editor used over multiple fields.
+			 * Wiki: 
+			 */
+
+		%>
+<%@ tag body-content="empty"%>
+<%@ taglib uri="fck-editor" prefix="FCK"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<div id="wyswygEditorScreen" style="visibility: hidden">
+	<!-- position: absolute; z-index: 1000; top: 16px; left: 230px; -->
+	<!--  Testing by Anthony, please delete this comment -->
+	<div id="wyswygEditor">
+		<div>
+			<FCK:editor id="FCKeditor1" 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">
+			</FCK:editor>
+		</div>
+		<div style="text-align: center">
+			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>" /></a> &nbsp;&nbsp;&nbsp;&nbsp; <a href="#"
+				onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>" /></a>
+		</div>
+	</div>
 </div>
Index: lams_tool_chat/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e -rd8995652544c9412e237362533c95ee99c8683c1
--- lams_tool_chat/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
+++ lams_tool_chat/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision d8995652544c9412e237362533c95ee99c8683c1)
@@ -33,9 +33,11 @@
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="text" required="true" rtexprvalue="true"%>
 <%@ attribute name="small" required="false" rtexprvalue="true"%>
+<%@ attribute name="key" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-function" prefix="fn"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
 
 <c:set var="lams">
 	<lams:LAMSURL />
@@ -53,15 +55,28 @@
 	<c:set var="previewClassName" value="smallPreviewPanel" />
 	<c:set var="txtClassName" value="smallTextareaPanel" />
 </c:if>
+
 <div id="preview${id}" style="visibility: hidden; display: none;">
 	<div>
-		<a href="javascript:doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)"><img src="${lams}images/html.gif" border="0" alt="Open HTML Editor"></a>
+		<c:if test="${key != null}">
+			<fmt:message key="${key}"/>
+		</c:if>
+		<a href="javascript:doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)">
+			<img src="${lams}images/html.gif" border="0" alt="Open HTML Editor">
+		</a>
 	</div>
 	<div class="${previewClassName}" id="preview${id}.text"></div>
+
+
 </div>
 <div id="tx${id}">
 	<div>
-		<a href="javascript:doTextToHTML('${id}');doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)"><img src="${lams}images/html.gif" border="0" alt="Open HTML Editor"></a>
+		<c:if test="${key != null}">
+			<fmt:message key="${key}"/>
+		</c:if>		
+		<a href="javascript:doTextToHTML('${id}');doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)">
+			<img src="${lams}images/html.gif" border="0" alt="Open HTML Editor">
+		</a>
 	</div>
 	<textarea class="${txtClassName}" name="${fn:toLowerCase(id_a)}${id_b}" id="tx${id}.textarea"><c:out value="${text}" escapeXml="false" /></textarea>
 </div>