Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r754e5e666cf510aff7f8f25527987cee00319ee2 -rf644eb2a669882b4938c6b49bb0441e70bb7adb9
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 754e5e666cf510aff7f8f25527987cee00319ee2)
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
@@ -26,6 +26,39 @@
 			<forward name="author" path="/pages/authoring/authoring.jsp" />
 			<forward name="monitoring" path="/pages/monitoring/authoring.jsp" />
 		</action>
+		<!-- ==========  Instrcutions File: online/offline ========== -->
+		<action path="/authoring/uploadOnlineFile"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
+			name="resourceForm" 
+			scope="session" 
+			validate="false"
+			parameter="uploadOnlineFile">
+			<forward name="success" path="/pages/authoring/authoring.jsp" />
+		</action>
+		<action path="/authoring/uploadOfflineFile"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
+			name="resourceForm" 
+			scope="session" 
+			validate="false"
+			parameter="uploadOfflineFile">
+			<forward name="success" path="/pages/authoring/authoring.jsp" />
+		</action>
+		<action path="/authoring/deleteOnlineFile"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
+			name="resourceForm" 
+			scope="session" 
+			validate="false"
+			parameter="deleteOnlineFile">
+			<forward name="success" path="/pages/authoring/parts/onlinefilelist.jsp" />
+		</action>
+		<action path="/authoring/deleteOfflineFile"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
+			name="resourceForm" 
+			scope="session" 
+			validate="false"
+			parameter="deleteOfflineFile">
+			<forward name="success" path="/pages/authoring/parts/offlinefilelist.jsp" />
+		</action>
 		<!-- ==========  Resource Item : URL ========== -->
 		<action path="/authoring/newItemInit"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -r754e5e666cf510aff7f8f25527987cee00319ee2 -rf644eb2a669882b4938c6b49bb0441e70bb7adb9
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 754e5e666cf510aff7f8f25527987cee00319ee2)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
@@ -39,6 +39,8 @@
 	
 	//for parameters' name
 	public static final String PARAM_TOOL_CONTENT_ID = "toolContentID";
+	public static final String PARAM_FILE_VERSION_ID = "fileVersionId";
+	public static final String PARAM_FILE_UUID = "fileUuid";
 	public static final String PARAM_ITEM_INDEX = "itemIndex";
 	
 	//for request attribute name
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -r754e5e666cf510aff7f8f25527987cee00319ee2 -rf644eb2a669882b4938c6b49bb0441e70bb7adb9
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 754e5e666cf510aff7f8f25527987cee00319ee2)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
@@ -555,7 +555,7 @@
 			log.error("Upload instruction attachment failed:" + e.getMessage());
 		}
 		
-		return mapping.findForward("success");
+		return mapping.findForward(ResourceConstants.SUCCESS);
 
 	}
 	/**
@@ -568,7 +568,7 @@
 	 */
 	public ActionForward deleteOfflineFile(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
-		return deleteFile(request, response,form, IToolContentHandler.TYPE_OFFLINE);
+		return deleteFile(mapping,request, response,form, IToolContentHandler.TYPE_OFFLINE);
 	}
 	/**
 	 * Delete online instruction file from current Resource authoring page.
@@ -580,20 +580,20 @@
 	 */
 	public ActionForward deleteOnlineFile(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
-		return deleteFile(request, response,form, IToolContentHandler.TYPE_ONLINE);
+		return deleteFile(mapping, request, response,form, IToolContentHandler.TYPE_ONLINE);
 	}
 
 	/**
+	 * @param mapping 
 	 * @param request
 	 * @param response
 	 * @param form 
 	 * @param type 
 	 * @return
 	 */
