Index: lams_tool_doku/web/pages/learning/galleryWalk.jsp
===================================================================
diff -u -r1a6cc3c4f7fa5ff432c34cb13d94ff44d15ccf1b -r66aaa15469871d9f71cafcfc4222ffa90f2d9bb2
--- lams_tool_doku/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision 1a6cc3c4f7fa5ff432c34cb13d94ff44d15ccf1b)
+++ lams_tool_doku/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision 66aaa15469871d9f71cafcfc4222ffa90f2d9bb2)
@@ -7,150 +7,149 @@
 <c:set var="dokumaran" value="${sessionMap.dokumaran}" />
 <c:set var="hasEditRight" value="${sessionMap.hasEditRight}"/>
 <c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
-
+	
 <lams:html>
-	<lams:head>
-		<title><fmt:message key="label.learning.title" /></title>
+<lams:head>
+	<title><fmt:message key="label.learning.title" /></title>
+	
+	<%@ include file="/common/header.jsp"%>
+	<lams:css suffix="jquery.jRating"/>
+	
+	<style>
+		#gallery-walk-rating-table {
+			width: 60%;
+			margin: 50px auto;
+			border-bottom: 1px solid #ddd;
+		}
+		
+		#gallery-walk-rating-table th {
+			font-weight: bold;
+			font-style: normal;
+			text-align: center;
+		}
+		
+		#gallery-walk-rating-table td {
+			text-align: center;
+		}
+		
+		#gallery-walk-rating-table th:first-child, #gallery-walk-rating-table td:first-child {
+			text-align: right;
+		}
+		
+		#gallery-walk-preview-info {
+			margin-bottom: 20px;
+		}
 
-		<%@ include file="/common/header.jsp"%>
-		<lams:css suffix="jquery.jRating"/>
+		.comment-textarea {
+			height: 100px !important;
+		}
+	</style>
 
-		<style>
-			#gallery-walk-rating-table {
-				width: 60%;
-				margin: 50px auto;
-				border-bottom: 1px solid #ddd;
-			}
-
-			#gallery-walk-rating-table th {
-				font-weight: bold;
-				font-style: normal;
-				text-align: center;
-			}
-
-			#gallery-walk-rating-table td {
-				text-align: center;
-			}
-
-			#gallery-walk-rating-table th:first-child, #gallery-walk-rating-table td:first-child {
-				text-align: right;
-			}
-
-			#gallery-walk-preview-info {
-				margin-bottom: 20px;
-			}
-
-			.comment-textarea {
-				height: 100px !important;
-			}
-		</style>
-
-		<script type="text/javascript" src="${lams}includes/javascript/etherpad.js"></script>
-		<lams:JSImport src="learning/includes/javascript/gate-check.js" />
-		<script type="text/javascript">
+	<script type="text/javascript" src="${lams}includes/javascript/etherpad.js"></script>
+	<lams:JSImport src="learning/includes/javascript/gate-check.js" />
+	<script type="text/javascript">
 			//var for jquery.jRating.js
