Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r77e263b43c7aed360e8dcc46af273db55123bc83 -r72862d19e593b3413e3d25913428d54bc379fde5
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 72862d19e593b3413e3d25913428d54bc379fde5)
@@ -172,8 +172,10 @@
 		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 		
 		Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
 		ForumForm forumForm = (ForumForm)form;
 		forumForm.setSessionMapID(sessionMap.getSessionID());
+		forumForm.setContentFolderID(contentFolderID);
 		
 		//get back the topic list and display them on page
 		forumService = getForumManager();
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java
===================================================================
diff -u -r77e263b43c7aed360e8dcc46af273db55123bc83 -r72862d19e593b3413e3d25913428d54bc379fde5
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java	(.../ForumForm.java)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java	(.../ForumForm.java)	(revision 72862d19e593b3413e3d25913428d54bc379fde5)
@@ -63,6 +63,7 @@
 	private Long toolContentID;
 	private String currentTab;
 	private String sessionMapID;
+	private String contentFolderID;
 	
     private FormFile offlineFile;
     private FormFile onlineFile;
@@ -177,5 +178,11 @@
 	public void setSessionMapID(String sessionMapID) {
 		this.sessionMapID = sessionMapID;
 	}
+	public String getContentFolderID() {
+		return contentFolderID;
+	}
+	public void setContentFolderID(String contentFolderID) {
+		this.contentFolderID = contentFolderID;
+	}
 
 }
Index: lams_tool_forum/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u -r899e6e7114706bb12cdc7aa09c697cf51137db55 -r72862d19e593b3413e3d25913428d54bc379fde5
--- lams_tool_forum/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 899e6e7114706bb12cdc7aa09c697cf51137db55)
+++ lams_tool_forum/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 72862d19e593b3413e3d25913428d54bc379fde5)
@@ -14,6 +14,7 @@
 		<attribute>
 			<name>id</name>
 			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
   		</attribute>
 		<attribute>
 			<name>basePath</name>
Index: lams_tool_forum/web/WEB-INF/lams.tld
===================================================================
diff -u -r3598d5bbce42e145fc46a33d70a7bd035b71d8bc -r72862d19e593b3413e3d25913428d54bc379fde5
--- lams_tool_forum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 3598d5bbce42e145fc46a33d70a7bd035b71d8bc)
+++ lams_tool_forum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 72862d19e593b3413e3d25913428d54bc379fde5)
@@ -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>   	
@@ -310,14 +306,8 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-   	<tag-file>
+	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
-	<tag-file>
-	    <name>DefineLater</name>
-		<path>/WEB-INF/tags/DefineLater.tag</path>
-   	</tag-file>  
-   	
-   	
 </taglib>
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2 -r72862d19e593b3413e3d25913428d54bc379fde5
--- lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 72862d19e593b3413e3d25913428d54bc379fde5)
@@ -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_forum/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/FCKEditor.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/FCKEditor.tag	(revision 72862d19e593b3413e3d25913428d54bc379fde5)
@@ -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 72862d19e593b3413e3d25913428d54bc379fde5 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/tags/HTMLEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 72862d19e593b3413e3d25913428d54bc379fde5 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/tags/SetEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
diff -u -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2 -r72862d19e593b3413e3d25913428d54bc379fde5
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 72862d19e593b3413e3d25913428d54bc379fde5)
@@ -1,13 +1,17 @@
 <%@ include file="/includes/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.forum.util.ForumConstants"%>
 
-<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
+<html:form action="authoring/update" method="post"
+	styleId="authoringForm" enctype="multipart/form-data">
 	<html:hidden property="toolContentID" />
 	<html:hidden property="sessionMapID" />
+	<html:hidden property="contentFolderID" />
 	<html:hidden property="currentTab" styleId="currentTab" />
 	<input type="hidden" name="mode" value="author">
-	
-	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+
+	<c:set var="formBean"
+		value="<%=request
+										.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	<div id="header">
 
 
@@ -18,18 +22,20 @@
 		</lams:Tabs>
 	</div>
 	<div id="content">
