Add label tags to improve accessibility

Author: fernandomurakami-cloud

java/org/apache/catalina/manager/HTMLManagerServlet.java

@@ -1170,34 +1170,34 @@ private static <U extends Comparable<? super U>> Comparator<Session> comparingNu
             "<table cellspacing=\"0\" cellpadding=\"3\">\n" +
             "<tr>\n" +
             " <td class=\"row-right\">\n" +
-            "  <small>{3}</small>\n" +
+            "  <label for=\"deployPath\"><small>{3}</small></label>\n" +
             " </td>\n" +
             " <td class=\"row-left\">\n" +
-            "  <input type=\"text\" name=\"deployPath\" size=\"20\">\n" +
+            "  <input type=\"text\" name=\"deployPath\" id=\"deployPath\" size=\"20\">\n" +
             " </td>\n" +
             "</tr>\n" +
             "<tr>\n" +
             " <td class=\"row-right\">\n" +
-            "  <small>{4}</small>\n" +
+            "  <label for=\"deployVersion\"><small>{4}</small></label>\n" +
             " </td>\n" +
             " <td class=\"row-left\">\n" +
-            "  <input type=\"text\" name=\"deployVersion\" size=\"20\">\n" +
+            "  <input type=\"text\" name=\"deployVersion\" id=\"deployVersion\" size=\"20\">\n" +
             " </td>\n" +
             "</tr>\n" +
             "<tr>\n" +
             " <td class=\"row-right\">\n" +
-            "  <small>{5}</small>\n" +
+            "  <label for=\"deployConfig\"><small>{5}</small></label>\n" +
             " </td>\n" +
             " <td class=\"row-left\">\n" +
-            "  <input type=\"text\" name=\"deployConfig\" size=\"20\">\n" +
+            "  <input type=\"text\" name=\"deployConfig\" id=\"deployConfig\" size=\"20\">\n" +
             " </td>\n" +
             "</tr>\n" +
             "<tr>\n" +
             " <td class=\"row-right\">\n" +
-            "  <small>{6}</small>\n" +
+            "  <label for=\"deployWar\"><small>{6}</small></label>\n" +
             " </td>\n" +
             " <td class=\"row-left\">\n" +
-            "  <input type=\"text\" name=\"deployWar\" size=\"40\">\n" +
+            "  <input type=\"text\" name=\"deployWar\" id=\"deployWar\" size=\"40\">\n" +
             " </td>\n" +
             "</tr>\n" +
             "<tr>\n" +
@@ -1224,10 +1224,10 @@ private static <U extends Comparable<? super U>> Comparator<Session> comparingNu
             "<table cellspacing=\"0\" cellpadding=\"3\">\n" +
             "<tr>\n" +
             " <td class=\"row-right\">\n" +
-            "  <small>{2}</small>\n" +
+            "  <label for=\"deployWarFile\"><small>{2}</small></label>\n" +
             " </td>\n" +
             " <td class=\"row-left\">\n" +
-            "  <input type=\"file\" name=\"deployWar\" size=\"40\">\n" +
+            "  <input type=\"file\" name=\"deployWar\" id=\"deployWarFile\" size=\"40\">\n" +
             " </td>\n" +
             "</tr>\n" +
             "<tr>\n" +
@@ -1260,10 +1260,10 @@ private static <U extends Comparable<? super U>> Comparator<Session> comparingNu
             "<table cellspacing=\"0\" cellpadding=\"3\">\n" +
             "<tr>\n" +
             " <td class=\"row-right\">\n" +
-            "  <small>{3}</small>\n" +
+            "  <label for=\"tlsHostName\"><small>{3}</small></label>\n" +
             " </td>\n" +
             " <td class=\"row-left\">\n" +
-            "  <input type=\"text\" name=\"tlsHostName\" size=\"20\">\n" +
+            "  <input type=\"text\" name=\"tlsHostName\" id=\"tlsHostName\" size=\"20\">\n" +
             " </td>\n" +
             "</tr>\n" +
             "<tr>\n" +

webapps/docs/changelog.xml

@@ -105,6 +105,14 @@
   issues do not "pop up" wrt. others).
 -->
 <section name="Tomcat 10.1.53 (schultz)" rtext="in development">
+  <subsection name="Web applications">
+    <changelog>
+      <add>
+        <bug>69931</bug>: Add &lt;label&gt; for fields in the HTML manager
+        application. Patch provided by yukitidev. (schultz)
+      </add>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 10.1.52 (schultz)" rtext="release in progress">
   <subsection name="Coyote">