Index: lams_tool_vote/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.48 -r1.49
--- lams_tool_vote/conf/language/ApplicationResources.properties	18 Aug 2006 04:54:41 -0000	1.48
+++ lams_tool_vote/conf/language/ApplicationResources.properties	20 Aug 2006 14:47:22 -0000	1.49
@@ -137,6 +137,9 @@
 authoring.msg.cancel.save  =Do you want to close this window without saving?
 button.try.again  =Try again
 label.group  =Group
+label.tip.displayPieChart = Displays pie chart of votes
+label.tip.displayBarChart = Displays bar chart of votes
+label.refresh = Refresh
 
 
 #======= End labels: Exported 131 labels for en AU =====
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java,v
diff -u -r1.35 -r1.36
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	16 Aug 2006 15:01:34 -0000	1.35
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	20 Aug 2006 14:47:22 -0000	1.36
@@ -369,7 +369,7 @@
 		return (mapping.findForward(VIEW_ANSWERS));
     }
     
-
+    
     public ActionForward redoQuestionsOk(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/Attic/VoteLearningForm.java,v
diff -u -r1.19 -r1.20
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java	12 Aug 2006 21:40:49 -0000	1.19
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java	20 Aug 2006 14:47:22 -0000	1.20
@@ -81,6 +81,7 @@
 	protected String getNextQuestion;
 	protected String getPreviousQuestion;
 	protected String endLearning;
+	protected String refreshVotes;
 	
 	protected String nominationsSubmited;
 	protected String revisitingUser;
@@ -223,6 +224,7 @@
 		this.setLearnerFinished(null);
 		this.setDonePreview(null);
 		this.setDoneLearnerProgress(null);
+		this.setRefreshVotes(null);
 	}
 
 	public void resetParameters()
@@ -271,7 +273,19 @@
 	public void setOptionCheckBoxSelected(String optionCheckBoxSelected) {
 		this.optionCheckBoxSelected = optionCheckBoxSelected;
 	}