-	private ActionForward deleteFile(HttpServletRequest request, HttpServletResponse response, ActionForm form, String type) {
-		Long contentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
-		Long versionID = new Long(WebUtil.readLongParam(request,"versionID"));
-		Long uuID = new Long(WebUtil.readLongParam(request,"uuID"));
+	private ActionForward deleteFile(ActionMapping mapping, HttpServletRequest request, HttpServletResponse response, ActionForm form, String type) {
+		Long versionID = new Long(WebUtil.readLongParam(request,ResourceConstants.PARAM_FILE_VERSION_ID));
+		Long uuID = new Long(WebUtil.readLongParam(request,ResourceConstants.PARAM_FILE_UUID));
 		
 		//handle session value
 		List attachmentList = getAttachmentList(request);
@@ -606,6 +606,7 @@
 			if(existAtt.getFileUuid().equals(uuID) && existAtt.getFileVersionId().equals(versionID)){
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
+				//remove from attachemnt
 				iter.remove();
 				break;
 			}
@@ -626,46 +627,13 @@
 				break;
 			}
 		}
-		StringBuffer sb = new StringBuffer();
-		iter = leftAttachments.iterator();
-		while(iter.hasNext()){
-//			ResourceAttachment file = (ResourceAttachment) iter.next();
-//			sb.append("<li>").append(file.getFileName()).append("\r\n");
-//			sb.append(" <a href=\"javascript:launchInstructionsPopup('download/?uuid=").append(file.getFileUuid()).append("&preferDownload=false')\">");
-//			sb.append(this.getResources(request).getMessage("label.view"));
-//			sb.append("</a>\r\n");
-//			sb.append(" <a href=\"../download/?uuid=").append(file.getFileUuid()).append("&preferDownload=true\">");
-//			sb.append(this.getResources(request).getMessage("label.download"));
-//			sb.append("</a>\r\n");
-//			sb.append("<a href=\"javascript:loadDoc('");
-//			sb.append(ForumConstants.TOOL_URL_BASE);
-//			sb.append("deletefile.do?method=");
-//			if(StringUtils.equals(type,IToolContentHandler.TYPE_OFFLINE))
-//				sb.append("deleteOffline");
-//			else
-//				sb.append("deleteOnline");
-//			sb.append("File&toolContentID=").append(contentID);
-//			sb.append("&uuID=").append(file.getFileUuid()).append("&versionID=").append(file.getFileVersionId()).append("','");
-//			if(StringUtils.equals(type,IToolContentHandler.TYPE_OFFLINE))
-//				sb.append("offlinefile");
-//			else
-//				sb.append("onlinefile");
-//			sb.append("')\">");
-//			
-//			if(StringUtils.equals(type,IToolContentHandler.TYPE_OFFLINE))
-//				sb.append(this.getResources(request).getMessage("label.authoring.offline.delete"));
-//			else
-//				sb.append(this.getResources(request).getMessage("label.authoring.online.delete"));
-//			sb.append("</a></li>\r\n");
+		if(StringUtils.equals(IToolContentHandler.TYPE_OFFLINE,type)){
+			request.setAttribute("offlineFileList",leftAttachments);
+		}else{
+			request.setAttribute("onlineFileList",leftAttachments);
 		}
-		try {
-			PrintWriter out = response.getWriter();
-			out.print(sb.toString());
-			out.flush();
-		} catch (IOException e) {
-			log.error(e);
-		}
-		return null;
+		return mapping.findForward(ResourceConstants.SUCCESS);
+
 	}
 	//*************************************************************************************
 	// Private method 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java
===================================================================
diff -u -r57a8fd80863308a6aae133850dbe2de4acd15abf -rf644eb2a669882b4938c6b49bb0441e70bb7adb9
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java	(.../ResourceForm.java)	(revision 57a8fd80863308a6aae133850dbe2de4acd15abf)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java	(.../ResourceForm.java)	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
@@ -47,7 +47,8 @@
  * User: Dapeng.Ni
  */
 public class ResourceForm extends ValidatorForm {
-	private static final long serialVersionUID = -6054354910960460120L;
+	private static final long serialVersionUID = 3599879328307492312L;
+
 	private static Logger logger = Logger.getLogger(ResourceForm.class.getName());
 
 	//Forum fields
@@ -89,15 +90,6 @@
         	logger.error("Initial ResourceForum failed by null value of Resource.");
         }
 	}
