Index: lams_tool_lamc/web/InstructionsContent.jsp
===================================================================
diff -u -rf6991bff0a6a158b9432f338079cc3fc650dd389 -r32fc4979f5d351d85b0b1d751810fe1433ee0fcc
--- lams_tool_lamc/web/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision f6991bff0a6a158b9432f338079cc3fc650dd389)
+++ lams_tool_lamc/web/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 32fc4979f5d351d85b0b1d751810fe1433ee0fcc)
@@ -8,37 +8,28 @@
 <script language="JavaScript" type="text/JavaScript">
 <!--
 
-// view a particular item in a file
-// questionIndexValue: index of question affected
-// actionMethod: name of the method to be called in the DispatchAction
-function viewFileItem(fileItemValue, actionMethod) {
-	document.McAuthoringForm.fileItem.value=fileItemValue; 
+function submitDeleteFile(uuid, actionMethod) {
+	document.McAuthoringForm.uuid.value=uuid; 
 	submitMethod(actionMethod);
 }
 
-function deleteFileItem(fileItemValue, actionMethod, offlineFile) {
-	document.McAuthoringForm.fileItem.value=fileItemValue; 
-	document.McAuthoringForm.offlineFile.value=offlineFile; 
-	submitMethod(actionMethod);
-}
-
 //-->     
 </script>
 
 				<table class="forms">
 				<tr> 
-					<td class="formlabel" valign=top>
+					<td NOWRAP class="formlabel" valign=top>
           				<bean:message key="label.offlineInstructions" />:
           			</td>
-					<td colspan=3 class="formcontrol" valign=top>
+					<td NOWRAP colspan=3 class="formcontrol" valign=top>
 					<FCK:editor id="richTextOfflineInstructions" basePath="/lams/fckeditor/">
 						  <c:out value="${richTextOfflineInstructions}" escapeXml="false" />						  
 					</FCK:editor>
 					</td> 
 				</tr>
 
 				<tr> 
-					<td class="formlabel" valign=top>
+					<td NOWRAP class="formlabel" valign=top>
           				<bean:message key="label.offlineFiles" />
           			</td>
           			<td colspan=3 NOWRAP valign=top> 
@@ -50,38 +41,53 @@
 
 				</tr>
 				<tr> 
-					<td align="right" valign=top>
+					<td NOWRAP align="right" valign=top>
           				<bean:message key="label.uploadedOfflineFiles" />
           			</td>
-					<td colspan=3 align=left valign=top width="100%">
+					<td NOWRAP colspan=3 align=left valign=top width="100%">
 						<table align="left" border="1">
-									<c:forEach var='item' items='${sessionScope.listUploadedOfflineFileNames}'>
-									<tr>
-								         <td valign=top><font size=2> <b> <c:out value='${item}'/> </b> </font> </td>
-								      	<td valign=top>
-								      		<img src="images/edit.gif" align=left onclick="javascript:viewFileItem('<c:out value="${item}"/>','viewFileItem');">
-								      	</td>
-							      	  	<td valign=top>
-								      		<img src="images/delete.gif" align=left onclick="javascript:deleteFileItem('<c:out value="${item}"/>','deleteFileItem', '1');">	  										  		
-								      	</td>
-								     </tr> 	
+									<c:forEach var='file' items='${sessionScope.listOfflineFilesMetadata}'>
+											<tr>
+												<td NOWRAP valign=top>
+													<c:out value="${file.filename}"/>
+												</td>
+												<td NOWRAP valign=top>
+													<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'/>')">
+														<bean:message key="label.view"/>
+													</a>
+												</td>
+												<td NOWRAP valign=top>
+													<c:set var="downloadURL">
+															<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=true"/>
+													</c:set>
+													<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+														<bean:message key="label.download"/>
+													</a>
+												</td>
+												<td NOWRAP valign=top> 
+													<img src="images/delete.gif" align=left onclick="javascript:submitDeleteFile('<c:out value="${file.uuid}"/>','deleteOfflineFile');">													
+												</td>
+											</tr>
 				         			</c:forEach>
 	         			</table>
 					</td> 
 				</tr>
           		<tr> 
-					<td align="right" valign=top>
+					<td NOWRAP align="right" valign=top>
           				<bean:message key="label.onlineInstructions" />
           			</td>
-					<td colspan=3 class="formcontrol" valign=top>
+					<td NOWRAP colspan=3 class="formcontrol" valign=top>
 					<FCK:editor id="richTextOnlineInstructions" basePath="/lams/fckeditor/">
 						  <c:out value="${sessionScope.richTextOnlineInstructions}" escapeXml="false" />						  
 					</FCK:editor>
 					</td> 
 				</tr>
 				
 				<tr> 
