Index: lams_tool_doku/web/pages/learning/learning.jsp
===================================================================
diff -u -rb5c36d2f8fb70869f2402ed3457a9513e2db871c -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737
--- lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision b5c36d2f8fb70869f2402ed3457a9513e2db871c)
+++ lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
@@ -106,15 +106,11 @@
 			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 		}
 		
-		function startGalleryWalk(){
-			document.location.href='<c:url value="/learning/startGalleryWalk.do?sessionMapID=${sessionMapID}"/>';
-		}
-		
 		<c:if test="${isTimeLimitEnabled}">
 			//init the connection with server using server URL but with different protocol
 			var dokuWebsocketInitTime = Date.now(),
 				dokuWebsocket = new WebSocket('<lams:WebAppURL />'.replace('http', 'ws') 
-							+ 'learningWebsocket?toolContentID=' + ${sessionMap.toolContentID}),
+							+ 'learningWebsocket?toolContentID=' + ${toolContentID}),
 				dokuWebsocketPingTimeout = null,
 				dokuWebsocketPingFunc = null;
 			
@@ -275,12 +271,6 @@
 		<c:if test="${mode != 'teacher'}">
 			<div>
 				<c:choose>
-					<c:when test="${dokumaran.galleryWalkEnabled}">
-						<button name="FinishButton" id="finish-button"
-								onclick="return startGalleryWalk()" class="btn btn-default voffset5 pull-right">
-							<fmt:message key="label.continue" />
-						</button>
-					</c:when>
 					<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
 						<button name="FinishButton" id="finish-button"
 								onclick="return continueReflect()" class="btn btn-default voffset5 pull-right">