Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/LearnerRep.jsp,v
diff -u -r1.53.2.21 -r1.53.2.22
--- lams_tool_laqa/web/learning/LearnerRep.jsp	17 Nov 2016 11:44:50 -0000	1.53.2.21
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	16 Feb 2017 04:10:15 -0000	1.53.2.22
@@ -238,17 +238,11 @@
 			});
 		 });
 	
-		function submitLearningMethod(actionMethod) {	
-			if (actionMethod == 'endLearning') {
-				$("#finishButton").attr("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>
 
@@ -467,8 +461,8 @@
 
 
 						<c:if test="${(generalLearnerFlowDTO.reflection != 'true') || !hasEditRight}">
-							<html:link href="#nogo" property="endLearning" styleId="finishButton"
-								onclick="javascript:submitMethod('endLearning'); return false;" styleClass="btn btn-primary pull-right na">
+							<button type="submit" id="finishButton"
+								onclick="javascript:submitMethod('endLearning'); return false;" class="btn btn-primary pull-right na">
 								<c:choose>
 									<c:when test="${sessionMap.activityPosition.last}">
 										<fmt:message key="button.submit" />
@@ -477,7 +471,7 @@
 										<fmt:message key="button.endLearning" />
 									</c:otherwise>
 								</c:choose>
-							</html:link>
+							</button>
 						</c:if>
 
 						<c:if test="${(generalLearnerFlowDTO.reflection == 'true') && hasEditRight}">
@@ -490,12 +484,8 @@
 				</c:if>
 			</c:if>
 
-
-
 		<div id="footer"></div>
 
-
-
 	</lams:Page>
 
 	</html:form>