Index: lams_monitoring/conf/language/ApplicationResources.properties =================================================================== diff -u -r5be330617da306520389b76b1ebf51357dfdd8ad -rd6359233b82413b67f4b8eede396f6bf95a9c162 --- lams_monitoring/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 5be330617da306520389b76b1ebf51357dfdd8ad) +++ lams_monitoring/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision d6359233b82413b67f4b8eede396f6bf95a9c162) @@ -1,16 +1,15 @@ # CVS ID: $Id$ # Language strings for the Monitoring classes and screens. Mostly error messages. -label.synch.gate=Synch Gate +label.synch.gate.title=Synch Gate label.permission.gate.title=Permission Gate label.schedule.gate.title=Schedule Gate label.schedule.gate.open.message=Schedule Gate will be opened at: label.schedule.gate.close.message=Schedule Gate will be closed at: -label.description=Description label.gate.you.open.message=Class cannot continue until the gate is opened by you label.gate.gate.open=Gate has been opened label.gate.open=open -label.gate.close=close +label.gate.closed=closed label.gate.waiting.learners={0} out of {1} are waiting in front of the gate. #Page title for monitoring screen Index: lams_monitoring/web/footer.jsp =================================================================== diff -u -r411ed0a4c93b7bc699baee8c66bdc540ec34c7cb -rd6359233b82413b67f4b8eede396f6bf95a9c162 --- lams_monitoring/web/footer.jsp (.../footer.jsp) (revision 411ed0a4c93b7bc699baee8c66bdc540ec34c7cb) +++ lams_monitoring/web/footer.jsp (.../footer.jsp) (revision d6359233b82413b67f4b8eede396f6bf95a9c162) @@ -1,10 +1 @@ - - - - - - - -
- - \ No newline at end of file Index: lams_monitoring/web/gate/gateInfo.jsp =================================================================== diff -u -r5be330617da306520389b76b1ebf51357dfdd8ad -rd6359233b82413b67f4b8eede396f6bf95a9c162 --- lams_monitoring/web/gate/gateInfo.jsp (.../gateInfo.jsp) (revision 5be330617da306520389b76b1ebf51357dfdd8ad) +++ lams_monitoring/web/gate/gateInfo.jsp (.../gateInfo.jsp) (revision d6359233b82413b67f4b8eede396f6bf95a9c162) @@ -21,9 +21,6 @@ - - - Index: lams_monitoring/web/gate/gateStatus.jsp =================================================================== diff -u --- lams_monitoring/web/gate/gateStatus.jsp (revision 0) +++ lams_monitoring/web/gate/gateStatus.jsp (revision d6359233b82413b67f4b8eede396f6bf95a9c162) @@ -0,0 +1,27 @@ +<%-- +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + + +
+ + +
+ Fisheye: Tag d6359233b82413b67f4b8eede396f6bf95a9c162 refers to a dead (removed) revision in file `lams_monitoring/web/gate/openGate.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_monitoring/web/gate/permissionGateContent.jsp =================================================================== diff -u -r5be330617da306520389b76b1ebf51357dfdd8ad -rd6359233b82413b67f4b8eede396f6bf95a9c162 --- lams_monitoring/web/gate/permissionGateContent.jsp (.../permissionGateContent.jsp) (revision 5be330617da306520389b76b1ebf51357dfdd8ad) +++ lams_monitoring/web/gate/permissionGateContent.jsp (.../permissionGateContent.jsp) (revision d6359233b82413b67f4b8eede396f6bf95a9c162) @@ -1,53 +1,55 @@ -<%-- -Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) -License Information: http://lamsfoundation.org/licensing/lams/2.0/ + <%-- + 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 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. + 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - USA + 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA - http://www.gnu.org/licenses/gpl.txt ---%> + 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" %> - - - - - - - - - -
- - - - - - - <%@ include file="gateInfo.jsp" %> - - - <%@ include file="openGate.jsp" %> -
 
 
 
- -
+ + + + + + + + + <%@ include file="gateInfo.jsp" %> + + + + - \ No newline at end of file + + + + + + + + + + +
 

 
 
-
<%@ include file="gateStatus.jsp" %>
+ + + \ No newline at end of file Index: lams_monitoring/web/gate/scheduleGateContent.jsp =================================================================== diff -u -r5be330617da306520389b76b1ebf51357dfdd8ad -rd6359233b82413b67f4b8eede396f6bf95a9c162 --- lams_monitoring/web/gate/scheduleGateContent.jsp (.../scheduleGateContent.jsp) (revision 5be330617da306520389b76b1ebf51357dfdd8ad) +++ lams_monitoring/web/gate/scheduleGateContent.jsp (.../scheduleGateContent.jsp) (revision d6359233b82413b67f4b8eede396f6bf95a9c162) @@ -26,38 +26,31 @@ <%@ taglib uri="tags-fmt" prefix="fmt" %> - - - - - - - -
- - - - - - - <%@ include file="gateInfo.jsp" %> - - - - - - - - - - -
 
 
 
- -
- -
- -
- + + + + + + + <%@ include file="gateInfo.jsp" %> + + + + + + + + + + + + + +
 

 
 
+ +
+ +
<%@ include file="gateStatus.jsp" %>
+ \ No newline at end of file Index: lams_monitoring/web/gate/sychGateContent.jsp =================================================================== diff -u -r5be330617da306520389b76b1ebf51357dfdd8ad -rd6359233b82413b67f4b8eede396f6bf95a9c162 --- lams_monitoring/web/gate/sychGateContent.jsp (.../sychGateContent.jsp) (revision 5be330617da306520389b76b1ebf51357dfdd8ad) +++ lams_monitoring/web/gate/sychGateContent.jsp (.../sychGateContent.jsp) (revision d6359233b82413b67f4b8eede396f6bf95a9c162) @@ -27,28 +27,20 @@ - - - - - - - -
- - - - - - - <%@ include file="gateInfo.jsp" %> - - - <%@ include file="openGate.jsp" %> -
 
 
 
- -
- + + + + + + + <%@ include file="gateInfo.jsp" %> + + + + + +
 

 
 
<%@ include file="gateStatus.jsp" %>
+ Index: lams_monitoring/web/header.jsp =================================================================== diff -u -r613e78cdef0956c171eecca09801ba982b7596cb -rd6359233b82413b67f4b8eede396f6bf95a9c162 --- lams_monitoring/web/header.jsp (.../header.jsp) (revision 613e78cdef0956c171eecca09801ba982b7596cb) +++ lams_monitoring/web/header.jsp (.../header.jsp) (revision d6359233b82413b67f4b8eede396f6bf95a9c162) @@ -19,36 +19,3 @@ http://www.gnu.org/licenses/gpl.txt --%> -<%@ taglib uri="tags-core" prefix="c" %> -<% -String protocol = request.getProtocol(); -if(protocol.startsWith("HTTPS")){ - protocol = "https://"; -}else{ - protocol = "http://"; -} -String pathToRoot = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/"; - -%> - - - - - - - - - - - -
- - - - - [HELP] - - space image -
- - Index: lams_monitoring/web/template/template.jsp =================================================================== diff -u -r613e78cdef0956c171eecca09801ba982b7596cb -rd6359233b82413b67f4b8eede396f6bf95a9c162 --- lams_monitoring/web/template/template.jsp (.../template.jsp) (revision 613e78cdef0956c171eecca09801ba982b7596cb) +++ lams_monitoring/web/template/template.jsp (.../template.jsp) (revision d6359233b82413b67f4b8eede396f6bf95a9c162) @@ -24,17 +24,18 @@ <%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + <tiles:getAsString name="title"/> -