Index: lams_central/web/css/components.css
===================================================================
diff -u -r1f6e357f9932435e8c97e005196baa2f23909191 -ref5bed2f62785ca5cdb668d9f1e8fbf4f0256dff
--- lams_central/web/css/components.css	(.../components.css)	(revision 1f6e357f9932435e8c97e005196baa2f23909191)
+++ lams_central/web/css/components.css	(.../components.css)	(revision ef5bed2f62785ca5cdb668d9f1e8fbf4f0256dff)
@@ -443,7 +443,7 @@
 
 .component-page-wrapper .component-page-content {
 	min-height: 100%;
-	padding: 1rem 4rem 2rem 8rem;
+	padding: 1rem 2rem 3rem 2rem;
 	transition: all .3s ease;
 	vertical-align: top;
 }
Index: lams_learning/web/css/components-learner.css
===================================================================
diff -u -r1f6e357f9932435e8c97e005196baa2f23909191 -ref5bed2f62785ca5cdb668d9f1e8fbf4f0256dff
--- lams_learning/web/css/components-learner.css	(.../components-learner.css)	(revision 1f6e357f9932435e8c97e005196baa2f23909191)
+++ lams_learning/web/css/components-learner.css	(.../components-learner.css)	(revision ef5bed2f62785ca5cdb668d9f1e8fbf4f0256dff)
@@ -56,6 +56,7 @@
 }
 
 .component-page-wrapper .activity-bottom-buttons {
+    margin-top: 1rem;
     display: flex;
     flex-direction: row-reverse;
 }
\ No newline at end of file
Index: lams_learning/web/includes/javascript/gate-check5.js
===================================================================
diff -u
--- lams_learning/web/includes/javascript/gate-check5.js	(revision 0)
+++ lams_learning/web/includes/javascript/gate-check5.js	(revision ef5bed2f62785ca5cdb668d9f1e8fbf4f0256dff)
@@ -0,0 +1,65 @@
+function checkNextGateActivity(finishButtonId, toolSessionId, activityId, submitFunction){
+	$(document).ready(function(){
+		let finishButton = $('#' + finishButtonId);
+
+		if (finishButton.length == 0){
+			return;
+		}
+
+		new bootstrap.Tooltip(finishButton[0],{
+			'trigger' : 'manual'
+		});
+
+		finishButton
+			.click(function(event){
+				if (finishButton.prop('disabled') == true) {
+					// if the button is already disabled, do not run a check
+					return;
+				}
+
+				// disable the button
+				finishButton.prop('disabled', true).attr('disabled', true);
+
+				// check if there is a gate after this activity
+				// if so, check if learner can pass
+				$.ajax({
+					'url' : '/lams/learning/learner/isNextGateActivityOpen.do?toolSessionId=' + toolSessionId + '&activityId=' + activityId,
+					'cache' : false,
+					'dataType' : 'json',
+					'success'  : function(response) {
+						if (response.status == 'open') {
+							// learner can pass
+							finishButton.prop('disabled', false).attr('disabled', false);
+							submitFunction();
+							return;
+						}
+
+						if (response.status == 'closed') {
+							// if there are other events bound to click, do not make them run
+							event.stopImmediatePropagation();
+
+							let timeoutFunction = null;
+							if (response.message) {
+								// tooltips should say whatever we got in the response
+								finishButton.attr({
+									'title' : response.message,
+									'data-original-title' : response.message
+								}).bootstrapTooltip('show');
+
+								timeoutFunction = function(){
+									finishButton.bootstrapTooltip('hide').prop('disabled', false).attr('disabled', false);
+								};
+							} else {
+								timeoutFunction = function(){
+									finishButton.prop('disabled', false).attr('disabled', false);
+								};
+							}
+
+							// show tooltip for several seconds
+							setTimeout(timeoutFunction, 5000);
+						}
+					}
+				});
+			});
+	});
+}
\ No newline at end of file
Index: lams_monitoring/web/css/components-monitoring.css
===================================================================
diff -u -r1f6e357f9932435e8c97e005196baa2f23909191 -ref5bed2f62785ca5cdb668d9f1e8fbf4f0256dff
--- lams_monitoring/web/css/components-monitoring.css	(.../components-monitoring.css)	(revision 1f6e357f9932435e8c97e005196baa2f23909191)
+++ lams_monitoring/web/css/components-monitoring.css	(.../components-monitoring.css)	(revision ef5bed2f62785ca5cdb668d9f1e8fbf4f0256dff)
@@ -139,6 +139,10 @@
 	margin-top: 1rem;
 }
 