-			<table>
-			<tr><td>
-			<%@ include file="/common/messages.jsp"%>
-			</td></tr>
-			</table>
-			<lams:TabBody id="1" titleKey="authoring.tab.basic" page="basic.jsp" />
-			<lams:TabBody id="2" titleKey="authoring.tab.advanced" page="advance.jsp" />
-			<lams:TabBody id="3" titleKey="authoring.tab.instructions" page="instructions.jsp" />
-			<!-- Button Row -->
-			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
-				toolSignature="<%=ForumConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" 
-				customiseSessionID="${formBean.sessionMapID}" />
-			<lams:HTMLEditor />
+
+		<%@ include file="/common/messages.jsp"%>
+
+		<lams:TabBody id="1" titleKey="authoring.tab.basic" page="basic.jsp" />
+		<lams:TabBody id="2" titleKey="authoring.tab.advanced"
+			page="advance.jsp" />
+		<lams:TabBody id="3" titleKey="authoring.tab.instructions"
+			page="instructions.jsp" />
+		<!-- Button Row -->
+		<lams:AuthoringButton formID="authoringForm"
+			clearSessionActionUrl="/clearsession.do"
+			toolSignature="<%=ForumConstants.TOOL_SIGNATURE%>"
+			toolContentID="${formBean.toolContentID}"
+			customiseSessionID="${formBean.sessionMapID}"
+			contentFolderID="${formBean.contentFolderID}" />
 	</div>
 </html:form>
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -r07bc909cfe122031c6236b32088858d4cd295fe9 -r72862d19e593b3413e3d25913428d54bc379fde5
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 07bc909cfe122031c6236b32088858d4cd295fe9)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 72862d19e593b3413e3d25913428d54bc379fde5)
@@ -1,5 +1,7 @@
 <%@ include file="/includes/taglibs.jsp"%>
-<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+<c:set var="formBean"
+	value="<%=request
+									.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
 <!--  Basic Tab Content -->
 
@@ -27,36 +29,49 @@
 	}
 </script>
 
-<table >
+<table>
 	<tr>
-		<td  colspan="2">
-			<lams:SetEditor id="forum.title" text="${formBean.forum.title}" small="true" key="label.authoring.basic.title" />
+		<td colspan="2">
+			<div class="field-name" style="text-align: left;">
+				<fmt:message key="label.authoring.basic.title"></fmt:message>
+			</div>
+			<html:text property="forum.title" style="width: 100%;"></html:text>
 		</td>
 	</tr>
 	<tr>
-		<td  colspan="2">
-			<lams:SetEditor id="forum.instructions" text="${formBean.forum.instructions}" key="label.authoring.basic.instruction"/>
+		<td colspan="2">
+			<div class="field-name" style="text-align: left;">
+				<fmt:message key="label.authoring.basic.instruction"></fmt:message>
+			</div>
+			<lams:FCKEditor id="forum.instructions"
+				value="${formBean.forum.instructions}"
+				contentFolderID="${formBean.contentFolderID}"></lams:FCKEditor>
+
+			<%--			<lams:SetEditor id="forum.instructions" text="${formBean.forum.instructions}" key="label.authoring.basic.instruction"/>--%>
 		</td>
 	</tr>
 </table>
-	<!-- Topics List Row -->
-	<div id="messageListArea">
-		<c:set var="sessionMapID" value="${formBean.sessionMapID}"/>
-		<%@ include file="/jsps/authoring/message/topiclist.jsp"%>
-	</div>
-<table >
+<!-- Topics List Row -->
+<div id="messageListArea">
+	<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
+	<%@ include file="/jsps/authoring/message/topiclist.jsp"%>
+</div>
+<table>
 	<tr>
 		<td colspan="2" align="left">
