Index: lams_tool_vote/web/authoring/InstructionsContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/Attic/InstructionsContent.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_vote/web/authoring/InstructionsContent.jsp	29 Jun 2006 00:38:11 -0000	1.5
+++ lams_tool_vote/web/authoring/InstructionsContent.jsp	30 Jun 2006 03:26:01 -0000	1.6
@@ -39,117 +39,109 @@
 					</td> 
 				</tr>
 				
-				<tr> 
-					<td NOWRAP class="formlabel" valign=top>
-						<font size=2>
-    	      				<b> <bean:message key="label.onlineFiles" /> </b>
-    	      			</font>
-          			</td>
-          			<td colspan=3 NOWRAP valign=top> 
-	          			<font size=2>
-							<html:file  property="theOnlineFile"></html:file>
-						 	<html:submit onclick="javascript:submitMethod('submitOnlineFiles');" styleClass="buttonLeft">
-								 <bean:message key="button.upload"/> 
-							</html:submit>
-						</font>
-					</td> 
-				</tr>
-
 				<tr>
-					<td NOWRAP align="right" valign=top>
-	          			<font size=2>
-		      				<b> <bean:message key="label.uploadedOnlineFiles" /> </b>
-	      				</font>
-          			</td>
           			
-					<td NOWRAP colspan=3 align=left valign=top width="100%">
+					<td NOWRAP colspan=4 align=left valign=top width="100%">
 						<table align="left" >
 									<c:forEach var='file' items='${sessionScope.listOnlineFilesMetadata}'>
 											<tr>
 												<td NOWRAP valign=top>
-													<font size=2> <c:out value="${file.filename}"/> </font>
-													&nbsp&nbsp
+													 <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'/>')">
-														 <font size=2>	<bean:message key="label.view"/> </font>
+														 	<bean:message key="label.view"/> 
 													</a>
-													&nbsp
+													</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'/>">
-														<font size=2> <bean:message key="label.download"/> </font>
+														 <bean:message key="label.download"/> 
 													</a>
-													&nbsp
-													<font size=2> <img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="javascript:submitDeleteFile('<c:out value="${file.uuid}"/>','deleteOnlineFile');"> </font>	
+													</td>
+													<td NOWRAP valign=top>
+
+													 <img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="javascript:submitDeleteFile('<c:out value="${file.uuid}"/>','deleteOnlineFile');"> 	
 												</td>
 											</tr>
 				         			</c:forEach>
 	         			</table>
 					</td> 
 				</tr>
 
-				
 				<tr> 
-					<td NOWRAP colspan=4 valign=top>
-						<lams:SetEditor id="richTextOfflineInstructions" text="${richTextOfflineInstructions}" small="true" key="label.offlineInstructions.col"/>																			
-					</td> 
-				</tr>
-				
-				<tr> 
-					<td NOWRAP class="formlabel" valign=top>
-						<font size=2>
-							<b> <bean:message key="label.offlineFiles" /> <b>
-						</font>
+					<td class="field-name">
+    	      				<b> <bean:message key="label.onlineFiles" /> </b>
           			</td>
           			<td colspan=3 NOWRAP valign=top> 
-	          			<font size=2>
-							<html:file  property="theOfflineFile"></html:file>
-						 	<html:submit onclick="javascript:submitMethod('submitOfflineFiles');" styleClass="buttonLeft">
+							<html:file  property="theOnlineFile"></html:file>
+						 	<html:submit onclick="javascript:submitMethod('submitOnlineFiles');" styleClass="buttonLeft">
 								 <bean:message key="button.upload"/> 
 							</html:submit>
-						</font>
 					</td> 
+				</tr>
 
+				
+				<tr> 
+					<td NOWRAP colspan=4 valign=top>
+						<lams:SetEditor id="richTextOfflineInstructions" text="${richTextOfflineInstructions}" small="true" key="label.offlineInstructions.col"/>																			
+					</td> 
 				</tr>
+				
+
 				<tr> 
-					<td NOWRAP align="right" valign=top>
-						<font size=2>
-    	      				<b> <bean:message key="label.uploadedOfflineFiles" /> </b>
-    	      			</font>
-          			</td>
-					<td NOWRAP colspan=3 align=left valign=top width="100%">
+					<td NOWRAP colspan=4 align=left valign=top width="100%">
 						<table align="left">
 									<c:forEach var='file' items='${sessionScope.listOfflineFilesMetadata}'>
 											<tr>
 												<td NOWRAP valign=top>
-													<font size=2> <c:out value="${file.filename}"/> </font>
-													&nbsp&nbsp
+													 <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'/>')">
-														<font size=2> <bean:message key="label.view"/> </font>
+														 	<bean:message key="label.view"/> 
 													</a>
-													&nbsp
+													</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'/>">
-														<font size=2> <bean:message key="label.download"/> </font>
+														 <bean:message key="label.download"/> 
 													</a>
-													&nbsp
-												 <font size=2>	<img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="javascript:submitDeleteFile('<c:out value="${file.uuid}"/>','deleteOfflineFile');"> </font>													
+													</td>
+													<td NOWRAP valign=top>
+
+													 <img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="javascript:submitDeleteFile('<c:out value="${file.uuid}"/>','deleteOnlineFile');"> 	
 												</td>
 											</tr>
 				         			</c:forEach>
 	         			</table>
 					</td> 
 				</tr>
 
+				<tr> 
+					<td class="field-name">
+							<b> <bean:message key="label.offlineFiles" /> <b>
+	      			</td>
+          			<td colspan=3 NOWRAP valign=top> 
+							<html:file  property="theOfflineFile"></html:file>
+						 	<html:submit onclick="javascript:submitMethod('submitOfflineFiles');" styleClass="buttonLeft">
+								 <bean:message key="button.upload"/> 
+							</html:submit>
+					</td> 
 
+				</tr>
+
+
 				<html:hidden property="fileItem"/>
 				<html:hidden property="offlineFile"/>				
 				<html:hidden property="uuid"/>