amyroh 2003/03/27 18:51:07 Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin TableTag.java webapps/admin/resources dataSources.jspf envEntries.jspf mailSessions.jspf resourceLinks.jspf userDatabases.jspf webapps/admin/users groups.jspf roles.jspf users.jspf Log: Accessibility improvement. Change header cells from <td> to <th>. Per the Access Board's guidelines for 508 compliance in the case of Web-based applications, HTML tables should use the scope attribute to indicate the row and column associations for each cell in the table (This needs to be done alongwith marking the header cells using <th> tags instead of <td>) For further details, please see the Access Board Guidelines at http://www.access-board.gov/sec508/guide/1194.22.htm#(g) Revision Changes Path 1.3 +56 -29 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TableTag.java Index: TableTag.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TableTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TableTag.java 23 Jan 2003 00:07:07 -0000 1.2 +++ TableTag.java 28 Mar 2003 02:51:07 -0000 1.3 @@ -244,35 +244,62 @@ String dataStyle = (String) dataStyles.get(i); String styleId = (String) styleIds.get(i); - if (header) + if (header) { out.println("<tr class=\"header-row\" >"); - else out.println("<tr>"); + out.println(" <th scope=\"col\" width=\"27%\"> "); - out.println(" <td width=\"27%\"> "); + out.print(" <div align=\"left\""); + if (labelStyle != null) + out.print( " class=\"" + labelStyle +"\""); + out.print(">"); + if (styleId != null) { + out.print("<label for=\"" + styleId + "\">"); + } + out.print(label); + if (styleId != null) { + out.print("</label>"); + } + out.println(" </div>"); + out.println(" </th>"); - out.print(" <div align=\"left\""); - if (labelStyle != null) - out.print( " class=\"" + labelStyle +"\""); - out.print(">"); - if (styleId != null) { - out.print("<label for=\"" + styleId + "\">"); - } - out.print(label); - if (styleId != null) { - out.print("</label>"); - } - out.println(" </div>"); - out.println(" </td>"); + out.println(" <th scope=\"col\" width=\"73%\"> "); + out.print(" <div align=\"left\"" ); + if (dataStyle != null) + out.print(" class=\"" + dataStyle + "\""); + out.print(">"); + out.print(data); + out.println(" </div>"); + out.print(" </th>"); + out.println("</tr>"); + } else { + out.println("<tr>"); + + out.println(" <td scope=\"row\" width=\"27%\"> "); - out.println(" <td width=\"73%\"> "); - out.print(" <div align=\"left\"" ); - if (dataStyle != null) - out.print(" class=\"" + dataStyle + "\""); - out.print(">"); - out.print(data); - out.println(" </div>"); - out.print(" </td>"); - out.println("</tr>"); + out.print(" <div align=\"left\""); + if (labelStyle != null) + out.print( " class=\"" + labelStyle +"\""); + out.print(">"); + if (styleId != null) { + out.print("<label for=\"" + styleId + "\">"); + } + out.print(label); + if (styleId != null) { + out.print("</label>"); + } + out.println(" </div>"); + out.println(" </td>"); + + out.println(" <td width=\"73%\"> "); + out.print(" <div align=\"left\"" ); + if (dataStyle != null) + out.print(" class=\"" + dataStyle + "\""); + out.print(">"); + out.print(data); + out.println(" </div>"); + out.print(" </td>"); + out.println("</tr>"); + } /* if (!header) { 1.4 +7 -7 jakarta-tomcat-catalina/webapps/admin/resources/dataSources.jspf Index: dataSources.jspf =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/dataSources.jspf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dataSources.jspf 23 Mar 2003 02:10:28 -0000 1.3 +++ dataSources.jspf 28 Mar 2003 02:51:07 -0000 1.4 @@ -11,25 +11,25 @@ </td> </logic:present> - <td width="20%"><div align="left" class="table-header-text"> + <th scope="col" width="20%"><div align="left" class="table-header-text"> <bean:message key="resources.datasrc.jndi"/> - </div></td> - <td><div align="left" class="table-header-text"> + </div></th> + <th scope="col"><div align="left" class="table-header-text"> <bean:message key="resources.datasrc.jdbcclass"/> - </div></td> + </div></th> </tr> <logic:iterate name="dataSourcesForm" property="dataSources" id="dataSource" type="java.lang.String"> <tr class="line-row"> <logic:present name="checkboxes"> - <td><div align="center" class="table-normal-text"> + <td scope="row"><div align="center" class="table-normal-text"> <label for="dataSources"></label> <input type="checkbox" name="dataSources" value="<%= dataSource %>" styleId="dataSources"> </td> </logic:present> - <td><div align="left" class="table-normal-text"> + <td scope="row"><div align="left" class="table-normal-text"> <html:link page='<%= "/resources/setUpDataSource.do?objectName=" + URLEncoder.encode(dataSource) + "&resourcetype=" + URLEncoder.encode(resourcetypeInfo) + "&path="+ @@ -39,7 +39,7 @@ <controls:attribute name="dataSource" attribute="name"/> </html:link> </div></td> - <td><div align="left" class="table-normal-text"> + <td scope="row"><div align="left" class="table-normal-text"> <controls:attribute name="dataSource" attribute="driverClassName"/> </div></td> </tr> 1.4 +7 -7 jakarta-tomcat-catalina/webapps/admin/resources/envEntries.jspf Index: envEntries.jspf =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/envEntries.jspf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- envEntries.jspf 23 Mar 2003 02:10:28 -0000 1.3 +++ envEntries.jspf 28 Mar 2003 02:51:07 -0000 1.4 @@ -11,22 +11,22 @@ </td> </logic:present> - <td width="20%"><div align="left" class="table-header-text"> + <th scope="col" width="20%"><div align="left" class="table-header-text"> <bean:message key="resources.env.entry"/> - </div></td> - <td><div align="left" class="table-header-text"> + </div></th> + <th scope="col"><div align="left" class="table-header-text"> <bean:message key="service.value"/> - </div></td> - <td><div align="left" class="table-header-text"> + </div></th> + <th scop="col"><div align="left" class="table-header-text"> <bean:message key="users.list.description"/> - </div></td> + </div></th> </tr> <logic:iterate name="envEntriesForm" property="envEntries" id="envEntry" type="java.lang.String"> <tr class="line-row"> <logic:present name="checkboxes"> - <td><div align="center" class="table-normal-text"> + <td scope="row"><div align="center" class="table-normal-text"> <label for="envEntries"></label> <input type="checkbox" name="envEntries" value="<%= envEntry %>" styleId="envEntries"> 1.4 +7 -7 jakarta-tomcat-catalina/webapps/admin/resources/mailSessions.jspf Index: mailSessions.jspf =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/mailSessions.jspf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mailSessions.jspf 23 Mar 2003 02:10:28 -0000 1.3 +++ mailSessions.jspf 28 Mar 2003 02:51:07 -0000 1.4 @@ -11,25 +11,25 @@ </td> </logic:present> - <td width="20%"><div align="left" class="table-header-text"> + <th scope="col" width="20%"><div align="left" class="table-header-text"> <bean:message key="resources.mailsession.name"/> - </div></td> - <td><div align="left" class="table-header-text"> + </div></th> + <th scope="col"><div align="left" class="table-header-text"> <bean:message key="resources.mailsession.mailhost"/> - </div></td> + </div></th> </tr> <logic:iterate name="mailSessionsForm" property="mailSessions" id="mailSession" type="java.lang.String"> <tr class="line-row"> <logic:present name="checkboxes"> - <td><div align="center" class="table-normal-text"> + <td scope="row"><div align="center" class="table-normal-text"> <label for="mailSessions"></label> <input type="checkbox" name="mailSessions" value="<%= mailSession %>" styleId="mailSessions"> </td> </logic:present> - <td><div align="left" class="table-normal-text"> + <td scope="row"><div align="left" class="table-normal-text"> <html:link page='<%= "/resources/setUpMailSession.do?objectName=" + URLEncoder.encode(mailSession) + "&resourcetype=" + URLEncoder.encode(resourcetypeInfo) + "&path="+ @@ -39,7 +39,7 @@ <controls:attribute name="mailSession" attribute="name"/> </html:link> </div></td> - <td><div align="left" class="table-normal-text"> + <td scope="row"><div align="left" class="table-normal-text"> <controls:attribute name="mailSession" attribute="mail.smtp.host"/> </div></td> </tr> 1.4 +7 -7 jakarta-tomcat-catalina/webapps/admin/resources/resourceLinks.jspf Index: resourceLinks.jspf =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/resourceLinks.jspf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- resourceLinks.jspf 23 Mar 2003 02:10:28 -0000 1.3 +++ resourceLinks.jspf 28 Mar 2003 02:51:07 -0000 1.4 @@ -11,24 +11,24 @@ </td> </logic:present> - <td width="20%"><div align="left" class="table-header-text"> + <th scope="col" width="20%"><div align="left" class="table-header-text"> <bean:message key="resources.resourcelk.name"/> - </div></td> - <td><div align="left" class="table-header-text"> + </div></th> + <th scope="col"><div align="left" class="table-header-text"> <bean:message key="resources.resourcelk.global"/> - </div></td> + </div></th> </tr> <logic:iterate name="resourceLinksForm" property="resourceLinks" id="resourceLink" type="java.lang.String"> <tr class="line-row"> <logic:present name="checkboxes"> - <td><div align="center" class="table-normal-text"> + <td scope="row"><div align="center" class="table-normal-text"> <label for="resourceLinks"></label> <input type="checkbox" name="resourceLinks" value="<%= resourceLink %>" styleId="resourceLinks"> </td> </logic:present> - <td><div align="left" class="table-normal-text"> + <td scope="row"><div align="left" class="table-normal-text"> <html:link page='<%= "/resources/setUpResourceLink.do?objectName=" + URLEncoder.encode(resourceLink) + "&resourcetype=" + URLEncoder.encode(resourcetypeInfo) + "&path="+ @@ -38,7 +38,7 @@ <controls:attribute name="resourceLink" attribute="name"/> </html:link> </div></td> - <td><div align="left" class="table-normal-text"> + <td scope="row"><div align="left" class="table-normal-text"> <controls:attribute name="resourceLink" attribute="global"/> </div></td> </tr> 1.4 +10 -10 jakarta-tomcat-catalina/webapps/admin/resources/userDatabases.jspf Index: userDatabases.jspf =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/userDatabases.jspf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- userDatabases.jspf 26 Mar 2003 08:05:20 -0000 1.3 +++ userDatabases.jspf 28 Mar 2003 02:51:07 -0000 1.4 @@ -11,29 +11,29 @@ </td> </logic:present> - <td width="20%"><div align="left" class="table-header-text"> + <th scope="col" width="20%"><div align="left" class="table-header-text"> <bean:message key="service.name"/> - </div></td> + </div></th> <%-- - <td><div align="left" class="table-header-text"> + <th scope="col"><div align="left" class="table-header-text"> <bean:message key="resources.userdb.location"/> - </div></td> + </div></th> --%> - <td><div align="left" class="table-header-text"> + <th scope="col"><div align="left" class="table-header-text"> <bean:message key="users.list.description"/> - </div></td> + </div></th> </tr> <logic:iterate name="userDatabasesForm" property="userDatabases" id="userDatabase" type="java.lang.String"> <tr class="line-row"> <logic:present name="checkboxes"> - <td><div align="center" class="table-normal-text"> + <td scope="row"><div align="center" class="table-normal-text"> <label for="userDatabases"></label> <input type="checkbox" name="userDatabases" value="<%= userDatabase %>" styleId="userDatabases"> </td> </logic:present> - <td><div align="left" class="table-normal-text"> + <td scope="row"><div align="left" class="table-normal-text"> <html:link page='<%= "/resources/setUpUserDatabase.do?objectName=" + URLEncoder.encode(userDatabase) + "&domain=" + URLEncoder.encode(domainInfo) %>'> @@ -41,11 +41,11 @@ </html:link> </div></td> <%-- FIX ME -- commentred out for now as the page was looking too crowded. - <td><div align="left" class="table-normal-text"> + <td scope="row"><div align="left" class="table-normal-text"> <controls:attribute name="userDatabase" attribute="pathname"/> </div></td> --%> - <td><div align="left" class="table-normal-text"> + <td scope="row"><div align="left" class="table-normal-text"> <controls:attribute name="userDatabase" attribute="description"/> </div></td> </tr> 1.3 +9 -9 jakarta-tomcat-catalina/webapps/admin/users/groups.jspf Index: groups.jspf =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/groups.jspf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- groups.jspf 23 Jan 2003 00:07:10 -0000 1.2 +++ groups.jspf 28 Mar 2003 02:51:07 -0000 1.3 @@ -7,22 +7,22 @@ cellspacing="0" cellpadding="0" width="100%"> <tr class="header-row"> <logic:present name="checkboxes"> - <td width="5%"><div align="left" class="table-header-text"> + <th scope="col" width="5%"><div align="left" class="table-header-text"> - </td> + </th> </logic:present> - <td width="20%"><div align="left" class="table-header-text"> + <th scope="col" width="20%"><div align="left" class="table-header-text"> <bean:message key="users.list.groupname"/> - </div></td> - <td><div align="left" class="table-header-text"> + </div></th> + <th scope="col"><div align="left" class="table-header-text"> <bean:message key="users.list.description"/> - </div></td> + </div></th> </tr> <logic:iterate name="groupsForm" property="groups" id="group" type="java.lang.String"> <tr class="line-row"> <logic:present name="checkboxes"> - <td><div align="center" class="table-normal-text"> + <td scope="row"><div align="center" class="table-normal-text"> <logic:present name="userForm"> <label for="groups"></label> <html:multibox property="groups" value="<%= group %>" styleId="groups"/> @@ -34,7 +34,7 @@ </logic:notPresent> </td> </logic:present> - <td><div align="left" class="table-normal-text"> + <td scope="row"><div align="left" class="table-normal-text"> <html:link page='<%= "/users/setUpGroup.do?objectName=" + URLEncoder.encode(group) + "&databaseName=" + @@ -42,7 +42,7 @@ <controls:attribute name="group" attribute="groupname"/> </html:link> </div></td> - <td><div align="left" class="table-normal-text"> + <td scope="row"><div align="left" class="table-normal-text"> <controls:attribute name="group" attribute="description"/> </div></td> </tr> 1.3 +7 -7 jakarta-tomcat-catalina/webapps/admin/users/roles.jspf Index: roles.jspf =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/roles.jspf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- roles.jspf 23 Jan 2003 00:07:10 -0000 1.2 +++ roles.jspf 28 Mar 2003 02:51:07 -0000 1.3 @@ -11,18 +11,18 @@ </td> </logic:present> - <td width="20%"><div align="left" class="table-header-text"> + <th scope="col" width="20%"><div align="left" class="table-header-text"> <bean:message key="users.list.rolename"/> - </div></td> - <td><div align="left" class="table-header-text"> + </div></th> + <th scope="col"><div align="left" class="table-header-text"> <bean:message key="users.list.description"/> - </div></td> + </div></th> </tr> <logic:iterate name="rolesForm" property="roles" id="role" type="java.lang.String"> <tr class="line-row"> <logic:present name="checkboxes"> - <td><div align="center" class="table-normal-text"> + <td scope="row"><div align="center" class="table-normal-text"> <logic:present name="groupForm"> <label for="roles"></label> <html:multibox property="roles" value="<%= role %>" styleId="roles"/> @@ -40,7 +40,7 @@ </logic:notPresent> </td> </logic:present> - <td><div align="left" class="table-normal-text"> + <td scope="row"><div align="left" class="table-normal-text"> <html:link page='<%= "/users/setUpRole.do?objectName=" + URLEncoder.encode(role) + "&databaseName=" + @@ -48,7 +48,7 @@ <controls:attribute name="role" attribute="rolename"/> </html:link> </div></td> - <td><div align="left" class="table-normal-text"> + <td scope="row"><div align="left" class="table-normal-text"> <controls:attribute name="role" attribute="description"/> </div></td> </tr> 1.3 +7 -7 jakarta-tomcat-catalina/webapps/admin/users/users.jspf Index: users.jspf =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/users.jspf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- users.jspf 23 Jan 2003 00:07:10 -0000 1.2 +++ users.jspf 28 Mar 2003 02:51:07 -0000 1.3 @@ -11,24 +11,24 @@ </td> </logic:present> - <td width="20%"><div align="left" class="table-header-text"> + <th scope="col" width="20%"><div align="left" class="table-header-text"> <bean:message key="users.list.username"/> - </div></td> - <td><div align="left" class="table-header-text"> + </div></th> + <th scope="col"><div align="left" class="table-header-text"> <bean:message key="users.list.fullName"/> - </div></td> + </div></th> </tr> <logic:iterate name="usersForm" property="users" id="user" type="java.lang.String"> <tr class="line-row"> <logic:present name="checkboxes"> - <td><div align="center" class="table-normal-text"> + <td scope="row"><div align="center" class="table-normal-text"> <label for="users"></label> <input type="checkbox" name="users" value="<%= user %>" styleId="users"> </td> </logic:present> - <td><div align="left" class="table-normal-text"> + <td scope="row"><div align="left" class="table-normal-text"> <html:link page='<%= "/users/setUpUser.do?objectName=" + URLEncoder.encode(user) + "&databaseName=" + @@ -36,7 +36,7 @@ <controls:attribute name="user" attribute="username"/> </html:link> </div></td> - <td><div align="left" class="table-normal-text"> + <td scope="row"><div align="left" class="table-normal-text"> <controls:attribute name="user" attribute="fullName"/> </div></td> </tr>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]