Skip to content

Commit

Permalink
Fix broken icons on modern Jenkins versions (#19)
Browse files Browse the repository at this point in the history
fix: Prepare for icon removal from core
  • Loading branch information
NotMyFault authored May 23, 2022
1 parent 0d34d96 commit 6f315cc
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 21 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ work
.classpath
.settings
.project
.idea
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

<artifactId>global-build-stats</artifactId>
<version>1.6-SNAPSHOT</version>
<name>Hudson global-build-stats plugin</name>
<name>Jenkins global-build-stats plugin</name>
<packaging>hpi</packaging>
<url>http://wiki.jenkins-ci.org/display/JENKINS/Global+Build+Stats+Plugin</url>
<description>Global build stats plugin will allow to gather and display global build result statistics. It is a useful tool allowing to display global hudson build trend over time.</description>
<url>https://plugins.jenkins.io/global-build-stats/</url>
<description>Global build stats plugin will allow to gather and display global build result statistics. It is a useful tool allowing to display global Jenkins build trend over time.</description>

<build>
<plugins>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?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">
<l:layout title="${%Global Build Stats}" permission="${it.requiredPermission}">

Expand Down Expand Up @@ -50,8 +51,8 @@

<l:side-panel>
<l:tasks>
<l:task icon="images/24x24/up.gif" href="${rootURL}/" title="${%Back to Dashboard}" />
<l:task icon="images/24x24/up.gif" href="${rootURL}/plugin/global-build-stats/" title="${%Back to Global Build Stats}" />
<l:task icon="icon-up icon-md" href="${rootURL}/" title="${%Back to Dashboard}" />
<l:task icon="icon-up icon-md" href="${rootURL}/plugin/global-build-stats/" title="${%Back to Global Build Stats}" />
</l:tasks>
</l:side-panel>

Expand Down Expand Up @@ -225,7 +226,7 @@
<td class="pane">
<j:choose>
<j:when test="${jobResult.buildAccessible}">
<a href="${rootURL}/job/${jobResult.jobName}/${jobResult.buildNumber}/console"><img src="${rootURL}/plugin/global-build-stats/icons/terminal.gif" /></a>
<a href="${rootURL}/job/${jobResult.jobName}/${jobResult.buildNumber}/console"><l:icon class="icon-terminal icon-lg"/><br/></a>
<a href="${rootURL}/job/${jobResult.jobName}/${jobResult.buildNumber}/">#${jobResult.buildNumber}</a>
</j:when>
<j:otherwise>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?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">
<l:layout title="${%Global Build Stats}" permission="${it.requiredPermission}">

Expand All @@ -8,10 +9,10 @@

<l:side-panel>
<l:tasks>
<l:task icon="images/24x24/up.gif" href="${rootURL}/" title="${%Back to Dashboard}" />
<l:task icon="images/24x24/save.gif" href="#" onclick="new BuildStatConfigForm(null).displayBuildStatConfigForm();" title="${%Create new chart}" />
<l:task icon="images/24x24/gear2.gif" href="#RetentionStrategy" title="${%Manage retention strategies}" />
<l:task icon="images/24x24/gear2.gif" href="#Initialize" title="${%Data Initialization}" />
<l:task icon="icon-up icon-md" href="${rootURL}/" title="${%Back to Dashboard}" />
<l:task icon="icon-save icon-md" href="#" onclick="new BuildStatConfigForm(null).displayBuildStatConfigForm();" title="${%Create new chart}" />
<l:task icon="icon-gear2 icon-md" href="#RetentionStrategy" title="${%Manage retention strategies}" />
<l:task icon="icon-gear2 icon-md" href="#Initialize" title="${%Data Initialization}" />
</l:tasks>
</l:side-panel>

Expand Down Expand Up @@ -91,16 +92,16 @@
<a name="buildStat_#{id}" />
#{buildStatImage}
<a href="#buildStat_#{id}" id="edit_#{id}" onclick="new BuildStatConfigForm('#{id}').displayBuildStatConfigForm();">
<img src="${rootURL}/plugin/global-build-stats/icons/save-new.png" height="36" /><br/>
<l:icon class="icon-save-new icon-lg"/><br/>
</a>
<a href="#" onclick="BUILD_STAT_CONFIGS.moveBuildStat('#{id}', 'up');" id="moveUp_#{id}">
<img src="${rootURL}/plugin/global-build-stats/icons/up.png" height="36" /><br/>
<l:icon class="icon-up icon-lg"/><br/>
</a>
<a href="#" onclick="BUILD_STAT_CONFIGS.moveBuildStat('#{id}', 'down');" id="moveDown_#{id}">
<img src="${rootURL}/plugin/global-build-stats/icons/down.png" height="36" /><br/>
<img src="${rootURL}/plugin/global-build-stats/icons/down.png" height="32" /><br/>
</a>
<a href="#buildStat_#{id}" onclick="deleteBuildStat('#{id}');">
<img src="${rootURL}/plugin/global-build-stats/icons/stop.png" height="36" /><br/>
<l:icon class="icon-stop icon-lg"/><br/>
</a>
</div>
<div id="regenerateIdBlockTemplate">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<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:p="/lib/hudson/project">
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core">
${%Automatically discard results older than}
<input type="text" id="${strategy.id}_days" name="discardResultsOlderThanDays" value="${strategy.days}" size="3" />
${%days}<br/>
Expand All @@ -8,4 +9,4 @@
}
$$('${strategy.id}_checkbox').onchange(); // For initialization
</script>
</j:jelly>
</j:jelly>
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<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:p="/lib/hudson/project">
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core">
${%Do not keep build results when they are discarded}<br/>
</j:jelly>
</j:jelly>
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<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:p="/lib/hudson/project">
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core">
${%Keep existing job results only}<br/>
</j:jelly>
</j:jelly>
3 changes: 2 additions & 1 deletion src/main/resources/index.jelly
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?jelly escape-by-default='true'?>
<!--
This view is used to render the plugin list page.
Since we don't really have anything dynamic here, let's just use static HTML.
-->
<div>
This plugin will allow you to manage global hudson build stats concerning build failures
</div>
</div>
Binary file removed src/main/webapp/icons/save-new.png
Binary file not shown.
Binary file removed src/main/webapp/icons/save.png
Binary file not shown.
Binary file removed src/main/webapp/icons/stop.png
Binary file not shown.
Binary file removed src/main/webapp/icons/terminal.gif
Binary file not shown.
Binary file removed src/main/webapp/icons/up.png
Binary file not shown.

0 comments on commit 6f315cc

Please sign in to comment.