Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_admin/web/WEB-INF/tags/Page.tag	29 Jul 2016 00:01:24 -0000	1.1.2.3
+++ lams_admin/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:03:59 -0000	1.1.2.4
@@ -38,9 +38,8 @@
 		<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') }">
+	<%--  only have sidebar and presence in learner main window, not in popup windows --%>
+	<c:if 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" />
@@ -66,7 +65,7 @@
 				<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 toolSessionId}">
 				<c:if test="${empty sessionMapID}">
 					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
 				</c:if>
@@ -123,6 +122,8 @@
 			function onProgressBarLoaded() {
 				$('#exitlabel').html(LABELS.EXIT);
 				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				$('#supportlabel').html(LABELS.SUPPORT_ACTIVITIES);
+				$('#progresslabel').html(LABELS.PROGRESS_BAR);
 				if ( allowRestart ) {
 					$('#restartlabel').html(LABELS.RESTART);
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
@@ -133,7 +134,7 @@
 			$(document).ready(function() {
 				var showControlBar = true;
 				var showIM = true;
-				if ( window.frameElement ) {
+				if ( window.frameElement ) { // parallel
 					var myId = window.frameElement.id;
 					if ( myId ) {
 						if ( myId == 'lamsDynamicFrame0' ) {
@@ -142,6 +143,9 @@
 							showControlBar = false;
 						}
 					}
+				} else { // test for popup window
+					debugger;
+					showControlBar =  ( window.name.match("LearnerActivity") == null );
 				}
 
 				if ( lessonId != "" || toolSessionId != "" ) {
@@ -162,6 +166,7 @@
 								allowRestart = result.allowRestart;
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
+								$('#navcontent').addClass('navcontent');
 								$('#sidebar').show();
 							}
 							
@@ -203,23 +208,21 @@
 							<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">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</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>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-wrench"></i></a>
+							<div id="supportPart" class="progressBarContainer"></div>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+							<span id="progresslabel">My Progress</span><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>
-	
+	</c:if> <%--  end of sidebar stuff - only used if in learner screen --%>
+
+		<div id="navcontent" class="content">
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
Index: lams_central/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_central/web/WEB-INF/tags/Page.tag	29 Jul 2016 00:01:13 -0000	1.1.2.7
+++ lams_central/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:04:00 -0000	1.1.2.8
@@ -38,9 +38,8 @@
 		<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') }">
+	<%--  only have sidebar and presence in learner main window, not in popup windows --%>
+	<c:if 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" />
@@ -66,7 +65,7 @@
 				<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 toolSessionId}">
 				<c:if test="${empty sessionMapID}">
 					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
 				</c:if>
@@ -123,6 +122,8 @@
 			function onProgressBarLoaded() {
 				$('#exitlabel').html(LABELS.EXIT);
 				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				$('#supportlabel').html(LABELS.SUPPORT_ACTIVITIES);
+				$('#progresslabel').html(LABELS.PROGRESS_BAR);
 				if ( allowRestart ) {
 					$('#restartlabel').html(LABELS.RESTART);
 					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
@@ -133,7 +134,7 @@
 			$(document).ready(function() {
 				var showControlBar = true;
 				var showIM = true;
-				if ( window.frameElement ) {
+				if ( window.frameElement ) { // parallel
 					var myId = window.frameElement.id;
 					if ( myId ) {
 						if ( myId == 'lamsDynamicFrame0' ) {
@@ -142,6 +143,9 @@
 							showControlBar = false;
 						}
 					}
+				} else { // test for popup window
+					debugger;
+					showControlBar =  ( window.name.match("LearnerActivity") == null );
 				}
 
 				if ( lessonId != "" || toolSessionId != "" ) {
@@ -162,6 +166,7 @@
 								allowRestart = result.allowRestart;
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
+								$('#navcontent').addClass('navcontent');
 								$('#sidebar').show();
 							}
 							
@@ -203,23 +208,21 @@
 							<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">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</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>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-wrench"></i></a>
+							<div id="supportPart" class="progressBarContainer"></div>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+							<span id="progresslabel">My Progress</span><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>
-	
+	</c:if> <%--  end of sidebar stuff - only used if in learner screen --%>
+
+		<div id="navcontent" class="content">
 			<div class="row no-gutter">
 			<div class="col-xs-12">
 			<div class="container">
Index: lams_central/web/includes/javascript/progressBar.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/progressBar.js,v
diff -u -r1.13.2.8 -r1.13.2.9
--- lams_central/web/includes/javascript/progressBar.js	28 Jul 2016 03:44:16 -0000	1.13.2.8
+++ lams_central/web/includes/javascript/progressBar.js	29 Jul 2016 04:04:00 -0000	1.13.2.9
@@ -1038,7 +1038,9 @@
 					CONFIRM_RESTART : result.messages["message.learner.progress.restart.confirm"],
 					RESTART: result.messages["message.lesson.restart.button"],
 					NOTEBOOK: result.messages["label.learner.progress.notebook"],
-					EXIT : result.messages["button.exit"]
+					EXIT : result.messages["button.exit"],
+					SUPPORT_ACTIVITIES : result.messages["label.learner.progress.support"],
+					PROGRESS_BAR: result.messages["label.my.progress"]
 				};
 			}
 			
@@ -1140,14 +1142,11 @@
 			}
 
 			// draw support activities if they exist
-			var supportSeparatorRow = $('#supportSeparatorRow');
-			if (result.support && supportSeparatorRow.length > 0 && !supportSeparatorRow.is(':visible')) {
-				supportSeparatorRow.show();
-
-
+			if (result.support) {
+				var svgheight = 17 + 33 * result.support.length;
 				// separate paper for Support Activities frame
 				var supportPaper = Snap();
-				$('#supportPart').height(17 + 33 * result.support.length)
+				$('#supportPart').height(svgheight+5)
 								 .append(supportPaper.node)
 								 .show();
 				$.each(result.support, function(activityIndex,
@@ -1165,7 +1164,11 @@
 					ActivityUtils.addEffects(activity);
 					supportPaper.text(90, 24 + 33 * activityIndex,
 							activity.name).attr(DEFAULT_TEXT_ATTRIBUTES);
+					supportPaper.attr(
+							{'height' : svgheight}
+					)
 				});
+				$("#supportitem").show();
 			}
 
 			// scroll to the current activity