-			<a href="javascript:showMessage('<html:rewrite page="/authoring/newTopic.do?sessionMapID=${formBean.sessionMapID}"/>');" style="float:left;width:150px"  class="button">
-				<fmt:message key="label.authoring.create.new.topic" />
-			</a>
+			<a
+				href="javascript:showMessage('<html:rewrite page="/authoring/newTopic.do?sessionMapID=${formBean.sessionMapID}"/>');"
+				style="float:left;width:150px" class="button"> <fmt:message
+					key="label.authoring.create.new.topic" /> </a>
 		</td>
 	</tr>
 	<tr>
 		<td colspan="2">
-			<iframe onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'" 
-			id="messageArea" name="messageArea" 
-			style="width:0px;height:0px;border:0px;display:none" frameborder="no" scrolling="no">
+			<iframe
+				onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
+				id="messageArea" name="messageArea"
+				style="width:0px;height:0px;border:0px;display:none"
+				frameborder="no" scrolling="no">
 			</iframe>
 		</td>
 	</tr>
Index: lams_tool_forum/web/jsps/authoring/header.jsp
===================================================================
diff -u -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2 -r72862d19e593b3413e3d25913428d54bc379fde5
--- lams_tool_forum/web/jsps/authoring/header.jsp	(.../header.jsp)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
+++ lams_tool_forum/web/jsps/authoring/header.jsp	(.../header.jsp)	(revision 72862d19e593b3413e3d25913428d54bc379fde5)
@@ -20,11 +20,6 @@
 			selectTab(tag.value);
         else
 			selectTab(1);
-
-	   initEditor("forum.title");
-	   initEditor("forum.instructions");
-	   initEditor("forum.onlineInstructions");
-	   initEditor("forum.offlineInstructions");
 	}  
         
 	function doSelectTab(tabId) {
Index: lams_tool_forum/web/jsps/authoring/instructions.jsp
===================================================================
diff -u -r671e0f31315ba99ec13f82789869ce2a01e0ea04 -r72862d19e593b3413e3d25913428d54bc379fde5
--- lams_tool_forum/web/jsps/authoring/instructions.jsp	(.../instructions.jsp)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
+++ lams_tool_forum/web/jsps/authoring/instructions.jsp	(.../instructions.jsp)	(revision 72862d19e593b3413e3d25913428d54bc379fde5)
@@ -1,8 +1,9 @@
-<%@ include file="/common/taglibs.jsp" %>
-<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-<c:set var="sessionMapID" value="${formBean.sessionMapID}"/>
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="formBean"
+	value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 
-<script lang="javascript">
+<script type="text/javascript">
 <!-- Common Javascript functions for LAMS -->
 	var offlineArea = "offlinefileArea";
 	var onlineArea = "onlinefileArea";
@@ -52,65 +53,83 @@
 		hideBusy(onlineArea);
 	}
 </script>
