Index: lams_tool_chat/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u -red16d5f8991580c9160628f30a49e947a0b154bb -r7f3d6ad9d7eed4d6dcff775408af478af964fddd
--- lams_tool_chat/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision ed16d5f8991580c9160628f30a49e947a0b154bb)
+++ lams_tool_chat/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 7f3d6ad9d7eed4d6dcff775408af478af964fddd)
@@ -14,6 +14,7 @@
 		<attribute>
 			<name>id</name>
 			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
   		</attribute>
 		<attribute>
 			<name>basePath</name>
Index: lams_tool_chat/web/WEB-INF/lams.tld
===================================================================
diff -u -r6b48d7643dda77bdad77a24c3af3f0b3d9cec1c2 -r7f3d6ad9d7eed4d6dcff775408af478af964fddd
--- lams_tool_chat/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 6b48d7643dda77bdad77a24c3af3f0b3d9cec1c2)
+++ lams_tool_chat/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 7f3d6ad9d7eed4d6dcff775408af478af964fddd)
@@ -287,14 +287,10 @@
        <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>HTMLEditor</name>
-       <path>/WEB-INF/tags/HTMLEditor.tag</path>
+       <name>FCKEditor</name>
+       <path>/WEB-INF/tags/FCKEditor.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>SetEditor</name>
-       <path>/WEB-INF/tags/SetEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   	
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r97964dcb4328d4b3dce27306a1793506c19413c9 -r7f3d6ad9d7eed4d6dcff775408af478af964fddd
--- lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 97964dcb4328d4b3dce27306a1793506c19413c9)
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7f3d6ad9d7eed4d6dcff775408af478af964fddd)
@@ -37,6 +37,7 @@
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolContentID" required="true" rtexprvalue="true" %>
+<%@ attribute name="contentFolderID" required="true" rtexprvalue="true" %>
 <%@ attribute name="clearSessionActionUrl" required="true" rtexprvalue="true" %>
 
 <%-- Optional attribute --%>
@@ -64,7 +65,7 @@
 <!-- begin tab content -->
 <script type="text/javascript">
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-       	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}'/>";
+       	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
 	}
     function doSubmit_Form_Only() {
     	document.getElementById("${formID}").submit();
@@ -81,7 +82,7 @@
 		}
     }  				
 </script>				
-<p align="right">
+<p style="text-align: right">
 	<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button">
 		<fmt:message key="${saveButtonLabelKey}" /> 
 	</html:link>
Index: lams_tool_chat/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/FCKEditor.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/FCKEditor.tag	(revision 7f3d6ad9d7eed4d6dcff775408af478af964fddd)
@@ -0,0 +1,57 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="fck-editor" prefix="fck"%>
+
+<%@ 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"%>
+
+<c:set var="language">
+	<lams:user property="localeLanguage" />
+</c:set>
+
+<c:if test="${empty toolbarSet}">
+	<c:set var="toolbarSet" value="Default" />
+</c:if>
+
+<c:set var="basePath" value="/lams/fckeditor/" />
+
+<!-- 
+<script type="text/javascript">
+	var oFCKeditor=new FCKeditor('${id}');
+	oFCKeditor.BasePath= "${basePath}";
+	oFCKeditor.ToolbarSet= "${toolbarSet}";
+	oFCKeditor.Value= '${value}';
+
+	oFCKeditor.Config["ImageBrowserURL"]= "${basePath}editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector&amp;CurrentFolder=/${contentFolderID}/";
+	oFCKeditor.Config["LinkBrowserURL"]=  "${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&amp;CurrentFolder=/${contentFolderID}/";
+	oFCKeditor.Config["FlashBrowserURL"]= "${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector&amp;CurrentFolder=/${contentFolderID}/";
+	oFCKeditor.Config["ImageUploadURL"]=  "${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/";
+	oFCKeditor.Config["LinkUploadURL"]=   "${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/";
+	oFCKeditor.Config["FlashUploadURL"]=  "${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/";
+
+	oFCKeditor.Config["AutoDetectLanguage"]= false ;
+	oFCKeditor.Config["DefaultLanguage"]= "${language}" ;
+
+	oFCKeditor.Create();
+</script>
+-->
+
+<fck:editor id="${id}"
+	basePath="${basePath}"
+	toolbarSet="${toolbarSet}"
+	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	autoDetectLanguage="false"
+	defaultLanguage="${language}">
+		${value}
+</fck:editor>
+
+
+
+
Fisheye: Tag 7f3d6ad9d7eed4d6dcff775408af478af964fddd refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/tags/HTMLEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7f3d6ad9d7eed4d6dcff775408af478af964fddd refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/tags/SetEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_chat/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e -r7f3d6ad9d7eed4d6dcff775408af478af964fddd
--- lams_tool_chat/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
+++ lams_tool_chat/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 7f3d6ad9d7eed4d6dcff775408af478af964fddd)
@@ -1,34 +1,35 @@
-<%/****************************************************************
-			 * 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
-			 * ****************************************************************
-			 */
 
