Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java
===================================================================
diff -u -r4355528fd4c5808b9b4d0eba2cbe68238560214e -raa602e148cfb13b61541a8c3ebc7676eda85bc77
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java	(.../VoteAction.java)	(revision 4355528fd4c5808b9b4d0eba2cbe68238560214e)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java	(.../VoteAction.java)	(revision aa602e148cfb13b61541a8c3ebc7676eda85bc77)
@@ -118,7 +118,7 @@
     }
     
     
-    public ActionForward addNewQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
+    public ActionForward addNewOption(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
     throws IOException, ServletException 
     {
 		logger.debug("dispathcing addNewQuestion");
@@ -154,22 +154,28 @@
 	    authoringUtil.reconstructOptionContentMapForAdd(mapOptionsContent, request);
 	    
 	    logger.debug("richTextInstructions: " + request.getSession().getAttribute(ACTIVITY_INSTRUCTIONS));
+	    
+	    mapOptionsContent=(Map)request.getSession().getAttribute(MAP_OPTIONS_CONTENT);
+	    logger.debug("final mapOptionsContent: " + mapOptionsContent);
 	    return (mapping.findForward(LOAD_QUESTIONS));
     }
 
 
-    public ActionForward removeQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
+    public ActionForward removeOption(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
     throws IOException, ServletException 
     {
 		logger.debug("doing removeQuestion ");
 		request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0));
 		
 		String richTextTitle = request.getParameter("title");
 	    String richTextInstructions = request.getParameter("instructions");
+	    String richTextPosting = request.getParameter("posting");
+	    
 	    logger.debug("richTextTitle: " + richTextTitle);
 	    logger.debug("richTextInstructions: " + richTextInstructions);
-	    String richTextPosting = request.getParameter("posting");
+	    logger.debug("richTextPosting: " + richTextPosting);
 	    
+	    
 	    if (richTextTitle != null)
 	    {
 			request.getSession().setAttribute(ACTIVITY_TITLE, richTextTitle);
@@ -194,6 +200,9 @@
 	    //request.getSession().setAttribute(EDITACTIVITY_EDITMODE, new Boolean(true));  
 	    authoringUtil.reconstructOptionContentMapForRemove(mapOptionsContent, request, voteAuthoringForm);
 	    
+	    mapOptionsContent=(Map)request.getSession().getAttribute(MAP_OPTIONS_CONTENT);
+	    logger.debug("final mapOptionsContent: " + mapOptionsContent);
+	    
 	    return (mapping.findForward(LOAD_QUESTIONS));
     }
 
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java
===================================================================
diff -u -r4355528fd4c5808b9b4d0eba2cbe68238560214e -raa602e148cfb13b61541a8c3ebc7676eda85bc77
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java	(.../VoteStarterAction.java)	(revision 4355528fd4c5808b9b4d0eba2cbe68238560214e)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java	(.../VoteStarterAction.java)	(revision aa602e148cfb13b61541a8c3ebc7676eda85bc77)
@@ -591,7 +591,11 @@
 	    		 * make the first entry the default(first) one for jsp
 	    		 */
 	    		if (mapIndex.longValue() == 1)
-	    			request.getSession().setAttribute(DEFAULT_QUESTION_CONTENT, voteQueContent.getQuestion());
+	    		{
+	    		    request.getSession().setAttribute(DEFAULT_QUESTION_CONTENT, voteQueContent.getQuestion());
+	    		    request.getSession().setAttribute(POSTING, voteQueContent.getQuestion());
+	    		}
+	    		
 	    		mapIndex=new Long(mapIndex.longValue()+1);
 			}
 		}
