[UniTime-cvs] UniTime/WebContent/user eventGrid.jsp, 1.15, 1.16 courseOfferingEdit.jsp, 1.8, 1.9 instructionalOfferingModify.jsp, 1.14, 1.15 eventAdd.jsp, 1.20, 1.21 schedulingSubpartEdit.jsp, 1.7, 1.8

[Tomas M. <to...@us...>]

Update of /cvsroot/unitime/UniTime/WebContent/user
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv14218/WebContent/user

Modified Files:
	eventGrid.jsp courseOfferingEdit.jsp 
	instructionalOfferingModify.jsp eventAdd.jsp 
	schedulingSubpartEdit.jsp 
Log Message:
Apache Tomcat 7 Compatibility Issues
 - various pages: corrected syntax to meet the new Tomcat 7 validation

Index: eventAdd.jsp
===================================================================
RCS file: /cvsroot/unitime/UniTime/WebContent/user/eventAdd.jsp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** eventAdd.jsp	1 Dec 2010 11:10:47 -0000	1.20
--- eventAdd.jsp	21 Jan 2011 19:13:19 -0000	1.21
***************
*** 298,311 ****
  								<logic:equal name="rf" property="room" value="false">
  								    <bean:define id="rfId" name="rf" property="uniqueId"/>
! 									<html:multibox property="roomTypes" onchange="<%="document.getElementById('nul" + rfId + "').style.display = (this.checked ? null : 'none');"%>" styleId="<%="chnul" + rfId%>">
  										<bean:write name="rf" property="uniqueId"/>
  									</html:multibox>
  									<bean:write name="rf" property="label"/><span id="<%="nul"+rfId%>">:&nbsp;
! 									<html:select name="eventAddForm" property="<%="nonUniversityLocation[" + rfId + "]"%>"
  										onfocus="setUp();" 
      									onkeypress="return selectSearch(event, this);" 
  										onkeydown="return checkKey(event, this);">
  										<html:option value="-1">Select...</html:option>
! 										<html:optionsCollection name="eventAddForm" property="<%="nonUniversityLocations[" + rfId + "]"%>" label="label" value="uniqueId"/>
  									</html:select>
  									</span>
--- 298,312 ----
  								<logic:equal name="rf" property="room" value="false">
  								    <bean:define id="rfId" name="rf" property="uniqueId"/>
! 								    <% String onChange = "document.getElementById('nul" + rfId + "').style.display = (this.checked ? null : 'none');"; %>
! 									<html:multibox property="roomTypes" onchange="<%=onChange%>" styleId='<%="chnul" + rfId%>'>
  										<bean:write name="rf" property="uniqueId"/>
  									</html:multibox>
  									<bean:write name="rf" property="label"/><span id="<%="nul"+rfId%>">:&nbsp;
! 									<html:select name="eventAddForm" property='<%="nonUniversityLocation[" + rfId + "]"%>'
  										onfocus="setUp();" 
      									onkeypress="return selectSearch(event, this);" 
  										onkeydown="return checkKey(event, this);">
  										<html:option value="-1">Select...</html:option>
! 										<html:optionsCollection name="eventAddForm" property='<%="nonUniversityLocations[" + rfId + "]"%>' label="label" value="uniqueId"/>
  									</html:select>
  									</span>

Index: eventGrid.jsp
===================================================================
RCS file: /cvsroot/unitime/UniTime/WebContent/user/eventGrid.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** eventGrid.jsp	1 Dec 2010 11:10:47 -0000	1.15
--- eventGrid.jsp	21 Jan 2011 19:13:19 -0000	1.16
***************
*** 94,107 ****
  								<logic:equal name="rf" property="room" value="false">
  								    <bean:define id="rfId" name="rf" property="uniqueId"/>
! 									<html:multibox property="roomTypes" onchange="<%="document.getElementById('nul" + rfId + "').style.display = (this.checked ? null : 'none');"%>" styleId="<%="chnul" + rfId%>">
  										<bean:write name="rf" property="uniqueId"/>
  									</html:multibox>
  									<bean:write name="rf" property="label"/><span id="<%="nul"+rfId%>">:&nbsp;
! 									<html:select name="eventGridForm" property="<%="nonUniversityLocation[" + rfId + "]"%>"
  										onfocus="setUp();" 
      									onkeypress="return selectSearch(event, this);" 
  										onkeydown="return checkKey(event, this);">
  										<html:option value="-1">Select...</html:option>
! 										<html:optionsCollection name="eventGridForm" property="<%="nonUniversityLocations[" + rfId + "]"%>" label="label" value="uniqueId"/>
  									</html:select>
  									</span>