-	/**
+	    /**
+     * @return Returns the refreshVotes.
+     */
+    public String getRefreshVotes() {
+        return refreshVotes;
+    }
+    /**
+     * @param refreshVotes The refreshVotes to set.
+     */
+    public void setRefreshVotes(String refreshVotes) {
+        this.refreshVotes = refreshVotes;
+    }
+/**
 	 * @return Returns the optionIndex.
 	 */
 	public String getOptionIndex() {
Index: lams_tool_vote/web/403.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/403.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_vote/web/403.jsp	25 Jul 2006 05:26:57 -0000	1.1
+++ lams_tool_vote/web/403.jsp	20 Aug 2006 14:47:22 -0000	1.2
@@ -1,6 +1,6 @@
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c" %>
-<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
 
 <c:redirect url="${lams}errorpages/403.jsp"/>
\ No newline at end of file
Index: lams_tool_vote/web/404.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/404.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_vote/web/404.jsp	25 Jul 2006 05:26:57 -0000	1.1
+++ lams_tool_vote/web/404.jsp	20 Aug 2006 14:47:22 -0000	1.2
@@ -1,7 +1,7 @@
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c" %>
-<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
 
 <c:redirect url="${lams}errorpages/404.jsp"/>
 
Index: lams_tool_vote/web/authoring/AdvancedContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/AdvancedContent.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_vote/web/authoring/AdvancedContent.jsp	14 Aug 2006 18:48:35 -0000	1.9
+++ lams_tool_vote/web/authoring/AdvancedContent.jsp	20 Aug 2006 14:47:22 -0000	1.10
@@ -28,8 +28,8 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
+<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
 		
 			<table>
Index: lams_tool_vote/web/authoring/Basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/Attic/Basic.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_vote/web/authoring/Basic.jsp	13 Apr 2006 18:30:39 -0000	1.2
+++ lams_tool_vote/web/authoring/Basic.jsp	20 Aug 2006 14:47:22 -0000	1.3
@@ -29,8 +29,8 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
+<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
 <jsp:include page="/authoring/BasicContent.jsp" />
 
Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/BasicContent.jsp,v
diff -u -r1.28 -r1.29
--- lams_tool_vote/web/authoring/BasicContent.jsp	16 Aug 2006 15:01:35 -0000	1.28
+++ lams_tool_vote/web/authoring/BasicContent.jsp	20 Aug 2006 14:47:22 -0000	1.29
@@ -29,8 +29,8 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
+<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
 	                                     
 					<table>
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.10 -r1.11
--- lams_tool_vote/web/authoring/InstructionsContent.jsp	16 Aug 2006 21:34:48 -0000	1.10
+++ lams_tool_vote/web/authoring/InstructionsContent.jsp	20 Aug 2006 14:47:22 -0000	1.11
@@ -29,8 +29,8 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
+<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
 				<table>
 				<tr> 
@@ -49,15 +49,15 @@
 													 <c:out value="${file.filename}"/> 
 													</td>
 													<td NOWRAP valign=top>												
-													<c:set var="viewURL">
+													<c:set scope="request" var="viewURL">
 														<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=false"/>
 													</c:set>
 													<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
 														 	<bean:message key="label.view"/> 
 													</a>
 													</td>
 													<td NOWRAP valign=top>													
-													<c:set var="downloadURL">
+													<c:set scope="request" var="downloadURL">
 															<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=true"/>
 													</c:set>
 													<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
@@ -103,15 +103,15 @@
 													 <c:out value="${file.filename}"/> 
 													</td>
 													<td NOWRAP valign=top>												
-													<c:set var="viewURL">
+													<c:set scope="request" var="viewURL">
 														<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=false"/>
 													</c:set>
 													<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
 														 	<bean:message key="label.view"/> 
 													</a>
 													</td>
 													<td NOWRAP valign=top>													
-													<c:set var="downloadURL">
+													<c:set scope="request" var="downloadURL">
 															<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=true"/>
 													</c:set>
 													<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
Index: lams_tool_vote/web/export/ExportContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/export/ExportContent.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_vote/web/export/ExportContent.jsp	16 Aug 2006 21:34:48 -0000	1.10
+++ lams_tool_vote/web/export/ExportContent.jsp	20 Aug 2006 14:47:22 -0000	1.11
@@ -28,8 +28,8 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
+<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
  				
 			<table  class="forms">
Index: lams_tool_vote/web/images/Thumbs.db
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/images/Attic/Thumbs.db,v
diff -u -r1.2 -r1.3
Binary files differ
Index: lams_tool_vote/web/images/columnchart.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/images/columnchart.gif,v
diff -u
Binary files differ
Index: lams_tool_vote/web/images/piechart.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/images/piechart.gif,v
diff -u
Binary files differ
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v
diff -u -r1.21 -r1.22
--- lams_tool_vote/web/learning/AllNominations.jsp	14 Aug 2006 18:48:35 -0000	1.21
+++ lams_tool_vote/web/learning/AllNominations.jsp	20 Aug 2006 14:47:21 -0000	1.22
@@ -24,10 +24,10 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="lams">
+<c:set scope="request" var="lams">
 	<lams:LAMSURL />
 </c:set>
-<c:set var="tool">
+<c:set scope="request" var="tool">
 	<lams:WebAppURL />
 </c:set>
 
@@ -56,7 +56,8 @@
 <div id="header-no-tabs-learner"></div>
 
 <div id="content-learner">
-<html:form  action="/learning?validate=false" enctype="multipart/form-data"method="POST" target="_self">
+
+<html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">
 	<html:hidden property="dispatch"/>
 	<html:hidden property="toolSessionID"/>
 	<html:hidden property="userID"/>	
@@ -69,114 +70,100 @@
 	<html:hidden property="reportViewOnly"/>		
 	<html:hidden property="userEntry"/>		
 	
+		<table cellpadding="0">
+		
+			  <tr>
+			  	<td NOWRAP valign=top align=center colspan=2> 
+					<b> <bean:message key="label.progressiveResults"/>  </b>
+			  	</td>
+			  </tr>	
 
-				<table>
-					  <tr>
-					  	<td NOWRAP align=center  valign=top colspan=2> 
-						  	 <b>  <bean:message key="label.progressiveResults"/> </b> 
-					  	</td>
-					  </tr>
-					  
- 					<c:if test="${voteGeneralLearnerFlowDTO.nominationsSubmited == 'true'}"> 			
-						<tr> <td class="error" align=center>
-								<img src="<c:out value="${tool}"/>images/success.gif" align="left" width=20 height=20>  
-								 <bean:message key="sbmt.learner.nominations.successful"/>  </img>
-						</td></tr>
-					</c:if> 		
-					  
-					  <tr>
-					  	<td NOWRAP align=center valign=top colspan=2> 
-							<c:set var="viewURL">
-								<html:rewrite page="/chartGenerator?type=pie"/>
-							</c:set>
-							<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-								 	<bean:message key="label.view.piechart"/>  
-							</a>
-								
-					  	</td>
-					  </tr>	
-					  
-					  
-			  			<tr> 
-						  	<td NOWRAP align=center  valign=top colspan=2> 
-								<c:set var="viewURL">
-									<html:rewrite page="/chartGenerator?type=bar"/>
-								</c:set>
-								<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-									 	<bean:message key="label.view.barchart"/>  
-								</a>
-							</td>
-						</tr>
-					  
-					  
-					  
 				  		<!--present  a mini summary table here -->
 			  			<tr> 
-						  	<td NOWRAP align=center  valign=top colspan=2> <table>
-					  
-					  				<tr>
-								 		<td NOWRAP> <b>  <bean:message key="label.nomination"/> </b> </td>
-										<td NOWRAP> <b>  <bean:message key="label.total.votes"/> </b> </td>
-									</tr>
-									
-									<c:forEach var="currentNomination" items="${voteGeneralLearnerFlowDTO.mapStandardNominationsHTMLedContent}">
-							  	 		<c:set var="currentNominationKey" scope="request" value="${currentNomination.key}"/>
-							  	 		 <tr>
-				  	 						<td NOWRAP valign=top align=left>
-												<c:out value="${currentNomination.value}" escapeXml="false"/>
-											 </td>
+						  	<td NOWRAP align=center  valign=top> 
+							  	<table cellpadding="0" class="alternative-color">
+						  				<tr>
+									 		<td NOWRAP> <b>  <bean:message key="label.nomination"/> </b> </td>
+											<td NOWRAP> <b>  <bean:message key="label.total.votes"/> </b> </td>
+										</tr>
+										
+										<c:forEach var="currentNomination" items="${voteGeneralLearnerFlowDTO.mapStandardNominationsHTMLedContent}">
+								  	 		<c:set var="currentNominationKey" scope="request" value="${currentNomination.key}"/>
+								  	 		 <tr>
+					  	 						<td NOWRAP valign=top align=left>
+													<c:out value="${currentNomination.value}" escapeXml="false"/>
+												 </td>
+				
+												<td NOWRAP valign=top align=left>				  	 		
+										  	 		<c:forEach var="currentUserCount" items="${voteGeneralLearnerFlowDTO.mapStandardUserCount}">
+											  	 		<c:set var="currentUserKey" scope="request" value="${currentUserCount.key}"/>
+										  				<c:if test="${currentNominationKey == currentUserKey}"> 				
+										  				
+										  					<c:if test="${currentUserCount.value != '0' }"> 	
+													  	 		<c:forEach var="currentQuestionUid" items="${voteGeneralLearnerFlowDTO.mapStandardQuestionUid}">
+														  	 		<c:set var="currentQuestionUidKey" scope="request" value="${currentQuestionUid.key}"/>
+													  				<c:if test="${currentQuestionUidKey == currentUserKey}"> 				
+	
+															  	 		<c:forEach var="currentSessionUid" items="${voteGeneralLearnerFlowDTO.mapStandardToolSessionUid}">
+																  	 		<c:set var="currentSessionUidKey" scope="request" value="${currentSessionUid.key}"/>
+															  				<c:if test="${currentSessionUidKey == currentQuestionUidKey}"> 				
 			
-											<td NOWRAP valign=top align=left>				  	 		
-									  	 		<c:forEach var="currentUserCount" items="${voteGeneralLearnerFlowDTO.mapStandardUserCount}">
-										  	 		<c:set var="currentUserKey" scope="request" value="${currentUserCount.key}"/>
-									  				<c:if test="${currentNominationKey == currentUserKey}"> 				
-									  				
-									  					<c:if test="${currentUserCount.value != '0' }"> 	
-												  	 		<c:forEach var="currentQuestionUid" items="${voteGeneralLearnerFlowDTO.mapStandardQuestionUid}">
-													  	 		<c:set var="currentQuestionUidKey" scope="request" value="${currentQuestionUid.key}"/>
-												  				<c:if test="${currentQuestionUidKey == currentUserKey}"> 				
+																	  				<c:if test="${currentNomination.value != 'Open Vote'}"> 				
+																						<c:set scope="request" var="viewURL">
+																							<lams:WebAppURL/>monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value}
+																						</c:set>
+	
+																						 <c:out value="${currentUserCount.value}"/>  
+	
+																					</c:if> 	    
+																	  				<c:if test="${currentNomination.value == 'Open Vote'}"> 				
+																							 <c:out value="${currentUserCount.value}"/>  
+																					</c:if> 	    
+																			</c:if> 	    
+																		</c:forEach>		  
+	
+																	</c:if> 	    
+																</c:forEach>		  
+															</c:if> 	    								
+											  				<c:if test="${currentUserCount.value == '0' }"> 		  				
+																	<c:out value="${currentUserCount.value}"/>  
+															</c:if> 	
+															    																								
+														</c:if> 	    
+													</c:forEach>		  
+				
+										  	 		<c:forEach var="currentRate" items="${voteGeneralLearnerFlowDTO.mapStandardRatesContent}">
+											  	 		<c:set var="currentRateKey" scope="request" value="${currentRate.key}"/>
+										  				<c:if test="${currentNominationKey == currentRateKey}"> 				
+																	 &nbsp(<c:out value="${currentRate.value}"/> <bean:message key="label.percent"/>) 
+														</c:if> 	    
+													</c:forEach>		  
+												</td>						
+											</tr>	
+										</c:forEach>	
+						  
+						  			</table>
+								</td> 
 