-			/**
-			 * Tab.tag
-			 *	Author: Mitchell Seaton
-			 *	Description: Creates a tab element.
-			 * Wiki: 
-			 */
+<%
+	 /****************************************************************
+	 * 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
+	 * ****************************************************************
+	 */
 
-			%>
+	/**
+	 * Tab.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates a tab element.
+	 * Wiki: 
+	 */
+%>
 <%@ tag body-content="empty"%>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="false" rtexprvalue="true"%>
@@ -37,18 +38,17 @@
 <%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <c:set var="lams">
 	<lams:LAMSURL />
 </c:set>
 <c:set var="tabTitle" value="${value}" />
-<c:set var="tableftFile" value="aqua_tab_left.gif" />
-<c:set var="tabrightFile" value="aqua_tab_right.gif" />
-<c:set var="tabcentreClass" value="tab tabcentre" />
 
-<%// Usually methodCall is selectTab, but the calling code can override methodCall if desired.
-			// this is handy if the page needs different logic on initialisation and user switching tabs %>
+<%
+	// Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+	// this is handy if the page needs different logic on initialisation and user switching tabs
+%>
 <c:if test="${methodCall == null}">
 	<c:choose>
 		<c:when test="${dControl}">
@@ -62,38 +62,19 @@
 
 <c:if test="${key != null && value == null}">
 	<c:set var="tabTitle">
-		<bean:message name="key" scope="page" />
+		<fmt:message key="${key}"/>
 	</c:set>
 </c:if>
 
 <c:if test="${inactive}">
-	<c:set var="tableftFile" value="aqua_tab_i_left.gif" />
-	<c:set var="tabrightFile" value="aqua_tab_i_right.gif" />
-	<c:set var="tabcentreClass" value="tab tabcentre_inactive" />
+	<%-- TODO need to reimplement inactive tabs --%>
 </c:if>
 
-<!-- 
-<td>
-	<table border="0" cellspacing="0" cellpadding="0" width="120" summary="This table is being used for layout purposes only">
-		<tr>
-			<td width="8">
-				<a href="#" onClick="${methodCall}(${id});return false;"><img src="${lams}images/${tableftFile}" name="tableft_${id}" width="8" height="22" border="0" id="tableft_${id}" /></a>
-			</td>
-			<td class="${tabcentreClass}" id="tab${id}" nowrap="nowrap">
-				<a href="#" onClick="${methodCall}(${id});return false;" id="${id}">${tabTitle}</a>
-			</td>
-			<td width="8">
-				<a href="#" onClick="${methodCall}(${id});return false;"><img src="${lams}images/${tabrightFile}" name="tabright_${id}" width="8" height="22" border="0" id="tabright_${id}" /></a>
-			</td>
-		</tr>
-	</table>
-</td>
--->
-
 <div class="nav-box">
 	<div class="tab-left" id="tab-left-${id}"></div>
 	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
