geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r675083 [2/2] - in /geronimo/server/trunk/plugins/console: console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/ console-base-portlets/src/main/webapp/WEB-INF/view/ca/ console-base-portlets/src/main/webapp/WEB-INF/view/configmanager...
Date Wed, 09 Jul 2008 02:07:11 GMT
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_zh.properties?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_zh.properties Tue Jul  8 19:07:09 2008
@@ -22,6 +22,8 @@
 console.common.password                   = \u5BC6\u7801
 console.common.username                   = \u7528\u6237\u540D
 console.head.title                        = Geronimo\u63A7\u5236\u53F0
+console.common.pages                      = \u9875\u9762
+console.common.applications 							= \u5e94\u7528
 console.login.components                  = <strong>Geronimo&#8482;</strong> has integrated the following components:<BR/> &nbsp;&nbsp;&#149;&nbsp; Application server (Apache Geronimo)<br/> &nbsp;&nbsp;&#149;&nbsp; Web server and servlet engine (Tomcat)<br/> &nbsp;&nbsp;&#149;&nbsp; Web server and servlet engine (Jetty)<br/> &nbsp;&nbsp;&#149;&nbsp; JSP compiler (Jasper)<br/> &nbsp;&nbsp;&#149;&nbsp; JAX-RPC Web Services engine (Apache Axis)<br/> &nbsp;&nbsp;&#149;&nbsp; JAX-WS Web Services engine (Apache Axis2)<br/> &nbsp;&nbsp;&#149;&nbsp; JAX-WS Web Services engine (Apache CXF)<br/> &nbsp;&nbsp;&#149;&nbsp; Relational database (Apache Derby)<br/> &nbsp;&nbsp;&#149;&nbsp; Messaging (ActiveMQ)<br/> &nbsp;&nbsp;&#149;&nbsp; User management services<br/> &nbsp;&nbsp;&#149;&nbsp; Centralized administration console<br/> 
 console.login.introduction                = <strong>GERONIMO&#8482;</strong> is a Java-certified, production-grade platform designed to allow developers to rapidly deploy and manage their applications. The result is an integrated, highly functional application platform that leverages the latest innovations from the open source community and simplifies application deployment and maintenance.
 console.login.requireCookies              = \u6CE8\u610F\uFF1A\u9700\u8981\u6FC0\u6D3B\u6D4F\u89C8\u5668\u7684Cookie\u529F\u80FD\uFF0C\u624D\u80FD\u767B\u5F55\u5230Geronimo\u63A7\u5236\u53F0\u3002

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp Tue Jul  8 19:07:09 2008
@@ -20,7 +20,7 @@
 <%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
 <%@ taglib uri="http://portals.apache.org/pluto/portlet-el" prefix="portlet-el" %>
-
+<fmt:setBundle basename="portaldriver"/>
 <portlet:defineObjects/>
 
 <portlet:actionURL var="formActionUrl"/>
@@ -70,14 +70,14 @@
 
 
 
-    <select name="page" onChange="<portlet:namespace/>doSwitchPage(this)">
+    <select name="page" title='<fmt:message key="console.common.pages" />' onChange="<portlet:namespace/>doSwitchPage(this)">
       <option value="Select. . .">Select. . .</option>
     <c:forEach items="${driverConfig.pages}" var="page">
       <option value="<c:out value="${page.name}"/>"><c:out value="${page.name}"/></option>
     </c:forEach>
     </select>
 
-    <select name="placedPortlets" size="5">
+    <select name="placedPortlets" title='<fmt:message key="console.common.pages" />' size="5">
 
     </select>
 
@@ -124,14 +124,14 @@
         }
     </script>
 
-    <select name="applications" onChange="<portlet:namespace/>doSwitch(this)">
+    <select name="applications" title='<fmt:message key="console.common.applications" />' onChange="<portlet:namespace/>doSwitch(this)">
       <option value='-'>Select. . .</option>
       <c:forEach items="${portletContainer.optionalContainerServices.portletRegistryService.registeredPortletApplications}" var="app">
       <option value="<c:out value="${app.applicationId}"/>"><c:out value="${app.applicationName}"/></option>
       </c:forEach>
     </select>
 
-    <select name="availablePortlets" disabled="true" onChange='<portlet:namespace/>doSwitchButton(this)'>
+    <select name="availablePortlets" title='<fmt:message key="console.common.applications" />' disabled="true" onChange='<portlet:namespace/>doSwitchButton(this)'>
 
     </select>
 

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp Tue Jul  8 19:07:09 2008
@@ -79,17 +79,17 @@
               </tr>
               <tr>
                 <td class="MediumBackground" ROWSPAN=3 ALIGN="center" ><img border="0" align="center" src="<%=request.getContextPath()%>/images/login_lock_64x55.gif" alt=""/></td> 
-                <td align="right" class="MediumBackground"><strong><fmt:message key="console.common.username"/></strong></td>
+                <td align="right" class="MediumBackground"><strong><label for="<portlet:namespace/>j_username"><fmt:message key="console.common.username"/></label></strong></td>
                 <td class="MediumBackground"><strong>:</strong></td>
                 <td width="1" class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground"><input name="j_username" type="text" class="InputField" value="" size="20px"/></td>
+                <td class="MediumBackground"><input name="j_username" id="<portlet:namespace/>j_username" type="text" class="InputField" value="" size="20px"/></td>
                 <td width="17" class="MediumBackground">&nbsp;</td>
               </tr>
               <tr>
-                <td align="right" class="MediumBackground"><strong><fmt:message key="console.common.password"/></strong></td>
+                <td align="right" class="MediumBackground"><strong><label for="<portlet:namespace/>j_password"><fmt:message key="console.common.password"/></label></strong></td>
                 <td class="MediumBackground"><strong>:</strong></td>
                 <td width="1" class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground"><input name="j_password" type="password" class="InputField" value="" size="20px"/></td>
+                <td class="MediumBackground"><input name="j_password" id="<portlet:namespace/>j_password" type="password" class="InputField" value="" size="20px"/></td>
                 <td class="MediumBackground">&nbsp;</td>
               </tr>
               <tr>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp Tue Jul  8 19:07:09 2008
@@ -78,17 +78,17 @@
               </tr>
               <tr>
                 <td class="MediumBackground" ROWSPAN=3 ALIGN="center" ><img border="0" align="center" src="<%=request.getContextPath()%>/images/login_lock_64x55.gif" alt=""/></td> 