--- 94,108 ----
  								<logic:equal name="rf" property="room" value="false">
  								    <bean:define id="rfId" name="rf" property="uniqueId"/>
! 								    <% String onChange = "document.getElementById('nul" + rfId + "').style.display = (this.checked ? null : 'none');"; %>
! 									<html:multibox property="roomTypes" onchange="<%=onChange%>" styleId='<%="chnul" + rfId%>'>
  										<bean:write name="rf" property="uniqueId"/>
  									</html:multibox>
  									<bean:write name="rf" property="label"/><span id="<%="nul"+rfId%>">:&nbsp;
! 									<html:select name="eventGridForm" property='<%="nonUniversityLocation[" + rfId + "]"%>'
  										onfocus="setUp();" 
      									onkeypress="return selectSearch(event, this);" 
  										onkeydown="return checkKey(event, this);">
  										<html:option value="-1">Select...</html:option>
! 										<html:optionsCollection name="eventGridForm" property='<%="nonUniversityLocations[" + rfId + "]"%>' label="label" value="uniqueId"/>
  									</html:select>
  									</span>

Index: instructionalOfferingModify.jsp
===================================================================
RCS file: /cvsroot/unitime/UniTime/WebContent/user/instructionalOfferingModify.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** instructionalOfferingModify.jsp	1 Dec 2010 11:10:47 -0000	1.14
--- instructionalOfferingModify.jsp	21 Jan 2011 19:13:19 -0000	1.15
***************
*** 316,320 ****
  						<TD align="left" valign="top" nowrap><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="false" ><html:text name="<%=frmName%>" property='<%= "numberOfRooms[" + ctr + "]" %>' tabindex="<%=java.lang.Integer.toString(8000 + ctr.intValue())%>" maxlength="5" size="3"/></logic:equal><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="true" ><bean:write name="<%=frmName%>" property='<%= "numberOfRooms[" + ctr + "]" %>'/><html:hidden property='<%= "numberOfRooms[" + ctr + "]" %>'/></logic:equal></TD>
  						<TD align="left" valign="top" nowrap><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="false" ><html:select style="width:200;" onfocus="<%= \"setUp(); changeWidth('departments[\" + ctr + \"]', 210)\" %>" onblur="<%= \" changeWidth('departments[\" + ctr + \"]', 200);\" %>" property='<%= "departments[" + ctr + "]" %>' tabindex="<%=java.lang.Integer.toString(10000 + ctr.intValue())%>"><html:option value="-1">Department</html:option><html:options collection='<%=Department.EXTERNAL_DEPT_ATTR_NAME + "list"%>' property="uniqueId" labelProperty="managingDeptLabel" /></html:select></logic:equal><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="true" ><logic:iterate scope="request" name="<%=Department.EXTERNAL_DEPT_ATTR_NAME%>" id="dept"><logic:equal name="<%=frmName%>" property='<%= "departments[" + ctr + "]" %>' value="<%=((Department)dept).getUniqueId().toString()%>"><bean:write name="dept" property="managingDeptLabel" /></logic:equal></logic:iterate><html:hidden property='<%= "departments[" + ctr + "]" %>'/></logic:equal></TD>
