Index: lams_central/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -rfa24e6729d808ea99968a62a54c5b977e17b807c -r5894fab28c33727f24d8b662caed5f5faac8a589
--- lams_central/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision fa24e6729d808ea99968a62a54c5b977e17b807c)
+++ lams_central/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 5894fab28c33727f24d8b662caed5f5faac8a589)
@@ -31,7 +31,7 @@
 		%>
 <%@ tag body-content="empty"%>
 <%@ taglib uri="fck-editor" prefix="FCK"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <c:set var="lams">
@@ -43,16 +43,14 @@
 	<!--  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 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>
+			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<fmt:message key="label.save"/>" /></a>
+			<a href="#" onClick="doPreview(activeEditorIndex)"><img	src="${lams}images/cross.gif" border="0" alt="<fmt:message key="label.cancel"/>" /></a>
 		</div>
 	</div>
 </div>
Index: lams_tool_nb/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -r0a9205737ad38f2cde57c92fbee07f8d895aaf44 -r5894fab28c33727f24d8b662caed5f5faac8a589
--- lams_tool_nb/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44)
+++ lams_tool_nb/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 5894fab28c33727f24d8b662caed5f5faac8a589)
@@ -31,7 +31,7 @@
 		%>
 <%@ tag body-content="empty"%>
 <%@ taglib uri="fck-editor" prefix="FCK"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <c:set var="lams">
@@ -43,16 +43,14 @@
 	<!--  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 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>
+			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<fmt:message key="label.save"/>" /></a>
+			<a href="#" onClick="doPreview(activeEditorIndex)"><img	src="${lams}images/cross.gif" border="0" alt="<fmt:message key="label.cancel"/>" /></a>
 		</div>
 	</div>
 </div>