-                <td align="right" class="MediumBackground"><strong><fmt:message key="console.common.username"/></strong></td>
+                <td align="right" class="MediumBackground"><strong><label for="<portlet:namespace/>j_username"><fmt:message key="console.common.username"/></label></strong></td>
                 <td class="MediumBackground"><strong>:</strong></td>
                 <td width="1" class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground"><input name="j_username" type="text" class="InputField" value="" size="20px" maxlength="25"/></td>
+                <td class="MediumBackground"><input name="j_username" id="<portlet:namespace/>j_username" type="text" class="InputField" value="" size="20px" maxlength="25"/></td>
                 <td width="17" class="MediumBackground">&nbsp;</td>
               </tr>
               <tr>
-                <td align="right" class="MediumBackground"><strong><fmt:message key="console.common.password"/></strong></td>
+                <td align="right" class="MediumBackground"><strong><label for="<portlet:namespace/>j_password"><fmt:message key="console.common.password"/></label></strong></td>
                 <td class="MediumBackground"><strong>:</strong></td>
                 <td width="1" class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground"><input name="j_password" type="password" class="InputField" value="" size="20px" maxlength="25"/></td>
+                <td class="MediumBackground"><input name="j_password" id="<portlet:namespace/>j_password" type="password" class="InputField" value="" size="20px" maxlength="25"/></td>
                 <td class="MediumBackground">&nbsp;</td>
               </tr>
               <tr>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/addRepository.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/addRepository.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/addRepository.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/addRepository.jsp Tue Jul  8 19:07:09 2008
@@ -45,7 +45,7 @@
 
 <form name="<portlet:namespace/>PluginForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="addRepository-after" />
-    <b><fmt:message key="car.common.newRepository" />:</b> <input type="text" name="newRepository" size="40" maxlength="200" />
+    <b><label for="<portlet:namespace/>newRepository"><fmt:message key="car.common.newRepository" /></label>:</b> <input type="text" name="newRepository" id="<portlet:namespace/>newRepository" size="40" maxlength="200" />
     <br />
     <c:if test="${!empty repoError}">
       <p><font color="red">${repoError}</font></p>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp Tue Jul  8 19:07:09 2008
@@ -54,24 +54,24 @@
     
 <table border="0" cellpadding="3">
 <tr>
-  <td><fmt:message key="car.list.assemblyGroupId"/></td>
-  <td><input type="text" name="groupId" value="${groupId}"/></td>
+  <td><label for="<portlet:namespace/>groupId"><fmt:message key="car.list.assemblyGroupId"/></label></td>
+  <td><input type="text" name="groupId" id="<portlet:namespace/>groupId" value="${groupId}"/></td>
 </tr>
 <tr>
-  <td><fmt:message key="car.list.assemblyArtifactId"/></td>
-  <td><input type="text" name="artifactId" value="${artifactId}"/></td>
+  <td><label for="<portlet:namespace/>artifactId"><fmt:message key="car.list.assemblyArtifactId"/></label></td>
+  <td><input type="text" name="artifactId" id="<portlet:namespace/>artifactId" value="${artifactId}"/></td>
 </tr>
 <tr>
-  <td><fmt:message key="car.list.assemblyVersion"/></td>
-  <td><input type="text" name="version" value="${version}"/></td>
+  <td><label for="<portlet:namespace/>version"><fmt:message key="car.list.assemblyVersion"/></label></td>
+  <td><input type="text" name="version" id="<portlet:namespace/>version" value="${version}"/></td>
 </tr>
 <tr>
-  <td><fmt:message key="car.list.assemblyPath"/></td>
-  <td><input type="text" name="relativeServerPath" value="${relativeServerPath}"/></td>
+  <td><label for="<portlet:namespace/>relativeServerPath"><fmt:message key="car.list.assemblyPath"/></label></td>
+  <td><input type="text" name="relativeServerPath" id="<portlet:namespace/>relativeServerPath" value="${relativeServerPath}"/></td>
 </tr>
 <tr>
-  <td><fmt:message key="car.list.assemblyFormat"/></td>
-  <td><select name="format">
+  <td><label for="<portlet:namespace/>format"><fmt:message key="car.list.assemblyFormat"/></label></td>
+  <td><select name="format" id="<portlet:namespace/>format">
         <option <c:if test="${format ne 'zip'}">selected="true"</c:if>>tar.gz</option>
         <option <c:if test="${format eq 'zip'}">selected="true"</c:if>>zip</option>
       </select>
@@ -95,7 +95,7 @@
 <c:set var="artifact" value="${plugin.pluginArtifact.moduleId}"/>
 <tr>
     <td class="${style}">
