Index: lams_monitoring/web/gate/conditionGateContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/gate/conditionGateContent.jsp,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_monitoring/web/gate/conditionGateContent.jsp	30 May 2016 12:10:36 -0000	1.3.2.2
+++ lams_monitoring/web/gate/conditionGateContent.jsp	18 Sep 2016 08:51:59 -0000	1.3.2.3
@@ -1,24 +1,3 @@
-	<%-- 
-	Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-	License Information: http://lamsfoundation.org/licensing/lams/2.0/
-
-	  This program is free software; you can redistribute it and/or modify
-	  it under the terms of the GNU General Public License version 2 as 
-	  published by the Free Software Foundation.
-
-	  This program is distributed in the hope that it will be useful,
-	  but WITHOUT ANY WARRANTY; without even the implied warranty of
-	  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	  GNU General Public License for more details.
-
-	  You should have received a copy of the GNU General Public License
-	  along with this program; if not, write to the Free Software
-	  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-	  USA
-
-	  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" %>
@@ -44,57 +23,12 @@
 		<%@ include file="gateInfo.jsp" %>
 		<c:if test="${not GateForm.map.gate.gateOpen}" >
 			<p><fmt:message key="label.gate.you.open.message"/><br />
-			   <fmt:message key="message.gate.condition.force.pass" /></p>
+			<small><em><fmt:message key="message.gate.condition.force.pass" /></em></small></p>
 		</c:if>
 		
 		<%@ include file="gateStatus.jsp" %>
 		<c:if test="${not GateForm.map.gate.gateOpen}" >
-			<hr />
-			<p><fmt:message key="label.gate.open.single.learner"/></p>
-			<html:form action="/gate?method=openGateForSingleUser" onsubmit="return onSubmitForm();" target="_self">
-			<input type="hidden" id="userId" name="userId" />
-			<table>
-				<tr>
-					<th><fmt:message key="label.gate.list.have.not.met.conditions.learners"/></th>
-					<th><fmt:message key="label.gate.list.waiting.learners"/></th>
-					<th><fmt:message key="label.gate.list.allowed.learners"/></th>
-		   		 </tr>
-				<tr>
-					<td width="34%">
-						<select style="width: 160px" id="forbidden" name="forbidden" size="10">
-							<c:forEach var="learner" items="${GateForm.map.forbiddenLearnerList}">
-								<option value="${learner.userId}"><c:out value="${learner.firstName} ${learner.lastName}" escapeXml="true"/></option>
-							</c:forEach>
-						</select>
-					</td >
-					<td width="33%">
-						<select style="width: 160px"  id="waiting" name="waiting" size="10">
-							<c:forEach var="learner" items="${GateForm.map.waitingLearnerList}">
-								<option value="${learner.userId}"><c:out value="${learner.firstName} ${learner.lastName}" escapeXml="true"/></option>
-							</c:forEach>
-						</select>
-					</td>
-					<td width="33%">
-						<select style="width: 160px" id="allowed" name="allowed" size="10" disabled="disabled">
-							<c:forEach var="learner" items="${GateForm.map.allowedToPassLearnerList}">
-								<option><c:out value="${learner.firstName} ${learner.lastName}" escapeXml="true"/></option>
-							</c:forEach>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<input style="width: 160px" type="submit"  class="button"  value="<fmt:message key="label.gate.allow"/>" onclick="document.pressed='forbidden'"/>
-					</td>
-					<td>
-						<input style="width: 160px" type="submit" class="button"  value="<fmt:message key="label.gate.allow"/>" onclick="document.pressed='waiting'"/>
-					</td>
-					<td>
-						 &nbsp;
-					</td>
-				</tr>
-			</table>
-			</html:form>
+				<%@ include file="openGateSingleUser.jsp" %>
 		</c:if>
 
 	</lams:Page>
\ No newline at end of file
Index: lams_monitoring/web/gate/gateInfo.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/gate/gateInfo.jsp,v
diff -u -r1.9.2.4 -r1.9.2.5
--- lams_monitoring/web/gate/gateInfo.jsp	18 Sep 2016 07:09:57 -0000	1.9.2.4
+++ lams_monitoring/web/gate/gateInfo.jsp	18 Sep 2016 08:51:59 -0000	1.9.2.5
@@ -8,19 +8,26 @@
 </c:if>
 
 <!--waiting learner information table-->
