Index: lams_tool_forum/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_gmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_images/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_imscc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_kaltura/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_lamc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_laqa/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_larsrc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_leader/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_mindmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_nb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_pixlr/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_preview/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_scratchie/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_scribe/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_survey/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_task/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_vote/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>
Index: lams_tool_wiki/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb0cfe60b20fe62eb6eb7a5998f82d71cf90892ec -rbec5a4167574944062fb75e0a30fd04683003a12
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b0cfe60b20fe62eb6eb7a5998f82d71cf90892ec)
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision bec5a4167574944062fb75e0a30fd04683003a12)
@@ -8,9 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
-			
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
+
 <c:choose>
 
 	<c:when test='${type == "navbar"}'>
@@ -136,6 +140,7 @@
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
 					$('#restartitem').show();
 				}
+				$('#sidebar').show();
 			}
 			
 			$(document).ready(function() {
@@ -173,7 +178,6 @@
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
-								$('#sidebar').show();
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -232,6 +236,8 @@
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
 					<div class="panel panel-default panel-${type}-page">
 						<c:if test="${not empty title}">
 							<div class="panel-heading">
@@ -256,7 +262,11 @@
 					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 					<div id="presenceEnabledPatchDiv"></div>
 					</c:if>
-						
+				</c:when>
+				<c:otherwise>
+					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
 			</div>
 				</div>
 			</div>
@@ -269,7 +279,9 @@
 		<div class="row no-gutter">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		
+
+		<c:choose>
+		<c:when test="${usePanel}">
 		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
 				<div class="panel-heading">
@@ -289,6 +301,13 @@
 				<jsp:doBody />
 			</div>
 		</div>
+		</c:when>
+
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
 		</div>
 		</div>
 		</div>