-														  	 		<c:forEach var="currentSessionUid" items="${voteGeneralLearnerFlowDTO.mapStandardToolSessionUid}">
-															  	 		<c:set var="currentSessionUidKey" scope="request" value="${currentSessionUid.key}"/>
-														  				<c:if test="${currentSessionUidKey == currentQuestionUidKey}"> 				
+							  	<td NOWRAP align=center valign=top> 
+									<c:set scope="request" var="viewURL">
+										<html:rewrite page="/chartGenerator?type=pie"/>
+									</c:set>
+									<a title="<bean:message key='label.tip.displayPieChart'/>" href="javascript:;" onclick="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+			                                    <img src="<c:out value="${tool}"/>images/piechart.gif" width=30 height=30 border="0">
+									</a> 
+									&nbsp
+									<c:set scope="request" var="viewURL">
+										<html:rewrite page="/chartGenerator?type=bar"/>
+									</c:set>
 		
-																  				<c:if test="${currentNomination.value != 'Open Vote'}"> 				
-																					<c:set var="viewURL">
-																						<lams:WebAppURL/>monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value}
-																					</c:set>
+									<a title="<bean:message key='label.tip.displayBarChart'/>" href="javascript:;" onclick="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+			                                    <img src="<c:out value="${tool}"/>images/columnchart.gif" width=30 height=30 border="0">
+									</a> 
+								</td>
 
