[HUDSON-4784] move help about LDAP groups from global matrix help to a new

help button next to the Add user/group button.


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@23519 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly

@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-	<f:block xmlns:local="local">
+  <f:block xmlns:local="local">
     <j:set var="groups" value="${descriptor.allGroups}"/>
     <d:taglib uri="local">
       <!-- generate one row for the sid name @sid -->
@@ -99,11 +99,16 @@ THE SOFTWARE.
         <local:row sid="${null}" />
       </tr>
     </table>
-    <div style="margin-top:0.5em; margin-left: 2em;">
+    <table style="margin-top:0.5em; margin-left: 2em; width: 100%">
+     <tr><td colspan="3">
       ${%User/group to add}:
       <input type="text" id="${id}text" />
       <input type="button" value="${%Add}" id="${id}button"/>
-    </div>
+     </td><td align="right">
+      <a href="#" class="help-button" helpURL="${rootURL}${descriptor.find('hudson.security.GlobalMatrixAuthorizationStrategy$DescriptorImpl').getHelpFile('user-group')}"><img src="${imagesURL}/16x16/help.gif" alt="[help]"/></a>
+     </td></tr>
+     <f:helpArea />
+    </table>
     <script>
       (function() {
         <!-- place master outside the DOM tree so that it won't creep into the submitted form -->

core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group.html

+<div>
+  Note that adding permissions for LDAP groups requires a specific syntax.  In the
+  default configuration all LDAP groups must be entered here in all capital letters
+  and with "ROLE_" added on the front.  For example, a group called "devs" would be
+  entered here as "ROLE_DEVS".  The prefix and case settings may be adjusted by
+  editing the <tt>WEB-INF/security/LDAPBindSecurityRealm.groovy</tt> file in your
+  Hudson deployment and restarting Hudson.
+</div>

core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help.html

@@ -16,12 +16,4 @@
   Permissions are additive. That is, if an user X is in group A, B, and C, then
   the permissions that this user actually has are the union of all permissions given to
   X, A, B, C, and anonymous.
-
-  <p>
-  Note that adding permissions for LDAP groups requires a specific syntax.  In the
-  default configuration all LDAP groups must be entered here in all capital letters
-  and with "ROLE_" added on the front.  For example, a group called "devs" would be
-  entered here as "ROLE_DEVS".  The prefix and case settings may be adjusted by
-  editing the <tt>WEB-INF/security/LDAPBindSecurityRealm.groovy</tt> file in your
-  Hudson deployment and restarting Hudson.
 </div>