Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java,v
diff -u -r1.5 -r1.6
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	16 Aug 2006 06:19:05 -0000	1.5
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	31 Aug 2006 00:35:33 -0000	1.6
@@ -54,7 +54,6 @@
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
 
-
 /**
  * @author
  * @version
@@ -97,14 +96,18 @@
 		Long toolContentID = new Long(WebUtil.readLongParam(request,
 				AttributeNames.PARAM_TOOL_CONTENT_ID));
 
+		String contentFolderID = WebUtil.readStrParam(request,
+				AttributeNames.PARAM_CONTENT_FOLDER_ID);
+
 		// set up notebookService
 		if (notebookService == null) {
-			notebookService = NotebookServiceProxy.getNotebookService(this.getServlet()
-					.getServletContext());
+			notebookService = NotebookServiceProxy.getNotebookService(this
+					.getServlet().getServletContext());
 		}
 
 		// retrieving Notebook with given toolContentID
-		Notebook notebook = notebookService.getNotebookByContentId(toolContentID);
+		Notebook notebook = notebookService
+				.getNotebookByContentId(toolContentID);
 		if (notebook == null) {
 			notebook = notebookService.copyDefaultContent(toolContentID);
 			notebook.setCreateDate(new Date());
@@ -125,23 +128,21 @@
 		notebook.setDefineLater(true);
 		notebookService.saveOrUpdateNotebook(notebook);
 
-		// Set up sessionMap
-		SessionMap<String, Object> map = new SessionMap<String, Object>();
-		initSessionMap(map, request);
-		updateSessionMap(map, notebook);
-
 		// Set up the authForm.
 		AuthoringForm authForm = (AuthoringForm) form;
 		updateAuthForm(authForm, notebook);
 
-		// add the sessionMapID to form
+		// Set up sessionMap
+		SessionMap<String, Object> map = createSessionMap(notebook,
+				getAccessMode(request));
 		authForm.setSessionMapID(map.getSessionID());
 
+		authForm.setContentFolderID(contentFolderID);
+
 		// add the sessionMap to HTTPSession.
 		request.getSession().setAttribute(map.getSessionID(), map);
-
 		request.setAttribute(NotebookConstants.ATTR_SESSION_MAP, map);
-		
+
 		return mapping.findForward("success");
 	}
 
@@ -154,7 +155,8 @@
 		SessionMap<String, Object> map = getSessionMap(request, authForm);
 
 		// get notebook content.
-		Notebook notebook = notebookService.getNotebookByContentId(authForm.getToolContentID());
+		Notebook notebook = notebookService.getNotebookByContentId(authForm
+				.getToolContentID());
 
 		// update notebook content using form inputs.
 		updateNotebook(notebook, authForm);
@@ -171,11 +173,11 @@
 					.getFileVersionId());
 			attachments.remove(att);
 		}
-		
+
 		// add unsaved attachments
 		attachments.addAll(getAttList(KEY_UNSAVED_ONLINE_FILES, map));
 		attachments.addAll(getAttList(KEY_UNSAVED_OFFLINE_FILES, map));
-		
+
 		// set attachments in case it didn't exist
 		notebook.setNotebookAttachments(attachments);
 
@@ -189,10 +191,10 @@
 
 		request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,
 				Boolean.TRUE);
-		
+
 		// add the sessionMapID to form
 		authForm.setSessionMapID(map.getSessionID());
-		
+
 		request.setAttribute(NotebookConstants.ATTR_SESSION_MAP, map);
 
 		return mapping.findForward("success");
@@ -258,8 +260,8 @@
 		}
 
 		// upload file to repository
-		NotebookAttachment newAtt = notebookService.uploadFileToContent(authForm
-				.getToolContentID(), file, type);
+		NotebookAttachment newAtt = notebookService.uploadFileToContent(
+				authForm.getToolContentID(), file, type);
 
 		// Add attachment to unsavedFiles
 		// check to see if file with same name exists
@@ -380,17 +382,23 @@
 	/**
 	 * Updates SessionMap using Notebook content.
 	 * 
-	 * @param map
 	 * @param notebook
+	 * @param mode
 	 */