-        <input type="checkbox" name="plugin" value="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"/>
+        <input type="checkbox" name="plugin" title="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}" value="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"/>
     </td>
   <td class="${style}">
     ${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/createPluginIndex.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/createPluginIndex.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/createPluginIndex.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/createPluginIndex.jsp Tue Jul  8 19:07:09 2008
@@ -37,11 +37,11 @@
 
 <h2><fmt:message key="car.common.createGeronimoPlugin"/></h2>
 
-<p><fmt:message key="car.index.createGeronimoPluginExp"/></p>
+<p><label for="<portlet:namespace/>configId"><fmt:message key="car.index.createGeronimoPluginExp"/></label></p>
 
 <form name="<portlet:namespace/>ExportForm" action="<portlet:actionURL/>" method="POST" onsubmit="return <portlet:namespace/>validateForm()">
     <input type="hidden" name="mode" value="configure-before"/>
-    <select name="configId">
+    <select name="configId" id="<portlet:namespace/>configId">
         <option/>
         <c:forEach var="config" items="${configurations}">
             <option>${config.configID}</option>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/index.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/index.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/index.jsp Tue Jul  8 19:07:09 2008
@@ -26,8 +26,8 @@
 
 <form name="<portlet:namespace/>PluginForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="index-after"/>
-    <b><fmt:message key="car.common.repository"/>:</b> <%-- todo: entry field for user-specified list --%>
-    <select name="repository">
+    <b><label for="<portlet:namespace/>repository"><fmt:message key="car.common.repository"/></label>:</b> <%-- todo: entry field for user-specified list --%>
+    <select name="repository" id="<portlet:namespace/>repository">
         <c:forEach var="repo" items="${repositories}">
             <option<c:if test="${repo eq repository}"> selected</c:if>>${repo}</option>
         </c:forEach>
@@ -40,8 +40,8 @@
     </p>
     <c:if test="${!empty repositories}">
         <br/><b><fmt:message key="car.index.optionalAuthentication"/>:</b>
-        <fmt:message key="consolebase.common.user"/>: <input type="text" name="username" value="${repouser}" size="12" maxlength="200"/>
-        <fmt:message key="consolebase.common.password"/>: <input type="password" name="password" value="${repopass}" size="12" maxlength="200"/>
+        <label for="<portlet:namespace/>username"><fmt:message key="consolebase.common.user"/></label>: <input type="text" name="username" id="<portlet:namespace/>username" value="${repouser}" size="12" maxlength="200"/>
+        <label for="<portlet:namespace/>password"><fmt:message key="consolebase.common.password"/></label>: <input type="password" name="password" id="<portlet:namespace/>password" value="${repopass}" size="12" maxlength="200"/>
         <br/><input type="submit" value='<fmt:message key="car.common.searchForPlugins" />'/>
     </c:if>
 </form>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/list.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/list.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/list.jsp Tue Jul  8 19:07:09 2008
@@ -69,7 +69,7 @@
 <c:set var="artifact" value="${plugin.pluginArtifact.moduleId}"/>
 <tr>
     <td class="${style}">
-        <input type="checkbox" name="plugin" value="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}" ${plugin.installable ? "": "disabled='true'"}/>
+        <input type="checkbox" name="plugin" title="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}" value="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}" ${plugin.installable ? "": "disabled='true'"}/>
     </td>
   <td class="${style}">
     <a href='<portlet:actionURL>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/pluginParams.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/pluginParams.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/pluginParams.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/pluginParams.jsp Tue Jul  8 19:07:09 2008
@@ -32,8 +32,8 @@
 
         <!-- ENTRY FIELD: Name -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.pluginParams.humanReadableName" />:</div></th>
-            <td><input name="name" type="text" size="30" value="${name}" /></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>name"><fmt:message key="car.pluginParams.humanReadableName" /></label>:</div></th>
+            <td><input name="name" id="<portlet:namespace/>name" type="text" size="30" value="${name}" /></td>
           </tr>
           <tr>
             <td></td>
@@ -55,8 +55,8 @@
           </tr>
         <!-- ENTRY FIELD: Repositories -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.downloadRepositories" />:</div></th>
-            <td><textarea rows="5" cols="60" name="repository">${repository}</textarea></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>repository"><fmt:message key="car.common.downloadRepositories" /></label>:</div></th>
+            <td><textarea rows="5" cols="60" name="repository" id="<portlet:namespace/>repository">${repository}</textarea></td>
           </tr>
           <tr>
             <td></td>
@@ -67,8 +67,8 @@
           </tr>
         <!-- ENTRY FIELD: Category -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.category" />:</div></th>
-            <td><input name="category" type="text" size="30" value="${category}" /></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>category"><fmt:message key="car.common.category" /></label>:</div></th>
+            <td><input name="category" id="<portlet:namespace/>category" type="text" size="30" value="${category}" /></td>
           </tr>
           <tr>
             <td></td>
@@ -78,8 +78,8 @@
           </tr>
         <!-- ENTRY FIELD: Description -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="consolebase.common.description"/>:</div></th>
-            <td><textarea rows="10" cols="60" name="description">${description}</textarea></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>description"><fmt:message key="consolebase.common.description"/></label>:</div></th>
+            <td><textarea rows="10" cols="60" name="description" id="<portlet:namespace/>description">${description}</textarea></td>
           </tr>
           <tr>
             <td></td>
@@ -90,8 +90,8 @@
           </tr>
         <!-- ENTRY FIELD: URL -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.pluginURL" />:</div></th>
-              <td><input name="url" type="text" size="30" value="${url}" /></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>url"><fmt:message key="car.common.pluginURL" /></label>:</div></th>
+              <td><input name="url" id="<portlet:namespace/>url" type="text" size="30" value="${url}" /></td>
           </tr>
           <tr>
             <td></td>
@@ -101,8 +101,8 @@
           </tr>
         <!-- ENTRY FIELD: Author -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.author" />:</div></th>
-              <td><input name="author" type="text" size="30" value="${author}" /></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>author"><fmt:message key="car.common.author" /></label>:</div></th>
+              <td><input name="author" id="<portlet:namespace/>author" type="text" size="30" value="${author}" /></td>
           </tr>
           <tr>
             <td></td>
@@ -112,8 +112,8 @@
           </tr>
         <!-- ENTRY FIELD: License -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.license" />:</div></th>
-            <td><input name="license" type="text" size="30" value="${license}" /></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>license"><fmt:message key="car.common.license" /></label>:</div></th>
+            <td><input name="license" id="<portlet:namespace/>license" type="text" size="30" value="${license}" /></td>
           </tr>
           <tr>
             <td></td>
@@ -123,9 +123,9 @@
           </tr>
         <!-- ENTRY FIELD: License Is Open Source-->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.openSource" />:</div></th>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>licenseOSI"><fmt:message key="car.common.openSource" /></label>:</div></th>
             <td>
-                <input type="checkbox" name="licenseOSI"<c:if test="${!(empty licenseOSI)}"> checked="checked"</c:if> />
+                <input type="checkbox" name="licenseOSI" id="<portlet:namespace/>licenseOSI"<c:if test="${!(empty licenseOSI)}"> checked="checked"</c:if> />
             </td>
           </tr>
           <tr>
@@ -136,8 +136,8 @@
           </tr>
         <!-- ENTRY FIELD: Geronimo Versions -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.geronimoVersions" />:</div></th>
-            <td><input type="text" cols="30" name="geronimoVersion" value="${geronimoVersion}"/></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>geronimoVersion"><fmt:message key="car.common.geronimoVersions" /></label>:</div></th>
+            <td><input type="text" cols="30" name="geronimoVersion" id="<portlet:namespace/>geronimoVersion" value="${geronimoVersion}"/></td>
           </tr>
           <tr>
             <td></td>
@@ -147,8 +147,8 @@
           </tr>
         <!-- ENTRY FIELD: JVM Versions -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="consolebase.common.JVMVersions"/>:</div></th>
-            <td><textarea rows="5" cols="60" name="jvmVersions">${jvmVersions}</textarea></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>jvmVersions"><fmt:message key="consolebase.common.JVMVersions"/></label>:</div></th>
+            <td><textarea rows="5" cols="60" name="jvmVersions" id="<portlet:namespace/>jvmVersions">${jvmVersions}</textarea></td>
           </tr>
           <tr>
             <td></td>
@@ -159,8 +159,8 @@
           </tr>
         <!-- ENTRY FIELD: Dependencies -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.dependencies" />:</div></th>
-            <td><textarea rows="5" cols="60" name="dependencies">${dependencies}</textarea></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>dependencies"><fmt:message key="car.common.dependencies" /></label>:</div></th>
+            <td><textarea rows="5" cols="60" name="dependencies" id="<portlet:namespace/>dependencies">${dependencies}</textarea></td>
           </tr>
           <tr>
             <td></td>
@@ -170,8 +170,8 @@
           </tr>
         <!-- ENTRY FIELD: Obsoletes -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.obsoletes" />:</div></th>
-            <td><textarea rows="5" cols="60" name="obsoletes">${obsoletes}</textarea></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>obsoletes"><fmt:message key="car.common.obsoletes" /></label>:</div></th>
+            <td><textarea rows="5" cols="60" name="obsoletes" id="<portlet:namespace/>obsoletes">${obsoletes}</textarea></td>
           </tr>
           <tr>
             <td></td>
@@ -182,8 +182,8 @@
           </tr>
         <!-- ENTRY FIELD: Prerequisite 1 -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.prerequisite1ID" />:</div></th>
-            <td><input name="prereq1" type="text" size="30" value="${prereq1}" /></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>prereq1"><fmt:message key="car.common.prerequisite1ID" /></label>:</div></th>
+            <td><input name="prereq1" id="<portlet:namespace/>prereq1" type="text" size="30" value="${prereq1}" /></td>
           </tr>
           <tr>
             <td></td>
@@ -195,9 +195,9 @@
         <!-- ENTRY FIELD: Prerequisite 1 Type -->
           <tr>
             <th style="min-width: 140px"><div align="right">
-            <fmt:message key="car.common.prerequisite1Type" />
+            <label for="<portlet:namespace/>prereq1type"><fmt:message key="car.common.prerequisite1Type" /></label>
            :</div></th>
-            <td><input name="prereq1type" type="text" size="30" value="${prereq1type}" /></td>
+            <td><input name="prereq1type" id="<portlet:namespace/>prereq1type" type="text" size="30" value="${prereq1type}" /></td>
           </tr>
           <tr>
             <td></td>
@@ -207,8 +207,8 @@
           </tr>
         <!-- ENTRY FIELD: Prerequisite 1 Description -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.prereq1Description" />:</div></th>
-            <td><textarea rows="5" cols="60" name="prereq1desc">${prereq1desc}</textarea></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>prereq1desc"><fmt:message key="car.common.prereq1Description" /></label>:</div></th>
+            <td><textarea rows="5" cols="60" name="prereq1desc" id="<portlet:namespace/>prereq1desc">${prereq1desc}</textarea></td>
           </tr>
           <tr>
             <td></td>
@@ -217,8 +217,8 @@
           </tr>
         <!-- ENTRY FIELD: Prerequisite 2 -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.prerequisite2ID" />:</div></th>
-            <td><input name="prereq2" type="text" size="30" value="${prereq2}" /></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>prereq2"><fmt:message key="car.common.prerequisite2ID" /></label>:</div></th>
+            <td><input name="prereq2" id="<portlet:namespace/>prereq2" type="text" size="30" value="${prereq2}" /></td>
           </tr>
           <tr>
             <td></td>
@@ -228,8 +228,8 @@
           </tr>
         <!-- ENTRY FIELD: Prerequisite 2 Type -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.prerequisite2Type" />:</div></th>
-            <td><input name="prereq2type" type="text" size="30" value="${prereq2type}" /></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>prereq2type"><fmt:message key="car.common.prerequisite2Type" /></label>:</div></th>
+            <td><input name="prereq2type" id="<portlet:namespace/>prereq2type" type="text" size="30" value="${prereq2type}" /></td>
           </tr>
           <tr>
             <td></td>
@@ -238,8 +238,8 @@
           </tr>
         <!-- ENTRY FIELD: Prerequisite 2 Description -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.prereq2Description" />:</div></th>
-            <td><textarea rows="5" cols="60" name="prereq2desc">${prereq2desc}</textarea></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>prereq2desc"><fmt:message key="car.common.prereq2Description" /></label>:</div></th>
+            <td><textarea rows="5" cols="60" name="prereq2desc" id="<portlet:namespace/>prereq2desc">${prereq2desc}</textarea></td>
           </tr>
           <tr>
             <td></td>
@@ -248,8 +248,8 @@
           </tr>
         <!-- ENTRY FIELD: Prerequisite 3 -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.prerequisite3ID" />:</div></th>
-            <td><input name="prereq3" type="text" size="30" value="${prereq3}" /></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>prereq3"><fmt:message key="car.common.prerequisite3ID" /></label>:</div></th>
+            <td><input name="prereq3" id="<portlet:namespace/>prereq3" type="text" size="30" value="${prereq3}" /></td>
           </tr>
           <tr>
             <td></td>
@@ -258,8 +258,8 @@
           </tr>
         <!-- ENTRY FIELD: Prerequisite 3 Type -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.prerequisite3Type" />:</div></th>
-            <td><input name="prereq3type" type="text" size="30" value="${prereq3type}" /></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>prereq3type"><fmt:message key="car.common.prerequisite3Type" /></label>:</div></th>
+            <td><input name="prereq3type" id="<portlet:namespace/>prereq3type" type="text" size="30" value="${prereq3type}" /></td>
           </tr>
           <tr>
             <td></td>
@@ -268,8 +268,8 @@
           </tr>
         <!-- ENTRY FIELD: Prerequisite 3 Description -->
           <tr>
-            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.prereq3Description" />:</div></th>
-            <td><textarea rows="5" cols="60" name="prereq3desc">${prereq3desc}</textarea></td>
+            <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>prereq3desc"><fmt:message key="car.common.prereq3Description" /></label>:</div></th>
+            <td><textarea rows="5" cols="60" name="prereq3desc" id="<portlet:namespace/>prereq3desc">${prereq3desc}</textarea></td>
           </tr>
           <tr>
             <td></td>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp Tue Jul  8 19:07:09 2008
@@ -59,18 +59,18 @@
 
 <p/>
 <div id="<portlet:namespace/>migratedPlan" style="display:inline">
-<fmt:message key="configmanager.deploy.migratedPlan" />:
+<label for="<portlet:namespace/>migratedPlan"><fmt:message key="configmanager.deploy.migratedPlan" /></label>:
 <form method="POST" action="/console/forwards/plan-export">
-    <textarea name="migratedPlan" rows=10 cols=80><c:out escapeXml="true" value="${migratedPlan}"/></textarea>
+    <textarea name="migratedPlan" id="<portlet:namespace/>migratedPlan" rows=10 cols=80><c:out escapeXml="true" value="${migratedPlan}"/></textarea>
     <br/>
     <button onclick="<portlet:namespace/>toggleDisplay('originalPlan');<portlet:namespace/>toggleDisplay('migratedPlan');return false;"><fmt:message key="configmanager.deploy.showOriginalPlan" /></button>
     <input type="submit" value='<fmt:message key="configmanager.deploy.saveLocally" />' />
 </form>
 </div>
 <div id="<portlet:namespace/>originalPlan" style="display:none">
-<fmt:message key="configmanager.deploy.originalPlan" />:
+<label for="<portlet:namespace/>originalPlan"><fmt:message key="configmanager.deploy.originalPlan" /></label>:
 <form>
-    <textarea rows=10 cols=80><c:out escapeXml="true" value="${originalPlan}"/></textarea><br/>
+    <textarea rows="10" cols="80" id="<portlet:namespace/>originalPlan"><c:out escapeXml="true" value="${originalPlan}"/></textarea><br/>
     <button onclick="<portlet:namespace/>toggleDisplay('migratedPlan');<portlet:namespace/>toggleDisplay('originalPlan');return false;"><fmt:message key="configmanager.deploy.showMigratedPlan" /></button>
 </form>
 </div>
@@ -79,13 +79,13 @@
 
 <form enctype="multipart/form-data" method="POST" action="<portlet:actionURL><portlet:param name="action" value="deploy"/></portlet:actionURL>">
 <table>
-  <tr><th align="right"><fmt:message key="configmanager.common.archive" />: </th><td><input type="file" name="module" /></td></tr>
-  <tr><th align="right"><fmt:message key="configmanager.common.plan" />: </th><td><input type="file" name="plan" /></td></tr>
+  <tr><th align="right"><label for="<portlet:namespace/>module"><fmt:message key="configmanager.common.archive" /></label>: </th><td><input type="file" name="module" id="<portlet:namespace/>module" /></td></tr>
+  <tr><th align="right"><label for="<portlet:namespace/>plan"><fmt:message key="configmanager.common.plan" /></label>: </th><td><input type="file" name="plan" id="<portlet:namespace/>plan" /></td></tr>
   <tr>
     <td></td>
     <td>
-        <input name="startApp" type="checkbox" value="yes" checked><fmt:message key="configmanager.common.startAppAfterInstall" /> <br />
-        <input name="redeploy" type="checkbox" value="yes"><fmt:message key="configmanager.deploy.redeployApplication" /> <br />
+        <input name="startApp" id="<portlet:namespace/>startApp" type="checkbox" value="yes" checked><label for="<portlet:namespace/>startApp"><fmt:message key="configmanager.common.startAppAfterInstall" /> </label><br />
+        <input name="redeploy" id="<portlet:namespace/>redeploy" type="checkbox" value="yes"><label for="<portlet:namespace/>redeploy"><fmt:message key="configmanager.deploy.redeployApplication" /> </label><br />
     </td>
   </tr>
   <tr>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp Tue Jul  8 19:07:09 2008
@@ -36,8 +36,8 @@
         }
       </script>
       <tr>
