Refine Console URL Provider UI (jenkinsci#10839)

Author: janfaracik

core/src/main/java/jenkins/console/ConsoleUrlProviderUserProperty.java

@@ -25,10 +25,12 @@
 package jenkins.console;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import hudson.model.User;
 import hudson.model.UserProperty;
 import hudson.model.UserPropertyDescriptor;
+import hudson.model.userproperty.UserPropertyCategory;
 import java.util.List;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
@@ -70,6 +72,11 @@ public String getDescription() {
             return Messages.consoleUrlProviderDisplayName_Description();
         }
 
+        @Override
+        public @NonNull UserPropertyCategory getUserPropertyCategory() {
+            return UserPropertyCategory.get(UserPropertyCategory.Appearance.class);
+        }
+
         @Override
         public UserProperty newInstance(User user) {
             return new ConsoleUrlProviderUserProperty();

core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAppearanceAction/index.jelly

@@ -30,7 +30,7 @@ THE SOFTWARE.
     <l:layout permission="${app.ADMINISTER}" title="${%title}">
         <st:include page="sidepanel.jelly" it="${it.targetUser}" />
         <l:main-panel>
-            <f:form method="post" action="configSubmit" name="config">
+            <f:form method="post" action="configSubmit" name="config" class="jenkins-form">
                 <h1>
                     ${%title}
                 </h1>
@@ -44,7 +44,7 @@ THE SOFTWARE.
                     <j:when test="${hasItems}">
                         <j:forEach var="d" items="${descriptors}" varStatus="loop">
                             <j:if test="${d.enabled}">
-                                <f:section title="${d.displayName}">
+                                <f:section title="${d.displayName}" description="${d.description}">
                                     <j:set var="it" value="${thisAction.targetUser}" />
                                     <j:set var="descriptor" value="${d}" />
                                     <j:set var="instance" value="${instances[d]}" />

core/src/main/resources/jenkins/console/ConsoleUrlProviderGlobalConfiguration/config.jelly

@@ -1,13 +1,8 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
     <j:if test="${descriptor.enabled}">
-        <f:section title="${%Console URL Provider}">
-            <f:block>
-                ${%description}
-            </f:block>
-            <f:entry>
-                <f:repeatableHeteroProperty field="providers" hasHeader="true" oneEach="true" header="${%Providers}" />
-            </f:entry>
+        <f:section title="${%Console URL Provider}" description="${%description}">
+            <f:repeatableHeteroProperty field="providers" hasHeader="true" oneEach="true" header="${%Providers}" />
         </f:section>
     </j:if>
 </j:jelly>

core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.jelly

@@ -5,8 +5,6 @@
           <!-- Dummy field to always have an entry in form submissions so users can delete all providers. -->
           <f:checkbox field="unused" checked="true" />
         </f:invisibleEntry>
-        <f:entry>
-            <f:repeatableHeteroProperty field="providers" hasHeader="true" oneEach="true" header="${%Providers}" />
-        </f:entry>
+        <f:repeatableHeteroProperty field="providers" hasHeader="true" oneEach="true" header="${%Providers}" />
     </j:if>
 </j:jelly>