+			onclick="${methodCall}(${id});return false;">${tabTitle}</a>
 	</div>
 	<div class="tab-right" id="tab-right-${id}"></div>
 </div>
Index: lams_tool_chat/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e -r7f3d6ad9d7eed4d6dcff775408af478af964fddd
--- lams_tool_chat/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
+++ lams_tool_chat/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 7f3d6ad9d7eed4d6dcff775408af478af964fddd)
@@ -1,34 +1,35 @@
-<%/****************************************************************
-			 * 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
-			 * ****************************************************************
-			 */
 
-			/**
-			 * TabBody.tag
-			 *	Author: Mitchell Seaton
-			 *	Description: Creates the body container for a tab element
-			 * Wiki: 
-			 */
+<%
+	 /****************************************************************
+	 * 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
+	 * ****************************************************************
+	 */
 
-		%>
+	/**
+	 * TabBody.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Creates the body container for a tab element
+	 * Wiki: 
+	 */
+%>
 <%@ tag body-content="scriptless"%>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
@@ -47,6 +48,5 @@
 			<jsp:doBody />
 		</c:otherwise>
 	</c:choose>
-
 </div>
 <!-- end tab content -->
Index: lams_tool_chat/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e -r7f3d6ad9d7eed4d6dcff775408af478af964fddd
--- lams_tool_chat/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
+++ lams_tool_chat/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 7f3d6ad9d7eed4d6dcff775408af478af964fddd)
@@ -1,36 +1,38 @@
-<%/****************************************************************
-			 * 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
-			 * ****************************************************************
-			 */
 
-			/**
-			 * Tabs.tag
-			 *	Author: Mitchell Seaton
-			 *	Description: Create a tab list from a input collection or nested Tab tags.
-			 * Wiki: 
-			 */
+<%
+	 /****************************************************************
+	 * 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
+	 * ****************************************************************
+	 */
 
-		%>
+	/**
+	 * Tabs.tag
+	 *	Author: Mitchell Seaton
+	 *	Description: Create a tab list from a input collection or nested Tab tags.
+	 * Wiki: 
+	 */
+%>
 <%@ tag body-content="scriptless"%>
-<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true"%>
+<%@ attribute name="collection" type="java.util.Collection"
+	required="false" rtexprvalue="true"%>
 <%@ attribute name="control" required="false" rtexprvalue="true"%>
 <%@ attribute name="useKey" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