-    public void reset(ActionMapping mapping, HttpServletRequest request){
-    	resource.setAllowAddFiles(false);
-    	resource.setAllowAddUrls(false);
-    	resource.setLockWhenFinished(false);
-    	resource.setDefineLater(false);
-    	resource.setRunAuto(false);
-    	resource.setRunOffline(false);
-    }
-
 	public int getCurrentTab() {
 		return currentTab;
 	}
Index: lams_tool_larsrc/web/includes/javascript/rsrccommon.js
===================================================================
diff -u
--- lams_tool_larsrc/web/includes/javascript/rsrccommon.js	(revision 0)
+++ lams_tool_larsrc/web/includes/javascript/rsrccommon.js	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
@@ -0,0 +1,18 @@
+	function launchPopup(url,title) {
+		var wd = null;
+		if(wd && wd.open && !wd.closed){
+			wd.close();
+		}
+		wd = window.open(url,title,'resizable,width=796,height=570,scrollbars');
+		wd.window.focus();
+	}
+	function showBusy(targetDiv){
+		if($(targetDiv+"_Busy") != null){
+			Element.show(targetDiv+"_Busy");
+		}
+	}
+	function hideBusy(targetDiv){
+		if($(targetDiv+"_Busy") != null){
+			Element.hide(targetDiv+"_Busy");
+		}				
+	}
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/authoring/advance.jsp
===================================================================
diff -u -rf3709b5af90ca8439a64e65b0c971bc547b1eb3a -rf644eb2a669882b4938c6b49bb0441e70bb7adb9
--- lams_tool_larsrc/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision f3709b5af90ca8439a64e65b0c971bc547b1eb3a)
+++ lams_tool_larsrc/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
@@ -1,28 +1,26 @@
+<%@ include file="/common/taglibs.jsp" %>
+<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-
 <!---------------------------Advance Tab Content ------------------------>	
 	<table class="forms">
 		<!-- Instructions Row -->
 		<tr>
 			<td colspan="2 class="formcontrol">
-				<html:checkbox property="resource.lockWhenFinished" value="1">
+				<html:checkbox property="resource.lockWhenFinished">
 					<fmt:message key="label.authoring.advance.lock.on.finished" />
 				</html:checkbox>
 			</td>
 		</tr>
 		<tr>
 			<td colspan="2 class="formcontrol">
-				<html:checkbox property="resource.runAuto" value="1">
+				<html:checkbox property="resource.runAuto">
 					<fmt:message key="label.authoring.advance.run.content.auto" />
 				</html:checkbox>
 			</td>
 		</tr>
 		<tr>
 			<td class="formcontrol">
-				<html:select property="resource.minViewResourceNumber" value="1">
+				<html:select property="resource.minViewResourceNumber">
 					<html:option value="1">1</html:option>
 					<html:option value="2">2</html:option>
 					<html:option value="3">3</html:option>
@@ -36,14 +34,14 @@
 		</tr>
 		<tr>
 			<td colspan="2 class="formcontrol">
-				<html:checkbox property="resource.allowAddUrls" value="1">
+				<html:checkbox property="resource.allowAddUrls">
 					<fmt:message key="label.authoring.advance.allow.learner.add.urls" />
 				</html:checkbox>
 			</td>
 		</tr>
 		<tr>
 			<td colspan="2 class="formcontrol">
-				<html:checkbox property="resource.allowAddFiles" value="1">
+				<html:checkbox property="resource.allowAddFiles">
 					<fmt:message key="label.authoring.advance.allow.learner.add.files" />
 				</html:checkbox>
 			</td>
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r2699ca5080d7ebf1fbcd84c3f5060428b6fbb192 -rf644eb2a669882b4938c6b49bb0441e70bb7adb9
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 2699ca5080d7ebf1fbcd84c3f5060428b6fbb192)
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
@@ -23,6 +23,7 @@
 	<!-- this is the custom CSS for hte tool -->
 	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
     <link href="<html:rewrite page='/includes/css/fckeditor_style.css'/>" rel="stylesheet" type="text/css">
