Update settings pages to use app bar component over hardcoded HTML

janfaracik · Jan 9, 2022 · fd5a5a7 · fd5a5a7
1 parent 07eb2c3
commit fd5a5a7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 21 deletions.
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy
@@ -12,14 +12,9 @@ def l=namespace(lib.LayoutTagLib)
 def st=namespace("jelly:stapler")
 
 l.layout(permission:app.SYSTEM_READ, title:my.displayName, cssclass:request.getParameter('decorate')) {
+    l.app_bar(title: my.displayName)
+
     l.main_panel {
-        div(class: "jenkins-app-bar") {
-            div(class: "jenkins-app-bar__content") {
-                h1 {
-                    text(my.displayName)
-                }
-            }
-        }
         set("readOnlyMode", !app.hasPermission(app.ADMINISTER))
 
         p()

diff --git a/core/src/main/resources/jenkins/model/GlobalCloudConfiguration/index.groovy b/core/src/main/resources/jenkins/model/GlobalCloudConfiguration/index.groovy
@@ -16,14 +16,8 @@ l.layout(norefresh:true, permission:app.SYSTEM_READ, title:my.displayName) {
             l.task(icon:"icon-gear icon-md", href:"${rootURL}/computer/", title:_("Manage Nodes"))
         }
     }
+    l.app_bar(title: my.displayName)
     l.main_panel {
-        div(class: "jenkins-app-bar") {
-            div(class: "jenkins-app-bar__content") {
-                h1 {
-                    text(my.displayName)
-                }
-            }
-        }
         def clouds = Cloud.all()
         if (!clouds.isEmpty()) {
             p()

diff --git a/core/src/main/resources/jenkins/tools/GlobalToolConfiguration/index.groovy b/core/src/main/resources/jenkins/tools/GlobalToolConfiguration/index.groovy
@@ -14,15 +14,9 @@ l.layout(permission:app.SYSTEM_READ, title:my.displayName) {
             l.task(icon:"icon-gear icon-md", href:"${rootURL}/manage", title:_("Manage Jenkins"))
         }
     }
+    l.app_bar(title: my.displayName)
     set("readOnlyMode", !app.hasPermission(app.ADMINISTER))
     l.main_panel {
-        h1 {
-            l.icon(class: 'icon-setting icon-xlg')
-            // TODO more appropriate icon
-            text(my.displayName)
-        }
-
-        p()
         div(class:"behavior-loading") {
             l.spinner(text: _("LOADING"))
         }