-	private void updateSessionMap(SessionMap<String, Object> map, Notebook notebook) {
+	private SessionMap<String, Object> createSessionMap(Notebook notebook,
+			ToolAccessMode mode) {
 
-		getAttList(KEY_UNSAVED_OFFLINE_FILES, map).clear();
-		getAttList(KEY_UNSAVED_ONLINE_FILES, map).clear();
-		getAttList(KEY_DELETED_FILES, map).clear();
-		getAttList(KEY_OFFLINE_FILES, map).clear();
-		getAttList(KEY_ONLINE_FILES, map).clear();
+		SessionMap<String, Object> map = new SessionMap<String, Object>();
 
+		map.put(KEY_MODE, mode);
+		map.put(KEY_ONLINE_FILES, new LinkedList<NotebookAttachment>());
+		map.put(KEY_OFFLINE_FILES, new LinkedList<NotebookAttachment>());
+		map.put(KEY_UNSAVED_ONLINE_FILES, new LinkedList<NotebookAttachment>());
+		map
+				.put(KEY_UNSAVED_OFFLINE_FILES,
+						new LinkedList<NotebookAttachment>());
+		map.put(KEY_DELETED_FILES, new LinkedList<NotebookAttachment>());
+
 		Iterator iter = notebook.getNotebookAttachments().iterator();
 		while (iter.hasNext()) {
 			NotebookAttachment attachment = (NotebookAttachment) iter.next();
@@ -402,6 +410,8 @@
 				getAttList(KEY_ONLINE_FILES, map).add(attachment);
 			}
 		}
+
+		return map;
 	}
 
 	/**
@@ -429,12 +439,15 @@
 	 * @param map
 	 * @param request
 	 */
-	private void initSessionMap(SessionMap<String, Object> map, HttpServletRequest request) {
+	private void initSessionMap(SessionMap<String, Object> map,
+			HttpServletRequest request) {
 		map.put(KEY_MODE, getAccessMode(request));
 		map.put(KEY_ONLINE_FILES, new LinkedList<NotebookAttachment>());
 		map.put(KEY_OFFLINE_FILES, new LinkedList<NotebookAttachment>());
 		map.put(KEY_UNSAVED_ONLINE_FILES, new LinkedList<NotebookAttachment>());
-		map.put(KEY_UNSAVED_OFFLINE_FILES, new LinkedList<NotebookAttachment>());
+		map
+				.put(KEY_UNSAVED_OFFLINE_FILES,
+						new LinkedList<NotebookAttachment>());
 		map.put(KEY_DELETED_FILES, new LinkedList<NotebookAttachment>());
 	}
 
@@ -445,7 +458,8 @@
 	 * @param map
 	 * @return
 	 */
-	private List<NotebookAttachment> getAttList(String key, SessionMap<String, Object> map) {
+	private List<NotebookAttachment> getAttList(String key,
+			SessionMap<String, Object> map) {
 		List<NotebookAttachment> list = (List<NotebookAttachment>) map.get(key);
 		return list;
 	}
@@ -457,8 +471,9 @@
 	 * @param authForm
 	 * @return
 	 */
-	private SessionMap<String, Object> getSessionMap(HttpServletRequest request,
-			AuthoringForm authForm) {
-		return (SessionMap<String, Object>) request.getSession().getAttribute(authForm.getSessionMapID());
+	private SessionMap<String, Object> getSessionMap(
+			HttpServletRequest request, AuthoringForm authForm) {
+		return (SessionMap<String, Object>) request.getSession().getAttribute(
+				authForm.getSessionMapID());
 	}
 }
\ No newline at end of file
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/AuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/AuthoringForm.java,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/AuthoringForm.java	27 Jul 2006 06:06:46 -0000	1.2
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/AuthoringForm.java	31 Aug 2006 00:35:33 -0000	1.3
@@ -53,6 +53,8 @@
 	String onlineInstruction;
 
 	Long toolContentID;
+	
+	String contentFolderID;
 
 	boolean lockOnFinished;
 	
@@ -192,4 +194,12 @@
 	public void setAllowRichEditor(boolean allowRichEditor) {
 		this.allowRichEditor = allowRichEditor;
 	}
+
+	public String getContentFolderID() {
+		return contentFolderID;
+	}
+
+	public void setContentFolderID(String contentFolderID) {
+		this.contentFolderID = contentFolderID;
+	}
 }
Index: lams_tool_notebook/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/web/WEB-INF/lams.tld	23 Aug 2006 07:47:08 -0000	1.2
+++ lams_tool_notebook/web/WEB-INF/lams.tld	31 Aug 2006 00:29:53 -0000	1.3
@@ -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_notebook/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/fckeditor/tlds/Attic/FCKeditor.tld,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	20 Jul 2006 01:11:10 -0000	1.1
+++ lams_tool_notebook/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	31 Aug 2006 00:29:52 -0000	1.2
@@ -14,6 +14,7 @@
 		<attribute>
 			<name>id</name>
 			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
   		</attribute>
 		<attribute>
 			<name>basePath</name>
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_tool_notebook/web/WEB-INF/tags/FCKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/Attic/FCKEditor.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_notebook/web/WEB-INF/tags/FCKEditor.tag	31 Aug 2006 00:38:51 -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>
+
+
+
+
Index: lams_tool_notebook/web/includes/javascript/authoring.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/includes/javascript/authoring.js,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_notebook/web/includes/javascript/authoring.js	31 Aug 2006 00:29:52 -0000	1.1
@@ -0,0 +1,28 @@
+
+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();
+}
\ No newline at end of file
Index: lams_tool_notebook/web/layouts/defaultLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/layouts/defaultLayout.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/layouts/defaultLayout.jsp	20 Jul 2006 01:11:09 -0000	1.1
+++ lams_tool_notebook/web/layouts/defaultLayout.jsp	31 Aug 2006 00:29:52 -0000	1.2
@@ -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_notebook/web/layouts/learningLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/layouts/learningLayout.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/layouts/learningLayout.jsp	20 Jul 2006 01:11:09 -0000	1.1
+++ lams_tool_notebook/web/layouts/learningLayout.jsp	31 Aug 2006 00:29:52 -0000	1.2
@@ -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_notebook/web/layouts/tabLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/layouts/tabLayout.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/layouts/tabLayout.jsp	20 Jul 2006 01:11:09 -0000	1.1
+++ lams_tool_notebook/web/layouts/tabLayout.jsp	31 Aug 2006 00:29:52 -0000	1.2
@@ -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_notebook/web/pages/authoring/advanced.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/advanced.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/web/pages/authoring/advanced.jsp	27 Jul 2006 06:06:46 -0000	1.2
+++ lams_tool_notebook/web/pages/authoring/advanced.jsp	31 Aug 2006 00:29:51 -0000	1.3
@@ -1,7 +1,5 @@
 <%@ 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>
