Index: lams_learning/web/loadToolActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/loadToolActivity.jsp,v
diff -u -r1.28 -r1.28.2.1
--- lams_learning/web/loadToolActivity.jsp	6 Jan 2014 08:42:49 -0000	1.28
+++ lams_learning/web/loadToolActivity.jsp	12 Mar 2016 23:48:18 -0000	1.28.2.1
@@ -18,46 +18,64 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
-
 <!-- Load Tool Activity (comment needed for the test harness) -->
 
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<c:set var="learnerAppUrl">
+	<lams:WebAppURL />
+</c:set>
+<link href="${learnerAppUrl}css/nprogress.css" rel="stylesheet" type="text/css" />
+<script type="text/javascript" src="${learnerAppUrl}includes/javascript/nprogress.js"></script>
 
-<div id="content">
-	<c:if test="${!empty activityForm.activityURLs}">
-		
-		<script  type="text/javascript">
-			function redirectPage() {
-				setTimeout("doRedirect()", 1000);
-			}
-			
-			function doRedirect() {
-				var url = "<c:out value='${activityForm.activityURLs[0].url}' escapeXml="false" />";
-				if ( url.substring(0,4)!="http" ) {
-					if ( url.substring(0,1)=="/" ) {
-						url = "<lams:WebAppURL/>.."+url;
-					} else {
-						url = "<lams:WebAppURL/>../"+url;
-					}
+
+
+<c:if test="${!empty activityForm.activityURLs}">
+
+	<script type="text/javascript">
+		function redirectPage() {
+			NProgress.configure({
+				easing : 'ease',
+				speed : 30
+			});
+			NProgress.configure({
+				trickleRate : 0.2,
+				trickleSpeed : 110
+			});
+			NProgress.start();
+			setTimeout("doRedirect()", 1000);
+
+		}
+
+		function doRedirect() {
+			var url = "<c:out value='${activityForm.activityURLs[0].url}' escapeXml="false" />";
+			if (url.substring(0, 4) != "http") {
+				if (url.substring(0, 1) == "/") {
+					url = "${learnerAppUrl}.." + url;
+				} else {
+					url = "${learnerAppUrl}../" + url;
 				}
-				window.location.href = url;
 			}
-		</script>
+			window.location.href = url;
+		}
+	</script>
 
-		<script language="JavaScript" type="text/JavaScript">
-			window.onload = redirectPage;
-		</script>
-		
-		<p><fmt:message key="message.activity.loading"/></p>
-	</c:if>
+	<script language="JavaScript" type="text/JavaScript">
+		window.onload = redirectPage;
+	</script>
 
-</div>  <!--closes content-->
+	<lams:Page type="admin">
+		<div class="text-center" style="margin-top: 10px; margin-bottom: 15px;">
+			<i class="fa fa-2x fa-refresh fa-spin text-primary"></i>
+			<p class="voffset5">
+				<fmt:message key="message.activity.loading" />
+			</p>
+		</div>
+	</lams:Page>
+	 
 
-
-<div id="footer">
-</div><!--closes footer-->
+</c:if>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/tags/Alert.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/tags/Page.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_learning/web/WEB-INF/tlds/lams/lams.tld	24 Feb 2016 12:35:27 -0000	1.3.2.2
+++ lams_learning/web/WEB-INF/tlds/lams/lams.tld	12 Mar 2016 23:48:18 -0000	1.3.2.3
@@ -432,6 +432,14 @@
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_learning/web/css/nprogress.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/gate/conditionGateContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/gate/conditionGateContent.jsp,v
diff -u -r1.2 -r1.2.2.1
--- lams_learning/web/gate/conditionGateContent.jsp	26 May 2014 10:11:53 -0000	1.2
+++ lams_learning/web/gate/conditionGateContent.jsp	12 Mar 2016 23:48:18 -0000	1.2.2.1
@@ -1,4 +1,5 @@
-	<%-- 
+
+<%-- 
 	Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 	License Information: http://lamsfoundation.org/licensing/lams/2.0/
 
@@ -19,9 +20,11 @@
 	  http://www.gnu.org/licenses/gpl.txt
 	--%>
 
-	<%@ taglib uri="tags-fmt" prefix="fmt" %>
-	<%@ taglib uri="tags-lams" prefix="lams" %>
-	
-	<lams:out value="${GateForm.map.gate.description}" escapeHtml="true"/>
-	
-	<p><fmt:message key="label.condition.gate.close.message"/></p>
\ No newline at end of file
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<div class="panel">
+	<lams:out value="${GateForm.map.gate.description}" escapeHtml="true" />
+</div>
+<div class="voffset">
+	<fmt:message key="label.condition.gate.close.message" />
+</div>
\ No newline at end of file
Index: lams_learning/web/gate/gateNext.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/gate/gateNext.jsp,v
diff -u -r1.9 -r1.9.12.1
--- lams_learning/web/gate/gateNext.jsp	29 Oct 2008 05:34:52 -0000	1.9
+++ lams_learning/web/gate/gateNext.jsp	12 Mar 2016 23:48:18 -0000	1.9.12.1
@@ -1,18 +1,23 @@
-<c:set var="formAction" value="/gate?method=knockGate&activityID=${GateForm.map.activityID}&lessonID=${GateForm.map.lessonID }"/>
+<c:set var="formAction"
+	value="/gate?method=knockGate&activityID=${GateForm.map.activityID}&lessonID=${GateForm.map.lessonID }" />
 <c:if test="${GateForm.map.monitorCanOpenGate}">
-	<p><fmt:message key="label.gate.refresh.message"/></p>
+	<div class="voffset5">
+		<fmt:message key="label.gate.refresh.message" />
+	</div>
 </c:if>
 
 <c:if test="${GateForm.map.previewLesson == true}">
-	<p>&nbsp;</p>
-	<c:set var="formAction"><c:out value="${formAction}"/>&force=true</c:set>
-	<p><em><fmt:message key="label.gate.preview.message"/></em></p>
-	<p>&nbsp;<p>
+	<div class="voffset5">
+		<c:set var="formAction">
+			<c:out value="${formAction}" />&force=true</c:set>
+		<em><fmt:message key="label.gate.preview.message" /></em>
+	</div>
 </c:if>
 
 <html:form action="${formAction}" target="_self">
-<div class="space-bottom-top align-right">
-	<html:submit styleClass="button"><fmt:message key="label.next.button"/></html:submit>
-</div>
+	<div class="voffset10 pull-right">
+		<html:submit styleClass="btn btn-default">
+			<fmt:message key="label.next.button" />
+		</html:submit>
+	</div>
 </html:form>
-	
\ No newline at end of file
Index: lams_learning/web/gate/permissionGateContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/gate/permissionGateContent.jsp,v
diff -u -r1.5 -r1.5.2.1
--- lams_learning/web/gate/permissionGateContent.jsp	26 May 2014 10:11:53 -0000	1.5
+++ lams_learning/web/gate/permissionGateContent.jsp	12 Mar 2016 23:48:18 -0000	1.5.2.1
@@ -1,4 +1,5 @@
-	<%-- 
+
+<%-- 
 	Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 	License Information: http://lamsfoundation.org/licensing/lams/2.0/
 
@@ -19,10 +20,12 @@
 	  http://www.gnu.org/licenses/gpl.txt
 	--%>
 
-	<%@ taglib uri="tags-fmt" prefix="fmt" %>
-	<%@ taglib uri="tags-lams" prefix="lams" %>
-	
-	<lams:out value="${GateForm.map.gate.description}" escapeHtml="true"/>
-	
-	<p><fmt:message key="label.permission.gate.message"/></p>
-	
\ No newline at end of file
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<div class="panel">
+	<lams:out value="${GateForm.map.gate.description}" escapeHtml="true" />
+</div>
+<div class="voffset5">
+	<fmt:message key="label.permission.gate.message" />
+</div>
Index: lams_learning/web/gate/scheduleGateContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/gate/scheduleGateContent.jsp,v
diff -u -r1.8 -r1.8.2.1
--- lams_learning/web/gate/scheduleGateContent.jsp	26 May 2014 10:11:53 -0000	1.8
+++ lams_learning/web/gate/scheduleGateContent.jsp	12 Mar 2016 23:48:18 -0000	1.8.2.1
@@ -19,81 +19,50 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c" %>		
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-logic" prefix="logic"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
-<lams:out value="${GateForm.map.gate.description}" escapeHtml="true"/>
+<div class="panel">
+	<lams:out value="${GateForm.map.gate.description}" escapeHtml="true" />
+</div>
 
+<lams:Alert type="info" close="false" id="whenOpens">
+<fmt:message key="label.schedule.gate.open.remaining" />&nbsp;<strong><time class="timeago" datetime="<fmt:formatDate value='${GateForm.map.startingTime}' pattern="yyyy-MM-dd'T'HH:mm:ss.S"/>"></time></strong>
+</lams:Alert>
+
 <c:choose>
 	<c:when test="${not empty GateForm.map.reachDate}">
-		<p><fmt:message key="label.schedule.gate.reach"/> <lams:Date value="${GateForm.map.reachDate}"/><br />
-		   <fmt:message key="label.schedule.gate.offset.1"/> <span id="offset"></span> <fmt:message key="label.schedule.gate.offset.2"/>
+		<p>
+			<fmt:message key="label.schedule.gate.reach" />
+			<strong><lams:Date value="${GateForm.map.reachDate}" /></strong>
+			<br />
+			<fmt:message key="label.schedule.gate.offset.1" />
+			<span id="offset"></span>
+			<fmt:message key="label.schedule.gate.offset.2" />
 		</p>
 	</c:when>
 	<c:otherwise>
 		<c:if test="${GateForm.map.startingTime!=null}">
-			<p><fmt:message key="label.schedule.gate.open.message"/> <lams:Date value="${GateForm.map.startingTime}"/></p>
+			<p>
+				<fmt:message key="label.schedule.gate.open.message" />&nbsp;<strong><lams:Date value="${GateForm.map.startingTime}" /></strong>
+			</p>
 		</c:if>
 		<c:if test="${GateForm.map.endingTime!=null}">
-			<p><fmt:message key="label.schedule.gate.close.message"/> <lams:Date value="${GateForm.map.endingTime}"/></p>
+			<p>
+				<fmt:message key="label.schedule.gate.close.message" />
+				<lams:Date value="${GateForm.map.endingTime}" />
+			</p>
 		</c:if>
 	</c:otherwise>
 </c:choose>
 
-<fmt:message key="label.schedule.gate.open.remaining"/> <span id="remaining"></span>
-
-<script type="text/javascript">
-	function buildDateString(offset, longFormat) {
-		var result = "",
-			day = 24*60*60,
-			offsetDay = Math.floor(offset/day);
-		offset -= offsetDay * day;
-		var offsetHour = Math.floor(offset/(60*60));
-		offset -= offsetHour * 60 * 60;
-		var offsetMinute =  Math.floor(offset/60);
-		
-		if (offsetDay > 0) {
-			result = offsetDay + " " + dayLabel + " ";
-		}
-		if (offsetHour > 0) {
-			result += offsetHour + " " + hourLabel + " ";
-		}
-		if (offsetMinute > 0) {
-			result += offsetMinute + " " + minuteLabel + " ";
-		}
-		if (longFormat) {
-			var offsetSecond = offset - offsetMinute * 60;
-			result += offsetSecond + " " + secondLabel;
-		}
-		return result;
-	}
-
-	var dayLabel = '<fmt:message key="label.days"/>',
-		hourLabel = '<fmt:message key="label.hours"/>',
-		minuteLabel = '<fmt:message key="label.minutes"/>',
-		secondLabel = '<fmt:message key="label.seconds"/>',
-		offsetField = document.getElementById('offset'),
-		remainingField = document.getElementById('remaining'),
-		remainTime = ${GateForm.map.remainTime};
-
-	setInterval(function(){
-		remainTime--;
-		if (remainTime <= 0) {
-			document.location.reload();
-		} else {
-			var remainingFieldText = buildDateString(remainTime, true);
-			remainingField.innerHTML = remainingFieldText;
-		}
-	}, 1000);
-		
-	if (offsetField != null) {
-		var offset = '${GateForm.map.startOffset}',
-			offsetFieldText = buildDateString(+offset, false);
-		offsetField.innerHTML = offsetFieldText;
-	}
-
-</script>
\ No newline at end of file
+  <script type="text/javascript">
+    jQuery(document).ready(function() {
+    	jQuery.timeago.settings.allowFuture = true;
+      jQuery("time.timeago").timeago();
+    });
+  </script>
\ No newline at end of file
Index: lams_learning/web/gate/synchGateContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/gate/synchGateContent.jsp,v
diff -u -r1.5 -r1.5.2.1
--- lams_learning/web/gate/synchGateContent.jsp	26 May 2014 10:11:53 -0000	1.5
+++ lams_learning/web/gate/synchGateContent.jsp	12 Mar 2016 23:48:18 -0000	1.5.2.1
@@ -19,18 +19,26 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c" %>		
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-logic" prefix="logic"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
-<lams:out value="${GateForm.map.gate.description}" escapeHtml="true"/>
+<div class="panel">
+	<lams:out value="${GateForm.map.gate.description}" escapeHtml="true" />
+</div>
 
-<p><fmt:message key="label.synch.gate.message"/></p> 
-<p><fmt:message key="label.gate.waiting.learners">  
-		<fmt:param value="${GateForm.map.waitingLearners}"/>
-		<fmt:param value="${GateForm.map.totalLearners}"/>
-	</fmt:message></p>
+<lams:Alert type="info" close="false" id="waitingAtTheGate">
+	<fmt:message key="label.gate.waiting.learners">
+		<fmt:param value="${GateForm.map.waitingLearners}" />
+		<fmt:param value="${GateForm.map.totalLearners}" />
+	</fmt:message>
+</lams:Alert>
 
+
+<div class="voffset5">
+	<fmt:message key="label.synch.gate.message" />
+</div>
+
Index: lams_learning/web/grouping/choose.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/grouping/choose.jsp,v
diff -u -r1.3.10.1 -r1.3.10.2
--- lams_learning/web/grouping/choose.jsp	19 Aug 2015 14:04:05 -0000	1.3.10.1
+++ lams_learning/web/grouping/choose.jsp	12 Mar 2016 23:48:18 -0000	1.3.10.2
@@ -19,64 +19,56 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c" %>		
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-function" prefix="fn" %>
-	
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-logic" prefix="logic"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-function" prefix="fn"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
-	<div id="content">
-		<h1><c:out value="${title}"/></h1>
-		<p>&nbsp;</p>
-		<p><fmt:message key="label.learner.choice.group.message"/></p>
-		
-		<table class="alternative-color" cellspacing="0">
+
+<lams:Page type="learner" title="${title}">
+
+	<div class="panel">
+		<fmt:message key="label.learner.choice.group.message" />
+	</div>
+
+	<div class="table-responsive">
+		<table class="table table-condensed table-hover">
 			<tr>
-				<th width="25%" class="first">
-					<fmt:message key="label.view.groups.title"/>
-				</th>
-				<th>
-					<c:if test="${viewStudentsBeforeSelection}">
-						<fmt:message key="label.view.groups.learners"/>
-					</c:if>
-				</th>
-				<th>
-				</th>
+				<th width="25%" class="first"><fmt:message key="label.view.groups.title" /></th>
+				<th><c:if test="${viewStudentsBeforeSelection}">
+						<fmt:message key="label.view.groups.learners" />
+					</c:if></th>
+				<th></th>
 			</tr>
-			<logic:iterate id="group" name="groups"> 
-			<tr>
-				<td width="25%" class="first">
-					<c:out value="${group.groupName}"/>
-				</td>
-				<td width="60%">
-					<c:if test="${viewStudentsBeforeSelection}">
-						<c:forEach items="${group.users}" var="user">
-							<c:out value="${user.firstName}"/> <c:out value="${user.lastName}"/><BR>
-						</c:forEach>
+			<logic:iterate id="group" name="groups">
+				<tr>
+					<td width="25%" class="first"><strong><c:out value="${group.groupName}" /></strong></td>
+					<td width="60%"><c:if test="${viewStudentsBeforeSelection}">
+							<c:forEach items="${group.users}" var="user">
+								<i class="fa fa-sm fa-user"></i>&nbsp;<c:out value="${user.firstName}" />&nbsp;<c:out value="${user.lastName}" />
+								<BR>
+							</c:forEach>
 						&nbsp;
-					</c:if>
-				</td>
-				<td>
-				<c:choose>
-					<c:when test="${not empty maxLearnersPerGroup and fn:length(group.users)>=maxLearnersPerGroup}">
-						<fmt:message key="label.learner.choice.group.full"/>
-					</c:when>
-					<c:otherwise>
-						<html:form action="/grouping.do?method=learnerChooseGroup&userId=${user.userID}&activityID=${activityID}&groupId=${group.groupId}" target="_self">
-							<html:submit styleClass="button"><fmt:message key="label.choose.group.button"/></html:submit>
-						</html:form>
-					</c:otherwise>
-				</c:choose>
-				</td>
-			</tr>
+					</c:if></td>
+					<td><c:choose>
+							<c:when test="${not empty maxLearnersPerGroup and fn:length(group.users)>=maxLearnersPerGroup}">
+								<fmt:message key="label.learner.choice.group.full" />
+							</c:when>
+							<c:otherwise>
+								<html:form
+									action="/grouping.do?method=learnerChooseGroup&userId=${user.userID}&activityID=${activityID}&groupId=${group.groupId}"
+									target="_self">
+									<html:submit styleClass="btn btn-sm btn-default">
+										<fmt:message key="label.choose.group.button" />
+									</html:submit>
+								</html:form>
+							</c:otherwise>
+						</c:choose></td>
+				</tr>
 			</logic:iterate>
 		</table>
-
-	</div>  <!--closes content-->
-
-	<div id="footer">
-	</div><!--closes footer-->
-
-</div>
\ No newline at end of file
+	</div>
+</lams:Page>
Index: lams_learning/web/grouping/show.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/grouping/show.jsp,v
diff -u -r1.13.2.1 -r1.13.2.2
--- lams_learning/web/grouping/show.jsp	19 Aug 2015 14:04:05 -0000	1.13.2.1
+++ lams_learning/web/grouping/show.jsp	12 Mar 2016 23:48:18 -0000	1.13.2.2
@@ -19,71 +19,97 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c" %>		
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-logic" prefix="logic"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<style type="text/css">
+.user-container {
+	padding: 2px;
+}
 
-	<html:form action="/grouping.do?method=completeActivity&userId=${user.userID}&lessonId=${lesson.lessonId}&activityID=${activityID}" target="_self" styleId="messageForm">
+.you {
+	font-weight: bolder;
+}
+</style>
+<lams:Page type="learner" title="${title}">
 
-	<div id="content">
+	<html:form
+		action="/grouping.do?method=completeActivity&userId=${user.userID}&lessonId=${lesson.lessonId}&activityID=${activityID}"
+		target="_self" styleId="messageForm">
 
-		<h1><c:out value="${title}"/></h1>
+		<c:set var="userId" value="${user.userID}" />
 
-		<table class="alternative-color" cellspacing="0">
-			<tr>
-				<th width="25%" class="first">
-					<fmt:message key="label.view.groups.title"/>
-				</th>
-				<th>
-					<fmt:message key="label.view.groups.learners"/>
-				</th>
-			</tr>
-			<logic:iterate id="group" name="groups"> 
-			<tr>
-				<td width="25%" class="first">
-					<c:out value="${group.groupName}"/>
-				</td>
-				<td>
-					<c:forEach items="${group.users}" var="user">
-						<c:out value="${user.firstName}"/> <c:out value="${user.lastName}"/><BR>
-					</c:forEach>
-					&nbsp;
-				</td>
-			</tr>
-			</logic:iterate>
-		</table>
+		<div class="panel panel-default">
+			<div class="panel-heading panel-title">
+				<i class="fa fa-sm fa-users text-primary"></i>&nbsp;
+				<fmt:message key="label.view.groups.title" />
+			</div>
+			<div class="panel-body">
 
-	<c:if test="${finishedButton}">
-	      <script type="text/javascript">
-	        function submitForm(methodName){
-                	 var f = document.getElementById('messageForm');
-                	 f.submit();
-		}
-	      </script>
+				<div class="table-responsive">
+					<table class="table table-condensed table-hover" cellspacing="0">
+						<logic:iterate id="group" name="groups">
+							<tr>
+								<td width="15%"><strong><c:out value="${group.groupName}" /></strong></td>
+								<td><c:forEach items="${group.users}" var="user">
+										<div name="u-${user.userId}" class="user-container">
+											<i name="ui-${user.userId}" class="fa fa-xs fa-user"></i>&nbsp;<c:out value="${user.firstName}" />&nbsp<c:out value="${user.lastName}" />
+										</div>
+									</c:forEach></td>
+							</tr>
+						</logic:iterate>
+					</table>
+				</div>
 
-			<table><tr><td><div id="right" class="right-buttons">
-					<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					  <span class="nextActivity">
-	                    <c:choose>
-		 					<c:when test="${activityPosition.last}">
-		 						<fmt:message key="label.submit.button" />
-		 					</c:when>
-		 					<c:otherwise>
-		 		 				<fmt:message key="label.finish.button" />
-		 					</c:otherwise>
-		 				</c:choose>
-		 			 </span>
-					 </html:link>
-			</div></td></tr></table>
-	</c:if>
+			</div>
+		</div>
 
-	</div>  <!--closes content-->
+		<c:if test="${finishedButton}">
+			<script type="text/javascript">
+				function submitForm(methodName) {
+					var f = document.getElementById('messageForm');
+					f.submit();
+				}
+			</script>
 
-	<div id="footer">
-	</div><!--closes footer-->
+			<div class="row no-gutter">
+				<div class="col-xs-12">
+					<div id="right-buttons" class="pull-right voffset10">
+						<html:link href="javascript:;" styleClass="btn btn btn-primary na" styleId="finishButton"
+							onclick="submitForm('finish')">
+							<span class="nextActivity"> <c:choose>
+									<c:when test="${activityPosition.last}">
+										<fmt:message key="label.submit.button" />
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="label.finish.button" />
+									</c:otherwise>
+								</c:choose>
+							</span>
+						</html:link>
+					</div>
 
-	</html:form>
+				</div>
+			</div>
+		</c:if>
 
-</div>
\ No newline at end of file
+
+		<div id="footer"></div>
+		<!--closes footer-->
+		<script type="text/javascript">
+			function codeAddress() {
+				var youUser = document.getElementsByName('u-${userId}');
+				if (youUser) {
+					youUser[0].className += ' alert-success you';
+					document.getElementsByName('ui-${userId}')[0].className = 'fa fa-sm fa-star';
+				}
+			}
+			window.onload = codeAddress;
+		</script>
+
+
+	</html:form>
+</lams:Page>
\ No newline at end of file
Index: lams_learning/web/grouping/wait.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/grouping/wait.jsp,v
diff -u -r1.7 -r1.7.16.1
--- lams_learning/web/grouping/wait.jsp	28 Sep 2006 23:29:23 -0000	1.7
+++ lams_learning/web/grouping/wait.jsp	12 Mar 2016 23:48:18 -0000	1.7.16.1
@@ -19,41 +19,39 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c" %>		
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-logic" prefix="logic"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
-	<c:set var="formAction">/grouping.do?method=performGrouping&activityID=${activity.activityId}</c:set>
-	<c:if test="${GroupingForm.map.previewLesson == true}">
-		<c:set var="formAction"><c:out value="${formAction}"/>&force=true</c:set>
-	</c:if>
+<c:set var="formAction">/grouping.do?method=performGrouping&activityID=${activity.activityId}</c:set>
+<c:if test="${GroupingForm.map.previewLesson == true}">
+	<c:set var="formAction">
+		<c:out value="${formAction}" />&force=true</c:set>
+</c:if>
 
+<lams:Page type="learner" title="${GroupingForm.map.title}">
 	<html:form action="${formAction}" target="_self">
 
+		<lams:Alert id="waitingGroups" close="false" type="info">
+			<fmt:message key="label.view.view.groups.wait.message" />
+		</lams:Alert>
 
-		<div id="content">
-		
-			<h1><c:out value="${GroupingForm.map.title}"/></h1>
-			
-			<p>&nbsp;</p>
+		<c:if test="${GroupingForm.map.previewLesson == true}">
+			<c:set var="formAction">
+				<c:out value="${formAction}" />&force=true</c:set>
+			<div class="voffset10">
+				<em><fmt:message key="label.grouping.preview.message" /></em>
+			</div>
+		</c:if>
 
-			<p><fmt:message key="label.view.view.groups.wait.message"/></p>
+		<div class="right-buttons">
+			<html:submit styleClass="btn btn-primary pull-right">
+				<fmt:message key="label.next.button" />
+			</html:submit>
+		</div>
 
-			<c:if test="${GroupingForm.map.previewLesson == true}">
-				<c:set var="formAction"><c:out value="${formAction}"/>&force=true</c:set>
-				<p><em><fmt:message key="label.grouping.preview.message"/></em></p>
-			</c:if>
-
-			<table><tr><td><div class="right-buttons">
-					<html:submit styleClass="button"><fmt:message key="label.next.button"/></html:submit>
-			</div></td></tr></table>
-
-		</div>  <!--closes content-->
-
-		<div id="footer">
-		</div><!--closes footer-->
-
 	</html:form>
+</lams:Page>
\ No newline at end of file
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_learning/web/includes/javascript/nprogress.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/layout/gateLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/gateLayout.jsp,v
diff -u -r1.11.12.1 -r1.11.12.2
--- lams_learning/web/layout/gateLayout.jsp	26 Feb 2016 07:17:51 -0000	1.11.12.1
+++ lams_learning/web/layout/gateLayout.jsp	12 Mar 2016 23:48:18 -0000	1.11.12.2
@@ -21,31 +21,34 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
 <!DOCTYPE html>
 <lams:html xhtml="true">
 
-	<lams:head>
-		<title><c:out value="${GateForm.map.gate.title}"/></title>
-		<lams:css/>
-		<META HTTP-EQUIV="Refresh" CONTENT="60;URL=<lams:WebAppURL/>/gate.do?method=knockGate&activityID=${GateForm.map.activityID}&lessonID=${GateForm.map.lessonID }">
-	  </lams:head>
-
-	<body class="stripes">
+<lams:head>
+	<title><c:out value="${GateForm.map.gate.title}" /></title>
+	<lams:css />
+	<META HTTP-EQUIV="Refresh"
+		CONTENT="60;URL=<lams:WebAppURL/>/gate.do?method=knockGate&activityID=${GateForm.map.activityID}&lessonID=${GateForm.map.lessonID }">
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.timeago.js"></script>
 		
+		
+</lams:head>
 
-			<div id="content">
+<body class="stripes">
 
-				<h1><c:out value="${GateForm.map.gate.title}"/></h1>
 
-				<tiles:insert attribute="body" />
-				<%@ include file="../gate/gateNext.jsp" %>			  
+	<lams:Page type="learner" title="${GateForm.map.gate.title}">
 
-			</div>  <!--closes content-->
+		<tiles:insert attribute="body" />
+		<%@ include file="../gate/gateNext.jsp"%>
 
 
-			<div id="footer">
-			</div><!--closes footer-->
+	</lams:Page>
+</body>
 
-	</body>
-
 </lams:html>
Index: lams_learning/web/layout/layout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/layout.jsp,v
diff -u -r1.18.12.2 -r1.18.12.3
--- lams_learning/web/layout/layout.jsp	26 Feb 2016 07:17:51 -0000	1.18.12.2
+++ lams_learning/web/layout/layout.jsp	12 Mar 2016 23:48:18 -0000	1.18.12.3
@@ -32,6 +32,8 @@
 <tiles:useAttribute name="includeBodyTag" ignore="true" />
 
 
+	
+
 <lams:head>
 	<title><fmt:message key="${pageTitleKey}" />
 	</title>
@@ -42,6 +44,7 @@
 	</c:set>
 	<script src="${lams}includes/javascript/AC_RunActiveContent.js"
 		type="text/javascript"></script>
+		
 	<script type="text/javascript"
 		src="${lams}includes/javascript/common.js"></script>
 </lams:head>