Index: lams_tool_vote/web/monitoring/Instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/Instructions.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_vote/web/monitoring/Instructions.jsp	23 Nov 2006 07:07:26 -0000	1.12
+++ lams_tool_vote/web/monitoring/Instructions.jsp	6 May 2008 02:50:04 -0000	1.13
@@ -19,118 +19,113 @@
 --%>
 
 <%@ include file="/common/taglibs.jsp"%>
+<html:errors />
 
-
-		<table class="forms">
-          		<tr> 
-					<td NOWRAP colspan=2 valign=top>
-                   		<b> <fmt:message key="label.onlineInstructions.col" /> </b> 
-                   		<c:out value="${voteGeneralMonitoringDTO.onlineInstructions}" escapeXml="false" />						
-					</td> 
-				</tr>
+<table cellspacing="0">
+	
+	<tr>
+		<td colspan="3">
+			<div class="field-name">
+				<fmt:message key="label.onlineInstructions.col" /> :
+			</div>	
+			<div style="padding-left: 20px;">
+				<c:out value="${voteGeneralMonitoringDTO.onlineInstructions}" escapeXml="false" />
+			</div>
+		</td>
+	</tr>
+	
+	<c:set var="isOnlineListEmpty" value="${true}" />	
+	<c:forEach var="file" items="${voteGeneralMonitoringDTO.attachmentList}">
+		<c:if test="${file.fileOnline}">
+		 	<c:set var="isOnlineListEmpty" value="${false}" />
+		</c:if>
+	</c:forEach>
+	<c:if test="${not isOnlineListEmpty}">
+		<tr>
+			<td  colspan="3" class="field-name-alternative-color">
+				<fmt:message key="label.attachments" />
+			</td>
+		</tr>		
+	</c:if>
+		
+	<c:forEach var="file" items="${voteGeneralMonitoringDTO.attachmentList}">
+		<c:if test="${file.fileOnline}"> 	
+			<tr >
+				<td width="7%" style="padding-left: 30px;">			
+					<c:out value="${file.fileName}" />
+				</td>
 				
+				<td width="3%" align="left">
+					<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'/>')" class="button"> <fmt:message key="label.view" /> </a> &nbsp;
+				</td>
 				
-				
-				<tr>
-					<td NOWRAP colspan=2 valign=top>
-				<table class="forms">
-					<tr><td align=center>
+				<td width="5%" align="left">
+					<c:set var="downloadURL">
+						<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=true" />
+					</c:set>
+					<a href="<c:out value='${downloadURL}' escapeXml='false'/>" class="button"> <fmt:message key="label.download" /> </a>
+				</td>
+			</tr>
+		</c:if>
+	</c:forEach>
 
-							<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
-								<tr>
-									<td>
-										<table width="70%" class="align-left">
+	
+	<tr>
+		<td colspan="3">
+			<hr />
+		</td>
+	</tr>
+	
+	<tr>
+		<td colspan="3">
+			<div class="field-name">
+				<fmt:message key="label.offlineInstructions.col" /> :
+			</div>	
+			<div style="padding-left: 20px;">
+				<c:out value="${voteGeneralMonitoringDTO.offlineInstructions}" escapeXml="false" />
+			</div>
+		</td>
+	</tr>
 
-       									<c:forEach var="attachment" items="${voteGeneralMonitoringDTO.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">
-												                   		<fmt:message key="label.view" />
-												                    </a>
-																	&nbsp&nbsp
-													            	<html:link page="<%=download%>" styleClass="button">
-													                	<fmt:message key="label.download" />
-													                </html:link>
-													            </td>
-												           	</tr>
-											            </table>
-										           	</td>
-									   	     	</tr>
-											</c:if> 											   	     	
-										</c:forEach>
-										</table>
-								 	</td>
-								</tr>
-							</table>
-
-							 	</td>
-							</tr>
-				</table>
-					</td> 				
-				</tr>
+	<c:set var="isOfflineListEmpty" value="${true}" />	
+	<c:forEach var="file" items="${voteGeneralMonitoringDTO.attachmentList}">
+		<c:if test="${not file.fileOnline}">
+		 	<c:set var="isOfflineListEmpty" value="${false}" />
+		</c:if>
+	</c:forEach>
+	<c:if test="${not isOfflineListEmpty}">
+		<tr>
+			<td  colspan="3" class="field-name-alternative-color">
+				<fmt:message key="label.attachments" />
+			</td>
+		</tr>
+	</c:if>		
+		
+	<c:forEach var="file" items="${voteGeneralMonitoringDTO.attachmentList}">
+		<c:if test="${not file.fileOnline}"> 
+			<tr >
+				<td width="7%" style="padding-left: 30px;">			
+					<c:out value="${file.fileName}" />
+				</td>
 				
-
-				<tr> 
-					<td colspan=2 NOWRAP> 
-                   		<b> <fmt:message key="label.offlineInstructions.col" /> </b>	<c:out value="${voteGeneralMonitoringDTO.offlineInstructions}" escapeXml="false" />												
-					</td> 
-				</tr>
-
-
-				<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%" class="align-left">
-
-       									<c:forEach var="attachment" items="${voteGeneralMonitoringDTO.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">
-												                   		<fmt:message key="label.view" />
-												                    </a>
-																	&nbsp&nbsp
-													            	<html:link page="<%=download%>" styleClass="button">
-													                	<fmt:message key="label.download" />
-													                </html:link>
-													            </td>
-												           	</tr>
-											            </table>
-										           	</td>
-									   	     	</tr>
-										</c:if> 											   	     	
-										</c:forEach>
-										</table>
-								 	</td>
-								</tr>
-							</table>
-
-							 	</td>
-							</tr>
-				</table>
-					</td> 				
-				</tr>
-
-			</table>	  	
+				<td width="3%" align="left">
+					<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'/>')" class="button"> <fmt:message key="label.view" /> </a> &nbsp;
+				</td>
+				
+				<td width="5%" align="left">
+					<c:set var="downloadURL">
+						<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=true" />
+					</c:set>
+					<a href="<c:out value='${downloadURL}' escapeXml='false'/>" class="button"> <fmt:message key="label.download" /> </a>
+				</td>
+			</tr>
+		</c:if>
+	</c:forEach>
+	
+</table>