Redesign the Jenkins header

core/src/main/java/hudson/model/ManageJenkinsAction.java

@@ -27,6 +27,10 @@
 import hudson.Extension;
 import hudson.Util;
 import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Optional;
+import jenkins.management.AdministrativeMonitorsDecorator;
 import jenkins.management.Badge;
 import jenkins.model.Jenkins;
 import jenkins.model.ModelObjectWithContextMenu;
@@ -40,11 +44,11 @@
 import org.kohsuke.stapler.StaplerResponse2;
 
 /**
- * Adds the "Manage Jenkins" link to the top page.
+ * Adds the "Manage Jenkins" link to the navigation bar.
  *
  * @author Kohsuke Kawaguchi
  */
-@Extension(ordinal = 100) @Symbol("manageJenkins")
+@Extension(ordinal = 998) @Symbol("manageJenkins")
 public class ManageJenkinsAction implements RootAction, StaplerFallback, ModelObjectWithContextMenu {
     @Override
     public String getIconFileName() {
@@ -88,4 +92,24 @@
         // If neither is the case, rewrite the relative URL to point to inside the /manage/ URL space
         menu.add("manage/" + url, icon, iconXml, text, post, requiresConfirmation, badge, message);
     }
+
+    @Override
+    public Badge getBadge() {
+        Jenkins jenkins = Jenkins.get();
+        AdministrativeMonitorsDecorator decorator = jenkins.getExtensionList(PageDecorator.class)
+                .get(AdministrativeMonitorsDecorator.class);
+        Collection<AdministrativeMonitor> activeAdministrativeMonitors = Optional.ofNullable(decorator.getMonitorsToDisplay()).orElse(Collections.emptyList());
+        boolean anySecurity = activeAdministrativeMonitors.stream().anyMatch(AdministrativeMonitor::isSecurity);
+
+        if (activeAdministrativeMonitors.isEmpty()) {
+            return null;
+        }
+
+        int size = activeAdministrativeMonitors.size();
+        String suffix = size > 1 ? "notifications" : "notification";
+
+        return new Badge(String.valueOf(size),
+                size + " " + suffix,
+                anySecurity ? Badge.Severity.DANGER : Badge.Severity.WARNING);
+    }
 }

core/src/main/java/hudson/model/MyViewsProperty.java

@@ -301,7 +301,7 @@ public MyViewsTabBar getMyViewsTabBar() {
         return Jenkins.get().getMyViewsTabBar();
     }
 