-	<!-- Instruction Tab Content -->
-	<table class="forms">
-		<!--hidden field contentID passed by flash-->
-		<tr>
-		</tr>
-		<!-- Instructions Row -->
-		<tr>
-			<td colspan="2">
-				<lams:SetEditor id="forum.onlineInstructions" small="true" text="${formBean.forum.onlineInstructions}" key="label.authoring.online.instruction" />
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<c:set var="fileTypeFlag" value="<%=IToolContentHandler.TYPE_ONLINE %>"/>
-				<div id="onlinefileArea">
-					<%@ include file="parts/instructionfilelist.jsp" %>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td nowrap="nowrap" class="field-name">
-				<fmt:message key="label.authoring.online.file" />:
-			</td>
-			<td>
-				<html:file property="onlineFile">
-					<fmt:message key="label.authoring.choosefile.button" />
-				</html:file>
-				<a href="#" onclick="javascript:doSubmit('uploadOnline');" class="button">
-					<fmt:message key="label.authoring.upload.online.button" />
-				</a>
-			</td>
-		</tr>	
-		<!-- Offline Instructions -->
-		<tr>
-			<td colspan="2">
-			<lams:SetEditor id="forum.offlineInstructions" small="true"  text="${formBean.forum.offlineInstructions}" key="label.authoring.offline.instruction"/>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<c:set var="fileTypeFlag" value="<%=IToolContentHandler.TYPE_OFFLINE %>"/>
-				<div id="offlinefileArea">
-					<%@ include file="parts/instructionfilelist.jsp" %>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td nowrap="nowrap" valign="top" class="field-name">
-				<fmt:message key="label.authoring.offline.file" />:
-			</td>
-			<td valign="top">
-				<html:file property="offlineFile">
-					<fmt:message key="label.authoring.choosefile.button" />
-				</html:file>
-				<a href="#" onclick="javascript:doSubmit('uploadOffline');" class="button">
-					<fmt:message key="label.authoring.upload.offline.button" />
-				</a>
-				<p>&nbsp;</p>
-			</td>
-		</tr>			
-		</table>
-		
\ No newline at end of file
+<!-- Instruction Tab Content -->
+<table class="forms">
+	<!-- Instructions Row -->
+	<tr>
+		<td>
+			<div class="field-name" style="text-align: left;">
+				<fmt:message key="label.authoring.online.instruction"></fmt:message>
+			</div>
+			<html:textarea property="forum.onlineInstructions" rows="3" cols="80"></html:textarea>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<c:set var="fileTypeFlag"
+				value="<%=IToolContentHandler.TYPE_ONLINE %>" />
+			<div id="onlinefileArea">
+				<%@ include file="parts/instructionfilelist.jsp"%>
+			</div>
+		</td>
+	</tr>
+	<tr>
+		<td class="field-name">
+			<div class="field-name" style="text-align: left">
+				<fmt:message key="label.authoring.online.file" />
+			</div>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<html:file property="onlineFile">
+				<fmt:message key="label.authoring.choosefile.button" />
+			</html:file>
+			<a href="#" onclick="javascript:doSubmit('uploadOnline');"
+				class="button"> <fmt:message
+					key="label.authoring.upload.online.button" /> </a>
+		</td>
+	</tr>
+</table>
+
+<hr />
+
+<table>
+	<!-- Offline Instructions -->
+	<tr>
+		<td>
+			<div class="field-name-alternative-color" style="text-align: left;">
+				<fmt:message key="label.authoring.offline.instruction"></fmt:message>
+			</div>
+			<html:textarea property="forum.offlineInstructions" rows="3"
+				cols="80"></html:textarea>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<c:set var="fileTypeFlag"
+				value="<%=IToolContentHandler.TYPE_OFFLINE %>" />
+			<div id="offlinefileArea">
+				<%@ include file="parts/instructionfilelist.jsp"%>
+			</div>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<div class="field-name-alternative-color" style="text-align: left">
+				<fmt:message key="label.authoring.offline.file" />
+			</div>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<html:file property="offlineFile">
+				<fmt:message key="label.authoring.choosefile.button" />
+			</html:file>
+			<a href="#" onclick="javascript:doSubmit('uploadOffline');"
+				class="button"> <fmt:message
+					key="label.authoring.upload.offline.button" /> </a>
+		</td>
+	</tr>
+</table>
+
Index: lams_tool_forum/web/jsps/authoring/parts/instructionfilelist.jsp
===================================================================
diff -u -r671e0f31315ba99ec13f82789869ce2a01e0ea04 -r72862d19e593b3413e3d25913428d54bc379fde5
--- lams_tool_forum/web/jsps/authoring/parts/instructionfilelist.jsp	(.../instructionfilelist.jsp)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
+++ lams_tool_forum/web/jsps/authoring/parts/instructionfilelist.jsp	(.../instructionfilelist.jsp)	(revision 72862d19e593b3413e3d25913428d54bc379fde5)
@@ -1,66 +1,66 @@
-<%@ include file="/common/taglibs.jsp" %>
-<%@ page import=" org.lamsfoundation.lams.contentrepository.client.IToolContentHandler"%>
-<c:set var="CONS_OFFLINE" value="<%=IToolContentHandler.TYPE_OFFLINE %>"/>
+<%@ include file="/common/taglibs.jsp"%>
+<%@ page
+	import="org.lamsfoundation.lams.contentrepository.client.IToolContentHandler"%>
+<c:set var="CONS_OFFLINE" value="<%=IToolContentHandler.TYPE_OFFLINE%>" />
 <c:choose>
 	<c:when test="${fileTypeFlag==CONS_OFFLINE}">