+	<link href="<html:rewrite page='/includes/css/rsrc.css'/>" rel="stylesheet" type="text/css">
 
  	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
     <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
@@ -31,6 +32,7 @@
     <script type="text/javascript" src="<html:rewrite page='/includes/javascript/fckcontroller.js'/>"></script>
     <script type="text/javascript" src="<html:rewrite page='/includes/javascript/tabcontroller.js'/>"></script>    
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/prototype.js'/>"></script>
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrccommon.js'/>"></script>
 
     <script>
     
@@ -62,10 +64,21 @@
 	    	selectTab(tabId);
         } 
         
-        function doSubmit(method) {
+        function doSubmit() {
         	$("authoringForm").submit();
         }
+        function doUploadOnline() {
+        	var myForm = $("authoringForm");
+        	myForm.action = "<c:url value='/authoring/uploadOnlineFile.do'/>";
+        	myForm.submit();
+        }
+        function doUploadOffline() {
+        	var myForm = $("authoringForm");
+        	myForm.action = "<c:url value='/authoring/uploadOfflineFile.do'/>";
+        	myForm.submit();
+        }
         
+        
     </script>
     <!-- ******************** END FCK Editor related javascript & HTML ********************** -->
     
@@ -74,7 +87,8 @@
 <body onLoad="init()">
 
 <html:form action="authoring/update" method="post" styleId="authoringForm"
-	focus="title"  enctype="multipart/form-data">
+	focus="resource.title"  enctype="multipart/form-data">
+<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 		<html:hidden property="toolContentID"/>
 		<html:hidden property="currentTab" styleId="currentTab" />
 
@@ -107,11 +121,10 @@
 
 <!-- Button Row -->
 		<p align="right">
-			<html:link href="javascript:doSubmit('updateContent');" property="submit" styleClass="button">
+			<html:link href="javascript:doSubmit();" property="submit" styleClass="button">
 				<fmt:message key="label.authoring.save.button" />
 			</html:link>
-			<html:link href="javascript:;" property="cancel"
-				onclick="window.close()" styleClass="button">
+			<html:link href="javascript:;" property="cancel" onclick="window.close()" styleClass="button">
 				<fmt:message key="label.authoring.cancel.button" />
 			</html:link>
 		</p>
Index: lams_tool_larsrc/web/pages/authoring/basic.jsp
===================================================================
diff -u -r0c4f17efc49e7012360fb98ac98b7e4a005fea9f -rf644eb2a669882b4938c6b49bb0441e70bb7adb9
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
@@ -1,4 +1,5 @@
 <%@ include file="/common/taglibs.jsp" %>
+<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 <script lang="javascript">
 <!-- Common Javascript functions for LAMS -->
 
@@ -18,21 +19,16 @@
 		area.style.height="0px";
 		area.style.display="none";
 	}
