Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2 -r9e18c27a14568ad401c96ae631006e455cb0b061
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9e18c27a14568ad401c96ae631006e455cb0b061)
@@ -69,7 +69,10 @@
     <script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
  	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
  	<lams:JSImport src="includes/javascript/fotorama.js" relative="true" />
+ 	<script type="text/javascript" src="${lams}learning/includes/javascript/gate-check.js"></script>
+		
 	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', finishSession);
 	
 		$(document).ready(function(){ 
 			$('.fotorama')
@@ -125,11 +128,11 @@
 			document.location.href = "<c:url value="/learning/start.do"/>?mode=${mode}&toolSessionID=${toolSessionID}";
  		    return false;
 		}
+		
 		function finishSession(){
-			$('#finishButton').attr('disabled', true);
 			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
-			return false;
 		}
+		
 		function continueReflect() {
 			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 		}
@@ -275,7 +278,7 @@
 						</button>
 					</c:when>
 					<c:otherwise>
-						<a href="#nogo" name="FinishButton" id="finishButton"	onclick="return finishSession()" class="btn btn-primary pull-right" >
+						<a href="#nogo" name="FinishButton" id="finishButton" class="btn btn-primary pull-right" >
 							<span class="na">
 								<c:choose>
 				 					<c:when test="${sessionMap.isLastActivity}">
Index: lams_tool_images/web/pages/learning/notebook.jsp
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -r9e18c27a14568ad401c96ae631006e455cb0b061
--- lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 9e18c27a14568ad401c96ae631006e455cb0b061)
@@ -8,11 +8,15 @@
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
 	
+	<script type="text/javascript" src="${lams}learning/includes/javascript/gate-check.js"></script>
 	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${sessionMap.toolSessionID}', '', submitForm);
+	
 		function disableFinishButton() {
 			document.getElementById("finishButton").disabled = true;
 		}
-		function submitForm(methodName){
+		
+		function submitForm(){
 			var f = document.getElementById('reflectionForm');
 			f.submit();
 		}
@@ -33,7 +37,7 @@
 
 			<textarea id="focused" rows="5" name="entryText" class="form-control"></textarea>
 
-			<a href="#nogo" class="btn btn-primary voffset5 pull-right" id="finishButton" onclick="submitForm('finish')">
+			<a href="#nogo" class="btn btn-primary voffset5 pull-right" id="finishButton"">
 				<div class="na"> 
 					<c:choose>
 						<c:when test="${sessionMap.isLastActivity}">