From e150218e4dd8101bf88881a51c63226ec0ea1a9d Mon Sep 17 00:00:00 2001 From: Valentin Delaye Date: Wed, 16 Oct 2024 14:06:05 +0200 Subject: [PATCH 1/2] Use monochrome symbol for directory tree --- .../javaposse/jobdsl/plugin/actions/ApiViewerAction.groovy | 2 +- job-dsl-plugin/src/main/resources/images/symbols/directory.svg | 3 +++ .../plugin/actions/GeneratedConfigFilesAction/jobMain.jelly | 2 +- .../actions/GeneratedConfigFilesBuildAction/summary.jelly | 2 +- .../jobdsl/plugin/actions/GeneratedJobsAction/jobMain.jelly | 2 +- .../plugin/actions/GeneratedJobsBuildAction/summary.jelly | 2 +- .../plugin/actions/GeneratedUserContentsAction/jobMain.jelly | 2 +- .../actions/GeneratedUserContentsBuildAction/summary.jelly | 2 +- .../jobdsl/plugin/actions/GeneratedViewsAction/jobMain.jelly | 2 +- .../plugin/actions/GeneratedViewsBuildAction/summary.jelly | 2 +- .../jobdsl/plugin/actions/SeedJobAction/jobMain.jelly | 2 +- job-dsl-plugin/src/main/webapp/images/directory.svg | 1 - 12 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 job-dsl-plugin/src/main/resources/images/symbols/directory.svg delete mode 100644 job-dsl-plugin/src/main/webapp/images/directory.svg 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 index 3f51e1df0..4a62e3c55 100644 --- 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 new file mode 100644 index 000000000..933a982ec --- /dev/null +++ b/job-dsl-plugin/src/main/resources/images/symbols/directory.svg @@ -0,0 +1,3 @@ + + + diff --git a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedConfigFilesAction/jobMain.jelly b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedConfigFilesAction/jobMain.jelly index f03db7ecd..0ae4e3bb1 100644 --- a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedConfigFilesAction/jobMain.jelly +++ b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedConfigFilesAction/jobMain.jelly @@ -3,7 +3,7 @@ - + Generated Config Files:
    diff --git a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedConfigFilesBuildAction/summary.jelly b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedConfigFilesBuildAction/summary.jelly index 3eff35167..42b434e69 100644 --- a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedConfigFilesBuildAction/summary.jelly +++ b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedConfigFilesBuildAction/summary.jelly @@ -2,7 +2,7 @@ - + Generated Config Files:
      diff --git a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedJobsAction/jobMain.jelly b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedJobsAction/jobMain.jelly index f47e4b91a..836985174 100644 --- a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedJobsAction/jobMain.jelly +++ b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedJobsAction/jobMain.jelly @@ -3,7 +3,7 @@
- + Generated Items:
    diff --git a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedJobsBuildAction/summary.jelly b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedJobsBuildAction/summary.jelly index aa74fe06f..d592240d6 100644 --- a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedJobsBuildAction/summary.jelly +++ b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedJobsBuildAction/summary.jelly @@ -2,7 +2,7 @@ - + Generated Items:
      diff --git a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedUserContentsAction/jobMain.jelly b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedUserContentsAction/jobMain.jelly index d47185f1f..982c388c5 100644 --- a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedUserContentsAction/jobMain.jelly +++ b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedUserContentsAction/jobMain.jelly @@ -3,7 +3,7 @@
- + Generated User Content:
    diff --git a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedUserContentsBuildAction/summary.jelly b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedUserContentsBuildAction/summary.jelly index ac4bf04dc..774bc263f 100644 --- a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedUserContentsBuildAction/summary.jelly +++ b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedUserContentsBuildAction/summary.jelly @@ -2,7 +2,7 @@ - + Generated User Content:
      diff --git a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedViewsAction/jobMain.jelly b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedViewsAction/jobMain.jelly index fe21b03f5..ccb1dd24e 100644 --- a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedViewsAction/jobMain.jelly +++ b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedViewsAction/jobMain.jelly @@ -3,7 +3,7 @@
- + Generated Views:
    diff --git a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedViewsBuildAction/summary.jelly b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedViewsBuildAction/summary.jelly index ed68998d5..127228c39 100644 --- a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedViewsBuildAction/summary.jelly +++ b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/GeneratedViewsBuildAction/summary.jelly @@ -2,7 +2,7 @@ - + Generated Views:
      diff --git a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/SeedJobAction/jobMain.jelly b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/SeedJobAction/jobMain.jelly index 9c589a0b1..3edb9d3ef 100644 --- a/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/SeedJobAction/jobMain.jelly +++ b/job-dsl-plugin/src/main/resources/javaposse/jobdsl/plugin/actions/SeedJobAction/jobMain.jelly @@ -3,7 +3,7 @@
- +

Seed job: diff --git a/job-dsl-plugin/src/main/webapp/images/directory.svg b/job-dsl-plugin/src/main/webapp/images/directory.svg deleted file mode 100644 index 8461a2b3b..000000000 --- a/job-dsl-plugin/src/main/webapp/images/directory.svg +++ /dev/null @@ -1 +0,0 @@ - From 391a2265bd0dd6415128fcb4c6a00512a18c50c0 Mon Sep 17 00:00:00 2001 From: Valentin Delaye Date: Sat, 19 Oct 2024 07:19:29 +0200 Subject: [PATCH 2/2] Add new subdirectory symbol --- .../resources/images/symbols/directory.svg | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/job-dsl-plugin/src/main/resources/images/symbols/directory.svg b/job-dsl-plugin/src/main/resources/images/symbols/directory.svg index 933a982ec..14dea9ebf 100644 --- a/job-dsl-plugin/src/main/resources/images/symbols/directory.svg +++ b/job-dsl-plugin/src/main/resources/images/symbols/directory.svg @@ -1,3 +1,19 @@ - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file