Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java,v
diff -u -r1.7 -r1.8
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	25 Apr 2006 13:28:49 -0000	1.7
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	25 Apr 2006 16:00:02 -0000	1.8
@@ -417,7 +417,21 @@
 	        	order++;
 	    		if (voteQueContent != null)
 	    		{
-	    		    localMapQuestionsContent.put(new Integer(order).toString(),voteQueContent.getQuestion());
+	    		    String entry=voteQueContent.getQuestion(); 
+	    		    logger.debug("entry: " + entry);
+	    		    if (entry != null)
+	    		    {
+		    		    if (entry.equals("sample nomination"))
+		    		    {
+		    		        logger.debug("this nomination entry points to a user entered nomination: " + attempt.getUserEntry());
+		    		        localMapQuestionsContent.put(new Integer(order).toString(), attempt.getUserEntry());
+		    		    }
+		    		    else
+		    		    {
+		    		        logger.debug("this nomination entry points to a standard nomination: " + voteQueContent.getQuestion());
+		    		        localMapQuestionsContent.put(new Integer(order).toString(),voteQueContent.getQuestion());    
+		    		    }
+	    		    }
 	    		}
 	    	}
 	    	request.getSession().setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, localMapQuestionsContent);
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_vote/web/learning/AllNominations.jsp	25 Apr 2006 13:28:49 -0000	1.3
+++ lams_tool_vote/web/learning/AllNominations.jsp	25 Apr 2006 16:00:02 -0000	1.4
@@ -76,14 +76,14 @@
 
 			  		<c:forEach var="entry" items="${sessionScope.mapGeneralCheckedOptionsContent}">
 						  <tr>
-						  	<td NOWRAP align=left valign=top  colspan=2> 
+						  	<td NOWRAP align=center valign=top  colspan=2> 
 								  <c:out value="${entry.value}" escapeXml="false" />									
 						  	</td>
 						  </tr>
 					</c:forEach>
 
 						<tr> 
-							<td NOWRAP align=left class="input" valign=top colspan=2> 
+							<td NOWRAP align=center class="input" valign=top colspan=2> 
 						 	  		<c:out value="${VoteLearningForm.userEntry}"/> 						 			
 					 		</td>
 					  	</tr>
@@ -107,12 +107,26 @@
 				                                    <bean:message key="label.retake"/>
 				                                </html:submit>
 								</c:if> 		          								                      
-	                            <html:submit property="continueOptionsCombined" 
-	                                         styleClass="linkbutton" 
-	                                         onclick="submitMethod('continueOptionsCombined');">
-									<bean:message key="button.submit"/>
-	                            </html:submit>
-	   						&nbsp&nbsp&nbsp&nbsp&nbsp                                	   						
+								
+								<c:if test="${VoteLearningForm.revisitingUser == 'false' }"> 							
+		                            <html:submit property="continueOptionsCombined" 
+		                                         styleClass="linkbutton" 
+		                                         onclick="submitMethod('continueOptionsCombined');">
+										<bean:message key="button.submit"/>
+		                            </html:submit>
+		   						&nbsp&nbsp&nbsp&nbsp&nbsp                                	   						
+								</c:if> 		          		
+
+								<c:if test="${VoteLearningForm.revisitingUser == 'true' && VoteLearningForm.lockOnFinish != 'true'}"> 							
+		                            <html:submit property="continueOptionsCombined" 
+		                                         styleClass="linkbutton" 
+		                                         onclick="submitMethod('continueOptionsCombined');">
+										<bean:message key="button.submit"/>
+		                            </html:submit>
+		   						&nbsp&nbsp&nbsp&nbsp&nbsp                                	   						
+								</c:if> 		          		
+
+														                      	   						
                                 <html:submit property="learnerFinished" 
                                              styleClass="linkbutton" 
                                              onclick="submitMethod('learnerFinished');">