-        <th style="min-width: 140px"><div align="right"><fmt:message key="realmwizard.common.userSelectSQL" />:</div></th>
-        <td><input name="option-userSelect" type="text"
+        <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>option-userSelect"><fmt:message key="realmwizard.common.userSelectSQL" /></label>:</div></th>
+        <td><input name="option-userSelect" id="<portlet:namespace/>option-userSelect" type="text"
                    size="60" value="${realm.options['userSelect']}"></td>
       </tr>
       <tr>
@@ -46,8 +46,8 @@
       </tr>
 
       <tr>
-        <th><div align="right"><fmt:message key="realmwizard.common.groupSelectSQL" />:</div></th>
-        <td><input name="option-groupSelect" type="text"
+        <th><div align="right"><label for="<portlet:namespace/>option-groupSelect"><fmt:message key="realmwizard.common.groupSelectSQL" /></label>:</div></th>
+        <td><input name="option-groupSelect" id="<portlet:namespace/>option-groupSelect" type="text"
                    size="60" value="${realm.options['groupSelect']}"></td>
       </tr>
       <tr>
@@ -56,8 +56,8 @@
       </tr>
 
       <tr>
-        <th><div align="right"><fmt:message key="realmwizard.common.digestAlgorithm" />:</div></th>
-        <td><input name="option-digest" type="text"
+        <th><div align="right"><label for="<portlet:namespace/>option-digest"><fmt:message key="realmwizard.common.digestAlgorithm" /></label>:</div></th>
+        <td><input name="option-digest" id="<portlet:namespace/>option-digest" type="text"
                    size="10" value="${realm.options['digest']}"></td>
       </tr>
       <tr>
