Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v
diff -u -r1.56.2.6 -r1.56.2.7
--- lams_tool_vote/web/learning/AllNominations.jsp	6 Nov 2016 11:54:34 -0000	1.56.2.6
+++ lams_tool_vote/web/learning/AllNominations.jsp	15 Feb 2017 04:12:34 -0000	1.56.2.7
@@ -22,9 +22,7 @@
 
 	<script type="text/javascript">
 		function submitMethod(actionMethod) {
-			if (actionMethod == 'learnerFinished') {
-				document.getElementById("finishButton").disabled = true;
-			}
+			$('.btn').prop('disabled', true);
 			document.VoteLearningForm.action += "&dispatch=" + actionMethod;
 			document.VoteLearningForm.submit();
 		}
@@ -215,21 +213,19 @@
 
 
 			<c:if test="${voteGeneralLearnerFlowDTO.reportViewOnly != 'true' }">
-				<html:submit property="refreshVotes" styleClass="btn btn-sm btn-default voffset10 pull-left"
-					onclick="submitMethod('viewAllResults');">
+				<button class="btn btn-sm btn-default voffset10 pull-left" onclick="submitMethod('viewAllResults');">
 					<fmt:message key="label.refresh" />
-				</html:submit>
+				</button>
 
 				<c:if test="${VoteLearningForm.lockOnFinish != 'true' && hasEditRight}">
-					<html:submit property="redoQuestionsOk" styleClass="btn btn-sm btn-default voffset10 pull-left "
-						onclick="submitMethod('redoQuestionsOk');">
+					<button class="btn btn-sm btn-default voffset10 pull-left " onclick="submitMethod('redoQuestionsOk');">
 						<fmt:message key="label.retake" />
-					</html:submit>
+					</button>
 				</c:if>
 
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true' || !hasEditRight}">
-					<html:link href="#" property="learnerFinished" onclick="javascript:submitMethod('learnerFinished');return false"
-						styleClass="btn btn-primary pull-right voffset10 na" styleId="finishButton">
+					<button onclick="javascript:submitMethod('learnerFinished');"
+						class="btn btn-primary pull-right voffset10 na" id="finishButton">
 						<c:choose>
 							<c:when test="${activityPosition.last}">
 								<fmt:message key="button.submitActivity" />
@@ -238,14 +234,13 @@
 								<fmt:message key="button.endLearning" />
 							</c:otherwise>
 						</c:choose>
-					</html:link>
+					</button>
 				</c:if>
 
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection == 'true' && hasEditRight}">
-					<html:submit property="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');"
-						styleClass="btn btn-primary pull-right voffset10">
+					<button onclick="javascript:submitMethod('forwardtoReflection');" class="btn btn-primary pull-right voffset10">
 						<fmt:message key="label.continue" />
-					</html:submit>
+					</button>
 				</c:if>
 			</c:if>
 			</div>
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AnswersContent.jsp,v
diff -u -r1.39.2.4 -r1.39.2.5
--- lams_tool_vote/web/learning/AnswersContent.jsp	6 Nov 2016 11:54:34 -0000	1.39.2.4
+++ lams_tool_vote/web/learning/AnswersContent.jsp	15 Feb 2017 04:12:34 -0000	1.39.2.5
@@ -61,6 +61,7 @@
 				alert("<fmt:message key="error.empty.selection"/>");
 				return false;
 			} else {
+				$('.btn').prop('disabled', true);
 				return true;
 			}
 		}
@@ -71,11 +72,6 @@
 			alert(msg);
 		}
 