! 						<TD align="left" valign="top" nowrap><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="false" ><html:select style="width:100;"  onfocus="<%= \"setUp(); changeWidth('datePatterns[\" + ctr + \"]', 200)\" %>" onblur="<%= \" changeWidth('datePatterns[\" + ctr + \"]', 100);\" %>"property='<%= "datePatterns[" + ctr + "]" %>' tabindex="<%=java.lang.Integer.toString(12000 + ctr.intValue())%>"><html:options collection="<%=DatePattern.DATE_PATTERN_LIST_ATTR%>" property="id" labelProperty="value" /></html:select></logic:equal><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="true" ><logic:equal name="<%=frmName%>" property='<%= "datePatterns[" + ctr + "]"%>' value="">Default</logic:equal><logic:iterate scope="request" name="<%=DatePattern.DATE_PATTERN_LIST_ATTR%>" id="dp"><logic:notEqual name="<%=frmName%>" property='<%= "datePatterns[" + ctr + "]" %>' value=""><logic:equal name="<%=frmName%>" property='<%= "datePatterns[" + ctr + "]" %>' value="<%=((IdValue)dp).getId().toString()%>"><bean:write name="dp" property="value" /></logic:equal></logic:notEqual></logic:iterate><html:hidden property='<%= "datePatterns[" + ctr + "]" %>'/></logic:equal></TD>
  						<TD align="center" valign="top" nowrap><logic:equal name="<%=frmName%>" property="displayDisplayInstructors" value="true" ><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="false" ><html:checkbox name="<%=frmName%>" property='<%= "displayInstructors[" + ctr + "]" %>' tabindex="<%=java.lang.Integer.toString(14000 + ctr.intValue())%>"/></logic:equal><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="true" >					<logic:equal name="<%=frmName%>" property='<%= "displayInstructors[" + ctr + "]" %>' value="true" ><IMG border='0' title='Display all instructors for this class in the schedule book.' alt='true' align='absmiddle' src='images/tick.gif'></logic:equal><html:hidden property='<%= "displayInstructors[" + ctr + "]" %>'/></logic:equal></logic:equal><logic:equal name="<%=frmName%>" property="displayDisplayInstructors" value="false" ><html:hidden property='<%= "displayInstructors[" + ctr + "]" %>'/></logic:equal></TD>
  						<TD align="center" valign="top" nowrap><logic:equal name="<%=frmName%>" property="displayDisplayInSchedule" value="true" ><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="false" ><html:checkbox name="<%=frmName%>" property='<%= "displayInScheduleBooks[" + ctr + "]" %>' tabindex="<%=java.lang.Integer.toString(16000 + ctr.intValue())%>"/></logic:equal><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="true" ><logic:equal name="<%=frmName%>" property='<%= "displayInScheduleBooks[" + ctr + "]" %>' value="true" ><IMG border='0' title='Display this classes in the schedule book.' alt='true' align='absmiddle' src='images/tick.gif'></logic:equal><html:hidden property='<%= "displayInScheduleBooks[" + ctr + "]" %>'/></logic:equal></logic:equal><logic:equal name="<%=frmName%>" property="displayDisplayInSchedule" value="false" ><html:hidden property='<%= "displayInScheduleBooks[" + ctr + "]" %>'/></logic:equal></TD>
--- 316,320 ----
  						<TD align="left" valign="top" nowrap><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="false" ><html:text name="<%=frmName%>" property='<%= "numberOfRooms[" + ctr + "]" %>' tabindex="<%=java.lang.Integer.toString(8000 + ctr.intValue())%>" maxlength="5" size="3"/></logic:equal><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="true" ><bean:write name="<%=frmName%>" property='<%= "numberOfRooms[" + ctr + "]" %>'/><html:hidden property='<%= "numberOfRooms[" + ctr + "]" %>'/></logic:equal></TD>
  						<TD align="left" valign="top" nowrap><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="false" ><html:select style="width:200;" onfocus="<%= \"setUp(); changeWidth('departments[\" + ctr + \"]', 210)\" %>" onblur="<%= \" changeWidth('departments[\" + ctr + \"]', 200);\" %>" property='<%= "departments[" + ctr + "]" %>' tabindex="<%=java.lang.Integer.toString(10000 + ctr.intValue())%>"><html:option value="-1">Department</html:option><html:options collection='<%=Department.EXTERNAL_DEPT_ATTR_NAME + "list"%>' property="uniqueId" labelProperty="managingDeptLabel" /></html:select></logic:equal><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="true" ><logic:iterate scope="request" name="<%=Department.EXTERNAL_DEPT_ATTR_NAME%>" id="dept"><logic:equal name="<%=frmName%>" property='<%= "departments[" + ctr + "]" %>' value="<%=((Department)dept).getUniqueId().toString()%>"><bean:write name="dept" property="managingDeptLabel" /></logic:equal></logic:iterate><html:hidden property='<%= "departments[" + ctr + "]" %>'/></logic:equal></TD>
