From 22dd5568cbd4bcd146486330c3a50a066865770b Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sun, 14 Apr 2024 10:04:55 +0100
Subject: [PATCH 1/8] Init

---
 .../resources/hudson/model/Run/console.jelly  | 56 +++++++------------
 .../resources/lib/hudson/buildCaption.jelly   |  7 +++
 .../lib/hudson/project/console-link.jelly     | 13 +----
 3 files changed, 29 insertions(+), 47 deletions(-)

diff --git a/core/src/main/resources/hudson/model/Run/console.jelly b/core/src/main/resources/hudson/model/Run/console.jelly
index 519b61744a27..d2d13d2e9870 100644
--- a/core/src/main/resources/hudson/model/Run/console.jelly
+++ b/core/src/main/resources/hudson/model/Run/console.jelly
@@ -28,47 +28,33 @@ THE SOFTWARE.
   Displays the console output
 -->
 <?jelly escape-by-default='true'?>
-<st:compress 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">
+<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:dd="/lib/layout/dropdowns">
   <l:layout title="${it.fullDisplayName} Console">
     <st:include page="sidepanel.jelly" />
-     <l:breadcrumb title="${%Console Output}" />
+
+    <l:breadcrumb title="${%Console Output}" />
+
     <l:main-panel>
-      <t:buildCaption>
+      <j:set var="controls">
+        <l:copyButton message="${%successfullyCopied}" tooltip="${%clickToCopy}" ref="out" label="${%Copy}" />
+        <l:overflowButton>
+          <dd:custom>
+            <a class="jenkins-dropdown__item" href="consoleText" download="${it.displayName}.txt">
+              <div class="jenkins-dropdown__item__icon">
+                <l:icon src="symbol-download" />
+              </div>
+              ${%Download}
+            </a>
+          </dd:custom>
+          <dd:item href="consoleText" text="${%View as plain text}" icon="symbol-document-text" />
+        </l:overflowButton>
+      </j:set>
+
+      <t:buildCaption controls="${controls}">
         ${%Console Output}
-        <l:copyButton message="${%successfullyCopied}" tooltip="${%clickToCopy}" ref="out"/>
       </t:buildCaption>
-      <j:set var="threshold" value="${h.getSystemProperty('hudson.consoleTailKB')?:'150'}" />
-      <!-- Show at most last 150KB (can override with system property) unless consoleFull is set -->
-      <j:set var="offset" value="${empty(consoleFull) ? it.logText.length()-threshold*1024 : 0}" />
-      <j:choose>
-        <j:when test="${offset > 0}">
-          ${%skipSome(offset/1024,"consoleFull")}
-        </j:when>
-        <j:otherwise>
-          <j:set var="offset" value="${0}" />
-        </j:otherwise>
-      </j:choose>
-
-      <j:out value="${h.generateConsoleAnnotationScriptAndStylesheet()}"/>
 
-      <j:choose>
-        <!-- Do progressive console output -->
-        <j:when test="${it.isLogUpdated()}">
-          <pre id="out" class="console-output" />
-            <div id="spinner">
-              <l:progressAnimation/>
-            </div>
-          <t:progressiveText href="logText/progressiveHtml" idref="out" spinner="spinner"
-               startOffset="${offset}" onFinishEvent="jenkins:consoleFinished"/>
-        </j:when>
-        <!-- output is completed now. -->
-        <j:otherwise>
-          <pre class="console-output" id="out">
-            <st:getOutput var="output" />
-            <j:whitespace>${it.writeLogTo(offset,output)}</j:whitespace>
-          </pre>
-        </j:otherwise>
-      </j:choose>
+      <st:include page="consolemini.jelly" />
     </l:main-panel>
   </l:layout>
 </st:compress>
diff --git a/core/src/main/resources/lib/hudson/buildCaption.jelly b/core/src/main/resources/lib/hudson/buildCaption.jelly
index 338344bdfa6a..398050268107 100644
--- a/core/src/main/resources/lib/hudson/buildCaption.jelly
+++ b/core/src/main/resources/lib/hudson/buildCaption.jelly
@@ -27,6 +27,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">
+  <st:documentation>
+    <st:attribute name="controls">
+      Optional field to set controls in the app bar
+    </st:attribute>
+  </st:documentation>
+
   <div class="jenkins-app-bar">
     <div class="jenkins-app-bar__content jenkins-build-caption" data-status-url="${rootURL}/${it.url}statusIcon">
       <l:icon alt="${it.iconColor.description}" src="symbol-status-${it.iconColor.iconName}"
