Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_admin/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_admin/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_admin/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_admin/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_admin/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_gradebook/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_gradebook/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_gradebook/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_gradebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_gradebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_gradebook/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_gradebook/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_gradebook/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_learning/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_learning/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_learning/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_monitoring/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_monitoring/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_monitoring/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_monitoring/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_monitoring/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_monitoring/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_assessment/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_assessment/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_assessment/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_assessment/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_assessment/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_chat/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_chat/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_chat/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_chat/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_chat/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_chat/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_daco/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_daco/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_daco/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_daco/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_daco/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_daco/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_doku/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_doku/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_doku/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_doku/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_doku/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_doku/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_doku/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_doku/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_forum/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_forum/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_forum/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_forum/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_forum/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_gmap/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_gmap/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_gmap/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_images/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_images/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_images/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_images/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_images/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_images/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_images/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_images/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_images/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_imscc/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_imscc/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_imscc/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_imscc/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_imscc/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_lamc/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_lamc/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_lamc/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_laqa/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_laqa/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_laqa/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_larsrc/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_larsrc/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_larsrc/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_leader/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_leader/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_leader/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_leader/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_leader/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_leader/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_leader/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_leader/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_mindmap/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_mindmap/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_mindmap/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_mindmap/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_mindmap/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_nb/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_nb/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_nb/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_nb/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_notebook/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_notebook/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_notebook/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_pixlr/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_pixlr/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_pixlr/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_pixlr/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_pixlr/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_preview/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_preview/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_preview/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_preview/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_preview/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_preview/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -ra08fb689e1bb174869cb981d301b204d2f573590 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision a08fb689e1bb174869cb981d301b204d2f573590)
+++ lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_sbmt/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_sbmt/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_sbmt/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_scratchie/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_scratchie/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_scratchie/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_scratchie/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_scratchie/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_scribe/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_scribe/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_scribe/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_scribe/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_scribe/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_spreadsheet/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_spreadsheet/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_survey/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_survey/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_survey/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_survey/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_survey/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_survey/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_survey/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_survey/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_task/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_task/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_task/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_task/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_task/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_task/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_task/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_task/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_vote/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_vote/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_vote/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_vote/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_vote/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_whiteboard/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_whiteboard/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_whiteboard/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_whiteboard/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_whiteboard/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_wiki/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_wiki/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_wiki/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_wiki/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_wiki/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_zoom/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_tool_zoom/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_tool_zoom/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_zoom/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_tool_zoom/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_www/web/WEB-INF/tags/Notebook.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74e39981b5e776f87368242e4881abc1015f490e refers to a dead (removed) revision in file `lams_www/web/WEB-INF/tags/NotebookReedit.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_www/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_www/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 76e2ef1e524594fd572167511caaf8c713027922)
+++ lams_www/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -62,10 +62,7 @@
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
-	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
-	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
-	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
Index: lams_www/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_www/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 955865d255f86a5447f729ec1ce573b2b6f94b27)
+++ lams_www/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -9,11 +9,6 @@
 <%@ attribute name="title" required="true" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%>
 <%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%>
-<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%>
-<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%>
-<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%>
-<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%>
 <%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%>
 
 <%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%>
@@ -28,14 +23,6 @@
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.finished" />
 </c:if>
-<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty continueReflectButtonLabelKey}">
-	<c:set var="continueReflectButtonLabelKey" value="label.continue" />
-</c:if>
-<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%>
-<c:if test="${empty editButtonLabelKey}">
-	<c:set var="editButtonLabelKey" value="label.edit" />
-</c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
@@ -44,10 +31,6 @@
 		function finishSession(){
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="${continueReflectUrl}"/>';
-		}
     </script>
 
 	<div id="container-main">
@@ -59,61 +42,17 @@
 			</fmt:message>
 		</lams:Alert5>
 
-		<!-- Display reflections -->
-		<c:if test="${isNotebookReeditEnabled}">
-			<div class="card shadow-sm mt-4">
-				<div class="card-header">
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</div>
-				
-				<div class="card-body">
-					<div class="m-2">
-						<lams:out escapeHtml="true" value="${notebookInstructions}" />
-					</div>
-					<hr/>
-
-					<div class="m-2">
-						<p>
-							<c:choose>
-								<c:when test="${empty notebookEntry}">
-									<em> <fmt:message key="message.no.reflection.available" /></em>
-								</c:when>
-								<c:otherwise>
-									<lams:out escapeHtml="true" value="${notebookEntry}" />
-								</c:otherwise>
-							</c:choose>
-						</p>
-						
-						<div>
-							<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-sm btn-secondary">
-								<fmt:message key="${editButtonLabelKey}" />
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</c:if>
-
 		<div class="activity-bottom-buttons">
-			<c:choose>
-				<c:when test="${isContinueReflectButtonEnabled}">
-					<button type="button" name="FinishButton" onclick="continueReflect()" class="btn btn-primary na">
-						<fmt:message key="${continueReflectButtonLabelKey}" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="${finishButtonLastActivityLabelKey}" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="${finishButtonLabelKey}" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:otherwise>
-			</c:choose>
+			<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
+				<c:choose>
+					<c:when test="${isLastActivity}">
+						<fmt:message key="${finishButtonLastActivityLabelKey}" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="${finishButtonLabelKey}" />
+					</c:otherwise>
+				</c:choose>
+			</button>
 		</div>
 	</div>
 </lams:PageLearner>
Index: lams_www/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc1757980eef39ff24a57df7e3366be5b21c0abae -r74e39981b5e776f87368242e4881abc1015f490e
--- lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c1757980eef39ff24a57df7e3366be5b21c0abae)
+++ lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
@@ -328,16 +328,8 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Notebook</name>
-		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>NotebookReedit</name>
-		<path>/WEB-INF/tags/NotebookReedit.tag </path>
-   	</tag-file>
-   	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>