Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.20 -r1.21
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	30 Oct 2008 04:28:28 -0000	1.20
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	31 Oct 2008 05:51:27 -0000	1.21
@@ -76,6 +76,7 @@
 label.gate.list.all.learners  =Forbidden to pass
 label.gate.list.waiting.learners  =Waiting in front of the gate
 label.gate.list.allowed.learners  =Allowed to pass
+label.gate.list.have.not.met.conditions.learners=Have not met conditions
+message.gate.condition.force.pass=Note: This will allow all learners to pass regardless of the specified conditions.
 
-
 #======= End labels: Exported 70 labels for en AU =====
Index: lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.20 -r1.21
--- lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	30 Oct 2008 04:28:28 -0000	1.20
+++ lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	31 Oct 2008 05:51:27 -0000	1.21
@@ -76,6 +76,7 @@
 label.gate.list.all.learners  =Forbidden to pass
 label.gate.list.waiting.learners  =Waiting in front of the gate
 label.gate.list.allowed.learners  =Allowed to pass
+label.gate.list.have.not.met.conditions.learners=Have not met conditions
+message.gate.condition.force.pass=Note: This will allow all learners to pass regardless of the specified conditions.
 
-
 #======= End labels: Exported 70 labels for en AU =====
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java,v
diff -u -r1.21 -r1.22
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java	30 Oct 2008 03:14:17 -0000	1.21
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java	31 Oct 2008 05:51:27 -0000	1.22
@@ -268,17 +268,17 @@
 	    return mapping.findForward(GateAction.VIEW_SYNCH_GATE);
 	} else if (gate.isScheduleGate()) {
 	    return viewScheduleGate(mapping, gateForm, (ScheduleGateActivity) gate);
-	} else if (gate.isConditionGate()) {
-	    gateForm.set("allowedToPassLearnerList", gate.getAllowedToPassLearners());
-	    gateForm.set(GateAction.READ_ONLY, Boolean.TRUE);
-	    return mapping.findForward(GateAction.VIEW_CONDITION_GATE);
-	} else if (gate.isPermissionGate() || gate.isSystemGate()) {
+	} else if (gate.isPermissionGate() || gate.isSystemGate() || gate.isConditionGate()) {
 	    gateForm.set("waitingLearnerList", waitingLearnersList);
 	    gateForm.set("allowedToPassLearnerList", gate.getAllowedToPassLearners());
 	    Collection<User> forbiddenUsers = learnerService.getLearnersForGate(gate);
 	    forbiddenUsers.removeAll(gate.getAllowedToPassLearners());
 	    gateForm.set("forbiddenLearnerList", forbiddenUsers);
-	    return mapping.findForward(GateAction.VIEW_PERMISSION_GATE);
+	    if (gate.isConditionGate()) {
+		return mapping.findForward(GateAction.VIEW_CONDITION_GATE);
+	    } else {
+		return mapping.findForward(GateAction.VIEW_PERMISSION_GATE);
+	    }
 	} else {
 	    throw new MonitoringServiceException("Invalid gate activity. " + "gate id [" + gate.getActivityId()
 		    + "] - the type [" + gate.getActivityTypeId() + "] is not a gate type");
Index: lams_monitoring/web/gate/conditionGateContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/gate/conditionGateContent.jsp,v
diff -u -r1.1 -r1.2
--- lams_monitoring/web/gate/conditionGateContent.jsp	16 Sep 2008 03:18:14 -0000	1.1
+++ lams_monitoring/web/gate/conditionGateContent.jsp	31 Oct 2008 05:51:27 -0000	1.2
@@ -24,16 +24,86 @@
 	<%@ taglib uri="tags-logic" prefix="logic" %>
 	<%@ taglib uri="tags-core" prefix="c" %>		
 	<%@ taglib uri="tags-fmt" prefix="fmt" %>
-
+	<script type="text/javascript">
+		function onSubmitForm(){
+			var select = document.getElementById(document.pressed);
+			if (select.selectedIndex==-1){
+				return false;
+			}
+			else {
+				document.getElementById("userId").value=select.options[select.selectedIndex].value;
+				return true;
+			}
+		}
+	</script>
 	<div id="content">
 		<h1><fmt:message key="label.condition.gate.title"/></h1>
 		
 		<%@ include file="gateInfo.jsp" %>
+		<c:if test="${not GateForm.map.gate.gateOpen and not GateForm.map.readOnly}" >
+			<p><fmt:message key="label.gate.you.open.message"/><br />
+			   <fmt:message key="message.gate.condition.force.pass" /></p>
+		</c:if>
 		
-		<p><fmt:message key="label.gate.list.allowed.learners"/></p>
-		<select style="width: 160px" size="10" disabled="disabled">
-			<c:forEach var="learner" items="${GateForm.map.allowedToPassLearnerList}">
-				<option>${learner.lastName} ${learner.firstName}</option>
-			</c:forEach>
-		</select>
+		<%@ include file="gateStatus.jsp" %>
+		<c:if test="${not GateForm.map.gate.gateOpen}" >
+			<hr />
+			<c:if test="${not GateForm.map.readOnly}" >
+				<p><fmt:message key="label.gate.open.single.learner"/></p>
+			</c:if>
+			<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:if test="${GateForm.map.readOnly}" >
+							 disabled="disabled"
+						</c:if>
+						>
+							<c:forEach var="learner" items="${GateForm.map.forbiddenLearnerList}">
+								<option value="${learner.userId}">${learner.lastName} ${learner.firstName}</option>
+							</c:forEach>
+						</select>
+					</td >
+					<td width="33%">
+						<select style="width: 160px"  id="waiting" name="waiting" size="10"
+						<c:if test="${GateForm.map.readOnly}" >
+							 disabled="disabled"
+						</c:if>
+						>
+							<c:forEach var="learner" items="${GateForm.map.waitingLearnerList}">
+								<option value="${learner.userId}">${learner.lastName} ${learner.firstName}</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>${learner.lastName} ${learner.firstName}</option>
+							</c:forEach>
+						</select>
+					</td>
+				</tr>
+				<c:if test="${not GateForm.map.readOnly}" >	
+					<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>
+				</c:if>
+			</table>
+			</html:form>
+		</c:if>
 	</div>  <!--closes content-->
\ No newline at end of file