@@ -47,6 +53,7 @@ THE SOFTWARE.
         </div>
       </j:if>
       <st:adjunct includes="lib.hudson.build-caption"/>
+      <j:out value="${attrs.controls}" />
     </div>
   </div>
 </j:jelly>
diff --git a/core/src/main/resources/lib/hudson/project/console-link.jelly b/core/src/main/resources/lib/hudson/project/console-link.jelly
index 3a0f9cd5f727..eca6f4d90c04 100644
--- a/core/src/main/resources/lib/hudson/project/console-link.jelly
+++ b/core/src/main/resources/lib/hudson/project/console-link.jelly
@@ -25,16 +25,5 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <!-- Displays a console link for a build. -->
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
-    <j:choose>
-        <j:when test="${it.logFile.length() > 200000}">
-            <!-- Show raw link directly so user need not click through live console page, though this is not so bad now as they would just see: Skipping nnn KB.. Full Log. -->
-            <l:task href="${h.getConsoleUrl(it) ?: (buildUrl.baseUrl + '/console')}" icon="icon-terminal icon-md" title="${%Console Output}"/>
-            <l:task href="${buildUrl.baseUrl}/consoleText" icon="icon-document icon-md" title="${%View as plain text}"/>
-        </j:when>
-        <j:otherwise>
-            <l:task icon="images/svgs/terminal.svg" href="${h.getConsoleUrl(it) ?: (buildUrl.baseUrl + '/console')}" title="${%Console Output}">
-                <l:task href="${buildUrl.baseUrl}/consoleText" icon="icon-document icon-md" title="${%View as plain text}"/>
-            </l:task>
-        </j:otherwise>
-    </j:choose>
+    <l:task href="${h.getConsoleUrl(it) ?: (buildUrl.baseUrl + '/console')}" icon="icon-terminal icon-md"  title="${%Console Output}" />
 </j:jelly>

From e972dd422c123dacc2ced6033cdda152ef4639f0 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sun, 14 Apr 2024 10:05:23 +0100
Subject: [PATCH 2/8] Update copyButton.jelly

---
 core/src/main/resources/lib/layout/copyButton.jelly | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/layout/copyButton.jelly b/core/src/main/resources/lib/layout/copyButton.jelly
index c161e18e3789..8a65c641657a 100644
--- a/core/src/main/resources/lib/layout/copyButton.jelly
+++ b/core/src/main/resources/lib/layout/copyButton.jelly
@@ -43,6 +43,9 @@ THE SOFTWARE.
     <st:attribute name="clazz">
       Additional CSS class names
     </st:attribute>
+    <st:attribute name="label">
+      Optional label for the button, hides the tooltip if set
+    </st:attribute>
     <st:attribute name="ref" use="required">
       The id of the target element to be copied
       @since 2.449
@@ -54,9 +57,10 @@ THE SOFTWARE.
           text="${attrs.text}"
           ref="${attrs.ref}"
           message="${attrs.message ?: '%Copied'}"
-          tooltip="${attrs.tooltip ?: '%Copy'}"
+          tooltip="${attrs.label != null ? null : attrs.tooltip ?: '%Copy'}"
           type="button">
     <span class="jenkins-copy-button__icon" />
+    ${attrs.label}
   </button>
 
   <st:adjunct includes="lib.layout.copyButton.copyButton"/>

From 4e5dfc1716f5ae84918f55ea466f5a82ad0f7a4e Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sun, 14 Apr 2024 10:06:26 +0100
Subject: [PATCH 3/8] Update console.jelly

---
 .../resources/hudson/model/Run/console.jelly  | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/core/src/main/resources/hudson/model/Run/console.jelly b/core/src/main/resources/hudson/model/Run/console.jelly
