Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java
===================================================================
diff -u -r63c1c2dbe54c8eed67ddd6d429886e7ca3daef5d -r192e812bc372965e505ea849d55537547fae74bd
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java	(.../ExportServlet.java)	(revision 63c1c2dbe54c8eed67ddd6d429886e7ca3daef5d)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java	(.../ExportServlet.java)	(revision 192e812bc372965e505ea849d55537547fae74bd)
@@ -113,8 +113,8 @@
     	
     	MonitoringUtil.prepareChartDataForExportLearner(request, voteService, null, content.getVoteContentId(), voteSession.getUid());
     	logger.debug("post prepareChartDataForExport");
-        
-        logger.debug("ending learner mode: ");
+    	
+    	logger.debug("ending learner mode: ");
     }
     
     public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies)
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java
===================================================================
diff -u -ra178ed11c7cc66dbfbff48645b8c6cc33eb2dbf8 -r192e812bc372965e505ea849d55537547fae74bd
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java	(.../VoteAction.java)	(revision a178ed11c7cc66dbfbff48645b8c6cc33eb2dbf8)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java	(.../VoteAction.java)	(revision 192e812bc372965e505ea849d55537547fae74bd)
@@ -317,7 +317,6 @@
 	        logger.debug("returning back to from to fix errors:");
 	        request.getSession().setAttribute(EDITACTIVITY_EDITMODE, new Boolean(true));
 	        request.setAttribute(VALIDATION_ERROR, new Boolean(true).toString());
-	        //return mapping.findForward(destination);
 	        return false;
 	    }
 	    
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java
===================================================================
diff -u -r50ad2be9f7ba75c8a0d7a47b84f7b9b0e0b2114e -r192e812bc372965e505ea849d55537547fae74bd
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	(.../VoteMonitoringAction.java)	(revision 50ad2be9f7ba75c8a0d7a47b84f7b9b0e0b2114e)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	(.../VoteMonitoringAction.java)	(revision 192e812bc372965e505ea849d55537547fae74bd)
@@ -466,16 +466,38 @@
 			logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to true");
 		}
 		
-    	refreshInstructionsData(request, voteContent);
+    	refreshInstructionsData(request, voteContent, voteService);
 
     	request.getSession().setAttribute(CURRENT_MONITORING_TAB, "instructions");
     	logger.debug("ending  initInstructionsContent...");
 	}
 
-	public void refreshInstructionsData(HttpServletRequest request, VoteContent voteContent)
+	public void refreshInstructionsData(HttpServletRequest request, VoteContent voteContent, IVoteService voteService)
 	{
 	    request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS,voteContent.getOnlineInstructions());
 	    request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS,voteContent.getOfflineInstructions());
+	    
+        /*process offline files metadata*/
+	    List listOfflineFilesMetaData=voteService.getOfflineFilesMetaData(voteContent.getUid());
+	    logger.debug("existing listOfflineFilesMetaData, to be structured as VoteAttachmentDTO: " + listOfflineFilesMetaData);
+	    listOfflineFilesMetaData=AuthoringUtil.populateMetaDataAsAttachments(listOfflineFilesMetaData);
+	    logger.debug("populated listOfflineFilesMetaData: " + listOfflineFilesMetaData);
+	    request.getSession().setAttribute(LIST_OFFLINEFILES_METADATA, listOfflineFilesMetaData);
+	    
+	    List listUploadedOfflineFileNames=AuthoringUtil.populateMetaDataAsFilenames(listOfflineFilesMetaData);
+	    logger.debug("returned from db listUploadedOfflineFileNames: " + listUploadedOfflineFileNames);
+	    request.getSession().setAttribute(LIST_UPLOADED_OFFLINE_FILENAMES, listUploadedOfflineFileNames);
+	    
+	    /*process online files metadata*/
+	    List listOnlineFilesMetaData=voteService.getOnlineFilesMetaData(voteContent.getUid());
+	    logger.debug("existing listOnlineFilesMetaData, to be structured as VoteAttachmentDTO: " + listOnlineFilesMetaData);
+	    listOnlineFilesMetaData=AuthoringUtil.populateMetaDataAsAttachments(listOnlineFilesMetaData);
+	    logger.debug("populated listOnlineFilesMetaData: " + listOnlineFilesMetaData);
+	    request.getSession().setAttribute(LIST_ONLINEFILES_METADATA, listOnlineFilesMetaData);
+	    
+	    List listUploadedOnlineFileNames=AuthoringUtil.populateMetaDataAsFilenames(listOnlineFilesMetaData);
+	    logger.debug("returned from db listUploadedOnlineFileNames: " + listUploadedOnlineFileNames);
+	    request.getSession().setAttribute(LIST_UPLOADED_ONLINE_FILENAMES, listUploadedOnlineFileNames);
 	}
 
     