-		function submitMethod(actionMethod) {
-			document.VoteLearningForm.dispatch.value = actionMethod;
-			document.VoteLearningForm.submit();
-		}
-
 		function checkLeaderProgress() {
 
 			$.ajax({
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/ExitLearning.jsp,v
diff -u -r1.38.2.5 -r1.38.2.6
--- lams_tool_vote/web/learning/ExitLearning.jsp	6 Nov 2016 11:54:34 -0000	1.38.2.5
+++ lams_tool_vote/web/learning/ExitLearning.jsp	15 Feb 2017 04:12:34 -0000	1.38.2.6
@@ -23,9 +23,7 @@
 
 	<script type="text/javascript">
 		function submitMethod(actionMethod) {
-			if (actionMethod == "learnerFinished") {
-				document.getElementById("finishButton").disabled = true;
-			}
+			$('.btn').prop('disabled', true);
 			document.VoteLearningForm.dispatch.value = actionMethod;
 			document.VoteLearningForm.submit();
 		}
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.38.2.5 -r1.38.2.6
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	6 Nov 2016 11:54:34 -0000	1.38.2.5
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	15 Feb 2017 04:12:34 -0000	1.38.2.6
@@ -17,9 +17,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script language="JavaScript" type="text/JavaScript">
 		function submitMethod(actionMethod) {
-			if (actionMethod == 'learnerFinished') {
-				document.getElementById("finishButton").disabled = true;
-			}
+			$('.btn').prop('disabled', true);
 			document.VoteLearningForm.action += "&dispatch=" + actionMethod;
 			document.VoteLearningForm.submit();
 		}
@@ -119,9 +117,8 @@
 				</c:when>
 
 				<c:when test="${voteGeneralLearnerFlowDTO.reflection != 'true' || !hasEditRight}">
-					<html:link href="#nogo" property="learnerFinished" styleId="finishButton"
-						onclick="javascript:submitMethod('learnerFinished');return false"
-						styleClass="btn btn-primary voffset10 pull-right na">
+					<html:submit property="learnerFinished" styleId="finishButton" onclick="javascript:submitMethod('learnerFinished')"
+						styleClass="btn btn-primary voffset10 pull-right n	a">
 						<c:choose>
 							<c:when test="${activityPosition.last}">
 								<fmt:message key="button.submitActivity" />
@@ -130,7 +127,7 @@
 								<fmt:message key="button.endLearning" />
 							</c:otherwise>
 						</c:choose>
-					</html:link>
+					</html:submit>
 				</c:when>
 
 				<c:otherwise>
Index: lams_tool_vote/web/learning/Notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Notebook.jsp,v
diff -u -r1.11.2.5 -r1.11.2.6
--- lams_tool_vote/web/learning/Notebook.jsp	6 Nov 2016 11:54:34 -0000	1.11.2.5
+++ lams_tool_vote/web/learning/Notebook.jsp	15 Feb 2017 04:12:34 -0000	1.11.2.6
@@ -15,6 +15,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script language="JavaScript" type="text/JavaScript">
 		function submitMethod(actionMethod) {
+			$('.btn').prop('disabled', true);
 			document.VoteLearningForm.dispatch.value = actionMethod;
 			document.VoteLearningForm.submit();
 		}
@@ -40,10 +41,10 @@
 			</div>
 
 			<html:textarea rows="5" property="entryText" styleClass="form-control" styleId="focused"></html:textarea>
-			<html:link href="#" property="submitReflection" onclick="javascript:submitMethod('submitReflection');return false"
+			<html:submit property="submitReflection" onclick="javascript:submitMethod('submitReflection')"
 				styleClass="btn btn-primary voffset10 pull-right na" styleId="finishButton">
 				<fmt:message key="button.endLearning" />
-			</html:link>
+			</html:submit>
 
 		</lams:Page>
 
Index: lams_tool_vote/web/learning/RevisitedAllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/RevisitedAllNominations.jsp,v
diff -u -r1.19.2.5 -r1.19.2.6
--- lams_tool_vote/web/learning/RevisitedAllNominations.jsp	6 Nov 2016 11:54:34 -0000	1.19.2.5
+++ lams_tool_vote/web/learning/RevisitedAllNominations.jsp	15 Feb 2017 04:12:34 -0000	1.19.2.6
@@ -22,9 +22,7 @@
 
 	<script type="text/javascript">
 		function submitMethod(actionMethod) {
-			if (actionMethod == "learnerFinished") {
-				document.getElementById("finishButton").disabled = true;
-			}
+			$('.btn').prop('disabled', true);
 			document.VoteLearningForm.dispatch.value = actionMethod;
 			document.VoteLearningForm.submit();
 		}
@@ -115,21 +113,18 @@
 			</c:if>
 
 
-
-			<html:link href="#nogo" property="learnerFinished" styleId="finishButton"
-				onclick="javascript:submitMethod('learnerFinished');return false"
+			<html:submit property="learnerFinished" styleId="finishButton"
+				onclick="javascript:submitMethod('learnerFinished');"
 				styleClass="btn btn-primary voffset10 pull-right na">
-				<span class="nextActivity"> <c:choose>
+				<c:choose>
 						<c:when test="${activityPosition.last}">
 							<fmt:message key="button.submitActivity" />
 						</c:when>
 						<c:otherwise>
 							<fmt:message key="button.endLearning" />
 						</c:otherwise>
-					</c:choose>
-				</span>
-			</html:link>
-
+				</c:choose>
+			</html:submit>
 			<div id="footer"></div>
 
 		</lams:Page>
Index: lams_tool_vote/web/learning/submissionDeadline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/submissionDeadline.jsp,v
diff -u -r1.1.2.5 -r1.1.2.6
--- lams_tool_vote/web/learning/submissionDeadline.jsp	6 Nov 2016 11:54:34 -0000	1.1.2.5
+++ lams_tool_vote/web/learning/submissionDeadline.jsp	15 Feb 2017 04:12:34 -0000	1.1.2.6
@@ -16,6 +16,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script language="JavaScript" type="text/JavaScript">
 		function submitMethod(actionMethod) {
+			$('.btn').prop('disabled', true);
 			document.VoteLearningForm.dispatch.value=actionMethod; 
 			document.VoteLearningForm.submit();
 		}
@@ -44,8 +45,8 @@
 			
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true'}">
 
-					<html:link href="#nogo" property="endLearning" styleId="finishButton" 
-				      onclick="javascript:submitMethod('learnerFinished');return false"
+					<html:submit property="endLearning" styleId="finishButton" 
+				      onclick="javascript:submitMethod('learnerFinished')"
 				      styleClass="btn btn-primary voffset10 pull-right na">
 							<c:choose>
 								<c:when test="${activityPosition.last}">
@@ -55,7 +56,7 @@
 									<fmt:message key="button.endLearning" />
 								</c:otherwise>
 							</c:choose>
-					</html:link>
+					</html:submit>
 
 				</c:if>