Index: lams_tool_laqa/web/monitoring/Instructions.jsp
===================================================================
diff -u -r2a5c5ae4d68939c91b7eb7a77ae5ffc60a87ebf5 -r0e25eab07d7153c61f50deb6332abc0d4ed3ec69
--- lams_tool_laqa/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision 2a5c5ae4d68939c91b7eb7a77ae5ffc60a87ebf5)
+++ lams_tool_laqa/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision 0e25eab07d7153c61f50deb6332abc0d4ed3ec69)
@@ -32,24 +32,24 @@
 		<table class="forms">
           		<tr> 
 					<td NOWRAP colspan=2 valign=top>
-                   		<b> <bean:message key="label.onlineInstructions.col" /> </b> <c:out value="${QaAuthoringForm.onlineInstructions}" escapeXml="false" />						
+                   		<b> <bean:message key="label.onlineInstructions.col" /> </b> 
+                   		<c:out value="${qaGeneralMonitoringDTO.onlineInstructions}" escapeXml="false" />						
 					</td> 
 				</tr>
 				
 				
+				
 				<tr>
 					<td NOWRAP colspan=2 valign=top>
 				<table class="forms">
 					<tr><td align=center>
-					<logic:present name="attachmentList">
-					<bean:size id="count" name="attachmentList" />
-					<logic:notEqual name="count" value="0">
+
 							<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
 								<tr>
 									<td>
 										<table width="70%" align="left">
 
-							            <logic:iterate name="attachmentList" id="attachment">
+       									<c:forEach var="attachment" items="${qaGeneralMonitoringDTO.attachmentList}">
 											<c:if test="${attachment.fileOnline == true }"> 			
 								            	<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>
@@ -80,14 +80,13 @@
 											            </table>
 										           	</td>
 									   	     	</tr>
-										</c:if> 											   	     	
-							    	    </logic:iterate>
+											</c:if> 											   	     	
+										</c:forEach>
 										</table>
 								 	</td>
 								</tr>
 							</table>
-					 </logic:notEqual>
-					 </logic:present>
+
 							 	</td>
 							</tr>
 				</table>
@@ -97,7 +96,7 @@
 
 				<tr> 
 					<td colspan=2 NOWRAP> 
-                   		<b> <bean:message key="label.offlineInstructions.col" /> </b>	<c:out value="${QaAuthoringForm.offlineInstructions}" escapeXml="false" />												
+                   		<b> <bean:message key="label.offlineInstructions.col" /> </b>	<c:out value="${qaGeneralMonitoringDTO.offlineInstructions}" escapeXml="false" />												
 					</td> 
 				</tr>
 
@@ -106,15 +105,13 @@
 					<td NOWRAP colspan=2 valign=top>
 				<table class="forms">
 					<tr><td align=center>
-					<logic:present name="attachmentList">
-					<bean:size id="count" name="attachmentList" />
-					<logic:notEqual name="count" value="0">
+
 							<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
 								<tr>
 									<td>
 										<table width="70%" align="left">
 
-							            <logic:iterate name="attachmentList" id="attachment">
+       									<c:forEach var="attachment" items="${qaGeneralMonitoringDTO.attachmentList}">
 											<c:if test="${attachment.fileOnline == false}"> 			
 								            	<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>
@@ -146,13 +143,12 @@
 										           	</td>
 									   	     	</tr>
 										</c:if> 											   	     	
-							    	    </logic:iterate>
+										</c:forEach>
 										</table>
 								 	</td>
 								</tr>
 							</table>
-					 </logic:notEqual>
-					 </logic:present>
+
 							 	</td>
 							</tr>
 				</table>