You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by am...@apache.org on 2003/01/23 01:07:11 UTC
cvs commit: jakarta-tomcat-catalina/webapps/admin/valve accessLogValve.jsp remoteAddrValve.jsp remoteHostValve.jsp requestDumperValve.jsp singleSignOnValve.jsp valves.jsp
amyroh 2003/01/22 16:07:10
Modified: webapps/admin banner.jsp index.jsp login.jsp
webapps/admin/WEB-INF controls.tld
webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ActionsTag.java ApplicationResources_en.properties
ApplicationResources_es.properties RowTag.java
TableTag.java
webapps/admin/connector connector.jsp connectors.jsp
webapps/admin/context context.jsp contexts.jsp
webapps/admin/defaultcontext defaultcontext.jsp
webapps/admin/host alias.jsp aliases.jsp host.jsp hosts.jsp
webapps/admin/logger logger.jsp loggers.jsp
webapps/admin/realm jdbcRealm.jsp jndiRealm.jsp
memoryRealm.jsp realms.jsp userDatabaseRealm.jsp
webapps/admin/resources dataSource.jsp dataSources.jspf
envEntries.jspf envEntry.jsp listDataSources.jspf
listEnvEntries.jspf listMailSessions.jspf
listResourceLinks.jspf listUserDatabases.jspf
mailSession.jsp mailSessions.jspf resourceLink.jsp
resourceLinks.jspf userDatabase.jsp
userDatabases.jspf
webapps/admin/server server.jsp
webapps/admin/service service.jsp services.jsp
webapps/admin/users group.jsp groups.jspf listGroups.jspf
listRoles.jspf listUsers.jspf role.jsp roles.jspf
user.jsp users.jspf
webapps/admin/valve accessLogValve.jsp remoteAddrValve.jsp
remoteHostValve.jsp requestDumperValve.jsp
singleSignOnValve.jsp valves.jsp
Log:
Improve accessibility for tomcat 5 admin.
Revision Changes Path
1.3 +1 -1 jakarta-tomcat-catalina/webapps/admin/banner.jsp
Index: banner.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/banner.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- banner.jsp 24 Jul 2002 20:57:25 -0000 1.2
+++ banner.jsp 23 Jan 2003 00:07:07 -0000 1.3
@@ -18,7 +18,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="left" valign="middle">
- <div class="masthead-title-text" align="left"><img src="images/TomcatBanner.jpg" height="120"></div>
+ <div class="masthead-title-text" align="left"><img src="images/TomcatBanner.jpg" alt="Tomcat Web Server Administration Tool" height="120"></div>
</td>
<form method='post' action='/admin/commitChanges.do' target='_self'>
<td align="right" valign="middle">
1.3 +3 -3 jakarta-tomcat-catalina/webapps/admin/index.jsp
Index: index.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/index.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.jsp 24 Jul 2002 20:57:25 -0000 1.2
+++ index.jsp 23 Jan 2003 00:07:07 -0000 1.3
@@ -13,10 +13,10 @@
<!-- Body -->
<frameset rows="117,685*" cols="*" frameborder="NO" border="3" framespacing="3">
- <frame name="banner" src='<%= response.encodeURL("banner.jsp") %>' scrolling="no">
+ <frame name="banner" src='<%= response.encodeURL("banner.jsp") %>' scrolling="no" title="commit and logout banner">
<frameset cols="300,*" frameborder="YES" border="2">
- <frame name="tree" src='<%= response.encodeURL("setUpTree.do") %>' scrolling="auto">
- <frame name="content" src='<%= response.encodeURL("blank.jsp") %>' scrolling="auto">
+ <frame name="tree" src='<%= response.encodeURL("setUpTree.do") %>' scrolling="auto" title="application navigation tree">
+ <frame name="content" src='<%= response.encodeURL("blank.jsp") %>' scrolling="auto" title="content editing">
</frameset>
</frameset>
1.3 +5 -5 jakarta-tomcat-catalina/webapps/admin/login.jsp
Index: login.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/login.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- login.jsp 24 Jul 2002 20:57:25 -0000 1.2
+++ login.jsp 23 Jan 2003 00:07:07 -0000 1.3
@@ -38,7 +38,7 @@
<tr>
<!-- banner -->
<td height="183">
- <div align="center"><img src="images/Login.jpg" width="490" height="228"></div>
+ <div align="center"><img src="images/Login.jpg" alt="Tomcat Web Server Administration Tool" width="490" height="228"></div>
</td>
</tr>
@@ -48,19 +48,19 @@
<table width="100%" border="0" cellspacing="2" cellpadding="5">
<tr>
<th align="right">
- <font color="#FFFFFF"><bean:message key="prompt.username"/></font>
+ <font color="#FFFFFF"><label for="username"><bean:message key="prompt.username"/></label></font>
</th>
<td align="left">
- <input type="text" name="j_username" size="16" maxlength="16"/>
+ <input type="text" name="j_username" size="16" maxlength="16" id="username"/>
</td>
</tr>
<p>
<tr>
<th align="right">
- <font color="#FFFFFF"><bean:message key="prompt.password"/></font>
+ <font color="#FFFFFF"><label for="password"><bean:message key="prompt.password"/></label></font>
</th>
<td align="left">
- <input type="password" name="j_password" size="16" maxlength="16"/>
+ <input type="password" name="j_password" size="16" maxlength="16" id="password"/>
</td>
</tr>
1.3 +18 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/controls.tld
Index: controls.tld
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/controls.tld,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- controls.tld 28 Dec 2002 04:24:09 -0000 1.2
+++ controls.tld 23 Jan 2003 00:07:07 -0000 1.3
@@ -105,6 +105,15 @@
</description>
</attribute>
+ <attribute>
+ <name>styleId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <description>
+ The styleId for the label table data element.
+ </description>
+ </attribute>
+
</tag>
<tag>
@@ -176,6 +185,15 @@
</description>
</attribute>
+ <attribute>
+ <name>label</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <description>
+ HTML Label tag generation.
+ </description>
+ </attribute>
+
</tag>
<tag>
1.2 +34 -8 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java
Index: ActionsTag.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ActionsTag.java 18 Jul 2002 16:48:21 -0000 1.1
+++ ActionsTag.java 23 Jan 2003 00:07:07 -0000 1.2
@@ -163,9 +163,22 @@
}
- // --------------------------------------------------------- Public Methods
+ /**
+ * HTML Label tag text.
+ */
+ protected String label = null;
+
+ public String getLabel() {
+ return (this.label);
+ }
+
+ public void setLabel(String label) {
+ this.label = label;
+ }
+ // --------------------------------------------------------- Public Methods
+
public int doStartTag() throws JspException {
this.labels.clear();
@@ -173,10 +186,10 @@
this.urls.clear();
return (EVAL_BODY_TAG);
-
+
}
-
-
+
+
/**
* Render this instant actions control.
*
@@ -205,6 +218,13 @@
pageContext.setAttribute(FUNCTION_TAG, Boolean.TRUE);
}
+ // Render LABEL element for section 508 accessibility
+
+ if (label != null) {
+ out.print("<label for=\"labelId\">");
+ out.print(label);
+ out.println("</label>");
+ }
// Render the beginning of this element
out.println();
out.print("<select");
@@ -218,6 +238,12 @@
out.print(style);
out.print("\"");
}
+ if (label != null) {
+ out.print(" id=\"");
+ out.print("labelId");
+ out.print("\"");
+ }
+
out.print(" onchange=\"IA_jumpMenu('self',this)\"");
out.println(">");
1.8 +3 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
Index: ApplicationResources_en.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ApplicationResources_en.properties 10 Dec 2002 20:43:54 -0000 1.7
+++ ApplicationResources_en.properties 23 Jan 2003 00:07:07 -0000 1.8
@@ -147,6 +147,7 @@
context.override=Override
context.path=Path
context.reloadable=Reloadable
+context.swallowOutput=Swallow Output
context.usenaming=Use Naming
context.workdir=Working Directory
context.loader.properties=Loader Properties
@@ -235,6 +236,7 @@
realm.user.roleName=User Role Name
realm.pattern=Role Search Pattern
realm.role.subtree=Search Role Subtree
+realm.userBase=User Base Element
realm.user.subtree=Search User Subtree
realm.userPassword=User Password
realm.userPattern=User Pattern
@@ -268,6 +270,7 @@
error.digest.required=<li>Digest algorithm is required.</li>
error.roleBase.required=<li>Role base element is required.</li>
error.rolePattern.required=<li>Role search pattern is required.</li>
+error.userBase.required=<li>User base element is required.</li>
error.userPassword.required=<li>User Password is required.</li>
error.userPattern.required=<li>User pattern is required.</li>
error.userSearch.required=<li>User search is required.</li>
1.8 +3 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
Index: ApplicationResources_es.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ApplicationResources_es.properties 10 Dec 2002 20:43:54 -0000 1.7
+++ ApplicationResources_es.properties 23 Jan 2003 00:07:07 -0000 1.8
@@ -148,6 +148,7 @@
context.override=Invalidaci\u00f3n
context.path=Camino
context.reloadable=Reloadable
+context.swallowOutput=Salida Del Trago
context.usenaming=Utilice El Nombramiento
context.workdir=Directorio De Trabajo
context.loader.properties=Propiedades del cargador
@@ -234,6 +235,7 @@
realm.user.roleName=User Role Name
realm.pattern=Modelo De la Busqueda Del Papel
realm.role.subtree=Search Role Subtree
+realm.userBase=User Base Element
realm.user.subtree=Search User Subtree
realm.userPassword=Palabra de paso Del Utilizador
realm.userPattern=User Pattern
@@ -267,6 +269,7 @@
error.digest.required=<li>Se requiere el algoritmo del digest</li>
error.roleBase.required=<li>Se requiere el elemento bajo del papel.</li>
error.rolePattern.required=<li>Se requiere el modelo de la busqueda del papel.</li>
+error.userBase.required=<li>Se requiere el elemento bajo del usuario.</li>
error.userPassword.required=<li>Se requiere la palabra de paso del utilizador.</li>
error.userPattern.required=<li>Se requiere el patr=n del usuario.</li>
error.userSearch.required=<li>Se requiere la b+squeda del usuario.</li>
1.2 +20 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/RowTag.java
Index: RowTag.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/RowTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RowTag.java 18 Jul 2002 16:48:22 -0000 1.1
+++ RowTag.java 23 Jan 2003 00:07:07 -0000 1.2
@@ -153,7 +153,21 @@
public void setdataStyle(String dataStyle) {
this.dataStyle = dataStyle;
}
+
+ /**
+ * The styleId for the label.
+ */
+ protected String styleId = null;
+
+ public String getStyleId() {
+ return (this.styleId);
+ }
+ public void setStyleId(String styleId) {
+ this.styleId = styleId;
+ }
+
+
// --------------------------------------------------------- Public Methods
@@ -203,7 +217,7 @@
// this row
HttpServletResponse response =
(HttpServletResponse) pageContext.getResponse();
- table.addRow(header, label, data, labelStyle, dataStyle);
+ table.addRow(header, label, data, labelStyle, dataStyle, styleId);
return (EVAL_PAGE);
@@ -222,6 +236,7 @@
this.data = null;
this.labelStyle = null;
this.dataStyle = null;
+ this.styleId = null;
}
1.2 +25 -10 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TableTag.java 18 Jul 2002 16:48:21 -0000 1.1
+++ TableTag.java 23 Jan 2003 00:07:07 -0000 1.2
@@ -138,6 +138,11 @@
*/
protected ArrayList headers = new ArrayList();
+ /**
+ * The set of styleIds for the rows displayed by this control.
+ */
+ protected ArrayList styleIds = new ArrayList();
+
// ------------------------------------------------------------- Properties
@@ -187,18 +192,19 @@
public int doStartTag() throws JspException {
-
+
this.headers.clear();
this.labels.clear();
this.datas.clear();
this.labelStyles.clear();
this.dataStyles.clear();
-
+ this.styleIds.clear();
+
return (EVAL_BODY_TAG);
+
+ }
- }
-
-
+
/**
* Render this instant actions control.
*
@@ -236,6 +242,7 @@
String data = (String) datas.get(i);
String labelStyle = (String) labelStyles.get(i);
String dataStyle = (String) dataStyles.get(i);
+ String styleId = (String) styleIds.get(i);
if (header)
out.println("<tr class=\"header-row\" >");
@@ -247,7 +254,13 @@
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>");
@@ -298,6 +311,7 @@
this.columns = 2;
this.tableStyle = null;
this.lineStyle = null;
+ this.styleIds.clear();
}
@@ -314,13 +328,14 @@
*/
void addRow(boolean header, String label, String data,
- String labelStyle, String dataStyle) {
+ String labelStyle, String dataStyle, String styleId) {
headers.add(new Boolean(header));
labels.add(label);
datas.add(data);
labelStyles.add(labelStyle);
dataStyles.add(dataStyle);
+ styleIds.add(styleId);
}
1.4 +35 -35 jakarta-tomcat-catalina/webapps/admin/connector/connector.jsp
Index: connector.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/connector/connector.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- connector.jsp 10 Dec 2002 20:43:54 -0000 1.3
+++ connector.jsp 23 Jan 2003 00:07:08 -0000 1.4
@@ -39,9 +39,9 @@
</logic:equal>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Connector Actions">
<controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
<logic:notEqual name="connectorForm" property="adminAction" value="Create">
@@ -71,11 +71,11 @@
<controls:data> </controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="connectorType">
<controls:label><bean:message key="connector.type"/>:</controls:label>
<controls:data>
<logic:equal name="connectorForm" property="adminAction" value="Create">
- <html:select property="connectorType" onchange="IA_jumpMenu('self',this)">
+ <html:select property="connectorType" onchange="IA_jumpMenu('self',this)" styleId="connectorType">
<bean:define id="connectorTypeVals" name="connectorForm" property="connectorTypeVals"/>
<html:options collection="connectorTypeVals" property="value" labelProperty="label"/>
</html:select>
@@ -96,25 +96,25 @@
</controls:row>
</logic:notEqual>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="acceptCount">
<controls:label><bean:message key="connector.accept.count"/>:</controls:label>
<controls:data>
- <html:text property="acceptCountText" size="5" maxlength="5"/>
+ <html:text property="acceptCountText" size="5" maxlength="5" styleId="acceptCount"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="timeout">
<controls:label><bean:message key="connector.connection.timeout"/><br>
(<bean:message key="connector.milliseconds"/>) :</controls:label>
<controls:data>
- <html:text property="connTimeOutText" size="10"/>
+ <html:text property="connTimeOutText" size="10" styleId="timeout"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debuglevel">
<controls:label><bean:message key="server.debuglevel"/>:</controls:label>
<controls:data>
- <html:select property="debugLvl">
+ <html:select property="debugLvl" styleId="debuglevel">
<bean:define id="debugLvlVals" name="connectorForm" property="debugLvlVals"/>
<html:options collection="debugLvlVals" property="value"
labelProperty="label"/>
@@ -122,17 +122,17 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="buffersize">
<controls:label><bean:message key="connector.default.buffer"/>:</controls:label>
<controls:data>
- <html:text property="bufferSizeText" size="5"/>
+ <html:text property="bufferSizeText" size="5" styleId="buffersize"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="enableDNS">
<controls:label><bean:message key="connector.enable.dns"/>:</controls:label>
<controls:data>
- <html:select property="enableLookups">
+ <html:select property="enableLookups" styleId="enableDNS">
<bean:define id="booleanVals" name="connectorForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -141,11 +141,11 @@
</controls:row>
<%-- Input only allowed on create transaction --%>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="address">
<controls:label><bean:message key="connector.address.ip"/>:</controls:label>
<controls:data>
<logic:equal name="connectorForm" property="adminAction" value="Create">
- <html:text property="address" size="20"/>
+ <html:text property="address" size="20" styleId="address"/>
</logic:equal>
<logic:equal name="connectorForm" property="adminAction" value="Edit">
<bean:write name="connectorForm" property="address"/>
@@ -160,11 +160,11 @@
</controls:row>
<%-- Input only allowed on create transaction --%>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="portnumber">
<controls:label><bean:message key="server.portnumber"/>:</controls:label>
<controls:data>
<logic:equal name="connectorForm" property="adminAction" value="Create">
- <html:text property="portText" size="5"/>
+ <html:text property="portText" size="5" styleId="portnumer"/>
</logic:equal>
<logic:equal name="connectorForm" property="adminAction" value="Edit">
<bean:write name="connectorForm" property="portText"/>
@@ -173,10 +173,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="redirectport">
<controls:label><bean:message key="connector.redirect.portnumber"/>:</controls:label>
<controls:data>
- <html:text property="redirectPortText" size="5"/>
+ <html:text property="redirectPortText" size="5" styleId="redirectport"/>
</controls:data>
</controls:row>
@@ -185,17 +185,17 @@
<controls:data> </controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="minProcessor">
<controls:label><bean:message key="connector.min"/>:</controls:label>
<controls:data>
- <html:text property="minProcessorsText" size="5"/>
+ <html:text property="minProcessorsText" size="5" styleId="minProcessor"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="connectorMax">
<controls:label><bean:message key="connector.max"/>:</controls:label>
<controls:data>
- <html:text property="maxProcessorsText" size="5"/>
+ <html:text property="maxProcessorsText" size="5" styleId="connectorMax"/>
</controls:data>
</controls:row>
@@ -207,17 +207,17 @@
<controls:data> </controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="proxyName">
<controls:label><bean:message key="connector.proxy.name"/>:</controls:label>
<controls:data>
- <html:text property="proxyName" size="30"/>
+ <html:text property="proxyName" size="30" styleId="proxyName"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="portNumber">
<controls:label><bean:message key="connector.proxy.portnumber"/>:</controls:label>
<controls:data>
- <html:text property="proxyPortText" size="5"/>
+ <html:text property="proxyPortText" size="5" styleId="portNumber"/>
</controls:data>
</controls:row>
</logic:notEqual>
@@ -231,10 +231,10 @@
<controls:data> </controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="clientauth">
<controls:label><bean:message key="connector.client.auth"/>:</controls:label>
<controls:data>
- <html:select property="clientAuthentication">
+ <html:select property="clientAuthentication" styleId="clientauth">
<bean:define id="booleanVals" name="connectorForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -243,11 +243,11 @@
</controls:row>
<%-- Input allowed only on create --%>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="keystore">
<controls:label><bean:message key="connector.keystore.filename"/>:</controls:label>
<controls:data>
<logic:equal name="connectorForm" property="adminAction" value="Create">
- <html:text property="keyStoreFileName" size="30"/>
+ <html:text property="keyStoreFileName" size="30" styleId="keystore"/>
</logic:equal>
<logic:equal name="connectorForm" property="adminAction" value="Edit">
<bean:write name="connectorForm" property="keyStoreFileName"/>
@@ -257,10 +257,10 @@
<%-- input password allowed only while creating connector --%>
<logic:equal name="connectorForm" property="adminAction" value="Create">
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="password">
<controls:label><bean:message key="connector.keystore.password"/>:</controls:label>
<controls:data>
- <html:password property="keyStorePassword" size="30"/>
+ <html:password property="keyStorePassword" size="30" styleId="password"/>
<%--
<logic:equal name="connectorForm" property="adminAction" value="Edit">
<bean:write name="connectorForm" property="keyStorePassword"/>
1.3 +5 -4 jakarta-tomcat-catalina/webapps/admin/connector/connectors.jsp
Index: connectors.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/connector/connectors.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- connectors.jsp 24 Jul 2002 20:57:26 -0000 1.2
+++ connectors.jsp 23 Jan 2003 00:07:08 -0000 1.3
@@ -25,9 +25,9 @@
<bean:message key="actions.connectors.delete"/>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Connector Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
</controls:action>
@@ -70,8 +70,9 @@
<font color='red'>*</font>
</logic:match>
<logic:notMatch name="connector" value='<%= Integer.toString(request.getServerPort()) %>'>
+ <label for="connectors"></label>
<html:multibox property="connectors"
- value="<%= connector.toString() %>"/>
+ value="<%= connector.toString() %>" styleId="connectors"/>
</logic:notMatch>
</div></td>
<td><div align="left" class="table-normal-text">
1.4 +46 -35 jakarta-tomcat-catalina/webapps/admin/context/context.jsp
Index: context.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/context/context.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- context.jsp 19 Aug 2002 23:10:33 -0000 1.3
+++ context.jsp 23 Jan 2003 00:07:08 -0000 1.4
@@ -37,9 +37,9 @@
</logic:equal>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Context Actions">
<controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
<controls:action disabled="true"> --------------------------------- </controls:action>
<logic:notEqual name="contextForm" property="adminAction" value="Create">
@@ -109,10 +109,10 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="cookies">
<controls:label><bean:message key="context.cookies"/>:</controls:label>
<controls:data>
- <html:select property="cookies">
+ <html:select property="cookies" styleId="cookies">
<bean:define id="booleanVals" name="contextForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -120,10 +120,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="crossContext">
<controls:label><bean:message key="context.cross.context"/>:</controls:label>
<controls:data>
- <html:select property="crossContext">
+ <html:select property="crossContext" styleId="crossContext">
<bean:define id="booleanVals" name="contextForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -131,10 +131,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debuglevel">
<controls:label><bean:message key="server.debuglevel"/>:</controls:label>
<controls:data>
- <html:select property="debugLvl">
+ <html:select property="debugLvl" styleId="debuglevel">
<bean:define id="debugLvlVals" name="contextForm" property="debugLvlVals"/>
<html:options collection="debugLvlVals" property="value"
labelProperty="label"/>
@@ -143,11 +143,11 @@
</controls:row>
<%-- input only allowed on create transaction --%>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="docbase">
<controls:label><bean:message key="context.docBase"/>:</controls:label>
<controls:data>
<logic:equal name="contextForm" property="adminAction" value="Create">
- <html:text property="docBase" size="30"/>
+ <html:text property="docBase" size="30" styleId="docbase"/>
</logic:equal>
<logic:equal name="contextForm" property="adminAction" value="Edit">
<bean:write name="contextForm" property="docBase"/>
@@ -156,10 +156,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="override">
<controls:label><bean:message key="context.override"/>:</controls:label>
<controls:data>
- <html:select property="override">
+ <html:select property="override" styleId="override">
<bean:define id="booleanVals" name="contextForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -168,11 +168,11 @@
</controls:row>
<%-- input only allowed on create transaction --%>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="path">
<controls:label><bean:message key="context.path"/>:</controls:label>
<controls:data>
<logic:equal name="contextForm" property="adminAction" value="Create">
- <html:text property="path" size="30"/>
+ <html:text property="path" size="30" styleId="path"/>
</logic:equal>
<logic:equal name="contextForm" property="adminAction" value="Edit">
<bean:write name="contextForm" property="path"/>
@@ -181,10 +181,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="reloadable">
<controls:label><bean:message key="context.reloadable"/>:</controls:label>
<controls:data>
- <html:select property="reloadable">
+ <html:select property="reloadable" styleId="reloadable">
<bean:define id="booleanVals" name="contextForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -192,10 +192,21 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="swallowOutput">
+ <controls:label><bean:message key="context.swallowOutput"/>:</controls:label>
+ <controls:data>
+ <html:select property="swallowOutput" styleId="swallowOutput">
+ <bean:define id="booleanVals" name="contextForm" property="booleanVals"/>
+ <html:options collection="booleanVals" property="value"
+ labelProperty="label"/>
+ </html:select>
+ </controls:data>
+ </controls:row>
+
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="usernaming">
<controls:label><bean:message key="context.usenaming"/>:</controls:label>
<controls:data>
- <html:select property="useNaming">
+ <html:select property="useNaming" styleId="usernaming">
<bean:define id="booleanVals" name="contextForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -204,11 +215,11 @@
</controls:row>
<%-- input only allowed on create transaction >
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="workdir">
<controls:label><bean:message key="context.workdir"/>:</controls:label>
<controls:data>
<logic:equal name="contextForm" property="adminAction" value="Create">
- <html:text property="workDir" size="30"/>
+ <html:text property="workDir" size="30" styleId="workdir"/>
</logic:equal>
<logic:equal name="contextForm" property="adminAction" value="Edit">
<bean:write name="contextForm" property="workDir"/>
@@ -241,17 +252,17 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="checkInterval">
<controls:label><bean:message key="context.checkInterval"/>:</controls:label>
<controls:data>
- <html:text property="ldrCheckInterval" size="5"/>
+ <html:text property="ldrCheckInterval" size="5" styleId="checkInterval"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debugLvlVals">
<controls:label><bean:message key="server.debuglevel"/>:</controls:label>
<controls:data>
- <html:select property="ldrDebugLvl">
+ <html:select property="ldrDebugLvl" styleId="debugLvlVals">
<bean:define id="debugLvlVals" name="contextForm" property="debugLvlVals"/>
<html:options collection="debugLvlVals" property="value"
labelProperty="label"/>
@@ -259,10 +270,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="reloadable">
<controls:label><bean:message key="context.reloadable"/>:</controls:label>
<controls:data>
- <html:select property="ldrReloadable">
+ <html:select property="ldrReloadable" styleId="reloadable">
<bean:define id="booleanVals" name="contextForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -292,17 +303,17 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="checkInterval">
<controls:label><bean:message key="context.checkInterval"/>:</controls:label>
<controls:data>
- <html:text property="mgrCheckInterval" size="5"/>
+ <html:text property="mgrCheckInterval" size="5" styleId="checkInterval"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debuglevel">
<controls:label><bean:message key="server.debuglevel"/>:</controls:label>
<controls:data>
- <html:select property="mgrDebugLvl">
+ <html:select property="mgrDebugLvl" styleId="debuglevel">
<bean:define id="debugLvlVals" name="contextForm" property="debugLvlVals"/>
<html:options collection="debugLvlVals" property="value"
labelProperty="label"/>
@@ -310,17 +321,17 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="sessionId">
<controls:label><bean:message key="context.sessionId"/>:</controls:label>
<controls:data>
- <html:textarea property="mgrSessionIDInit" cols="30" rows="2"/>
+ <html:textarea property="mgrSessionIDInit" cols="30" rows="2" styleId="sessionId"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="maxSessions">
<controls:label><bean:message key="context.max.sessions"/>:</controls:label>
<controls:data>
- <html:text property="mgrMaxSessions" size="5"/>
+ <html:text property="mgrMaxSessions" size="5" styleId="maxSessions"/>
</controls:data>
</controls:row>
</controls:table>
1.3 +5 -4 jakarta-tomcat-catalina/webapps/admin/context/contexts.jsp
Index: contexts.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/context/contexts.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- contexts.jsp 24 Jul 2002 20:57:26 -0000 1.2
+++ contexts.jsp 23 Jan 2003 00:07:08 -0000 1.3
@@ -25,9 +25,9 @@
<bean:message key="actions.contexts.delete"/>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Context Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
</controls:action>
@@ -69,8 +69,9 @@
<font color='red'>*</font>
</logic:match>
<logic:notMatch name="context" value='<%= "path="+request.getContextPath()+"," %>'>
+ <label for="contexts"></label>
<html:multibox property="contexts"
- value="<%= context.toString() %>"/>
+ value="<%= context.toString() %>" styleId="contexts"/>
</logic:notMatch>
</div></td>
<td><div align="left" class="table-normal-text">
1.3 +36 -25 jakarta-tomcat-catalina/webapps/admin/defaultcontext/defaultcontext.jsp
Index: defaultcontext.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/defaultcontext/defaultcontext.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- defaultcontext.jsp 20 Sep 2002 21:23:00 -0000 1.2
+++ defaultcontext.jsp 23 Jan 2003 00:07:08 -0000 1.3
@@ -37,9 +37,9 @@
</logic:equal>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Default Context Actions">
<controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
<controls:action disabled="true"> --------------------------------- </controls:action>
</controls:actions>
@@ -68,10 +68,10 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="cookies">
<controls:label><bean:message key="context.cookies"/>:</controls:label>
<controls:data>
- <html:select property="cookies">
+ <html:select property="cookies" styleId="cookies">
<bean:define id="booleanVals" name="defaultContextForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -79,10 +79,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="crosscontext">
<controls:label><bean:message key="context.cross.context"/>:</controls:label>
<controls:data>
- <html:select property="crossContext">
+ <html:select property="crossContext" styleId="crosscontext">
<bean:define id="booleanVals" name="defaultContextForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -90,10 +90,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="reloadable">
<controls:label><bean:message key="context.reloadable"/>:</controls:label>
<controls:data>
- <html:select property="reloadable">
+ <html:select property="reloadable" styleId="reloadable">
<bean:define id="booleanVals" name="defaultContextForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -101,10 +101,21 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="swallowoutput">
+ <controls:label><bean:message key="context.swallowOutput"/>:</controls:label>
+ <controls:data>
+ <html:select property="swallowOutput" styleId="swallowoutput">
+ <bean:define id="booleanVals" name="defaultContextForm" property="booleanVals"/>
+ <html:options collection="booleanVals" property="value"
+ labelProperty="label"/>
+ </html:select>
+ </controls:data>
+ </controls:row>
+
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="usenaming">
<controls:label><bean:message key="context.usenaming"/>:</controls:label>
<controls:data>
- <html:select property="useNaming">
+ <html:select property="useNaming" styleId="usenaming">
<bean:define id="booleanVals" name="defaultContextForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -136,17 +147,17 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="checkInterval">
<controls:label><bean:message key="context.checkInterval"/>:</controls:label>
<controls:data>
- <html:text property="ldrCheckInterval" size="5"/>
+ <html:text property="ldrCheckInterval" size="5" styleId="checkInterval"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debuglevel">
<controls:label><bean:message key="server.debuglevel"/>:</controls:label>
<controls:data>
- <html:select property="ldrDebugLvl">
+ <html:select property="ldrDebugLvl" styleId="debuglevel">
<bean:define id="debugLvlVals" name="defaultContextForm" property="debugLvlVals"/>
<html:options collection="debugLvlVals" property="value"
labelProperty="label"/>
@@ -154,10 +165,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="reloadable">
<controls:label><bean:message key="context.reloadable"/>:</controls:label>
<controls:data>
- <html:select property="ldrReloadable">
+ <html:select property="ldrReloadable" styleId="reloadable">
<bean:define id="booleanVals" name="defaultContextForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -187,17 +198,17 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="checkinterval">
<controls:label><bean:message key="context.checkInterval"/>:</controls:label>
<controls:data>
- <html:text property="mgrCheckInterval" size="5"/>
+ <html:text property="mgrCheckInterval" size="5" styleId="checkinterval"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debuglevel">
<controls:label><bean:message key="server.debuglevel"/>:</controls:label>
<controls:data>
- <html:select property="mgrDebugLvl">
+ <html:select property="mgrDebugLvl" styleId="debuglevel">
<bean:define id="debugLvlVals" name="defaultContextForm" property="debugLvlVals"/>
<html:options collection="debugLvlVals" property="value"
labelProperty="label"/>
@@ -205,17 +216,17 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="sessionId">
<controls:label><bean:message key="context.sessionId"/>:</controls:label>
<controls:data>
- <html:textarea property="mgrSessionIDInit" cols="30" rows="2"/>
+ <html:textarea property="mgrSessionIDInit" cols="30" rows="2" styleId="sessionId"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="maxsessions">
<controls:label><bean:message key="context.max.sessions"/>:</controls:label>
<controls:data>
- <html:text property="mgrMaxSessions" size="5"/>
+ <html:text property="mgrMaxSessions" size="5" styleId="maxsessions"/>
</controls:data>
</controls:row>
</controls:table>
1.3 +2 -2 jakarta-tomcat-catalina/webapps/admin/host/alias.jsp
Index: alias.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/host/alias.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alias.jsp 24 Jul 2002 20:57:26 -0000 1.2
+++ alias.jsp 23 Jan 2003 00:07:08 -0000 1.3
@@ -52,12 +52,12 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="aliasName">
<controls:label>
<bean:message key="host.alias.name"/>:
</controls:label>
<controls:data>
- <html:text property="aliasName" size="24" maxlength="24"/>
+ <html:text property="aliasName" size="24" maxlength="24" styleId="aliasName"/>
</controls:data>
</controls:row>
</controls:table>
1.3 +5 -4 jakarta-tomcat-catalina/webapps/admin/host/aliases.jsp
Index: aliases.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/host/aliases.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aliases.jsp 24 Jul 2002 20:57:26 -0000 1.2
+++ aliases.jsp 23 Jan 2003 00:07:08 -0000 1.3
@@ -26,9 +26,9 @@
<bean:message key="actions.alias.delete"/>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Alias Actions">
<controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
</controls:actions>
@@ -59,8 +59,9 @@
<logic:iterate name="aliasesList" id="alias">
<tr class="line-row">
<td><div align="left" class="table-normal-text">
+ <label for="aliases"></label>
<html:multibox property="aliases"
- value="<%= alias.toString() %>"/>
+ value="<%= alias.toString() %>" styleId="aliases"/>
</div></td>
<td><div align="left" class="table-normal-text">
<%= alias.toString() %>
1.6 +21 -21 jakarta-tomcat-catalina/webapps/admin/host/host.jsp
Index: host.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/host/host.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- host.jsp 16 Sep 2002 04:46:19 -0000 1.5
+++ host.jsp 23 Jan 2003 00:07:08 -0000 1.6
@@ -37,9 +37,9 @@
</logic:equal>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Host Actions">
<controls:action selected="true"> -----<bean:message key="actions.available.actions"/>----- </controls:action>
<controls:action disabled="true"> ------------------------------------- </controls:action>
<logic:notEqual name="hostForm" property="adminAction" value="Create">
@@ -142,14 +142,14 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="name">
<controls:label>
<bean:message key="host.name"/>:
</controls:label>
<controls:data>
<%-- input only allowed on create transaction --%>
<logic:equal name="hostForm" property="adminAction" value="Create">
- <html:text property="hostName" size="255" maxlength="24"/>
+ <html:text property="hostName" size="255" maxlength="24" styleId="name"/>
</logic:equal>
<logic:equal name="hostForm" property="adminAction" value="Edit">
<bean:write name="hostForm" property="hostName"/>
@@ -159,11 +159,11 @@
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="base">
<controls:label><bean:message key="host.base"/>:</controls:label>
<controls:data>
<logic:equal name="hostForm" property="adminAction" value="Create">
- <html:text property="appBase" size="24"/>
+ <html:text property="appBase" size="24" styleId="base"/>
</logic:equal>
<logic:equal name="hostForm" property="adminAction" value="Edit">
<bean:write name="hostForm" property="appBase"/>
@@ -172,10 +172,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="autodeploy">
<controls:label><bean:message key="host.autoDeploy"/>:</controls:label>
<controls:data>
- <html:select property="autoDeploy">
+ <html:select property="autoDeploy" styleId="autodeploy">
<bean:define id="booleanVals" name="hostForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -183,10 +183,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debuglevel">
<controls:label><bean:message key="server.debuglevel"/>:</controls:label>
<controls:data>
- <html:select property="debugLvl">
+ <html:select property="debugLvl" styleId="debuglevel">
<bean:define id="debugLvlVals" name="hostForm" property="debugLvlVals"/>
<html:options collection="debugLvlVals" property="value"
labelProperty="label"/>
@@ -194,10 +194,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="deployxml">
<controls:label><bean:message key="host.deployXML"/>:</controls:label>
<controls:data>
- <html:select property="deployXML">
+ <html:select property="deployXML" styleId="deployxml">
<bean:define id="booleanVals" name="hostForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -205,10 +205,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="livedeploy">
<controls:label><bean:message key="host.liveDeploy"/>:</controls:label>
<controls:data>
- <html:select property="liveDeploy">
+ <html:select property="liveDeploy" styleId="livedeploy">
<bean:define id="booleanVals" name="hostForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -216,10 +216,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="wars">
<controls:label><bean:message key="host.wars"/>:</controls:label>
<controls:data>
- <html:select property="unpackWARs">
+ <html:select property="unpackWARs" styleId="wars">
<bean:define id="booleanVals" name="hostForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -227,10 +227,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="xmlnamespace">
<controls:label><bean:message key="host.xmlNamespaceAware"/>:</controls:label>
<controls:data>
- <html:select property="xmlNamespaceAware">
+ <html:select property="xmlNamespaceAware" styleId="xmlnamespace">
<bean:define id="booleanVals" name="hostForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -238,10 +238,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="xmlvalidation">
<controls:label><bean:message key="host.xmlValidation"/>:</controls:label>
<controls:data>
- <html:select property="xmlValidation">
+ <html:select property="xmlValidation" styleId="xmlvalidation">
<bean:define id="booleanVals" name="hostForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
1.3 +5 -4 jakarta-tomcat-catalina/webapps/admin/host/hosts.jsp
Index: hosts.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/host/hosts.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hosts.jsp 24 Jul 2002 20:57:26 -0000 1.2
+++ hosts.jsp 23 Jan 2003 00:07:08 -0000 1.3
@@ -24,9 +24,9 @@
<bean:message key="actions.hosts.delete"/>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Host Actions">
<controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
</controls:actions>
@@ -61,8 +61,9 @@
<font color='red'>*</font>
</logic:match>
<logic:notMatch name="host" value='<%= "host="+request.getServerName()+"," %>'>
+ <label for="hosts"></label>
<html:multibox property="hosts"
- value="<%= host.toString() %>"/>
+ value="<%= host.toString() %>" styleId="hosts"/>
</logic:notMatch>
</div></td>
<td><div align="left" class="table-normal-text">
1.3 +19 -17 jakarta-tomcat-catalina/webapps/admin/logger/logger.jsp
Index: logger.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/logger/logger.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logger.jsp 24 Jul 2002 20:57:26 -0000 1.2
+++ logger.jsp 23 Jan 2003 00:07:08 -0000 1.3
@@ -38,9 +38,9 @@
</logic:equal>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Loger Actions">
<controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
<controls:action disabled="true"> --------------------------------- </controls:action>
<logic:notEqual name="loggerForm" property="adminAction" value="Create">
@@ -67,11 +67,11 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="type">
<controls:label><bean:message key="connector.type"/>:</controls:label>
<controls:data>
<logic:equal name="loggerForm" property="adminAction" value="Create">
- <html:select property="loggerType" onchange="IA_jumpMenu('self',this)">
+ <html:select property="loggerType" onchange="IA_jumpMenu('self',this)" styleId="type">
<bean:define id="loggerTypeVals" name="loggerForm" property="loggerTypeVals"/>
<html:options collection="loggerTypeVals" property="value" labelProperty="label"/>
</html:select>
@@ -82,10 +82,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debuglevel">
<controls:label><bean:message key="server.debuglevel"/>:</controls:label>
<controls:data>
- <html:select property="debugLvl">
+ <html:select property="debugLvl" styleId="debuglevel">
<bean:define id="debugLvlVals" name="loggerForm" property="debugLvlVals"/>
<html:options collection="debugLvlVals" property="value"
labelProperty="label"/>
@@ -93,10 +93,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="verbositylevel">
<controls:label><bean:message key="logger.verbositylevel"/>:</controls:label>
<controls:data>
- <html:select property="verbosityLvl">
+ <html:select property="verbosityLvl" styleId="verbositylevel">
<bean:define id="verbosityLvlVals" name="loggerForm" property="verbosityLvlVals"/>
<html:options collection="verbosityLvlVals" property="value"
labelProperty="label"/>
@@ -130,31 +130,33 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="directory">
<controls:label><bean:message key="logger.directory"/>:</controls:label>
<controls:data>
- <html:text property="directory" size="25"/>
+ <html:text property="directory" size="25" styleId="directory"/>
+
+
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="prefix">
<controls:label><bean:message key="logger.prefix"/>:</controls:label>
<controls:data>
- <html:text property="prefix" size="25"/>
+ <html:text property="prefix" size="25" styleId="prefix"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="suffix">
<controls:label><bean:message key="logger.suffix"/>:</controls:label>
<controls:data>
- <html:text property="suffix" size="15"/>
+ <html:text property="suffix" size="15" styleId="suffix"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="timestamp">
<controls:label><bean:message key="logger.timestamp"/>:</controls:label>
<controls:data>
- <html:select property="timestamp">
+ <html:select property="timestamp" styleId="timestamp">
<bean:define id="booleanVals" name="loggerForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
1.3 +5 -4 jakarta-tomcat-catalina/webapps/admin/logger/loggers.jsp
Index: loggers.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/logger/loggers.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- loggers.jsp 24 Jul 2002 20:57:26 -0000 1.2
+++ loggers.jsp 23 Jan 2003 00:07:08 -0000 1.3
@@ -25,9 +25,9 @@
<bean:message key="actions.loggers.delete"/>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Logger Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
</controls:action>
@@ -64,8 +64,9 @@
<logic:iterate name="loggersList" id="logger">
<tr class="line-row">
<td><div align="left" class="table-normal-text">
+ <label for="loggers"></label>
<html:multibox property="loggers"
- value="<%= logger.toString() %>"/>
+ value="<%= logger.toString() %>" styleId="loggers"/>
</div></td>
<td><div align="left" class="table-normal-text">
<html:link page='<%= "/EditLogger.do?select=" +
1.3 +27 -27 jakarta-tomcat-catalina/webapps/admin/realm/jdbcRealm.jsp
Index: jdbcRealm.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/realm/jdbcRealm.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jdbcRealm.jsp 24 Jul 2002 20:57:26 -0000 1.2
+++ jdbcRealm.jsp 23 Jan 2003 00:07:09 -0000 1.3
@@ -37,9 +37,9 @@
</logic:equal>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Realm Actions">
<controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
<logic:notEqual name="jdbcRealmForm" property="adminAction" value="Create">
@@ -68,11 +68,11 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="type">
<controls:label><bean:message key="connector.type"/>:</controls:label>
<controls:data>
<logic:equal name="jdbcRealmForm" property="adminAction" value="Create">
- <html:select property="realmType" onchange="IA_jumpMenu('self',this)">
+ <html:select property="realmType" onchange="IA_jumpMenu('self',this)" styleId="type">
<bean:define id="realmTypeVals" name="jdbcRealmForm" property="realmTypeVals"/>
<html:options collection="realmTypeVals" property="value" labelProperty="label"/>
</html:select>
@@ -83,38 +83,38 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="driver">
<controls:label><bean:message key="realm.driver"/>:</controls:label>
<controls:data>
- <html:text property="driver" size="30"/>
+ <html:text property="driver" size="30" styleId="driver"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="passwd">
<controls:label><bean:message key="realm.passwd"/>:</controls:label>
<controls:data>
- <html:text property="connectionPassword" size="30"/>
+ <html:text property="connectionPassword" size="30" styleId="passwd"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="url">
<controls:label><bean:message key="realm.url"/>:</controls:label>
<controls:data>
- <html:text property="connectionURL" size="30"/>
+ <html:text property="connectionURL" size="30" styleId="url"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="username">
<controls:label><bean:message key="realm.userName"/>:</controls:label>
<controls:data>
- <html:text property="connectionName" size="30"/>
+ <html:text property="connectionName" size="30" styleId="username"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debuglevel">
<controls:label><bean:message key="server.debuglevel"/>:</controls:label>
<controls:data>
- <html:select property="debugLvl">
+ <html:select property="debugLvl" styleId="debuglevel">
<bean:define id="debugLvlVals" name="jdbcRealmForm" property="debugLvlVals"/>
<html:options collection="debugLvlVals" property="value"
labelProperty="label"/>
@@ -123,45 +123,45 @@
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="digest">
<controls:label><bean:message key="realm.digest"/>:</controls:label>
<controls:data>
- <html:text property="digest" size="30"/>
+ <html:text property="digest" size="30" styleId="digest"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="passwordCol">
<controls:label><bean:message key="realm.passwordCol"/>:</controls:label>
<controls:data>
- <html:text property="passwordCol" size="30"/>
+ <html:text property="passwordCol" size="30" styleId="passwordCol"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="roleNameCol">
<controls:label><bean:message key="realm.roleNameCol"/>:</controls:label>
<controls:data>
- <html:text property="roleNameCol" size="30"/>
+ <html:text property="roleNameCol" size="30" styleId="roleNameCol"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="userNameCol">
<controls:label><bean:message key="realm.userNameCol"/>:</controls:label>
<controls:data>
- <html:text property="userNameCol" size="30"/>
+ <html:text property="userNameCol" size="30" styleId=userNameCol"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="userRoleTable">
<controls:label><bean:message key="realm.userRoleTable"/>:</controls:label>
<controls:data>
- <html:text property="roleTable" size="30"/>
+ <html:text property="roleTable" size="30" styleId="userRoleTable"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="userTable">
<controls:label><bean:message key="realm.userTable"/>:</controls:label>
<controls:data>
- <html:text property="userTable" size="30"/>
+ <html:text property="userTable" size="30" styleId="userTable"/>
</controls:data>
</controls:row>
1.4 +37 -37 jakarta-tomcat-catalina/webapps/admin/realm/jndiRealm.jsp
Index: jndiRealm.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/realm/jndiRealm.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jndiRealm.jsp 14 Aug 2002 20:45:17 -0000 1.3
+++ jndiRealm.jsp 23 Jan 2003 00:07:09 -0000 1.4
@@ -36,9 +36,9 @@
</logic:equal>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Realm Actions">
<controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
<logic:notEqual name="jndiRealmForm" property="adminAction" value="Create">
@@ -67,11 +67,11 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="type">
<controls:label><bean:message key="connector.type"/>:</controls:label>
<controls:data>
<logic:equal name="jndiRealmForm" property="adminAction" value="Create">
- <html:select property="realmType" onchange="IA_jumpMenu('self',this)">
+ <html:select property="realmType" onchange="IA_jumpMenu('self',this)" styleId="type">
<bean:define id="realmTypeVals" name="jndiRealmForm" property="realmTypeVals"/>
<html:options collection="realmTypeVals" property="value" labelProperty="label"/>
</html:select>
@@ -82,38 +82,38 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="connName">
<controls:label><bean:message key="realm.connName"/>:</controls:label>
<controls:data>
- <html:text property="connectionName" size="30"/>
+ <html:text property="connectionName" size="30" styleId="connName"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="connPassword">
<controls:label><bean:message key="realm.connPassword"/>:</controls:label>
<controls:data>
- <html:text property="connectionPassword" size="30"/>
+ <html:text property="connectionPassword" size="30" styleId="connPassword"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="connURL">
<controls:label><bean:message key="realm.connURL"/>:</controls:label>
<controls:data>
- <html:text property="connectionURL" size="30"/>
+ <html:text property="connectionURL" size="30" styleId="connURL"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="connFactory">
<controls:label><bean:message key="realm.connFactory"/>:</controls:label>
<controls:data>
- <html:text property="contextFactory" size="30"/>
+ <html:text property="contextFactory" size="30" styleId="connFactory"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debuglevel">
<controls:label><bean:message key="server.debuglevel"/>:</controls:label>
<controls:data>
- <html:select property="debugLvl">
+ <html:select property="debugLvl" styleId="debuglevel">
<bean:define id="debugLvlVals" name="jndiRealmForm" property="debugLvlVals"/>
<html:options collection="debugLvlVals" property="value"
labelProperty="label"/>
@@ -121,38 +121,38 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="digest">
<controls:label><bean:message key="realm.digest"/>:</controls:label>
<controls:data>
- <html:text property="digest" size="30"/>
+ <html:text property="digest" size="30" styleId="digest"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="roleBase">
<controls:label><bean:message key="realm.roleBase"/>:</controls:label>
<controls:data>
- <html:text property="roleBase" size="30"/>
+ <html:text property="roleBase" size="30" styleId="roleBase"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="roleName">
<controls:label><bean:message key="realm.roleName"/>:</controls:label>
<controls:data>
- <html:text property="roleName" size="30"/>
+ <html:text property="roleName" size="30" styleId="roleName"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="pattern">
<controls:label><bean:message key="realm.pattern"/>:</controls:label>
<controls:data>
- <html:text property="rolePattern" size="30"/>
+ <html:text property="rolePattern" size="30" styleId="pattern"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="rolesubtree">
<controls:label><bean:message key="realm.role.subtree"/>:</controls:label>
<controls:data>
- <html:select property="roleSubtree">
+ <html:select property="roleSubtree" styleId="rolesubtree">
<bean:define id="searchVals" name="jndiRealmForm" property="searchVals"/>
<html:options collection="searchVals" property="value"
labelProperty="label"/>
@@ -160,24 +160,24 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="userBase">
<controls:label><bean:message key="realm.userBase"/>:</controls:label>
<controls:data>
- <html:text property="userBase" size="30"/>
+ <html:text property="userBase" size="30" styleId="userBase"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="roleName">
<controls:label><bean:message key="realm.user.roleName"/>:</controls:label>
<controls:data>
- <html:text property="userRoleName" size="30"/>
+ <html:text property="userRoleName" size="30" styleId="roleName"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="usersubtree">
<controls:label><bean:message key="realm.user.subtree"/>:</controls:label>
<controls:data>
- <html:select property="userSubtree">
+ <html:select property="userSubtree" styleId="usersubtree">
<bean:define id="searchVals" name="jndiRealmForm" property="searchVals"/>
<html:options collection="searchVals" property="value"
labelProperty="label"/>
@@ -185,24 +185,24 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="userPassword">
<controls:label><bean:message key="realm.userPassword"/>:</controls:label>
<controls:data>
- <html:text property="userPassword" size="30"/>
+ <html:text property="userPassword" size="30" styleId="userPassword"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="userPattern">
<controls:label><bean:message key="realm.userPattern"/>:</controls:label>
<controls:data>
- <html:text property="userPattern" size="30"/>
+ <html:text property="userPattern" size="30" styleId="userPattern"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="userSearch">
<controls:label><bean:message key="realm.userSearch"/>:</controls:label>
<controls:data>
- <html:text property="userSearch" size="30"/>
+ <html:text property="userSearch" size="30" styleId="userSearch"/>
</controls:data>
</controls:row>
1.3 +9 -9 jakarta-tomcat-catalina/webapps/admin/realm/memoryRealm.jsp
Index: memoryRealm.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/realm/memoryRealm.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- memoryRealm.jsp 24 Jul 2002 20:57:26 -0000 1.2
+++ memoryRealm.jsp 23 Jan 2003 00:07:09 -0000 1.3
@@ -37,9 +37,9 @@
</logic:equal>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Label Actions">
<controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
<logic:notEqual name="memoryRealmForm" property="adminAction" value="Create">
@@ -68,11 +68,11 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="type">
<controls:label><bean:message key="connector.type"/>:</controls:label>
<controls:data>
<logic:equal name="memoryRealmForm" property="adminAction" value="Create">
- <html:select property="realmType" onchange="IA_jumpMenu('self',this)">
+ <html:select property="realmType" onchange="IA_jumpMenu('self',this)" styleId="type">
<bean:define id="realmTypeVals" name="memoryRealmForm" property="realmTypeVals"/>
<html:options collection="realmTypeVals" property="value" labelProperty="label"/>
</html:select>
@@ -83,10 +83,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debuglevel">
<controls:label><bean:message key="server.debuglevel"/>:</controls:label>
<controls:data>
- <html:select property="debugLvl">
+ <html:select property="debugLvl" styleId="debuglevel">
<bean:define id="debugLvlVals" name="memoryRealmForm" property="debugLvlVals"/>
<html:options collection="debugLvlVals" property="value"
labelProperty="label"/>
@@ -94,10 +94,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="pathName">
<controls:label><bean:message key="realm.pathName"/>:</controls:label>
<controls:data>
- <html:text property="pathName" size="25"/>
+ <html:text property="pathName" size="25" styleId="pathName"/>
</controls:data>
</controls:row>
1.3 +5 -4 jakarta-tomcat-catalina/webapps/admin/realm/realms.jsp
Index: realms.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/realm/realms.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- realms.jsp 24 Jul 2002 20:57:26 -0000 1.2
+++ realms.jsp 23 Jan 2003 00:07:09 -0000 1.3
@@ -25,9 +25,9 @@
<bean:message key="actions.realms.delete"/>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Realm Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
</controls:action>
@@ -64,8 +64,9 @@
<logic:iterate name="realmsList" id="realm">
<tr class="line-row">
<td><div align="left" class="table-normal-text">
+ <label for="realms"></label>
<html:multibox property="realms"
- value="<%= realm.toString() %>"/>
+ value="<%= realm.toString() %>" styleId="realms"/>
</div></td>
<td><div align="left" class="table-normal-text">
<html:link page='<%= "/EditRealm.do?select=" +
1.3 +9 -9 jakarta-tomcat-catalina/webapps/admin/realm/userDatabaseRealm.jsp
Index: userDatabaseRealm.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/realm/userDatabaseRealm.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- userDatabaseRealm.jsp 24 Jul 2002 20:57:26 -0000 1.2
+++ userDatabaseRealm.jsp 23 Jan 2003 00:07:09 -0000 1.3
@@ -37,9 +37,9 @@
</logic:equal>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Realm Actions">
<controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
<logic:notEqual name="userDatabaseRealmForm" property="adminAction" value="Create">
@@ -68,11 +68,11 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="type">
<controls:label><bean:message key="connector.type"/>:</controls:label>
<controls:data>
<logic:equal name="userDatabaseRealmForm" property="adminAction" value="Create">
- <html:select property="realmType" onchange="IA_jumpMenu('self',this)">
+ <html:select property="realmType" onchange="IA_jumpMenu('self',this)" styleId="type">
<bean:define id="realmTypeVals" name="userDatabaseRealmForm" property="realmTypeVals"/>
<html:options collection="realmTypeVals" property="value" labelProperty="label"/>
</html:select>
@@ -83,10 +83,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debuglevel">
<controls:label><bean:message key="server.debuglevel"/>:</controls:label>
<controls:data>
- <html:select property="debugLvl">
+ <html:select property="debugLvl" styleId="debuglevel">
<bean:define id="debugLvlVals" name="userDatabaseRealmForm" property="debugLvlVals"/>
<html:options collection="debugLvlVals" property="value"
labelProperty="label"/>
@@ -94,11 +94,11 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="resource">
<controls:label><bean:message key="realm.resource"/>:</controls:label>
<controls:data>
<logic:equal name="userDatabaseRealmForm" property="adminAction" value="Create">
- <html:text property="resource" size="25" maxlength="25"/>
+ <html:text property="resource" size="25" maxlength="25" styleId="resource"/>
</logic:equal>
<logic:equal name="userDatabaseRealmForm" property="adminAction" value="Edit">
<bean:write name="userDatabaseRealmForm" property="resource" scope="session"/>
1.3 +20 -20 jakarta-tomcat-catalina/webapps/admin/resources/dataSource.jsp
Index: dataSource.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/dataSource.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dataSource.jsp 24 Jul 2002 20:57:27 -0000 1.2
+++ dataSource.jsp 23 Jan 2003 00:07:09 -0000 1.3
@@ -46,7 +46,7 @@
</td>
<td align="right" nowrap>
<div class="page-title-text">
- <controls:actions>
+ <controls:actions label="Data Source Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
</controls:action>
@@ -54,7 +54,7 @@
---------------------------------
</controls:action>
- <controls:action url='<%= "/resources/setUpDataSource.do?resourcetype=" +
+ <controls:action url='<%= "/resources/setUpDataSource.do?resourcetype=" +
URLEncoder.encode(resourcetypeInfo) + "&path="+
URLEncoder.encode(pathInfo) + "&host="+
URLEncoder.encode(hostInfo) + "&service="+
@@ -96,7 +96,7 @@
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="jndi">
<controls:label>
<bean:message key="resources.datasrc.jndi"/>:
</controls:label>
@@ -106,88 +106,88 @@
<html:hidden property="jndiName"/>
</logic:present>
<logic:notPresent name="dataSourceForm" property="objectName">
- <html:text property="jndiName" size="35" maxlength="56"/>
+ <html:text property="jndiName" size="35" maxlength="56" styleId="jndi"/>
</logic:notPresent>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="url">
<controls:label>
<bean:message key="resources.datasrc.url"/>:
</controls:label>
<controls:data>
- <html:textarea property="url" cols="35" rows="2"/>
+ <html:textarea property="url" cols="35" rows="2" styleId="url"/>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="jdbcclass">
<controls:label>
<bean:message key="resources.datasrc.jdbcclass"/>:
</controls:label>
<controls:data>
- <html:text property="driverClass" size="45" maxlength="256"/>
+ <html:text property="driverClass" size="45" maxlength="256" styleId="jdbcclass"/>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="username">
<controls:label>
<bean:message key="users.prompt.username"/>
</controls:label>
<controls:data>
- <html:text property="username" size="15" maxlength="25"/>
+ <html:text property="username" size="15" maxlength="25" styleId="username"/>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="password">
<controls:label>
<bean:message key="users.prompt.password"/>
</controls:label>
<controls:data>
- <html:password property="password" size="15" maxlength="25"/>
+ <html:password property="password" size="15" maxlength="25" styleId="password"/>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="active">
<controls:label>
<bean:message key="resources.datasrc.active"/>:
</controls:label>
<controls:data>
- <html:text property="active" size="5" maxlength="5"/>
+ <html:text property="active" size="5" maxlength="5" styleId="active"/>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="idle">
<controls:label>
<bean:message key="resources.datasrc.idle"/>:
</controls:label>
<controls:data>
- <html:text property="idle" size="5" maxlength="5"/>
+ <html:text property="idle" size="5" maxlength="5" styleId="idle"/>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="wait">
<controls:label>
<bean:message key="resources.datasrc.wait"/>:
</controls:label>
<controls:data>
- <html:text property="wait" size="5" maxlength="5"/>
+ <html:text property="wait" size="5" maxlength="5" styleId="wait"/>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="validation">
<controls:label>
<bean:message key="resources.datasrc.validation"/>:
</controls:label>
<controls:data>
- <html:textarea property="query" cols="35" rows="3"/>
+ <html:textarea property="query" cols="35" rows="3" styleId="validation"/>
</controls:data>
</controls:row>
1.2 +2 -1 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dataSources.jspf 18 Jul 2002 16:48:28 -0000 1.1
+++ dataSources.jspf 23 Jan 2003 00:07:09 -0000 1.2
@@ -24,8 +24,9 @@
<tr class="line-row">
<logic:present name="checkboxes">
<td><div align="center" class="table-normal-text">
+ <label for="dataSources"></label>
<input type="checkbox" name="dataSources"
- value="<%= dataSource %>">
+ value="<%= dataSource %>" styleId="dataSources">
</td>
</logic:present>
<td><div align="left" class="table-normal-text">
1.2 +2 -1 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- envEntries.jspf 18 Jul 2002 16:48:28 -0000 1.1
+++ envEntries.jspf 23 Jan 2003 00:07:09 -0000 1.2
@@ -27,8 +27,9 @@
<tr class="line-row">
<logic:present name="checkboxes">
<td><div align="center" class="table-normal-text">
+ <label for="envEntries"></label>
<input type="checkbox" name="envEntries"
- value="<%= envEntry %>">
+ value="<%= envEntry %>" styleId="envEntries">
</td>
</logic:present>
<td><div align="left" class="table-normal-text">
1.3 +12 -12 jakarta-tomcat-catalina/webapps/admin/resources/envEntry.jsp
Index: envEntry.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/envEntry.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- envEntry.jsp 24 Jul 2002 20:57:27 -0000 1.2
+++ envEntry.jsp 23 Jan 2003 00:07:09 -0000 1.3
@@ -46,7 +46,7 @@
</td>
<td align="right" nowrap>
<div class="page-title-text">
- <controls:actions>
+ <controls:actions label="Environment Entry Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
</controls:action>
@@ -54,7 +54,7 @@
---------------------------------
</controls:action>
- <controls:action url='<%= "/resources/setUpEnvEntry.do?resourcetype=" +
+ <controls:action url='<%= "/resources/setUpEnvEntry.do?resourcetype=" +
URLEncoder.encode(resourcetypeInfo) + "&path="+
URLEncoder.encode(pathInfo) + "&host="+
URLEncoder.encode(hostInfo) + "&service="+
@@ -96,7 +96,7 @@
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="name">
<controls:label>
<bean:message key="service.name"/>:
</controls:label>
@@ -106,18 +106,18 @@
<html:hidden property="name"/>
</logic:present>
<logic:notPresent name="envEntryForm" property="objectName">
- <html:text property="name" size="24" maxlength="32"/>
+ <html:text property="name" size="24" maxlength="32" styleId="name"/>
</logic:notPresent>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="type">
<controls:label>
<bean:message key="connector.type"/>:
</controls:label>
<controls:data>
- <html:select property="entryType">
+ <html:select property="entryType" styleId="type">
<bean:define id="typeVals" name="envEntryForm" property="typeVals"/>
<html:options collection="typeVals" property="value"
labelProperty="label"/>
@@ -126,32 +126,32 @@
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="value">
<controls:label>
<bean:message key="service.value"/>:
</controls:label>
<controls:data>
- <html:text property="value" size="24" maxlength="64"/>
+ <html:text property="value" size="24" maxlength="64" styleId="value"/>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="override">
<controls:label>
<bean:message key="resources.env.override"/>:
</controls:label>
<controls:data>
- <html:checkbox property="override" value="override"/>
+ <html:checkbox property="override" value="override" styleId="override"/>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="description">
<controls:label>
<bean:message key="users.prompt.description"/>
</controls:label>
<controls:data>
- <html:text property="description" size="30" maxlength="64"/>
+ <html:text property="description" size="30" maxlength="64" styleId="description"/>
</controls:data>
</controls:row>
1.2 +6 -2 jakarta-tomcat-catalina/webapps/admin/resources/listDataSources.jspf
Index: listDataSources.jspf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listDataSources.jspf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- listDataSources.jspf 18 Jul 2002 16:48:28 -0000 1.1
+++ listDataSources.jspf 23 Jan 2003 00:07:09 -0000 1.2
@@ -1,4 +1,6 @@
-<controls:actions>
+<td align="right" nowrap>
+<div class="page-title-text">
+<controls:actions label="Data Source Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
@@ -25,4 +27,6 @@
<bean:message key="resources.actions.datasrc.delete"/>
</controls:action>
-</controls:actions>
\ No newline at end of file
+</controls:actions>
+</div>
+</td>
1.2 +6 -2 jakarta-tomcat-catalina/webapps/admin/resources/listEnvEntries.jspf
Index: listEnvEntries.jspf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listEnvEntries.jspf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- listEnvEntries.jspf 18 Jul 2002 16:48:28 -0000 1.1
+++ listEnvEntries.jspf 23 Jan 2003 00:07:09 -0000 1.2
@@ -1,4 +1,6 @@
-<controls:actions>
+<td align="right" nowrap>
+<div class="page-title-text">
+<controls:actions label="Environment Entry Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
@@ -25,4 +27,6 @@
<bean:message key="resources.actions.env.delete"/>
</controls:action>
-</controls:actions>
\ No newline at end of file
+</controls:actions>
+</div>
+</td>
1.2 +6 -2 jakarta-tomcat-catalina/webapps/admin/resources/listMailSessions.jspf
Index: listMailSessions.jspf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listMailSessions.jspf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- listMailSessions.jspf 18 Jul 2002 16:48:28 -0000 1.1
+++ listMailSessions.jspf 23 Jan 2003 00:07:09 -0000 1.2
@@ -1,4 +1,6 @@
-<controls:actions>
+<td align="right" nowrap>
+<div class="page-title-text">
+<controls:actions label="Mail Session Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
@@ -25,4 +27,6 @@
<bean:message key="resources.actions.mailsession.delete"/>
</controls:action>
-</controls:actions>
\ No newline at end of file
+</controls:actions>
+</div>
+</td>
1.2 +6 -2 jakarta-tomcat-catalina/webapps/admin/resources/listResourceLinks.jspf
Index: listResourceLinks.jspf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listResourceLinks.jspf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- listResourceLinks.jspf 18 Jul 2002 16:48:28 -0000 1.1
+++ listResourceLinks.jspf 23 Jan 2003 00:07:09 -0000 1.2
@@ -1,4 +1,6 @@
-<controls:actions>
+<td align="right" nowrap>
+<div class="page-title-text">
+<controls:actions label="Resource Link Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
@@ -25,4 +27,6 @@
<bean:message key="resources.actions.resourcelk.delete"/>
</controls:action>
-</controls:actions>
\ No newline at end of file
+</controls:actions>
+</div>
+</td>
1.2 +6 -2 jakarta-tomcat-catalina/webapps/admin/resources/listUserDatabases.jspf
Index: listUserDatabases.jspf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listUserDatabases.jspf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- listUserDatabases.jspf 18 Jul 2002 16:48:28 -0000 1.1
+++ listUserDatabases.jspf 23 Jan 2003 00:07:09 -0000 1.2
@@ -1,4 +1,6 @@
-<controls:actions>
+<td align="right" nowrap>
+<div class="page-title-text">
+<controls:actions label="User Database Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
@@ -17,4 +19,6 @@
<bean:message key="resources.actions.userdb.delete"/>
</controls:action>
-</controls:actions>
\ No newline at end of file
+</controls:actions>
+</div>
+</td>
1.3 +6 -6 jakarta-tomcat-catalina/webapps/admin/resources/mailSession.jsp
Index: mailSession.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/mailSession.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mailSession.jsp 24 Jul 2002 20:57:27 -0000 1.2
+++ mailSession.jsp 23 Jan 2003 00:07:09 -0000 1.3
@@ -46,7 +46,7 @@
</td>
<td align="right" nowrap>
<div class="page-title-text">
- <controls:actions>
+ <controls:actions label="Mail Session Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
</controls:action>
@@ -54,7 +54,7 @@
---------------------------------
</controls:action>
- <controls:action url='<%= "/resources/setUpMailSession.do?resourcetype=" +
+ <controls:action url='<%= "/resources/setUpMailSession.do?resourcetype=" +
URLEncoder.encode(resourcetypeInfo) + "&path="+
URLEncoder.encode(pathInfo) + "&host="+
URLEncoder.encode(hostInfo) + "&service="+
@@ -96,7 +96,7 @@
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="name">
<controls:label>
<bean:message key="resources.mailsession.name"/>:
</controls:label>
@@ -106,18 +106,18 @@
<html:hidden property="name"/>
</logic:present>
<logic:notPresent name="mailSessionForm" property="objectName">
- <html:text property="name" size="35" maxlength="56"/>
+ <html:text property="name" size="35" maxlength="56" styleId="name"/>
</logic:notPresent>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="mailhost">
<controls:label>
<bean:message key="resources.mailsession.mailhost"/>:
</controls:label>
<controls:data>
- <html:textarea property="mailhost" cols="35" rows="2"/>
+ <html:textarea property="mailhost" cols="35" rows="2" styleId="mailhost"/>
</controls:data>
</controls:row>
1.2 +2 -1 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mailSessions.jspf 18 Jul 2002 16:48:28 -0000 1.1
+++ mailSessions.jspf 23 Jan 2003 00:07:09 -0000 1.2
@@ -24,8 +24,9 @@
<tr class="line-row">
<logic:present name="checkboxes">
<td><div align="center" class="table-normal-text">
+ <label for="mailSessions"></label>
<input type="checkbox" name="mailSessions"
- value="<%= mailSession %>">
+ value="<%= mailSession %>" styleId="mailSessions">
</td>
</logic:present>
<td><div align="left" class="table-normal-text">
1.3 +8 -8 jakarta-tomcat-catalina/webapps/admin/resources/resourceLink.jsp
Index: resourceLink.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/resourceLink.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- resourceLink.jsp 24 Jul 2002 20:57:27 -0000 1.2
+++ resourceLink.jsp 23 Jan 2003 00:07:09 -0000 1.3
@@ -47,7 +47,7 @@
</td>
<td align="right" nowrap>
<div class="page-title-text">
- <controls:actions>
+ <controls:actions label="Resource Link Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
</controls:action>
@@ -97,7 +97,7 @@
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="name">
<controls:label>
<bean:message key="resources.resourcelk.name"/>:
</controls:label>
@@ -107,32 +107,32 @@
<html:hidden property="name"/>
</logic:present>
<logic:notPresent name="resourceLinkForm" property="objectName">
- <html:text property="name" size="35" maxlength="56"/>
+ <html:text property="name" size="35" maxlength="56" styleId="name"/>
</logic:notPresent>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="global">
<controls:label>
<bean:message key="resources.resourcelk.global"/>:
</controls:label>
<controls:data>
- <html:text property="global" size="35" maxlength="56"/>
+ <html:text property="global" size="35" maxlength="56" styleId="global"/>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="type">
<controls:label>
<bean:message key="resources.resourcelk.type"/>:
</controls:label>
<controls:data>
- <html:text property="type" size="45" maxlength="256"/>
+ <html:text property="type" size="45" maxlength="256" styleId="type"/>
</controls:data>
</controls:row>
- </controls:table>
+ </controls:table>
</td>
1.2 +2 -1 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- resourceLinks.jspf 18 Jul 2002 16:48:28 -0000 1.1
+++ resourceLinks.jspf 23 Jan 2003 00:07:09 -0000 1.2
@@ -23,8 +23,9 @@
<tr class="line-row">
<logic:present name="checkboxes">
<td><div align="center" class="table-normal-text">
+ <label for="resourceLinks"></label>
<input type="checkbox" name="resourceLinks"
- value="<%= resourceLink %>">
+ value="<%= resourceLink %>" styleId="resourceLinks">
</td>
</logic:present>
<td><div align="left" class="table-normal-text">
1.3 +8 -8 jakarta-tomcat-catalina/webapps/admin/resources/userDatabase.jsp
Index: userDatabase.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/userDatabase.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- userDatabase.jsp 24 Jul 2002 20:57:27 -0000 1.2
+++ userDatabase.jsp 23 Jan 2003 00:07:09 -0000 1.3
@@ -32,7 +32,7 @@
</td>
<td align="right" nowrap>
<div class="page-title-text">
- <controls:actions>
+ <controls:actions label="User Database Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
</controls:action>
@@ -74,7 +74,7 @@
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="name">
<controls:label>
<bean:message key="service.name"/>:
</controls:label>
@@ -84,23 +84,23 @@
<html:hidden property="name"/>
</logic:present>
<logic:notPresent name="userDatabaseForm" property="objectName">
- <html:text property="name" size="24" maxlength="32"/>
+ <html:text property="name" size="24" maxlength="32" styleId="name"/>
</logic:notPresent>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="location">
<controls:label>
<bean:message key="resources.userdb.location"/>:
</controls:label>
<controls:data>
- <html:text property="path" size="32" maxlength="64"/>
+ <html:text property="path" size="32" maxlength="64" styleId="location"/>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="factory">
<controls:label>
<bean:message key="resources.userdb.factory"/>:
</controls:label>
@@ -110,12 +110,12 @@
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="description">
<controls:label>
<bean:message key="users.prompt.description"/>
</controls:label>
<controls:data>
- <html:textarea property="description" cols="32" rows="3"/>
+ <html:textarea property="description" cols="32" rows="3" styleId="description"/>
</controls:data>
</controls:row>
1.2 +2 -1 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- userDatabases.jspf 18 Jul 2002 16:48:28 -0000 1.1
+++ userDatabases.jspf 23 Jan 2003 00:07:09 -0000 1.2
@@ -28,8 +28,9 @@
<tr class="line-row">
<logic:present name="checkboxes">
<td><div align="center" class="table-normal-text">
+ <label for="userDatabases"></label>
<input type="checkbox" name="userDatabases"
- value="<%= userDatabase %>">
+ value="<%= userDatabase %>" styleId="userDatabases">
</td>
</logic:present>
<td><div align="left" class="table-normal-text">
1.3 +7 -7 jakarta-tomcat-catalina/webapps/admin/server/server.jsp
Index: server.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/server/server.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- server.jsp 24 Jul 2002 20:57:27 -0000 1.2
+++ server.jsp 23 Jan 2003 00:07:09 -0000 1.3
@@ -27,7 +27,7 @@
</td>
<td align="right" nowrap>
<div class="page-title-text">
- <controls:actions>
+ <controls:actions label="Server Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
</controls:action>
@@ -69,17 +69,17 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="portNumber">
<controls:label><bean:message key="server.portnumber"/>:</controls:label>
<controls:data>
- <html:text property="portNumberText" size="24" maxlength="24"/>
+ <html:text property="portNumberText" size="24" maxlength="24" styleId="portNumber"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debugLvl">
<controls:label><bean:message key="server.debuglevel"/>:</controls:label>
<controls:data>
- <html:select property="debugLvl">
+ <html:select property="debugLvl" styleId="debugLvl">
<bean:define id="debugLvlVals" name="serverForm" property="debugLvlVals"/>
<html:options collection="debugLvlVals" property="value"
labelProperty="label"/>
@@ -87,10 +87,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="shutdown">
<controls:label><bean:message key="server.shutdown"/>:</controls:label>
<controls:data>
- <html:text property="shutdownText" size="24" maxlength="24"/>
+ <html:text property="shutdownText" size="24" maxlength="24" styleId="shutdown"/>
</controls:data>
</controls:row>
</controls:table>
1.4 +12 -12 jakarta-tomcat-catalina/webapps/admin/service/service.jsp
Index: service.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/service/service.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- service.jsp 16 Sep 2002 04:46:19 -0000 1.3
+++ service.jsp 23 Jan 2003 00:07:10 -0000 1.4
@@ -43,9 +43,9 @@
</logic:equal>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Service Actions">
<controls:action selected="true">
-----<bean:message key="actions.available.actions"/>-----
</controls:action>
@@ -74,7 +74,7 @@
</controls:action-->
<controls:action disabled="true">
-------------------------------------
- </controls:action>
+ </controls:action>
<controls:action url='<%= "/AddHost.do?serviceName=" +
URLEncoder.encode(thisServiceName) %>'>
<bean:message key="actions.hosts.create"/>
@@ -161,13 +161,13 @@
</controls:data>
</controls:row>
<controls:row header="false"
- labelStyle="table-label-text" dataStyle="table-normal-text">
+ labelStyle="table-label-text" dataStyle="table-normal-text" styleId="serviceName">
<controls:label>
<bean:message key="service.name"/>:
</controls:label>
<controls:data>
<logic:equal name="serviceForm" property="adminAction" value="Create">
- <html:text property="serviceName" size="24" maxlength="24"/>
+ <html:text property="serviceName" size="24" maxlength="24" styleId="serviceName"/>
</logic:equal>
<logic:equal name="serviceForm" property="adminAction" value="Edit">
<html:hidden property="serviceName"/>
@@ -205,13 +205,13 @@
</controls:data>
</controls:row>
<controls:row header="false"
- labelStyle="table-label-text" dataStyle="table-normal-text">
+ labelStyle="table-label-text" dataStyle="table-normal-text" styleId="engineName">
<controls:label>
<bean:message key="service.name"/>:
</controls:label>
<controls:data>
<logic:equal name="serviceForm" property="adminAction" value="Create">
- <html:text property="engineName" size="24" maxlength="24"/>
+ <html:text property="engineName" size="24" maxlength="24" styleId="engineName"/>
</logic:equal>
<logic:equal name="serviceForm" property="adminAction" value="Edit">
<html:hidden property="engineName"/>
@@ -220,28 +220,28 @@
</controls:data>
</controls:row>
<controls:row header="false"
- labelStyle="table-label-text" dataStyle="table-normal-text">
+ labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debugLvlVals">
<controls:label>
<bean:message key="server.debuglevel"/>:
</controls:label>
<controls:data>
<bean:define id="debugLvlVals" name="serviceForm"
property="debugLvlVals"/>
- <html:select property="debugLvl">
+ <html:select property="debugLvl" styleId="debugLvlVals">
<html:options collection="debugLvlVals" property="value"
labelProperty="label"/>
</html:select>
</controls:data>
</controls:row>
<controls:row header="false"
- labelStyle="table-label-text" dataStyle="table-normal-text">
+ labelStyle="table-label-text" dataStyle="table-normal-text" styleId="hostNameVals">
<controls:label>
<bean:message key="service.defaulthostname"/>:
</controls:label>
<controls:data>
<bean:define id="hostNameVals" name="serviceForm"
property="hostNameVals"/>
- <html:select property="defaultHost">
+ <html:select property="defaultHost" styleId="hostNameVals">
<html:options collection="hostNameVals" property="value"
labelProperty="label"/>
</html:select>
1.3 +5 -4 jakarta-tomcat-catalina/webapps/admin/service/services.jsp
Index: services.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/service/services.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- services.jsp 24 Jul 2002 20:57:28 -0000 1.2
+++ services.jsp 23 Jan 2003 00:07:10 -0000 1.3
@@ -25,9 +25,9 @@
<bean:message key="actions.services.delete"/>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Service Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
</controls:action>
@@ -70,8 +70,9 @@
</logic:match>
<logic:notMatch name="service"
value='<%= (String)request.getAttribute("adminAppService") %>'>
+ <label for="services"></label>
<html:multibox property="services"
- value="<%= service.toString() %>"/>
+ value="<%= service.toString() %>" styleId="services" styleId="services"/>
</logic:notMatch>
</div></td>
<td><div align="left" class="table-normal-text">
1.4 +5 -5 jakarta-tomcat-catalina/webapps/admin/users/group.jsp
Index: group.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/group.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- group.jsp 16 Aug 2002 23:56:18 -0000 1.3
+++ group.jsp 23 Jan 2003 00:07:10 -0000 1.4
@@ -31,7 +31,7 @@
</td>
<td align="right" nowrap>
<div class="page-title-text">
- <controls:actions>
+ <controls:actions label="Group Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
</controls:action>
@@ -74,7 +74,7 @@
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="groupname">
<controls:label>
<bean:message key="users.prompt.groupname"/>
</controls:label>
@@ -84,18 +84,18 @@
<html:hidden property="groupname"/>
</logic:present>
<logic:notPresent name="groupForm" property="objectName">
- <html:text property="groupname" size="24" maxlength="32"/>
+ <html:text property="groupname" size="24" maxlength="32" styleId="groupname"/>
</logic:notPresent>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="description">
<controls:label>
<bean:message key="users.prompt.description"/>
</controls:label>
<controls:data>
- <html:text property="description" size="24" maxlength="128"/>
+ <html:text property="description" size="24" maxlength="128" styleId="description"/>
</controls:data>
</controls:row>
1.2 +4 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- groups.jspf 18 Jul 2002 16:48:16 -0000 1.1
+++ groups.jspf 23 Jan 2003 00:07:10 -0000 1.2
@@ -24,11 +24,13 @@
<logic:present name="checkboxes">
<td><div align="center" class="table-normal-text">
<logic:present name="userForm">
- <html:multibox property="groups" value="<%= group %>"/>
+ <label for="groups"></label>
+ <html:multibox property="groups" value="<%= group %>" styleId="groups"/>
</logic:present>
<logic:notPresent name="userForm">
+ <label for="groups"></label>
<input type="checkbox" name="groups"
- value="<%= group %>">
+ value="<%= group %>" styleId="groups">
</logic:notPresent>
</td>
</logic:present>
1.2 +5 -1 jakarta-tomcat-catalina/webapps/admin/users/listGroups.jspf
Index: listGroups.jspf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/listGroups.jspf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- listGroups.jspf 18 Jul 2002 16:48:16 -0000 1.1
+++ listGroups.jspf 23 Jan 2003 00:07:10 -0000 1.2
@@ -1,4 +1,6 @@
-<controls:actions>
+<td align="right" nowrap>
+<div class="page-title-text">
+<controls:actions label="Group Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
@@ -26,3 +28,5 @@
</controls:action>
</controls:actions>
+</div>
+</td>
1.2 +5 -1 jakarta-tomcat-catalina/webapps/admin/users/listRoles.jspf
Index: listRoles.jspf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/listRoles.jspf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- listRoles.jspf 18 Jul 2002 16:48:16 -0000 1.1
+++ listRoles.jspf 23 Jan 2003 00:07:10 -0000 1.2
@@ -1,4 +1,6 @@
-<controls:actions>
+<td align="right" nowrap>
+<div class="page-title-text">
+<controls:actions label="Role Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
@@ -26,3 +28,5 @@
</controls:action>
</controls:actions>
+</div>
+</td>
1.2 +5 -1 jakarta-tomcat-catalina/webapps/admin/users/listUsers.jspf
Index: listUsers.jspf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/listUsers.jspf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- listUsers.jspf 18 Jul 2002 16:48:16 -0000 1.1
+++ listUsers.jspf 23 Jan 2003 00:07:10 -0000 1.2
@@ -1,4 +1,6 @@
-<controls:actions>
+<td align="right" nowrap>
+<div class="page-title-text">
+<controls:actions label="User Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
@@ -26,3 +28,5 @@
</controls:action>
</controls:actions>
+</div>
+</td>
1.4 +5 -5 jakarta-tomcat-catalina/webapps/admin/users/role.jsp
Index: role.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/role.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- role.jsp 16 Aug 2002 23:56:18 -0000 1.3
+++ role.jsp 23 Jan 2003 00:07:10 -0000 1.4
@@ -31,7 +31,7 @@
</td>
<td align="right" nowrap>
<div class="page-title-text">
- <controls:actions>
+ <controls:actions label="Role Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
</controls:action>
@@ -74,7 +74,7 @@
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="rolename">
<controls:label>
<bean:message key="users.prompt.rolename"/>
</controls:label>
@@ -84,18 +84,18 @@
<html:hidden property="rolename"/>
</logic:present>
<logic:notPresent name="roleForm" property="objectName">
- <html:text property="rolename" size="24" maxlength="32"/>
+ <html:text property="rolename" size="24" maxlength="32" styleId="rolename"/>
</logic:notPresent>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="description">
<controls:label>
<bean:message key="users.prompt.description"/>:
</controls:label>
<controls:data>
- <html:text property="description" size="24" maxlength="128"/>
+ <html:text property="description" size="24" maxlength="128" styleId="description"/>
</controls:data>
</controls:row>
1.2 +6 -3 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- roles.jspf 18 Jul 2002 16:48:16 -0000 1.1
+++ roles.jspf 23 Jan 2003 00:07:10 -0000 1.2
@@ -24,15 +24,18 @@
<logic:present name="checkboxes">
<td><div align="center" class="table-normal-text">
<logic:present name="groupForm">
- <html:multibox property="roles" value="<%= role %>"/>
+ <label for="roles"></label>
+ <html:multibox property="roles" value="<%= role %>" styleId="roles"/>
</logic:present>
<logic:present name="userForm">
- <html:multibox property="roles" value="<%= role %>"/>
+ <label for="roles"></label>
+ <html:multibox property="roles" value="<%= role %>" styleId="roles"/>
</logic:present>
<logic:notPresent name="groupForm">
<logic:notPresent name="userForm">
+ <label for="roles"></label>
<input type="checkbox" name="roles"
- value="<%= role %>">
+ value="<%= role %>" styleId="roles">
</logic:notPresent>
</logic:notPresent>
</td>
1.4 +7 -7 jakarta-tomcat-catalina/webapps/admin/users/user.jsp
Index: user.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/user.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- user.jsp 16 Aug 2002 23:56:18 -0000 1.3
+++ user.jsp 23 Jan 2003 00:07:10 -0000 1.4
@@ -31,7 +31,7 @@
</td>
<td align="right" nowrap>
<div class="page-title-text">
- <controls:actions>
+ <controls:actions label="User Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
</controls:action>
@@ -75,7 +75,7 @@
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="username">
<controls:label>
<bean:message key="users.prompt.username"/>
</controls:label>
@@ -85,28 +85,28 @@
<html:hidden property="username"/>
</logic:present>
<logic:notPresent name="userForm" property="objectName">
- <html:text property="username" size="24" maxlength="32"/>
+ <html:text property="username" size="24" maxlength="32" styleId="username"/>
</logic:notPresent>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="password">
<controls:label>
<bean:message key="users.prompt.password"/>
</controls:label>
<controls:data>
- <html:password property="password" size="24" maxlength="32"/>
+ <html:password property="password" size="24" maxlength="32" styleId="password"/>
</controls:data>
</controls:row>
<controls:row labelStyle="table-label-text"
- dataStyle="table-normal-text">
+ dataStyle="table-normal-text" styleId="fullname">
<controls:label>
<bean:message key="users.prompt.fullName"/>
</controls:label>
<controls:data>
- <html:text property="fullName" size="24" maxlength="64"/>
+ <html:text property="fullName" size="24" maxlength="64" styleId="fullname"/>
</controls:data>
</controls:row>
1.2 +2 -1 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- users.jspf 18 Jul 2002 16:48:16 -0000 1.1
+++ users.jspf 23 Jan 2003 00:07:10 -0000 1.2
@@ -23,8 +23,9 @@
<tr class="line-row">
<logic:present name="checkboxes">
<td><div align="center" class="table-normal-text">
+ <label for="users"></label>
<input type="checkbox" name="users"
- value="<%= user %>">
+ value="<%= user %>" styleId="users">
</td>
</logic:present>
<td><div align="left" class="table-normal-text">
1.4 +19 -19 jakarta-tomcat-catalina/webapps/admin/valve/accessLogValve.jsp
Index: accessLogValve.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/valve/accessLogValve.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- accessLogValve.jsp 22 Nov 2002 22:24:56 -0000 1.3
+++ accessLogValve.jsp 23 Jan 2003 00:07:10 -0000 1.4
@@ -39,9 +39,9 @@
</logic:equal>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Valve Actions">
<controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
<logic:notEqual name="accessLogValveForm" property="adminAction" value="Create">
@@ -76,11 +76,11 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="type">
<controls:label><bean:message key="connector.type"/>:</controls:label>
<controls:data>
<logic:equal name="accessLogValveForm" property="adminAction" value="Create">
- <html:select property="valveType" onchange="IA_jumpMenu('self',this)">
+ <html:select property="valveType" onchange="IA_jumpMenu('self',this)" styleId="type">
<bean:define id="valveTypeVals" name="accessLogValveForm" property="valveTypeVals"/>
<html:options collection="valveTypeVals" property="value" labelProperty="label"/>
</html:select>
@@ -91,10 +91,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debuglevel">
<controls:label><bean:message key="server.debuglevel"/>:</controls:label>
<controls:data>
- <html:select property="debugLvl">
+ <html:select property="debugLvl" styleId="debuglevel">
<bean:define id="debugLvlVals" name="accessLogValveForm" property="debugLvlVals"/>
<html:options collection="debugLvlVals" property="value"
labelProperty="label"/>
@@ -102,31 +102,31 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="directory">
<controls:label><bean:message key="logger.directory"/>:</controls:label>
<controls:data>
- <html:text property="directory" size="30"/>
+ <html:text property="directory" size="30" styleId="directory"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="pattern">
<controls:label><bean:message key="valve.pattern"/>:</controls:label>
<controls:data>
- <html:textarea property="pattern" cols="30" rows="2"/>
+ <html:textarea property="pattern" cols="30" rows="2" styleId="pattern"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="prefix">
<controls:label><bean:message key="logger.prefix"/>:</controls:label>
<controls:data>
- <html:text property="prefix" size="30"/>
+ <html:text property="prefix" size="30" styleId="prefix"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="resolveHosts">
<controls:label><bean:message key="valve.resolveHosts"/>:</controls:label>
<controls:data>
- <html:select property="resolveHosts">
+ <html:select property="resolveHosts" styleId="resolveHosts">
<bean:define id="booleanVals" name="accessLogValveForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -134,10 +134,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="rotatable">
<controls:label><bean:message key="valve.rotatable"/>:</controls:label>
<controls:data>
- <html:select property="rotatable">
+ <html:select property="rotatable" styleId="rotatable">
<bean:define id="booleanVals" name="accessLogValveForm" property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
@@ -145,10 +145,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="suffix">
<controls:label><bean:message key="logger.suffix"/>:</controls:label>
<controls:data>
- <html:text property="suffix" size="30"/>
+ <html:text property="suffix" size="30" styleId="suffix"/>
</controls:data>
</controls:row>
1.3 +9 -9 jakarta-tomcat-catalina/webapps/admin/valve/remoteAddrValve.jsp
Index: remoteAddrValve.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/valve/remoteAddrValve.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- remoteAddrValve.jsp 24 Jul 2002 20:57:29 -0000 1.2
+++ remoteAddrValve.jsp 23 Jan 2003 00:07:10 -0000 1.3
@@ -39,9 +39,9 @@
</logic:equal>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Valve Actions">
<controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
<logic:notEqual name="remoteAddrValveForm" property="adminAction" value="Create">
@@ -76,11 +76,11 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="type">
<controls:label><bean:message key="connector.type"/>:</controls:label>
<controls:data>
<logic:equal name="remoteAddrValveForm" property="adminAction" value="Create">
- <html:select property="valveType" onchange="IA_jumpMenu('self',this)">
+ <html:select property="valveType" onchange="IA_jumpMenu('self',this)" styleId="type">
<bean:define id="valveTypeVals" name="remoteAddrValveForm" property="valveTypeVals"/>
<html:options collection="valveTypeVals" property="value" labelProperty="label"/>
</html:select>
@@ -91,17 +91,17 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="allowIPs">
<controls:label><bean:message key="valve.allowIPs"/>:</controls:label>
<controls:data>
- <html:textarea property="allow" cols="30" rows="3"/>
+ <html:textarea property="allow" cols="30" rows="3" styleId="allowIPs"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="denyIPs">
<controls:label><bean:message key="valve.denyIPs"/>:</controls:label>
<controls:data>
- <html:textarea property="deny" cols="30" rows="3"/>
+ <html:textarea property="deny" cols="30" rows="3" styleId="denyIPs"/>
</controls:data>
</controls:row>
1.3 +9 -9 jakarta-tomcat-catalina/webapps/admin/valve/remoteHostValve.jsp
Index: remoteHostValve.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/valve/remoteHostValve.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- remoteHostValve.jsp 24 Jul 2002 20:57:29 -0000 1.2
+++ remoteHostValve.jsp 23 Jan 2003 00:07:10 -0000 1.3
@@ -39,9 +39,9 @@
</logic:equal>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Valve Actions">
<controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
<logic:notEqual name="remoteHostValveForm" property="adminAction" value="Create">
@@ -76,11 +76,11 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="type">
<controls:label><bean:message key="connector.type"/>:</controls:label>
<controls:data>
<logic:equal name="remoteHostValveForm" property="adminAction" value="Create">
- <html:select property="valveType" onchange="IA_jumpMenu('self',this)">
+ <html:select property="valveType" onchange="IA_jumpMenu('self',this)" styleId="type">
<bean:define id="valveTypeVals" name="remoteHostValveForm" property="valveTypeVals"/>
<html:options collection="valveTypeVals" property="value" labelProperty="label"/>
</html:select>
@@ -91,17 +91,17 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="allowHosts">
<controls:label><bean:message key="valve.allowHosts"/>:</controls:label>
<controls:data>
- <html:textarea property="allow" cols="30" rows="3"/>
+ <html:textarea property="allow" cols="30" rows="3" styleId="allowHosts"/>
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="denyHosts">
<controls:label><bean:message key="valve.denyHosts"/>:</controls:label>
<controls:data>
- <html:textarea property="deny" cols="30" rows="3"/>
+ <html:textarea property="deny" cols="30" rows="3" styleId="denyHosts"/>
</controls:data>
</controls:row>
1.3 +5 -5 jakarta-tomcat-catalina/webapps/admin/valve/requestDumperValve.jsp
Index: requestDumperValve.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/valve/requestDumperValve.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- requestDumperValve.jsp 24 Jul 2002 20:57:29 -0000 1.2
+++ requestDumperValve.jsp 23 Jan 2003 00:07:10 -0000 1.3
@@ -39,9 +39,9 @@
</logic:equal>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Valve Actions">
<controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
<logic:notEqual name="requestDumperValveForm" property="adminAction" value="Create">
@@ -77,11 +77,11 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="type">
<controls:label><bean:message key="connector.type"/>:</controls:label>
<controls:data>
<logic:equal name="requestDumperValveForm" property="adminAction" value="Create">
- <html:select property="valveType" onchange="IA_jumpMenu('self',this)">
+ <html:select property="valveType" onchange="IA_jumpMenu('self',this)" styleId="type">
<bean:define id="valveTypeVals" name="requestDumperValveForm" property="valveTypeVals"/>
<html:options collection="valveTypeVals" property="value" labelProperty="label"/>
</html:select>
1.3 +7 -7 jakarta-tomcat-catalina/webapps/admin/valve/singleSignOnValve.jsp
Index: singleSignOnValve.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/valve/singleSignOnValve.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- singleSignOnValve.jsp 24 Jul 2002 20:57:29 -0000 1.2
+++ singleSignOnValve.jsp 23 Jan 2003 00:07:10 -0000 1.3
@@ -39,9 +39,9 @@
</logic:equal>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Valve Actions">
<controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
<logic:notEqual name="singleSignOnValveForm" property="adminAction" value="Create">
@@ -76,11 +76,11 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="type">
<controls:label><bean:message key="connector.type"/>:</controls:label>
<controls:data>
<logic:equal name="singleSignOnValveForm" property="adminAction" value="Create">
- <html:select property="valveType" onchange="IA_jumpMenu('self',this)">
+ <html:select property="valveType" onchange="IA_jumpMenu('self',this)" styleId="type">
<bean:define id="valveTypeVals" name="singleSignOnValveForm" property="valveTypeVals"/>
<html:options collection="valveTypeVals" property="value" labelProperty="label"/>
</html:select>
@@ -91,10 +91,10 @@
</controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debugLvlVals">
<controls:label><bean:message key="server.debuglevel"/>:</controls:label>
<controls:data>
- <html:select property="debugLvl">
+ <html:select property="debugLvl" styleId="debugLvlVals">
<bean:define id="debugLvlVals" name="singleSignOnValveForm" property="debugLvlVals"/>
<html:options collection="debugLvlVals" property="value"
labelProperty="label"/>
1.3 +5 -4 jakarta-tomcat-catalina/webapps/admin/valve/valves.jsp
Index: valves.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/valve/valves.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- valves.jsp 24 Jul 2002 20:57:29 -0000 1.2
+++ valves.jsp 23 Jan 2003 00:07:10 -0000 1.3
@@ -29,9 +29,9 @@
<bean:message key="actions.valves.delete"/>
</div>
</td>
- <td width="19%">
- <div align="right">
- <controls:actions>
+ <td align="right" nowrap>
+ <div class="page-title-text">
+ <controls:actions label="Valve Actions">
<controls:action selected="true">
----<bean:message key="actions.available.actions"/>----
</controls:action>
@@ -68,8 +68,9 @@
<logic:iterate name="valvesList" id="valve">
<tr class="line-row">
<td><div align="left" class="table-normal-text">
+ <label for="valves"></label>
<html:multibox property="valves"
- value="<%= valve.toString() %>"/>
+ value="<%= valve.toString() %>" styleId="valves"/>
</div></td>
<td><div align="left" class="table-normal-text">
<html:link page='<%= "/EditValve.do?select=" +
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>