Use monochrome symbol for directory tree (#1477)

jenkinsci · Oct 30, 2024 · 1090a3b · 1090a3b
1 parent 16307d3
commit 1090a3b
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 11 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/directory.svg'
+    final String iconFileName = 'symbol-directory plugin-job-dsl'
     final String displayName = 'Job DSL API Reference'
     final String urlName = '/plugin/job-dsl/api-viewer/index.html'
 }
diff --git a/job-dsl-plugin/src/main/resources/images/symbols/directory.svg b/job-dsl-plugin/src/main/resources/images/symbols/directory.svg
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/directory.svg">
+            <t:summary icon="symbol-directory plugin-job-dsl">
                 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/directory.svg">
+        <t:summary icon="symbol-directory plugin-job-dsl">
             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/directory.svg">
+            <t:summary icon="symbol-directory plugin-job-dsl">
                 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/directory.svg">
+        <t:summary icon="symbol-directory plugin-job-dsl">
             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/directory.svg">
+            <t:summary icon="symbol-directory plugin-job-dsl">
                 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/directory.svg">
+        <t:summary icon="symbol-directory plugin-job-dsl">
             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/directory.svg">
+            <t:summary icon="symbol-directory plugin-job-dsl">
                 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/directory.svg">
+        <t:summary icon="symbol-directory plugin-job-dsl">
             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
@@ -3,7 +3,7 @@
 <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/directory.svg">
+            <t:summary icon="symbol-directory plugin-job-dsl">
                 <j:if test="${it.seedJob != null}">
                     <p>
                         Seed job:

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