Fisheye: Tag aa602e148cfb13b61541a8c3ebc7676eda85bc77 refers to a dead (removed) revision in file `lams_tool_vote/web/author_page/css/aqua.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aa602e148cfb13b61541a8c3ebc7676eda85bc77 refers to a dead (removed) revision in file `lams_tool_vote/web/author_page/css/base.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aa602e148cfb13b61541a8c3ebc7676eda85bc77 refers to a dead (removed) revision in file `lams_tool_vote/web/author_page/css/fckeditor_style.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aa602e148cfb13b61541a8c3ebc7676eda85bc77 refers to a dead (removed) revision in file `lams_tool_vote/web/author_page/css/tool_custom.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aa602e148cfb13b61541a8c3ebc7676eda85bc77 refers to a dead (removed) revision in file `lams_tool_vote/web/author_page/css/xp.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aa602e148cfb13b61541a8c3ebc7676eda85bc77 refers to a dead (removed) revision in file `lams_tool_vote/web/author_page/js/fckcontroller.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aa602e148cfb13b61541a8c3ebc7676eda85bc77 refers to a dead (removed) revision in file `lams_tool_vote/web/author_page/js/tabcontroller.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
diff -u -r4355528fd4c5808b9b4d0eba2cbe68238560214e -raa602e148cfb13b61541a8c3ebc7676eda85bc77
--- lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 4355528fd4c5808b9b4d0eba2cbe68238560214e)
+++ lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision aa602e148cfb13b61541a8c3ebc7676eda85bc77)
@@ -62,13 +62,13 @@
 					  	<tr> 
 					 		<td valign="top"><font size=2> <b> <bean:message key="label.vote.posting"/>:  </b></font></td>
 							<td NOWRAP valign=top>
-								<lams:SetEditor id="posting" text="${defaultQuestionContent}" small="true"/>								
+								<lams:SetEditor id="posting" text="${posting}" small="true"/>								
 							</td> 
 						</tr>
 
 
 				
-			 		<!--default question content, this entry can not be deleted but can be updated -->
+			 		<!--default Option content, this entry can not be deleted but can be updated -->
 				 		<tr> 
 						  	<td valign="top"> 
 						 		<font size=2> <b> Nomination 1:  </b></font>
@@ -79,7 +79,7 @@
 							</td> 
 					  	</tr>
 		
-				  	<!--end of default question content -->
+				  	<!--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"/>
@@ -96,14 +96,14 @@
 	                                	<c:if test="${ (sessionScope.activeModule != 'monitoring') }"> 			
 			 		 						<html:submit property="removeContent" 
 	                                                     styleClass="linkbutton"  
-	                                                     onclick="removeQuestion(${optIndex});">
+	                                                     onclick="removeOption(${optIndex});">
 												<bean:message key="button.delete"/>
 											</html:submit>
 										</c:if> 			
 	                                	<c:if test="${ (sessionScope.activeModule == 'monitoring') }"> 			
 			 		 						<html:submit property="removeContent" 
 	                                                     styleClass="linkbutton"  
-	                                                     onclick="removeMonitoringQuestion(${optIndex});">
+	                                                     onclick="removeMonitoringOption(${optIndex});">
 												<bean:message key="button.delete"/>
 											</html:submit>
 										</c:if> 													
@@ -120,7 +120,7 @@
                             <td align="right">
                                 <html:submit property="addContent" 
                                              styleClass="linkbutton" 
-                                             onclick="submitMethod('addNewQuestion');">
+                                             onclick="submitMethod('addNewOption');">
                                     <bean:message key="button.addNewQuestion"/>
                                 </html:submit>
                             </td>
@@ -136,17 +136,16 @@
 
 <SCRIPT language="JavaScript"> 
 
-	function removeQuestion(optIndex)
+	function removeOption(optIndex)
 	{
 		document.VoteAuthoringForm.optIndex.value=optIndex;
-		alert(optIndex);
-        submitMethod('removeQuestion');
+        submitMethod('removeOption');
 	}
 
-	function removeMonitoringQuestion(questionIndex)
+	function removeMonitoringOption(optIndex)
 	{
-		document.VoteMonitoringForm.questionIndex.value=questionIndex;
-        submitMonitoringMethod('removeQuestion');
+		document.VoteMonitoringForm.optIndex.value=optIndex;
+        submitMonitoringMethod('removeOption');
 	}
 	
  </SCRIPT>
Fisheye: Tag aa602e148cfb13b61541a8c3ebc7676eda85bc77 refers to a dead (removed) revision in file `lams_tool_vote/web/includes/javascript/fckcontroller.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aa602e148cfb13b61541a8c3ebc7676eda85bc77 refers to a dead (removed) revision in file `lams_tool_vote/web/includes/javascript/tabcontroller.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aa602e148cfb13b61541a8c3ebc7676eda85bc77 refers to a dead (removed) revision in file `lams_tool_vote/web/includes/javascript/xmlrequest.js'.
Fisheye: No comparison available.  Pass `N' to diff?