geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r696126 - in /geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator: dependencies.jsp displayPlan.jsp enterpriseApp.jsp environment.jsp getArchive.jsp references.jsp security.jsp
Date Wed, 17 Sep 2008 01:33:57 GMT
Author: dwoods
Date: Tue Sep 16 18:33:57 2008
New Revision: 696126

URL: http://svn.apache.org/viewvc?rev=696126&view=rev
Log:
GERONIMO-4081 Accessibility issue: Webking scan errors against 'Check Web Accessibility(Section
508)'

Modified:
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/dependencies.jsp
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/enterpriseApp.jsp
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/environment.jsp
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/security.jsp

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/dependencies.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/dependencies.jsp?rev=696126&r1=696125&r2=696126&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/dependencies.jsp
(original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/dependencies.jsp
Tue Sep 16 18:33:57 2008
@@ -42,14 +42,14 @@
   <!-- Dependencies -->
   <c:forEach var="commonLib" items="${commonLibs}">
     <tr>
-      <td><input type="checkbox" name="selectedLibs" value="${commonLib}"
+      <td><input type="checkbox" name="selectedLibs" id="<portlet:namespace/>selectedLibs-${commonLib}"
value="${commonLib}"
         <c:forEach var="dependency" items="${data.environmentConfig.dependencies}">
           <c:if test="${commonLib == dependency}">checked="checked"
           </c:if>
         </c:forEach> />
       </td>
       <td>
-      ${commonLib}
+      <label for="<portlet:namespace/>selectedLibs-${commonLib}">${commonLib}</label>
       </td>
     </tr>
   </c:forEach>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp?rev=696126&r1=696125&r2=696126&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp
(original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp
Tue Sep 16 18:33:57 2008
@@ -39,8 +39,8 @@
       </tr>
     <!-- STATUS FIELD: Deployment Plan -->
       <tr>
-        <th valign="top" style="min-width: 140px"><div align="right">Deployment
Plan:</div></th>
-        <td><textarea rows="30" cols="60" name="deploymentPlan">${data.deploymentPlan}</textarea></td>
+        <th valign="top" style="min-width: 140px"><div align="right"><label
for="<portlet:namespace/>deploymentPlan">Deployment Plan</label>:</div></th>
+        <td><textarea rows="30" cols="60" name="deploymentPlan" id="<portlet:namespace/>deploymentPlan">${data.deploymentPlan}</textarea></td>
       </tr>
     <!-- SUBMIT BUTTON -->
       <tr>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/enterpriseApp.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/enterpriseApp.jsp?rev=696126&r1=696125&r2=696126&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/enterpriseApp.jsp
(original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/enterpriseApp.jsp
Tue Sep 16 18:33:57 2008
@@ -87,7 +87,7 @@
           </div>
         </tr>
         <tr>
-          <th><div align="right">Group Id:</div></th>
+          <th><div align="right"><label for="groupId">Group Id</label>:</div></th>
           <td>
             <input type="text" id="groupId" name="groupId"
               dojoType="dijit.form.ValidationTextBox" required="false" trim="true"/>
@@ -99,7 +99,7 @@
           </div>
         </tr>
         <tr>
-          <th><div align="right">Artifact Id:</div></th>
+          <th><div align="right"><label for="artifactId">Artifact Id</label>:</div></th>
           <td>
             <input type="text" id="artifactId" name="artifactId"
               dojoType="dijit.form.ValidationTextBox" required="true" trim="true"/>
@@ -110,7 +110,7 @@
           </div>
         </tr>
         <tr>
-          <th><div align="right">Version:</div></th>
+          <th><div align="right"><label for="version">Version</label>:</div></th>
           <td>
             <input type="text" id="version" name="version"
               dojoType="dijit.form.ValidationTextBox" required="false" trim="true"/>
@@ -121,7 +121,7 @@
           </div>
         </tr>
         <tr>
-          <th><div align="right">Type:</div></th>
+          <th><div align="right"><label for="type">Type</label>:</div></th>
           <td>
             <select dojoType="dijit.form.ComboBox" id="type" name="type" 
                 value="" autocomplete="false" hasDownArrow="false">
@@ -150,7 +150,7 @@
           <td></td>
         </tr>
         <tr>
-          <th><div align="right">Hidden Classes:</div></th>
+          <th><div align="right"><label for="hiddenClasses">Hidden Classes</label>:</div></th>
           <td>
             <input type="text" id="hiddenClasses" name="hiddenClasses"
               dojoType="dijit.form.ValidationTextBox" trim="true"/>
@@ -164,7 +164,7 @@
           </div>
         </tr>
         <tr>
-          <th><div align="right">Non Overridable Classes:</div></th>
+          <th><div align="right"><label for="nonOverridableClasses">Non
Overridable Classes</label>:</div></th>
           <td>
             <input type="text" id="nonOverridableClasses" name="nonOverridableClasses"

               dojoType="dijit.form.ValidationTextBox" trim="true"/>
@@ -178,7 +178,7 @@
           </div>
         </tr>
         <tr>
-          <th><div align="right">Inverse Class Loading:</div></th>
+          <th><div align="right"><label for="inverseClassLoading">Inverse
Class Loading</label>:</div></th>
           <td>
             <input type="checkBox" name="inverseClassLoading" id="inverseClassLoading"
value="true" 
               dojoType="dijit.form.CheckBox" />
@@ -346,7 +346,7 @@
             name="dependencies" value="${commonLib}" type="checkbox"/>
           </td>
           <td valign="middle" align="left">
-            <label for="dependencies">${commonLib}</label>
+            <label for="depChkBox_${vs.index}">${commonLib}</label>
           </td>
         </tr>
       </c:forEach>
@@ -362,26 +362,26 @@
   <input type="hidden" name="prevName" id="depEditPrevName" value="none"/>
   <table cellspacing="15">
     <tr>
-      <td>Groupd Id:</td>
+      <td><label for="txtGroupId">Groupd Id</label>:</td>
       <td>
         <input type="text" dojoType="dijit.form.TextBox" id="txtGroupId" size="20" name="groupId"
trim="true"/>
       </td>
     </tr>
     <tr>
-      <td>Artifact Id:</td>
+      <td><label for="txtArtifactId">Artifact Id</label>:</td>
       <td>
         <input type="text" dojoType="dijit.form.TextBox" id="txtArtifactId" size="20"

           name="artifactId" trim="true" onChange="checkDepEditFields()"/>
       </td>
     </tr>
     <tr>
-      <td>Version:</td>
+      <td><label for="txtVersion">Version</label>:</td>
       <td>
         <input type="text" dojoType="dijit.form.TextBox" id="txtVersion" size="20" name="version"
trim="true"/>
       </td>
     </tr>
     <tr>
-      <td>Type:</td>
+      <td><label for="txtType">Type</label>:</td>
       <td>
         <input type="text" dojoType="dijit.form.TextBox" id="txtType" size="20" name="type"
trim="true"/>
       </td>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/environment.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/environment.jsp?rev=696126&r1=696125&r2=696126&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/environment.jsp
(original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/environment.jsp
Tue Sep 16 18:33:57 2008
@@ -38,8 +38,8 @@
 
   <!-- ENTRY FIELD: Context Root -->
   <tr>
-    <th><div align="right">Web Context Root:</div></th>
-    <td><input name="contextRoot" type="text" size="25" value="${data.webApp.contextRoot}"
/></td>
+    <th><div align="right"><label for="<portlet:namespace/>contextRoot">Web
Context Root</label>:</div></th>
+    <td><input name="contextRoot" id="<portlet:namespace/>contextRoot" type="text"
size="25" value="${data.webApp.contextRoot}" /></td>
   </tr>
   <tr>
     <td></td>
@@ -58,8 +58,8 @@
     groupId/artifactId/version/type. Example: "org.apache.geronimo.plugins/plancreator-tomcat/2.1/car".</td>
   </tr>
   <tr>
-    <th><div align="right">Group Id:</div></th>
-    <td><input name="groupId" type="text" size="25" value="${data.webApp.environment.moduleId.groupId}"
/></td>
+    <th><div align="right"><label for="<portlet:namespace/>groupId">Group
Id</label>:</div></th>
+    <td><input name="groupId" id="<portlet:namespace/>groupId" type="text"
size="25" value="${data.webApp.environment.moduleId.groupId}" /></td>
   </tr>
   <tr>
     <td></td>
@@ -67,24 +67,24 @@
     The important thing is that each artifactID should be unique within the group.</td>
   </tr>
   <tr>
-    <th><div align="right">Artifact Id:</div></th>
-    <td><input name="artifactId" type="text" size="25" value="${data.webApp.environment.moduleId.artifactId}"
/></td>
+    <th><div align="right"><label for="<portlet:namespace/>artifactId">Artifact
Id</label>:</div></th>
+    <td><input name="artifactId" id="<portlet:namespace/>artifactId" type="text"
size="25" value="${data.webApp.environment.moduleId.artifactId}" /></td>
   </tr>
   <tr>
     <td></td>
     <td>A name identifying the specific module within the group.</td>
   </tr>
   <tr>
-    <th><div align="right">Version:</div></th>
-    <td><input name="version" type="text" size="25" value="${data.webApp.environment.moduleId.version}"
/></td>
+    <th><div align="right"><label for="<portlet:namespace/>version">Version</label>:</div></th>
+    <td><input name="version" id="<portlet:namespace/>version" type="text"
size="25" value="${data.webApp.environment.moduleId.version}" /></td>
   </tr>
   <tr>
     <td></td>
     <td>Version number for the module.</td>
   </tr>
   <tr>
-    <th><div align="right">Type:</div></th>
-    <td><input name="type" type="text" size="25" value="${data.webApp.environment.moduleId.type}"
/></td>
+    <th><div align="right"><label for="<portlet:namespace/>type">Type</label>:</div></th>
+    <td><input name="type" id="<portlet:namespace/>type" type="text" size="25"
value="${data.webApp.environment.moduleId.type}" /></td>
   </tr>
   <tr>
     <td></td>
@@ -97,8 +97,8 @@
     <th colspan="2">Class Path Settings</th>
   </tr>
   <tr>
-    <th><div align="right">Hidden Classes:</div></th>
-    <td><input name="hiddenClasses" type="text" size="25" value="${data.environmentConfig.hiddenClassesString}"
/></td>
+    <th><div align="right"><label for="<portlet:namespace/>hiddenClasses">Hidden
Classes</label>:</div></th>
+    <td><input name="hiddenClasses" id="<portlet:namespace/>hiddenClasses"
type="text" size="25" value="${data.environmentConfig.hiddenClassesString}" /></td>
   </tr>
   <tr>
     <td></td>
@@ -108,8 +108,8 @@
     Separate multiple package/class names with a semicolon ';'</td>
   </tr>
   <tr>
-    <th><div align="right">Non Overridable Classes:</div></th>
-    <td><input name="nonOverridableClasses" type="text" size="25" value="${data.environmentConfig.nonOverridableClassesString}"
/></td>
+    <th><div align="right"><label for="<portlet:namespace/>nonOverridableClasses">Non
Overridable Classes</label>:</div></th>
+    <td><input name="nonOverridableClasses" id="<portlet:namespace/>nonOverridableClasses"
type="text" size="25" value="${data.environmentConfig.nonOverridableClassesString}" /></td>
   </tr>
   <tr>
     <td></td>
@@ -119,8 +119,8 @@
     Separate multiple package/class names with a semicolon ';'</td>
   </tr>
   <tr>
-    <th><div align="right">Inverse Class Loading:</div></th>
-    <td><input name="inverseClassLoading" type="checkbox" value="true" 
+    <th><div align="right"><label for="<portlet:namespace/>inverseClassLoading">Inverse
Class Loading</label>:</div></th>
+    <td><input name="inverseClassLoading" id="<portlet:namespace/>inverseClassLoading"
type="checkbox" value="true" 
       <c:if test="${data.environmentConfig.inverseClassLoading}">CHECKED </c:if>
/></td>
   </tr>
   <tr>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp?rev=696126&r1=696125&r2=696126&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp
(original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp
Tue Sep 16 18:33:57 2008
@@ -30,8 +30,8 @@
   <input type="hidden" name="mode" value="index-after" />
 <table>
   <tr>
-    <th align="right">Archive:</th>
-    <td><input type="file" name="moduleURI" value="" /></td>
+    <th align="right"><label for="<portlet:namespace/>moduleURI">Archive</label>:</th>
+    <td><input type="file" name="moduleURI" id="<portlet:namespace/>moduleURI"
value="" /></td>
   </tr>
   <tr></tr>
   <tr>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp?rev=696126&r1=696125&r2=696126&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp
(original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp
Tue Sep 16 18:33:57 2008
@@ -164,10 +164,10 @@
       <input type="hidden" name="ejbRef.${status.index}.refName" value="${ejbRef.refName}"
/>
       <tr>
         <td class="${backgroundClass}">
-          <div align="right">${ejbRef.refName}</div>
+          <div align="right"><label for="<portlet:namespace/>ejbRef.${status.index}.refLink">${ejbRef.refName}</label></div>
         </td>
         <td class="${backgroundClass}">
-          <select name="ejbRef.${status.index}.refLink">
+          <select name="ejbRef.${status.index}.refLink" id="<portlet:namespace/>ejbRef.${status.index}.refLink">
             <c:forEach var="ejb" items="${deployedEjbs}">
               <option value="${ejb.patternName}">${ejb.displayName}</option>
             </c:forEach>
@@ -199,10 +199,10 @@
       <input type="hidden" name="ejbLocalRef.${status.index}.refName" value="${ejbLocalRef.refName}"
/>
       <tr>
         <td class="${backgroundClass}">
-          <div align="right">${ejbLocalRef.refName}</div>
+          <div align="right"><label for="<portlet:namespace/>ejbLocalRef.${status.index}.refLink">${ejbLocalRef.refName}</label></div>
         </td>
         <td class="${backgroundClass}">
-          <select name="ejbLocalRef.${status.index}.refLink">
+          <select name="ejbLocalRef.${status.index}.refLink" id="<portlet:namespace/>ejbLocalRef.${status.index}.refLink">
             <c:forEach var="ejb" items="${deployedEjbs}">
               <option value="${ejb.patternName}">${ejb.displayName}</option>
             </c:forEach>
@@ -234,10 +234,10 @@
       <input type="hidden" name="jdbcPoolRef.${status.index}.refName" value="${refData.refName}"
/>
       <tr>
         <td class="${backgroundClass}">
-          <div align="right">${refData.refName}</div>
+          <div align="right"><label for="<portlet:namespace/>jdbcPoolRef.${status.index}.refLink">${refData.refName}</label></div>
         </td>
         <td class="${backgroundClass}">
-          <select name="jdbcPoolRef.${status.index}.refLink">
+          <select name="jdbcPoolRef.${status.index}.refLink" id="<portlet:namespace/>jdbcPoolRef.${status.index}.refLink">
           <c:forEach var="jdbcPool" items="${deployedJdbcConnectionPools}">
             <option value="${jdbcPool.patternName}">${jdbcPool.displayName}</option>
           </c:forEach>
@@ -269,10 +269,10 @@
       <input type="hidden" name="jmsConnectionFactoryRef.${status.index}.refName" value="${refData.refName}"
/>
       <tr>
         <td class="${backgroundClass}">
-          <div align="right">${refData.refName}</div>
+          <div align="right"><label for="<portlet:namespace/>jmsConnectionFactoryRef.${status.index}.refLink">${refData.refName}</label></div>
         </td>
         <td class="${backgroundClass}">
-          <select name="jmsConnectionFactoryRef.${status.index}.refLink">
+          <select name="jmsConnectionFactoryRef.${status.index}.refLink" id="<portlet:namespace/>jmsConnectionFactoryRef.${status.index}.refLink">
             <c:forEach var="jmsFactory" items="${deployedJmsConnectionFactories}">
               <option value="${jmsFactory.patternName}">${jmsFactory.displayName}</option>
             </c:forEach>
@@ -304,10 +304,10 @@
       <input type="hidden" name="jmsDestinationRef.${status.index}.refName" value="${resourceEnvRef.refName}"
/>
       <tr>
         <td class="${backgroundClass}">
-          <div align="right">${resourceEnvRef.refName}</div>
+          <div align="right"><label for="<portlet:namespace/>jmsDestinationRef.${status.index}.refLink">${resourceEnvRef.refName}</label></div>
         </td>
         <td class="${backgroundClass}">
-          <select name="jmsDestinationRef.${status.index}.refLink">
+          <select name="jmsDestinationRef.${status.index}.refLink" id="<portlet:namespace/>jmsDestinationRef.${status.index}.refLink">
             <c:forEach var="jmsDestination" items="${deployedJmsDestinations}">
               <option value="${jmsDestination.patternName}" 
                 <c:if test="${fn:startsWith(jmsDestination.displayName, resourceEnvRef.messageDestinationLink)}">
selected="selected"</c:if>
@@ -329,10 +329,10 @@
       <input type="hidden" name="messageDestination.${status.index}.refName" value="${messageDestination.messageDestinationName}"
/>
       <tr>
         <td class="${backgroundClass}">
-          <div align="right">${messageDestination.messageDestinationName}</div>
+          <div align="right"><label for="<portlet:namespace/>messageDestination.${status.index}.refLink">${messageDestination.messageDestinationName}</label></div>
         </td>
         <td class="${backgroundClass}">
-          <select name="messageDestination.${status.index}.refLink">
+          <select name="messageDestination.${status.index}.refLink" id="<portlet:namespace/>messageDestination.${status.index}.refLink">
             <c:forEach var="jmsDestination" items="${deployedJmsDestinations}">
               <option value="${jmsDestination.patternName}" 
                 <c:if test="${fn:startsWith(jmsDestination.displayName, messageDestination.adminObjectLink)}">
selected="selected"</c:if>
@@ -366,10 +366,10 @@
       <input type="hidden" name="javaMailSessionRef.${status.index}.refName" value="${refData.refName}"
/>
       <tr>
         <td class="${backgroundClass}">
-          <div align="right">${refData.refName}</div>
+          <div align="right"><label for="<portlet:namespace/>javaMailSessionRef.${status.index}.refLink">${refData.refName}</label></div>
         </td>
         <td class="${backgroundClass}">
-          <select name="javaMailSessionRef.${status.index}.refLink">
+          <select name="javaMailSessionRef.${status.index}.refLink" id="<portlet:namespace/>javaMailSessionRef.${status.index}.refLink">
             <c:forEach var="javaMailSession" items="${deployedJavaMailSessions}">
               <option value="${javaMailSession.patternName}">${javaMailSession.displayName}</option>
             </c:forEach>
@@ -427,27 +427,27 @@
             <div id="<portlet:namespace/>${serviceRefId}.addNewPort" style="display:none">
               <table border="0">
                 <tr>
-                  <th><div align="right">Port Name:</div></th>
+                  <th><div align="right"><label for="<portlet:namespace/>${serviceRefId}.newPort.portName">Port
Name</label>:</div></th>
                   <td><input type="text" id="<portlet:namespace/>${serviceRefId}.newPort.portName"/></td>
                 </tr>
                 <tr>
-                  <th><div align="right">Protocol:</div></th>
+                  <th><div align="right"><label for="<portlet:namespace/>${serviceRefId}.newPort.protocol">Protocol</label>:</div></th>
                   <td><input type="text" id="<portlet:namespace/>${serviceRefId}.newPort.protocol"/></td>
                 </tr>
                 <tr>
-                  <th><div align="right">Host:</div></th>
+                  <th><div align="right"><label for="<portlet:namespace/>${serviceRefId}.newPort.host">Host</label>:</div></th>
                   <td><input type="text" id="<portlet:namespace/>${serviceRefId}.newPort.host"/></td>
                 </tr>
                 <tr>
-                  <th><div align="right">Port:</div></th>
+                  <th><div align="right"><label for="<portlet:namespace/>${serviceRefId}.newPort.port">Port</label>:</div></th>
                   <td><input type="text" id="<portlet:namespace/>${serviceRefId}.newPort.port"/></td>
                 </tr>
                 <tr>
-                  <th><div align="right">URI:</div></th>
+                  <th><div align="right"><label for="<portlet:namespace/>${serviceRefId}.newPort.uri">URI</label>:</div></th>
                   <td><input type="text" id="<portlet:namespace/>${serviceRefId}.newPort.uri"/></td>
                 </tr>
                 <tr>
-                  <th><div align="right">Credentials Name:</div></th>
+                  <th><div align="right"><label for="<portlet:namespace/>${serviceRefId}.newPort.credentialsName">Credentials
Name</label>:</div></th>
                   <td><input type="text" id="<portlet:namespace/>${serviceRefId}.newPort.credentialsName"/></td>
                 </tr>
                 <tr>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/security.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/security.jsp?rev=696126&r1=696125&r2=696126&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/security.jsp
(original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/security.jsp
Tue Sep 16 18:33:57 2008
@@ -279,10 +279,10 @@
   <!-- ENTRY FIELD: Security Realm Name -->
   <tr>
     <th>
-    <div align="right">Security Realm Name:</div>
+    <div align="right"><label for="<portlet:namespace/>securityRealmName">Security
Realm Name</label>:</div>
     </th>
     <td>
-      <select name="securityRealmName">
+      <select name="securityRealmName" id="<portlet:namespace/>securityRealmName">
         <c:forEach var="securityRealm" items="${deployedSecurityRealms}">
           <option value="${securityRealm.realmName}">${securityRealm.realmName}</option>
         </c:forEach>
@@ -298,16 +298,16 @@
 <div>
   <input type="checkbox" id="<portlet:namespace/>advancedSecuritySettingsCheckbox"
     onClick="<portlet:namespace/>toggleAdvancedSecuritySettings();"/>
-  <b>Advanced Settings</b>
+  <b><label for="<portlet:namespace/>advancedSecuritySettingsCheckbox">Advanced
Settings</label></b>
   <div id="<portlet:namespace/>advancedSecuritySettings" style="display:none">
     <input type="hidden" id="<portlet:namespace/>advancedSecuritySettingsFlag"
       name="security.advancedSettings.isPresent" value="false"/>
     <table border="0" class="MediumBackground">
       <!-- Credential Store Ref -->
       <tr>
-        <th><div align="left">Credential Store:</div></th>
+        <th><div align="left"><label for="<portlet:namespace/>security.credentialStoreRef">Credential
Store</label>:</div></th>
         <td>
-          <select name="security.credentialStoreRef">
+          <select name="security.credentialStoreRef" id="<portlet:namespace/>security.credentialStoreRef">
             <c:forEach var="credentialStore" items="${deployedCredentialStores}">
               <option value="${credentialStore.patternName}">${credentialStore.displayName}</option>
             </c:forEach>
@@ -324,12 +324,12 @@
         <td colspan="2"><div align="left"><b>Default Subject:</b></div></td>
       </tr>
       <tr>
-        <th><div align="right">Realm:</div></th>
-        <td><input name="security.defaultSubject.realm" type="text" size="25"/></td>
+        <th><div align="right"><label for="<portlet:namespace/>security.defaultSubject.realm">Realm</label>:</div></th>
+        <td><input name="security.defaultSubject.realm" id="<portlet:namespace/>security.defaultSubject.realm"
type="text" size="25"/></td>
       </tr>
       <tr>
-        <th><div align="right">Id:</div></th>
-        <td><input name="security.defaultSubject.id" type="text" size="25"/></td>
+        <th><div align="right"><label for="<portlet:namespace/>security.defaultSubject.id">Id</label>:</div></th>
+        <td><input name="security.defaultSubject.id" id="<portlet:namespace/>security.defaultSubject.id"
type="text" size="25"/></td>
       </tr>
       <tr>
         <th></th>
@@ -341,8 +341,8 @@
       <!-- doas-current-caller -->
       <tr>
         <td colspan="2" align="left">
-          <b>doas-current-caller:</b>
-          <input name="security.doasCurrentCaller" type="checkbox" value="true"/>
+          <b><label for="<portlet:namespace/>security.doasCurrentCaller">doas-current-caller</label>:</b>
+          <input name="security.doasCurrentCaller" id="<portlet:namespace/>security.doasCurrentCaller"
type="checkbox" value="true"/>
         </td>
       </tr>
       <tr>
@@ -352,8 +352,8 @@
       <!-- use-context-handler -->
       <tr>
         <td colspan="2" align="left">
-          <b>use-context-handler:</b>
-          <input name="security.useContextHandler" type="checkbox" value="true"/>
+          <b><label for="<portlet:namespace/>security.useContextHandler">use-context-handler</label>:</b>
+          <input name="security.useContextHandler" id="<portlet:namespace/>security.useContextHandler"
type="checkbox" value="true"/>
         </td>
       </tr>
       <tr>
@@ -393,7 +393,7 @@
         <div id="<portlet:namespace/>${roleId}.loginDomainPrincipal.placeHolder"></div>
         <div id="<portlet:namespace/>${roleId}.realmPrincipal.placeHolder"></div>
         <div id="<portlet:namespace/>${roleId}.distinguishedName.placeHolder"></div>
-        <div align="justify">Add: 
+        <div align="justify"><label for="${roleId}.selectList">Add:</label>

         <select id="${roleId}.selectList" 
           onchange="<portlet:namespace/>handleAddClick('${roleId}', this.value)">
           <option value=""></option>
@@ -408,11 +408,11 @@
             name="${roleId}.principal.lastIndex" value="0">
           <table border="0">
             <tr>
-              <th><div align="right">Name:</div></th>
+              <th><div align="right"><label for="<portlet:namespace/>${roleId}.principal.name">Name</label>:</div></th>
               <td><input type="text" id="<portlet:namespace/>${roleId}.principal.name"/></td>
             </tr>
             <tr>
-              <th><div align="right">Class:</div></th>
+              <th><div align="right"><label for="<portlet:namespace/>${roleId}.principal.class">Class</label>:</div></th>
               <td>
                 <select id="<portlet:namespace/>${roleId}.principal.class">
                   <option value="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal">Group
Principal</option>
@@ -437,11 +437,11 @@
             name="${roleId}.loginDomainPrincipal.lastIndex" value="0">
           <table border="0">
             <tr>
-              <th><div align="right">Name:</div></th>
+              <th><div align="right"><label for="<portlet:namespace/>${roleId}.loginDomainPrincipal.name">Name</label>:</div></th>
               <td><input type="text" id="<portlet:namespace/>${roleId}.loginDomainPrincipal.name"/></td>
             </tr>
             <tr>
-              <th><div align="right">Class:</div></th>
+              <th><div align="right"><label for="<portlet:namespace/>${roleId}.loginDomainPrincipal.class">Class</label>:</div></th>
               <td>
                 <select id="<portlet:namespace/>${roleId}.loginDomainPrincipal.class">
                   <option value="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal">Group
Principal</option>
@@ -450,7 +450,7 @@
               </td>
             </tr>
             <tr>
-              <th><div align="right">Domain Name:</div></th>
+              <th><div align="right"><label for="<portlet:namespace/>${roleId}.loginDomainPrincipal.domainName">Domain
Name</label>:</div></th>
               <td><input type="text" id="<portlet:namespace/>${roleId}.loginDomainPrincipal.domainName"/></td>
             </tr>
             <tr>
@@ -470,11 +470,11 @@
             name="${roleId}.realmPrincipal.lastIndex" value="0">
           <table border="0">
             <tr>
-              <th><div align="right">Name:</div></th>
+              <th><div align="right"><label for="<portlet:namespace/>${roleId}.realmPrincipal.name">Name</label>:</div></th>
               <td><input type="text" id="<portlet:namespace/>${roleId}.realmPrincipal.name"/></td>
             </tr>
             <tr>
-              <th><div align="right">Class:</div></th>
+              <th><div align="right"><label for="<portlet:namespace/>${roleId}.realmPrincipal.class">Class</label>:</div></th>
               <td>
                 <select id="<portlet:namespace/>${roleId}.realmPrincipal.class">
                   <option value="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal">Group
Principal</option>
@@ -483,11 +483,11 @@
               </td>
             </tr>
             <tr>
-              <th><div align="right">Domain Name:</div></th>
+              <th><div align="right"><label for="<portlet:namespace/>${roleId}.realmPrincipal.domainName">Domain
Name</label>:</div></th>
               <td><input type="text" id="<portlet:namespace/>${roleId}.realmPrincipal.domainName"/></td>
             </tr>
             <tr>
-              <th><div align="right">Realm Name:</div></th>
+              <th><div align="right"><label for="<portlet:namespace/>${roleId}.realmPrincipal.realmName">Realm
Name</label>:</div></th>
               <td>
                 <select id="<portlet:namespace/>${roleId}.realmPrincipal.realmName">
                   <c:forEach var="securityRealm" items="${deployedSecurityRealms}">
@@ -513,7 +513,7 @@
             name="${roleId}.distinguishedName.lastIndex" value="0">
           <table border="0">
             <tr>
-              <th><div align="right">Name:</div></th>
+              <th><div align="right"><label for="<portlet:namespace/>${roleId}.distinguishedName.name">Name</label>:</div></th>
               <td><input type="text" id="<portlet:namespace/>${roleId}.distinguishedName.name"/></td>
             </tr>
             <tr>
@@ -532,16 +532,16 @@
         <div id="<portlet:namespace/>${runAsSubjectId}.ui">
           <input type="checkbox" id="<portlet:namespace/>${runAsSubjectId}.checkBox"
disabled="disabled" 
             onClick="<portlet:namespace/>toggleRunAsSubject('${runAsSubjectId}');"/>
-          Specify run-as-subject*
+          <label for="<portlet:namespace/>${runAsSubjectId}.checkBox">Specify
run-as-subject*</label>
           <div id="<portlet:namespace/>${runAsSubjectId}.subElements" style="display:none">
             <table border="0">
               <tr>
-                <th><div align="right">Realm:</div></th>
-                <td><input name="${runAsSubjectId}.realm" type="text" size="25"/></td>
+                <th><div align="right"><label for="<portlet:namespace/>${runAsSubjectId}.realm">Realm</label>:</div></th>
+                <td><input name="${runAsSubjectId}.realm" id="<portlet:namespace/>${runAsSubjectId}.realm"
type="text" size="25"/></td>
               </tr>
               <tr>
-                <th><div align="right">Id:</div></th>
-                <td><input name="${runAsSubjectId}.id" type="text" size="25"/></td>
+                <th><div align="right"><label for="<portlet:namespace/>${runAsSubjectId}.id">Id</label>:</div></th>
+                <td><input name="${runAsSubjectId}.id" id="<portlet:namespace/>${runAsSubjectId}.id"
type="text" size="25"/></td>
               </tr>
               <tr>
                 <th></th>



Mime
View raw message