index d2d13d2e9870..449aa3b4e725 100644
--- a/core/src/main/resources/hudson/model/Run/console.jelly
+++ b/core/src/main/resources/hudson/model/Run/console.jelly
@@ -54,7 +54,38 @@ THE SOFTWARE.
         ${%Console Output}
       </t:buildCaption>
 
-      <st:include page="consolemini.jelly" />
+      <j:set var="threshold" value="${h.getSystemProperty('hudson.consoleTailKB')?:'150'}" />
+      <!-- Show at most last 150KB (can override with system property) unless consoleFull is set -->
+      <j:set var="offset" value="${empty(consoleFull) ? it.logText.length()-threshold*1024 : 0}" />
+      <j:choose>
+        <j:when test="${offset > 0}">
+          ${%skipSome(offset/1024,"consoleFull")}
+        </j:when>
+        <j:otherwise>
+          <j:set var="offset" value="${0}" />
+        </j:otherwise>
+      </j:choose>
+
+      <j:out value="${h.generateConsoleAnnotationScriptAndStylesheet()}"/>
+
+      <j:choose>
+        <!-- Do progressive console output -->
+        <j:when test="${it.isLogUpdated()}">
+          <pre id="out" class="console-output" />
+          <div id="spinner">
+            <l:progressAnimation/>
+          </div>
+          <t:progressiveText href="logText/progressiveHtml" idref="out" spinner="spinner"
+                             startOffset="${offset}" onFinishEvent="jenkins:consoleFinished"/>
+        </j:when>
+        <!-- output is completed now. -->
+        <j:otherwise>
+          <pre class="console-output" id="out">
+            <st:getOutput var="output" />
+            <j:whitespace>${it.writeLogTo(offset,output)}</j:whitespace>
+          </pre>
+        </j:otherwise>
+      </j:choose>
     </l:main-panel>
   </l:layout>
 </st:compress>

From ac013f2f4c30e7bfb6f5410bd9d3b7e29a1cf3d6 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sun, 14 Apr 2024 10:07:43 +0100
Subject: [PATCH 4/8] Update console.jelly

---
 core/src/main/resources/hudson/model/Run/console.jelly | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/resources/hudson/model/Run/console.jelly b/core/src/main/resources/hudson/model/Run/console.jelly
index 449aa3b4e725..b019df14fa4e 100644
--- a/core/src/main/resources/hudson/model/Run/console.jelly
+++ b/core/src/main/resources/hudson/model/Run/console.jelly
@@ -72,11 +72,11 @@ THE SOFTWARE.
         <!-- Do progressive console output -->
         <j:when test="${it.isLogUpdated()}">
           <pre id="out" class="console-output" />
-          <div id="spinner">
-            <l:progressAnimation/>
-          </div>
+            <div id="spinner">
+              <l:progressAnimation/>
+            </div>
           <t:progressiveText href="logText/progressiveHtml" idref="out" spinner="spinner"
-                             startOffset="${offset}" onFinishEvent="jenkins:consoleFinished"/>
+                  startOffset="${offset}" onFinishEvent="jenkins:consoleFinished"/>
         </j:when>
         <!-- output is completed now. -->
         <j:otherwise>

From 32b24f80d7cc72384ad4a1defcf58b21861c15a9 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sun, 14 Apr 2024 10:07:57 +0100
Subject: [PATCH 5/8] Update console.jelly

---
 core/src/main/resources/hudson/model/Run/console.jelly | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/hudson/model/Run/console.jelly b/core/src/main/resources/hudson/model/Run/console.jelly
index b019df14fa4e..34c92c9492c2 100644
--- a/core/src/main/resources/hudson/model/Run/console.jelly
+++ b/core/src/main/resources/hudson/model/Run/console.jelly
@@ -76,7 +76,7 @@ THE SOFTWARE.
               <l:progressAnimation/>
             </div>
           <t:progressiveText href="logText/progressiveHtml" idref="out" spinner="spinner"
-                  startOffset="${offset}" onFinishEvent="jenkins:consoleFinished"/>
+               startOffset="${offset}" onFinishEvent="jenkins:consoleFinished"/>
         </j:when>
         <!-- output is completed now. -->
         <j:otherwise>