@@ -66,8 +66,8 @@
       </tr>
 
       <tr>
-        <th><div align="right"><fmt:message key="realmwizard.common.digestEncoding" />:</div></th>
-        <td><input name="option-encoding" type="text"
+        <th><div align="right"><label for="<portlet:namespace/>option-encoding"><fmt:message key="realmwizard.common.digestEncoding" /></label>:</div></th>
+        <td><input name="option-encoding" id="<portlet:namespace/>option-encoding" type="text"
                    size="10" value="${realm.options['encoding']}"></td>
       </tr>
       <tr>
@@ -84,9 +84,9 @@
 
 
       <tr>
-        <th><div align="right"><fmt:message key="realmwizard.common.databasePool" /></div></th>
+        <th><div align="right"><label for="<portlet:namespace/>option-databasePoolAbstractName"><fmt:message key="realmwizard.common.databasePool" /></label></div></th>
         <td>
-          <select name="option-databasePoolAbstractName" onChange="<portlet:namespace/>changeRequiredFields(this)">
+          <select name="option-databasePoolAbstractName" id="<portlet:namespace/>option-databasePoolAbstractName" onChange="<portlet:namespace/>changeRequiredFields(this)">
             <option />
         <c:forEach var="pool" items="${pools}">
             <option value="${pool.abstractName}"<c:if test="${realm.options['dataSourceName'] eq pool.name && realm.options['dataSourceApplication'] eq pool.applicationName}"> selected</c:if>>${pool.displayName}</option>
@@ -103,8 +103,8 @@
       </tr>
 
       <tr>
-        <th><div align="right"><fmt:message key="realmwizard.common.JDBCDriverClass" /></div></th>
-        <td><input name="option-jdbcDriver" type="text"
+        <th><div align="right"><label for="<portlet:namespace/>option-jdbcDriver"><fmt:message key="realmwizard.common.JDBCDriverClass" /></label></div></th>
+        <td><input name="option-jdbcDriver" id="<portlet:namespace/>option-jdbcDriver" type="text"
                    size="60" value="${realm.options['jdbcDriver']}"></td>
       </tr>
       <tr>