-																					 <c:out value="${currentUserCount.value}"/>  
+							</tr>					  
 
-																				</c:if> 	    
-																  				<c:if test="${currentNomination.value == 'Open Vote'}"> 				
-																						 <c:out value="${currentUserCount.value}"/>  
-																				</c:if> 	    
-																		</c:if> 	    
-																	</c:forEach>		  
-
-																</c:if> 	    
-															</c:forEach>		  
-														</c:if> 	    								
-										  				<c:if test="${currentUserCount.value == '0' }"> 		  				
-																<c:out value="${currentUserCount.value}"/>  
-														</c:if> 	
-														    																								
-													</c:if> 	    
-												</c:forEach>		  
-			
-									  	 		<c:forEach var="currentRate" items="${voteGeneralLearnerFlowDTO.mapStandardRatesContent}">
-										  	 		<c:set var="currentRateKey" scope="request" value="${currentRate.key}"/>
-									  				<c:if test="${currentNominationKey == currentRateKey}"> 				
-																 &nbsp(<c:out value="${currentRate.value}"/> <bean:message key="label.percent"/>) 
-													</c:if> 	    
-												</c:forEach>		  
-											</td>								
-										</tr>	
-									</c:forEach>	
-					  
-					  			</table>
-								</td> </tr>					  
-
 					  <tr>
 					  	<td NOWRAP valign=top colspan=2> 
 								&nbsp
