Index: lams_tool_nb/web/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/authoring/Attic/instructions.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_nb/web/authoring/instructions.jsp	28 Jun 2006 09:53:07 -0000	1.3
+++ lams_tool_nb/web/authoring/instructions.jsp	5 Jul 2006 05:15:00 -0000	1.4
@@ -1,18 +1,66 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
-<!-- Instructions Tab Content  -->
+<c:set var="onlineExist" value="false" />
+<c:set var="offlineExist" value="false" />
+<c:forEach var="att" items="${attachmentList}">
+	<c:if test="${att.onlineFile}">
+		<c:set var="onlineExist" value="true" />
+	</c:if>
+	<c:if test="${not att.onlineFile}">
+		<c:set var="offlineExist" value="true" />
+	</c:if>
+</c:forEach>
 
+
+<!-- Instructions Tab Content  -->
 <table>
 	<tr>
 		<td>
-			<lams:SetEditor id="onlineInstructions" text="${NbAuthoringForm.onlineInstructions}" key="instructions.onlineInstructions" />
+			<lams:SetEditor id="onlineInstructions" text="${NbAuthoringForm.onlineInstructions}" key="instructions.onlineInstructions" small="true" />
 		</td>
 	</tr>
 
+	<c:if test="${onlineExist == 'true'}">
+		<tr>
+			<td>
+				<c:if test="${not empty attachmentList}">
+					<ul>
+						<c:forEach var="attachment" items="${attachmentList}">
+							<c:if test="${attachment.onlineFile}">
+								<li>
+									${attachment.filename}
+									<c:set var="viewURL">
+										<html:rewrite page="/download/?uuid=${attachment.uuid}&amp;preferDownload=false" />
+									</c:set>
+									<a href="javascript:launchInstructionsPopup('${viewURL}');"> <fmt:message key="link.view" /> </a> &nbsp;
+
+									<c:set var="downloadURL">
+										<html:rewrite page="/download/?uuid=${attachment.uuid}&amp;preferDownload=true" />
+									</c:set>
+									<a href="${downloadURL}"> <fmt:message key="link.download" /> </a> &nbsp;
+
+									<c:set var="deleteURL">
+										<html:rewrite page="/authoring.do?method=Delete&amp;uuid=${attachment.uuid}" />
+									</c:set>
+									<a href="${deleteURL}" onclick="javascript:return confirm('Are you sure you want to delete this file?')" target="_self"> <fmt:message key="link.delete" /> </a>
+								</li>
+							</c:if>
+						</c:forEach>
+					</ul>
+				</c:if>
+			</td>
+		</tr>
+	</c:if>
+
 	<tr>
+		<td class="field-name">
+			<fmt:message key="instructions.uploadOnlineInstr" />
+		</td>
+	</tr>
+	<tr>
 		<td>
 			<html:file property="onlineFile" />
-			<html:submit property="method">
+			<html:submit property="method" styleClass="button">
 				<fmt:message key="button.upload" />
 			</html:submit>
 		</td>
@@ -23,73 +71,54 @@
 
 <table>
 	<tr>
-		<td >
-			<lams:SetEditor id="offlineInstructions" text="${NbAuthoringForm.onlineInstructions}" key="instructions.onlineInstructions" alt="true" />
+		<td>
+			<lams:SetEditor id="offlineInstructions" text="${NbAuthoringForm.onlineInstructions}" key="instructions.onlineInstructions" alt="true" small="true" />
 		</td>
 	</tr>
 
+	<c:if test="${offlineExist == 'true'}">
+		<tr>
+			<td>
+				<c:if test="${not empty attachmentList}">
+					<ul>
+						<c:forEach var="attachment" items="${attachmentList}">
+							<c:if test="${not attachment.onlineFile}">
+								<li>
+									${attachment.filename}
+									<c:set var="viewURL">
+										<html:rewrite page="/download/?uuid=${attachment.uuid}&amp;preferDownload=false" />
+									</c:set>
+									<a href="javascript:launchInstructionsPopup('${viewURL}');"> <fmt:message key="link.view" /> </a> &nbsp;
+
+									<c:set var="downloadURL">
+										<html:rewrite page="/download/?uuid=${attachment.uuid}&amp;preferDownload=true" />
+									</c:set>
+									<a href="${downloadURL}"> <fmt:message key="link.download" /> </a> &nbsp;
+
+									<c:set var="deleteURL">
+										<html:rewrite page="/authoring.do?method=Delete&amp;uuid=${attachment.uuid}" />
+									</c:set>
+									<a href="${deleteURL}" onclick="javascript:return confirm('Are you sure you want to delete this file?')" target="_self"> <fmt:message key="link.delete" /> </a>
+								</li>
+							</c:if>
+						</c:forEach>
+					</ul>
+				</c:if>
+			</td>
+		</tr>
+	</c:if>
+
 	<tr>
+		<td class="field-name-alternative-color">
+			<fmt:message key="instructions.uploadOfflineInstr" />
+		</td>
+	</tr>
+	<tr>
 		<td>
 			<html:file property="offlineFile" />
-			<html:submit property="method">
+			<html:submit property="method" styleClass="button">
 				<fmt:message key="button.upload" />
 			</html:submit>
 		</td>
 	</tr>
 </table>
-
-<logic:present name="attachmentList">
-	<bean:size id="count" name="attachmentList" />
-	<logic:notEqual name="count" value="0">
-		<hr />
-
-		<h2>
-			<fmt:message key="label.attachments" />
-		</h2>
-
-		<table>
-			<tr>
-				<th>
-					<fmt:message key="label.filename" />
-				</th>
-				<th>
-					<fmt:message key="label.type" />
-				</th>
-				<th>
-					&nbsp;
-				</th>
-			</tr>
-			<logic:iterate name="attachmentList" id="attachment">
-				<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>
-						<c:choose>
-							<c:when test="${attachment.onlineFile}">
-								<fmt:message key="instructions.type.online" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="instructions.type.offline" />
-							</c:otherwise>
-						</c:choose>
-					</td>
-					<td>
-						<a href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")' class="button"> <fmt:message key="link.view" /> </a>
-
-						<html:link page="<%=download%>" styleClass="button">
-							<fmt:message key="link.download" />
-						</html:link>
-						<html:link page="/authoring.do?method=Delete" 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="link.delete" />
-						</html:link>
-					</td>
-				</tr>
-			</logic:iterate>
-		</table>
-	</logic:notEqual>
-</logic:present>