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.9 -r1.10
--- lams_tool_nb/web/authoring/instructions.jsp	18 Oct 2006 03:18:31 -0000	1.9
+++ lams_tool_nb/web/authoring/instructions.jsp	30 Apr 2008 06:30:18 -0000	1.10
@@ -19,7 +19,7 @@
 			<div class="field-name">
 				<fmt:message key="instructions.onlineInstructions"></fmt:message>
 			</div>
-			<html:textarea property="onlineInstructions" rows="3" cols="75"></html:textarea>
+			<lams:STRUTS-textarea property="onlineInstructions" rows="3" cols="75" />			
 		</td>
 	</tr>
 
@@ -85,7 +85,7 @@
 			<div class="field-name-alternative-color">
 				<fmt:message key="instructions.offlineInstructions"></fmt:message>
 			</div>
-			<html:textarea property="offlineInstructions" rows="3" cols="75"></html:textarea>
+			<lams:STRUTS-textarea property="offlineInstructions" rows="3" cols="75" />
 		</td>
 	</tr>
 
Index: lams_tool_nb/web/monitoring/m_Instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/monitoring/Attic/m_Instructions.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_nb/web/monitoring/m_Instructions.jsp	19 Jul 2006 05:15:48 -0000	1.3
+++ lams_tool_nb/web/monitoring/m_Instructions.jsp	30 Apr 2008 06:30:18 -0000	1.4
@@ -1,77 +1,100 @@
 <%@ include file="/includes/taglibs.jsp"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
-<table cellpadding="0">
+<table cellspacing="0">
+	
 	<tr>
-		<td class="field-name" width="30%">
-			<fmt:message key="instructions.onlineInstructions" />
+		<td colspan="3">
+			<div class="field-name">
+				<fmt:message key="instructions.onlineInstructions" /> :
+			</div>	
+			<div style="padding-left: 20px;">
+				<c:out value="${formBean.onlineInstructions}" escapeXml="false" />
+			</div>
 		</td>
-		<td>
-			<c:out value="${formBean.onlineInstructions}" escapeXml="false" />
-		</td>
 	</tr>
+	
+	<c:if test="${fn:length(formBean.attachmentsList) > 0}">
+		<tr>
+			<td  colspan="3" class="field-name-alternative-color">
+				<fmt:message key="label.attachments" />
+			</td>
+		</tr>		
+	</c:if>
+		
+	<c:forEach var="file" items="${formBean.attachmentsList}">
+		<c:if test="${file.onlineFile}">
+			<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="link.view" /> </a> &nbsp;
+				</td>
+				
+				<td width="5%" align="left">
+					<c:set var="downloadURL">
+						<html:rewrite page="/download/?uuid=${file.uuid}&versionID=${file.versionId}&preferDownload=true" />
+					</c:set>
+					<a href="<c:out value='${downloadURL}' escapeXml='false'/>" class="button"> <fmt:message key="link.download" /> </a>
+				</td>
+			</tr>
+		</c:if>
+	</c:forEach>
 
+	
 	<tr>
-		<td class="field-name" width="30%">
-			<fmt:message key="instructions.offlineInstructions" />
+		<td colspan="3">
+			<hr />
 		</td>
-		<td>
-			<c:out value="${formBean.offlineInstructions}" escapeXml="false" />
+	</tr>
+	
+	<tr>
+		<td colspan="3">
+			<div class="field-name">
+				<fmt:message key="instructions.offlineInstructions" /> :
+			</div>	
+			<div style="padding-left: 20px;">
+				<c:out value="${formBean.offlineInstructions}" escapeXml="false" />
+			</div>
 		</td>
 	</tr>
-</table>
-
-<c:forEach var="attachment" items="${formBean.attachmentsList}" varStatus="status">
-	<c:if test="${status.first}">
-		<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>
-				<th>
-					&nbsp;
-				</th>
-			</tr>
-	</c:if>
 	
-		<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>
-	
+	<c:if test="${fn:length(formBean.attachmentsList) > 0}">
 		<tr>
-			<td>
-				<c:out value="${attachment.filename}" />
+			<td  colspan="3" class="field-name-alternative-color">
+				<fmt:message key="label.attachments" />
 			</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>
-			</td>
-			<td>
-				<html:link page="<%=download%>" styleClass="button">
-					<fmt:message key="link.download" />
-				</html:link>
-			</td>
 		</tr>
-	<c:if test="${status.last}">
-		</table>
-	</c:if>
+	</c:if>		
+		
+	<c:forEach var="file" items="${taskList.offlineFileList}">
+		<c:if test="${not file.onlineFile}">
+			<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="link.view" /> </a> &nbsp;
+				</td>
+				
+				<td width="5%" align="left">
+					<c:set var="downloadURL">
+						<html:rewrite page="/download/?uuid=${file.uuid}&versionID=${file.versionId}&preferDownload=true" />
+					</c:set>
+					<a href="<c:out value='${downloadURL}' escapeXml='false'/>" class="button"> <fmt:message key="link.download" /> </a>
+				</td>
+			</tr>
+		</c:if>
 	</c:forEach>
+	
+</table>
+