jenkinsci · mawinter69 · Mar 5, 2026 · Mar 5, 2026
diff --git a/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly b/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly
@@ -24,12 +24,12 @@ 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">
-  <div class="jenkins-alert jenkins-alert-danger">
+  <l:adminMonitor severity="danger">
     <dl>
         <dt>${%PluginCycles}</dt>
         <j:forEach var="p" items="${it.pluginsWithCycle}">
           <dd><j:out value="${p.longName} v${p.version}"/></dd>
         </j:forEach>
     </dl>
-  </div>
+  </l:adminMonitor>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly b/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly
@@ -24,13 +24,13 @@ 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">
-  <div class="jenkins-alert jenkins-alert-warning">
+  <l:adminMonitor>
     <dl>
       <dt>${%DeprecatedPlugins}</dt>
       <j:forEach var="e" items="${it.getDeprecatedPlugins()}">
         <dd><a href="${e.value}" rel="noopener noreferrer" target="_blank">${e.key.displayName}</a></dd>
       </j:forEach>
     </dl>
     <p>${%DeprecatedPluginsDescription}</p>
-  </div>
+  </l:adminMonitor>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly b/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly
@@ -24,12 +24,12 @@ 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">
-  <div class="jenkins-alert jenkins-alert-danger">
+  <l:adminMonitor severity="danger">
     <dl>
         <dt>${%RequiredPluginUpdates}</dt>
         <j:forEach var="p" items="${it.pluginsToBeUpdated}">
         <dd><j:out value="${p.pluginName}"/> — <j:out value="${p.message}"/></dd>
       </j:forEach>
     </dl>
-  </div>
+  </l:adminMonitor>
 </j:jelly>
diff --git a/.../src/main/resources/hudson/PluginWrapper/PluginWrapperAdministrativeMonitor/message.jelly b/.../src/main/resources/hudson/PluginWrapper/PluginWrapperAdministrativeMonitor/message.jelly
@@ -1,10 +1,10 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-  <div class="jenkins-alert jenkins-alert-danger" role="alert">
-    <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
-      <f:submit name="correct" value="${%Correct}"/>
-    </form>
-    <p>${%blurbOriginal}</p>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout">
+  <l:adminMonitor severity="danger">
+    <div class="buttons">
+      <a href="${rootURL}/pluginManager" class="jenkins-button jenkins-button--primary">${%Correct}</a>
+    </div>
+    ${%blurbOriginal}
     <p><strong>${%DirectlyDependentPlugins.title}</strong></p>
     <j:forEach items="${it.plugins}" var="plugin">
       <j:if test="${plugin.hasOriginalDependencyErrors()}">
@@ -30,5 +30,5 @@
         </j:forEach>
       </dl>
     </j:if>
-  </div>
+  </l:adminMonitor>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index.jelly b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index.jelly
@@ -27,7 +27,7 @@ THE SOFTWARE.
 	<l:layout title="${%JENKINS_HOME is almost full}">
 		<l:main-panel>
       <h1>
-        <l:icon class="icon-warning icon-xlg"/>
+        <l:icon src="symbol-warning" class="icon-xlg jenkins-!-warning-color"/>
         ${%blurb}
       </h1>
 