! 						<TD align="left" valign="top" nowrap><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="false" ><html:select style="width:100;"  onfocus="<%= \"setUp(); changeWidth('datePatterns[\" + ctr + \"]', 200)\" %>" onblur="<%= \" changeWidth('datePatterns[\" + ctr + \"]', 100);\" %>" property='<%= "datePatterns[" + ctr + "]" %>' tabindex="<%=java.lang.Integer.toString(12000 + ctr.intValue())%>"><html:options collection="<%=DatePattern.DATE_PATTERN_LIST_ATTR%>" property="id" labelProperty="value" /></html:select></logic:equal><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="true" ><logic:equal name="<%=frmName%>" property='<%= "datePatterns[" + ctr + "]"%>' value="">Default</logic:equal><logic:iterate scope="request" name="<%=DatePattern.DATE_PATTERN_LIST_ATTR%>" id="dp"><logic:notEqual name="<%=frmName%>" property='<%= "datePatterns[" + ctr + "]" %>' value=""><logic:equal name="<%=frmName%>" property='<%= "datePatterns[" + ctr + "]" %>' value="<%=((IdValue)dp).getId().toString()%>"><bean:write name="dp" property="value" /></logic:equal></logic:notEqual></logic:iterate><html:hidden property='<%= "datePatterns[" + ctr + "]" %>'/></logic:equal></TD>
  						<TD align="center" valign="top" nowrap><logic:equal name="<%=frmName%>" property="displayDisplayInstructors" value="true" ><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="false" ><html:checkbox name="<%=frmName%>" property='<%= "displayInstructors[" + ctr + "]" %>' tabindex="<%=java.lang.Integer.toString(14000 + ctr.intValue())%>"/></logic:equal><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="true" >					<logic:equal name="<%=frmName%>" property='<%= "displayInstructors[" + ctr + "]" %>' value="true" ><IMG border='0' title='Display all instructors for this class in the schedule book.' alt='true' align='absmiddle' src='images/tick.gif'></logic:equal><html:hidden property='<%= "displayInstructors[" + ctr + "]" %>'/></logic:equal></logic:equal><logic:equal name="<%=frmName%>" property="displayDisplayInstructors" value="false" ><html:hidden property='<%= "displayInstructors[" + ctr + "]" %>'/></logic:equal></TD>
  						<TD align="center" valign="top" nowrap><logic:equal name="<%=frmName%>" property="displayDisplayInSchedule" value="true" ><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="false" ><html:checkbox name="<%=frmName%>" property='<%= "displayInScheduleBooks[" + ctr + "]" %>' tabindex="<%=java.lang.Integer.toString(16000 + ctr.intValue())%>"/></logic:equal><logic:equal name="<%=frmName%>" property='<%= "readOnlyClasses[" + ctr + "]" %>' value="true" ><logic:equal name="<%=frmName%>" property='<%= "displayInScheduleBooks[" + ctr + "]" %>' value="true" ><IMG border='0' title='Display this classes in the schedule book.' alt='true' align='absmiddle' src='images/tick.gif'></logic:equal><html:hidden property='<%= "displayInScheduleBooks[" + ctr + "]" %>'/></logic:equal></logic:equal><logic:equal name="<%=frmName%>" property="displayDisplayInSchedule" value="false" ><html:hidden property='<%= "displayInScheduleBooks[" + ctr + "]" %>'/></logic:equal></TD>

Index: courseOfferingEdit.jsp
===================================================================
RCS file: /cvsroot/unitime/UniTime/WebContent/user/courseOfferingEdit.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** courseOfferingEdit.jsp	1 Dec 2010 11:10:47 -0000	1.8
--- courseOfferingEdit.jsp	21 Jan 2011 19:13:19 -0000	1.9
***************
*** 196,200 ****
  				<td nowrap>Fractional Increments Allowed: </td>
  				<td>
! 				<html:checkbox property="fractionalIncrementsAllowed"disabled="<%=(frm.getCreditFormat() != null && frm.getCreditFormat().equals(VariableRangeCreditUnitConfig.CREDIT_FORMAT))?false:true%>"/>
  				</td>
  				</tr>
--- 196,200 ----
  				<td nowrap>Fractional Increments Allowed: </td>
  				<td>
! 				<html:checkbox property="fractionalIncrementsAllowed" disabled="<%=(frm.getCreditFormat() != null && frm.getCreditFormat().equals(VariableRangeCreditUnitConfig.CREDIT_FORMAT))?false:true%>"/>
  				</td>
  				</tr>

Index: schedulingSubpartEdit.jsp
===================================================================
RCS file: /cvsroot/unitime/UniTime/WebContent/user/schedulingSubpartEdit.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** schedulingSubpartEdit.jsp	1 Dec 2010 11:10:47 -0000	1.7
--- schedulingSubpartEdit.jsp	21 Jan 2011 19:13:19 -0000	1.8
***************
*** 213,217 ****
  				<td nowrap>Fractional Increments Allowed: </td>
  				<td>
! 				<html:checkbox property="fractionalIncrementsAllowed"disabled="<%=(frm.getCreditFormat() != null && frm.getCreditFormat().equals(VariableRangeCreditUnitConfig.CREDIT_FORMAT))?false:true%>"/>
  				</td>
  				</tr>
--- 213,217 ----
  				<td nowrap>Fractional Increments Allowed: </td>
  				<td>
! 				<html:checkbox property="fractionalIncrementsAllowed" disabled="<%=(frm.getCreditFormat() != null && frm.getCreditFormat().equals(VariableRangeCreditUnitConfig.CREDIT_FORMAT))?false:true%>"/>
  				</td>
  				</tr>