@@ -17,4 +15,3 @@
 		</tr>
 	</tbody>
 </table>
-
Index: lams_tool_notebook/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/authoring.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/web/pages/authoring/authoring.jsp	20 Aug 2006 23:31:33 -0000	1.2
+++ lams_tool_notebook/web/pages/authoring/authoring.jsp	31 Aug 2006 00:29:51 -0000	1.3
@@ -39,11 +39,10 @@
 		</c:if>
 		
 		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lantbk11" cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save" toolContentID="${formBean.toolContentID}"
-			accessMode="${sessionMap.mode}" defineLater="${defineLater}" customiseSessionID="${sessionMap.sessionID}"/>
+			accessMode="${sessionMap.mode}" defineLater="${defineLater}" customiseSessionID="${sessionMap.sessionID}" contentFolderID="abc"/>
 
 	</html:form>
 </div>
 
 <div id="footer"></div>
 
-<lams:HTMLEditor />
Index: lams_tool_notebook/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/basic.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/pages/authoring/basic.jsp	20 Jul 2006 01:11:10 -0000	1.1
+++ lams_tool_notebook/web/pages/authoring/basic.jsp	31 Aug 2006 00:29:51 -0000	1.2
@@ -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_notebook/web/pages/authoring/headItems.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/headItems.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/pages/authoring/headItems.jsp	20 Jul 2006 01:11:10 -0000	1.1
+++ lams_tool_notebook/web/pages/authoring/headItems.jsp	31 Aug 2006 00:29:51 -0000	1.2
@@ -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 type="text/javascript"
+	src="${tool}includes/javascript/authoring.js">
 </script>
\ No newline at end of file
Index: lams_tool_notebook/web/pages/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/Attic/instructions.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/pages/authoring/instructions.jsp	20 Jul 2006 01:11:10 -0000	1.1
+++ lams_tool_notebook/web/pages/authoring/instructions.jsp	31 Aug 2006 00:29:51 -0000	1.2
@@ -1,73 +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>
@@ -77,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>
@@ -90,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>
@@ -163,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>