@@ -113,9 +113,9 @@
       </tr>
 
       <tr>
-        <th><div align="right"><fmt:message key="realmwizard.common.driverJAR" />:</div></th>
+        <th><div align="right"><label for="<portlet:namespace/>jar"><fmt:message key="realmwizard.common.driverJAR" /></label>:</div></th>
         <td>
-          <select name="jar">
+          <select name="jar" id="<portlet:namespace/>jar">
             <option />
         <c:forEach var="jar" items="${jars}">
             <option value="${jar}" <c:if test="${jar == realm.jar}">selected</c:if>>${jar}</option>
@@ -129,8 +129,8 @@
       </tr>
 
       <tr>
-        <th><div align="right"><fmt:message key="realmwizard.common.JDBCUrl" /></div></th>
-        <td><input name="option-jdbcURL" type="text"
+        <th><div align="right"><label for="<portlet:namespace/>option-jdbcURL"><fmt:message key="realmwizard.common.JDBCUrl" /></label></div></th>
+        <td><input name="option-jdbcURL" id="<portlet:namespace/>option-jdbcURL" type="text"
                    size="60" value="${realm.options['jdbcURL']}"></td>
       </tr>
       <tr>
@@ -139,8 +139,8 @@
       </tr>
 
       <tr>
-        <th><div align="right"><fmt:message key="realmwizard.common.JDBCUsername" /></div></th>
-        <td><input name="option-jdbcUser" type="text"
+        <th><div align="right"><label for="<portlet:namespace/>option-jdbcUser"><fmt:message key="realmwizard.common.JDBCUsername" /></label></div></th>
+        <td><input name="option-jdbcUser" id="<portlet:namespace/>option-jdbcUser" type="text"
                    size="20" value="${realm.options['jdbcUser']}"></td>
       </tr>
       <tr>
@@ -149,13 +149,13 @@
       </tr>
 
       <tr>
-        <th><div align="right"><fmt:message key="realmwizard.common.JDBCPassword" /></div></th>
-        <td><input name="option-jdbcPassword" type="password"
+        <th><div align="right"><label for="<portlet:namespace/>option-jdbcPassword"><fmt:message key="realmwizard.common.JDBCPassword" /></label></div></th>
+        <td><input name="option-jdbcPassword" id="<portlet:namespace/>option-jdbcPassword" type="password"
                    size="20" value="${realm.options['jdbcPassword']}"></td>
       </tr>
       <tr>
-        <th><div align="right"><fmt:message key="consolebase.common.confirmPassword"/></div></th>
-        <td><input name="confirm-option-jdbcPassword" type="password"
+        <th><div align="right"><label for="<portlet:namespace/>confirm-option-jdbcPassword"><fmt:message key="consolebase.common.confirmPassword"/></label></div></th>
+        <td><input name="confirm-option-jdbcPassword" id="<portlet:namespace/>confirm-option-jdbcPassword" type="password"
                    size="20" value="${realm.options['jdbcPassword']}"></td>
       </tr>
       <tr>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp Tue Jul  8 19:07:09 2008
@@ -91,12 +91,12 @@
     <table border="0">
     <!-- ENTRY FIELD: Audit Log -->
       <tr>
-        <th valign="top" style="min-width: 140px"><div align="right"><fmt:message key="realmwizard.common.enableAuditing" />:</div></th>
+        <th valign="top" style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>auditCheckbox"><fmt:message key="realmwizard.common.enableAuditing" /></label>:</div></th>
         <td valign="top">
           <input type="checkbox" id="<portlet:namespace/>auditCheckbox" name="enableAuditing"<c:if test="${!(empty realm.auditPath)}"> checked="checked"</c:if>
           onclick="document.getElementById('<portlet:namespace/>auditDiv').style.display=this.checked ? 'block' : 'none';document.getElementById('<portlet:namespace/>auditPath').value='';"/>
           <div id="<portlet:namespace/>auditDiv" style="display: <c:choose><c:when test="${empty realm.auditPath}">none</c:when><c:otherwise>block</c:otherwise></c:choose>;">
-          <fmt:message key="realmwizard.common.logFile" />: <input type="text" id="<portlet:namespace/>auditPath" name="auditPath" size="30" value="${realm.auditPath}" />
+          <label for="<portlet:namespace/>auditPath"><fmt:message key="realmwizard.common.logFile" /></label>: <input type="text" id="<portlet:namespace/>auditPath" name="auditPath" size="30" value="${realm.auditPath}" />
           </div>
         </td>
       </tr>
@@ -106,14 +106,14 @@
       </tr>
     <!-- ENTRY FIELDS: Lockout -->
       <tr>
-        <th valign="top"><div align="right"><fmt:message key="realmwizard.common.enableLockout" />:</div></th>
+        <th valign="top"><div align="right"><label for="<portlet:namespace/>lockoutCheckbox"><fmt:message key="realmwizard.common.enableLockout" /></label>:</div></th>
         <td valign="top">
           <input type="checkbox" id="<portlet:namespace/>lockoutCheckbox" name="enableLockout"<c:if test="${realm.lockoutEnabled}"> checked="checked"</c:if>
                  onclick="document.getElementById('<portlet:namespace/>lockoutDiv').style.display=this.checked ? 'block' : 'none';document.getElementById('<portlet:namespace/>lockoutCount').value='';document.getElementById('<portlet:namespace/>lockoutWindow').value='';document.getElementById('<portlet:namespace/>lockoutDuration').value='';"/>
           <div id="<portlet:namespace/>lockoutDiv" style="display: <c:choose><c:when test="${realm.lockoutEnabled}">block</c:when><c:otherwise>none</c:otherwise></c:choose>;">
