improving the UI. I think the GUI needs more work in general...

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

core/src/main/resources/hudson/model/Hudson/configure.jelly

@@ -22,19 +22,6 @@
       </s:entry>
       <s:optionalBlock name="use_security" title="Enable security"
                        checked="${it.useSecurity}" help="/help/system-config/enableSecurity.html">
-        <j:if test="${app.newSecurity}">
-          <s:block>
-            <table style="width:100%">
-              <s:descriptorRadioList title="Security Realm" varName="realm"
-                                     instance="${it.securityRealm}"
-                                     descriptors="${h.securityRealmDescriptors}"/>
-              <s:descriptorRadioList title="Authorization" varName="authorization"
-                                     instance="${it.authorizationStrategy}"
-                                     descriptors="${h.authorizationStrategyDescriptors}"/>
-            </table>
-          </s:block>
-        </j:if>
-
         <s:entry title="TCP port for JNLP slave agents"
             help="/help/system-config/master-slave/slave-agent-port.html">
           <s:radio name="slaveAgentPortType" value="fixed" id="sat.fixed"
@@ -56,6 +43,19 @@
                    checked="${it.slaveAgentPort==-1}" onclick="$('sat.port').disabled=true" />
           <label for="sat.disabled">Disable</label>
         </s:entry>
+
+        <j:if test="${app.newSecurity}">
+          <s:entry title="Access Control">
+            <table style="width:100%">
+              <s:descriptorRadioList title="Security Realm" varName="realm"
+                                     instance="${it.securityRealm}"
+                                     descriptors="${h.securityRealmDescriptors}"/>
+              <s:descriptorRadioList title="Authorization" varName="authorization"
+                                     instance="${it.authorizationStrategy}"
+                                     descriptors="${h.authorizationStrategyDescriptors}"/>
+            </table>
+          </s:entry>
+        </j:if>
       </s:optionalBlock>