Index: lams_tool_chat/web/includes/javascript/authoring.js
===================================================================
diff -u
--- lams_tool_chat/web/includes/javascript/authoring.js	(revision 0)
+++ lams_tool_chat/web/includes/javascript/authoring.js	(revision 7f3d6ad9d7eed4d6dcff775408af478af964fddd)
@@ -0,0 +1,29 @@
+
+function init() {
+
+	// initialising tabs
+	initTabSize(3);
+	
+	// open the current tab    
+	var tag = document.getElementById("currentTab");
+	if (tag.value != "") {
+		selectTab(tag.value);
+	} else {
+		selectTab(1);
+	}
+}
+function doSelectTab(tabId) {
+	var tag = document.getElementById("currentTab");
+	tag.value = tabId;
+	selectTab(tabId);
+}
+function doSubmit(method) {
+	document.authoringForm.dispatch.value = method;
+	document.authoringForm.submit();
+}
+function deleteAttachment(dispatch, uuid) {
+	document.authoringForm.dispatch.value = dispatch;
+	document.authoringForm.deleteFileUuid.value = uuid;
+	document.authoringForm.submit();
+}
+
Index: lams_tool_chat/web/layouts/defaultLayout.jsp
===================================================================
diff -u -red3c47b7ae61ab6af7d88769b237943923199ad8 -r7f3d6ad9d7eed4d6dcff775408af478af964fddd
--- lams_tool_chat/web/layouts/defaultLayout.jsp	(.../defaultLayout.jsp)	(revision ed3c47b7ae61ab6af7d88769b237943923199ad8)
+++ lams_tool_chat/web/layouts/defaultLayout.jsp	(.../defaultLayout.jsp)	(revision 7f3d6ad9d7eed4d6dcff775408af478af964fddd)
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+            "http://www.w3.org/TR/html4/loose.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 
Index: lams_tool_chat/web/layouts/learningLayout.jsp
===================================================================
diff -u -r6e0f6145136b39b5736a6a1e20c596f54cf7f5b0 -r7f3d6ad9d7eed4d6dcff775408af478af964fddd
--- lams_tool_chat/web/layouts/learningLayout.jsp	(.../learningLayout.jsp)	(revision 6e0f6145136b39b5736a6a1e20c596f54cf7f5b0)
+++ lams_tool_chat/web/layouts/learningLayout.jsp	(.../learningLayout.jsp)	(revision 7f3d6ad9d7eed4d6dcff775408af478af964fddd)
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	"http://www.w3.org/TR/html4/loose.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 
Index: lams_tool_chat/web/layouts/tabLayout.jsp
===================================================================
diff -u -red3c47b7ae61ab6af7d88769b237943923199ad8 -r7f3d6ad9d7eed4d6dcff775408af478af964fddd
--- lams_tool_chat/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision ed3c47b7ae61ab6af7d88769b237943923199ad8)
+++ lams_tool_chat/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision 7f3d6ad9d7eed4d6dcff775408af478af964fddd)
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+            "http://www.w3.org/TR/html4/loose.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 
Index: lams_tool_chat/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r4723715bee4472a5a41fc2cafd690b23b7ae4e2a -r7f3d6ad9d7eed4d6dcff775408af478af964fddd
--- lams_tool_chat/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 4723715bee4472a5a41fc2cafd690b23b7ae4e2a)
+++ lams_tool_chat/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 7f3d6ad9d7eed4d6dcff775408af478af964fddd)
@@ -1,27 +1,32 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="authoringForm" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-
 <!-- ========== Advanced Tab ========== -->
 <table cellpadding="0">
 	<tbody>
 		<tr>
 			<td align="right">
-				<html:checkbox property="lockOnFinished" value="1" styleClass="noBorder"></html:checkbox>
+				<html:checkbox property="lockOnFinished" value="1"
+					styleClass="noBorder" styleId="lockOnFinished">
+				</html:checkbox>
 			</td>
 			<td>
-				<fmt:message key="advanced.lockOnFinished" />
+				<label for="lockOnFinished">
+					<fmt:message key="advanced.lockOnFinished" />
+				</label>
 			</td>
 		</tr>
 		<tr>
 			<td align="right">
-				<html:checkbox property="reflectOnActivity" value="1" styleClass="noBorder"></html:checkbox>
+				<html:checkbox property="reflectOnActivity" value="1"
+					styleClass="noBorder" styleId="reflectOnActivity"></html:checkbox>
 			</td>
 			<td>
-				<fmt:message key="advanced.reflectOnActivity" />
+				<label for="reflectOnActivity">
+					<fmt:message key="advanced.reflectOnActivity" />
+				</label>
 			</td>
 		</tr>
-				<tr>
+		<tr>
 			<td>
 				&nbsp;
 			</td>
@@ -31,10 +36,13 @@
 		</tr>
 		<tr>
 			<td align="right">
-				<html:checkbox property="filteringEnabled" value="1" styleClass="noBorder"></html:checkbox>
+				<html:checkbox property="filteringEnabled" value="1"
+					styleClass="noBorder" styleId="filteringEnabled"></html:checkbox>
 			</td>
 			<td>
-				<fmt:message key="advanced.filteringEnabled" />
+				<label for="filteringEnabled">
+					<fmt:message key="advanced.filteringEnabled" />
+				</label>
 			</td>
 		</tr>
 		<tr>