+
+<c:if test="${not GateForm.map.gate.gateOpen}">
+	<div id="gateStatus" class="alert alert-danger" style="margin-bottom: 10px; padding: 8px">
+				<div class="media">
+					<div class="media-left">
+						<i class="fa fa-lg fa-minus-circle"></i>
+					</div>
+					<div class="media-body">
+						<strong><fmt:message key="label.gate.closed"/></strong>
+					</div>
+				</div>
+	</div>
+</c:if>		
 <p>
+<span><fmt:message key="label.grouping.status"/></span> 
 	<strong> <fmt:message key="label.gate.waiting.learners">
 			<fmt:param value="${GateForm.map.waitingLearners}" />
 			<fmt:param value="${GateForm.map.totalLearners}" />
 		</fmt:message>
 	</strong>
 </p>
 
-<c:if test="${not GateForm.map.readOnly}">
-	<c:if test="${not GateForm.map.gate.gateOpen}" >
-		<html:form action="/gate?method=openGate" target="_self">
-			<input type="hidden" name="activityId" value="${GateForm.map.activityId}" />
-			<p><html:submit styleClass="btn btn-default"><fmt:message key="label.gate.open"/></html:submit></p>
-		</html:form>
-	</c:if>
-</c:if>
+
Index: lams_monitoring/web/gate/gateStatus.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/gate/gateStatus.jsp,v
diff -u -r1.8 -r1.8.12.1
--- lams_monitoring/web/gate/gateStatus.jsp	27 May 2008 02:13:16 -0000	1.8
+++ lams_monitoring/web/gate/gateStatus.jsp	18 Sep 2016 08:51:59 -0000	1.8.12.1
@@ -1,42 +1,25 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
+<c:if test="${not GateForm.map.gate.gateOpen}">
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
-  published by the Free Software Foundation.
+				<c:if test="${not GateForm.map.readOnly}">
+					<html:form action="/gate?method=openGate" target="_self">
+						<input type="hidden" name="activityId" value="${GateForm.map.activityId}" />
+						<p><html:submit styleClass="btn btn-primary btn-sm"><fmt:message key="label.gate.open"/></html:submit></p>
+					</html:form>
+				</c:if>        
+        
+</c:if>
+<c:if test="${GateForm.map.gate.gateOpen}">
 
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+	<div id="gateStatus" class="alert alert-success" style="margin-bottom: 10px; padding: 8px">
+				<div class="media">
+					<div class="media-left">
+						<i class="fa fa-lg fa-sign-in"></i>
+					</div>
+					<div class="media-body">
+						<strong><fmt:message key="label.gate.gate.open"/></strong>
+					</div>
+				</div>
+	</div>
 
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-  USA
-
-  http://www.gnu.org/licenses/gpl.txt
---%>
-<c:if test="${not GateForm.map.localFiles}">
-	<p class="align-right">
-			<c:if test="${not GateForm.map.gate.gateOpen}">
-				<img height="43" src="../images/synch_active.gif" width="37"><br><span class="bodyBold"><fmt:message key="label.gate.closed"/></span>
-			</c:if>
-			<c:if test="${GateForm.map.gate.gateOpen}">
-				<img height="43" src="../images/synch_not_active.gif" width="37"><br><span class="bodyBold"><fmt:message key="label.gate.gate.open"/></span>
-			</c:if>
-	</p>
 </c:if>
 
