jenkinsci · timja · Mar 16, 2022 · Nov 25, 2021 · Nov 25, 2021 · Nov 25, 2021
diff --git a/core/src/main/java/hudson/console/ModelHyperlinkNote.java b/core/src/main/java/hudson/console/ModelHyperlinkNote.java
@@ -27,7 +27,7 @@ public ModelHyperlinkNote(String url, int length) {
 
     @Override
     protected String extraAttributes() {
-        return " class='model-link'";
+        return " class='model-link model-link--float'";
     }
 
     public static String encodeTo(@NonNull User u) {

diff --git a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
@@ -153,7 +153,18 @@ public ContextMenu add(String url, String icon, String iconXml, String text, boo
         @Restricted(DoNotUse.class) // manage.jelly only
         public ContextMenu addHeader(String title) {
             final MenuItem item = new MenuItem().withDisplayName(title);
-            item.header = true;
+            item.type = MenuItemType.HEADER;
+            return add(item);
+        }
+
+        /**
+         * Add a separator row (no icon, no URL, no text).
+         *
+         * @since TODO - Provide version
+         */
+        public ContextMenu addSeparator() {
+            final MenuItem item = new MenuItem();
+            item.type = MenuItemType.SEPARATOR;
             return add(item);
         }
 
@@ -303,12 +314,12 @@ class MenuItem {
 
 
         /**
-         * True to display this item as a section header.
-         * @since 2.231
+         * The type of menu item
+         * @since TODO
          */
         @Exported
         @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "read by Stapler")
-        public boolean header;
+        public MenuItemType type = MenuItemType.ITEM;
 
         /**
          * If this is a submenu, definition of subitems.
@@ -388,6 +399,12 @@ private String getResourceUrl() {
 
     }
 
+    enum MenuItemType {
+        ITEM,
+        HEADER,
+        SEPARATOR
+    }
+
     /**
      * Allows an action to decide whether it will be visible in a context menu.
      * @since 1.538

diff --git a/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly b/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly
@@ -29,18 +29,18 @@ THE SOFTWARE.
             <j:set var="id" value="${h.generateId()}"/>
             <j:set var="href" value="${jobBaseUrl}${job.shortUrl}build?delay=0sec"/>
             <div class="jenkins-table__cell__button-wrapper">
-              <a id="${id}" class="jenkins-table__button jenkins-table__button--green" href="${href}">
-                  <j:choose>
-                      <j:when test="${job.parameterized}">
-                          <j:set var="title" value="${%Schedule_a_task_with_parameters(h.getRelativeDisplayNameFrom(job, itemGroup),it.taskNoun(job))}"/>
-                      </j:when>
-                      <j:otherwise>
-                          <span class="build-button-column-icon-reference-holder" data-id="${id}" data-url="${href}" data-notification="${%Task_scheduled(it.taskNoun(job))}"/>
-                          <j:set var="title" value="${%Schedule_a_task(h.getRelativeDisplayNameFrom(job, itemGroup),it.taskNoun(job))}"/>
-                      </j:otherwise>
-                  </j:choose>
-                  <l:icon src="symbol-play" alt="${title}" />
-                  <st:adjunct includes="hudson.views.BuildButtonColumn.icon"/>
+              <j:choose>
+                <j:when test="${job.parameterized}">
+                  <j:set var="title" value="${%Schedule_a_task_with_parameters(h.getRelativeDisplayNameFrom(job, itemGroup),it.taskNoun(job))}"/>
+                </j:when>
+                <j:otherwise>
+                  <span class="build-button-column-icon-reference-holder" data-id="${id}" data-url="${href}" data-notification="${%Task_scheduled(it.taskNoun(job))}"/>
+                  <j:set var="title" value="${%Schedule_a_task(h.getRelativeDisplayNameFrom(job, itemGroup),it.taskNoun(job))}"/>
+                </j:otherwise>
+              </j:choose>
+              <a id="${id}" tooltip="${title}" class="jenkins-table__button jenkins-table__button--green" href="${href}">
+                <l:icon src="symbol-play" />
+                <st:adjunct includes="hudson.views.BuildButtonColumn.icon"/>
               </a>
             </div>
           </j:if>

diff --git a/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly b/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly
@@ -29,7 +29,7 @@ THE SOFTWARE.
     <j:choose>
       <j:when test="${lfBuild!=null}">
         ${lfBuild.timestampString}
-        <a href="${jobBaseUrl}${job.shortUrl}lastFailedBuild/" class="jenkins-table__link jenkins-table__badge">${lfBuild.displayName}</a>
+        <a href="${jobBaseUrl}${job.shortUrl}lastFailedBuild/" class="jenkins-table__link jenkins-table__badge model-link inside">${lfBuild.displayName}</a>
       </j:when>
       <j:otherwise>
         ${%N/A}

diff --git a/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly b/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly
@@ -29,7 +29,7 @@ THE SOFTWARE.
     <j:choose>
       <j:when test="${lsBuild!=null}">
         ${lsBuild.timestampString}
-        <a href="${jobBaseUrl}${job.shortUrl}lastSuccessfulBuild/" class="jenkins-table__link jenkins-table__badge">${lsBuild.displayName}</a>
+        <a href="${jobBaseUrl}${job.shortUrl}lastSuccessfulBuild/" class="jenkins-table__link jenkins-table__badge model-link inside">${lsBuild.displayName}</a>
       </j:when>
       <j:otherwise>
         ${%N/A}

diff --git a/core/src/main/resources/jenkins/views/JenkinsHeader/headerContent.jelly b/core/src/main/resources/jenkins/views/JenkinsHeader/headerContent.jelly
@@ -1,6 +1,6 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:i="jelly:fmt" xmlns:x="jelly:xml">
-    <header id="header" class="page-header">
+    <header id="page-header" class="page-header">
         <div class="page-header__brand">
             <div class="logo">
                 <a id="jenkins-home-link" href="${rootURL}/">
@@ -56,7 +56,7 @@
                                 <j:set var="userName" value="${user.fullName}"/>
                             </j:otherwise>
                         </j:choose>
-                        <a href="${rootURL}/${user.url}" class="model-link inside inverse">
+                        <a href="${rootURL}/${user.url}" class="model-link">
                             <l:svgIcon
                                        class="am-monitor-icon" >
                                 <use href="${resURL}/images/material-icons/svg-sprite-social-symbol.svg#ic_person_24px"></use>

diff --git a/core/src/main/resources/lib/form/breadcrumb-config-outline/init.js b/core/src/main/resources/lib/form/breadcrumb-config-outline/init.js
@@ -13,5 +13,9 @@ Event.observe(window, "load", function () {
             $(e.section).insert({top:"<a id=" + id + " class='section-anchor'>#</a>"});
         menu.add('#' + id, null, caption);
     });
-    breadcrumbs.attachMenu('inpage-nav', menu);
+    var inpageNav = document.getElementById("inpage-nav")
+    var chevron = document.createElement("li")
+    chevron.classList.add("children")
+    inpageNav.parentNode.insertBefore(chevron, inpageNav.nextSibling);
+    breadcrumbs.attachMenu(chevron, menu);
 });
diff --git a/core/src/main/resources/lib/hudson/buildListTable.jelly b/core/src/main/resources/lib/hudson/buildListTable.jelly
@@ -44,7 +44,7 @@ THE SOFTWARE.
                   insert(new Element('div', {class: 'jenkins-table__cell__button-wrapper'}).
                       insert(generateSVGIcon(e.iconName, "${iconSizeClass}"))));
               tr.insert(new Element('td').
-                  insert(new Element('a', {class: 'jenkins-table__link model-link inside', href: '${rootURL}/' + e.parentUrl}).
+                  insert(new Element('a', {class: 'jenkins-table__link model-link', href: '${rootURL}/' + e.parentUrl}).
                       update(e.parentFullDisplayName)).
                   insert(new Element('a', {class: 'jenkins-table__link jenkins-table__badge model-link inside', href: '${rootURL}/' + e.url}).
                       update(e.displayName.escapeHTML())));

diff --git a/core/src/main/resources/lib/hudson/executors.jelly b/core/src/main/resources/lib/hudson/executors.jelly
@@ -35,21 +35,22 @@ THE SOFTWARE.
     <d:tag name="computerCaption">
 
       <a href="${rootURL}/${c.url}" class="jenkins-link--with-icon model-link inside"><l:icon src="${c.iconClassName}" alt="${altText}"/><st:nbsp/>${title}</a>
-      <j:if test="${c.offline}">
-        <st:nbsp/>
-        <j:choose>
-          <j:when test="${c.offlineCause!=null and !c.connecting}">
-            (<img src="${imagesURL}/svgs/error.svg" width="16" height="16" title="${c.offlineCause}"/> ${%offline})
-          </j:when>
-          <j:when test="${c.connecting}">
-            (<l:icon class="icon-hourglass icon-sm"/>${%launching})
-          </j:when>
-          <j:otherwise>
-            (${%offline})
-          </j:otherwise>
-        </j:choose>
-      </j:if>
-      <j:if test="${!c.acceptingTasks}"> <st:nbsp/> (${%suspended})</j:if>
+      <span style="float: right; font-weight: normal;">
+        <j:if test="${c.offline}">
+          <j:choose>
+            <j:when test="${c.offlineCause!=null and !c.connecting}">
+              (<img src="${imagesURL}/svgs/error.svg" width="16" height="16" title="${c.offlineCause}"/> ${%offline})
+            </j:when>
+            <j:when test="${c.connecting}">
+              (<l:icon class="icon-hourglass icon-sm"/>${%launching})
+            </j:when>
+            <j:otherwise>
+              (${%offline})
+            </j:otherwise>
+          </j:choose>
+        </j:if>
+        <j:if test="${!c.acceptingTasks}"> <st:nbsp/> (${%suspended})</j:if>
+      </span>
     </d:tag>
     <d:tag name="executor">
       <j:if test="${!c.offline or (c.offline and !e.idle)}">

diff --git a/core/src/main/resources/lib/layout/breadcrumb.jelly b/core/src/main/resources/lib/layout/breadcrumb.jelly
@@ -40,9 +40,9 @@ THE SOFTWARE.
 
   <j:if test="${mode=='breadcrumbs'}">
     <li id="${attrs.id}" class="item">
-      <a href="${attrs.href}" class="model-link inside">
+      <a href="${attrs.href}">
         ${attrs.title}
       </a>
     </li>
   </j:if>
-</j:jelly>
+</j:jelly>
diff --git a/core/src/main/resources/lib/layout/breadcrumbBar.jelly b/core/src/main/resources/lib/layout/breadcrumbBar.jelly
@@ -34,50 +34,47 @@ THE SOFTWARE.
     use the &lt;l:breadcrumb> tag.
   </st:documentation>
 
-  <tr id="top-nav">
-    <td id="left-top-nav" colspan="2">
-      <st:adjunct includes="lib.layout.breadcrumbs" />
-      <div class="top-sticker noedge">
-        <div class="top-sticker-inner">
-          <div class="breadcrumbs__wrapper">
-            <ul id="breadcrumbs">
-              <j:forEach var="anc" items="${request.ancestors}">
-                <j:if test="${h.isModel(anc.object) and anc.prev.url!=anc.url}">
-                  <li class="item">
-                    <a href="${anc.url}/" class="${h.isModelWithContextMenu(anc.object)?'model-link':null} inside">
-                      <!-- Workaround to set desired name to first breadcrumb (instead of Jenkins) -->
-                      <j:choose>
-                        <j:when test="${anc.object == app}">
-                          ${%Dashboard}
-                        </j:when>
-                        <j:otherwise>
-                          ${anc.object.displayName}
-                        </j:otherwise>
-                      </j:choose>
-                    </a>
-                  </li>
+  <st:adjunct includes="lib.layout.breadcrumbs" />
+
+  <div class="top-sticker noedge">
+    <div class="top-sticker-inner">
+      <div class="jenkins-breadcrumbs">
+        <ul id="breadcrumbs">
+          <j:forEach var="anc" items="${request.ancestors}">
+            <j:if test="${h.isModel(anc.object) and anc.prev.url!=anc.url}">
+              <li class="item">
+                <a href="${anc.url}/" class="${h.isModelWithContextMenu(anc.object)?'model-link':null}">
+                  <!-- Workaround to set desired name to first breadcrumb (instead of Jenkins) -->
                   <j:choose>
-                    <j:when test="${h.isModelWithChildren(anc.object)}">
-                      <li class="children" href="${anc.url}/">
-                        <!-- shows '>' for rendering children -->
-                      </li>
+                    <j:when test="${anc.object == app}">
+                      ${%Dashboard}
                     </j:when>
                     <j:otherwise>
-                      <li class="separator">
-                      </li>
+                      ${anc.object.displayName}
                     </j:otherwise>
                   </j:choose>
-                </j:if>
-              </j:forEach>
+                </a>
+              </li>
+              <j:choose>
+                <j:when test="${h.isModelWithChildren(anc.object)}">
+                  <li class="children" href="${anc.url}/">
+                    <!-- shows '>' for rendering children -->
+                  </li>
+                </j:when>
+                <j:otherwise>
+                  <li class="separator">
+                  </li>
+                </j:otherwise>
+              </j:choose>
+            </j:if>
+          </j:forEach>
 
-              <!-- render additional breadcrumb items -->
-              <d:invokeBody />
-            </ul>
+          <!-- render additional breadcrumb items -->
+          <d:invokeBody />
+        </ul>
 
-            <div id="breadcrumb-menu-target"/><!-- this is where the menu gets rendered -->
-          </div>
-        </div>
+        <div id="breadcrumb-menu-target"/><!-- this is where the menu gets rendered -->
       </div>
-    </td>
-  </tr>
-</j:jelly>
+    </div>
+  </div>
+</j:jelly>