-          <fmt:message key="realmwizard.advanced.lockUserAfter" /> <input type="text" id="<portlet:namespace/>lockoutCount" name="lockoutCount" size="2" maxlength="3" value="${realm.lockoutCount}" />
-          <fmt:message key="realmwizard.advanced.failuresWithin" /> <input type="text" id="<portlet:namespace/>lockoutWindow" name="lockoutWindow" size="4" maxlength="5" value="${realm.lockoutWindow}" /> <fmt:message key="realmwizard.advanced.failuresWithinSeconds" /><br />
-          <fmt:message key="realmwizard.advanced.keepAccountLockedFor" /> <input type="text" id="<portlet:namespace/>lockoutDuration" name="lockoutDuration" size="5" maxlength="5" value="${realm.lockoutDuration}" /> <fmt:message key="realmwizard.advanced.keepAccountLockedForSeconds" />.
+          <label for="<portlet:namespace/>lockoutCount"><fmt:message key="realmwizard.advanced.lockUserAfter" /> </label><input type="text" id="<portlet:namespace/>lockoutCount" name="lockoutCount" size="2" maxlength="3" value="${realm.lockoutCount}" />
+          <label for="<portlet:namespace/>lockoutWindow"><fmt:message key="realmwizard.advanced.failuresWithin" /> </label><input type="text" id="<portlet:namespace/>lockoutWindow" name="lockoutWindow" size="4" maxlength="5" value="${realm.lockoutWindow}" /> <fmt:message key="realmwizard.advanced.failuresWithinSeconds" /><br />
+          <label for="<portlet:namespace/>lockoutDuration"><fmt:message key="realmwizard.advanced.keepAccountLockedFor" /> </label><input type="text" id="<portlet:namespace/>lockoutDuration" name="lockoutDuration" size="5" maxlength="5" value="${realm.lockoutDuration}" /> <fmt:message key="realmwizard.advanced.keepAccountLockedForSeconds" />.
           </div>
         </td>
       </tr>
@@ -123,9 +123,9 @@
       </tr>
     <!-- ENTRY FIELD: Store Password -->
       <tr>
-        <th valign="top"><div align="right"><fmt:message key="realmwizard.common.storePassword" />:</div></th>
+        <th valign="top"><div align="right"><label for="<portlet:namespace/>storePassword"><fmt:message key="realmwizard.common.storePassword" /></label>:</div></th>
         <td valign="top">
-          <input type="checkbox" name="storePassword"<c:if test="${realm.storePassword}"> checked="checked"</c:if>/>
+          <input type="checkbox" name="storePassword" id="<portlet:namespace/>storePassword"<c:if test="${realm.storePassword}"> checked="checked"</c:if>/>
         </td>
       </tr>
       <tr>
@@ -134,12 +134,12 @@
       </tr>
     <!-- ENTRY FIELD: Named UPC -->
       <tr>
-        <th valign="top"><div align="right"><fmt:message key="realmwizard.advanced.namedCredential" />:</div></th>
+        <th valign="top"><div align="right"><label for="<portlet:namespace/>namedUPCCheckbox"><fmt:message key="realmwizard.advanced.namedCredential" /></label>:</div></th>
         <td valign="top">
           <input type="checkbox" id="<portlet:namespace/>namedUPCCheckbox" name="namedUPC"<c:if test="${!(empty realm.credentialName)}"> checked="checked"</c:if>
           onclick="document.getElementById('<portlet:namespace/>namedUPCDiv').style.display=this.checked ? 'block' : 'none';document.getElementById('<portlet:namespace/>credentialName').value='';"/>
           <div id="<portlet:namespace/>namedUPCDiv" style="display: <c:choose><c:when test="${empty realm.credentialName}">none</c:when><c:otherwise>block</c:otherwise></c:choose>;">
-          <fmt:message key="realmwizard.advanced.credentialName" />: <input type="text" id="<portlet:namespace/>credentialName" name="credentialName" size="30" value="${realm.credentialName}" />
+          <label for="<portlet:namespace/>credentialName"><fmt:message key="realmwizard.advanced.credentialName" /></label>: <input type="text" id="<portlet:namespace/>credentialName" name="credentialName" size="30" value="${realm.credentialName}" />
           </div>
         </td>
       </tr>
@@ -170,4 +170,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list" />
-            </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>
\ No newline at end of file
+            </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp Tue Jul  8 19:07:09 2008
@@ -95,15 +95,15 @@
     </script>
     <c:forEach var="option" items="${realm.optionNames}">
       <tr>
-        <th style="min-width: 140px"><div align="right">${optionMap[option].displayName}:</div></th>
-        <td><input name="option-${option}"
+        <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>option-${option}">${optionMap[option].displayName}</label>:</div></th>
+        <td><input name="option-${option}" id="<portlet:namespace/>option-${option}"
                    type="<c:choose><c:when test="${optionMap[option].password}">password</c:when><c:otherwise>text</c:otherwise></c:choose>"
                    size="${optionMap[option].length}" value="${realm.options[option]}"></td>
       </tr>
     <c:if test="${optionMap[option].password}">
       <tr>
-        <th style="min-width: 140px"><div align="right">Confirm password:</div></th>
-        <td><input name="confirm-option-${option}" type="password"
+        <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>confirm-option-${option}">Confirm password</label>:</div></th>
+        <td><input name="confirm-option-${option}" id="<portlet:namespace/>confirm-option-${option}" type="password"
                    size="${optionMap[option].length}" value="${realm.options[option]}"></td>
       </tr>
       <script language="JavaScript">

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/edit.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/edit.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/edit.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/edit.jsp Tue Jul  8 19:07:09 2008
@@ -53,7 +53,7 @@
         <td>
       <c:choose> <%-- Can't change the realm name after deployment because it's wired into all the abstractNames --%>
         <c:when test="${empty realm.abstractName}">
-          <input name="name" type="text" size="30" value="${realm.name}">
+          <input name="name" title='<fmt:message key="realmwizard.common.realmName" />' type="text" size="30" value="${realm.name}">
         </c:when>
         <c:otherwise>
           <input name="name" type="hidden" value="${realm.name}" />
@@ -70,9 +70,9 @@
     <c:choose>
       <c:when test="${mode eq 'custom'}">
       <tr>
-        <th><div align="right"><fmt:message key="realmwizard.edit.loginModuleJAR" />:</div></th>
+        <th><div align="right"><label for="<portlet:namespace/>jar"><fmt:message key="realmwizard.edit.loginModuleJAR" /></label>:</div></th>
         <td>
-          <select name="jar">
+          <select name="jar" id="<portlet:namespace/>jar">
                   <option />
               <c:forEach var="availableJar" items="${jars}">
                   <option <c:if test="${availableJar == realm.jar}">selected</c:if>>
@@ -101,7 +101,7 @@
         <td>
       <c:choose> <%-- Can't change the login domain name after deployment because it's how we know which GBean is which --%>
         <c:when test="${empty realm.abstractName}">
-          <input name="module-domain-${status.index}" type="text" size="20" value="${module.loginDomainName}" />
+          <input name="module-domain-${status.index}" title='<fmt:message key="realmwizard.common.loginDomainName" />' type="text" size="20" value="${module.loginDomainName}" />
         </c:when>
         <c:otherwise>
           <input name="module-domain-${status.index}" type="hidden" value="${module.loginDomainName}" />