-	function launchPopup(url,title) {
-		var wd = null;
-		if(wd && wd.open && !wd.closed){
-			wd.close();
-		}
-		wd = window.open(url,title,'resizable,width=796,height=570,scrollbars');
-		wd.window.focus();
-	}
+
 	function verifyUrl(myUrl, title){
 		launchPopup(myUrl,title);
 	}
 	
 	function previewItem(type,idx,uuid,versionId){
 		//2:file, 3:website,4:learning object
 		if(type == 2){
+			var myUrl = "<c:url value='/download/?uuid='/>"+uuid+"&preferDownload=false";
+			launchPopup(myUrl,"File");
 		}else if(type ==3){
 			var myUrl = "<c:url value='/download/?uuid='/>"+uuid+"&preferDownload=false";
 			launchPopup(myUrl,"Website");
@@ -71,29 +67,18 @@
 	}
 	function deleteItemComplete(){
 		hideBusy(resourceListTargetDiv);
-	
 	}
-	function showBusy(targetDiv){
-		if($(targetDiv+"_Busy") != null){
-			Element.show(targetDiv+"_Busy");
-		}
-	}
-	function hideBusy(targetDiv){
-		if($(targetDiv+"_Busy") != null){
-			Element.hide(targetDiv+"_Busy");
-		}				
-	}
 </script>
 	<!---------------------------Basic Tab Content ------------------------>
 	<table class="forms">
 		<tr>
 			<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
-			<td NOWRAP width="700"><lams:SetEditor id="Title" text="${authoring.title}" small="true"/></td>
+			<td NOWRAP width="700"><lams:SetEditor id="Resource.title" text="${formBean.resource.title}" small="true"/></td>
 		</tr>
 		<tr>
 			<td class="formlabel"><fmt:message key="label.authoring.basic.instruction" />:</td>
 			<td NOWRAP width="700">
-				<lams:SetEditor id="Instructions" text="${authoring.instruction}"/>
+				<lams:SetEditor id="Resource.instructions" text="${formBean.resource.instructions}"/>
 			</td>
 		</tr>
 		<tr>
Index: lams_tool_larsrc/web/pages/authoring/instructions.jsp
===================================================================
diff -u -ra3299505c1f0a51ade0247a7117581df5c7b6066 -rf644eb2a669882b4938c6b49bb0441e70bb7adb9
--- lams_tool_larsrc/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision a3299505c1f0a51ade0247a7117581df5c7b6066)
+++ lams_tool_larsrc/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
@@ -1,8 +1,56 @@
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ include file="/common/taglibs.jsp" %>
+<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 
+<script lang="javascript">
+<!-- Common Javascript functions for LAMS -->
+	var offlineArea = "offlinefileArea";
+	var onlineArea = "onlinefileArea";
+	function deleteOfflineFile(fileUuid,fileVersionId){
+		var url = "<c:url value="/authoring/deleteOfflineFile.do"/>";
+	    var reqIDVar = new Date();
+		var param = "fileUuid=" + fileUuid + "&fileVersionId="+ fileVersionId+"&reqID="+reqIDVar.getTime();
+		offlineLoading();
+	    var myAjax = new Ajax.Updater(
+		    	offlineArea,
+		    	url,
+		    	{
+		    		method:'get',
+		    		parameters:param,
+		    		onComplete:offlineComplete,
+		    		evalScripts:false
+		    	}
+	    );
+	}
+	function deleteOnlineFile(fileUuid,fileVersionId){
+		var url = "<c:url value="/authoring/deleteOnlineFile.do"/>";
+	    var reqIDVar = new Date();
+		var param = "fileUuid=" + fileUuid + "&fileVersionId="+ fileVersionId+"&reqID="+reqIDVar.getTime();
+		onlineLoading();
+	    var myAjax = new Ajax.Updater(
+		    	onlineArea,
+		    	url,
+		    	{
+		    		method:'get',
+		    		parameters:param,
+		    		onComplete:onlineComplete,
+		    		evalScripts:false
+		    	}
+	    );
+	}
+
+	function offlineLoading(){
+		showBusy(offlineArea);
+	}
+	function offlineComplete(){
+		hideBusy(offlineArea);
+	}
+	function onlineLoading(){
+		showBusy(onlineArea);
+	}
+	function onlineComplete(){
+		hideBusy(onlineArea);
+	}
+</script>
 	<!---------------------------Instruction Tab Content ------------------------>
 	<table class="forms">
 		<!--hidden field contentID passed by flash-->
@@ -13,35 +61,15 @@
 			<td class="formlabel"><fmt:message
 				key="label.authoring.online.instruction" />:</td>
 			<td NOWRAP width="700">
