Index: lams_tool_nb/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.8 -r1.9
--- lams_tool_nb/web/WEB-INF/lams.tld	23 Aug 2006 07:47:53 -0000	1.8
+++ lams_tool_nb/web/WEB-INF/lams.tld	31 Aug 2006 01:31:54 -0000	1.9
@@ -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_nb/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/fckeditor/tlds/Attic/FCKeditor.tld,v
diff -u -r1.3 -r1.4
--- lams_tool_nb/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	15 Aug 2005 23:54:16 -0000	1.3
+++ lams_tool_nb/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	31 Aug 2006 01:31:46 -0000	1.4
@@ -14,6 +14,7 @@
 		<attribute>
 			<name>id</name>
 			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
   		</attribute>
 		<attribute>
 			<name>basePath</name>
Index: lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	19 Jul 2006 05:15:49 -0000	1.4
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	31 Aug 2006 01:31:54 -0000	1.5
@@ -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_nb/web/WEB-INF/tags/FCKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/Attic/FCKEditor.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_nb/web/WEB-INF/tags/FCKEditor.tag	31 Aug 2006 01:31:54 -0000	1.1
@@ -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 1.8 refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tags/HTMLEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tags/SetEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_nb/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/authoring/authoring.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_nb/web/authoring/authoring.jsp	23 Aug 2006 07:29:42 -0000	1.8
+++ lams_tool_nb/web/authoring/authoring.jsp	31 Aug 2006 01:31:54 -0000	1.9
@@ -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="/includes/taglibs.jsp"%>
 
