Merge pull request #417 from janfaracik/simplify-names

Simplify Manage Jenkins items naming + change icons
jenkinsci · Apr 28, 2023 · 1f71105 · 1f71105
2 parents 4eaaca1 + fee71af
commit 1f71105
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 12 deletions.
diff --git a/src/main/java/com/cloudbees/plugins/credentials/CredentialsDescriptor.java b/src/main/java/com/cloudbees/plugins/credentials/CredentialsDescriptor.java
@@ -243,7 +243,7 @@ public String getCredentialsPage() {
      * @since 1.25
      */
     public String getIconClassName() {
-        return "symbol-key";
+        return "symbol-credentials plugin-credentials";
     }
 
     /**

diff --git a/src/main/java/com/cloudbees/plugins/credentials/CredentialsParameterValue.java b/src/main/java/com/cloudbees/plugins/credentials/CredentialsParameterValue.java
@@ -156,7 +156,7 @@ public String iconClassName() {
         if (c != null) {
             return c.getDescriptor().getIconClassName();
         }
-        return "symbol-key";
+        return "symbol-credentials plugin-credentials";
     }
 
     public String url() {

diff --git a/src/main/java/com/cloudbees/plugins/credentials/CredentialsProvider.java b/src/main/java/com/cloudbees/plugins/credentials/CredentialsProvider.java
@@ -1092,7 +1092,7 @@ public String getDisplayName() {
      */
     @Override
     public String getIconClassName() {
-        return "symbol-key";
+        return "symbol-credentials plugin-credentials";
     }
 
     /**

diff --git a/src/main/java/com/cloudbees/plugins/credentials/CredentialsStoreAction.java b/src/main/java/com/cloudbees/plugins/credentials/CredentialsStoreAction.java
@@ -398,7 +398,7 @@ public boolean isVisible() {
     @Override
     public String getIconClassName() {
         return isVisible()
-                ? "symbol-key"
+                ? "symbol-credentials plugin-credentials"
                 : 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
-                : "symbol-key";
+                : "symbol-credential-providers plugin-credentials";
     }
 
     /**

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 "symbol-key";
+        return "symbol-credentials plugin-credentials";
     }
 
     @Override

diff --git a/src/main/java/com/cloudbees/plugins/credentials/ViewCredentialsAction.java b/src/main/java/com/cloudbees/plugins/credentials/ViewCredentialsAction.java
@@ -112,7 +112,7 @@ public ModelObject getContext() {
     @Override
     public String getIconFileName() {
         return isVisible()
-                ? "symbol-key"
+                ? "symbol-credentials plugin-credentials"
                 : null;
     }
 
@@ -295,7 +295,7 @@ public List<TableEntry> getTableEntries() {
     @Override
     public String getIconClassName() {
         return isVisible()
-                ? "symbol-key"
+                ? "symbol-credentials plugin-credentials"
                 : null;
     }
 

diff --git a/src/main/resources/com/cloudbees/plugins/credentials/Messages.properties b/src/main/resources/com/cloudbees/plugins/credentials/Messages.properties
@@ -71,7 +71,7 @@ SystemCredentialsProvider.ProviderImpl.DisplayName=Jenkins Credentials Provider
 SystemCredentialsProvider.UserFacingAction.DisplayName=System
 UserCredentialsProvider_DisplayName=Credentials
 UserCredentialsProvider.UserFacingAction.DisplayName=User
-GlobalCredentialsConfiguration.DisplayName=Configure Credential Providers
+GlobalCredentialsConfiguration.DisplayName=Credential Providers
 GlobalCredentialsConfiguration.Description=Configure the credential providers and types
 CredentialsProviderFilter.None.DisplayName=All available
 CredentialsProviderFilter.Includes.DisplayName=Only selected
@@ -82,5 +82,5 @@ CredentialsTypeFilter.Excludes.DisplayName=Exclude selected
 CredentialsProviderTypeRestriction.Includes.DisplayName=Includes
 CredentialsProviderTypeRestriction.Excludes.DisplayName=Excludes
 
-ManageCredentialsConfiguration.displayName=Manage Credentials
+ManageCredentialsConfiguration.displayName=Credentials
 ManageCredentialsConfiguration.description=Configure credentials 
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/Messages_it.properties b/src/main/resources/com/cloudbees/plugins/credentials/Messages_it.properties
@@ -95,9 +95,9 @@ CredentialsTypeFilter.Includes.DisplayName=Solo le voci selezionate
 CredentialsTypeFilter.None.DisplayName=Tutte le voci disponibili
 GlobalCredentialsConfiguration.Description=Configura i provider e i tipi di \
   credenziali
-GlobalCredentialsConfiguration.DisplayName=Configura provider credenziali
+GlobalCredentialsConfiguration.DisplayName=Provider credenziali
 ManageCredentialsConfiguration.description=Configura credenziali
-ManageCredentialsConfiguration.displayName=Gestisci credenziali
+ManageCredentialsConfiguration.displayName=Credenziali
 SystemCredentialsProvider.ProviderImpl.DisplayName=Provider credenziali Jenkins
 SystemCredentialsProvider.UserFacingAction.DisplayName=Sistema
 UserCredentialsProvider_DisplayName=Credenziali

diff --git a/src/main/resources/images/symbols/credential-providers.svg b/src/main/resources/images/symbols/credential-providers.svg
diff --git a/src/main/resources/images/symbols/credentials.svg b/src/main/resources/images/symbols/credentials.svg