@@ -47,4 +55,3 @@
 		</tr>
 	</tbody>
 </table>
-
Index: lams_tool_chat/web/pages/authoring/authoring.jsp
===================================================================
diff -u -red3c47b7ae61ab6af7d88769b237943923199ad8 -r7f3d6ad9d7eed4d6dcff775408af478af964fddd
--- lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision ed3c47b7ae61ab6af7d88769b237943923199ad8)
+++ lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7f3d6ad9d7eed4d6dcff775408af478af964fddd)
@@ -1,14 +1,11 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <div id="header">
-
-	<!--  TITLE KEY PAGE GOES HERE -->
 	<lams:Tabs control="true">
 		<lams:Tab id="1" key="button.basic" />
 		<lams:Tab id="2" key="button.advanced" />
 		<lams:Tab id="3" key="button.instructions" />
 	</lams:Tabs>
-
 </div>
 <!--closes header-->
 
@@ -17,6 +14,7 @@
 		enctype="multipart/form-data">
 		<div>
 			<html:hidden property="toolContentID" />
+			<html:hidden property="contentFolderID" />
 			<html:hidden property="currentTab" styleId="currentTab" />
 			<html:hidden property="dispatch" value="updateContent" />
 			<html:hidden property="sessionMapID" />
@@ -49,11 +47,11 @@
 			cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
 			toolContentID="${formBean.toolContentID}"
 			accessMode="${sessionMap.mode}" defineLater="${defineLater}"
-			customiseSessionID="${sessionMap.sessionID}" />
+			customiseSessionID="${sessionMap.sessionID}"
+			contentFolderID="${formBean.contentFolderID}" />
 
 	</html:form>
 </div>
+<!--closes content-->
 
 <div id="footer"></div>
-
-<lams:HTMLEditor />
Index: lams_tool_chat/web/pages/authoring/basic.jsp
===================================================================
diff -u -r284b8223088983657f804360bdda0f9c137e7d13 -r7f3d6ad9d7eed4d6dcff775408af478af964fddd
--- lams_tool_chat/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 284b8223088983657f804360bdda0f9c137e7d13)
+++ lams_tool_chat/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 7f3d6ad9d7eed4d6dcff775408af478af964fddd)
@@ -1,18 +1,27 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="authoringForm" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+<c:set var="authoringForm"
+	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
 <!-- ========== Basic Tab ========== -->
 <table cellpadding="0">
 	<tbody>
 		<tr>
 			<td>
-				<lams:SetEditor id="Title" text="${authoringForm.title}" small="true" key="label.authoring.basic.title" />
+				<div class="field-name" style="text-align: left;">
+					<fmt:message key="label.authoring.basic.title"></fmt:message>
+				</div>
+				<html:text property="title" style="width: 100%;"></html:text>
 			</td>
 		</tr>
 		<tr>
 			<td>
-				<lams:SetEditor id="Instructions" text="${authoringForm.instructions}" key="label.authoring.basic.instructions" />
+				<div class="field-name" style="text-align: left;">
+					<fmt:message key="label.authoring.basic.instructions"></fmt:message>
+				</div>
+				<lams:FCKEditor id="instructions"
+					value="${authoringForm.instructions}"
+					contentFolderID="${authoringForm.contentFolderID}"></lams:FCKEditor>
 			</td>
 		</tr>
 	</tbody>
Index: lams_tool_chat/web/pages/authoring/headItems.jsp
===================================================================
diff -u -r39a4ece987cbb4ab50fd15fc15d2dbb210fece38 -r7f3d6ad9d7eed4d6dcff775408af478af964fddd
--- lams_tool_chat/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 39a4ece987cbb4ab50fd15fc15d2dbb210fece38)
+++ lams_tool_chat/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 7f3d6ad9d7eed4d6dcff775408af478af964fddd)
@@ -1,49 +1,9 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="lams">
-	<lams:LAMSURL />
+<c:set var="tool">
+	<lams:WebAppURL />
 </c:set>
 
