Index: lams_monitoring/web/gate/gateStatus.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/gate/gateStatus.jsp	(.../gateStatus.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/gate/gateStatus.jsp	(.../gateStatus.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -1,4 +1,4 @@
-<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ include file="/taglibs.jsp"%>
 
 <c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.timeago.js"></script>
@@ -8,17 +8,17 @@
 	$(document).ready(function() {$("time.timeago").timeago();});
 </script>
 	        
-<c:if test="${not GateForm.map.gate.gateOpen}">
+<c:if test="${not gateForm.gate.gateOpen}">
 
-				<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 voffset10"><fmt:message key="label.gate.open"/></html:submit></p>
-					</html:form>
+				<c:if test="${not GateForm.readOnly}">
+					<form:form action="openGate.do" id="gateForm" modelAttribute="gateForm" target="_self">
+						<input type="hidden" name="activityId" value="${gateForm.map.activityId}" />
+						<p><input type="submit" class="btn btn-primary btn-sm voffset10" value="<fmt:message key="label.gate.open"/>" /></p>
+					</form:form>
 				</c:if>        
         
 </c:if>
-<c:if test="${GateForm.map.gate.gateOpen}">
+<c:if test="${gateForm.gate.gateOpen}">
 
 	<div id="gateStatus" class="alert alert-success" style="margin-bottom: 10px; padding: 8px">
 				<div class="media">
@@ -27,12 +27,12 @@
 					</div>
 					<div class="media-body">
 						<strong><fmt:message key="label.gate.gate.open"/>
-						<c:if test="${not empty GateForm.map.gate.gateOpenTime}">
-							&nbsp;<lams:Date value="${GateForm.map.gate.gateOpenTime}" timeago="true" />
+						<c:if test="${not empty gateForm.map.gate.gateOpenTime}">
+							&nbsp;<lams:Date value="${gateForm.gate.gateOpenTime}" timeago="true" />
 						</c:if>
-						<c:if test="${not empty GateForm.map.gate.gateOpenUser}">
+						<c:if test="${not empty gateForm.map.gate.gateOpenUser}">
 							&nbsp;<fmt:message key="label.gate.gate.open.user">
-								<fmt:param value="${GateForm.map.gate.gateOpenUser.firstName} ${GateForm.map.gate.gateOpenUser.lastName}" />
+								<fmt:param value="${gateForm.gate.gateOpenUser.firstName} ${gateForm.gate.gateOpenUser.lastName}" />
 							</fmt:message>
 						</c:if>
 						</strong>