Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java,v
diff -u -r1.34 -r1.35
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	31 Aug 2006 06:39:02 -0000	1.34
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	1 Sep 2006 02:47:00 -0000	1.35
@@ -365,7 +365,11 @@
 		List items = null;
 		Resource resource = null;
 		ResourceForm resourceForm = (ResourceForm)form;
-
+		
+		// Get contentFolderID and save to form.
+		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+		resourceForm.setContentFolderID(contentFolderID);
+				
 		//initial Session Map 
 		SessionMap sessionMap = new SessionMap();
 		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
@@ -1057,4 +1061,4 @@
 	}
 
 
-}
+}
\ No newline at end of file
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java,v
diff -u -r1.9 -r1.10
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java	28 Aug 2006 07:23:13 -0000	1.9
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java	1 Sep 2006 02:47:00 -0000	1.10
@@ -53,6 +53,7 @@
 
 	//Forum fields
 	private String sessionMapID;
+	private String contentFolderID;
 	private int currentTab;
     private FormFile offlineFile;
     private FormFile onlineFile;
@@ -128,5 +129,13 @@
 		this.sessionMapID = sessionMapID;
 	}
 
+	public String getContentFolderID() {
+		return contentFolderID;
+	}
 
+	public void setContentFolderID(String contentFolderID) {
+		this.contentFolderID = contentFolderID;
+	}
+
+
 }
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.7 -r1.8
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	18 Aug 2006 07:02:04 -0000	1.7
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	1 Sep 2006 02:47:00 -0000	1.8
@@ -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_larsrc/web/WEB-INF/tags/FCKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/Attic/FCKEditor.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/WEB-INF/tags/FCKEditor.tag	1 Sep 2006 02:47:00 -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.6 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tags/HTMLEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tags/SetEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/WEB-INF/tlds/fckeditor/FCKeditor.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tlds/fckeditor/Attic/FCKeditor.tld,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/web/WEB-INF/tlds/fckeditor/FCKeditor.tld	24 Mar 2006 06:23:57 -0000	1.1
+++ lams_tool_larsrc/web/WEB-INF/tlds/fckeditor/FCKeditor.tld	1 Sep 2006 02:47:01 -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_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.7 -r1.8
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	28 Aug 2006 02:29:43 -0000	1.7
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	1 Sep 2006 02:47:00 -0000	1.8
@@ -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_larsrc/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/authoring.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	31 Aug 2006 06:39:02 -0000	1.19
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	1 Sep 2006 02:47:00 -0000	1.20
@@ -34,12 +34,7 @@
 	    		selectTab(tag.value);
             else
                 selectTab(1); //select the default tab;
