Index: lams_tool_vote/web/authoring/InstructionsContent.jsp
===================================================================
diff -u -r9ad7805407672e72dfc83fb0ba49ccafb0d43d6f -raf61f7f381d4ead2712ec1b624053445c38c36d3
--- lams_tool_vote/web/authoring/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 9ad7805407672e72dfc83fb0ba49ccafb0d43d6f)
+++ lams_tool_vote/web/authoring/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision af61f7f381d4ead2712ec1b624053445c38c36d3)
@@ -20,179 +20,137 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ include file="/common/taglibs.jsp" %>
+<%@ include file="/common/taglibs.jsp"%>
 
-		<table class="forms">
+<table>
 
-				<tr>
-					<td NOWRAP colspan=2 valign=top>
-						<div class="field-name">
-							<fmt:message key="label.onlineInstructions.col"></fmt:message>
-						</div>
-						<html:textarea property="onlineInstructions" rows="3" cols="80"></html:textarea>
-					</td>
-				</tr>
-				
-				
-				<tr>
-				<td NOWRAP colspan=2 valign=top>
-				<table class="forms">
-					<tr><td align=center>
+	<tr>
+		<td>
+			<div class="field-name">
+				<fmt:message key="label.onlineInstructions.col"></fmt:message>
+			</div>
+			<html:textarea property="onlineInstructions" rows="3" cols="80"></html:textarea>
+		</td>
+	</tr>
 
-							<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
-								<tr>
-									<td>
-										<table width="70%" align="left">
+	<tr>
+		<td>
+			<ul>
+				<c:forEach var="attachment"
+					items="${voteGeneralAuthoringDTO.attachmentList}">
+					<c:if test="${attachment.fileOnline == true }">
+						<li>
+							<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" />
 
-									<c:forEach var="attachment" items="${voteGeneralAuthoringDTO.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>
-																	&nbsp&nbsp
-													            	<html:link page="/authoring.do?dispatch=deleteFile&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&voteChangable=${voteGeneralAuthoringDTO.voteChangable}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}&onlineInstructions=${voteGeneralAuthoringDTO.onlineInstructions}&offlineInstructions=${voteGeneralAuthoringDTO.offlineInstructions}"
-													                         	paramId="uuid" paramName="attachment" paramProperty="uuid"
-													                         	onclick="javascript:return confirm('Are you sure you want to delete this file?')"
-													                         	target="_self" styleClass="button">
-													                	<bean:message key="button.delete" />
-													                </html:link> 
-													            </td>
-												           	</tr>
-											            </table>
-										           	</td>
-									   	     	</tr>
-											</c:if> 											   	     	
-										</c:forEach>
-										</table>
-								 	</td>
-								</tr>
-							</table>
+							<bean:write name="attachment" property="fileName" />
 
+							<a
+								href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")'>
+								<fmt:message key="label.view" /> </a> &nbsp
+							<html:link page="<%=download%>">
+								<fmt:message key="label.download" />
+							</html:link>
+							&nbsp
+							<html:link
+								page="/authoring.do?dispatch=deleteFile&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&voteChangable=${voteGeneralAuthoringDTO.voteChangable}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}&onlineInstructions=${voteGeneralAuthoringDTO.onlineInstructions}&offlineInstructions=${voteGeneralAuthoringDTO.offlineInstructions}"
+								paramId="uuid" paramName="attachment" paramProperty="uuid"
+								onclick="javascript:return confirm('Are you sure you want to delete this file?')"
+								target="_self">
+								<fmt:message key="button.delete" />
+							</html:link>
+						</li>
+					</c:if>
+				</c:forEach>
+			</ul>
+		</td>
+	</tr>
 
+	<tr>
+		<td>
+			<div class="field-name">
+				<fmt:message key="label.onlineFiles" />
+			</div>
+			<html:file property="theOnlineFile"></html:file>
+			<html:submit property="submitOnlineFile" styleClass="button"
+				onclick="submitMethod('addNewFile');">
+				<fmt:message key="button.upload" />
+			</html:submit>
+		</td>
+	</tr>
 
