Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
diff -u -ra396ea2b749c1c978c3e9cfe05e427581dc6a1f7 -r80d305915ce2c3952f34ed08e8b4740188dde18c
--- lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision a396ea2b749c1c978c3e9cfe05e427581dc6a1f7)
+++ lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 80d305915ce2c3952f34ed08e8b4740188dde18c)
@@ -37,20 +37,24 @@
 					<table class="forms">
 						<tr>   
 						<td NOWRAP class=error>
-							<c:if test="${sbmtSuccess == 'true' }"> 			
-								<img src="<c:out value="${tool}"/>images/success.gif" align="left" width=20 height=20>  <bean:message key="sbmt.successful"/>  </img>
+							<c:if test="${voteGeneralAuthoringDTO.sbmtSuccess == 'true' }"> 			
+								<img src="<c:out value="${tool}"/>images/success.gif" align="left" width=20 height=20>  
+								<bean:message key="sbmt.successful"/>  </img>
 							</c:if> 			
 
-							<c:if test="${userExceptionMaxNominationInvalid == 'true'}"> 										
-									<img src="<c:out value="${tool}"/>images/error.jpg" align="left" width=20 height=20>  <bean:message key="error.maxNominationCount.invalid"/>  </img>
+							<c:if test="${voteGeneralAuthoringDTO.userExceptionMaxNominationInvalid == 'true'}"> 										
+									<img src="<c:out value="${tool}"/>images/error.jpg" align="left" width=20 height=20>  
+									<bean:message key="error.maxNominationCount.invalid"/>  </img>
 							</c:if> 			
 
-							<c:if test="${validationError == 'true'}"> 			
-									<img src="<c:out value="${tool}"/>images/error.jpg" align="left" width=20 height=20>  <bean:message key="error.fields.mandatory"/>  </img>
+							<c:if test="${voteGeneralAuthoringDTO.validationError == 'true'}"> 			
+									<img src="<c:out value="${tool}"/>images/error.jpg" align="left" width=20 height=20>  
+									<bean:message key="error.fields.mandatory"/>  </img>
 							</c:if> 			
 							
-							<c:if test="${userExceptionOptionsDuplicate == 'true'}"> 			
-									<img src="<c:out value="${tool}"/>images/error.jpg" align="left" width=20 height=20>   <bean:message key="error.duplicate.nomination"/>  </img>
+							<c:if test="${voteGeneralAuthoringDTO.userExceptionOptionsDuplicate == 'true'}"> 			
+									<img src="<c:out value="${tool}"/>images/error.jpg" align="left" width=20 height=20>   
+									<bean:message key="error.duplicate.nomination"/>  </img>
 							</c:if> 			
 							
 						</td>
@@ -61,13 +65,13 @@
 					<table class="forms">
 						<tr> 
 							<td NOWRAP valign=top>
-								<lams:SetEditor id="title" text="${activityTitle}" small="true" key="label.authoring.title.col"/>								
+								<lams:SetEditor id="title" text="${voteGeneralAuthoringDTO.activityTitle}" small="true" key="label.authoring.title.col"/>								
 							</td> 
 					  	</tr>
 
 					  	<tr> 
 							<td NOWRAP valign=top>
-								<lams:SetEditor id="instructions" text="${activityInstructions}" key="label.authoring.instructions.col"/>								
+								<lams:SetEditor id="instructions" text="${voteGeneralAuthoringDTO.activityInstructions}" key="label.authoring.instructions.col"/>								
 							</td> 
 						</tr>
 				
@@ -78,7 +82,7 @@
 					 		<!--default Option content, this entry can not be deleted but can be updated -->
 						 		<tr> 
 									<td NOWRAP valign=top>
-										<lams:SetEditor id="optionContent0" text="${defaultOptionContent}" key="label.nomination.col"/>								
+										<lams:SetEditor id="optionContent0" text="${voteGeneralAuthoringDTO.defaultOptionContent}" key="label.nomination.col"/>								
 									</td> 
 									
 									
