Index: lams_tool_laqa/web/InstructionsContent.jsp
===================================================================
diff -u -r032d46b663074e55bef3eacea19388202073a89a -r859bc278352c883be139ea4fa2da8ea92ed19f54
--- lams_tool_laqa/web/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 032d46b663074e55bef3eacea19388202073a89a)
+++ lams_tool_laqa/web/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 859bc278352c883be139ea4fa2da8ea92ed19f54)
@@ -4,7 +4,9 @@
 <%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
 <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
 <%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
 
+
 <div id="richTextContainer">
 		<tr> <td>
 			<table align=center>
@@ -38,10 +40,8 @@
 					<td>
           				<fmt:message key="label.uploadedOfflineFiles" />
           			</td>
-					<td>
-						<c:forEach var='item' items='${sessionScope.listUploadedOfflineFileNames}'>
-				            <li><c:out value='${item}'/></li>
-	         			</c:forEach>
+					<td>         			
+         			
 					</td> 
 				</tr>
           		<tr> 
@@ -74,9 +74,6 @@
           				<fmt:message key="label.uploadedOnlineFiles" />
           			</td>
 					<td>
-						<c:forEach var='item' items='${sessionScope.listUploadedOnlineFileNames}'>
-				            <li><c:out value='${item}'/></li>
-	         			</c:forEach>
 					</td> 
 				</tr>
 				
@@ -94,6 +91,79 @@
 				</table>
 
 		</td></tr>
+		<tr><td>
+		
+
+<logic:present name="attachmentList">
+<bean:size id="count" name="attachmentList" />
+<c:out value="${count}"/>
+<logic:notEqual name="count" value="0">
+
+	<h2><fmt:message key="label.attachments" /></h2>
+	<div id="datatablecontainer">
+		<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+			<tr>
+				<td>
+					<table width="70%" align="left">
+		            <tr>
+		                <td><fmt:message key="label.filename" /></td>
+		                <td><fmt:message key="label.type" /></td>
+		            	<td>&nbsp;</td>
+		            </tr>
+		            <logic:iterate name="attachmentList" id="attachment">
+		            	<bean:define id="view">/download/?uuid=<bean:write name="attachment" property="uuid"/>&preferDownload=false</bean:define>
+						<bean:define id="download">/download/?uuid=<bean:write name="attachment" property="uuid"/>&preferDownload=true</bean:define>
+                        <bean:define id="uuid" name="attachment" property="uuid" />
+                        
+                        <tr>
+			                         	
+			            	<td><bean:write name="attachment" property="fileName"/></td>
+			                <td>
+			                	<c:choose>
+					            	<c:when test="${attachment.fileOnline}" >
+					                	<fmt:message key="instructions.type.online" />
+					               	</c:when>
+					                <c:otherwise>
+					                	<fmt:message key="instructions.type.offline" />
+					                </c:otherwise>
+				                </c:choose>
+				            </td>
+				            <td>
+					        	<table>
+						        	<tr>
+						            	<td>
+						                	<a href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")' class="button">
+						                   		<fmt:message key="link.view" />
+						                    </a>
+						               	</td>
+						                <td>
+							            	<html:link page="<%=download%>" styleClass="button">
+							                	<fmt:message key="link.download" />
+							                </html:link>
+						                </td>
+						                <td>
+							            	<html:link page="/authoring.do?method=deleteFile" 
+							                         	paramId="uuid" paramName="attachment" paramProperty="uuid"
+							                         	onclick="javascript:return confirm('Are you sure you want to delete this file?')"
+							                         	target="_self" styleClass="button">
+							                	<fmt:message key="link.delete" />
+							                </html:link> 
+							            </td>
+						           	</tr>
+					            </table>
+				           	</td>
+			   	     	</tr>
+		    	    </logic:iterate>
+					</table>
+			 	</td>
+			</tr>
+		</table>
+	</div>
+	
+ </logic:notEqual>
+ </logic:present>
+		
+		</td></tr>
 </div>