@@ -197,27 +184,33 @@
 						  </tr>
 					</c:forEach>
 
-						<tr> 
-							<td NOWRAP align=center  valign=top colspan=2> 
-						 	  		<c:out value="${VoteLearningForm.userEntry}"/> 						 			
-					 		</td>
-					  	</tr>
+					<tr> 
+						<td NOWRAP align=center  valign=top colspan=2> 
+					 	  		<c:out value="${VoteLearningForm.userEntry}"/> 						 			
+				 		</td>
+				  	</tr>
 
 
-
-
 				<c:if test="${VoteLearningForm.reportViewOnly != 'true'}"> 				   	
 				  <tr>
 				  	<td NOWRAP valign=top> 
-								<c:if test="${VoteLearningForm.voteChangable == 'true'}"> 				   						
-			                                <html:submit property="redoQuestionsOk" 
-			                                             styleClass="button" 
-			                                             onclick="submitMethod('redoQuestionsOk');">
-			                                    <bean:message key="label.retake"/>
-			                                </html:submit>
-								</c:if> 		          
-
-					<td>					
+	                                <html:submit property="refreshVotes" 
+	                                             styleClass="button" 
+	                                             onclick="submitMethod('viewAllResults');">
+	                                    <bean:message key="label.refresh"/>
+	                                </html:submit>
+	                                
+						<c:if test="${VoteLearningForm.voteChangable == 'true'}"> 				   										  
+									&nbsp&nbsp	
+	                                <html:submit property="redoQuestionsOk" 
+	                                             styleClass="button" 
+	                                             onclick="submitMethod('redoQuestionsOk');">
+	                                    <bean:message key="label.retake"/>
+	                                </html:submit>
+						</c:if> 		          					
+	                                
+	                                
+					</td>					
 					<td NOWRAP valign=top align=right> 			
                                 <html:submit property="learnerFinished" 
                                              styleClass="button" 
@@ -228,7 +221,11 @@
 				  </tr>
 				</c:if> 		          				  
 
-	</html:form>
+		
+		</table>
+	
+</html:form>
+
 </div>
 
 <div id="footer-learner"></div>
@@ -237,3 +234,9 @@
 </body>
 </html:html>
 
+
+
+
+
+
+
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AnswersContent.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_vote/web/learning/AnswersContent.jsp	12 Aug 2006 17:50:33 -0000	1.20
+++ lams_tool_vote/web/learning/AnswersContent.jsp	20 Aug 2006 14:47:21 -0000	1.21
@@ -24,10 +24,10 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="lams">
+<c:set scope="request"  var="lams">
 	<lams:LAMSURL />
 </c:set>
-<c:set var="tool">
+<c:set scope="request" var="tool">
 	<lams:WebAppURL />
 </c:set>
 
@@ -117,7 +117,8 @@
 	<html:hidden property="lockOnFinish"/>	
 	<html:hidden property="reportViewOnly"/>			
 	
-			<table>
+	
+			<table cellpadding="0">
 					<c:if test="${voteGeneralLearnerFlowDTO.activityRunOffline == 'true'}"> 			
 						<tr> <td class="error">
 							<bean:message key="label.learning.forceOfflineMessage"/>
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/ExitLearning.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_vote/web/learning/ExitLearning.jsp	14 Aug 2006 18:48:35 -0000	1.10
+++ lams_tool_vote/web/learning/ExitLearning.jsp	20 Aug 2006 14:47:21 -0000	1.11
@@ -24,10 +24,10 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="lams">
+<c:set scope="request" var="lams">
 	<lams:LAMSURL />
 </c:set>
-<c:set var="tool">
+<c:set scope="request" var="tool">
 	<lams:WebAppURL />
 </c:set>
 
@@ -69,7 +69,7 @@
 	<html:hidden property="reportViewOnly"/>		
 	<html:hidden property="userEntry"/>			
 		
-			<table>
+			<table cellpadding="0" class="alternative-color">
 					  <tr>
 					  	<td NOWRAP align=left valign=top colspan=2> 
 						  	 <b>  <bean:message key="label.learning.forceFinishMessage"/> </b> 
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.16 -r1.17
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	12 Aug 2006 17:50:34 -0000	1.16
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	20 Aug 2006 14:47:21 -0000	1.17
@@ -24,10 +24,10 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="lams">
+<c:set scope="request" var="lams">
 	<lams:LAMSURL />
 </c:set>