-    @Extension @Symbol("myView")
+    @Symbol("myView")
     public static class GlobalAction implements RootAction {
 
         @Override

core/src/main/java/hudson/model/RootAction.java

@@ -24,8 +24,10 @@
 
 package hudson.model;
 
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.Extension;
 import hudson.ExtensionPoint;
+import jenkins.management.Badge;
 
 /**
  * Marker interface for actions that are added to {@link jenkins.model.Jenkins}.
@@ -38,4 +40,14 @@
  * @since 1.311
  */
 public interface RootAction extends Action, ExtensionPoint {
+
+    /**
+     * A {@link Badge} shown on the button for the action.
+     *
+     * @return badge or {@code null} if no badge should be shown.
+     * @since TODO
+     */
+    default @CheckForNull Badge getBadge() {
+        return null;
+    }
 }

core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java

@@ -28,7 +28,6 @@
 import hudson.Extension;
 import hudson.diagnosis.ReverseProxySetupMonitor;
 import hudson.model.AdministrativeMonitor;
-import hudson.model.ManageJenkinsAction;
 import hudson.model.PageDecorator;
 import hudson.util.HudsonIsLoading;
 import hudson.util.HudsonIsRestarting;
@@ -56,9 +55,6 @@ public class AdministrativeMonitorsDecorator extends PageDecorator {
     public AdministrativeMonitorsDecorator() {
         // otherwise this would be added to every internal context menu building request
         ignoredJenkinsRestOfUrls.add("contextMenu");
-
-        // don't show here to allow admins to disable malfunctioning monitors via AdministrativeMonitorsDecorator
-        ignoredJenkinsRestOfUrls.add("configure");
     }
 
     @NonNull
@@ -163,11 +159,6 @@ public Collection<AdministrativeMonitor> getMonitorsToDisplay() {
             return null;
         }
 
-        // Don't show on Manage Jenkins
-        if (o instanceof ManageJenkinsAction) {
-            return null;
-        }
-
         // don't show for some URLs served directly by Jenkins
         if (o instanceof Jenkins) {
             String url = a.getRestOfUrl();

core/src/main/java/jenkins/model/Jenkins.java

@@ -2350,7 +2350,7 @@ public String getSearchUrl() {
     public SearchIndexBuilder makeSearchIndex() {
         SearchIndexBuilder builder = super.makeSearchIndex();
 
-        this.actions.stream().filter(e -> e.getIconFileName() != null).forEach(action -> builder.add(new SearchItem() {
+        this.actions.stream().filter(e -> !(e.getIconFileName() == null || e.getUrlName() == null)).forEach(action -> builder.add(new SearchItem() {
             @Override
             public String getSearchName() {
                 return action.getDisplayName();

core/src/main/java/jenkins/model/navigation/SearchAction.java

@@ -0,0 +1,50 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2025, Jan Faracik
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package jenkins.model.navigation;
+
+import hudson.Extension;
+import hudson.model.RootAction;
+
+/**
+ * TODO
+ */
+@Extension(ordinal = 999)
+public class SearchAction implements RootAction {
+
+    @Override
+    public String getIconFileName() {
+        return "symbol-search";
+    }
+
+    @Override
+    public String getDisplayName() {
+        return "Search";
+    }
+
+    @Override
+    public String getUrlName() {
+        return null;
+    }
+}

core/src/main/java/jenkins/model/navigation/UserAction.java

@@ -0,0 +1,96 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2025, Jan Faracik
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package jenkins.model.navigation;
+
+import static hudson.Functions.getAvatar;
+
+import hudson.Extension;
+import hudson.model.Action;
+import hudson.model.RootAction;
+import hudson.model.User;
+import java.util.ArrayList;
+import java.util.List;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+
+/**
+ * Display the user avatar in the navigation bar.
+ * Provides a handy jumplist for common user actions.
+ */
+@Extension(ordinal = -1)
+public class UserAction implements RootAction {
+
+    @Override
+    public String getIconFileName() {
+        User current = User.current();
+
+        if (current == null) {
+            return null;
+        }
+
+        return getAvatar(current, "96x96");
+    }
+
+    @Override
+    public String getDisplayName() {
+        User current = User.current();
+
+        if (current == null) {
+            return null;
+        }
+
+        return current.getFullName();
+    }
+
+    @Override
+    public String getUrlName() {
+        User current = User.current();
+
+        if (current == null) {
+            return null;
+        }
+
+        return current.getUrl();
+    }
+
+    @Restricted(NoExternalUse.class)
+    public User getUser() {
+        return User.current();
+    }
+
+    @Restricted(NoExternalUse.class)
+    public List<Action> getActions() {
+        User current = User.current();
+
+        if (User.current() == null) {
+            return null;
+        }
+
+        List<Action> actions = new ArrayList<>();
+        actions.addAll(current.getPropertyActions());
+        actions.addAll(current.getTransientActions());
+        return actions.stream().filter(e -> e.getIconFileName() != null).toList();
+    }
+}

core/src/main/java/jenkins/views/FullHeader.java

@@ -1,5 +1,11 @@
 package jenkins.views;
 
+import hudson.model.Action;
+import java.util.List;
+import jenkins.model.Jenkins;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+
 /**
  * {@link Header} that provides its own resources as full replacement. It does not
  * depends on any core resource (images, CSS, JS, etc.)
@@ -13,4 +19,16 @@ public abstract class FullHeader extends Header {
     public boolean isCompatible() {
         return true;
     }
+
+    /**
+     * @return a list of {@link Action} to show in the header, defaults to {@link hudson.model.RootAction} extensions
+     */
+    @Restricted(NoExternalUse.class)
+    public List<Action> getActions() {
+        return Jenkins.get()
+                .getActions()
+                .stream()
+                .filter(e -> e.getIconFileName() != null)
+                .toList();
+    }
 }

core/src/main/java/jenkins/views/PartialHeader.java

@@ -25,7 +25,7 @@ public abstract class PartialHeader extends Header {
      *
      * Increment this number when an incompatible change is made to the header (like the search form API).
      */
-    private static final int compatibilityHeaderVersion = 1;
+    private static final int compatibilityHeaderVersion = 2;
 
     @Override
     public final boolean isCompatible() {

core/src/main/resources/hudson/model/ManageJenkinsAction/index.jelly

@@ -28,11 +28,6 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <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">
   <l:layout title="${%Manage Jenkins}" permissions="${app.MANAGE_AND_SYSTEM_READ}">
-    <j:if test="${taskTags==null}">
-      <st:include page="sidepanel.jelly" it="${app}" />
-      <!-- no need for additional breadcrumb here as we're on an index page already including breadcrumb -->
-    </j:if>
-
     <l:main-panel>
       <l:app-bar title="${%Manage Jenkins}">
         <l:search-bar placeholder="${%Search settings}" id="settings-search-bar" />
@@ -50,7 +45,6 @@ THE SOFTWARE.
       <j:forEach var="category" items="${app.categorizedManagementLinks.entrySet()}">
         <section class="jenkins-section jenkins-section--bottom-padding">
           <h2 class="jenkins-section__title">${category.key.label}</h2>
-          ${taskTags!=null and attrs.contextMenu!='false' ? taskTags.addHeader(category.key.label) : null}
           <div class="jenkins-section__items">
           <j:forEach var="m" items="${category.value}">
             <j:if test="${m.iconFileName != null}">
@@ -61,7 +55,6 @@ THE SOFTWARE.
               <j:set var="iconXml">
                 <l:icon src="${m.iconFileName}" />
               </j:set>
-              ${taskTags!=null and attrs.contextMenu!='false' ? it.addContextMenuItem(taskTags, m.urlName, iconSrc, iconXml, m.displayName, m.requiresPOST, m.requiresConfirmation, m.badge, sure) : null}
               <j:choose>
                 <j:when test="${m.requiresConfirmation}">
                   <l:confirmationLink href="${m.urlName}" post="${m.requiresPOST}" message="${%sure}" title="${m.displayName}">

core/src/main/resources/hudson/model/View/sidepanel.jelly

@@ -60,7 +60,6 @@ THE SOFTWARE.
       <st:include page="sidepanel2.jelly" optional="true"/>
 
       <st:include page="tasks-bottom.jelly" it="${it.owner}" optional="true" />
-      <t:actions />
     </l:tasks>
     <j:forEach var="w" items="${it.widgets}">
       <j:set var="view" value="${it}" /><!-- expose the view that's rendering this sidepanel to the widget -->

core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/loginLink.jelly

@@ -25,7 +25,4 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
   <st:include page="/hudson/security/SecurityRealm/loginLink.jelly" />
-  <j:if test="${it.allowsSignup()}">
-    <a href="${rootURL}/signup">${%sign up}</a>
-  </j:if>
 </j:jelly>

core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly

@@ -24,6 +24,8 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
-  <a href="${rootURL}/${app.securityRealm.loginUrl}?from=${app.securityRealm.from}">${%login}</a>
+<j:jelly xmlns:j="jelly:core">
+  <a class="jenkins-button" href="${rootURL}/${app.securityRealm.loginUrl}?from=${app.securityRealm.from}" style="aspect-ratio: unset; padding: 0.5rem 1rem" tooltip="Sign in to access and manage your Jenkins projects">
+    ${%Sign in}
+  </a>
 </j:jelly>