-<%-- Authoring Script --%>
-
-<script type="text/javascript">
-	var imgRoot="${lams}images/";
-	var themeName="aqua";
-        
-	function init(){
-
-		// initialising tabs
-		initTabSize(3);
-	
-        // open the current tab    
-		var tag = document.getElementById("currentTab");
-		if(tag.value != "")
-			selectTab(tag.value);
-     	else
-			selectTab(1);
-			
-		// initialising fckeditor
-		initEditor("Title");
-		initEditor("Instructions");
-		initEditor("OnlineInstruction");
-		initEditor("OfflineInstruction");
-	}  
-        
-	function doSelectTab(tabId) {
-		var tag = document.getElementById("currentTab");
-		tag.value = tabId;
-		selectTab(tabId);
-	}
-
-	function doSubmit(method) {
-		document.authoringForm.dispatch.value=method;
-		document.authoringForm.submit();
-	}
-	
-	function deleteAttachment(dispatch, uuid) {
-		document.authoringForm.dispatch.value=dispatch;
-		document.authoringForm.deleteFileUuid.value=uuid;
-		document.authoringForm.submit();	
-	}
-	
-</script>
\ No newline at end of file
+<script type="text/javascript"
+	src="${tool}includes/javascript/authoring.js">
+</script>
Index: lams_tool_chat/web/pages/authoring/instructions.jsp
===================================================================
diff -u -r4723715bee4472a5a41fc2cafd690b23b7ae4e2a -r7f3d6ad9d7eed4d6dcff775408af478af964fddd
--- lams_tool_chat/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision 4723715bee4472a5a41fc2cafd690b23b7ae4e2a)
+++ lams_tool_chat/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision 7f3d6ad9d7eed4d6dcff775408af478af964fddd)
@@ -1,70 +1,92 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="authForm" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 <html:hidden property="deleteFileUuid" />
 
 <table cellpadding="0">
 	<tbody>
-		<!-- ==========  Online Instructions ========== -->
+		<%-- Online Instructions --%>
 		<tr>
 			<td>
-				<lams:SetEditor id="OnlineInstruction" text="${authForm.onlineInstruction}" key="instructions.onlineInstructions" small="true" />
+				<div class="field-name" style="text-align: left;">
+					<fmt:message key="instructions.onlineInstructions"></fmt:message>
+				</div>
+				<html:textarea property="onlineInstruction" rows="3" cols="80"></html:textarea>
 			</td>
 		</tr>
 
-		<!-- ==========  Online Attachments ========== -->
-		<c:if test="${not empty requestScope.sessionMap.onlineFiles or not empty requestScope.sessionMap.unsavedOnlineFiles}">
+		<%-- Online Attachments --%>
+		<c:if
+			test="${not empty requestScope.sessionMap.onlineFiles or not empty requestScope.sessionMap.unsavedOnlineFiles}">
 			<tr>
 				<td>
 					<div class="space-left">
-						<c:forEach var="file" items="${requestScope.sessionMap.onlineFiles}">
-							<li>
-								<c:out value="${file.fileName}" />
-								<c:set var="viewURL">
-									<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
-								</c:set>
-								<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"> <fmt:message key="link.view" /> </a> &nbsp;
+						<ul>
+							
+							<%-- Online Saved Files	--%>
+							<c:forEach var="file"
+								items="${requestScope.sessionMap.onlineFiles}">
+								<li>
+									<c:out value="${file.fileName}" />
+									<c:set var="viewURL">
+										<html:rewrite
+											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+									</c:set>
+									<a
+										href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+										<fmt:message key="link.view" /> </a> &nbsp;
 
-								<c:set var="downloadURL">
-									<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=true" />
-								</c:set>
-								<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <fmt:message key="link.download" /> </a> &nbsp;
+									<c:set var="downloadURL">
+										<html:rewrite
+											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
+									</c:set>
+									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+										<fmt:message key="link.download" /> </a> &nbsp;
 
