Fix

janfaracik · Nov 6, 2021 · 7fb61fb · 7fb61fb
1 parent cea8325
commit 7fb61fb
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 23 deletions.
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy
@@ -13,9 +13,12 @@ def st=namespace("jelly:stapler")
 
 l.layout(permission:app.SYSTEM_READ, title:my.displayName, cssclass:request.getParameter('decorate')) {
     l.main_panel {
-        h1 {
-            l.icon(class: 'icon-secure icon-xlg')
-            text(my.displayName)
+        div(class: "jenkins-app-bar") {
+            div(class: "jenkins-app-bar__content") {
+                h1 {
+                    text(my.displayName)
+                }
+            }
         }
         set("readOnlyMode", !app.hasPermission(app.ADMINISTER))
 
@@ -32,12 +35,8 @@ l.layout(permission:app.SYSTEM_READ, title:my.displayName, cssclass:request.getP
                     f.checkbox(title:_("Disable remember me"), field: "disableRememberMe")
                 }
 
-                div(style:"width:100%") {
-                    f.descriptorRadioList(title:_("Security Realm"), varName:"realm", instance:app.securityRealm, descriptors: h.filterDescriptors(app, SecurityRealm.all()))
-                }
-            }
+                f.descriptorRadioList(title:_("Security Realm"), varName:"realm", instance:app.securityRealm, descriptors: h.filterDescriptors(app, SecurityRealm.all()))
 
-            div(style:"width:100%") {
                 f.descriptorRadioList(title:_("Authorization"), varName:"authorization", instance:app.authorizationStrategy, descriptors:h.filterDescriptors(app, AuthorizationStrategy.all()))
             }
 

diff --git a/core/src/main/resources/lib/form/class-entry.jelly b/core/src/main/resources/lib/form/class-entry.jelly
@@ -45,15 +45,13 @@ THE SOFTWARE.
     </st:attribute>
   </st:documentation>
   <j:set var="clazz" value="${attrs.clazz ?: attrs.descriptor.clazz.name}" />
-  <f:invisibleEntry>
-    <input type="hidden" name="stapler-class" value="${clazz}" />  <!-- Legacy: Remove once plugins have been staged onto $class -->
-    <j:choose>
-      <j:when test="${attrs.descriptor != null and attrs.descriptor.id != clazz}">
-        <input type="hidden" name="kind" value="${attrs.descriptor.id}" />
-      </j:when>
-      <j:otherwise>
-        <input type="hidden" name="$class" value="${clazz}" />
-      </j:otherwise>
-    </j:choose>
-  </f:invisibleEntry>
+  <input type="hidden" name="stapler-class" value="${clazz}" />  <!-- Legacy: Remove once plugins have been staged onto $class -->
+  <j:choose>
+    <j:when test="${attrs.descriptor != null and attrs.descriptor.id != clazz}">
+      <input type="hidden" name="kind" value="${attrs.descriptor.id}" />
+    </j:when>
+    <j:otherwise>
+      <input type="hidden" name="$class" value="${clazz}" />
+    </j:otherwise>
+  </j:choose>
 </j:jelly>
diff --git a/core/src/main/resources/lib/form/descriptorRadioList.jelly b/core/src/main/resources/lib/form/descriptorRadioList.jelly
@@ -53,9 +53,9 @@ THE SOFTWARE.
         title="${d.displayName}" checked="${instance.descriptor==d}">
         <j:set var="descriptor" value="${d}" />
 	      <j:set var="instance" value="${instance.descriptor==d?instance:null}" />
-	      <f:class-entry descriptor="${descriptor}" />
 	      <st:include from="${d}" page="${d.configPage}" optional="true" />
 	    </f:radioBlock>
+        <f:class-entry descriptor="${descriptor}" />
 	  </j:forEach>
 	</f:section>
 </j:jelly>
diff --git a/core/src/main/resources/lib/form/hetero-radio.jelly b/core/src/main/resources/lib/form/hetero-radio.jelly
@@ -47,8 +47,8 @@ THE SOFTWARE.
         <j:set var="descriptor" value="${d}" />
         <j:set var="instance" value="${currentDescriptor==d?currentInstance:null}" />
         <st:include from="${d}" page="${d.configPage}" optional="true" />
-        <f:class-entry descriptor="${d}" />
       </f:radioBlock>
+      <f:class-entry descriptor="${d}" />
     </j:forEach>
   </div>
   <!-- TODO consider customizedFields -->

diff --git a/war/src/main/less/base/style.less b/war/src/main/less/base/style.less
@@ -1174,13 +1174,21 @@ div.to-be-removed { display: none; }
   max-width: 100%;
 }
 
+.radioBlock-container {
+  margin-bottom: 0.66rem;
+
+  &:last-of-type {
+    margin-bottom: 0;
+  }
+}
+
 .optionalBlock-container > .form-container,
 .radioBlock-container > .form-container,
 .dropdownList-container {
   position: relative;
-  margin-top: 10px;
   padding-left: 32px;
   transition: var(--standard-transition);
+  margin-top: 0.66rem;
 
   &::after {
     content: "";
@@ -1193,13 +1201,18 @@ div.to-be-removed { display: none; }
     border-radius: 2px;
     transition: var(--standard-transition);
   }
+
+  &:empty {
+    display: none;
+  }
 }
 
 .form-container--hidden {
   visibility: hidden!important;
   margin-top: 0!important;
   opacity: 0!important;
   max-height: 0!important;
+  height: 0!important;
 }
 
 .row-set-end { display: none; }

diff --git a/war/src/main/less/modules/form.less b/war/src/main/less/modules/form.less
@@ -268,7 +268,7 @@
 }
 
 .jenkins-radio {
-  margin-top: 2px;
+  margin-top: 3px;
 
   &:not(:last-of-type) {
     margin-bottom: 20px;