-            
-            initEditor("Title");
-            initEditor("Instructions");
-            initEditor("OnlineInstruction");
-            initEditor("OfflineInstruction");
-            
+          
         }     
         
         function doSelectTab(tabId) {
@@ -123,6 +118,7 @@
 		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 		<html:hidden property="resource.contentId" />
 		<html:hidden property="sessionMapID" />
+		<html:hidden property="contentFolderID" />
 		<html:hidden property="currentTab" styleId="currentTab" />
 
 			<!-- tab content 1 (Basic) -->
@@ -147,13 +143,13 @@
 			--%>
 			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
 				toolSignature="<%=ResourceConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.resource.contentId}" 
-				 customiseSessionID="${formBean.sessionMapID}" />
+				 customiseSessionID="${formBean.sessionMapID}"
+				 contentFolderID="${formBean.contentFolderID}" />
 	</html:form>
 
 </div>
 
 <div id="footer"></div>
-<lams:HTMLEditor />
 <!-- end page div -->
 </div>
 
Index: lams_tool_larsrc/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/basic.jsp,v
diff -u -r1.18 -r1.19
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	25 Aug 2006 02:41:04 -0000	1.18
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	1 Sep 2006 02:47:00 -0000	1.19
@@ -65,11 +65,21 @@
 	<!-- Basic Tab Content -->
 	<table>
 		<tr>
-			<td colspan="2"><lams:SetEditor id="Resource.title" text="${formBean.resource.title}" small="true" key="label.authoring.basic.title" /></td>
+			<td colspan="2">
+				<div class="field-name" style="text-align: left;">
+					<fmt:message key="label.authoring.basic.title"></fmt:message>
+				</div>
+				<html:text property="resource.title" style="width: 100%;"></html:text>
+			</td>
 		</tr>
 		<tr>
 			<td colspan="2">
-				<lams:SetEditor id="Resource.instructions" text="${formBean.resource.instructions}"  key="label.authoring.basic.instruction"/>
+				<div class="field-name" style="text-align: left;">
+					<fmt:message key="label.authoring.basic.instruction"></fmt:message>
+				</div>
+				<lams:FCKEditor id="resource.instructions"
+					value="${formBean.resource.instructions}"
+					contentFolderID="${formBean.contentFolderID}"></lams:FCKEditor>
 			</td>
 		</tr>
 		<tr>
Index: lams_tool_larsrc/web/pages/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/Attic/instructions.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_larsrc/web/pages/authoring/instructions.jsp	28 Aug 2006 07:23:13 -0000	1.10
+++ lams_tool_larsrc/web/pages/authoring/instructions.jsp	1 Sep 2006 02:47:00 -0000	1.11
@@ -3,7 +3,7 @@
 <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";
@@ -53,64 +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="Resource.onlineInstructions" small="true" text="${formBean.resource.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:doUploadOnline();" class="button">
-					<fmt:message key="label.authoring.upload.online.button" />
-				</a>
-			</td>
-		</tr>	
-		<!-- Offline Instructions -->
-		<tr>
-			<td colspan="2">
-			<lams:SetEditor id="Resource.offlineInstructions" small="true"  text="${formBean.resource.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:doUploadOffline();" 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="resource.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>
+			<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:doUploadOnline();"
+				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="resource.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:doUploadOffline();"
+				class="button"> <fmt:message
+					key="label.authoring.upload.offline.button" /> </a>
+		</td>
+	</tr>
+</table>
+
Index: lams_tool_larsrc/web/pages/authoring/parts/instructionfilelist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/Attic/instructionfilelist.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/web/pages/authoring/parts/instructionfilelist.jsp	28 Aug 2006 07:23:14 -0000	1.1
+++ lams_tool_larsrc/web/pages/authoring/parts/instructionfilelist.jsp	1 Sep 2006 02:47:00 -0000	1.2
@@ -1,65 +1,65 @@
-<%@ 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.instructionAttachmentList}"/>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="fileList" value="${sessionMap.instructionAttachmentList}" />
 
 <%-- 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}','instructionfile')" 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">
-						<c:choose>
-							<c:when test="${fileTypeFlag==CONS_OFFLINE}">
-								<a href="#" onclick="deleteOfflineFile(${file.fileUuid},${file.fileVersionId})" class="button">
-									<fmt:message key="label.authoring.offline.delete"/>
-								</a>
-							</c:when>
-							<c:otherwise>
-								<a href="#" onclick="deleteOnlineFile(${file.fileUuid},${file.fileVersionId})" class="button">
-									<fmt:message key="label.authoring.online.delete"/>
-								</a>
-							</c:otherwise>
-						</c:choose>
-					</td>				
-				</tr>
+				<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}','instructionfile')">
+						<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})">
+								<fmt:message key="label.authoring.offline.delete" />
+							</html:link>
+						</c:when>
+						<c:otherwise>
+							<html:link href="#"
+								onclick="deleteOnlineFile(${file.fileUuid},${file.fileVersionId})">
+								<fmt:message key="label.authoring.online.delete" />
+							</html:link>
+						</c:otherwise>
+					</c:choose>
+				</li>
 			</c:if>
 		</c:forEach>
-	</table>
-</c:if>
\ No newline at end of file
+	</ul>
+</c:if>