-								<html:link href="javascript:deleteAttachment('deleteOnline','${file.fileUuid}')">
-									<fmt:message key="link.delete" />
-								</html:link>
-							</li>
-						</c:forEach>
+									<html:link
+										href="javascript:deleteAttachment('deleteOnline','${file.fileUuid}')">
+										<fmt:message key="link.delete" />
+									</html:link>
+								</li>
+							</c:forEach>
 
-						<%-- Displaying unsaved Files --%>
-						<c:forEach var="file" items="${requestScope.sessionMap.unsavedOnlineFiles}">
-							<li>
-								<c:out value="${file.fileName}" />
-								*
-								<c:set var="viewURL">
-									<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
-								</c:set>
-								<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"> <fmt:message key="link.view" /> </a> &nbsp;
+							<%-- Online Unsaved Files --%>
+							<c:forEach var="file"
+								items="${requestScope.sessionMap.unsavedOnlineFiles}">
+								<li>
+									<c:out value="${file.fileName}" />
+									*
+									<c:set var="viewURL">
+										<html:rewrite
+											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+									</c:set>
+									<a
+										href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+										<fmt:message key="link.view" /> </a> &nbsp;
 
-								<c:set var="downloadURL">
-									<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=true" />
-								</c:set>
-								<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <fmt:message key="link.download" /> </a> &nbsp;
+									<c:set var="downloadURL">
+										<html:rewrite
+											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
+									</c:set>
+									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+										<fmt:message key="link.download" /> </a> &nbsp;
 
-								<html:link href="javascript:deleteAttachment('removeUnsavedOnline','${file.fileUuid}')">
-									<fmt:message key="link.delete" />
-								</html:link>
-							</li>
-						</c:forEach>
+									<html:link
+										href="javascript:deleteAttachment('removeUnsavedOnline','${file.fileUuid}')">
+										<fmt:message key="link.delete" />
+									</html:link>
+								</li>
+							</c:forEach>
+
+						</ul>
 					</div>
 				</td>
 			</tr>
 		</c:if>
 
-		<!-- ==========  Online Attachments Upload========== -->
+		<%-- Online Attachments Upload --%>
 		<tr>
 			<td>
-				<div class="field-name left-buttons">
+				<div class="field-name" style="text-align: left">
 					<fmt:message key="instructions.uploadOnlineInstr" />
 				</div>
 			</td>
@@ -74,7 +96,8 @@
 				<div class="space-left">
 					<html:file property="onlineFile">
 					</html:file>
-					<html:link href="javascript:doSubmit('uploadOnline');" property="submit" styleClass="button">
+					<html:link href="javascript:doSubmit('uploadOnline');"
+						property="submit" styleClass="button">
 						<fmt:message key="button.upload" />
 					</html:link>
 				</div>
@@ -87,70 +110,91 @@
 
 <table>
 	<tbody>
-		<!-- ==========  Offline Instructions ========== -->
+		<%-- Offline Instructions --%>
 		<tr>
 			<td>
-				<lams:SetEditor id="OfflineInstruction" text="${authForm.offlineInstruction}" key="instructions.offlineInstructions" alt="true" small="true" />
+				<div class="field-name-alternative-color" style="text-align: left;">
+					<fmt:message key="instructions.offlineInstructions"></fmt:message>
+				</div>
+				<html:textarea property="offlineInstruction" rows="3" cols="80"></html:textarea>
 			</td>
 		</tr>
 
 
 
-		<!-- ==========  Offline Attachments ========== -->
-		<c:if test="${not empty requestScope.sessionMap.offlineFiles or not empty requestScope.sessionMap.unsavedOfflineFiles}">
+		<%-- Offline Attachments --%>
+		<c:if
+			test="${not empty requestScope.sessionMap.offlineFiles or not empty requestScope.sessionMap.unsavedOfflineFiles}">
 			<tr>
 				<td>
 					<div class="space-left">
