Index: lams_tool_sbmt/web/authoring/instructions.jsp
===================================================================
diff -u -rdb11bf61b7b1cf6015649f067a53f73c5dbee792 -r17b9effc3c7ea57333aa800fff6d511689c32329
--- lams_tool_sbmt/web/authoring/instructions.jsp	(.../instructions.jsp)	(revision db11bf61b7b1cf6015649f067a53f73c5dbee792)
+++ lams_tool_sbmt/web/authoring/instructions.jsp	(.../instructions.jsp)	(revision 17b9effc3c7ea57333aa800fff6d511689c32329)
@@ -1,106 +1,115 @@
-<%@include file="/common/taglibs.jsp"%>
+<%@ include file="/common/taglibs.jsp" %>
+<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 
-<!-- Instruction Tab Content -->
-<table cellpadding="0">
-	<!-- Instructions Row -->
-	<tr>
-		<td>
-			<lams:SetEditor id="OnlineInstruction" text="${authoring.onlineInstruction}" key="label.authoring.online.instruction" small="true"/>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<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>
-			</div>
-		</td>
-	</tr>
-	<tr>
-		<td class="field-name">
-			<fmt:message key="label.authoring.online.file" />
-			:
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<html:file property="onlineFile">
-				<fmt:message key="label.authoring.choosefile.button" />
-			</html:file>
-			<html:button onclick="javascript:doSubmit('uploadOnline');" property="uploadOnlineButt" styleClass="button">
-				<fmt:message key="label.authoring.upload.online.button" />
-			</html:button>
-		</td>
-	</tr>
-	<!-- Offline Instructions -->
-</table>
+<script lang="javascript">
+<!-- Common Javascript functions for LAMS -->
+	var offlineArea = "offlinefileArea";
+	var onlineArea = "onlinefileArea";
+	function deleteOfflineFile(fileUuid,fileVersionId){
+		var url = "<c:url value="/authoring.do?dispatch=deleteOfflineFile"/>";
+	    var reqIDVar = new Date();
+		var param = "sessionMapID=${formBean.sessionMapID}&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.do?dispatch=deleteOnlineFile"/>";
+	    var reqIDVar = new Date();
+		var param = "sessionMapID=${formBean.sessionMapID}&fileUuid=" + fileUuid + "&fileVersionId="+ fileVersionId+"&reqID="+reqIDVar.getTime();
+		onlineLoading();
+	    var myAjax = new Ajax.Updater(
+		    	onlineArea,
+		    	url,
+		    	{
+		    		method:'get',
+		    		parameters:param,
+		    		onComplete:onlineComplete,
+		    		evalScripts:false
+		    	}
+	    );
+	}
 
-<hr/>
-
-<table cellpadding="0">	
-	
-	<tr>
-		<td>
-			<lams:SetEditor id="OfflineInstruction" text="${authoring.offlineInstruction}" key="label.authoring.offline.instruction" small="true" alt="true"/>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<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>
-						<c:set var="downloadOfflineURL">
-							<html:rewrite page="/download/?uuid=${file.uuID}&versionID=${details.versionID}&preferDownload=true" />
-						</c:set>
-						<html:link href="${downloadOfflineURL}">
-							<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>
-			</div>
-		</td>
-	</tr>
-	<tr>
-		<td class="field-name-alternative-color">
-			<fmt:message key="label.authoring.offline.file" />
-			:
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<html:file property="offlineFile">
-				<fmt:message key="label.authoring.choosefile.button" />
-			</html:file>
-			<html:button onclick="javascript:doSubmit('uploadOffline');" property="uploadOfflineButt" styleClass="button">
-				<fmt:message key="label.authoring.upload.offline.button" />
-			</html:button>
-		</td>
-	</tr>
-</table>
+	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-->
+		<tr>
+		</tr>
+		<!-- Instructions Row -->
+		<tr>
+			<td colspan="2">
+				<lams:SetEditor id="onlineInstruction" small="true" text="${formBean.onlineInstruction}" key="label.authoring.online.instruction" />
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2">
+				<c:set var="onlineFileList" value="${formBean.onlineFileList}"/>
+				<div id="onlinefileArea">
+					<%@ include file="parts/onlinefilelist.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="offlineInstruction" small="true"  text="${formBean.offlineInstruction}" key="label.authoring.offline.instruction"/>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2">
+				<c:set var="offlineFileList" value="${formBean.offlineFileList}"/>
+				<div id="offlinefileArea">
+					<%@ include file="parts/offlinefilelist.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