-					<td class="formlabel" valign=top>
+					<td NOWRAP class="formlabel" valign=top>
           				<bean:message key="label.onlineFiles" />
           			</td>
           			<td colspan=3 NOWRAP valign=top> 
@@ -93,67 +99,83 @@
 				</tr>
 
 				<tr>
-					<td align="right" valign=top>
+					<td NOWRAP align="right" valign=top>
           				<bean:message key="label.uploadedOnlineFiles" />
           			</td>
           			
-					<td colspan=3 align=left valign=top width="100%">
+					<td NOWRAP colspan=3 align=left valign=top width="100%">
 						<table align="left" border="1">
-									<c:forEach var='item' items='${sessionScope.listUploadedOnlineFileNames}'>
-										<tr>									
-									         <td valign=top><font size=2> <b> <c:out value='${item}'/> </b> </font> </td>
-									      	<td valign=top>
-									      		<img src="images/edit.gif" align=left onclick="javascript:viewFileItem('<c:out value="${item}"/>','viewFileItem');">	  										  		
-									      	</td>
-									      	<td valign=top>
-									      		<img src="images/delete.gif" align=left onclick="javascript:deleteFileItem('<c:out value="${item}"/>','deleteFileItem', '0');">	  										  		
-									      	</td>
-					         			</tr>								      	
+									<c:forEach var='file' items='${sessionScope.listOnlineFilesMetadata}'>
+											<tr>
+												<td NOWRAP valign=top>
+													<c:out value="${file.filename}"/>
+												</td>
+												<td NOWRAP valign=top>
+													<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'/>')">
+														<bean:message key="label.view"/>
+													</a>
+												</td>
+												<td NOWRAP valign=top>
+													<c:set var="downloadURL">
+															<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=true"/>
+													</c:set>
+													<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+														<bean:message key="label.download"/>
+													</a>
+												</td>
+												<td NOWRAP valign=top> 
+													<img src="images/delete.gif" align=left onclick="javascript:submitDeleteFile('<c:out value="${file.uuid}"/>','deleteOnlineFile');">													
+												</td>
+											</tr>
 				         			</c:forEach>
 	         			</table>
 					</td> 
 				</tr>
 
 				<html:hidden property="fileItem"/>
 				<html:hidden property="offlineFile"/>				
-
+				<html:hidden property="uuid"/>				
+				
 		  		<tr>
- 				 	<td colspan=4 align=center valign=top>								
+ 				 	<td NOWRAP colspan=4 align=center valign=top>								
 						&nbsp
 				  	</td>
 				</tr>
  				 
  				 <tr>
-				 	<td valign=top>								
+				 	<td NOWRAP valign=top>								
 				  	</td>
-					 <td colspan=3 valign=top> 
+					 <td NOWRAP colspan=3 valign=top> 
 						 <html:submit onclick="javascript:submitMethod('doneInstructionsTab');">
 							<bean:message key="button.done"/>
 						</html:submit>
 					</td> 
  				 </tr>
  				 
  				 <tr>
- 				 	<td colspan=4 align=center valign=top>								
+ 				 	<td NOWRAP colspan=4 align=center valign=top>								
 						&nbsp
 				  	</td>
 				</tr>
 				
 				<c:if test="${requestScope.fileContentReady == 1}"> 			
 					<tr>
-						<td align="right" valign=top>
+						<td NOWRAP align="right" valign=top>
 	          				 <bean:message key="label.fileContent" /> : 
 	          			</td>
 					
-	 				 	<td colspan=3 align=left valign=top>								
+	 				 	<td NOWRAP colspan=3 align=left valign=top>								
 	 				 		<table>
 	 				 			<tr> 
-	 				 				<td align=center> <font size=2> <b>
+	 				 				<td NOWRAP align=center> <font size=2> <b>
 	 				 					 <c:out value="${sessionScope.fileName}"/>  
 	 				 				</b> </font> </td>
 				 				 </tr>
 				 				 <tr>
-			 				 		<td> <textarea ROWS=20 COLS=80><c:out value="${sessionScope.fileContent}"/> </textarea> </td>				 				 
+			 				 		<td NOWRAP> <textarea ROWS=20 COLS=80><c:out value="${sessionScope.fileContent}"/> </textarea> </td>				 				 
 				 				 </tr>
 	 				 		</table>
 					  	</td>