@@ -117,17 +117,17 @@
         <td><fmt:message key="realmwizard.edit.loginDomainExp" /></td>
       </tr>
       <tr>
-        <th><div align="right"><fmt:message key="realmwizard.common.loginModuleClass" />:</div></th>
-        <td><input name="module-class-${status.index}" type="text" size="60" value="${module.className}" /></td>
+        <th><div align="right"><label for="<portlet:namespace/>module-class-${status.index}"><fmt:message key="realmwizard.common.loginModuleClass" /></label>:</div></th>
+        <td><input name="module-class-${status.index}" id="<portlet:namespace/>module-class-${status.index}" type="text" size="60" value="${module.className}" /></td>
       </tr>
       <tr>
         <td></td>
         <td><fmt:message key="realmwizard.edit.loginModuleClassExp" /></td>
       </tr>
       <tr>
-        <th><div align="right"><fmt:message key="realmwizard.common.controlFlag" />:</div></th>
+        <th><div align="right"><label for="<portlet:namespace/>module-control-${status.index}"><fmt:message key="realmwizard.common.controlFlag" /></label>:</div></th>
         <td>
-          <select name="module-control-${status.index}">
+          <select name="module-control-${status.index}" id="<portlet:namespace/>module-control-${status.index}">
             <option value="OPTIONAL"<c:if test="${module.controlFlag eq 'OPTIONAL'}"> selected</c:if>>Optional</option>
             <option value="REQUIRED"<c:if test="${module.controlFlag eq 'REQUIRED'}"> selected</c:if>>Required</option>
             <option value="REQUISITE"<c:if test="${module.controlFlag eq 'REQUISITE'}"> selected</c:if>>Requisite</option>
@@ -141,9 +141,9 @@
           <a href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/login/Configuration.html">javax.security.auth.login.Configuration</a>.</td>
       </tr>
       <tr>
-        <th><div align="right"><fmt:message key="realmwizard.common.supportAdvancedMapping" />:</div></th>
+        <th><div align="right"><label for="<portlet:namespace/>module-wrap-${status.index}"><fmt:message key="realmwizard.common.supportAdvancedMapping" /></label>:</div></th>
         <td>
-          <select name="module-wrap-${status.index}">
+          <select name="module-wrap-${status.index}" id="<portlet:namespace/>module-wrap-${status.index}">
             <option value="true"<c:if test="${module.wrapPrincipals}"> selected</c:if>>Yes</option>
             <option value="false"<c:if test="${!module.wrapPrincipals}"> selected</c:if>>No</option>
           </select>
@@ -154,8 +154,8 @@
         <td><fmt:message key="realmwizard.edit.supportAdvancedMappingExp" /></td>
       </tr>
       <tr>
-        <th><div align="right"><fmt:message key="realmwizard.common.configurationOptions" />:</div></th>
-        <td><textarea name="module-options-${status.index}" rows="5" cols="60">${module.optionString}</textarea></td>
+        <th><div align="right"><label for="<portlet:namespace/>module-options-${status.index}"><fmt:message key="realmwizard.common.configurationOptions" /></label>:</div></th>
+        <td><textarea name="module-options-${status.index}" id="<portlet:namespace/>module-options-${status.index}" rows="5" cols="60">${module.optionString}</textarea></td>
       </tr>
       <tr>
         <td></td>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp Tue Jul  8 19:07:09 2008
@@ -75,8 +75,8 @@
     <table border="0">
     <!-- ENTRY FIELD: NAME -->
       <tr>
-        <th style="min-width: 140px"><div align="right"><fmt:message key="realmwizard.common.nameOfSecurityRealm" />:</div></th>
-        <td><input name="name" type="text" size="30" value="${realm.name}" /></td>
+        <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>name"><fmt:message key="realmwizard.common.nameOfSecurityRealm" /></label>:</div></th>
+        <td><input name="name" id="<portlet:namespace/>name" type="text" size="30" value="${realm.name}" /></td>
       </tr>
       <tr>
         <td></td>
@@ -84,9 +84,9 @@
       </tr>
     <!-- ENTRY FIELD: REALM TYPE -->
       <tr>
-        <th><div align="right"><fmt:message key="realmwizard.common.realmType" />:</div></th>
+        <th><div align="right"><label for="<portlet:namespace/>realmType"><fmt:message key="realmwizard.common.realmType" /></label>:</div></th>
         <td>
-          <select name="realmType">
+          <select name="realmType" id="<portlet:namespace/>realmType">
         <c:forEach var="module" items="${moduleTypes}">
             <option <c:if test="${module.name == realm.realmType}">selected</c:if>>${module.name}</option>
         </c:forEach>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/showPlan.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/showPlan.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/showPlan.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/showPlan.jsp Tue Jul  8 19:07:09 2008
@@ -69,8 +69,8 @@
     <table border="0">
     <!-- STATUS FIELD: Deployment Plan -->
       <tr>
-        <th valign="top" style="min-width: 140px"><div align="right"><fmt:message key="realmwizard.common.deploymentPlan" />:</div></th>
-        <td><textarea rows="30" cols="60" readonly>${deploymentPlan}</textarea></td>
+        <th valign="top" style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>deploymentPlan"><fmt:message key="realmwizard.common.deploymentPlan" /></label>:</div></th>
+        <td><textarea rows="30" cols="60" id="<portlet:namespace/>deploymentPlan" readonly>${deploymentPlan}</textarea></td>
       </tr>
     <!-- SUBMIT BUTTON -->
       <tr>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp Tue Jul  8 19:07:09 2008
@@ -79,8 +79,8 @@
     <table border="0">
     <!-- ENTRY FIELD: Username -->
       <tr>
-        <th style="min-width: 140px"><div align="right"><fmt:message key="consolebase.common.userName"/>:</div></th>
-        <td><input name="username" type="text" size="20" /></td>
+        <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>username"><fmt:message key="consolebase.common.userName"/></label>:</div></th>
+        <td><input name="username" id="<portlet:namespace/>username" type="text" size="20" /></td>
       </tr>
       <tr>
         <td></td>
@@ -88,8 +88,8 @@
       </tr>
     <!-- ENTRY FIELD: Password -->
       <tr>
-        <th><div align="right"><fmt:message key="consolebase.common.password"/>:</div></th>
-        <td><input name="password" type="password" size="20" /></td>
+        <th><div align="right"><label for="<portlet:namespace/>password"><fmt:message key="consolebase.common.password"/></label>:</div></th>
+        <td><input name="password" id="<portlet:namespace/>password" type="password" size="20" /></td>
       </tr>
       <tr>
         <td></td>



Mime
View raw message