Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v
diff -u -r1.44 -r1.45
--- lams_tool_vote/web/learning/AllNominations.jsp	26 Aug 2009 01:11:51 -0000	1.44
+++ lams_tool_vote/web/learning/AllNominations.jsp	16 Sep 2009 03:46:43 -0000	1.45
@@ -237,8 +237,8 @@
 					</c:if>
 
 					<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true'}">
-						<html:link href="javascript:;" property="learnerFinished"
-							onclick="javascript:submitMethod('learnerFinished');"
+						<html:link href="#" property="learnerFinished"
+							onclick="javascript:submitMethod('learnerFinished');return false"
 							styleClass="button" style="float:right" styleId="finishButton">
 							<span class="nextActivity"><fmt:message key="label.finished" /></span>
 						</html:link>
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/ExitLearning.jsp,v
diff -u -r1.30 -r1.31
--- lams_tool_vote/web/learning/ExitLearning.jsp	1 Mar 2009 01:50:18 -0000	1.30
+++ lams_tool_vote/web/learning/ExitLearning.jsp	16 Sep 2009 03:46:43 -0000	1.31
@@ -107,8 +107,8 @@
 					</c:if>
 
 					<div class="space-bottom-top align-right">
-						<html:link href="javascript:;" property="learnerFinished" styleClass="button" styleId="finishButton"
-							onclick="submitMethod('learnerFinished');">
+						<html:link href="#" property="learnerFinished" styleClass="button" styleId="finishButton"
+							onclick="submitMethod('learnerFinished');return false">
 							<span class="nextActivity"><fmt:message key="label.finished" /></span>
 						</html:link>
 					</div>
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.31 -r1.32
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	1 Mar 2009 01:50:18 -0000	1.31
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	16 Sep 2009 03:46:43 -0000	1.32
@@ -117,8 +117,8 @@
 				
 				<c:when test="${voteGeneralLearnerFlowDTO.reflection != 'true'}">
 					<span class="right-buttons">
-						<html:link href="javascript:;" property="learnerFinished" styleId="finishButton"
-							onclick="javascript:submitMethod('learnerFinished');"
+						<html:link href="#" property="learnerFinished" styleId="finishButton"
+							onclick="javascript:submitMethod('learnerFinished');return false"
 							styleClass="button">
 							<span class="nextActivity"><fmt:message key="label.finished" /></span>
 						</html:link>
Index: lams_tool_vote/web/learning/Notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Notebook.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_vote/web/learning/Notebook.jsp	8 Jun 2007 01:43:32 -0000	1.7
+++ lams_tool_vote/web/learning/Notebook.jsp	16 Sep 2009 03:46:43 -0000	1.8
@@ -71,11 +71,11 @@
 				styleClass="text-area"></html:textarea>
 
 			<div class="space-bottom-top align-right">
-				<html:submit property="submitReflection"
-					onclick="javascript:submitMethod('submitReflection');"
+				<html:link href="#" property="submitReflection"
+					onclick="javascript:submitMethod('submitReflection');return false"
 					styleClass="button">
-					<fmt:message key="button.endLearning" />
-				</html:submit>
+					<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
+				</html:link>
 			</div>
 
 		</div>
Index: lams_tool_vote/web/learning/RevisitedAllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/RevisitedAllNominations.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_vote/web/learning/RevisitedAllNominations.jsp	1 Mar 2009 01:50:18 -0000	1.11
+++ lams_tool_vote/web/learning/RevisitedAllNominations.jsp	16 Sep 2009 03:46:43 -0000	1.12
@@ -104,8 +104,8 @@
 					<fmt:message key="label.retake" />
 				</html:submit>
 
-				<html:link href="javascript:;" property="learnerFinished" styleId="finishButton"
-					onclick="javascript:submitMethod('learnerFinished');"
+				<html:link href="#" property="learnerFinished" styleId="finishButton"
+					onclick="javascript:submitMethod('learnerFinished');return false"
 					styleClass="button">
 					<span class="nextActivity"><fmt:message key="label.finished" /></span>
 				</html:link>
Index: lams_tool_vote/web/learning/RunOffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Attic/RunOffline.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_vote/web/learning/RunOffline.jsp	1 Mar 2009 01:50:18 -0000	1.11
+++ lams_tool_vote/web/learning/RunOffline.jsp	16 Sep 2009 03:46:43 -0000	1.12
@@ -41,7 +41,6 @@
 	<script language="JavaScript" type="text/JavaScript">
 		function submitMethod(actionMethod) 
 		{
-			document.getElementById("finishButton").disabled = true;
 			document.VoteLearningForm.dispatch.value=actionMethod; 
 			document.VoteLearningForm.submit();
 		}
@@ -51,8 +50,7 @@
 
 <body class="stripes">
 
-	<html:form action="/learning?validate=false"
-		enctype="multipart/form-data" method="POST" target="_self">
+	<html:form action="/learning?validate=false" method="POST">
 		<html:hidden property="dispatch" />
 		<html:hidden property="toolSessionID" />
 		<html:hidden property="userID" />
@@ -69,19 +67,21 @@
 			<div class="space-bottom-top align-right">
 
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true'}">
-					<html:submit property="learnerFinished" styleId="finishButton"
-						onclick="javascript:submitMethod('learnerFinished');"
-						styleClass="button">
-						<fmt:message key="label.finished" />
-					</html:submit>
+
+				      <html:link href="#" property="endLearning" styleId="finishButton" 
+				      onclick="javascript:submitMethod('learnerFinished');return false"
+				      styleClass="button">
+					<span class="nextActivity"><fmt:message key="label.finished" /></span>
+				      </html:link>
+
 				</c:if>
 
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection == 'true'}">
-					<html:link href="javascript:;" property="forwardtoReflection"
+					<html:submit property="forwardtoReflection"
 						onclick="javascript:submitMethod('forwardtoReflection');"
 						styleClass="button">
-						<span class="nextActivity"><fmt:message key="label.continue" /></span>
-					</html:link>
+						<fmt:message key="label.continue" />
+					</html:submit>
 				</c:if>
 
 			</div>