-							 	</td>
-							</tr>
-				</table>
-					</td> 				
-				</tr>
-				
-				
-				<tr> 
-					<td class="field-name"> 
-	          				<fmt:message key="label.onlineFiles" />
-          			</td>
-          			<td NOWRAP> 
-						<html:file  property="theOnlineFile"></html:file>
-					 	<html:submit property="submitOnlineFile" 
-                                     styleClass="linkbutton" 
-                                     onclick="submitMethod('addNewFile');">
-								<fmt:message key="button.upload"/>
-						</html:submit>
-					</td> 
-				
-				</tr>
+	<tr>
+		<td>
+			<hr />
+		</td>
+	</tr>
 
+	<tr>
+		<td>
+			<div class="field-name-alternative-color">
+				<fmt:message key="label.offlineInstructions.col"></fmt:message>
+			</div>
+			<html:textarea property="offlineInstructions" rows="3" cols="80"></html:textarea>
+		</td>
+	</tr>
 
-				<tr>
-					<td NOWRAP colspan=2 valign=top>
-						<div class="field-name">
-							<fmt:message key="label.offlineInstructions.col"></fmt:message>
-						</div>
-						<html:textarea property="offlineInstructions" rows="3" cols="80"></html:textarea>
-					</td>
-				</tr>
+	<tr>
+		<td>
+			<ul>
+				<c:forEach var="attachment"
+					items="${voteGeneralAuthoringDTO.attachmentList}">
 
+					<c:if test="${attachment.fileOnline == false}">
+						<li>
+							<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" />
+							<bean:write name="attachment" property="fileName" />
+							<a
+								href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")'>
+								<fmt:message key="label.view" /> </a> &nbsp
+							<html:link page="<%=download%>">
+								<fmt:message key="label.download" />
+							</html:link>
+							&nbsp
+							<html:link
+								page="/authoring.do?dispatch=deleteFile&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&voteChangable=${voteGeneralAuthoringDTO.voteChangable}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}&onlineInstructions=${voteGeneralAuthoringDTO.onlineInstructions}&offlineInstructions=${voteGeneralAuthoringDTO.offlineInstructions}"
+								paramId="uuid" paramName="attachment" paramProperty="uuid"
+								onclick="javascript:return confirm('Are you sure you want to delete this file?')"
+								target="_self">
+								<fmt:message key="button.delete" />
+							</html:link>
+						</li>
+					</c:if>
+				</c:forEach>
+			</ul>
+		</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%" align="left">
+	<tr>
+		<td>
+			<div class="field-name-alternative-color">
+				<fmt:message key="label.offlineFiles" />
+			</div>
+			<html:file property="theOfflineFile"></html:file>
+			<html:submit property="submitOfflineFile" styleClass="button"
+				onclick="submitMethod('addNewFile');">
+				<fmt:message key="button.upload" />
+			</html:submit>
+		</td>
+	</tr>
+</table>
 
-									<c:forEach var="attachment" items="${voteGeneralAuthoringDTO.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>
-																	&nbsp&nbsp
-													            	<html:link page="/authoring.do?dispatch=deleteFile&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&voteChangable=${voteGeneralAuthoringDTO.voteChangable}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}&onlineInstructions=${voteGeneralAuthoringDTO.onlineInstructions}&offlineInstructions=${voteGeneralAuthoringDTO.offlineInstructions}"
-													            	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="button.delete" />
-													                </html:link> 
-													            </td>
-												           	</tr>
-											            </table>
-										           	</td>
-									   	     	</tr>
-										</c:if> 											   	     	
-											</c:forEach>
-										</table>
-								 	</td>
-								</tr>
-							</table>
 
-							 	</td>
-							</tr>
-				</table>
-					</td> 				
-				</tr>
 
 
 
-				<tr> 
-					<td class="field-name"> 
-          				<fmt:message key="label.offlineFiles" />
-          			</td>
-          			<td NOWRAP> 
-						<html:file  property="theOfflineFile"></html:file>
-					 	<html:submit property="submitOfflineFile" 
-                                     styleClass="linkbutton" 
-                                     onclick="submitMethod('addNewFile');">
-								<fmt:message key="button.upload"/>
-						</html:submit>
-					</td> 
-				</tr>          		
-			</table>	  	
-	
 
 
-	
-	
 
 
-
-