Index: lams_tool_forum/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.9 -r1.1.2.10
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:40:07 -0000	1.1.2.9
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:25 -0000	1.1.2.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.9 -r1.1.2.10
--- lams_tool_gmap/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:40:05 -0000	1.1.2.9
+++ lams_tool_gmap/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:34 -0000	1.1.2.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_images/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:40:06 -0000	1.1.2.8
+++ lams_tool_images/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:22 -0000	1.1.2.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:44:02 -0000	1.1.2.8
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:24 -0000	1.1.2.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_kaltura/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:44:02 -0000	1.1.2.8
+++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:28 -0000	1.1.2.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.9 -r1.1.2.10
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:40:44 -0000	1.1.2.9
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:31 -0000	1.1.2.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.10 -r1.1.2.11
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:41:45 -0000	1.1.2.10
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:35 -0000	1.1.2.11
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:42:10 -0000	1.1.2.8
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:29 -0000	1.1.2.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_leader/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:40:34 -0000	1.1.2.8
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:33 -0000	1.1.2.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_mindmap/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:40:33 -0000	1.1.2.8
+++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:39 -0000	1.1.2.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.9 -r1.1.2.10
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:41:20 -0000	1.1.2.9
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:36 -0000	1.1.2.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.11 -r1.1.2.12
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:41:21 -0000	1.1.2.11
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:39 -0000	1.1.2.12
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:41:34 -0000	1.1.2.8
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:32 -0000	1.1.2.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_preview/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:44:04 -0000	1.1.2.8
+++ lams_tool_preview/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:37 -0000	1.1.2.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.9 -r1.1.2.10
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:42:51 -0000	1.1.2.9
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:38 -0000	1.1.2.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:42:02 -0000	1.1.2.8
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:21 -0000	1.1.2.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.9 -r1.1.2.10
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:39:24 -0000	1.1.2.9
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:27 -0000	1.1.2.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.9 -r1.1.2.10
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:42:53 -0000	1.1.2.9
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:23 -0000	1.1.2.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.9 -r1.1.2.10
--- lams_tool_survey/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:42:50 -0000	1.1.2.9
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:30 -0000	1.1.2.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.9 -r1.1.2.10
--- lams_tool_task/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:42:52 -0000	1.1.2.9
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:37:26 -0000	1.1.2.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.9 -r1.1.2.10
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:43:08 -0000	1.1.2.9
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:39:20 -0000	1.1.2.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.9 -r1.1.2.10
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:43:24 -0000	1.1.2.9
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:39:34 -0000	1.1.2.10
@@ -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>