Merge pull request #13 from lacostej/fix/icons_and_themes

Fix icons to match 'new' Jenkins theme. Long overdue:)
jenkinsci · Nov 2, 2023 · a92e954 · a92e954
2 parents fc86b20 + f0e3873
commit a92e954
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/src/main/resources/hudson/plugins/batch_task/BatchRun/index.jelly b/src/main/resources/hudson/plugins/batch_task/BatchRun/index.jelly
@@ -1,37 +1,39 @@
 <!--
   Displays the execution log
+
+  can be inspired by https://github.com/jenkinsci/jenkins/blob/master/core/src/main/resources/hudson/model/Run/console.jelly
 -->
 <?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">
+<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" xmlns:p="/lib/hudson/project">
   <l:layout title="${%title(it.displayName)}" norefresh="true">
     <l:header />
     <l:side-panel>
       <l:tasks>
-        <l:task icon="images/24x24/up.gif" href="../" title="${%Back to List}" />
-        <l:task icon="images/24x24/terminal.gif" href="${request.originalRequestURI}" title="${%Console}" />
+        <l:task icon="icon-up icon-md" href="../" title="${%Back to List}" />
+        <l:task icon="icon-terminal icon-md" href="${request.originalRequestURI}" title="${%Console}" />
         <j:set var="isRunPath" value="${request.findAncestor(it.owner)!=null}" />
+
         <j:set var="p" value="${it.previous}" />
         <j:if test="${p!=null}">
-          <l:task icon="images/24x24/previous.gif" href="${isRunPath?rootURL+'/'+p.url:'../'+p.number}/" title="${%Previous}" />
+          <l:task contextMenu="false" href="${isRunPath?rootURL+'/'+p.url:'../'+p.number}/" icon="icon-previous icon-md" title="${%Previous}"/>
         </j:if>
         <j:set var="n" value="${it.next}" />
         <j:if test="${n!=null}">
-          <l:task icon="images/24x24/next.gif" href="${isRunPath?rootURL+'/'+n.url:'../'+n.number}/" title="${%Next}" />
+          <l:task contextMenu="false" href="${isRunPath?rootURL+'/'+n.url:'../'+n.number}/" icon="icon-next icon-md" title="${%Next}"/>
         </j:if>
       </l:tasks>
     </l:side-panel>
     <l:main-panel>
       <h1>
-        <img src="${rootURL}/images/48x48/${it.buildStatusUrl}" width="48" height="48" alt="${it.iconColor.description}" />
-        ${%title(it.taskName)}
+          <t:buildCaption it="${it}">${%title(it.taskName)}</t:buildCaption>
       </h1>
 
       <j:choose>
         <!-- Do progressive console output -->
-        <j:when test="${it.running}">
-          <pre id="out"></pre>
+        <j:when test="${it.isLogUpdated()}">
+          <pre id="out" class="console-output"></pre>
           <div id="spinner">
-            <img src="${rootURL}/images/spinner.gif" />
+            <l:progressAnimation/>
           </div>
           <t:progressiveText href="progressiveLog" idref="out" spinner="spinner" />
         </j:when>

diff --git a/src/main/resources/hudson/plugins/batch_task/BatchRunAction/index.jelly b/src/main/resources/hudson/plugins/batch_task/BatchRunAction/index.jelly
@@ -8,7 +8,7 @@
         <j:forEach var="r" items="${it.records}">
           <tr>
             <td>
-              <img src="${rootURL}/images/32x32/${r.buildStatusUrl}" alt="${r.iconColor.description}" />
+              <t:ballColorTd it="${r.iconColor}" />
             </td><td>
               <a href="${r.id}/">${r.displayName} (${r.timestampString} ago)</a>
             </td>

diff --git a/src/main/resources/hudson/plugins/batch_task/BatchTask/sidepanel.jelly b/src/main/resources/hudson/plugins/batch_task/BatchTask/sidepanel.jelly
@@ -12,14 +12,14 @@
   <l:side-panel>
     <l:tasks>
       <j:set var="url" value="${h.getNearestAncestorUrl(request,it)}"/>
-      <l:task icon="images/24x24/up.gif" href="../../" title="${%Back to Task List}" />
+      <l:task icon="icon-previous icon-md" href="../../" title="${%Back to Task List}" />
       <j:if test="${it.hasBuildPermission()}">
         <j:if test="${!it.disabled}">
-          <l:task icon="images/24x24/clock.gif" href="${url}/execute" title="${%Build Now}" />
+          <l:task icon="icon-clock icon-md" href="${url}/execute" title="${%Build Now}" />
         </j:if>
       </j:if>
       <j:if test="${it.hasDeletePermission()}">
-        <l:task icon="images/24x24/edit-delete.gif" href="${url}/delete" title="${%Delete Task}" />
+        <l:task icon="icon-edit-delete icon-md" href="${url}/delete" title="${%Delete Task}" />
       </j:if>
       <!-- Configure doesn't seem to lead anywhere -->
       <!--j:if test="${it.hasConfigurePermission()}">

diff --git a/src/main/resources/hudson/plugins/batch_task/BatchTaskAction/index.jelly b/src/main/resources/hudson/plugins/batch_task/BatchTaskAction/index.jelly
@@ -20,7 +20,7 @@
     <l:main-panel>
       <h1>${%Batch Tasks}</h1>
       <t:setIconSize/>
-      <table class="sortable pane bigtable" id="projectstatus">
+      <table class="jenkins-table sortable" id="projectstatus">
         <tr>
           <th style="padding-left:1.5em">${%S}</th>
           <th initialSortDir="down">${%Task}</th>
@@ -52,11 +52,7 @@
               </j:choose>
             </td>
             <td>
-              <j:if test="${t.hasBuildPermission()}">
-                <form action="${t.name}/execute" method="post">
-                  <input type="image" src="${rootURL}/images/${iconSize}/clock.gif" tooltip="${%Execute}" />
-                </form>
-              </j:if>
+              <l:task href="${t.name}/execute" icon="icon-clock icon-md" permission="${it.BUILD}" post="${!it.parameterized}" title=""/> <!-- tooltip ${%Execute} -->
             </td>
             <td></td>
           </tr>