diff --git a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.jelly b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.jelly
@@ -24,11 +24,10 @@ 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">
-<div class="jenkins-alert jenkins-alert-warning">
-  <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
-    <f:submit name="yes" value="${%Tell me more}"/>
-    <f:submit name="no" value="${%Dismiss}"/>
-  </form>
-  ${%blurb(app.rootDir)}
-</div>
+  <l:adminMonitor dismissable="true">
+    <div class="buttons">
+      <a href="${rootURL}/${it.url}/" class="jenkins-button jenkins-button--primary">${%Tell me more}</a>
+    </div>
+    ${%blurb(app.rootDir)}
+  </l:adminMonitor>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/diagnosis/NullIdDescriptorMonitor/message.jelly b/core/src/main/resources/hudson/diagnosis/NullIdDescriptorMonitor/message.jelly
@@ -24,12 +24,12 @@ 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">
-<div class="jenkins-alert jenkins-alert-danger">
-  <dl>
-    <dt>${%blurb}</dt>
-    <j:forEach var="d" items="${it.problems}">
-      <dd>${%problem(d, d.displayName, app.pluginManager.whichPlugin(d.getClass()))}</dd>
-    </j:forEach>
-  </dl>
-</div>
+  <l:adminMonitor severity="danger">
+    <dl>
+      <dt>${%blurb}</dt>
+      <j:forEach var="d" items="${it.problems}">
+        <dd>${%problem(d, d.displayName, app.pluginManager.whichPlugin(d.getClass()))}</dd>
+      </j:forEach>
+    </dl>
+  </l:adminMonitor>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly
@@ -24,11 +24,10 @@ 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">
-  <div class="jenkins-alert jenkins-alert-warning">
-    <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
-      <f:submit name="yes" value="${%Manage}"/>
-      <f:submit name="no" value="${%Dismiss}"/>
-    </form>
+  <l:adminMonitor severity="warning" dismissable="true">
+    <div class="buttons">
+      <a href="${rootURL}/${it.url}/manage" class="jenkins-button jenkins-button--primary" style="margin-left: auto">${%Manage}</a>
+    </div>
     ${%You have data stored in an older format and/or unreadable data.}
-  </div>
+  </l:adminMonitor>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message.jelly b/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message.jelly
@@ -23,16 +23,12 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" xmlns:l="/lib/layout">
-  <div id="redirect-error" class="jenkins-alert jenkins-alert-danger reverse-proxy__hidden"
-       data-url="${rootURL}/${it.url}/test" data-context="${rootURL}">
-    <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
-      <f:submit name="yes" value="${%More Info}"/>
-      <l:isAdmin>
-        <f:submit name="no" value="${%Dismiss}"/>
-      </l:isAdmin>
-    </form>
-    <div>${%blurb}</div>
-    <div class="js-context-message reverse-proxy__hidden">${%missingContextMessage(rootURL)}</div>
-  </div>
+  <l:adminMonitor severity="danger" dismissable="true" class="reverse-proxy__hidden" id="redirect-error">
+    <div class="buttons">
+      <a href="https://www.jenkins.io/redirect/troubleshooting/broken-reverse-proxy" class="jenkins-button jenkins-button--primary">${%More Info}</a>
+    </div>
+    <div id="redirect-data" data-url="${rootURL}/${it.url}/test" data-context="${rootURL}"/>
+    <div>${%blurb} <span class="js-context-message reverse-proxy__hidden">${%missingContextMessage(rootURL)}</span></div>
+  </l:adminMonitor>
   <st:adjunct includes="hudson.diagnosis.ReverseProxySetupMonitor.resources"/>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/resources.js b/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/resources.js
