Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java,v
diff -u -r1.18 -r1.19
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	5 Sep 2007 08:05:24 -0000	1.18
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	6 May 2008 02:37:05 -0000	1.19
@@ -183,6 +183,7 @@
 		file.setFileUuid(nodeKey.getUuid());
 		file.setFileVersionId(nodeKey.getVersion());
 		file.setFileName(uploadFile.getFileName());
+		file.setCreated(new Date());
 		
 		return file;
 	}
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java,v
diff -u -r1.13 -r1.14
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java	2 May 2008 08:22:40 -0000	1.13
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java	6 May 2008 02:37:05 -0000	1.14
@@ -140,6 +140,7 @@
 		
 		//get survey 
 		Survey survey = service.getSurveyByContentId(contentId);
+		survey.toDTO();
 		
 		//get statistic
 		SortedMap<SurveySession,Integer> statis = service.getStatistic(contentId);
Index: lams_tool_survey/web/pages/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/Attic/instructions.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_survey/web/pages/authoring/instructions.jsp	18 Oct 2006 03:20:17 -0000	1.2
+++ lams_tool_survey/web/pages/authoring/instructions.jsp	6 May 2008 02:37:05 -0000	1.3
@@ -64,8 +64,7 @@
 			<div class="field-name">
 				<fmt:message key="label.authoring.online.instruction"></fmt:message>
 			</div>
-			<html:textarea property="survey.onlineInstructions" rows="3"
-				cols="75"></html:textarea>
+			<lams:STRUTS-textarea property="survey.onlineInstructions" rows="3" cols="75" />
 		</td>
 	</tr>
 	<tr>
@@ -102,8 +101,7 @@
 			<div class="field-name-alternative-color">
 				<fmt:message key="label.authoring.offline.instruction"></fmt:message>
 			</div>
-			<html:textarea property="survey.offlineInstructions" rows="3"
-				cols="75"></html:textarea>
+			<lams:STRUTS-textarea property="survey.offlineInstructions" rows="3" cols="75" />
 		</td>
 	</tr>
 	<tr>
Index: lams_tool_survey/web/pages/monitoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/Attic/instructions.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_survey/web/pages/monitoring/instructions.jsp	12 Sep 2006 04:15:19 -0000	1.1
+++ lams_tool_survey/web/pages/monitoring/instructions.jsp	6 May 2008 02:37:05 -0000	1.2
@@ -2,76 +2,95 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="survey" value="${sessionMap.survey}"/>
 
+<table cellspacing="0">
 
-<table cellpadding="0">
-	<!-- Instructions Row -->
 	<tr>
-		<td class="field-name" width="30%">
-			<fmt:message key="label.authoring.online.instruction" />
-			:
-		</td>
-		<td>
-			<c:out value="${survey.onlineInstructions}" escapeXml="false" />
-		</td>
-	</tr>
-	<tr>
-		<td>
-			&nbsp;
-		</td>
-		<td>
-
-			<div id="onlinefile">
-				<c:forEach var="file" items="${survey.onlineFileList}">
-					<li>
-						<c:out value="${file.fileName}" />
-						<c:set var="viewURL">
-							<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
-						</c:set>
-						<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"> <fmt:message key="label.view" /> </a> &nbsp;
-						<c:set var="downloadURL">
-							<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
-						</c:set>
-						<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <fmt:message key="label.download" /> </a>
-					</li>
-				</c:forEach>
+		<td colspan="3">
+			<div class="field-name">
+				<fmt:message key="label.authoring.online.instruction" /> :
+			</div>	
+			<div style="padding-left: 20px;">
+				<c:out value="${survey.onlineInstructions}" escapeXml="false" />
 			</div>
 		</td>
 	</tr>
+	
+	<c:if test="${not empty survey.onlineFileList}">
+		<tr>
+			<td  colspan="3" class="field-name-alternative-color">
+				<fmt:message key="label.monitoring.instructions.attachments" />
+			</td>
+		</tr>		
+	</c:if>
+		
+	<c:forEach var="file" items="${survey.onlineFileList}">
+		<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.fileUuid}&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.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
+				</c:set>
+				<a href="<c:out value='${downloadURL}' escapeXml='false'/>" class="button"> <fmt:message key="label.download" /> </a>
+			</td>
+		</tr>
+	</c:forEach>
+
+	
 	<tr>
-		<td class="field-name"  width="30%">
-			<fmt:message key="label.authoring.offline.instruction" />
-			:
+		<td colspan="3">
+			<hr />
 		</td>
-		<td>
-			<c:out value="${survey.offlineInstructions}" escapeXml="false" />
-		</td>
 	</tr>
+	
 	<tr>
-		<td>
-			&nbsp;
-		</td>
-		<td>
-			<div id="offlinefile">
-				<c:forEach var="file" items="${survey.offlineFileList}">
-					<li>
-						<c:out value="${file.fileName}" />
-						<c:set var="viewURL">
-							<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
-						</c:set>
-						<html:link href="javascript:launchInstructionsPopup('${viewURL}')">
-							<fmt:message key="label.view" />
-						</html:link>
-						<c:set var="downloadURL">
-							<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
-						</c:set>
-						<html:link href="${downloadURL}">
-							<fmt:message key="label.download" />
-						</html:link>
-					</li>
-				</c:forEach>
+		<td colspan="3">
+			<div class="field-name">
+				<fmt:message key="label.authoring.offline.instruction" /> :
+			</div>	
+			<div style="padding-left: 20px;">
+				<c:out value="${survey.offlineInstructions}" escapeXml="false" />
 			</div>
 		</td>
 	</tr>
+	
+	<c:if test="${not empty survey.offlineFileList}">
+		<tr>
+			<td  colspan="3" class="field-name-alternative-color">
+				<fmt:message key="label.monitoring.instructions.attachments" />
+			</td>
+		</tr>
+	</c:if>		
+		
+	<c:forEach var="file" items="${survey.offlineFileList}">
+		<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.fileUuid}&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.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
+				</c:set>
+				<a href="<c:out value='${downloadURL}' escapeXml='false'/>" class="button"> <fmt:message key="label.download" /> </a>
+			</td>
+		</tr>
+	</c:forEach>
+	
 </table>
-
-