From 5ab5cbf701a7e95bbd5902ae60d837194a0680fa Mon Sep 17 00:00:00 2001
From: dodo920306 <dodo920306@gmail.com>
Date: Mon, 19 May 2025 19:57:26 +0800
Subject: [PATCH 1/3] Fix help display behaviors in the trait list UI

Wrap helpLink and helpArea in a `.help-sibling` container to ensure help content
appears under the correct entry, rather than always in the first block. Also moved
the helpLink inline with displayName inside the same <td> to improve layout.

- Fixes confusing UX in repeatable entries
- Matches Jenkins' help JavaScript behavior (finds closest `.help-sibling`)
- Removes unnecessary <div> wrapping displayName
---
 src/main/resources/jenkins/scm/api/form/traits.jelly | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/jenkins/scm/api/form/traits.jelly b/src/main/resources/jenkins/scm/api/form/traits.jelly
index 9d5915bc..5b4c99e9 100644
--- a/src/main/resources/jenkins/scm/api/form/traits.jelly
+++ b/src/main/resources/jenkins/scm/api/form/traits.jelly
@@ -105,18 +105,18 @@ THE SOFTWARE.
     <d:tag name="body">
       <local:blockWrapper>
         <j:set var="help" value="${descriptor.helpFile}"/>
+        <div class="help-sibling" style="width:100%">
           <local:row>
             <local:td>
-              <div>
-                <b>${descriptor.displayName}</b>
-              </div>
+              <b>${descriptor.displayName}</b>
+              <f:helpLink url="${help}"/>
             </local:td>
-            <f:helpLink url="${help}"/>
           </local:row>
           <!-- TODO: help support is unintuitive; people should be able to see help from drop-down menu -->
           <j:if test="${help!=null}">
             <f:helpArea/>
           </j:if>
+        </div>
 
         <d:invokeBody/>
 

From 9758454f7a586306748cab92ee51590f1f826270 Mon Sep 17 00:00:00 2001
From: dodo920306 <dodo920306@gmail.com>
Date: Fri, 3 Oct 2025 10:18:51 +0800
Subject: [PATCH 2/3] Remove the redundant style and element

Signed-off-by: dodo920306 <dodo920306@gmail.com>
---
 src/main/resources/jenkins/scm/api/form/traits.jelly | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/jenkins/scm/api/form/traits.jelly b/src/main/resources/jenkins/scm/api/form/traits.jelly
index e662724a..bc23fab7 100644
--- a/src/main/resources/jenkins/scm/api/form/traits.jelly
+++ b/src/main/resources/jenkins/scm/api/form/traits.jelly
@@ -63,12 +63,10 @@ THE SOFTWARE.
     <d:tag name="body">
       <div>
         <j:set var="help" value="${descriptor.helpFile}"/>
-        <div class="help-sibling" style="width:100%">
+        <div class="help-sibling">
           <local:row>
-            <local:td>
-              <b>${descriptor.displayName}</b>
-              <f:helpLink url="${help}"/>
-            </local:td>
+            <b>${descriptor.displayName}</b>
+            <f:helpLink url="${help}"/>
           </local:row>
           <!-- TODO: help support is unintuitive; people should be able to see help from drop-down menu -->
           <j:if test="${help!=null}">

From a2b65e1cd4081d9823fec2c199818c25e7d4fdf9 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Fri, 3 Oct 2025 09:07:14 +0100
Subject: [PATCH 3/3] Update
 src/main/resources/jenkins/scm/api/form/traits.jelly

---
 src/main/resources/jenkins/scm/api/form/traits.jelly | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/jenkins/scm/api/form/traits.jelly b/src/main/resources/jenkins/scm/api/form/traits.jelly
index bc23fab7..0e3dbef4 100644
--- a/src/main/resources/jenkins/scm/api/form/traits.jelly
+++ b/src/main/resources/jenkins/scm/api/form/traits.jelly
@@ -65,7 +65,7 @@ THE SOFTWARE.
         <j:set var="help" value="${descriptor.helpFile}"/>
         <div class="help-sibling">
           <local:row>
-            <b>${descriptor.displayName}</b>
+            ${descriptor.displayName}
             <f:helpLink url="${help}"/>
           </local:row>
           <!-- TODO: help support is unintuitive; people should be able to see help from drop-down menu -->