geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r675083 [1/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
Author: dwoods
Date: Tue Jul  8 19:07:09 2008
New Revision: 675083

URL: http://svn.apache.org/viewvc?rev=675083&view=rev
Log:
GERONIMO-4081 Accessibility issues.  Applied GERONIMO-4081-console.patch from Ivan.

Modified:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/ajpPort.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/config.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/webApps.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/processCSR.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/configureKey.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/createKeystore.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/generateCSR.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/importCAReply.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKey.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/uploadCertificate.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/view.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/groups/addmaximized.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/users/addmaximized.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver.properties
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_zh.properties
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/addRepository.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/createPluginIndex.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/index.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/list.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/pluginParams.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/edit.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/showPlan.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/ajpPort.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/ajpPort.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/ajpPort.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/ajpPort.jsp Tue Jul  8 19:07:09 2008
@@ -38,8 +38,8 @@
     <table border="0">
         <!-- ENTRY FIELD: AJP Port -->
         <tr>
-            <th><div align="right"><fmt:message key="apache.jk.ajpPort.networkPort"/>:</div></th>
-            <td><input name="addAjpPort" type="text" size="5" maxlength="5"
+            <th><div align="right"><label for="<portlet:namespace/>addAjpPort"><fmt:message key="apache.jk.ajpPort.networkPort"/></label>:</div></th>
+            <td><input name="addAjpPort" id="<portlet:namespace/>addAjpPort" type="text" size="5" maxlength="5"
                        value="${model.addAjpPort}"/></td>
         </tr>
         <tr>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/config.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/config.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/config.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/config.jsp Tue Jul  8 19:07:09 2008
@@ -36,9 +36,9 @@
     <table border="0">
         <!-- ENTRY FIELD: OS -->
         <tr>
-            <th><div align="right"><fmt:message key="apache.jk.config.operatingSystem"/>:</div></th>
+            <th><div align="right"><label for="<portlet:namespace/>os"><fmt:message key="apache.jk.config.operatingSystem"/></label>:</div></th>
             <td>
-                <select name="os">
+                <select name="os" id="<portlet:namespace/>os">
                     <option></option>
                     <option <c:if test="${model.os == 'Fedora Core 4'}">selected</c:if>>Fedora Core 4</option>
                     <option <c:if test="${model.os == 'SuSE Pro 9.0'}">selected</c:if>>SuSE Pro 9.0</option>
@@ -58,8 +58,8 @@
 
         <!-- ENTRY FIELD: workers.properties path -->
         <tr>
-            <th><div align="right"><fmt:message key="apache.jk.config.pathToProperties"/>:</div></th>
-            <td><input name="workersPath" type="text" size="30" maxlength="255"
+            <th><div align="right"><label for="<portlet:namespace/>workersPath"><fmt:message key="apache.jk.config.pathToProperties"/></label>:</div></th>
+            <td><input name="workersPath" id="<portlet:namespace/>workersPath" type="text" size="30" maxlength="255"
                        value="${model.workersPath}"/></td>
         </tr>
         <tr>
@@ -69,8 +69,8 @@
 
         <!-- ENTRY FIELD: log file path -->
         <tr>
-            <th><div align="right"><fmt:message key="apache.jk.config.logFileLocation"/>:</div></th>
-            <td><input name="logFilePath" type="text" size="30" maxlength="255"
+            <th><div align="right"><label for="<portlet:namespace/>logFilePath"><fmt:message key="apache.jk.config.logFileLocation"/></label>:</div></th>
+            <td><input name="logFilePath" id="<portlet:namespace/>logFilePath" type="text" size="30" maxlength="255"
                        value="${model.logFilePath}"/></td>
         </tr>
         <tr>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/webApps.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/webApps.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/webApps.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/webApps.jsp Tue Jul  8 19:07:09 2008
@@ -48,9 +48,9 @@
       <c:if test="${web.running}">
         <tr>
             <td>${web.name}</td>
-            <td align="center"><input type="checkbox" name="webapp.${status.index}.enabled"<c:if test="${model.webApps[status.index].enabled}"> checked="checked"</c:if> /></td>
-            <td align="center"><input type="checkbox" name="webapp.${status.index}.serveStaticContent"<c:if test="${model.webApps[status.index].serveStaticContent}"> checked="checked"</c:if> /></td>
-            <td><input type="text" name="webapp.${status.index}.dynamicPattern" size="20" maxlength="250"
+            <td align="center"><input type="checkbox" title='${web.name} <fmt:message key="apache.jk.webApps.throughApache"/>' name="webapp.${status.index}.enabled" <c:if test="${model.webApps[status.index].enabled}"> checked="checked"</c:if> /></td>
+            <td align="center"><input type="checkbox" title='${web.name} <fmt:message key="apache.jk.webApps.staticContent"/>' name="webapp.${status.index}.serveStaticContent" <c:if test="${model.webApps[status.index].serveStaticContent}"> checked="checked"</c:if> /></td>
+            <td><input type="text" name="webapp.${status.index}.dynamicPattern" size="20" maxlength="250" title="${web.name} ${model.webApps[status.index].dynamicPattern}"
                        value="${model.webApps[status.index].dynamicPattern}"/></td>
         </tr>
       </c:if>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp Tue Jul  8 19:07:09 2008
@@ -119,10 +119,10 @@
     </tr>
     <tr><td>&nbsp;</td></tr>
     <tr>
-        <th colspan="2" align="left"><fmt:message key="ca.common.base64EncodedCertText"/></th>
+        <th colspan="2" align="left"><label for="<portlet:namespace/>base64EncodedCertText"><fmt:message key="ca.common.base64EncodedCertText"/></label></th>
     </tr>
     <tr>
-        <td colspan="2"><form><textarea rows="15" cols="80" READONLY>${certText}</textarea></form></td>
+        <td colspan="2"><form><textarea rows="15" cols="80" id="<portlet:namespace/>base64EncodedCertText" READONLY>${certText}</textarea></form></td>
     </tr>
   </table>
 </c:if>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp Tue Jul  8 19:07:09 2008
@@ -73,27 +73,27 @@
             <th colspan="2" align="left"><fmt:message key="ca.common.detailsOfCert"/></th>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="ca.common.certSerialNo"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>sNo"><fmt:message key="ca.common.certSerialNo"/></label>:</th>
             <td>
-                <input type="text" name="sNo" size="20" maxlength="200" value="${sNo}" READONLY/>
+                <input type="text" name="sNo" id="<portlet:namespace/>sNo" size="20" maxlength="200" value="${sNo}" READONLY/>
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="ca.common.validFromDate"/> (mm/dd/yyyy):</th>
+            <th align="right"><label for="<portlet:namespace/>validFrom"><fmt:message key="ca.common.validFromDate"/> (mm/dd/yyyy)</label>:</th>
             <td>
-                <input type="text" name="validFrom" size="20" maxlength="200" value="${validFrom}"/>
+                <input type="text" name="validFrom" id="<portlet:namespace/>validFrom" size="20" maxlength="200" value="${validFrom}"/>
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="ca.common.validToDate"/> (mm/dd/yyyy):</th>
+            <th align="right"><label for="<portlet:namespace/>validTo"><fmt:message key="ca.common.validToDate"/> (mm/dd/yyyy)</label>:</th>
             <td>
-                <input type="text" name="validTo" size="20" maxlength="200" value="${validTo}"/>
+                <input type="text" name="validTo" id="<portlet:namespace/>validTo" size="20" maxlength="200" value="${validTo}"/>
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="ca.common.signatureAlgorithm"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>algorithm"><fmt:message key="ca.common.signatureAlgorithm"/></label>:</th>
             <td>
-                <select name="algorithm">
+                <select name="algorithm" id="<portlet:namespace/>algorithm">
                     <option <c:if test="${algorithm eq 'MD2withRSA'}">selected</c:if> >MD2withRSA</option>
                     <option <c:if test="${algorithm eq 'MD5withRSA' || algorithm eq '' || empty(algorithm)}">selected</c:if> >MD5withRSA</option>
                     <option <c:if test="${algorithm eq 'SHA1withRSA'}">selected</c:if> >SHA1withRSA</option>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/processCSR.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/processCSR.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/processCSR.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/processCSR.jsp Tue Jul  8 19:07:09 2008
@@ -43,11 +43,11 @@
     <input type="hidden" name="mode" value="processCSR-after" />
     <table border="0">
         <tr>
-            <th colspan="2" align="left"><fmt:message key="ca.common.CSRText"/></th>
+            <th colspan="2" align="left"><label for="<portlet:namespace/>pkcs10certreq"><fmt:message key="ca.common.CSRText"/></label></th>
         </tr>
         <tr>
             <td colspan="2">
-                <textarea rows="20" cols="80" name="pkcs10certreq">
+                <textarea rows="20" cols="80" name="pkcs10certreq" id="<portlet:namespace/>pkcs10certreq">
                 <fmt:message key="ca.processCSR.pastePkcs10here"/>                
                 </textarea>
             </td>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp Tue Jul  8 19:07:09 2008
@@ -70,39 +70,39 @@
             <th colspan="2" align="left"><fmt:message key="ca.common.certAuthorityIdentity"/></th>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="ca.common.commonName"/> (CN):</th>
+            <th align="right"><label for="<portlet:namespace/>caCN"><fmt:message key="ca.common.commonName"/> (CN)</label>:</th>
             <td>
-                <input type="text" name="caCN" size="20" maxlength="200" value="${caCN}"/>
+                <input type="text" name="caCN" id="<portlet:namespace/>caCN" size="20" maxlength="200" value="${caCN}"/>
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="ca.common.Division_BusinessUnit"/> (OU):</th>
+            <th align="right"><label for="<portlet:namespace/>caOU"><fmt:message key="ca.common.Division_BusinessUnit"/> (OU)</label>:</th>
             <td>
-                <input type="text" name="caOU" size="20" maxlength="200" value="${caOU}"/>
+                <input type="text" name="caOU" id="<portlet:namespace/>caOU" size="20" maxlength="200" value="${caOU}"/>
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="ca.common.company_Organization"/> (O):</th>
+            <th align="right"><label for="<portlet:namespace/>caO"><fmt:message key="ca.common.company_Organization"/> (O)</label>:</th>
             <td>
-                <input type="text" name="caO" size="20" maxlength="200" value="${caO}"/>
+                <input type="text" name="caO" id="<portlet:namespace/>caO" size="20" maxlength="200" value="${caO}"/>
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="ca.common.city_Locality"/> (L):</th>
+            <th align="right"><label for="<portlet:namespace/>caL"><fmt:message key="ca.common.city_Locality"/> (L)</label>:</th>
             <td>
-                <input type="text" name="caL" size="20" maxlength="200" value="${caL}"/>
+                <input type="text" name="caL" id="<portlet:namespace/>caL" size="20" maxlength="200" value="${caL}"/>
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="ca.common.state_Province"/> (ST):</th>
+            <th align="right"><label for="<portlet:namespace/>caST"><fmt:message key="ca.common.state_Province"/> (ST)</label>:</th>
             <td>
-                <input type="text" name="caST" size="20" maxlength="200" value="${caST}"/>
+                <input type="text" name="caST" id="<portlet:namespace/>caST" size="20" maxlength="200" value="${caST}"/>
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="ca.common.countryCode"/> (2 char) (C):</th>
+            <th align="right"><label for="<portlet:namespace/>caC"><fmt:message key="ca.common.countryCode"/> (2 char) (C)</label>:</th>
             <td>
-                <input type="text" name="caC" size="3" maxlength="2" value="${caC}"/>
+                <input type="text" name="caC" id="<portlet:namespace/>caC" size="3" maxlength="2" value="${caC}"/>
             </td>
         </tr>
         <tr><td>&nbsp;</td></tr>
@@ -110,24 +110,24 @@
             <th colspan="2" align="left"><fmt:message key="ca.common.keyDetails"/></th>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="consolebase.common.alias"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>alias"><fmt:message key="consolebase.common.alias"/></label>:</th>
             <td>
-                <input type="text" name="alias" size="20" maxlength="100" value="${alias}"/>
+                <input type="text" name="alias" id="<portlet:namespace/>alias" size="20" maxlength="100" value="${alias}"/>
             </td>
         </tr>
 
         <tr>
-            <th align="right"><fmt:message key="ca.common.keyAlgorithm"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>keyAlgorithm"><fmt:message key="ca.common.keyAlgorithm"/></label>:</th>
             <td>
-                <select name="keyAlgorithm">
+                <select name="keyAlgorithm" id="<portlet:namespace/>keyAlgorithm">
                     <option <c:if test="${keyAlgorithm eq 'RSA' || keyAlgorithm eq '' || empty(keyAlgorithm)}">selected</c:if> >RSA</option>
                 </select>
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="ca.common.keySize"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>keySize"><fmt:message key="ca.common.keySize"/></label>:</th>
             <td>
-                <select name="keySize">
+                <select name="keySize" id="<portlet:namespace/>keySize">
                     <option <c:if test="${keySize eq '512'}">selected</c:if> >512</option>
                     <option <c:if test="${keySize eq '1024' || keySize eq '' || empty(keySize)}">selected</c:if> >1024</option>
                     <option <c:if test="${keySize eq '2048'}">selected</c:if> >2048</option>
@@ -135,15 +135,15 @@
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="consolebase.common.password"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>password"><fmt:message key="consolebase.common.password"/></label>:</th>
             <td>
-                <input type="password" name="password" size="20" maxlength="200"/>
+                <input type="password" name="password" id="<portlet:namespace/>password" size="20" maxlength="200"/>
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="consolebase.common.confirmPassword"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>confirm"><fmt:message key="consolebase.common.confirmPassword"/></label>:</th>
             <td>
-                <input type="password" name="confirm" size="20" maxlength="200"/>
+                <input type="password" name="confirm" id="<portlet:namespace/>confirm" size="20" maxlength="200"/>
             </td>
         </tr>
         <tr><td>&nbsp</td></tr>
@@ -151,27 +151,27 @@
             <th colspan="2" align="left"><fmt:message key="ca.common.certificateDetails"/></th>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="ca.common.certSerialNumber"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>sNo"><fmt:message key="ca.common.certSerialNumber"/></label>:</th>
             <td>
-                <input type="text" name="sNo" size="20" maxlength="200" value="${sNo}"/>
+                <input type="text" name="sNo" id="<portlet:namespace/>sNo" size="20" maxlength="200" value="${sNo}"/>
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="ca.common.validFromDate"/>(mm/dd/yyyy):</th>
+            <th align="right"><label for="<portlet:namespace/>validFrom"><fmt:message key="ca.common.validFromDate"/>(mm/dd/yyyy)</label>:</th>
             <td>
-                <input type="text" name="validFrom" size="20" maxlength="200" value="${validFrom}"/>
+                <input type="text" name="validFrom" id="<portlet:namespace/>validFrom" size="20" maxlength="200" value="${validFrom}"/>
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="ca.common.validToDate"/>(mm/dd/yyyy):</th>
+            <th align="right"><label for="<portlet:namespace/>validTo"><fmt:message key="ca.common.validToDate"/>(mm/dd/yyyy)</label>:</th>
             <td>
-                <input type="text" name="validTo" size="20" maxlength="200" value="${validTo}"/>
+                <input type="text" name="validTo" id="<portlet:namespace/>validTo" size="20" maxlength="200" value="${validTo}"/>
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="ca.common.signatureAlgorithm"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>algorithm"><fmt:message key="ca.common.signatureAlgorithm"/></label>:</th>
             <td>
-                <select name="algorithm">
+                <select name="algorithm" id="<portlet:namespace/>algorithm">
                     <option <c:if test="${algorithm eq 'MD2withRSA'}">selected</c:if> >MD2withRSA</option>
                     <option <c:if test="${algorithm eq 'MD5withRSA' || algorithm eq '' || empty(algorithm)}">selected</c:if> >MD5withRSA</option>
                     <option <c:if test="${algorithm eq 'SHA1withRSA'}">selected</c:if> >SHA1withRSA</option>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp Tue Jul  8 19:07:09 2008
@@ -40,8 +40,8 @@
 
 <form name="<portlet:namespace/>UnlockCAForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="unlockCA-after" />
-    <b><fmt:message key="ca.unlockCA.enterCAPrivateKeyPassword"/>:</b>
-    <input type="password" name="password" size="20" maxlength="200" />
+    <b><label for="<portlet:namespace/>password"><fmt:message key="ca.unlockCA.enterCAPrivateKeyPassword"/></label>:</b>
+    <input type="password" name="password" id="<portlet:namespace/>password" size="20" maxlength="200" />
     <br />
 
     <input type="submit" value='<fmt:message key="ca.common.unlockCertAuthority"/>' onClick="return <portlet:namespace/>validateForm();"/>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp Tue Jul  8 19:07:09 2008
@@ -47,9 +47,9 @@
       <input type="hidden" name="mode" value="viewCert-before" />
       <table border="0">
         <tr>
-            <th align="right"><fmt:message key="ca.common.certSerialNo"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>sNo"><fmt:message key="ca.common.certSerialNo"/></label>:</th>
             <td>
-                <input type="text" name="sNo" size="20" maxlength="200" />
+                <input type="text" name="sNo" id="<portlet:namespace/>sNo" size="20" maxlength="200" />
             </td>
         </tr>
       </table>
@@ -147,11 +147,11 @@
         </tr>
         <tr><td>&nbsp;</td></tr>
         <tr>
-            <th colspan="2" align="left"><fmt:message key="ca.common.base64EncodedCertText"/></th>
+            <th colspan="2" align="left"><label for="<portlet:namespace/>certText"><fmt:message key="ca.common.base64EncodedCertText"/></label></th>
         </tr>
         <tr>
             <td colspan="2">
-                <form><textarea rows="15" cols="80" READONLY>${certText}</textarea></form>
+                <form><textarea rows="15" cols="80" id="<portlet:namespace/>certText" READONLY>${certText}</textarea></form>
             </td>
         </tr>
     </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp Tue Jul  8 19:07:09 2008
@@ -216,11 +216,11 @@
 
 
 <form name="checkExpert">
-<input type="checkbox" name="expertMode" onClick="toggleExpertMode();" />&nbsp;Expert User (enable all actions on Geronimo Provided Components)  
+<input type="checkbox" name="expertMode" id="<portlet:namespace/>expertMode" onClick="toggleExpertMode();" />&nbsp;<label for="<portlet:namespace/>expertMode">Expert User (enable all actions on Geronimo Provided Components)</label>  
 </form>
 
 <form name="showDependenciesForm">
-<input type="checkbox" name="showDependenciesMode" onClick="toggleShowDependenciesMode();" />&nbsp;Show parent and child components
+<input type="checkbox" name="showDependenciesMode" id="<portlet:namespace/>showDependenciesMode" onClick="toggleShowDependenciesMode();" />&nbsp;<label for="<portlet:namespace/>showDependenciesMode">Show parent and child components</label>
 </form>
 
 <table width="100%">

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp Tue Jul  8 19:07:09 2008
@@ -55,21 +55,21 @@
     <input type="hidden" name="mode" value="${mode}" />
     <table border="0">
         <tr>
-            <th align="right"><fmt:message key="keystore.changePassword.oldPassword"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>password"><fmt:message key="keystore.changePassword.oldPassword"/></label>:</th>
             <td>
-                <input type="password" name="password" size="20" maxlength="200" />
+                <input type="password" name="password" id="<portlet:namespace/>password" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="keystore.changePassword.newPassword"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>newPassword"><fmt:message key="keystore.changePassword.newPassword"/></label>:</th>
             <td>
-                <input type="password" name="newPassword" size="20" maxlength="200" />
+                <input type="password" name="newPassword" id="<portlet:namespace/>newPassword" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="keystore.changePassword.confirmPassword"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>confirm-newPassword"><fmt:message key="keystore.changePassword.confirmPassword"/></label>:</th>
             <td>
-                <input type="password" name="confirm-newPassword" size="20" maxlength="200" />
+                <input type="password" name="confirm-newPassword" id="<portlet:namespace/>confirm-newPassword" size="20" maxlength="200" />
             </td>
         </tr>
     </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/configureKey.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/configureKey.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/configureKey.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/configureKey.jsp Tue Jul  8 19:07:09 2008
@@ -50,27 +50,27 @@
     <input type="hidden" name="mode" value="configureKey-after" />
     <table border="0">
         <tr>
-            <th align="right"><fmt:message key="keystore.configureKey.aliasForKey"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>alias"><fmt:message key="keystore.configureKey.aliasForKey"/></label>:</th>
             <td>
-                <input type="text" name="alias" size="20" maxlength="100" />
+                <input type="text" name="alias" id="<portlet:namespace/>alias" size="20" maxlength="100" />
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="keystore.configureKey.passwordForKey"/></th>
+            <th align="right"><label for="<portlet:namespace/>password"><fmt:message key="keystore.configureKey.passwordForKey"/></label></th>
             <td>
-                <input type="password" name="password" size="20" maxlength="200" />
+                <input type="password" name="password" id="<portlet:namespace/>password" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="consolebase.common.confirmPassword"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>confirm-password"><fmt:message key="consolebase.common.confirmPassword"/></label>:</th>
             <td>
-                <input type="password" name="confirm-password" size="20" maxlength="200" />
+                <input type="password" name="confirm-password" id="<portlet:namespace/>confirm-password" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="keystore.configureKey.keySize"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>keySize"><fmt:message key="keystore.configureKey.keySize"/></label>:</th>
             <td>
-                <select name="keySize">
+                <select name="keySize" id="<portlet:namespace/>keySize">
                     <option>512</option>
                     <option selected="true">1024</option>
                     <option>2048</option>
@@ -78,9 +78,9 @@
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="keystore.configureKey.algorithm"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>algorithm"><fmt:message key="keystore.configureKey.algorithm"/></label>:</th>
             <td>
-                <select name="algorithm">
+                <select name="algorithm" id="<portlet:namespace/>algorithm">
                     <option>MD2withRSA</option>
                     <option selected="true">MD5withRSA</option>
                     <option>SHA1withRSA</option>
@@ -88,48 +88,48 @@
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="keystore.configureKey.validFor"/> :</th>
+            <th align="right"><label for="<portlet:namespace/>valid"><fmt:message key="keystore.configureKey.validFor"/> </label>:</th>
             <td>
-                <input type="text" name="valid" size="5" maxlength="8" />
+                <input type="text" name="valid" id="<portlet:namespace/>valid" size="5" maxlength="8" />
             </td>
         </tr>
         <tr>
             <th colspan="2"><fmt:message key="keystore.configureKey.certificateIdentity"/></th>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="keystore.configureKey.serverHostname"/> (CN):</th>
+            <th align="right"><label for="<portlet:namespace/>certCN"><fmt:message key="keystore.configureKey.serverHostname"/> (CN)</label>:</th>
             <td>
-                <input type="text" name="certCN" size="20" maxlength="200" />
+                <input type="text" name="certCN" id="<portlet:namespace/>certCN" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="keystore.configureKey.company_Org"/> (O):</th>
+            <th align="right"><label for="<portlet:namespace/>certO"><fmt:message key="keystore.configureKey.company_Org"/> (O)</label>:</th>
             <td>
-                <input type="text" name="certO" size="20" maxlength="200" />
+                <input type="text" name="certO" id="<portlet:namespace/>certO" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="keystore.configureKey.division_BusinessUnit"/> (OU):</th>
+            <th align="right"><label for="<portlet:namespace/>certOU"><fmt:message key="keystore.configureKey.division_BusinessUnit"/> (OU)</label>:</th>
             <td>
-                <input type="text" name="certOU" size="20" maxlength="200" />
+                <input type="text" name="certOU" id="<portlet:namespace/>certOU" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="keystore.configureKey.city_Locality"/> (L):</th>
+            <th align="right"><label for="<portlet:namespace/>certL"><fmt:message key="keystore.configureKey.city_Locality"/> (L)</label>:</th>
             <td>
-                <input type="text" name="certL" size="20" maxlength="200" />
+                <input type="text" name="certL" id="<portlet:namespace/>certL" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="keystore.configureKey.state_Province"/> (ST):</th>
+            <th align="right"><label for="<portlet:namespace/>certST"><fmt:message key="keystore.configureKey.state_Province"/> (ST)</label>:</th>
             <td>
-                <input type="text" name="certST" size="20" maxlength="200" />
+                <input type="text" name="certST" id="<portlet:namespace/>certST" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="keystore.configureKey.country_Code"/> (2 char) (C):</th>
+            <th align="right"><label for="<portlet:namespace/>certC"><fmt:message key="keystore.configureKey.country_Code"/> (2 char) (C)</label>:</th>
             <td>
-                <input type="text" name="certC" size="3" maxlength="2" />
+                <input type="text" name="certC" id="<portlet:namespace/>certC" size="3" maxlength="2" />
             </td>
         </tr>
     </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/createKeystore.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/createKeystore.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/createKeystore.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/createKeystore.jsp Tue Jul  8 19:07:09 2008
@@ -43,27 +43,27 @@
     <input type="hidden" name="mode" value="createKeystore-after" />
     <table border="0">
         <tr>
-            <th align="right"><fmt:message key="keystore.createKeystore.keystoreFileName"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>filename"><fmt:message key="keystore.createKeystore.keystoreFileName"/></label>:</th>
             <td>
-                <input type="text" name="filename" size="20" maxlength="100" />
+                <input type="text" name="filename" id="<portlet:namespace/>filename" size="20" maxlength="100" />
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="keystore.createKeystore.passwordForKeystore"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>password"><fmt:message key="keystore.createKeystore.passwordForKeystore"/></label>:</th>
             <td>
-                <input type="password" name="password" size="20" maxlength="200" />
+                <input type="password" name="password" id="<portlet:namespace/>password" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="consolebase.common.confirmPassword"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>confirm-password"><fmt:message key="consolebase.common.confirmPassword"/></label>:</th>
             <td>
-                <input type="password" name="confirm-password" size="20" maxlength="200" />
+                <input type="password" name="confirm-password" id="<portlet:namespace/>confirm-password" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right"><fmt:message key="keystore.createKeystore.type"/>:</th>
+            <th align="right"><label for="<portlet:namespace/>type"><fmt:message key="keystore.createKeystore.type"/></label>:</th>
             <td>
-                <select name="type">
+                <select name="type" id="<portlet:namespace/>type">
                     <c:forEach var="keystoreType" items="${keystoreTypes}">
                         <option <c:if test="${defaultType eq keystoreType}">selected</c:if>>${keystoreType}</option>
                     </c:forEach>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/generateCSR.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/generateCSR.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/generateCSR.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/generateCSR.jsp Tue Jul  8 19:07:09 2008
@@ -23,11 +23,11 @@
 <fmt:message key="keystore.common.alias"/>: ${alias}<br/>
 
 <table>
-<th><fmt:message key="keystore.generateCSR.PKCS10CertificatioRequest"/>t</th>
+<th><label for="<portlet:namespace/>csr"><fmt:message key="keystore.generateCSR.PKCS10CertificatioRequest"/></label></th>
 <tr>
 <td>
 <form action=>
-<textarea rows="15" cols="80" readonly>
+<textarea rows="15" cols="80" id="<portlet:namespace/>csr" readonly>
 ${csr}
 </textarea>
 </td>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/importCAReply.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/importCAReply.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/importCAReply.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/importCAReply.jsp Tue Jul  8 19:07:09 2008
@@ -28,10 +28,10 @@
 <portlet:param name="id" value="${id}" />
 <portlet:param name="alias" value="${alias}" /></portlet:actionURL>">
 <table>
-<th><fmt:message key="keystore.importCAReply.PKCS7CertificateReply"/></th>
+<th><label for="<portlet:namespace/>pkcs7cert"><fmt:message key="keystore.importCAReply.PKCS7CertificateReply"/></label></th>
 <tr>
 <td>
-<textarea rows="20" cols="80" name="pkcs7cert">
+<textarea rows="20" cols="80" name="pkcs7cert" id="<portlet:namespace/>pkcs7cert">
 <fmt:message key="keystore.importCAReply.pasteHere"/>
 </textarea>
 </td>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKey.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKey.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKey.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKey.jsp Tue Jul  8 19:07:09 2008
@@ -32,14 +32,14 @@
     <input type="hidden" name="keystore" value="${keystore}" />
     <input type="hidden" name="password" value="${password}" />
     <input type="hidden" name="mode" value="unlockKey-after" />
-    <b><fmt:message key="keystore.unlockKey.unlockPrivateKey"/>:</b>
-    <select name="keyAlias">
+    <b><label for="<portlet:namespace/>keyAlias"><fmt:message key="keystore.unlockKey.unlockPrivateKey"/></label>:</b>
+    <select name="keyAlias" id="<portlet:namespace/>keyAlias">
         <c:forEach var="alias" items="${keys}">
             <option>${alias}</option>
         </c:forEach>
     </select>
-    <fmt:message key="consolebase.common.password"/>:
-    <input type="password" name="keyPassword" size="20" maxlength="200" />
+    <label for="<portlet:namespace/>keyPassword"><fmt:message key="consolebase.common.password"/></label>:
+    <input type="password" name="keyPassword" id="<portlet:namespace/>keyPassword" size="20" maxlength="200" />
     <br />
 
     <input type="submit" value='<fmt:message key="keystore.unlockKey.unlockPrivateKey"/>' />

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp Tue Jul  8 19:07:09 2008
@@ -29,19 +29,19 @@
 <form name="<portlet:namespace/>KeystoreForm" action="<portlet:actionURL/>">
     <input type="hidden" name="keystore" value="${keystore}" />
     <input type="hidden" name="mode" value="${mode}-after" />
-    <b><fmt:message key="keystore.unlockKeystore.enterKeystorePassword"/>:</b>
-    <input type="password" name="password" size="20" maxlength="200" />
+    <b><label for="<portlet:namespace/>password"><fmt:message key="keystore.unlockKeystore.enterKeystorePassword"/></label>:</b>
+    <input type="password" name="password" id="<portlet:namespace/>password" size="20" maxlength="200" />
     <br />
 
     <c:if test="${mode eq 'unlockKeystore' && !empty keys}">
-        <b><fmt:message key="keystore.common.unlockPrivateKey"/>:</b>
-        <select name="keyAlias">
+        <b><label for="<portlet:namespace/>keyAlias"><fmt:message key="keystore.common.unlockPrivateKey"/></label>:</b>
+        <select name="keyAlias" id="<portlet:namespace/>keyAlias">
             <c:forEach var="alias" items="${keys}">
                 <option>${alias}</option>
             </c:forEach>
         </select>
-        <fmt:message key="consolebase.common.password"/>:
-        <input type="password" name="keyPassword" size="20" maxlength="200" />
+        <label for="<portlet:namespace/>keyPassword"><fmt:message key="consolebase.common.password"/></label>:
+        <input type="password" name="keyPassword" id="<portlet:namespace/>keyPassword" size="20" maxlength="200" />
         <br />
     </c:if>
 

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/uploadCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/uploadCertificate.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/uploadCertificate.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/uploadCertificate.jsp Tue Jul  8 19:07:09 2008
@@ -40,7 +40,7 @@
     <input type="hidden" name="id" value="${id}" />
     <input type="hidden" name="mode" value="uploadCertificate-after" />
     <table border="0">
-        <th align="left"> <fmt:message key="keystore.common.trustedCertificate"/> </th>
+        <th align="left"> <label for="<portlet:namespace/>certificate"><fmt:message key="keystore.common.trustedCertificate"/></label> </th>
 <!-- Uploading certificate using a disk file fails on Windows.  Certificate text is used instead.
         <tr>
             <th align="right">Certificate file:</th>
@@ -51,13 +51,13 @@
  -->
         <tr>
             <td colspan="2">
-                <textarea rows="15" cols="80" name="certificate"><fmt:message key="keystore.uploadCertificate.pasteHere"/></textarea>
+                <textarea rows="15" cols="80" name="certificate" id="<portlet:namespace/>certificate"><fmt:message key="keystore.uploadCertificate.pasteHere"/></textarea>
             </td>
         </tr>
         <tr>
-            <th align="left"><fmt:message key="keystore.uploadCertificate.aliasForCertificate"/>:</th>
+            <th align="left"><label for="<portlet:namespace/>alias"><fmt:message key="keystore.uploadCertificate.aliasForCertificate"/></label>:</th>
             <td>
-                <input type="text" name="alias" size="20" maxlength="200" />
+                <input type="text" name="alias" id="<portlet:namespace/>alias" size="20" maxlength="200" />
             </td>
         </tr>
     </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp Tue Jul  8 19:07:09 2008
@@ -80,17 +80,17 @@
                 <b><fmt:message key="logmanager.common.filterCriteria"/>:</b>
                 <input type="hidden" value="search" name="action"/>
                 <br/>
-                File 
-                <select name="logFile">
+                <label for="<portlet:namespace/>logFile"><fmt:message key="consolebase.common.file"/></label> 
+                <select name="logFile" id="<portlet:namespace/>logFile">
                     <c:forEach var="file" items="${logFiles}">
                         <option value="${file.fullName}" < c:if test="${logFile eq file.fullName}">selected</c:if>>${file.name}</option>
                     </c:forEach>
                 </select>
-                <fmt:message key="logmanager.search.lines"/> <input type="text" name="startPos" value="${startPos}" size="3"/>
-                <fmt:message key="logmanager.search.to"/> <input type="text" name="endPos" value="${endPos}" size="3"/>
-                <fmt:message key="logmanager.search.maxResults"/> <input type="text" name="maxRows" value="${maxRows}" size="3"/>
-                <fmt:message key="logmanager.search.level"/>
-                <select name="logLevel">
+                <label for="<portlet:namespace/>startPos"><fmt:message key="logmanager.search.lines"/> </label><input type="text" name="startPos" id="<portlet:namespace/>startPos" value="${startPos}" size="3"/>
+                <label for="<portlet:namespace/>endPos"><fmt:message key="logmanager.search.to"/> </label><input type="text" name="endPos" id="<portlet:namespace/>endPos" value="${endPos}" size="3"/>
+                <label for="<portlet:namespace/>maxRows"><fmt:message key="logmanager.search.maxResults"/> </label><input type="text" name="maxRows" id="<portlet:namespace/>maxRows" value="${maxRows}" size="3"/>
+                <label for="<portlet:namespace/>logLevel"><fmt:message key="logmanager.search.level"/></label>
+                <select name="logLevel" id="<portlet:namespace/>logLevel">
                     <option <c:if test="${logLevel == 'TRACE' || logLevel == ''}">selected</c:if>>TRACE</option>
                     <option <c:if test="${logLevel == 'DEBUG'}">selected</c:if>>DEBUG</option>
                     <option <c:if test="${logLevel == 'INFO'}">selected</c:if>>INFO</option>
@@ -98,8 +98,8 @@
                     <option <c:if test="${logLevel == 'ERROR'}">selected</c:if>>ERROR</option>
                     <option <c:if test="${logLevel == 'FATAL'}">selected</c:if>>FATAL</option>
                 </select>
-                <fmt:message key="logmanager.search.containingText"/> <input type="text" name="searchString" value="${searchString}"/>
-                <fmt:message key="logmanager.search.withExceptions"/> <input type="checkbox" name="stackTraces" < c:if test="${!empty stackTraces}">CHECKED </c:if>/>
+                <label for="<portlet:namespace/>searchString"><fmt:message key="logmanager.search.containingText"/> </label><input type="text" name="searchString" id="<portlet:namespace/>searchString" value="${searchString}"/>
+                <label for="<portlet:namespace/>stackTraces"><fmt:message key="logmanager.search.withExceptions"/> </label><input type="checkbox" name="stackTraces" id="<portlet:namespace/>stackTraces" < c:if test="${!empty stackTraces}">CHECKED </c:if>/>
                 <br/>
                 <input type="submit" value="<fmt:message key="logmanager.search.fileterLog"/>"/>
             </form>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/view.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/view.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/view.jsp Tue Jul  8 19:07:09 2008
@@ -63,17 +63,17 @@
         renderRequest.setAttribute("refreshPeriod", LogHelper.getRefreshPeriod());
 
 -->
-    <td nowrap><fmt:message key="logmanager.common.configFile"/></td>
-    <td><input type="text" name="configFile" value="${configFile}" size="45"/></td>
+    <td nowrap><label for="<portlet:namespace/>configFile"><fmt:message key="logmanager.common.configFile"/></label></td>
+    <td><input type="text" name="configFile" id="<portlet:namespace/>configFile" value="${configFile}" size="45"/></td>
 </tr>
 <tr>
-    <td nowrap><fmt:message key="logmanager.common.refreshPeriod"/></td>
-    <td><input type="text" name="refreshPeriod" value="${refreshPeriod}" size="45"/></td>
+    <td nowrap><label for="<portlet:namespace/>refreshPeriod"><fmt:message key="logmanager.common.refreshPeriod"/></label></td>
+    <td><input type="text" name="refreshPeriod" id="<portlet:namespace/>refreshPeriod" value="${refreshPeriod}" size="45"/></td>
 </tr>
 <tr>
-    <td nowrap><fmt:message key="logmanager.common.logLevel"/></td>
+    <td nowrap><label for="<portlet:namespace/>logLevel"><fmt:message key="logmanager.common.logLevel"/></label></td>
     <td>
-    <select name="logLevel">
+    <select name="logLevel" id="<portlet:namespace/>logLevel">
         <option<c:if test="${logLevel eq 'ALL'}"> selected</c:if>>ALL</option>
         <option<c:if test="${logLevel eq 'TRACE'}"> selected</c:if>>TRACE</option>
         <option<c:if test="${logLevel eq 'DEBUG'}"> selected</c:if>>DEBUG</option>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp Tue Jul  8 19:07:09 2008
@@ -100,24 +100,24 @@
       <th colspan="2"><fmt:message key="repository.normal.addArchiveToRepository"/></th>
     </tr>
     <tr>
-      <td><fmt:message key="consolebase.common.file"/></td>
-      <td><input name="local" onchange="<portlet:namespace/>parse(value);" type="file">&nbsp;&nbsp;&nbsp;</td>
+      <td><label for="<portlet:namespace/>local"><fmt:message key="consolebase.common.file"/></label></td>
+      <td><input name="local" id="<portlet:namespace/>local" onchange="<portlet:namespace/>parse(value);" type="file">&nbsp;&nbsp;&nbsp;</td>
     </tr>
     <tr>
-      <td><fmt:message key="consolebase.common.group"/>:</td>
-      <td><input type="text" name="group" value="${group}"/></td>
+      <td><label for="<portlet:namespace/>group"><fmt:message key="consolebase.common.group"/></label>:</td>
+      <td><input type="text" name="group" id="<portlet:namespace/>group" value="${group}"/></td>
     </tr>
     <tr>
-      <td><fmt:message key="repository.normal.artifact"/>:</td>
-      <td><input type="text" name="artifact" value="${artifact}"/></td>
+      <td><label for="<portlet:namespace/>artifact"><fmt:message key="repository.normal.artifact"/></label>:</td>
+      <td><input type="text" name="artifact" id="<portlet:namespace/>artifact" value="${artifact}"/></td>
     </tr>
     <tr>
-      <td><fmt:message key="consolebase.common.version"/>:</td>
-      <td><input type="text" name="version" value="${version}"/></td>
+      <td><label for="<portlet:namespace/>version"><fmt:message key="consolebase.common.version"/></label>:</td>
+      <td><input type="text" name="version" id="<portlet:namespace/>version" value="${version}"/></td>
     </tr>
     <tr>
-      <td><fmt:message key="consolebase.common.type"/>:</td>
-      <td><input type="text" name="fileType" value="${fileType}"/></td>
+      <td><label for="<portlet:namespace/>fileType"><fmt:message key="consolebase.common.type"/></label>:</td>
+      <td><input type="text" name="fileType" id="<portlet:namespace/>fileType" value="${fileType}"/></td>
     </tr>
     <tr><td colspan="2"><font size="-2">&nbsp;</font></td></tr>
     <tr>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/groups/addmaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/groups/addmaximized.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/groups/addmaximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/groups/addmaximized.jsp Tue Jul  8 19:07:09 2008
@@ -80,7 +80,7 @@
        <c:choose>
        <c:when test="${add}"> 
         <input type="hidden" name="action" value="add">
-        <input type="text" name="GroupName" value="">
+        <input type="text" name="GroupName" title='<fmt:message key="consolebase.common.groupName"/>' value="">
        </c:when>
        <c:otherwise>
         <input type="hidden" name="action" value="update">
@@ -92,8 +92,8 @@
     </tr>   
 
     <tr>
-        <td width="200" class="formLabel"><fmt:message key="consolebase.common.description"/></td>
-        <td class="formElement"><input type="text" name="Description" value="${Description}"></td>
+        <td width="200" class="formLabel"><label for="<portlet:namespace/>Description"><fmt:message key="consolebase.common.description"/></label></td>
+        <td class="formElement"><input type="text" name="Description" id="<portlet:namespace/>Description" value="${Description}"></td>
     </tr>   
     <tr>
         <td class="formLabel"><fmt:message key="consolebase.common.users"/></td>
@@ -103,7 +103,7 @@
         <table>
             <tr>
                 <td>
-                    <select name="usersToRemove" size="4" multiple>
+                    <select name="usersToRemove" title='<fmt:message key="consolebase.common.users"/>' size="4" multiple>
                     <c:forEach var="user" items="${otherUsers}">
                         <option value="${user}">${user}</option>
                     </c:forEach>    
@@ -121,7 +121,7 @@
                     />                
                 </td> 
                 <td>
-                <select name="Members" size="4" multiple>
+                <select name="Members" title='<fmt:message key="consolebase.common.users"/>' size="4" multiple>
                 <c:forEach var="user" items="${users}">
                     <option value="${user}">${user}</option>
                 </c:forEach>    

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/users/addmaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/users/addmaximized.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/users/addmaximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/users/addmaximized.jsp Tue Jul  8 19:07:09 2008
@@ -74,7 +74,7 @@
        <c:choose>
        <c:when test="${add}"> 
         <input type="hidden" name="action" value="add">
-        <input type="text" name="UserName" value="" maxlength="30">
+        <input type="text" name="UserName" title='<fmt:message key="consolebase.common.userName"/>' value="" maxlength="30">
        </c:when>
        <c:otherwise>
         <input type="hidden" name="action" value="update">
@@ -85,30 +85,30 @@
         </td>
     </tr>   
     <tr>
-        <td width="200" class="formLabel"> <fmt:message key="consolebase.common.password"/></td>
-        <td class="formElement"><input type="password" name="Password" value="${Password}" maxlength="30"></td>
+        <td width="200" class="formLabel"> <label for="<portlet:namespace/>Password"><fmt:message key="consolebase.common.password"/></label></td>
+        <td class="formElement"><input type="password" name="Password" id="<portlet:namespace/>Password" value="${Password}" maxlength="30"></td>
     </tr>   
     <tr>
-        <td width="200"><fmt:message key="consolebase.common.confirmPassword"/>Confirm Password</td>
-        <td><input type="password" name="ConfirmPassword" value="${Password2}" maxlength="30"></td>
+        <td width="200"><label for="<portlet:namespace/>ConfirmPassword"><fmt:message key="consolebase.common.confirmPassword"/>Confirm Password</label></td>
+        <td><input type="password" name="ConfirmPassword" id="<portlet:namespace/>ConfirmPassword" value="${Password2}" maxlength="30"></td>
     </tr>
     <tr>
-        <td width="200" class="formLabel"><fmt:message key="consolebase.common.givenName"/></td>
-        <td class="formElement"><input type="text" name="FirstName" value="${FirstName}" maxlength="30"></td>
+        <td width="200" class="formLabel"><label for="<portlet:namespace/>FirstName"><fmt:message key="consolebase.common.givenName"/></label></td>
+        <td class="formElement"><input type="text" name="FirstName" id="<portlet:namespace/>FirstName" value="${FirstName}" maxlength="30"></td>
     </tr>
 
     <input type="hidden" name="MiddleInit" value="" >
     <tr>
-        <td width="200" class="formLabel"><fmt:message key="consolebase.common.familyName"/></td>
-        <td class="formElement"><input type="text" name="LastName" value="${LastName}" maxlength="30"></td>
+        <td width="200" class="formLabel"><label for="<portlet:namespace/>LastName"><fmt:message key="consolebase.common.familyName"/></label></td>
+        <td class="formElement"><input type="text" name="LastName" id="<portlet:namespace/>LastName" value="${LastName}" maxlength="30"></td>
     </tr>
     <tr>
-        <td width="200" class="formLabel"><fmt:message key="consolebase.common.department"/></td>
-        <td class="formElement"><input type="text" name="Department" value="${Department}" maxlength="30"></td>
+        <td width="200" class="formLabel"><label for="<portlet:namespace/>Department"><fmt:message key="consolebase.common.department"/></label></td>
+        <td class="formElement"><input type="text" name="Department" id="<portlet:namespace/>Department" value="${Department}" maxlength="30"></td>
     </tr>
     <tr>
-        <td width="200" class="formLabel"><fmt:message key="consolebase.common.email"/></td>
-        <td class="formElement"><input type="text" name="Email" value="${Email}" maxlength="30"></td>
+        <td width="200" class="formLabel"><label for="<portlet:namespace/>Email"><fmt:message key="consolebase.common.email"/></label></td>
+        <td class="formElement"><input type="text" name="Email" id="<portlet:namespace/>Email" value="${Email}" maxlength="30"></td>
     </tr>
 
     <tr>   

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp Tue Jul  8 19:07:09 2008
@@ -83,7 +83,7 @@
        <c:choose>
 	   <c:when test="${add}"> 
 	    <input type="hidden" name="action" value="add">
-	    <input type="text" name="group" value="">
+	    <input type="text" name="group" title='<fmt:message key="consolebase.common.groupName"/>' value="">
        </c:when>
        <c:otherwise>
 	    <input type="hidden" name="action" value="update">
@@ -104,7 +104,7 @@
             <table>
             <tr>
                 <td>
-                <select name="availusers" size="4" multiple>
+                <select name="availusers" title='<fmt:message key="consolebase.common.users"/>' size="4" multiple>
                 <%
                 for(int i = 0;i<users.length;i++){
                     String user = users[i];
@@ -129,7 +129,7 @@
                     />                
                 </td> 
                 <td>
-                <select name="users" size="4" multiple>
+                <select name="users" title='<fmt:message key="consolebase.common.users"/>' size="4" multiple>
                 <%
                 for(int i = 0;i<users.length;i++){
                     String user = users[i];

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp Tue Jul  8 19:07:09 2008
@@ -64,7 +64,7 @@
         <input type="hidden" name="action" value="${Action}">
         <c:choose>
         <c:when test="${add}"> 
-            <input type="text" name="userId" value="${UserName}">
+            <input type="text" name="userId" title='<fmt:message key="consolebase.common.userID"/>' value="${UserName}">
         </c:when>
         <c:otherwise>
             <input type="hidden" name="userId" value="${UserName}">
@@ -77,9 +77,9 @@
     <c:choose>
       <c:when test="${add}">
         <tr>
-          <td width="200"><fmt:message key="consolebase.common.group"/></td>
+          <td width="200"><label for="<portlet:namespace/>group"><fmt:message key="consolebase.common.group"/></label></td>
           <td>
-            <select name="group">
+            <select name="group" id="<portlet:namespace/>group">
               <c:forEach var="groups" items="${groupsInfo}">
                 <option value="${groups.key}">${groups.key}</option>
               </c:forEach>
@@ -91,12 +91,12 @@
       </c:otherwise>
     </c:choose>
     <tr>
-        <td width="200"><fmt:message key="consolebase.common.password"/></td>
-        <td><input type="password" name="password" value=""></td>
+        <td width="200"><label for="<portlet:namespace/>password"><fmt:message key="consolebase.common.password"/></label></td>
+        <td><input type="password" name="password" id="<portlet:namespace/>password" value=""></td>
     </tr>   
     <tr>
-        <td width="200"><fmt:message key="consolebase.common.confirmPassword"/></td>
-        <td><input type="password" name="confirmpassword" value=""></td>
+        <td width="200"><label for="<portlet:namespace/>confirmpassword"><fmt:message key="consolebase.common.confirmPassword"/></label></td>
+        <td><input type="password" name="confirmpassword" id="<portlet:namespace/>confirmpassword" value=""></td>
     </tr>
     <tr>   
        <td>&nbsp;</td> <td  align="left" class="formElement"><input type="submit" value="${Submit}" onclick="return <portlet:namespace/>validateForm()"> <input type="submit" name="cancel"  value="<fmt:message key="consolebase.common.cancel"/>"></td>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp Tue Jul  8 19:07:09 2008
@@ -64,9 +64,9 @@
                                 <td colspan="4" class="DarkBackground"><b><fmt:message key="webaccesslogmanager.view.container" />:</b></td>
                             </tr>
                             <tr>
-                                <td><fmt:message key="webaccesslogmanager.view.searchWebContainer" />:</td>
+                                <td><label for="<portlet:namespace/>selectedContainer"><fmt:message key="webaccesslogmanager.view.searchWebContainer" /></label>:</td>
                                 <td>
-                                    <select name="selectedContainer">
+                                    <select name="selectedContainer" id="<portlet:namespace/>selectedContainer">
                                         <c:forEach var="webContainer" items="${webContainers}">
                                             <option value="${webContainer.value}"<c:if test="${webContainer.value eq selectedContainer}">selected</c:if>>${webContainer.key}</option>
                                         </c:forEach>
@@ -92,9 +92,9 @@
                                 <td colspan="4" class="DarkBackground"><b>Log:</b></td>
                             </tr>
                             <tr>
-                                <td><fmt:message key="webaccesslogmanager.view.searchWebLog" />:</td>
+                                <td><label for="<portlet:namespace/>selectedLog"><fmt:message key="webaccesslogmanager.view.searchWebLog" /></label>:</td>
                                 <td>
-                                    <select name="selectedLog">
+                                    <select name="selectedLog" id="<portlet:namespace/>selectedLog">
                                         <c:forEach var="webLog" items="${webLogs}">
                                             <option<c:if test="${webLog eq selectedLog}">selected</c:if>>${webLog}</option>
                                         </c:forEach>
@@ -116,41 +116,41 @@
                         <td colspan="4" class="DarkBackground"><b><fmt:message key="consolebase.common.date"/>:</b></td>
                     </tr>
                     <tr>
-                        <td><fmt:message key="webaccesslogmanager.common.from"/>:</td>
+                        <td><label for="<portlet:namespace/>fromDate"><fmt:message key="webaccesslogmanager.common.from"/></label>:</td>
                         <td>
-                            <input type="text" name="fromDate" value="${fromDate}">
+                            <input type="text" name="fromDate" id="<portlet:namespace/>fromDate" value="${fromDate}">
                         </td>
-                        <td><fmt:message key="webaccesslogmanager.common.to"/>:</td>
+                        <td><label for="<portlet:namespace/>toDate"><fmt:message key="webaccesslogmanager.common.to"/></label>:</td>
                         <td>
-                            <input type="text" name="toDate" value="${toDate}">
+                            <input type="text" name="toDate" id="<portlet:namespace/>toDate" value="${toDate}">
                         </td>
                     </tr>
                     <tr>
-                        <td><fmt:message key="webaccesslogmanager.view.ignoreDates"/>:</td>
+                        <td><label for="<portlet:namespace/>ignoreDates"><fmt:message key="webaccesslogmanager.view.ignoreDates"/></label>:</td>
                         <td>
-                            <input type="checkbox" name="ignoreDates" < c:if test="${ignoreDates}">checked</c:if>/>
+                            <input type="checkbox" name="ignoreDates" id="<portlet:namespace/>ignoreDates" < c:if test="${ignoreDates}">checked</c:if>/>
                         </td>
                     </tr>
                     <tr>
                         <td colspan="4" class="DarkBackground"><b><fmt:message key="webaccesslogmanager.view.identity"/>:</b></td>
                     </tr>
                     <tr>
-                        <td><fmt:message key="webaccesslogmanager.common.remoteAddress"/>:</td>
+                        <td><label for="<portlet:namespace/>requestHost"><fmt:message key="webaccesslogmanager.common.remoteAddress"/></label>:</td>
                         <td>
-                            <input type="text" name="requestHost" value="${requestHost}"/>
+                            <input type="text" name="requestHost" id="<portlet:namespace/>requestHost" value="${requestHost}"/>
                         </td>
-                        <td><fmt:message key="webaccesslogmanager.common.authenticatedUser"/>:</td>
+                        <td><label for="<portlet:namespace/>authUser"><fmt:message key="webaccesslogmanager.common.authenticatedUser"/></label>:</td>
                         <td>
-                            <input type="text" name="authUser" value="${authUser}"/>
+                            <input type="text" name="authUser" id="<portlet:namespace/>authUser" value="${authUser}"/>
                         </td>
                     </tr>
                     <tr>
                         <td colspan="4" class="DarkBackground"><b><fmt:message key="webaccesslogmanager.common.request"/>:</b></td>
                     </tr>
                     <tr>
-                        <td><fmt:message key="webaccesslogmanager.common.requestMethod"/>:</td>
+                        <td><label for="<portlet:namespace/>requestMethod"><fmt:message key="webaccesslogmanager.common.requestMethod"/></label>:</td>
                         <td>
-                            <select name="requestMethod">
+                            <select name="requestMethod" id="<portlet:namespace/>requestMethod">
                                 <option value="" < c:if test="${empty requestMethod or requestMethod eq ''}">selected</c:if>>ANY</option>
                                 <option <c:if test="${requestMethod == 'GET'}">selected</c:if>>GET</option>
                                 <option <c:if test="${requestMethod == 'POST'}">selected</c:if>>POST</option>
@@ -158,22 +158,22 @@
                                 <option <c:if test="${requestMethod == 'DELETE'}">selected</c:if>>DELETE</option>
                             </select>
                         </td>
-                        <td><fmt:message key="webaccesslogmanager.common.requestedURI"/>:</td>
+                        <td><label for="<portlet:namespace/>requestedURI"><fmt:message key="webaccesslogmanager.common.requestedURI"/></label>:</td>
                         <td>
-                            <input type="text" name="requestedURI" value="${requestedURI}"/>
+                            <input type="text" name="requestedURI" id="<portlet:namespace/>requestedURI" value="${requestedURI}"/>
                         </td>
                     </tr>
                     <tr>
                         <td colspan="4" class="DarkBackground"><b><fmt:message key="webaccesslogmanager.view.resultSize"/>:</b></td>
                     </tr>
                     <tr>
-                        <td><fmt:message key="webaccesslogmanager.view.startResult"/>:</td>
+                        <td><label for="<portlet:namespace/>startResult"><fmt:message key="webaccesslogmanager.view.startResult"/></label>:</td>
                         <td>
-                            <input type="text" name="startResult" value="${startResult}"/>
+                            <input type="text" name="startResult" id="<portlet:namespace/>startResult" value="${startResult}"/>
                         </td>
-                        <td><fmt:message key="webaccesslogmanager.view.maxResults"/>:</td>
+                        <td><label for="<portlet:namespace/>maxResult"><fmt:message key="webaccesslogmanager.view.maxResults"/></label>:</td>
                         <td>
-                            <input type="text" name="maxResult" value="${maxResult}"/>
+                            <input type="text" name="maxResult" id="<portlet:namespace/>maxResult" value="${maxResult}"/>
                         </td>
                     </tr>
                     <tr>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp Tue Jul  8 19:07:09 2008
@@ -19,7 +19,7 @@
 
 <%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
 <portlet:defineObjects/>
-
+<fmt:setBundle basename="consolebase"/>
 <script language="JavaScript">
 // validate the form submission
 function <portlet:namespace/>validateForm(){
@@ -82,11 +82,11 @@
   <th class="DarkBackground">Description</th>
 </tr>
 <tr>
-  <td class="LightBackground"><strong>*uniqueName</strong></td>
+  <td class="LightBackground"><strong>*<fmt:message key="webmanager.common.uniqueName"/></strong></td>
   <td>String</td>
   <td><c:choose>
         <c:when test="${empty connectorURI}">
-            <input name="uniqueName" type="text" size="30">
+            <input name="uniqueName" title='<fmt:message key="webmanager.common.uniqueName"/>' type="text" size="30">
         </c:when>
         <c:otherwise>
             <input name="uniqueName" type="hidden" value='<c:out escapeXml="true" value="${uniqueName}"/>'>
@@ -102,14 +102,14 @@
   <tr>
     <td class="${style}">
     <c:if test="${connectorAttribute.required}"><strong>*</c:if>
-    ${connectorAttribute.attributeName}
+    <label for="<portlet:namespace/>${connectorAttribute.attributeName}">${connectorAttribute.attributeName}</label>
     <c:if test="${connectorAttribute.required}"></strong></c:if>
     </td>
     <td class="${style}">${connectorAttribute.attributeClass.simpleName}</td>
     <c:choose>
         <c:when test="${enumValues != null}">
     	    <td class="${style}">
-    	    <select name="${connectorAttribute.attributeName}">
+    	    <select name="${connectorAttribute.attributeName}" id="<portlet:namespace/>${connectorAttribute.attributeName}">
                 <c:if test="${fn:length(connectorAttribute.value) > 0}">
                     <option selected>
                       <c:out escapeXml="true" value="${connectorAttribute.value}"/>
@@ -126,19 +126,19 @@
     	     </td>
         </c:when>
         <c:when test="${connectorAttribute.attributeClass.simpleName eq 'Integer'}">
-    	    <td class="${style}"><input name="${connectorAttribute.attributeName}" type="text" size="5" 
+    	    <td class="${style}"><input name="${connectorAttribute.attributeName}" id="<portlet:namespace/>${connectorAttribute.attributeName}" type="text" size="5" 
     	     value="<c:out escapeXml="true" value="${connectorAttribute.stringValue}"/>"></td>
         </c:when>
         <c:when test="${connectorAttribute.attributeClass.simpleName eq 'Boolean'}">
-		    <td class="${style}"><input name="${connectorAttribute.attributeName}" type="checkbox" 
-		    <c:if test="${connectorAttribute.value}">checked</c:if>></td>
+		    <td class="${style}"><input name="${connectorAttribute.attributeName}" id="<portlet:namespace/>${connectorAttribute.attributeName}" type="checkbox" 
+		    <c:if test="${connectorAttribute.value}"><label for="<portlet:namespace/>${connectorAttribute.attributeName}">checked</label></c:if>></td>
         </c:when>
         <c:when test="${fn:containsIgnoreCase(connectorAttribute.attributeName, 'pass')}">
-		    <td class="${style}"><input name="${connectorAttribute.attributeName}" type="password" size="30"
+		    <td class="${style}"><input name="${connectorAttribute.attributeName}" id="<portlet:namespace/>${connectorAttribute.attributeName}" type="password" size="30"
     	     value="<c:out escapeXml="true" value="${connectorAttribute.stringValue}"/>"></td>
         </c:when>
         <c:otherwise>
-		    <td class="${style}"><input name="${connectorAttribute.attributeName}" type="text" size="30"
+		    <td class="${style}"><input name="${connectorAttribute.attributeName}" id="<portlet:namespace/>${connectorAttribute.attributeName}" type="text" size="30"
     	     value="<c:out escapeXml="true" value="${connectorAttribute.stringValue}"/>"></td>
         </c:otherwise>
     </c:choose>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver.properties?rev=675083&r1=675082&r2=675083&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver.properties (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver.properties Tue Jul  8 19:07:09 2008
@@ -22,6 +22,9 @@
 console.common.password                   = Password
 console.common.username                   = Username
 console.head.title                        = Geronimo Console
+console.common.pages                      = Pages
+console.common.applications								= Applications
+console.head.title                        = Geronimo Console
 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              = Note: Logging onto the Geronimo Console requires cookies to be enabled in your web browser.



Mime
View raw message