Index: lams_tool_lamc/web/monitoring/Instructions.jsp
===================================================================
diff -u -ra6b8145d81296213a6c9f9e7a23dee9a167eaff3 -r8522cd628329e0031e21b48f2750b1fd9b1842a6
--- lams_tool_lamc/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision a6b8145d81296213a6c9f9e7a23dee9a167eaff3)
+++ lams_tool_lamc/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision 8522cd628329e0031e21b48f2750b1fd9b1842a6)
@@ -18,92 +18,119 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
 
-				<table class="forms">
-				<tr> 
+		<table class="forms">
+          		<tr> 
 					<td NOWRAP colspan=2 valign=top>
-						<b> <bean:message key="label.onlineInstructions.col"/> </b>
-						<c:out value="${sessionScope.richTextOnlineInstructions}" escapeXml="false" />												
+                   		<b> <bean:message key="label.onlineInstructions.col" /> </b> 
+                   		<c:out value="${mcGeneralMonitoringDTO.onlineInstructions}" escapeXml="false" />						
 					</td> 
 				</tr>
 				
-
+				
+				
 				<tr>
-					<td colspan=2 NOWRAP align=left valign=top width="50%">
-						<table width="50%" cellspacing="8" align="CENTER" class="forms">
-									<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 NOWRAP colspan=2 valign=top>
+				<table class="forms">
+					<tr><td align=center>
 
-												</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>
-											</tr>
-				         			</c:forEach>
-	         			</table>
-					</td> 
+							<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
+								<tr>
+									<td>
+										<table width="70%" align="left">
+
+       									<c:forEach var="attachment" items="${mcGeneralMonitoringDTO.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>
+						                        <bean:define id="uuid" name="attachment" property="uuid" />
+						                        
+						                        <tr>
+									            	<td> <bean:write name="attachment" property="fileName"/>  </td>
+										            <td>
+											        	<table>
+												        	<tr>
+												            	<td>
+												                	<a href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")' class="button">
+												                   		<bean:message key="label.view" />
+												                    </a>
+																	&nbsp&nbsp
+													            	<html:link page="<%=download%>" styleClass="button">
+													                	<bean:message key="label.download" />
+													                </html:link>
+													            </td>
+												           	</tr>
+											            </table>
+										           	</td>
+									   	     	</tr>
+											</c:if> 											   	     	
+										</c:forEach>
+										</table>
+								 	</td>
+								</tr>
+							</table>
+
+							 	</td>
+							</tr>
+				</table>
+					</td> 				
 				</tr>
 				
 
 				<tr> 
-					<td NOWRAP colspan=2 valign=top>
-						<b> <bean:message key="label.offlineInstructions.col"/> </b>
-						<c:out value="${richTextOfflineInstructions}" escapeXml="false" />																		
+					<td colspan=2 NOWRAP> 
+                   		<b> <bean:message key="label.offlineInstructions.col" /> </b>	<c:out value="${mcGeneralMonitoringDTO.offlineInstructions}" escapeXml="false" />												
 					</td> 
 				</tr>
 
-				<tr> 
-					<td colspan=2 NOWRAP align=left valign=top width="50%">
-						<table width="50%" cellspacing="8" align="CENTER" class="forms">
-									<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>
-				         			</c:forEach>
-	         			</table>
-					</td> 
+				<tr>
+					<td NOWRAP colspan=2 valign=top>
+				<table class="forms">
+					<tr><td align=center>
+
+							<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
+								<tr>
+									<td>
+										<table width="70%" align="left">
+
+       									<c:forEach var="attachment" items="${mcGeneralMonitoringDTO.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>
+						                        <bean:define id="uuid" name="attachment" property="uuid" />
+						                        
+						                        <tr>
+									            	<td> <bean:write name="attachment" property="fileName"/>  </td>
+										            <td>
+											        	<table>
+												        	<tr>
+												            	<td>
+												                	<a href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")' class="button">
+												                   		<bean:message key="label.view" />
+												                    </a>
+																	&nbsp&nbsp
+													            	<html:link page="<%=download%>" styleClass="button">
+													                	<bean:message key="label.download" />
+													                </html:link>
+													            </td>
+												           	</tr>
+											            </table>
+										           	</td>
+									   	     	</tr>
+										</c:if> 											   	     	
+										</c:forEach>
+										</table>
+								 	</td>
+								</tr>
+							</table>
+
+							 	</td>
+							</tr>
+				</table>
+					</td> 				
 				</tr>
 
-				<html:hidden property="fileItem"/>
-				<html:hidden property="offlineFile"/>				
-				<html:hidden property="uuid"/>				
-				
 			</table>