+.component-page-wrapper .monitoring-page-content {
+	padding: 1rem 4rem 2rem 8rem;
+}
+
 .monitoring-page-wrapper .monitoring-panel {
 	display: inline-block;
 	width: 100%;
Index: lams_tool_nb/lams_tool_nb.eml
===================================================================
diff -u -rf3144d7b1c275056481fd76050bad49b0ba6d06d -ref5bed2f62785ca5cdb668d9f1e8fbf4f0256dff
--- lams_tool_nb/lams_tool_nb.eml	(.../lams_tool_nb.eml)	(revision f3144d7b1c275056481fd76050bad49b0ba6d06d)
+++ lams_tool_nb/lams_tool_nb.eml	(.../lams_tool_nb.eml)	(revision ef5bed2f62785ca5cdb668d9f1e8fbf4f0256dff)
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component inheritJdk="true">
-	<contentEntry url="file://$MODULE_DIR$"/>
+	<contentEntry url="file://$MODULE_DIR$">
+		<excludeFolder url="file://$MODULE_DIR$/bin"/>
+		<excludeFolder url="file://$MODULE_DIR$/build"/>
+	</contentEntry>
 	<lib name="jboss-servlet-api_4.0_spec-1.0.0.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/servlet-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/servlet-api"/>
 	</lib>
 	<lib name="jackson-core-2.9.5.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/jackson"/>
 	</lib>
 	<lib name="jackson-databind-2.9.5.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/jackson"/>
 	</lib>
 	<lib name="javax.persistence-api-2.2.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/persistence-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/persistence-api"/>
 	</lib>
 	<lib name="hibernate-core-5.3.6.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_48$/hibernate-core"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_48$/hibernate-core"/>
 	</lib>
 	<levels>
 		<level name="3rdParty" value="project"/>
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java
===================================================================
diff -u -r966fe6dea3c644eaf336f305c960861b7e62fd73 -ref5bed2f62785ca5cdb668d9f1e8fbf4f0256dff
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java	(.../LearningController.java)	(revision 966fe6dea3c644eaf336f305c960861b7e62fd73)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java	(.../LearningController.java)	(revision ef5bed2f62785ca5cdb668d9f1e8fbf4f0256dff)
@@ -197,7 +197,7 @@
 	    return "message";
 	}
 
-	return "learnerContent5";
+	return "learnerContent";
 
     }
 
Index: lams_tool_nb/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r966fe6dea3c644eaf336f305c960861b7e62fd73 -ref5bed2f62785ca5cdb668d9f1e8fbf4f0256dff
--- lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 966fe6dea3c644eaf336f305c960861b7e62fd73)
+++ lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision ef5bed2f62785ca5cdb668d9f1e8fbf4f0256dff)
@@ -1,8 +1,15 @@
 <%@ tag body-content="scriptless" %>
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
+<c:set var="lams">
+    <lams:LAMSURL />
+</c:set>
+
 <lams:html>
     <lams:head>
         <title><fmt:message key="activity.title"/></title>