@@ -603,7 +625,7 @@
     public ActionForward submitAllContent(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
     throws IOException, ServletException {
     	logger.debug("dispatching proxy submitAllContent...");
-    	request.getSession().setAttribute(ACTIVE_MODULE, DEFINE_LATER);
+    	request.getSession().setAttribute(ACTIVE_MODULE, MONITORING);
 
     	request.setAttribute(SOURCE_VOTE_STARTER, "monitoring");
 	    logger.debug("SOURCE_VOTE_STARTER: monitoring");
@@ -628,7 +650,8 @@
 		
 		if (isContentSubmitted == true)
 		    voteMonitoringForm.setSbmtSuccess(new Boolean(true).toString());
-		    
+
+		request.getSession().setAttribute(DEFINE_LATER_IN_EDIT_MODE, new Boolean(false));
 		logger.debug("final submit status :" +voteMonitoringForm.getSbmtSuccess());
         return (mapping.findForward(destination));	
     }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java
===================================================================
diff -u -r9b9b31de09cd2c5a5594ae149ca63b209cd602c3 -r192e812bc372965e505ea849d55537547fae74bd
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java	(.../VoteMonitoringStarterAction.java)	(revision 9b9b31de09cd2c5a5594ae149ca63b209cd602c3)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java	(.../VoteMonitoringStarterAction.java)	(revision 192e812bc372965e505ea849d55537547fae74bd)
@@ -243,7 +243,7 @@
 		voteMonitoringAction.refreshStatsData(request);
 		
 		logger.debug("refreshing instructions data...");
-		voteMonitoringAction.refreshInstructionsData(request, voteContent);
+		voteMonitoringAction.refreshInstructionsData(request, voteContent, voteService);
 		    		
 	    logger.debug("end initializing  monitoring data...");
 		return true;
Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp
===================================================================
diff -u -rc849cc447f6fa8c34a5878b5b0eff51ce2ec1344 -r192e812bc372965e505ea849d55537547fae74bd
--- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision c849cc447f6fa8c34a5878b5b0eff51ce2ec1344)
+++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision 192e812bc372965e505ea849d55537547fae74bd)
@@ -186,10 +186,6 @@
 		<!-- tab content 1 (Basic) -->
 		<lams:TabBody id="1" titleKey="label.basic" page="BasicContent.jsp"/>
 		<!-- end of content (Basic) -->
-		<!-- Button Row -->
-		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lavote11" 
-			cancelButtonLabelKey="label.cancel" saveButtonLabelKey="label.save" toolContentID="${formBean.toolContentID}" />			
 	</c:if> 			
 
 	
Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
diff -u -rbe0f74b3d01318467107b6a074df9a097ca56fc1 -r192e812bc372965e505ea849d55537547fae74bd
--- lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
+++ lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 192e812bc372965e505ea849d55537547fae74bd)
@@ -150,7 +150,15 @@
 					
 					</table>
 
+      	<c:if test="${ activeModule != 'authoring' }"> 					
+			<HR>
+			<p align="right">
+		        <a href="javascript:submitMethod('submitAllContent')" class="button">
+		        	<bean:message key="label.save"/></a>
+			</p>
+		</c:if> 					
 
+
 <SCRIPT language="JavaScript"> 
 
 	function removeOption(optIndex)