-		<c:set var="targetFileType" value="<%=IToolContentHandler.TYPE_OFFLINE %>"/>
+		<c:set var="targetFileType"
+			value="<%=IToolContentHandler.TYPE_OFFLINE%>" />
 	</c:when>
 	<c:otherwise>
-		<c:set var="targetFileType" value="<%=IToolContentHandler.TYPE_ONLINE %>"/>
+		<c:set var="targetFileType"
+			value="<%=IToolContentHandler.TYPE_ONLINE%>" />
 	</c:otherwise>
 </c:choose>
 
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
-<c:set var="fileList" value="${sessionMap.attachmentList}"/>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="fileList" value="${sessionMap.attachmentList}" />
 
 <%-- check whehter has target file type --%>
 <c:forEach var="file" items="${fileList}">
 	<c:if test="${targetFileType == file.fileType}">
-		<c:set var="hasFile" value="${true}"/>
+		<c:set var="hasFile" value="${true}" />
 	</c:if>
 </c:forEach>
 
 <%-- Display target file type --%>
 <c:if test="${hasFile}">
-	<table style="align:left;width:600px" border="0" >
+	<ul>
 		<c:forEach var="file" items="${fileList}">
 			<c:if test="${targetFileType == file.fileType}">
-			<tr>
-					<td>
-						<c:out value="${file.fileName}"/>
-					</td>
-					<td width="80px" align="center">
-						<c:set var="viewURL">
-							<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=false"/>
-						</c:set>
-						<html:link href="javascript:launchPopup('${viewURL}','offlinefile')" styleClass="button">
-							<fmt:message key="label.view"/>
-						</html:link>
-					</td>
-					<td width="100px" align="center">
-						<c:set var="downloadURL">
-								<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
-						</c:set>
-						<html:link href="${downloadURL}"  styleClass="button">
-							<fmt:message key="label.download"/>
-						</html:link>
-					</td>
-					<td width="80px" align="center">
+				<li>
+					<c:out value="${file.fileName}" />
+					<c:set var="viewURL">
+						<html:rewrite
+							page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=false" />
+					</c:set>
+					<html:link
+						href="javascript:launchPopup('${viewURL}','offlinefile')">
+						<fmt:message key="label.view" />
+					</html:link>
+					<c:set var="downloadURL">
+						<html:rewrite
+							page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
+					</c:set>
+					<html:link href="${downloadURL}">
+						<fmt:message key="label.download" />
+					</html:link>
 					<c:choose>
 						<c:when test="${fileTypeFlag==CONS_OFFLINE}">
-							<html:link href="#" onclick="deleteOfflineFile(${file.fileUuid},${file.fileVersionId})" styleClass="button">
-								<fmt:message key="label.authoring.offline.delete"/>
+							<html:link href="#"
+								onclick="deleteOfflineFile(${file.fileUuid},${file.fileVersionId})">
+								<fmt:message key="label.authoring.offline.delete" />
 							</html:link>
 						</c:when>
 						<c:otherwise>
-							<html:link href="#" onclick="deleteOnlineFile(${file.fileUuid},${file.fileVersionId})" styleClass="button">
-								<fmt:message key="label.authoring.online.delete"/>
+							<html:link href="#"
+								onclick="deleteOnlineFile(${file.fileUuid},${file.fileVersionId})">
+								<fmt:message key="label.authoring.online.delete" />
 							</html:link>
 						</c:otherwise>
 					</c:choose>
-					</td>				
-				</tr>			
+				</li>
 			</c:if>
 		</c:forEach>
-	</table>
-</c:if>
\ No newline at end of file
+	</ul>
+</c:if>