Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.43.2.8 -r1.43.2.9
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	17 Nov 2016 11:44:50 -0000	1.43.2.8
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	16 Feb 2017 04:10:15 -0000	1.43.2.9
@@ -11,17 +11,11 @@
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
 
 	<script language="JavaScript" type="text/JavaScript">
-		function submitLearningMethod(actionMethod) {
-			if (actionMethod == 'endLearning') {
-				document.getElementById("finishButton").disabled = true;
-			}
+		function submitMethod(actionMethod) {
+			$('.btn').prop('disabled', true);
 			document.QaLearningForm.method.value = actionMethod;
 			document.QaLearningForm.submit();
 		}
-
-		function submitMethod(actionMethod) {
-			submitLearningMethod(actionMethod);
-		}
 	</script>
 </lams:head>
 
@@ -145,8 +139,8 @@
 				<c:if test="${!generalLearnerFlowDTO.showOtherAnswers}">
 					<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
 						<div class="space-bottom-top align-right">
-							<html:link href="#nogo" property="endLearning" styleId="finishButton"
-								onclick="javascript:submitMethod('storeAllResults');return false" styleClass="btn btn-primary pull-right na">
+							<button type="submit" id="finishButton" 
+								onclick="javascript:submitMethod('storeAllResults');return false" class="btn btn-primary pull-right na">
 								<c:choose>
 									<c:when test="${sessionMap.activityPosition.last}">
 										<fmt:message key="button.submit" />
@@ -156,7 +150,7 @@
 									</c:otherwise>
 								</c:choose>
 
-							</html:link>
+							</button>
 						</div>
 					</c:if>