From 63367640060e91cf9f3004c8ec7021c1db80a0dd Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sun, 14 Apr 2024 10:09:12 +0100
Subject: [PATCH 6/8] Remove props

---
 core/src/main/resources/hudson/model/Run/console.jelly      | 2 +-
 core/src/main/resources/hudson/model/Run/console.properties | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/src/main/resources/hudson/model/Run/console.jelly b/core/src/main/resources/hudson/model/Run/console.jelly
index 34c92c9492c2..ab8bda7b720e 100644
--- a/core/src/main/resources/hudson/model/Run/console.jelly
+++ b/core/src/main/resources/hudson/model/Run/console.jelly
@@ -36,7 +36,7 @@ THE SOFTWARE.
 
     <l:main-panel>
       <j:set var="controls">
-        <l:copyButton message="${%successfullyCopied}" tooltip="${%clickToCopy}" ref="out" label="${%Copy}" />
+        <l:copyButton ref="out" label="${%Copy}" />
         <l:overflowButton>
           <dd:custom>
             <a class="jenkins-dropdown__item" href="consoleText" download="${it.displayName}.txt">
diff --git a/core/src/main/resources/hudson/model/Run/console.properties b/core/src/main/resources/hudson/model/Run/console.properties
index d4467f9be774..c9af02ab9aa3 100644
--- a/core/src/main/resources/hudson/model/Run/console.properties
+++ b/core/src/main/resources/hudson/model/Run/console.properties
@@ -21,5 +21,3 @@
 # THE SOFTWARE.
 
 skipSome=Skipping {0,number,integer} KB.. <a href="{1}">Full Log</a>
-clickToCopy=Click to copy
-successfullyCopied=Copied to clipboard
\ No newline at end of file

From d448e0309cc2069b97afa1a25023c71f394391da Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Wed, 24 Apr 2024 21:28:03 +0100
Subject: [PATCH 7/8] Update console.jelly

---
 .../resources/hudson/model/Run/console.jelly   | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/core/src/main/resources/hudson/model/Run/console.jelly b/core/src/main/resources/hudson/model/Run/console.jelly
index ab8bda7b720e..a05e28fc5c33 100644
--- a/core/src/main/resources/hudson/model/Run/console.jelly
+++ b/core/src/main/resources/hudson/model/Run/console.jelly
@@ -36,18 +36,14 @@ THE SOFTWARE.
 
     <l:main-panel>
       <j:set var="controls">
+        <a class="jenkins-button" href="consoleText" download="${it.displayName}.txt">
+          <l:icon src="symbol-download" />
+          ${%Download}
+        </a>
         <l:copyButton ref="out" label="${%Copy}" />
-        <l:overflowButton>
-          <dd:custom>
-            <a class="jenkins-dropdown__item" href="consoleText" download="${it.displayName}.txt">
-              <div class="jenkins-dropdown__item__icon">
-                <l:icon src="symbol-download" />
-              </div>
-              ${%Download}
-            </a>
-          </dd:custom>
-          <dd:item href="consoleText" text="${%View as plain text}" icon="symbol-document-text" />
-        </l:overflowButton>
+        <a class="jenkins-button" href="consoleText">
+          ${%View as plain text}
+        </a>
       </j:set>
 
       <t:buildCaption controls="${controls}">

From b810a3f8f5b0d42a971e3d7458b1082d31eb1e8a Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Mon, 20 May 2024 18:23:57 +0100
Subject: [PATCH 8/8] Remove import

---
 core/src/main/resources/hudson/model/Run/console.jelly | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/hudson/model/Run/console.jelly b/core/src/main/resources/hudson/model/Run/console.jelly
index a05e28fc5c33..3609d2b7ee68 100644
--- a/core/src/main/resources/hudson/model/Run/console.jelly
+++ b/core/src/main/resources/hudson/model/Run/console.jelly
@@ -28,7 +28,7 @@ THE SOFTWARE.
   Displays the console output
 -->
 <?jelly escape-by-default='true'?>
-<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:dd="/lib/layout/dropdowns">
+<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
   <l:layout title="${it.fullDisplayName} Console">
     <st:include page="sidepanel.jelly" />