Index: lams_tool_assessment/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r43109c0633b7699925623470abcf46421b624ff0 -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 43109c0633b7699925623470abcf46421b624ff0)
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_bbb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r8315ad837ab0fce3626560b8e72e0ab1297d7bec -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_bbb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 8315ad837ab0fce3626560b8e72e0ab1297d7bec)
+++ lams_tool_bbb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc7ba52ee01e6e67a6cd7ccf4d8b24f01203eb3a1 -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c7ba52ee01e6e67a6cd7ccf4d8b24f01203eb3a1)
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r0978f4c3fff33f106dc928704ad6249815cd131c -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 0978f4c3fff33f106dc928704ad6249815cd131c)
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra39ddd2af8d2bfba39c9d3add6bcb7ee09d7ff5f -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a39ddd2af8d2bfba39c9d3add6bcb7ee09d7ff5f)
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7e36808f988eacadf9b5d82b450dcf6518ed49d9 -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7e36808f988eacadf9b5d82b450dcf6518ed49d9)
+++ lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r91b889b2799b29b15df18c661e46cd1532eb5251 -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 91b889b2799b29b15df18c661e46cd1532eb5251)
+++ lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r556a6982f300507743b2c917118c0035f1f80d84 -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 556a6982f300507743b2c917118c0035f1f80d84)
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9dffcfc34a162e2764264327642af2c6fae5ee01 -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
+++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9c21ce6391eb60f464a106f582c8935103ab61b0 -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9c21ce6391eb60f464a106f582c8935103ab61b0)
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r097e25c6195a1a5f58821003b0fa332844dc6305 -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 097e25c6195a1a5f58821003b0fa332844dc6305)
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf)
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra6f139bf7f2aeceb96792867e30e3de3959bd1f0 -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a6f139bf7f2aeceb96792867e30e3de3959bd1f0)
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<a style="float: right" href="${titleHelpURL}" target="_new"><span class="help" style="margin: 0px"></span></a>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r017d7545cab486a7d901af349a9a1015f7f387b6 -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 017d7545cab486a7d901af349a9a1015f7f387b6)
+++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r6b4aed17af30b7410d1b0938a69b95b05ef2495d -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6b4aed17af30b7410d1b0938a69b95b05ef2495d)
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r5aa5708a9fe203378eea76b1abfb12169189142e -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 5aa5708a9fe203378eea76b1abfb12169189142e)
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,48 +1,290 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
+		</div>
+
+	</c:when>
+
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
+		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
 
 
 		
Index: lams_tool_pixlr/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r6eaaff81c675b592c0efa20bf13dacc7863f460b -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6eaaff81c675b592c0efa20bf13dacc7863f460b)
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rdfa065f63337cf06d31a9232dee1e1bf46c2bdb8 -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision dfa065f63337cf06d31a9232dee1e1bf46c2bdb8)
+++ lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -red5aa531a1b645392cb8fcb2fad507065ddb0227 -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision ed5aa531a1b645392cb8fcb2fad507065ddb0227)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r0cc94471294210863bab4937934efeef42dfdeaf -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 0cc94471294210863bab4937934efeef42dfdeaf)
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r18b17447403673ba4a33fdbf4d77f7bec9d27bd2 -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 18b17447403673ba4a33fdbf4d77f7bec9d27bd2)
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r4cef43ff9f318cfb92259c5d25b2e97e6e732a83 -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4cef43ff9f318cfb92259c5d25b2e97e6e732a83)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r1c9c204c7d6fad2a083eac4250d68aabce949b53 -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1c9c204c7d6fad2a083eac4250d68aabce949b53)
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9bde0c194f5868e0e9e1dd133aefd38416574b1b -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9bde0c194f5868e0e9e1dd133aefd38416574b1b)
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rd7b8dfc74b0f786d93eb97ff3a351a96be451acf -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d7b8dfc74b0f786d93eb97ff3a351a96be451acf)
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r731fcdae94ff4e5e1a052eee8fe74f5896f1da4d -r9662494d876e715f5416d2e4a52fa46ae5a2d4ca
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 731fcdae94ff4e5e1a052eee8fe74f5896f1da4d)
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9662494d876e715f5416d2e4a52fa46ae5a2d4ca)
@@ -1,49 +1,291 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+			
+<c:choose>
 
-
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner --%>
+	<c:choose>
+	<c:when test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionID}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+						
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = true;
+				var showIM = true;
+				if ( window.frameElement ) {
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1' ) {
+							showControlBar = false;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#sidebar').show();
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+						}
+					});
+				}
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">ExitX</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries()" ><span id="notebooklabel">NotebookX</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">RestartX</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu()">
+							<i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+		<div class="content navcontent">
+	
+	</c:when> <%--  end of sidebar stuff - only used if in learner screen --%>
+	<c:otherwise>
+		<div class="content">
+	</c:otherwise>
+	</c:choose>
+	
+			<div class="row no-gutter">
+			<div class="col-xs-12">
+			<div class="container">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
-					<jsp:doBody />
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
-			
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
 
+	</c:when>
 
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter">
+		<div class="col-xs-12">
+		<div class="container" id="content">
 		
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
+		</div>
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
+
+
+		
+			
\ No newline at end of file