@@ -1,13 +1,15 @@
 (function () {
   var redirectForm = document.getElementById("redirect-error");
+  const redirectData = document.getElementById("redirect-data");
+
   if (!redirectForm) {
     console.warn(
       'This script expects to have an element with id="redirect-error" to be working.',
     );
     return;
   }
 
-  var urlToTest = redirectForm.getAttribute("data-url");
+  var urlToTest = redirectData.getAttribute("data-url");
   var callUrlToTest = function (testWithContext, callback) {
     var headers = {};
     var body = null;
@@ -40,7 +42,7 @@
 
   callUrlToTest(false, function (response) {
     if (response.status !== 200) {
-      var context = redirectForm.getAttribute("data-context");
+      var context = redirectData.getAttribute("data-context");
       // to cover the case where the JenkinsRootUrl is configured without the context
       if (context) {
         callUrlToTest(true, function (response2) {

diff --git a/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.jelly b/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.jelly
@@ -24,13 +24,10 @@ 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">
-  <div id="tooManyJobsButNoView" class="jenkins-alert jenkins-alert-warning">
-    <l:isAdmin>
-      <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
-        <f:submit name="yes" value="${%Create a view now}"/>
-        <f:submit name="no" value="${%Dismiss}"/>
-      </form>
-    </l:isAdmin>
+  <l:adminMonitor>
+    <div class="buttons">
+      <a href="${rootURL}/newView" class="jenkins-button jenkins-button--primary">${%Create a view now}</a>
+    </div>
     ${%blurb}
-  </div>
+  </l:adminMonitor>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.jelly b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.jelly
@@ -24,7 +24,7 @@ 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">
-  <div class="jenkins-alert jenkins-alert-info">
+  <l:adminMonitor severity="info">
     <j:set var="ucData" value="${it.data}" />
     <j:set var="upJob" value="${app.updateCenter.hudsonJob}" />
     <j:choose>
@@ -62,5 +62,5 @@ THE SOFTWARE.
         </l:isAdmin>
       </j:otherwise>
     </j:choose>
-  </div>
+  </l:adminMonitor>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message.jelly b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message.jelly
@@ -24,10 +24,7 @@ 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">
-  <div class="jenkins-alert jenkins-alert-warning">
-    <form method="post" action="${rootURL}/${it.url}/disable">
-      <f:submit value="${%Dismiss}"/>
-    </form>
+  <l:adminMonitor>
     ${%blurb(rootURL)}
-  </div>
+  </l:adminMonitor>
 </j:jelly>
diff --git a/...dson/security/csrf/DefaultCrumbIssuer/ExcludeSessionIdAdministrativeMonitor/message.jelly b/...dson/security/csrf/DefaultCrumbIssuer/ExcludeSessionIdAdministrativeMonitor/message.jelly
@@ -23,12 +23,11 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-  <div class="jenkins-alert jenkins-alert-warning">
-    <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
-      <f:submit name="learn" value="${%Learn more}"/>
-      <f:submit name="dismiss" value="${%Dismiss}"/>
-    </form>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout">
+  <l:adminMonitor>
+    <div class="buttons">
+      <a href="https://www.jenkins.io/redirect/csrf-protection/" class="jenkins-button jenkins-button--primary">${%Learn more}</a>
+    </div>
     ${%blurb}
-  </div>
+  </l:adminMonitor>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message.jelly b/core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message.jelly
@@ -23,8 +23,8 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:t="/lib/hudson">
-  <div class="jenkins-alert jenkins-alert-warning">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout">
+  <l:adminMonitor>
     ${%blurb(rootURL)}
-  </div>
+  </l:adminMonitor>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/triggers/SlowTriggerAdminMonitor/message.groovy b/core/src/main/resources/hudson/triggers/SlowTriggerAdminMonitor/message.groovy
@@ -7,16 +7,19 @@ import org.apache.commons.jelly.tags.fmt.FmtTagLibrary
 
 SlowTriggerAdminMonitor tam = my
 
-dl {
-    div(class: "jenkins-alert jenkins-alert-warning") {
-        form(method: "post", name: "clear", action: rootURL + "/" + tam.url + "/clear") {
-            button(name: "clear", type: "submit", class: "jenkins-button jenkins-submit-button jenkins-button--primary") {
-                raw _("Dismiss")
+l = namespace(lib.LayoutTagLib)
+l.adminMonitor() {
+    dl(style: "width: 100%;") {
+
+        div(style: "display: flex; justify-content: space-between; align-items: center;") {
+            text(_("blurb"))
+            form(method: "post", name: "clear", action: rootURL + "/" + tam.url + "/clear", style: "align-self: flex-start;") {
+                button(name: "clear", type: "submit", class: "jenkins-button jenkins-submit-button jenkins-button--primary") {
+                    raw _("Clear")
+                }
             }
         }
 
-        text(_("blurb"))
-
         table(class: "sortable jenkins-table jenkins-!-margin-top-2", width: "100%") {
             thead {
                 tr {

diff --git a/core/src/main/resources/hudson/util/DoubleLaunchChecker/message.jelly b/core/src/main/resources/hudson/util/DoubleLaunchChecker/message.jelly
@@ -24,24 +24,20 @@ 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" xmlns:i="jelly:fmt">
-  <div class="jenkins-alert jenkins-alert-warning">
-      <p>
-        ${%message(it.home)}
-      </p>
-      <table>
-        <tr>
-          <td>${%This Jenkins}:</td>
-          <td>${it.id}</td>
-        </tr>
-        <tr>
-          <td>${%Other Jenkins}:</td>
-          <td>${it.collidingId}</td>
-        </tr>
-      </table>
-      <div>
-        <form method="post" action="${rootURL}/${it.url}/disable">
-          <f:submit value="${%label}" />
-        </form>
-      </div>
-  </div>
+  <l:adminMonitor dismissable="false">
+    <form method="post" action="${rootURL}/${it.url}/disable">
+      <f:submit value="${%label}" />
+    </form>
+    ${%message(it.home)}
+    <table>
+      <tr>
+        <td>${%This Jenkins}:</td>
+        <td>${it.id}</td>
+      </tr>
+      <tr>
+        <td>${%Other Jenkins}:</td>
+        <td>${it.collidingId}</td>
+      </tr>
+    </table>
+  </l:adminMonitor>
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/diagnosis/HsErrPidList/message.jelly b/core/src/main/resources/jenkins/diagnosis/HsErrPidList/message.jelly
@@ -24,7 +24,7 @@ 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">
-  <div class="jenkins-alert jenkins-alert-danger">
+  <l:adminMonitor severity="danger">
     ${%blurb(rootURL+'/'+it.url)}
-  </div>
+  </l:adminMonitor>
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/diagnostics/CompletedInitializationMonitor/message.jelly b/core/src/main/resources/jenkins/diagnostics/CompletedInitializationMonitor/message.jelly
@@ -1,11 +1,11 @@
 <?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">
-  <div class="jenkins-alert jenkins-alert-warning">
-      ${%blurb(app.initLevel)}
-      ${%Example: usage of} <code>@Initializer(after = InitMilestone.COMPLETED)</code> ${%in a plugin}
-      (<a href="https://www.jenkins.io/redirect/troubleshooting/initialization-not-completed" rel="noopener noreferrer" target="_blank">${%See documentation}</a>).
-      ${%Please} <a href="https://www.jenkins.io/redirect/report-an-issue" rel="noopener noreferrer" target="_blank">${%report a bug}</a> ${%in the Jenkins bugtracker}.
-      <!--TODO: Nice2have: cause diagnostics-->
-      <!-- FIXME TODO XXX i18n does not take into account different sentence structure, rewrite with arguments -->
-  </div>
+  <l:adminMonitor>
+    ${%blurb(app.initLevel)}
+    ${%Example: usage of} <code>@Initializer(after = InitMilestone.COMPLETED)</code> ${%in a plugin}
+    (<a href="https://www.jenkins.io/redirect/troubleshooting/initialization-not-completed" rel="noopener noreferrer" target="_blank">${%See documentation}</a>).
+    ${%Please} <a href="https://www.jenkins.io/redirect/report-an-issue" rel="noopener noreferrer" target="_blank">${%report a bug}</a> ${%in the Jenkins bugtracker}.
+    <!--TODO: Nice2have: cause diagnostics-->
+    <!-- FIXME TODO XXX i18n does not take into account different sentence structure, rewrite with arguments -->
+  </l:adminMonitor>
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsAgents/message.jelly b/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsAgents/message.jelly
@@ -24,12 +24,10 @@ 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">
-  <div class="jenkins-alert jenkins-alert-warning">
-     <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
-      <f:submit name="yes" value="${%Manage}"/>
-      <f:submit name="no" value="${%Dismiss}"/>
-     </form>
-
+  <l:adminMonitor severity="warning" dismissable="true">
+    <div class="buttons">
+      <a href="${rootURL}/computer/(built-in)/configure" class="jenkins-button jenkins-button--primary">${%ManageExecutors}</a>
+    </div>
     ${%ExecutorsWarning}
-  </div>
+  </l:adminMonitor>
 </j:jelly>