@@ -90,22 +94,22 @@
 						  	<!--end of default Option content -->
 						  	
 					  		<!-- if there is more than just the default content start presenting them -->
-					  	 		<c:set var="optIndex" scope="session" value="1"/>
-								<c:forEach var="optionEntry" items="${sessionScope.mapOptionsContent}">
+					  	 		<c:set var="optIndex" scope="request" value="1"/>
+								<c:forEach var="optionEntry" items="${voteGeneralAuthoringDTO.mapOptionsContent}">
 							  		<c:if test="${optionEntry.key > 1}"> 			
-										<c:set var="optIndex" scope="session" value="${optIndex +1}"/>
+										<c:set var="optIndex" scope="request" value="${optIndex +1}"/>
 										  <tr>
 											<td NOWRAP valign=top>
 												<lams:SetEditor id="optionContent${optIndex-1}" text="${optionEntry.value}" key="label.nomination.col"/>								
-			                                	<c:if test="${ activeModule != 'monitoring' }"> 			
+			                                	<c:if test="${voteGeneralAuthoringDTO.activeModule != 'monitoring' }"> 			
 					 		 						<html:submit property="removeContent" 
 			                                                     styleClass="linkbutton"  
 			                                                     onclick="removeNomination(${optIndex});">
 														<bean:message key="button.delete"/>
 													</html:submit>
 												</c:if> 			
 												
-			                                	<c:if test="${ activeModule == 'monitoring' }"> 			
+			                                	<c:if test="${voteGeneralAuthoringDTO.activeModule == 'monitoring' }"> 			
 					 		 						<html:submit property="removeContent" 
 			                                                     styleClass="linkbutton"  
 			                                                     onclick="removeMonitoringNomination(${optIndex});">
@@ -115,19 +119,18 @@
 		                                    </td>
 		                                    
 			      						  	<td NOWRAP valign=top>			
-								  				<c:if test="${maxOptionIndex == optIndex}"> 			
+								  				<c:if test="${voteGeneralAuthoringDTO.maxOptionIndex == optIndex}"> 			
 				     								  <img src="<c:out value="${tool}"/>images/up.gif" align=left onclick="javascript:submitModifyNomination('<c:out value="${optIndex}"/>','moveNominationUp');"> 
 				     							</c:if> 	    
 												
-				 				  				<c:if test="${maxOptionIndex != optIndex }"> 			
+				 				  				<c:if test="${voteGeneralAuthoringDTO.maxOptionIndex != optIndex }"> 			
 					   								    <img src="<c:out value="${tool}"/>images/down.gif" align=left onclick="javascript:submitModifyNomination('<c:out value="${optIndex}"/>','moveNominationDown');">		  	   								 
 					       								<img src="<c:out value="${tool}"/>images/up.gif" align=left onclick="javascript:submitModifyNomination('<c:out value="${optIndex}"/>','moveNominationUp');">		  	
 												</c:if> 	           								 
 				                         	</td>
 										  </tr>
 									</c:if> 			
 								</c:forEach>
-								<html:hidden property="toolContentId" value="${VoteAuthoringForm.toolContentId}"/>
 								<html:hidden property="optIndex"/>
 		                        
 		                        <tr>
@@ -146,14 +149,14 @@
 				
 					</table>
 
-      	<c:if test="${ activeModule != 'authoring' }"> 					
+      	<c:if test="${voteGeneralAuthoringDTO.activeModule != 'authoring' }"> 					
 			<p align="right">
 		        <a href="javascript:submitMethod('submitAllContent')" class="button">
 		        	<bean:message key="label.save"/></a>
 			</p>
 		</c:if> 				
 		
-      	<c:if test="${activeModule == 'authoring'}"> 					
+      	<c:if test="${voteGeneralAuthoringDTO.activeModule == 'authoring'}"> 					
 			<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}" />