Index: lams_tool_doku/web/pages/learning/learning.jsp
===================================================================
diff -u -rb7f0f1b0246677a801a7a6effc9ca42e9cd2d1ce -r9a44cf207835a61579a048a72af28c8aeb77e1d8
--- lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision b7f0f1b0246677a801a7a6effc9ca42e9cd2d1ce)
+++ lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9a44cf207835a61579a048a72af28c8aeb77e1d8)
@@ -39,9 +39,9 @@
 	<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/etherpad.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(){
 			// Resize Etherpad iframe when its content grows.
@@ -85,16 +85,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(){
@@ -285,7 +283,7 @@
 			<div>
 				<c:choose>
 					<c:when test="${dokumaran.galleryWalkEnabled}">
-						<button data-toggle="tooltip" 
+						<button data-toggle="tooltip" id="continue-button"
 								class="btn btn-default voffset5 pull-right ${mode == 'author' ? '' : 'disabled'}"
 								<c:choose>
 									<c:when test="${mode == 'author'}">
@@ -301,7 +299,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>
@@ -311,7 +309,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}">