@@ -14,15 +14,9 @@
 	    var themeName="aqua";
         
         function init(){
-			
-			initEditor("title");						
-			initEditor("content");
 			var showBasicContent = "${requestScope.showBasicContent}";
 			if (showBasicContent != "true") {
 	            initTabSize(3);
-	            
-       			initEditor("onlineInstructions");						
-       			initEditor("offlineInstructions");
 	        }
 	        
 	        var tag = document.getElementById("currentTab");
@@ -52,13 +46,18 @@
 <body onLoad="init()">
 
 	<div id="page">
-		<html:form action="/authoring" styleId="authoringForm" target="_self" enctype="multipart/form-data">
+		<html:form action="/authoring" styleId="authoringForm" target="_self"
+			enctype="multipart/form-data">
 			<html:hidden property="toolContentID" />
+			<html:hidden property="contentFolderID" />
 			<html:hidden property="currentTab" styleId="currentTab" />
 			<html:hidden property="sessionMapID" />
 
-			<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-			<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" scope="request"/>	
+			<c:set var="formBean"
+				value="<%=request
+											.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+			<c:set var="sessionMap"
+				value="${sessionScope[formBean.sessionMapID]}" scope="request" />
 
 			<%-- in define later mode we edit only the basic content. But if we don't have the instructions tab, then the instructions are lost when saving. --%>
 			<h1>
@@ -68,15 +67,17 @@
 				<!-- start tabs -->
 				<lams:Tabs control="true">
 					<lams:Tab id="1" key="label.authoring.heading.basic" />
-					<lams:Tab id="2" key="label.authoring.heading.advanced" inactive="true" />
+					<lams:Tab id="2" key="label.authoring.heading.advanced"
+						inactive="true" />
 					<c:choose>
-					<c:when test="${formBean.defineLater != 'true'}">
-						<lams:Tab id="3" key="label.authoring.heading.instructions" />
-					</c:when>
-					<c:otherwise>
-						<lams:Tab id="3" key="label.authoring.heading.instructions" inactive="true" />
-					</c:otherwise>
-				</c:choose>
+						<c:when test="${formBean.defineLater != 'true'}">
+							<lams:Tab id="3" key="label.authoring.heading.instructions" />
+						</c:when>
+						<c:otherwise>
+							<lams:Tab id="3" key="label.authoring.heading.instructions"
+								inactive="true" />
+						</c:otherwise>
+					</c:choose>
 				</lams:Tabs>
 				<!-- end tab buttons -->
 			</div>
@@ -86,21 +87,27 @@
 				<%@ include file="../errorbox.jsp"%>
 
 				<!--  Set up tabs  -->
-				<lams:TabBody id="1" titleKey="label.authoring.heading.basic" page="basic.jsp" />
-				<lams:TabBody id="2" titleKey="label.authoring.heading.advanced" page="advance.jsp" />
-				<lams:TabBody id="3" titleKey="label.authoring.heading.instructions" page="instructions.jsp" />
+				<lams:TabBody id="1" titleKey="label.authoring.heading.basic"
+					page="basic.jsp" />
+				<lams:TabBody id="2" titleKey="label.authoring.heading.advanced"
+					page="advance.jsp" />
+				<lams:TabBody id="3" titleKey="label.authoring.heading.instructions"
+					page="instructions.jsp" />
 
 				<!-- Button Row -->
 				<c:set var="dispatchMethodName">
 					<fmt:message key="button.save" />
 				</c:set>
 				<html:hidden property="method" value="${dispatchMethodName}" />
-				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lanb11" 
-					toolContentID="${formBean.toolContentID}" cancelButtonLabelKey="button.cancel" 
-					saveButtonLabelKey="button.save" customiseSessionID="${sessionMap.sessionID}"/>
+				<lams:AuthoringButton formID="authoringForm"
+					clearSessionActionUrl="/clearsession.do" toolSignature="lanb11"
+					toolContentID="${formBean.toolContentID}"
+					cancelButtonLabelKey="button.cancel"
+					saveButtonLabelKey="button.save"
+					customiseSessionID="${sessionMap.sessionID}"
+					contentFolderID="${NbAuthoringForm.contentFolderID}" />
 			</div>
 			<div id="footer" />
-				<lams:HTMLEditor contentFolderID="${NbAuthoringForm.contentFolderID}" />
 		</html:form>
 	</div>
 </body>
Index: lams_tool_nb/web/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/authoring/basic.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_nb/web/authoring/basic.jsp	28 Jun 2006 09:53:07 -0000	1.3
+++ lams_tool_nb/web/authoring/basic.jsp	31 Aug 2006 01:31:54 -0000	1.4
@@ -1,16 +1,24 @@
 <%@ include file="/includes/taglibs.jsp"%>
-
 <!-- Basic Tab Content  -->
-
 <table cellpadding="0">
-	<tr>
-		<td>
-			<lams:SetEditor id="title" text="${NbAuthoringForm.title}" small="true" key="basic.title" />
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<lams:SetEditor id="content" text="${NbAuthoringForm.content}" key="basic.content" />
-		</td>
-	</tr>
+	<tbody>
+		<tr>
+			<td>
+				<div class="field-name" style="text-align: left;">
+					<fmt:message key="basic.title"></fmt:message>
+				</div>
+				<html:text property="title" style="width: 100%;"></html:text>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<div class="field-name" style="text-align: left;">
+					<fmt:message key="basic.content"></fmt:message>
+				</div>
+				<lams:FCKEditor id="content"
+					value="${NbAuthoringForm.content}"
+					contentFolderID="${NbAuthoringForm.contentFolderID}"></lams:FCKEditor>
+			</td>
+		</tr>
+	</tbody>
 </table>
Index: lams_tool_nb/web/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/authoring/Attic/instructions.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_nb/web/authoring/instructions.jsp	19 Jul 2006 05:15:49 -0000	1.5
+++ lams_tool_nb/web/authoring/instructions.jsp	31 Aug 2006 01:31:54 -0000	1.6
@@ -11,12 +11,14 @@
 	</c:if>
 </c:forEach>
 
-
 <!-- Instructions Tab Content  -->
 <table>
 	<tr>
 		<td>
-			<lams:SetEditor id="onlineInstructions" text="${NbAuthoringForm.onlineInstructions}" key="instructions.onlineInstructions" small="true" />
+			<div class="field-name" style="text-align: left;">
+				<fmt:message key="instructions.onlineInstructions"></fmt:message>
+			</div>
+			<html:textarea property="onlineInstructions" rows="3" cols="80"></html:textarea>
 		</td>
 	</tr>
 
@@ -25,24 +27,32 @@
 			<td>
 				<c:if test="${not empty requestScope.sessionMap.attachmentList}">
 					<ul>
-						<c:forEach var="attachment" items="${requestScope.sessionMap.attachmentList}">
+						<c:forEach var="attachment"
+							items="${requestScope.sessionMap.attachmentList}">
 							<c:if test="${attachment.onlineFile}">
 								<li>
 									${attachment.filename}
 									<c:set var="viewURL">
-										<html:rewrite page="/download/?uuid=${attachment.uuid}&amp;preferDownload=false" />
+										<html:rewrite
+											page="/download/?uuid=${attachment.uuid}&amp;preferDownload=false" />
 									</c:set>
-									<a href="javascript:launchInstructionsPopup('${viewURL}');"> <fmt:message key="link.view" /> </a> &nbsp;
+									<a href="javascript:launchInstructionsPopup('${viewURL}');">
+										<fmt:message key="link.view" /> </a> &nbsp;
 
 									<c:set var="downloadURL">
-										<html:rewrite page="/download/?uuid=${attachment.uuid}&amp;preferDownload=true" />
+										<html:rewrite
+											page="/download/?uuid=${attachment.uuid}&amp;preferDownload=true" />
 									</c:set>
-									<a href="${downloadURL}"> <fmt:message key="link.download" /> </a> &nbsp;
+									<a href="${downloadURL}"> <fmt:message key="link.download" />
+									</a> &nbsp;
 
 									<c:set var="deleteURL">
-										<html:rewrite page="/authoring.do?method=Delete&amp;uuid=${attachment.uuid}" />
+										<html:rewrite
+											page="/authoring.do?method=Delete&amp;uuid=${attachment.uuid}" />
 									</c:set>
-									<a href="${deleteURL}" onclick="javascript:return confirm('Are you sure you want to delete this file?')" target="_self"> <fmt:message key="link.delete" /> </a>
+									<a href="${deleteURL}"
+										onclick="javascript:return confirm('Are you sure you want to delete this file?')"
+										target="_self"> <fmt:message key="link.delete" /> </a>
 								</li>
 							</c:if>
 						</c:forEach>
@@ -53,8 +63,10 @@
 	</c:if>
 
 	<tr>
-		<td class="field-name">
-			<fmt:message key="instructions.uploadOnlineInstr" />
+		<td>
+			<div class="field-name" style="text-align: left;">
+				<fmt:message key="instructions.uploadOnlineInstr" />
+			</div>
 		</td>
 	</tr>
 	<tr>
@@ -72,33 +84,44 @@
 <table>
 	<tr>
 		<td>
-			<lams:SetEditor id="offlineInstructions" text="${NbAuthoringForm.offlineInstructions}" 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="offlineInstructions" rows="3" cols="80"></html:textarea>
 		</td>
-	</tr>  
+	</tr>
 
 	<c:if test="${offlineExist == 'true'}">
 		<tr>
 			<td>
 				<c:if test="${not empty requestScope.sessionMap.attachmentList}">
 					<ul>
-						<c:forEach var="attachment" items="${requestScope.sessionMap.attachmentList}">
+						<c:forEach var="attachment"
+							items="${requestScope.sessionMap.attachmentList}">
 							<c:if test="${not attachment.onlineFile}">
 								<li>
 									${attachment.filename}
 									<c:set var="viewURL">
-										<html:rewrite page="/download/?uuid=${attachment.uuid}&amp;preferDownload=false" />
+										<html:rewrite
+											page="/download/?uuid=${attachment.uuid}&amp;preferDownload=false" />
 									</c:set>
-									<a href="javascript:launchInstructionsPopup('${viewURL}');"> <fmt:message key="link.view" /> </a> &nbsp;
+									<a href="javascript:launchInstructionsPopup('${viewURL}');">
+										<fmt:message key="link.view" /> </a> &nbsp;
 
 									<c:set var="downloadURL">
-										<html:rewrite page="/download/?uuid=${attachment.uuid}&amp;preferDownload=true" />
+										<html:rewrite
+											page="/download/?uuid=${attachment.uuid}&amp;preferDownload=true" />
 									</c:set>
-									<a href="${downloadURL}"> <fmt:message key="link.download" /> </a> &nbsp;
+									<a href="${downloadURL}"> <fmt:message key="link.download" />
+									</a> &nbsp;
 
 									<c:set var="deleteURL">
-										<html:rewrite page="/authoring.do?method=Delete&amp;uuid=${attachment.uuid}" />
+										<html:rewrite
+											page="/authoring.do?method=Delete&amp;uuid=${attachment.uuid}" />
 									</c:set>
-									<a href="${deleteURL}" onclick="javascript:return confirm('Are you sure you want to delete this file?')" target="_self"> <fmt:message key="link.delete" /> </a>
+									<a href="${deleteURL}"
+										onclick="javascript:return confirm('Are you sure you want to delete this file?')"
+										target="_self"> <fmt:message key="link.delete" /> </a>
 								</li>
 							</c:if>
 						</c:forEach>
@@ -109,8 +132,10 @@
 	</c:if>
 
 	<tr>
-		<td class="field-name-alternative-color">
-			<fmt:message key="instructions.uploadOfflineInstr" />
+		<td>
+			<div class="field-name-alternative-color" style="text-align: left;">
+				<fmt:message key="instructions.uploadOfflineInstr" />
+			</div>
 		</td>
 	</tr>
 	<tr>