-<c:set var="tool">
+<c:set scope="request" var="tool">
 	<lams:WebAppURL />
 </c:set>
 
@@ -115,7 +115,7 @@
                                 </html:submit>
 					  	 </td>
 					  </tr>
-					
+		
 				</table>
 </html:form>
 
Index: lams_tool_vote/web/learning/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Attic/LearnerRep.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_vote/web/learning/LearnerRep.jsp	11 Aug 2006 12:34:07 -0000	1.2
+++ lams_tool_vote/web/learning/LearnerRep.jsp	20 Aug 2006 14:47:21 -0000	1.3
@@ -24,10 +24,10 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="lams">
+<c:set scope="request" var="lams">
 	<lams:LAMSURL />
 </c:set>
-<c:set var="tool">
+<c:set scope="request" var="tool">
 	<lams:WebAppURL />
 </c:set>
 
@@ -72,7 +72,7 @@
 				</tr>
 		</table>
 
-		<c:set var="monitoringURL">
+		<c:set scope="request" var="monitoringURL">
 			<html:rewrite page="/monitoring.do" />
 		</c:set>
 
Index: lams_tool_vote/web/learning/defineLater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/defineLater.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_vote/web/learning/defineLater.jsp	14 Jul 2006 04:50:06 -0000	1.1
+++ lams_tool_vote/web/learning/defineLater.jsp	20 Aug 2006 14:47:21 -0000	1.2
@@ -24,10 +24,10 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="lams">
+<c:set scope="request" var="lams">
 	<lams:LAMSURL />
 </c:set>
-<c:set var="tool">
+<c:set scope="request" var="tool">
 	<lams:WebAppURL />
 </c:set>
 
Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/AllSessionsSummary.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	16 Aug 2006 15:01:35 -0000	1.10
+++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	20 Aug 2006 14:47:22 -0000	1.11
@@ -28,8 +28,8 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
+<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
 
 
@@ -171,7 +171,7 @@
 														<tr> 
 															<td> </td>
 															<td NOWRAP valign=top align=left >
-																<c:set var="viewURL">
+																<c:set scope="request" var="viewURL">
 																	<html:rewrite page="/chartGenerator?type=pie&currentSessionId=${currentSessionId}"/>
 																</c:set>
 																<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
@@ -182,7 +182,7 @@
 														<tr> 
 															<td> </td>
 															<td NOWRAP valign=top align=left >
-																<c:set var="viewURL">
+																<c:set scope="request" var="viewURL">
 																	<html:rewrite page="/chartGenerator?type=bar&currentSessionId=${currentSessionId}"/>
 																</c:set>
 																<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
@@ -222,7 +222,7 @@
 																	  				<c:if test="${currentSessionUidKey == currentQuestionUidKey}"> 				
 					
 																		  				<c:if test="${currentNomination.value != 'Open Vote'}"> 				
-																							<c:set var="viewURL">
+																							<c:set scope="request" var="viewURL">
 																								<lams:WebAppURL/>monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value}
 																							</c:set>
 																		  																					
Index: lams_tool_vote/web/monitoring/Edit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Edit.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_vote/web/monitoring/Edit.jsp	16 Aug 2006 15:01:35 -0000	1.3
+++ lams_tool_vote/web/monitoring/Edit.jsp	20 Aug 2006 14:47:22 -0000	1.4
@@ -28,8 +28,8 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
+<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
 		<c:if test="${voteGeneralMonitoringDTO.isMonitoredContentInUse != 'true'}"> 			
 			<c:if test="${voteGeneralMonitoringDTO.defineLaterInEditMode != 'true'}"> 			
Index: lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/IndividualSessionSummary.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp	16 Aug 2006 21:34:48 -0000	1.11
+++ lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp	20 Aug 2006 14:47:22 -0000	1.12
@@ -28,8 +28,8 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
+<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
 
 				<table>
@@ -164,7 +164,7 @@
 								<tr> 
 									<td> </td>
 									<td NOWRAP valign=top align=left >
-										<c:set var="viewURL">
+										<c:set scope="request" var="viewURL">
 											<html:rewrite page="/chartGenerator?type=pie"/>
 										</c:set>
 										<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