-				<lams:SetEditor id="OnlineInstruction" text="${authoring.onlineInstruction}"/>
+				<lams:SetEditor id="Resource.onlineInstructions" text="${formBean.resource.onlineInstructions}"/>
 			</td>
 		</tr>
 		<tr>
 			<td></td>
 			<td class="formcontrol">
-				<div id="onlinefile">
-				<c:forEach var="file" items="${authoring.onlineFiles}">
-					<li><c:out value="${file.name}"/>
-					<c:set var="viewURL">
-						<html:rewrite page="/download/?uuid=${file.uuID}&preferDownload=false"/>
-					</c:set>
-					<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-						<fmt:message key="label.view"/>
-					</a>&nbsp;
-					<c:set var="downloadURL">
-							<html:rewrite page="/download/?uuid=${file.uuID}&versionID=${details.versionID}&preferDownload=true"/>
-					</c:set>
-					<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-						<fmt:message key="label.download"/>
-					</a>&nbsp;
-					<c:set var="deleteonline">
-					<html:rewrite page="/deletefile.do?method=deleteOnlineFile&toolContentID=${authoring.contentID}&uuID=${file.uuID}&versionID=${file.versionID}"/>
-					</c:set>
-					<html:link href="javascript:loadDoc('${deleteonline}','onlinefile')">
-						<fmt:message key="label.authoring.online.delete"/>
-					</html:link>					
-					</li>
-				</c:forEach>
+				<c:set var="onlineFileList" value="${formBean.onlineFileList}"/>
+				<div id="onlinefileArea">
+					<%@ include file="parts/onlinefilelist.jsp" %>
 				</div>
 			</td>
 		</tr>
@@ -50,42 +78,28 @@
 				<fmt:message key="label.authoring.online.file" />:
 			</td>
 			<td class="formcontrol">
-				<html:file property="onlineFile">
+				<html:file property="onlineFile" styleClass="buttonStyle">
 					<fmt:message key="label.authoring.choosefile.button" />
 				</html:file>
-				<html:link href="javascript:doSubmit('uploadOnline');" property="submit">
+				<html:button onclick="javascript:doUploadOnline();" property="uploadOnlineSubmit" styleClass="buttonStyle">
 					<fmt:message key="label.authoring.upload.online.button" />
-				</html:link>
+				</html:button>
 			</td>
 		</tr>	
 		<!------------Offline Instructions ----------------------->
 		<tr>
 			<td class="formlabel"><fmt:message
 				key="label.authoring.offline.instruction" />:</td>
 			<td NOWRAP width="700">
-			<lams:SetEditor id="OfflineInstruction" text="${authoring.offlineInstruction}"/>
+			<lams:SetEditor id="Resource.offlineInstructions" text="${formBean.resource.offlineInstructions}"/>
 			</td>
 		</tr>
 		<tr>
 			<td></td>
 			<td class="formcontrol">
-				<div id="offlinefile">
-				<c:forEach var="file" items="${authoring.offlineFiles}">
-					<li><c:out value="${file.name}"/>
-					<html:link href="javascript:launchInstructionsPopup('download/?uuid=${file.uuID}&preferDownload=false')">
-						<fmt:message key="label.view"/>
-					</html:link>
-					<html:link href="../download/?uuid=${file.uuID}&preferDownload=true">
-						<fmt:message key="label.download"/>
-					</html:link>
-					<c:set var="deleteoffline">
-					<html:rewrite page="/deletefile.do?method=deleteOfflineFile&toolContentID=${authoring.contentID}&uuID=${file.uuID}&versionID=${file.versionID}"/>
-					</c:set>
-					<html:link href="javascript:loadDoc('${deleteoffline}','offlinefile')">
-						<fmt:message key="label.authoring.offline.delete"/>
-					</html:link>					
-					</li>
-				</c:forEach>
+				<c:set var="offlineFileList" value="${formBean.offlineFileList}"/>
+				<div id="offlinefileArea">
+					<%@ include file="parts/offlinefilelist.jsp" %>
 				</div>
 			</td>
 		</tr>
