Index: lams_tool_whiteboard/web/pages/learning/galleryWalk.jsp
===================================================================
diff -u -r5739216c21c85ff9b4b11cba522b5ffd2875d55c -raffa2f129f35c53208fa1fbd0ef55e5282408c3c
--- lams_tool_whiteboard/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision 5739216c21c85ff9b4b11cba522b5ffd2875d55c)
+++ lams_tool_whiteboard/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision affa2f129f35c53208fa1fbd0ef55e5282408c3c)
@@ -86,6 +86,7 @@
 	</style>
 
 	<script type="text/javascript" src="${lams}includes/javascript/fullscreen.js"></script>
+	<script type="text/javascript" src="${lams}learning/includes/javascript/gate-check.js"></script>
 	<script type="text/javascript">
 			//var for jquery.jRating.js
 		var pathToImageFolder = "${lams}images/css/",
@@ -102,9 +103,8 @@
 			ALLOW_RERATE = true,
 			SESSION_ID = ${toolSessionID};
 			
-	    // avoid name clash between bootstrap and jQuery UI
-	    $.fn.bootstrapTooltip = $.fn.tooltip.noConflict();
-		
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+			
 	    $(document).ready(function(){
 			$('[data-toggle="tooltip"]').bootstrapTooltip();
 			
@@ -121,9 +121,7 @@
 		});
 		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
-			return false;
 		}
 		
 		function continueReflect(){
@@ -260,8 +258,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<a href="#nogo" name="FinishButton" id="finish-button"
-							onclick="return finishSession()" class="btn btn-primary voffset5 pull-right na">
+					<a href="#nogo" name="FinishButton" id="finish-button" class="btn btn-primary voffset5 pull-right na">
 						<span class="nextActivity">
 							<c:choose>
 			 					<c:when test="${sessionMap.isLastActivity}">
Index: lams_tool_whiteboard/web/pages/learning/learning.jsp
===================================================================
diff -u -r5739216c21c85ff9b4b11cba522b5ffd2875d55c -raffa2f129f35c53208fa1fbd0ef55e5282408c3c
--- lams_tool_whiteboard/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 5739216c21c85ff9b4b11cba522b5ffd2875d55c)
+++ lams_tool_whiteboard/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision affa2f129f35c53208fa1fbd0ef55e5282408c3c)
@@ -66,10 +66,11 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/fullscreen.js"></script>
+	<script type="text/javascript" src="${lams}learning/includes/javascript/gate-check.js"></script>
+	
 	<script type="text/javascript">
-	    // avoid name clash between bootstrap and jQuery UI
-	    $.fn.bootstrapTooltip = $.fn.tooltip.noConflict();
-	    
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		$(document).ready(function(){
 			$('[data-toggle="tooltip"]').bootstrapTooltip();
 
@@ -92,16 +93,14 @@
 	            type: 'post',
 	            success: function (json) {
 	            	if (json.isLeaderResponseFinalized) {
-	            		$("#finish-button").show();
+	            		$("#finish-button, #continue-button").show();
 	            	}
 	            }
 	       	});
 		}
 	
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
-			return false;
 		}
 		
 		function continueReflect(){
@@ -318,7 +317,7 @@
 						</button>
 					</c:when>
 					<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
-						<button name="FinishButton" id="finish-button"
+						<button name="FinishButton" id="continue-button"
 								onclick="return continueReflect()" class="btn btn-default voffset5 pull-right">
 							<fmt:message key="label.continue" />
 						</button>
@@ -328,7 +327,7 @@
 					</c:when>
 					<c:otherwise>
 						<a href="#nogo" name="FinishButton" id="finish-button"
-								onclick="return finishSession()" class="btn btn-primary voffset5 pull-right na">
+								 class="btn btn-primary voffset5 pull-right na">
 							<span class="nextActivity">
 								<c:choose>
 				 					<c:when test="${sessionMap.isLastActivity}">
Index: lams_tool_whiteboard/web/pages/learning/notebook.jsp
===================================================================
diff -u -r4c4fe77d887f75b6dad30ab974aba88a1fa34e25 -raffa2f129f35c53208fa1fbd0ef55e5282408c3c
--- lams_tool_whiteboard/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 4c4fe77d887f75b6dad30ab974aba88a1fa34e25)
+++ lams_tool_whiteboard/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision affa2f129f35c53208fa1fbd0ef55e5282408c3c)
@@ -1,28 +1,31 @@
 <%@ include file="/common/taglibs.jsp"%>
 <!DOCTYPE html>
         
-
+<c:set var="sessionMapID" value="${param.sessionMapID}" />
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+        
 <lams:html>
 <lams:head>
 	<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){
-        	        var f = document.getElementById('reflectionForm');
-	                f.submit();
-	        }
+		
+        function submitForm(){
+		    var f = document.getElementById('reflectionForm');
+	        f.submit();
+        }
 	</script>
 </lams:head>
 <body class="stripes">
 
-	<c:set var="sessionMapID" value="${param.sessionMapID}" />
-	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-
 	<lams:Page type="learner" title="${sessionMap.title}">
 	
 	<form:form action="submitReflection.do" modelAttribute="reflectionForm" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
@@ -40,7 +43,7 @@
 				cssClass="text-area form-control" />
 
 			<div class="space-bottom-top align-right">
-				<a href="#nogo" class="btn btn-primary voffset5 pull-right na" id="finishButton" onclick="submitForm('finish')">
+				<a href="#nogo" class="btn btn-primary voffset5 pull-right na" id="finishButton">
 					<span class="nextActivity">
 						<c:choose>
 		 					<c:when test="${sessionMap.isLastActivity}">