Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix icons to match current theme #13

Merged
merged 5 commits into from
Nov 2, 2023
Merged

Fix icons to match current theme #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7285b7f
Fix build status icons in Executed Tasks for given build
lacostej Oct 31, 2023
c0a669b
Also change the icon for executing tasks
lacostej Oct 31, 2023
c1df76d
Some more icon fixes
lacostej Oct 31, 2023
6f82308
Some more icon fixes
lacostej Oct 31, 2023
f0e3873
Some more icon fixes
lacostej Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions src/main/resources/hudson/plugins/batch_task/BatchRun/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/hudson/plugins/batch_task/BatchRunAction/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/hudson/plugins/batch_task/BatchTask/sidepanel.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()}">
Expand Down
8 changes: 2 additions & 6 deletions src/main/resources/hudson/plugins/batch_task/BatchTaskAction/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down