-						<!-- Saved attachments -->
-						<c:forEach var="file" items="${requestScope.sessionMap.offlineFiles}">
-							<li>
-								<c:out value="${file.fileName}" />
-								<c:set var="viewURL">
-									<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
-								</c:set>
-								<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"> <fmt:message key="link.view" /> </a> &nbsp;
+						<ul>
 
-								<c:set var="downloadURL">
-									<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=true" />
-								</c:set>
-								<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <fmt:message key="link.download" /> </a> &nbsp;
+							<%-- Offline Saved Attachments --%>
+							<c:forEach var="file"
+								items="${requestScope.sessionMap.offlineFiles}">
+								<li>
+									<c:out value="${file.fileName}" />
+									<c:set var="viewURL">
+										<html:rewrite
+											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+									</c:set>
+									<a
+										href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+										<fmt:message key="link.view" /> </a> &nbsp;
 
-								<html:link href="javascript:deleteAttachment('deleteOffline','${file.fileUuid}')">
-									<fmt:message key="link.delete" />
-								</html:link>
-							</li>
-						</c:forEach>
+									<c:set var="downloadURL">
+										<html:rewrite
+											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
+									</c:set>
+									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+										<fmt:message key="link.download" /> </a> &nbsp;
 
-						<!-- Unsaved attachments -->
-						<c:forEach var="file" items="${requestScope.sessionMap.unsavedOfflineFiles}">
-							<li>
-								<c:out value="${file.fileName}" />
-								*
-								<c:set var="viewURL">
-									<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
-								</c:set>
-								<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"> <fmt:message key="link.view" /> </a> &nbsp;
+									<html:link
+										href="javascript:deleteAttachment('deleteOffline','${file.fileUuid}')">
+										<fmt:message key="link.delete" />
+									</html:link>
+								</li>
+							</c:forEach>
+	
+								<%-- Offline Unsaved Attachments --%>
+								<c:forEach var="file"
+									items="${requestScope.sessionMap.unsavedOfflineFiles}">
+									<li>
+										<c:out value="${file.fileName}" />
+										*
+										<c:set var="viewURL">
+											<html:rewrite
+												page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+										</c:set>
+										<a
+											href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+										<fmt:message key="link.view" /> </a> &nbsp;
 
-								<c:set var="downloadURL">
-									<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=true" />
-								</c:set>
-								<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <fmt:message key="link.download" /> </a> &nbsp;
+									<c:set var="downloadURL">
+										<html:rewrite
+											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
+									</c:set>
+									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+										<fmt:message key="link.download" /> </a> &nbsp;
 
-								<html:link href="javascript:deleteAttachment('removeUnsavedOffline','${file.fileUuid}')">
-									<fmt:message key="link.delete" />
-								</html:link>
-							</li>
-						</c:forEach>
+									<html:link
+										href="javascript:deleteAttachment('removeUnsavedOffline','${file.fileUuid}')">
+										<fmt:message key="link.delete" />
+									</html:link>
+								</li>
+							</c:forEach>
+
+						</ul>
 					</div>
 				</td>
 			</tr>
 		</c:if>
 
-		<!-- ==========  Offline Attachments Upload ========== -->
-
+		<%--Offline Attachments Upload --%>
 		<tr>
 			<td>
-				<div class="field-name-alternative-color left-buttons">
+				<div class="field-name-alternative-color" style="text-align: left;">
 					<fmt:message key="instructions.uploadOfflineInstr" />
 				</div>
 			</td>
@@ -160,7 +204,8 @@
 				<div class="space-left">
 					<html:file property="offlineFile">
 					</html:file>
-					<html:link href="javascript:doSubmit('uploadOffline');" property="submit" styleClass="button">
+					<html:link href="javascript:doSubmit('uploadOffline');"
+						property="submit" styleClass="button">
 						<fmt:message key="button.upload" />
 					</html:link>
 				</div>