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] 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/>