-<c:if test="${GateForm.map.localFiles}">
-	<p class="align-left">
-		<c:if test="${not GateForm.map.gate.gateOpen}">
-				<span class="bodyBold"><fmt:message key="label.gate.closed"/></span>
-			</c:if>
-			<c:if test="${GateForm.map.gate.gateOpen}">
-				<span class="bodyBold"><fmt:message key="label.gate.gate.open"/></span>
-			</c:if>
-	</p>
-</c:if>
-
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_monitoring/web/gate/openGateSingleUser.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_monitoring/web/gate/permissionGateContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/gate/permissionGateContent.jsp,v
diff -u -r1.16.2.3 -r1.16.2.4
--- lams_monitoring/web/gate/permissionGateContent.jsp	30 May 2016 12:10:36 -0000	1.16.2.3
+++ lams_monitoring/web/gate/permissionGateContent.jsp	18 Sep 2016 08:51:59 -0000	1.16.2.4
@@ -1,24 +1,3 @@
-	<%-- 
-	Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-	License Information: http://lamsfoundation.org/licensing/lams/2.0/
-
-	  This program is free software; you can redistribute it and/or modify
-	  it under the terms of the GNU General Public License version 2 as 
-	  published by the Free Software Foundation.
-
-	  This program is distributed in the hope that it will be useful,
-	  but WITHOUT ANY WARRANTY; without even the implied warranty of
-	  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	  GNU General Public License for more details.
-
-	  You should have received a copy of the GNU General Public License
-	  along with this program; if not, write to the Free Software
-	  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-	  USA
-
-	  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" %>
@@ -37,67 +16,18 @@
 			}
 		}
 	</script>
-	<div id="content">
-
 	<c:set var="title"><fmt:message key="label.permission.gate.title"/></c:set>
 	<lams:Page title="${title}" type="monitoring">
 		
 		<%@ include file="gateInfo.jsp" %>
 		
-		
 		<c:if test="${not GateForm.map.gate.gateOpen}" >
 			<p><fmt:message key="label.gate.you.open.message"/></p>
 		</c:if>
 
 		<%@ include file="gateStatus.jsp" %>
 		<c:if test="${not GateForm.map.gate.gateOpen}" >
-			<hr />
-			<p><fmt:message key="label.gate.open.single.learner"/></p>
-			<html:form action="/gate?method=openGateForSingleUser" onsubmit="return onSubmitForm();" target="_self">
-			<input type="hidden" id="activityId" name="activityId" value="${GateForm.map.activityId}" />
-			<input type="hidden" id="userId" name="userId" />
-			<table>
-				<tr>
-					<th><fmt:message key="label.gate.list.all.learners"/></th>
-					<th><fmt:message key="label.gate.list.waiting.learners"/></th>
-					<th><fmt:message key="label.gate.list.allowed.learners"/></th>
-		   		 </tr>
-				<tr>
-					<td width="34%">
-						<select style="width: 160px" id="forbidden" name="forbidden" size="10">
-							<c:forEach var="learner" items="${GateForm.map.forbiddenLearnerList}">
-								<option value="${learner.userId}"><c:out value="${learner.firstName} ${learner.lastName}" escapeXml="true"/></option>
-							</c:forEach>
-						</select>
-					</td >
-					<td width="33%">
-						<select style="width: 160px"  id="waiting" name="waiting" size="10">
-							<c:forEach var="learner" items="${GateForm.map.waitingLearnerList}">
-								<option value="${learner.userId}"><c:out value="${learner.firstName} ${learner.lastName}" escapeXml="true"/></option>
-							</c:forEach>
-						</select>
-					</td>
-					<td width="33%">
-						<select style="width: 160px" id="allowed" name="allowed" size="10" disabled="disabled">
-							<c:forEach var="learner" items="${GateForm.map.allowedToPassLearnerList}">
-								<option><c:out value="${learner.firstName} ${learner.lastName}" escapeXml="true"/></option>
-							</c:forEach>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<input style="width: 160px" type="submit"  class="button"  value="<fmt:message key="label.gate.allow"/>" onclick="document.pressed='forbidden'"/>
-					</td>
-					<td>
-						<input style="width: 160px" type="submit" class="button"  value="<fmt:message key="label.gate.allow"/>" onclick="document.pressed='waiting'"/>
-					</td>
-					<td>
-						 &nbsp;
-					</td>
-				</tr>
-			</table>
-			</html:form>
+					<%@ include file="openGateSingleUser.jsp" %>
 		</c:if>
 
 	</lams:Page>
\ No newline at end of file