@@ -16,7 +23,9 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/popper.min.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
-        <script src="<lams:LAMSURL/>learning/includes/javascript/learnerPage.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
+
         <script>
             var LAMS_URL = '<lams:LAMSURL/>';
             $(document).ready(function (){
@@ -43,12 +52,22 @@
                 <div class="top-menu">
                 </div>
             </header>
-            <main>
-                <jsp:doBody/>
-            </main>
-<%--            <div class="activity-bottom-buttons">--%>
-<%--                <button class="btn btn-primary" type="button" onclick="javascript:nextActivity()">Next activity</button>--%>
-<%--            </div>--%>
+
+            <div class="card">
+                <c:if test="${not empty title}">
+                    <div class="card-header">
+                        <h5><c:out value="${title}" escapeXml="true" /></h5>
+                    </div>
+                </c:if>
+
+                <div class="card-body">
+                    <main>
+                        <jsp:doBody/>
+                    </main>
+                </div>
+            </div>
+
+
         </div>
 
         <!-- Progress Bar Modal Start -->
Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -ref5bed2f62785ca5cdb668d9f1e8fbf4f0256dff
--- lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision ef5bed2f62785ca5cdb668d9f1e8fbf4f0256dff)
@@ -1,102 +1,88 @@
 <!DOCTYPE html>
-<%@ include file="/includes/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants"%>
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
+<%@ include file="/includes/taglibs.jsp"%>
 
-<lams:html>
-<lams:head>
-	<lams:css />
-	<title><fmt:message key="activity.title"/></title>
-	<script src="${lams}includes/javascript/jquery.js"></script>
-	<script src="${lams}includes/javascript/bootstrap.min.js" type="text/javascript"></script>
-	<lams:JSImport src="learning/includes/javascript/gate-check.js" />
-	<script type="text/javascript">
+<lams:PageLearner toolSessionID="${nbLearnerForm.toolSessionID}" title="${nbLearnerForm.title}">
+	<script>
 		checkNextGateActivity('finishButton', '${nbLearnerForm.toolSessionID}', '', function(){
 			submitForm('finish');
 		});
-	</script>
-</lams:head>
 
-<body class="stripes">
+		function disableFinishButton() {
+			var finishButton = document.getElementById("finishButton");
+			if (finishButton != null) {
+				finishButton.disabled = true;
+			}
+		}
 
-<script type="text/javascript">
-	function disableFinishButton() {
-		var finishButton = document.getElementById("finishButton");
-		if (finishButton != null) {
-			finishButton.disabled = true;
+		function submitForm(methodName) {
+			var f = document.getElementById('nbLearnerForm');
+			f.action = methodName + ".do";
+			f.submit();
 		}
-	}
-	function submitForm(methodName) {
-		var f = document.getElementById('nbLearnerForm');
-		f.action = methodName + ".do";
-		f.submit();
-	}
-</script>
+	</script>
 
-<lams:Page type="learner" title="${nbLearnerForm.title}">
-	<div class="panel">
-		<c:out value="${nbLearnerForm.basicContent}" escapeXml="false" />
-	</div>
 
+	<c:out value="${nbLearnerForm.basicContent}" escapeXml="false" />
+
+
 	<form:form modelAttribute="nbLearnerForm" target="_self" onsubmit="disableFinishButton();" id="nbLearnerForm">
 		<form:hidden path="mode" />
 		<form:hidden path="toolSessionID" />
 
 		<c:if test="${userFinished and reflectOnActivity}">
-			<div class="panel">
-				<lams:out value="${reflectInstructions}" escapeHtml="true" />
+			<div class="card">
+				<div class="card-body">
+					<p class="fst-italic">
+						<lams:out value="${reflectInstructions}" escapeHtml="true" />
+					</p>
+					<p class="mt-5">
+						<c:choose>
+							<c:when test="${empty reflectEntry}">
+								<fmt:message key="message.no.reflection.available" />
+							</c:when>
+							<c:otherwise>
+								<lams:out escapeHtml="true" value="${reflectEntry}" />
+							</c:otherwise>
+						</c:choose>
+					</p>
+				</div>
 			</div>
 
-			<div class="bg-warning" id="reflectionEntry">
-				<c:choose>
-					<c:when test="${empty reflectEntry}">
-						<fmt:message key="message.no.reflection.available" />
-					</c:when>
-					<c:otherwise>
-						<lams:out escapeHtml="true" value="${reflectEntry}" />
-					</c:otherwise>
-				</c:choose>
-			</div>
+
 		</c:if>
 
 		<c:if test="${allowComments}">
 			<hr/>
-			<lams:Comments toolSessionId="${nbLearnerForm.toolSessionID}" 
-				toolSignature="<%=NoticeboardConstants.TOOL_SIGNATURE%>" likeAndDislike="${likeAndDislike}" anonymous="${anonymous}" />
+			<lams:Comments toolSessionId="${nbLearnerForm.toolSessionID}"
+						   toolSignature="<%=NoticeboardConstants.TOOL_SIGNATURE%>" likeAndDislike="${likeAndDislike}"
+						   anonymous="${anonymous}" />
 		</c:if>
 
-
 		<c:if test="${not nbLearnerForm.readOnly}">
-			<c:choose>
-				<c:when test="${reflectOnActivity}">
+			<div class="activity-bottom-buttons">
+				<c:choose>
+					<c:when test="${reflectOnActivity}">
+						<button class="btn btn-primary" onclick="submitForm('reflect')">
+							<fmt:message key="button.continue" />
+						</button>
+					</c:when>
+					<c:otherwise>
+						<button id="finishButton" class="btn btn-primary">
+							<c:choose>
+								<c:when test="${isLastActivity}">
+									<fmt:message key="button.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.finish" />
+								</c:otherwise>
+							</c:choose>
+						</button>
+					</c:otherwise>
+				</c:choose>
+			</div>
 
-					<button  name="continueButton" class="btn btn-sm btn-primary pull-right"
-						onclick="submitForm('reflect')">
-						<fmt:message key="button.continue" />
-					</button>
-				</c:when>
-				<c:otherwise>
-
-
-					<a href="#nogo" id="finishButton" name="finishButton" class="btn btn-primary pull-right voffset10 na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="button.submit" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="button.finish" />
-							</c:otherwise>
-						</c:choose>
-
-					</a>
-				</c:otherwise>
-			</c:choose>
 		</c:if>
 
 	</form:form>
-
-</lams:Page>
-	
-</lams:html>
\ No newline at end of file
+</lams:PageLearner>
\ No newline at end of file
Fisheye: Tag ef5bed2f62785ca5cdb668d9f1e8fbf4f0256dff refers to a dead (removed) revision in file `lams_tool_nb/web/learnerContent5.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_nb/web/reflect.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -ref5bed2f62785ca5cdb668d9f1e8fbf4f0256dff
--- lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision ef5bed2f62785ca5cdb668d9f1e8fbf4f0256dff)
@@ -1,80 +1,58 @@
 <!DOCTYPE html>
 <%@ include file="/includes/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants"%>
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
 
-<lams:html>
-<lams:head>
-	<lams:css />
-	<title><fmt:message key="activity.title"/></title>
-	<script src="${lams}includes/javascript/jquery.js"></script>
-	<script src="${lams}includes/javascript/bootstrap.min.js" type="text/javascript"></script>
-	<lams:JSImport src="learning/includes/javascript/gate-check.js" />
-	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${nbLearnerForm.toolSessionID}', '', function(){
+<lams:PageLearner toolSessionID="${nbLearnerForm.toolSessionID}" title="${nbLearnerForm.title}">
+
+	<script>
+		checkNextGateActivity('finishButton', '${nbLearnerForm.toolSessionID}', '', function () {
 			submitForm('finish');
 		});
-	</script>
-</lams:head>
 
-<body class="stripes">
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
 
-<script type="text/javascript">
-	function disableFinishButton() {
-		document.getElementById("finishButton").disabled = true;
-	}
-	function submitForm(methodName) {
-		var f = document.getElementById('nbLearnerForm');
-		f.action = methodName + ".do";
-		f.submit();
-	}
-</script>
+		function submitForm(methodName) {
+			var f = document.getElementById('nbLearnerForm');
+			f.action = methodName + ".do";
+			f.submit();
+		}
 
-<lams:Page type="learner" title="${title}" formID="nbLearnerForm">
+		$(document).ready(function (){
+			$('#focusedInput').focus();
+		});
+	</script>
 
+	<lams:out value="${reflectInstructions}" escapeHtml="true" />
+
 	<form:form method="post" onsubmit="disableFinishButton();" modelAttribute="nbLearnerForm" id="nbLearnerForm">
-		<div class="form-group">
-			<div class="panel">
-				<lams:out value="${reflectInstructions}" escapeHtml="true" />
-			</div>
+		<textarea rows="4" name="reflectionText" value="${reflectEntry}" class="form-control mt-2"
+				  id="focusedInput"></textarea>
 
-			<textarea rows="4" name="reflectionText" value="${reflectEntry}" class="form-control"
-				id="focusedInput"></textarea>
+		<form:hidden path="toolSessionID" />
+		<form:hidden path="mode" />
 
-			<form:hidden path="toolSessionID" />
-			<form:hidden path="mode" />
-
-			<a href="#nogo" class="btn btn-primary pull-right voffset10" id="finishButton">
+		<div class="activity-bottom-buttons">
+			<button type="button" class="btn btn-primary" id="finishButton">
 				<c:choose>
 					<c:when test="${isLastActivity}">
-						<fmt:message key="button.submit" />
+						<fmt:message key="button.submit"/>
 					</c:when>
 					<c:otherwise>
-						<fmt:message key="button.finish" />
+						<fmt:message key="button.finish"/>
 					</c:otherwise>
 				</c:choose>
-			</a>
+			</button>
 		</div>
-
 	</form:form>
 
 	<!-- Comments: the extra div counteracts the float -->
 	<c:if test="${allowComments}">
 		<div class="row no-gutter"><div class="col-xs-12"></div></div>
 		<lams:Comments toolSessionId="${nbLearnerForm.toolSessionID}"
-			toolSignature="<%=NoticeboardConstants.TOOL_SIGNATURE%>" likeAndDislike="${likeAndDislike}" readOnly="true"
-			pageSize="10" sortBy="1" />
+					   toolSignature="<%=NoticeboardConstants.TOOL_SIGNATURE%>" likeAndDislike="${likeAndDislike}" readOnly="true"
+					   pageSize="10" sortBy="1" />
 	</c:if>
 	<!-- End comments -->
-
-</lams:Page>
-
-<script type="text/javascript">
-	window.onload = function() {
-		document.getElementById("focusedInput").focus();
-	}
-</script>
-	
-</lams:html>
+</lams:PageLearner>
\ No newline at end of file