Index: lams_tool_scratchie/web/pages/authoring/advance.jsp
===================================================================
diff -u -rbbe9589ceab063d62380b9fe3f02648a4581e109 -r97c904db50165d55330d46cf940debea735ea16e
--- lams_tool_scratchie/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision bbe9589ceab063d62380b9fe3f02648a4581e109)
+++ lams_tool_scratchie/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 97c904db50165d55330d46cf940debea735ea16e)
@@ -49,31 +49,29 @@
 		<c:if test="${confidenceLevelsActivities == null}">
 			<div class="alert-warning" style="margin-bottom: 5px;">
 				<fmt:message key="label.save.learning.design" />
-			</div>		
+			</div>
 		</c:if>
-	
-		<label for="display-confidence-levels-activities">
-			<input type="checkbox" id="display-confidence-levels-activities"
-					<c:if test="${formBean.scratchie.confidenceLevelsActivityUiid != null}">checked="true"</c:if>
-					<c:if test="${fn:length(confidenceLevelsActivities) == 0}">disabled="disabled"</c:if>
-			/>
-			
-			<c:choose>
-				<c:when test="${fn:length(confidenceLevelsActivities) == 0}">
-					<fmt:message key="label.no.confidence.levels.activities" />
-				</c:when>
+		
+		<c:choose>
+			<c:when test="${fn:length(confidenceLevelsActivities) == 0}">
+				<fmt:message key="label.no.confidence.levels.activities" />
+			</c:when>
 				
-				<c:otherwise>
+			<c:otherwise>
+				<label for="display-confidence-levels-activities">
+					<input type="checkbox" id="display-confidence-levels-activities"
+							<c:if test="${formBean.scratchie.confidenceLevelsActivityUiid != null}">checked="true"</c:if>
+					/>
+				
 					<fmt:message key="label.show.confidence.level" />&nbsp;
 					<html:select property="scratchie.confidenceLevelsActivityUiid" styleClass="form-control input-sm" styleId="confidence-levels-activity">
 						<c:forEach var="confidenceProvidingActivity" items="${confidenceLevelsActivities}">
 							<html:option value="${confidenceProvidingActivity.activityUIID}">${confidenceProvidingActivity.title}</html:option>
 						</c:forEach>
 					</html:select>
-				</c:otherwise>
-			</c:choose>
-
-		</label>
+				</label>
+			</c:otherwise>
+		</c:choose>
 	</div>
 </lams:SimplePanel>
 
Fisheye: Tag 97c904db50165d55330d46cf940debea735ea16e refers to a dead (removed) revision in file `lams_tool_scratchie/web/pages/learning/burningQuestions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r868cbadb5ccd51c7172a97cfd02b31edbaa9d97a -r97c904db50165d55330d46cf940debea735ea16e
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 868cbadb5ccd51c7172a97cfd02b31edbaa9d97a)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 97c904db50165d55330d46cf940debea735ea16e)
@@ -182,7 +182,7 @@
 		//autosave feature
 		<c:if test="${isUserLeader && (mode != 'teacher')}">
 			
-			var autosaveInterval = "30000"; // 30 seconds interval
+			var autosaveInterval = "60000"; // 60 seconds interval
 			window.setInterval(
 				function(){
 					if (isWaitingForConfirmation) return;
Index: lams_tool_scratchie/web/pages/learning/questionlist.jsp
===================================================================
diff -u -r868cbadb5ccd51c7172a97cfd02b31edbaa9d97a -r97c904db50165d55330d46cf940debea735ea16e
--- lams_tool_scratchie/web/pages/learning/questionlist.jsp	(.../questionlist.jsp)	(revision 868cbadb5ccd51c7172a97cfd02b31edbaa9d97a)
+++ lams_tool_scratchie/web/pages/learning/questionlist.jsp	(.../questionlist.jsp)	(revision 97c904db50165d55330d46cf940debea735ea16e)
@@ -175,31 +175,35 @@
 	</table>
 	
 	<%-- show burning questions --%>
-	<c:if test="${isUserLeader && scratchie.burningQuestionsEnabled}">
+	<c:if test="${isUserLeader && scratchie.burningQuestionsEnabled || (mode == 'teacher')}">
 		<div class="form-group burning-question-container">
 			<a data-toggle="collapse" data-target="#burning-question-item${item.uid}">
 				<i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i>
 				<fmt:message key="label.burning.question" />
 			</a>
 			
 			<div id="burning-question-item${item.uid}" class="collapse <c:if test="${not empty item.burningQuestion}">in</c:if>">
-				<textarea rows="5" name="burningQuestion${item.uid}" class="form-control">${item.burningQuestion}</textarea>
+				<textarea rows="5" name="burningQuestion${item.uid}" class="form-control"
+					<c:if test="${mode == 'teacher'}">disabled="disabled"</c:if>
+				>${item.burningQuestion}</textarea>
 			</div>
 		</div>
 	</c:if>
 
 </c:forEach>
 
 <%-- show general burning question --%>
-<c:if test="${isUserLeader && scratchie.burningQuestionsEnabled}">
+<c:if test="${isUserLeader && scratchie.burningQuestionsEnabled || (mode == 'teacher')}">
 	<div class="form-group burning-question-container">
 		<a data-toggle="collapse" data-target="#burning-question-general">
 			<i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i>
 			<fmt:message key="label.general.burning.question" />
 		</a>
 
 		<div id="burning-question-general" class="collapse <c:if test="${not empty sessionMap.generalBurningQuestion}">in</c:if>">
-			<textarea rows="5" name="generalBurningQuestion" class="form-control">${sessionMap.generalBurningQuestion}</textarea>
+			<textarea rows="5" name="generalBurningQuestion" class="form-control"
+				<c:if test="${mode == 'teacher'}">disabled="disabled"</c:if>
+			>${sessionMap.generalBurningQuestion}</textarea>
 		</div>
 	</div>
 </c:if>
Index: lams_tool_scratchie/web/pages/learning/results.jsp
===================================================================
diff -u -r868cbadb5ccd51c7172a97cfd02b31edbaa9d97a -r97c904db50165d55330d46cf940debea735ea16e
--- lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision 868cbadb5ccd51c7172a97cfd02b31edbaa9d97a)
+++ lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision 97c904db50165d55330d46cf940debea735ea16e)
@@ -204,9 +204,6 @@
 		function continueReflect() {
 			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 		}
-		function editBurningQuestions() {
-			document.location.href='<c:url value="/learning/start.do"/>?mode=${mode}&toolSessionID=${toolSessionID}';
-		}
 		function refresh() {
 			location.reload();
 			return false;
@@ -257,12 +254,6 @@
 						<table id="burningQuestions${burningQuestionItemDto.scratchieItem.uid}" class="scroll" cellpadding="0" cellspacing="0"></table>
 					</div>
 				</c:forEach>
-
-				<c:if test="${(mode != 'teacher') && isUserLeader}">
-					<html:button property="finishButton" onclick="return editBurningQuestions()" styleClass="btn btn-sm btn-default">
-						<fmt:message key="label.edit" />
-					</html:button>
-				</c:if>
 			</div>
 		</c:if>