chore: Prepare for sunset icon removal from core

jenkinsci · Dec 23, 2021 · 112b964 · 112b964
1 parent 748e590
commit 112b964
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 12 deletions.
diff --git a/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/actions/ApiViewerAction.groovy b/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/actions/ApiViewerAction.groovy
@@ -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'
 }
diff --git a/...c/main/resources/javaposse/jobdsl/plugin/actions/GeneratedConfigFilesAction/jobMain.jelly b/...c/main/resources/javaposse/jobdsl/plugin/actions/GeneratedConfigFilesAction/jobMain.jelly
@@ -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">

diff --git a/...n/resources/javaposse/jobdsl/plugin/actions/GeneratedConfigFilesBuildAction/summary.jelly b/...n/resources/javaposse/jobdsl/plugin/actions/GeneratedConfigFilesBuildAction/summary.jelly
@@ -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">

diff --git a/...ugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedJobsAction/jobMain.jelly b/...ugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedJobsAction/jobMain.jelly
@@ -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">

diff --git a/...src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedJobsBuildAction/summary.jelly b/...src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedJobsBuildAction/summary.jelly
@@ -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">

diff --git a/.../main/resources/javaposse/jobdsl/plugin/actions/GeneratedUserContentsAction/jobMain.jelly b/.../main/resources/javaposse/jobdsl/plugin/actions/GeneratedUserContentsAction/jobMain.jelly
@@ -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">

diff --git a/.../resources/javaposse/jobdsl/plugin/actions/GeneratedUserContentsBuildAction/summary.jelly b/.../resources/javaposse/jobdsl/plugin/actions/GeneratedUserContentsBuildAction/summary.jelly
@@ -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">

diff --git a/...gin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedViewsAction/jobMain.jelly b/...gin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedViewsAction/jobMain.jelly
@@ -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">

diff --git a/...rc/main/resources/javaposse/jobdsl/plugin/actions/GeneratedViewsBuildAction/summary.jelly b/...rc/main/resources/javaposse/jobdsl/plugin/actions/GeneratedViewsBuildAction/summary.jelly
@@ -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">

diff --git a/...dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/SeedJobAction/jobMain.jelly b/...dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/SeedJobAction/jobMain.jelly
@@ -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:
@@ -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>

diff --git a/job-dsl-plugin/src/main/webapp/images/48x48/directory.png b/job-dsl-plugin/src/main/webapp/images/48x48/directory.png
diff --git a/job-dsl-plugin/src/main/webapp/images/directory.svg b/job-dsl-plugin/src/main/webapp/images/directory.svg