Exchange PNGs with SVGs

jenkinsci · Sep 23, 2021 · 2e2d03f · 2e2d03f
1 parent fd56f46
commit 2e2d03f
Show file tree

Hide file tree

Showing 70 changed files with 23 additions and 23 deletions.
diff --git a/src/main/java/com/cloudbees/plugins/credentials/CredentialsStoreAction.java b/src/main/java/com/cloudbees/plugins/credentials/CredentialsStoreAction.java
@@ -229,7 +229,7 @@ public Object unmarshal(HierarchicalStreamReader reader, final UnmarshallingCont
     @Override
     public String getIconFileName() {
         return isVisible()
-                ? "/plugin/credentials/images/24x24/credentials.png"
+                ? "/plugin/credentials/images/credentials.svg"
                 : null;
     }
 

diff --git a/src/main/java/com/cloudbees/plugins/credentials/GlobalCredentialsConfiguration.java b/src/main/java/com/cloudbees/plugins/credentials/GlobalCredentialsConfiguration.java
@@ -78,7 +78,7 @@ public class GlobalCredentialsConfiguration extends ManagementLink
     public String getIconFileName() {
         return ExtensionList.lookup(CredentialsDescriptor.class).isEmpty()
                 ? null
-                : "/plugin/credentials/images/48x48/credentials.png";
+                : "/plugin/credentials/images/credentials.svg";
     }
 
     /**

diff --git a/src/main/java/com/cloudbees/plugins/credentials/ManageCredentialsConfiguration.java b/src/main/java/com/cloudbees/plugins/credentials/ManageCredentialsConfiguration.java
@@ -22,7 +22,7 @@ public String getCategoryName() {
 
     @Override
     public String getIconFileName() {
-        return "/plugin/credentials/images/48x48/credentials.png";
+        return "/plugin/credentials/images/credentials.svg";
     }
 
     @Override

diff --git a/src/main/java/com/cloudbees/plugins/credentials/PluginImpl.java b/src/main/java/com/cloudbees/plugins/credentials/PluginImpl.java
@@ -55,22 +55,22 @@ public void start() throws Exception {
         }) {
             IconSet.icons.addIcon(new Icon(
                     String.format("icon-credentials-%s icon-sm", name),
-                    String.format("credentials/images/16x16/%s.png", name),
+                    String.format("credentials/images/%s.svg", name),
                             Icon.ICON_SMALL_STYLE, IconType.PLUGIN)
             );
             IconSet.icons.addIcon(new Icon(
                     String.format("icon-credentials-%s icon-md", name),
-                    String.format("credentials/images/24x24/%s.png", name),
+                    String.format("credentials/images/%s.svg", name),
                             Icon.ICON_MEDIUM_STYLE, IconType.PLUGIN)
             );
             IconSet.icons.addIcon(new Icon(
                     String.format("icon-credentials-%s icon-lg", name),
-                    String.format("credentials/images/32x32/%s.png", name),
+                    String.format("credentials/images/%s.svg", name),
                             Icon.ICON_LARGE_STYLE, IconType.PLUGIN)
             );
             IconSet.icons.addIcon(new Icon(
                     String.format("icon-credentials-%s icon-xlg", name),
-                    String.format("credentials/images/48x48/%s.png", name),
+                    String.format("credentials/images/%s.svg", name),
                             Icon.ICON_XLARGE_STYLE, IconType.PLUGIN)
             );
         }

diff --git a/src/main/java/com/cloudbees/plugins/credentials/SystemCredentialsProvider.java b/src/main/java/com/cloudbees/plugins/credentials/SystemCredentialsProvider.java
@@ -627,7 +627,7 @@ public CredentialsStore getStore() {
         @Override
         public String getIconFileName() {
             return isVisible()
-                    ? "/plugin/credentials/images/24x24/system-store.png"
+                    ? "/plugin/credentials/images/system-store.svg"
                     : null;
         }
 

diff --git a/src/main/java/com/cloudbees/plugins/credentials/UserCredentialsProvider.java b/src/main/java/com/cloudbees/plugins/credentials/UserCredentialsProvider.java
@@ -570,7 +570,7 @@ public CredentialsStore getStore() {
         @Override
         public String getIconFileName() {
             return isVisible()
-                    ? "/plugin/credentials/images/24x24/user-store.png"
+                    ? "/plugin/credentials/images/user-store.svg"
                     : null;
         }
 

diff --git a/src/main/java/com/cloudbees/plugins/credentials/ViewCredentialsAction.java b/src/main/java/com/cloudbees/plugins/credentials/ViewCredentialsAction.java
@@ -113,7 +113,7 @@ public ModelObject getContext() {
     @Override
     public String getIconFileName() {
         return isVisible()
-                ? "/plugin/credentials/images/24x24/credentials.png"
+                ? "/plugin/credentials/images/credentials.svg"
                 : null;
     }
 

diff --git a/...es/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/move.jelly b/...es/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/move.jelly
@@ -3,7 +3,7 @@
   <l:layout title="${it.fullDisplayName}" norefresh="true" permission="${it.domain.parent.DELETE}">
 		<st:include page="sidepanel.jelly" />
 		<l:main-panel>
-      <h1><img src="${resURL}/plugin/credentials/images/48x48/move.png" alt=""/>${%Move}</h1>
+      <h1><img src="${resURL}/plugin/credentials/images/move.svg" alt=""/>${%Move}</h1>
       <form method="post" action="doMove">
         ${%blurb(it.displayName,it.typeName)}
         <br />

diff --git a/...m/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel.jelly b/...m/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel.jelly
@@ -27,10 +27,10 @@
   <l:side-panel>
     <l:tasks>
     <j:set var="url" value="${h.getNearestAncestorUrl(request,it)}"/>
-      <l:task icon="images/24x24/up.png" href="../.." title="${%backto(it.domain.displayName)}" contextMenu="false"/>
-      <l:task icon="images/24x24/setting.png" href="${url}/update" title="${%Update}" permission="${it.domain.parent.UPDATE}"/>
-      <l:task icon="images/24x24/edit-delete.png" href="${url}/delete" title="${%Delete}" permission="${it.domain.parent.DELETE}"/>
-      <l:task icon="plugin/credentials/images/24x24/move.png" href="${url}/move" title="${%Move}" permission="${it.domain.parent.DELETE}"/>
+      <l:task icon="images/svgs/up.svg" href="../.." title="${%backto(it.domain.displayName)}" contextMenu="false"/>
+      <l:task icon="images/svgs/setting.svg" href="${url}/update" title="${%Update}" permission="${it.domain.parent.UPDATE}"/>
+      <l:task icon="images/svgs/edit-delete.svg" href="${url}/delete" title="${%Delete}" permission="${it.domain.parent.DELETE}"/>
+      <l:task icon="plugin/credentials/images/move.svg" href="${url}/move" title="${%Move}" permission="${it.domain.parent.DELETE}"/>
     </l:tasks>
   </l:side-panel>
 </j:jelly>
diff --git a/...ources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/index.jelly b/...ources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/index.jelly
@@ -95,7 +95,7 @@
                 <td>
                   <j:if test="${h.hasPermission(c, it.parent.UPDATE)}">
                     <a href="credential/${c.urlName}/update">
-                      <img src="${resURL}/images/${iconSize}/setting.png" alt="${%Update}"
+                      <img src="${resURL}/images/svgs/setting.svg" alt="${%Update}"
                            tooltip="${%Update}" class="icon${iconSize}"/>
                     </a>
                   </j:if>

diff --git a/...es/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/sidepanel.jelly b/...es/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/sidepanel.jelly
@@ -27,11 +27,11 @@
   <l:side-panel>
     <l:tasks>
     <j:set var="url" value="${h.getNearestAncestorUrl(request,it)}"/>
-    <l:task icon="images/24x24/up.png" href="../.." title="${%Back to credential domains}" contextMenu="false"/>
-      <l:task icon="plugin/credentials/images/24x24/new-credential.png" href="newCredentials" title="${%Add Credentials}" permission="${it.parent.CREATE}" />
+    <l:task icon="images/svgs/up.svg" href="../.." title="${%Back to credential domains}" contextMenu="false"/>
+      <l:task icon="plugin/credentials/images/new-credential.svg" href="newCredentials" title="${%Add Credentials}" permission="${it.parent.CREATE}" />
       <j:if test="${!it.global and it.parent.domainsModifiable}">
-      <l:task icon="images/24x24/setting.png" href="${url}/configure" title="${%Configure}" permission="${it.parent.MANAGE_DOMAINS}"/>
-      <l:task icon="images/24x24/edit-delete.png" href="${url}/delete" title="${%Delete domain}" permission="${it.parent.MANAGE_DOMAINS}"/>
+      <l:task icon="images/svgs/setting.svg" href="${url}/configure" title="${%Configure}" permission="${it.parent.MANAGE_DOMAINS}"/>
+      <l:task icon="images/svgs/edit-delete.svg" href="${url}/delete" title="${%Delete domain}" permission="${it.parent.MANAGE_DOMAINS}"/>
       </j:if>
     </l:tasks>
   </l:side-panel>

diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/action.jelly b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/action.jelly
@@ -29,7 +29,7 @@
             href="${h.getActionUrl(it.url,action)}"
             permission="${action.VIEW}">
       <j:if test="${action.domainsModifiable}">
-        <l:task icon="plugin/credentials/images/24x24/new-domain.png" title="${%Add domain}"
+        <l:task icon="plugin/credentials/images/new-domain.svg" title="${%Add domain}"
                 href="newDomain"
                 permission="${it.MANAGE_DOMAINS}"/>
       </j:if>

diff --git a/src/main/resources/com/cloudbees/plugins/credentials/ViewCredentialsAction/action.jelly b/src/main/resources/com/cloudbees/plugins/credentials/ViewCredentialsAction/action.jelly
@@ -34,7 +34,7 @@
                 href="${h.getActionUrl(storeBaseUrl,action)}"
                 permission="${action.VIEW}">
           <j:if test="${action.domainsModifiable}">
-            <l:task icon="plugin/credentials/images/24x24/new-domain.png" title="${%Add domain}"
+            <l:task icon="plugin/credentials/images/new-domain.svg" title="${%Add domain}"
                     href="newDomain"
                     permission="${action.MANAGE_DOMAINS}"/>
           </j:if>

diff --git a/src/main/webapp/images/16x16/certificate.png b/src/main/webapp/images/16x16/certificate.png
diff --git a/src/main/webapp/images/16x16/credential.png b/src/main/webapp/images/16x16/credential.png
diff --git a/src/main/webapp/images/16x16/credentials.png b/src/main/webapp/images/16x16/credentials.png
diff --git a/src/main/webapp/images/16x16/domain.png b/src/main/webapp/images/16x16/domain.png
diff --git a/src/main/webapp/images/16x16/folder-store.png b/src/main/webapp/images/16x16/folder-store.png
diff --git a/src/main/webapp/images/16x16/move.png b/src/main/webapp/images/16x16/move.png
diff --git a/src/main/webapp/images/16x16/new-credential.png b/src/main/webapp/images/16x16/new-credential.png
diff --git a/src/main/webapp/images/16x16/new-domain.png b/src/main/webapp/images/16x16/new-domain.png
diff --git a/src/main/webapp/images/16x16/system-store.png b/src/main/webapp/images/16x16/system-store.png
diff --git a/src/main/webapp/images/16x16/user-store.png b/src/main/webapp/images/16x16/user-store.png
diff --git a/src/main/webapp/images/16x16/userpass.png b/src/main/webapp/images/16x16/userpass.png
diff --git a/src/main/webapp/images/24x24/certificate.png b/src/main/webapp/images/24x24/certificate.png
diff --git a/src/main/webapp/images/24x24/credential.png b/src/main/webapp/images/24x24/credential.png
diff --git a/src/main/webapp/images/24x24/credentials.png b/src/main/webapp/images/24x24/credentials.png
diff --git a/src/main/webapp/images/24x24/domain.png b/src/main/webapp/images/24x24/domain.png
diff --git a/src/main/webapp/images/24x24/folder-store.png b/src/main/webapp/images/24x24/folder-store.png
diff --git a/src/main/webapp/images/24x24/move.png b/src/main/webapp/images/24x24/move.png
diff --git a/src/main/webapp/images/24x24/new-credential.png b/src/main/webapp/images/24x24/new-credential.png
diff --git a/src/main/webapp/images/24x24/new-domain.png b/src/main/webapp/images/24x24/new-domain.png
diff --git a/src/main/webapp/images/24x24/system-store.png b/src/main/webapp/images/24x24/system-store.png
diff --git a/src/main/webapp/images/24x24/user-store.png b/src/main/webapp/images/24x24/user-store.png
diff --git a/src/main/webapp/images/24x24/userpass.png b/src/main/webapp/images/24x24/userpass.png
diff --git a/src/main/webapp/images/32x32/certificate.png b/src/main/webapp/images/32x32/certificate.png
diff --git a/src/main/webapp/images/32x32/credential.png b/src/main/webapp/images/32x32/credential.png
diff --git a/src/main/webapp/images/32x32/credentials.png b/src/main/webapp/images/32x32/credentials.png
diff --git a/src/main/webapp/images/32x32/domain.png b/src/main/webapp/images/32x32/domain.png
diff --git a/src/main/webapp/images/32x32/folder-store.png b/src/main/webapp/images/32x32/folder-store.png
diff --git a/src/main/webapp/images/32x32/move.png b/src/main/webapp/images/32x32/move.png
diff --git a/src/main/webapp/images/32x32/new-credential.png b/src/main/webapp/images/32x32/new-credential.png
diff --git a/src/main/webapp/images/32x32/new-domain.png b/src/main/webapp/images/32x32/new-domain.png
diff --git a/src/main/webapp/images/32x32/system-store.png b/src/main/webapp/images/32x32/system-store.png
diff --git a/src/main/webapp/images/32x32/user-store.png b/src/main/webapp/images/32x32/user-store.png
diff --git a/src/main/webapp/images/32x32/userpass.png b/src/main/webapp/images/32x32/userpass.png
diff --git a/src/main/webapp/images/48x48/certificate.png b/src/main/webapp/images/48x48/certificate.png
diff --git a/src/main/webapp/images/48x48/credential.png b/src/main/webapp/images/48x48/credential.png
diff --git a/src/main/webapp/images/48x48/credentials.png b/src/main/webapp/images/48x48/credentials.png
diff --git a/src/main/webapp/images/48x48/domain.png b/src/main/webapp/images/48x48/domain.png
diff --git a/src/main/webapp/images/48x48/folder-store.png b/src/main/webapp/images/48x48/folder-store.png
diff --git a/src/main/webapp/images/48x48/move.png b/src/main/webapp/images/48x48/move.png
diff --git a/src/main/webapp/images/48x48/new-credential.png b/src/main/webapp/images/48x48/new-credential.png
diff --git a/src/main/webapp/images/48x48/new-domain.png b/src/main/webapp/images/48x48/new-domain.png
diff --git a/src/main/webapp/images/48x48/system-store.png b/src/main/webapp/images/48x48/system-store.png
diff --git a/src/main/webapp/images/48x48/user-store.png b/src/main/webapp/images/48x48/user-store.png
diff --git a/src/main/webapp/images/48x48/userpass.png b/src/main/webapp/images/48x48/userpass.png
diff --git a/src/images/certificate.svg → src/main/webapp/images/certificate.svg b/src/images/certificate.svg → src/main/webapp/images/certificate.svg
diff --git a/src/images/credential.svg → src/main/webapp/images/credential.svg b/src/images/credential.svg → src/main/webapp/images/credential.svg
diff --git a/src/images/credentials.svg → src/main/webapp/images/credentials.svg b/src/images/credentials.svg → src/main/webapp/images/credentials.svg
diff --git a/src/images/domain.svg → src/main/webapp/images/domain.svg b/src/images/domain.svg → src/main/webapp/images/domain.svg
diff --git a/src/images/folder-store.svg → src/main/webapp/images/folder-store.svg b/src/images/folder-store.svg → src/main/webapp/images/folder-store.svg
diff --git a/src/images/make-inkscape.sh → src/main/webapp/images/make-inkscape.sh b/src/images/make-inkscape.sh → src/main/webapp/images/make-inkscape.sh
diff --git a/src/images/move.svg → src/main/webapp/images/move.svg b/src/images/move.svg → src/main/webapp/images/move.svg
diff --git a/src/images/new-credential.svg → src/main/webapp/images/new-credential.svg b/src/images/new-credential.svg → src/main/webapp/images/new-credential.svg
diff --git a/src/images/new-domain.svg → src/main/webapp/images/new-domain.svg b/src/images/new-domain.svg → src/main/webapp/images/new-domain.svg
diff --git a/src/images/system-store.svg → src/main/webapp/images/system-store.svg b/src/images/system-store.svg → src/main/webapp/images/system-store.svg
diff --git a/src/images/user-store.svg → src/main/webapp/images/user-store.svg b/src/images/user-store.svg → src/main/webapp/images/user-store.svg
diff --git a/src/images/userpass.svg → src/main/webapp/images/userpass.svg b/src/images/userpass.svg → src/main/webapp/images/userpass.svg
diff --git a/src/test/java/com/cloudbees/plugins/credentials/CredentialsUnavailableExceptionTest.java b/src/test/java/com/cloudbees/plugins/credentials/CredentialsUnavailableExceptionTest.java
@@ -228,7 +228,7 @@ public SCMRevisionState calcRevisionsFromBuild(@Nonnull Run<?, ?> build, @Nullab
             return new SCMRevisionState() {
                 @Override
                 public String getIconFileName() {
-                    return "mock.png";
+                    return "mock.svg";
                 }
 
                 @Override