@@ -94,12 +108,12 @@
 				<fmt:message key="label.authoring.offline.file" />:
 			</td>
 			<td class="formcontrol">
-				<html:file property="offlineFile">
+				<html:file property="offlineFile" styleClass="buttonStyle">
 					<fmt:message key="label.authoring.choosefile.button" />
 				</html:file>
-				<html:link href="javascript:doSubmit('uploadOffline');" property="submit">
+				<html:button onclick="javascript:doUploadOffline();" property="uploadOfflineSubmit" styleClass="buttonStyle">
 					<fmt:message key="label.authoring.upload.offline.button" />
-				</html:link>
+				</html:button>
 			</td>
 		</tr>			
 		<tr><td colspan="2"><html:errors/></td></tr>
Index: lams_tool_larsrc/web/pages/authoring/parts/itemattachment.jsp
===================================================================
diff -u -r754e5e666cf510aff7f8f25527987cee00319ee2 -rf644eb2a669882b4938c6b49bb0441e70bb7adb9
--- lams_tool_larsrc/web/pages/authoring/parts/itemattachment.jsp	(.../itemattachment.jsp)	(revision 754e5e666cf510aff7f8f25527987cee00319ee2)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemattachment.jsp	(.../itemattachment.jsp)	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
@@ -7,7 +7,7 @@
 			<c:out value="${itemAttachment.fileName}" />
 		</td>
 		<td>
-			<a href="#" onclick="removeItemAttachment(${itemAttachment.itemIndex})">
+			<a href="#" onclick="removeItemAttachment(${itemAttachment.itemIndex})" style="button">
 				<fmt:message key="label.delete" />
 			</a>	
 		</td>
Index: lams_tool_larsrc/web/pages/authoring/parts/offlinefilelist.jsp
===================================================================
diff -u
--- lams_tool_larsrc/web/pages/authoring/parts/offlinefilelist.jsp	(revision 0)
+++ lams_tool_larsrc/web/pages/authoring/parts/offlinefilelist.jsp	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
@@ -0,0 +1,31 @@
+<%@ include file="/common/taglibs.jsp" %>
+<table border="0">
+	<c:forEach var="file" items="${offlineFileList}">
+	<tr>
+		<td>
+			<c:out value="${file.fileName}"/>
+		</td>
+		<td>
+			<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>
+			<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>
+			<html:link href="#" onclick="deleteOfflineFile(${file.fileUuid},${file.fileVersionId})" styleClass="button">
+				<fmt:message key="label.authoring.offline.delete"/>
+			</html:link>
+		</td>				
+	</tr>
+	</c:forEach>
+</table>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/authoring/parts/onlinefilelist.jsp
===================================================================
diff -u
--- lams_tool_larsrc/web/pages/authoring/parts/onlinefilelist.jsp	(revision 0)
+++ lams_tool_larsrc/web/pages/authoring/parts/onlinefilelist.jsp	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
@@ -0,0 +1,31 @@
+<%@ include file="/common/taglibs.jsp" %>
+<table border="0">
+	<c:forEach var="file" items="${onlineFileList}">
+	<tr>
+		<td>
+			<c:out value="${file.fileName}"/>
+		</td>
+		<td>
+			<c:set var="viewURL">
+				<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=false"/>
+			</c:set>
+			<html:link href="javascript:launchPopup('${viewURL}','onlinefile')" styleClass="button">
+				<fmt:message key="label.view"/>
+			</html:link>
+		</td>
+		<td>
+			<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>
+			<html:link href="#" onclick="deleteOnlineFile(${file.fileUuid},${file.fileVersionId})" styleClass="button">
+				<fmt:message key="label.authoring.online.delete"/>
+			</html:link>
+		</td>				
+	</tr>
+	</c:forEach>
+</table>
\ No newline at end of file