-			// label.comment.textarea.tip
-			var pathToImageFolder = "${lams}images/css/",
-					//vars for rating.js
-					AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
-					YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
-					MAX_RATES = 0,
-					MIN_RATES = 0,
-					COMMENTS_MIN_WORDS_LIMIT = 0,
-					COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip" />',
-					WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="warning.comment.blank"/>',
-					LAMS_URL = '${lams}',
-					COUNT_RATED_ITEMS = true,
-					ALLOW_RERATE = true,
-					SESSION_ID = ${toolSessionID};
-
-			checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
-
-			$(document).ready(function(){
-				// show etherpads only on Group expand
-				$('.etherpad-collapse').on('show.bs.collapse', function(){
-					var etherpad = $('.etherpad-container', this);
-					if (!etherpad.hasClass('initialised')) {
-						var id = etherpad.attr('id'),
-								groupId = id.substring('etherpad-container-'.length);
-						etherpadInitMethods[groupId]();
-					}
-				});
-
-				$('[data-toggle="tooltip"]').bootstrapTooltip();
+		var pathToImageFolder = "${lams}images/css/",
+			//vars for rating.js
+			AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
+			YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+			MAX_RATES = 0,
+			MIN_RATES = 0,
+			COMMENTS_MIN_WORDS_LIMIT = 0,
+			COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip" />',
+			WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="warning.comment.blank"/>',
+			LAMS_URL = '${lams}',
+			COUNT_RATED_ITEMS = true,
+			ALLOW_RERATE = true,
+			SESSION_ID = ${toolSessionID};
+			
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
+	    $(document).ready(function(){
+			// show etherpads only on Group expand
+			$('.etherpad-collapse').on('show.bs.collapse', function(){
+				var etherpad = $('.etherpad-container', this);
+				if (!etherpad.hasClass('initialised')) {
+					var id = etherpad.attr('id'),
+						groupId = id.substring('etherpad-container-'.length);
+					etherpadInitMethods[groupId]();
+				}
 			});
+			
+			$('[data-toggle="tooltip"]').bootstrapTooltip();
+		});
+		
+		function finishSession(){
+			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
+		}
+		
+		function continueReflect(){
+			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
+		}
+	</script>
+	<lams:JSImport src="includes/javascript/rating.js" />
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
+	
+	<%@ include file="websocket.jsp"%>	
+</lams:head>
+<body class="stripes">
 
-			function finishSession(){
-				document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
-			}
+<lams:Page type="learner" title="${dokumaran.title}" style="">
 
-			function continueReflect(){
-				document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
-			}
-		</script>
-		<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
-
-		<%@ include file="websocket.jsp"%>
-	</lams:head>
-	<body class="stripes">
-
-	<lams:Page type="learner" title="${dokumaran.title}" style="">
-
-		<lams:errors/>
-
-		<p><c:out value="${dokumaran.description}" escapeXml="false" /></p>
-
-		<c:if test="${not empty dokumaran.galleryWalkInstructions}">
-			<h4 class="voffset20" style="text-align: center"><fmt:message key="label.gallery.walk.instructions.header" /></h4>
-			<p><c:out value="${dokumaran.galleryWalkInstructions}" escapeXml="false" /></p>
-		</c:if>
-
-		<c:if test="${dokumaran.galleryWalkFinished and not dokumaran.galleryWalkReadOnly}">
-			<h4 class="voffset20" style="text-align: center"><fmt:message key="label.gallery.walk.ratings.header" /></h4>
-			<table id="gallery-walk-rating-table" class="table table-hover table-condensed">
-				<thead class="thead-light">
+	<lams:errors/>
+	
+	<p><c:out value="${dokumaran.description}" escapeXml="false" /></p>
+	
+	<c:if test="${not empty dokumaran.galleryWalkInstructions}">
+		<h4 class="voffset20" style="text-align: center"><fmt:message key="label.gallery.walk.instructions.header" /></h4>
+		<p><c:out value="${dokumaran.galleryWalkInstructions}" escapeXml="false" /></p>
+	</c:if>
+		
+	<c:if test="${dokumaran.galleryWalkFinished and not dokumaran.galleryWalkReadOnly}">
+		<h4 class="voffset20" style="text-align: center"><fmt:message key="label.gallery.walk.ratings.header" /></h4>
+		<table id="gallery-walk-rating-table" class="table table-hover table-condensed">
+		  <thead class="thead-light">
+		    <tr>
+		      <th scope="col"><fmt:message key="monitoring.label.group" /></th>
+		      <th scope="col"><fmt:message key="label.rating" /></th>
+		    </tr>
+		  </thead>
+		  <tbody>
+			<c:forEach var="groupSummary" items="${summaryList}">
 				<tr>
-					<th scope="col"><fmt:message key="monitoring.label.group" /></th>
-					<th scope="col"><fmt:message key="label.rating" /></th>
+					<td>${groupSummary.sessionName}</td>
+					<td>
+						<lams:Rating itemRatingDto="${groupSummary.itemRatingDto}" 
+									 isItemAuthoredByUser="true"
+									 hideCriteriaTitle="true" />
+					</td>
 				</tr>
-				</thead>
-				<tbody>
-				<c:forEach var="groupSummary" items="${summaryList}">
-					<tr>
-						<td>${groupSummary.sessionName}</td>
-						<td>
-							<lams:Rating itemRatingDto="${groupSummary.itemRatingDto}"
-										 isItemAuthoredByUser="true"
-										 hideCriteriaTitle="true" />
-						</td>
-					</tr>
-				</c:forEach>
-				</tbody>
-			</table>
-		</c:if>
-
-		<h4 class="voffset20" style="text-align: center"><fmt:message key="label.gallery.walk" /></h4>
-
-		<c:if test="${mode == 'author'}">
-			<div class="row no-gutter" id="gallery-walk-preview-info">
-				<div class="col-xs-12 col-sm-offset-2 col-sm-8">
-					<div class="alert alert-info leader-display">
-						<fmt:message key="label.gallery.walk.preview" />
-					</div>
+			</c:forEach>
+		  </tbody>
+		</table>
+	</c:if>
+	
+	<h4 class="voffset20" style="text-align: center"><fmt:message key="label.gallery.walk" /></h4>
+	
+	<c:if test="${mode == 'author'}">
+		<div class="row no-gutter" id="gallery-walk-preview-info">
+			<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+				<div class="alert alert-info leader-display">
+					<fmt:message key="label.gallery.walk.preview" />
 				</div>
 			</div>
-		</c:if>
+		</div>
+	</c:if>
+	
 
-
-		<div id="doku-group-panels" class="panel-group" role="tablist" aria-multiselectable="true">
-			<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
-
-				<div class="panel panel-default doku-group-panel">
-					<div class="panel-heading" role="tab" id="heading${groupSummary.sessionId}">
+	<div id="doku-group-panels" class="panel-group" role="tablist" aria-multiselectable="true"> 
+		<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
+		
+		    <div class="panel panel-default doku-group-panel">
+		       <div class="panel-heading" role="tab" id="heading${groupSummary.sessionId}">
 		       	<span class="panel-title collapsable-icon-left">
-		       		<a class="collapsed" role="button" data-toggle="collapse" href="#collapse${groupSummary.sessionId}"
-					   aria-expanded="false" aria-controls="collapse${groupSummary.sessionId}" data-parent="#doku-group-panels">
+		       		<a class="collapsed" role="button" data-toggle="collapse" href="#collapse${groupSummary.sessionId}" 
+							aria-expanded="false" aria-controls="collapse${groupSummary.sessionId}" data-parent="#doku-group-panels">
 						<c:choose>
 							<c:when test="${toolSessionID == groupSummary.sessionId}">
 								<b><c:out value="${groupSummary.sessionName}" />&nbsp;<fmt:message key="label.gallery.walk.your.group" /></b>
@@ -161,66 +160,66 @@
 						</c:choose>
 					</a>
 				</span>
-					</div>
-					<div id="collapse${groupSummary.sessionId}" class="panel-collapse collapse etherpad-collapse"
-						 role="tabpanel" aria-labelledby="heading${groupSummary.sessionId}">
-							<%-- Do not show rating to own group before Gallery Walk is finished --%>
-						<c:if test="${not dokumaran.galleryWalkReadOnly and (dokumaran.galleryWalkFinished or mode == 'teacher' or toolSessionID != groupSummary.sessionId)}">
-							<lams:Rating itemRatingDto="${groupSummary.itemRatingDto}" showComments="true"
-										 isItemAuthoredByUser="${dokumaran.galleryWalkFinished or not hasEditRight or mode == 'teacher'}" />
-						</c:if>
-
-						<lams:Etherpad groupId="${groupSummary.sessionId}"
-									   padId="${hasEditRight and dokumaran.galleryWalkEditEnabled and toolSessionID == groupSummary.sessionId ? groupSummary.padId : groupSummary.readOnlyPadId}"
-									   showControls="${hasEditRight and ((dokumaran.galleryWalkEditEnabled and toolSessionID == groupSummary.sessionId) or (not dokumaran.galleryWalkFinished and not dokumaran.galleryWalkReadOnly))}"
-									   showOnDemand="true" height="600" />
-					</div>
+		       </div>
+		       <div id="collapse${groupSummary.sessionId}" class="panel-collapse collapse etherpad-collapse" 
+		       	    role="tabpanel" aria-labelledby="heading${groupSummary.sessionId}">
+					<%-- Do not show rating to own group before Gallery Walk is finished --%>
+		       	    <c:if test="${not dokumaran.galleryWalkReadOnly and (dokumaran.galleryWalkFinished or mode == 'teacher' or toolSessionID != groupSummary.sessionId)}">
+		       	    	<lams:Rating itemRatingDto="${groupSummary.itemRatingDto}" showComments="true"
+								     isItemAuthoredByUser="${dokumaran.galleryWalkFinished or not hasEditRight or mode == 'teacher'}" />
+		       	    </c:if>
+		 
+					<lams:Etherpad groupId="${groupSummary.sessionId}"
+								   padId="${hasEditRight and dokumaran.galleryWalkEditEnabled and toolSessionID == groupSummary.sessionId ? groupSummary.padId : groupSummary.readOnlyPadId}"
+								   showControls="${hasEditRight and ((dokumaran.galleryWalkEditEnabled and toolSessionID == groupSummary.sessionId) or (not dokumaran.galleryWalkFinished and not dokumaran.galleryWalkReadOnly))}"
+								   showOnDemand="true" height="600" />	
 				</div>
-			</c:forEach>
-		</div>
-
-		<c:if test="${mode != 'teacher'}">
-			<div>
-				<c:choose>
-					<c:when test="${not dokumaran.galleryWalkFinished}">
-						<button data-toggle="tooltip"
-								class="btn btn-default voffset5 pull-right ${mode == 'author' ? '' : 'disabled'}"
-								<c:choose>
-									<c:when test="${mode == 'author'}">
-										title="<fmt:message key='label.gallery.walk.wait.finish.preview' />"
-										onClick="javascript:location.href = location.href + '&galleryWalk=forceFinish'"
-									</c:when>
-									<c:otherwise>
-										title="<fmt:message key='label.gallery.walk.wait.finish' />"
-									</c:otherwise>
-								</c:choose>
-						>
-							<fmt:message key="label.continue" />
-						</button>
-					</c:when>
-					<c:when test="${sessionMap.reflectOn and not sessionMap.userFinished}">
-						<button name="FinishButton" id="finish-button"
-								onclick="return continueReflect()" class="btn btn-default voffset5 pull-right">
-							<fmt:message key="label.continue" />
-						</button>
-					</c:when>
-					<c:otherwise>
-						<a href="#nogo" name="FinishButton" id="finish-button" class="btn btn-primary voffset5 pull-right na">
-						<span class="nextActivity">
+			</div>
+		</c:forEach>
+	</div>
+	
+	<c:if test="${mode != 'teacher'}">
+		<div>
+			<c:choose>
+				<c:when test="${not dokumaran.galleryWalkFinished}">
+					<button data-toggle="tooltip" 
+							class="btn btn-default voffset5 pull-right ${mode == 'author' ? '' : 'disabled'}"
 							<c:choose>
-								<c:when test="${sessionMap.isLastActivity}">
-									<fmt:message key="label.submit" />
+								<c:when test="${mode == 'author'}">
+									title="<fmt:message key='label.gallery.walk.wait.finish.preview' />"
+									onClick="javascript:location.href = location.href + '&galleryWalk=forceFinish'"
 								</c:when>
 								<c:otherwise>
-									<fmt:message key="label.finished" />
+									title="<fmt:message key='label.gallery.walk.wait.finish' />"
 								</c:otherwise>
 							</c:choose>
+					>
+						<fmt:message key="label.continue" />
+					</button>
+				</c:when>
+				<c:when test="${sessionMap.reflectOn and not sessionMap.userFinished}">
+					<button name="FinishButton" id="finish-button"
+							onclick="return continueReflect()" class="btn btn-default voffset5 pull-right">
+						<fmt:message key="label.continue" />
+					</button>
+				</c:when>
+				<c:otherwise>
+					<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}">
+			 						<fmt:message key="label.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="label.finished" />
+			 					</c:otherwise>
+			 				</c:choose>
 						</span>
-						</a>
-					</c:otherwise>
-				</c:choose>
-			</div>
-		</c:if>
-	</lams:Page>
-	</body>
+					</a>
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</c:if>
+</lams:Page>
+</body>
 </lams:html>
\ No newline at end of file