Skip to content

Commit

Permalink
Merge pull request #1245 from NotMyFault/chore/master/prep-for-icon-r…
Browse files Browse the repository at this point in the history
…emoval-from-core

Prepare for sunset icon removal from core
  • Loading branch information
jamietanna authored Jan 1, 2022
2 parents 748e590 + 112b964 commit 34e5070
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package javaposse.jobdsl.plugin.actions
import hudson.model.Action

class ApiViewerAction implements Action {
final String iconFileName = '/plugin/job-dsl/images/48x48/directory.png'
final String iconFileName = '/plugin/job-dsl/images/directory.svg'
final String displayName = 'Job DSL API Reference'
final String urlName = '/plugin/job-dsl/api-viewer/index.html'
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<j:set var="allConfigFiles" value="${it.findAllGeneratedObjects()}"/>
<j:if test="${!allConfigFiles.isEmpty()}">
<table style="margin-top: 1em; margin-left:1em;">
<t:summary icon="/plugin/job-dsl/images/48x48/directory.png">
<t:summary icon="/plugin/job-dsl/images/directory.svg">
Generated Config Files:
<ul class="folderList">
<j:forEach items="${allConfigFiles}" var="configFile">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/lib/hudson">
<j:set var="allConfigFiles" value="${it.modifiedObjects}"/>
<j:if test="${!allConfigFiles.isEmpty()}">
<t:summary icon="/plugin/job-dsl/images/48x48/directory.png">
<t:summary icon="/plugin/job-dsl/images/directory.svg">
Generated Config Files:
<ul class="folderList">
<j:forEach items="${allConfigFiles}" var="configFile">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<j:set var="allFolders" value="${it.items}"/>
<j:if test="${!allFolders.isEmpty()}">
<table style="margin-top: 1em; margin-left:1em;">
<t:summary icon="/plugin/job-dsl/images/48x48/directory.png">
<t:summary icon="/plugin/job-dsl/images/directory.svg">
Generated Items:
<ul class="folderList">
<j:forEach items="${allFolders}" var="folder">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/lib/hudson">
<j:set var="allFolders" value="${it.items}"/>
<j:if test="${!allFolders.isEmpty()}">
<t:summary icon="/plugin/job-dsl/images/48x48/directory.png">
<t:summary icon="/plugin/job-dsl/images/directory.svg">
Generated Items:
<ul class="folderList">
<j:forEach items="${allFolders}" var="folder">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<j:set var="allUserContents" value="${it.findAllGeneratedObjects()}"/>
<j:if test="${!allUserContents.isEmpty()}">
<table style="margin-top: 1em; margin-left:1em;">
<t:summary icon="/plugin/job-dsl/images/48x48/directory.png">
<t:summary icon="/plugin/job-dsl/images/directory.svg">
Generated User Content:
<ul class="folderList">
<j:forEach items="${allUserContents}" var="userContent">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/lib/hudson">
<j:set var="allUserContents" value="${it.modifiedObjects}"/>
<j:if test="${!allUserContents.isEmpty()}">
<t:summary icon="/plugin/job-dsl/images/48x48/directory.png">
<t:summary icon="/plugin/job-dsl/images/directory.svg">
Generated User Content:
<ul class="folderList">
<j:forEach items="${allUserContents}" var="userContent">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<j:set var="allViews" value="${it.views}"/>
<j:if test="${!allViews.isEmpty()}">
<table style="margin-top: 1em; margin-left:1em;">
<t:summary icon="/plugin/job-dsl/images/48x48/directory.png">
<t:summary icon="/plugin/job-dsl/images/directory.svg">
Generated Views:
<ul class="viewList">
<j:forEach items="${allViews}" var="view">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/lib/hudson">
<j:set var="allViews" value="${it.views}"/>
<j:if test="${!allViews.isEmpty()}">
<t:summary icon="/plugin/job-dsl/images/48x48/directory.png">
<t:summary icon="/plugin/job-dsl/images/directory.svg">
Generated Views:
<ul class="viewList">
<j:forEach items="${allViews}" var="view">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?jelly escape-by-default='true'?>
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:t="/lib/hudson">
<j:jelly xmlns:j="jelly:core" xmlns:t="/lib/hudson" xmlns:l="/lib/layout">
<j:if test="${it.seedJob != null || it.templateJob != null}">
<table style="margin-top: 1em; margin-left:1em;">
<t:summary icon="/plugin/job-dsl/images/48x48/directory.png">
<t:summary icon="/plugin/job-dsl/images/directory.svg">
<j:if test="${it.seedJob != null}">
<p>
Seed job:
Expand All @@ -18,7 +18,7 @@
</j:if>
<j:if test="${it.configChanged}">
<p>
<img style="vertical-align:top" src="${imagesURL}/16x16/warning.gif"/>
<l:icon style="vertical-align:top" class="icon-warning icon-sm"/>
This item has been changed manually since it was generated by the seed job.
</p>
</j:if>
Expand Down
Binary file not shown.
1 change: 1 addition & 0 deletions job-dsl-plugin/src/main/webapp/images/directory.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 34e5070

Please sign in to comment.