Index: lams_tool_vote/web/export/ExportContent.jsp
===================================================================
diff -u -rca5e8fafb4ef5006a3acbf41c7fa88e94037a9a4 -r192e812bc372965e505ea849d55537547fae74bd
--- lams_tool_vote/web/export/ExportContent.jsp	(.../ExportContent.jsp)	(revision ca5e8fafb4ef5006a3acbf41c7fa88e94037a9a4)
+++ lams_tool_vote/web/export/ExportContent.jsp	(.../ExportContent.jsp)	(revision 192e812bc372965e505ea849d55537547fae74bd)
@@ -128,6 +128,7 @@
 
 						<tr> 
 							<td NOWRAP valign=top align=left >
+		
 								Pie Chart
 							</td>
 						</tr>
Index: lams_tool_vote/web/monitoring/Instructions.jsp
===================================================================
diff -u -rbc445cd305b92a8737e721c1ab90ed6138dc1715 -r192e812bc372965e505ea849d55537547fae74bd
--- lams_tool_vote/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision bc445cd305b92a8737e721c1ab90ed6138dc1715)
+++ lams_tool_vote/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision 192e812bc372965e505ea849d55537547fae74bd)
@@ -31,32 +31,107 @@
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
-		<table class="forms">
-			<tr>
-				<td>
-					<table align="center">
-						<tr> 
-							<td NOWRAP valign=top>
-				  				<b> <font size=2> <bean:message key="label.offlineInstructions.col" /> </font> </b>
-				  			</td>
-							<td NOWRAP valign=top>
-								  <font size=2> <c:out value="${sessionScope.richTextOfflineInstructions}" escapeXml="false" />	</font>					  
-							</td> 
-						</tr>
-						
-						<tr>
-							<td colspan=2> &nbsp&nbsp&nbsp </td>
-						</tr>
+	
+			<table width="80%" cellspacing="8" align="center" class="forms">
+				<tr> 
+					<td NOWRAP align="right" valign=top>
+						<font size=2>
+    	      				<b> <bean:message key="label.onlineInstructions.col" /> </b>
+    	      			</font>
+          			</td>
+					<td NOWRAP colspan=3 valign=top>
+							   <c:out value="${sessionScope.richTextOnlineInstructions}" escapeXml="false" />	
+					</td> 
+				</tr>
 				
-						<tr> 
-							<td NOWRAP valign=top>
-				  				<b> <font size=2> <bean:message key="label.onlineInstructions.col" /> </font></b>
-				  			</td>
-							<td NOWRAP valign=top>
-								  <font size=2> <c:out value="${sessionScope.richTextOnlineInstructions}" escapeXml="false" />	</font>					  
-							</td> 
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
+
+				<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%">
+						<table align="left" border="1">
+									<c:forEach var='file' items='${sessionScope.listOnlineFilesMetadata}'>
+											<tr>
+												<td NOWRAP valign=top>
+													<font size=2> <c:out value="${file.filename}"/> </font>
+												</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>
+													</a>
+												</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>
+													</a>
+												</td>
+											</tr>
+				         			</c:forEach>
+	         			</table>
+					</td> 
+				</tr>
+
+				
+				<tr> 
+					<td NOWRAP class="formlabel" valign=top>
+						<font size=2>
+    	      				<b> <bean:message key="label.offlineInstructions.col" /> <b>
+    	      			</font>
+          			</td>
+					<td NOWRAP colspan=3 valign=top>
+						   <c:out value="${sessionScope.richTextOfflineInstructions}" escapeXml="false" />	
+					</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%">
+						<table align="left" border="1">
+									<c:forEach var='file' items='${sessionScope.listOfflineFilesMetadata}'>
+											<tr>
+												<td NOWRAP valign=top>
+													<font size=2> <c:out value="${file.filename}"/> </font>
+												</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>
+													</a>
+												</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>
+													</a>
+												</td>
+											</tr>
+				         			</c:forEach>
+	         			</table>
+					</td> 
+				</tr>
+
+
+				<html:hidden property="fileItem"/>
+				<html:hidden property="offlineFile"/>				
+				<html:hidden property="uuid"/>				
+				
+			</table>	  	
+		
\ No newline at end of file