@@ -175,7 +175,7 @@
 								<tr> 
 									<td> </td>
 									<td NOWRAP valign=top align=left >
-										<c:set var="viewURL">
+										<c:set scope="request" var="viewURL">
 											<html:rewrite page="/chartGenerator?type=bar"/>
 										</c:set>
 										<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
@@ -215,7 +215,7 @@
 														  				<c:if test="${currentSessionUidKey == currentQuestionUidKey}"> 				
 		
 																  				<c:if test="${currentNomination.value != 'Open Vote'}"> 				
-																					<c:set var="viewURL">
+																					<c:set scope="request" var="viewURL">
 																						<lams:WebAppURL/>monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value}
 																					</c:set>
 																  																					
Index: lams_tool_vote/web/monitoring/Instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/Instructions.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_vote/web/monitoring/Instructions.jsp	16 Aug 2006 21:34:48 -0000	1.7
+++ lams_tool_vote/web/monitoring/Instructions.jsp	20 Aug 2006 14:47:22 -0000	1.8
@@ -28,8 +28,8 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
+<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
 	
 				<table>
@@ -56,7 +56,7 @@
 													 <c:out value="${file.filename}"/> 
 													</td>
 													<td NOWRAP valign=top>												
-													<c:set var="viewURL">
+													<c:set scope="request" var="viewURL">
 														<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=false"/>
 													</c:set>
 													<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
@@ -65,7 +65,7 @@
 													</td>
 													<td NOWRAP valign=top>													
 
-													<c:set var="downloadURL">
+													<c:set scope="request" var="downloadURL">
 															<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=true"/>
 													</c:set>
 													<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
@@ -101,7 +101,7 @@
 													 <c:out value="${file.filename}"/> 
 													</td>
 													<td NOWRAP valign=top>												
-													<c:set var="viewURL">
+													<c:set scope="request" var="viewURL">
 														<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=false"/>
 													</c:set>
 													<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
@@ -110,7 +110,7 @@
 													</td>
 													<td NOWRAP valign=top>													
 
-													<c:set var="downloadURL">
+													<c:set scope="request" var="downloadURL">
 															<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=true"/>
 													</c:set>
 													<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
Index: lams_tool_vote/web/monitoring/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/LearnerRep.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_vote/web/monitoring/LearnerRep.jsp	16 Aug 2006 15:01:35 -0000	1.5
+++ lams_tool_vote/web/monitoring/LearnerRep.jsp	20 Aug 2006 14:47:22 -0000	1.6
@@ -58,7 +58,7 @@
 				</tr>
 		</table>
 
-		<c:set var="monitoringURL">
+		<c:set scope="request" var="monitoringURL">
 			<html:rewrite page="/monitoring.do" />
 		</c:set>
 
Index: lams_tool_vote/web/monitoring/Stats.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Stats.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_vote/web/monitoring/Stats.jsp	16 Aug 2006 15:01:35 -0000	1.8
+++ lams_tool_vote/web/monitoring/Stats.jsp	20 Aug 2006 14:47:22 -0000	1.9
@@ -27,8 +27,8 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
+<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
  		<c:set var="statsTabActive" scope="request" value="true"/>
  		
Index: lams_tool_vote/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/SummaryContent.jsp,v
diff -u -r1.25 -r1.26
--- lams_tool_vote/web/monitoring/SummaryContent.jsp	16 Aug 2006 15:01:35 -0000	1.25
+++ lams_tool_vote/web/monitoring/SummaryContent.jsp	20 Aug 2006 14:47:22 -0000	1.26
@@ -28,8 +28,8 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
+<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
 		<c:if test="${(voteGeneralMonitoringDTO.userExceptionNoToolSessions == 'true')}"> 	
 				<table align="center">
Index: lams_tool_vote/web/monitoring/UserResponses.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/UserResponses.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_vote/web/monitoring/UserResponses.jsp	30 Jun 2006 03:26:26 -0000	1.5
+++ lams_tool_vote/web/monitoring/UserResponses.jsp	20 Aug 2006 14:47:22 -0000	1.6
@@ -28,8 +28,8 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
+<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
 	<tr> 
 			 <td NOWRAP valign=top>   <c:out value="${userData.userName}"/>   </td>