Update Manage Jenkins icons (#6273)

jenkinsci · Feb 15, 2022 · 958db3c · 958db3c
1 parent 595547e
commit 958db3c
Show file tree

Hide file tree

Showing 81 changed files with 241 additions and 374 deletions.
diff --git a/core/src/main/java/hudson/AboutJenkins.java b/core/src/main/java/hudson/AboutJenkins.java
@@ -18,7 +18,7 @@
 public class AboutJenkins extends ManagementLink {
     @Override
     public String getIconFileName() {
-        return "symbol-help-circle";
+        return "symbol-jenkins";
     }
 
     @Override

diff --git a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
@@ -454,7 +454,7 @@ public Category getCategory() {
 
         @Override
         public String getIconFileName() {
-            return "document.svg";
+            return "symbol-cube";
         }
 
         @Override

diff --git a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
@@ -80,7 +80,7 @@ private WindowsInstallerLink(File jenkinsWar) {
 
     @Override
     public String getIconFileName() {
-        return "installer.svg";
+        return "symbol-windows";
     }
 
     @Override

diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
@@ -727,10 +727,10 @@ public void setTemporarilyOffline(boolean temporarilyOffline, OfflineCause cause
     @Exported
     public String getIcon() {
         // The machine was taken offline by someone
-        if (isTemporarilyOffline() && getOfflineCause() instanceof OfflineCause.UserCause) return "computer-user-offline.svg";
+        if (isTemporarilyOffline() && getOfflineCause() instanceof OfflineCause.UserCause) return "symbol-computer-disconnected";
         // There is a "technical" reason the computer will not accept new builds
-        if (isOffline() || !isAcceptingTasks()) return "computer-x.svg";
-        return "computer.svg";
+        if (isOffline() || !isAcceptingTasks()) return "symbol-computer-offline";
+        return "symbol-computer";
     }
 
     /**
@@ -747,10 +747,10 @@ public String getIcon() {
     @Exported
     public String getIconClassName() {
         // The machine was taken offline by someone
-        if (isTemporarilyOffline() && getOfflineCause() instanceof OfflineCause.UserCause) return "icon-computer-user-offline";
+        if (isTemporarilyOffline() && getOfflineCause() instanceof OfflineCause.UserCause) return "symbol-computer-disconnected";
         // There is a "technical" reason the computer will not accept new builds
-        if (isOffline() || !isAcceptingTasks()) return "icon-computer-x";
-        return "icon-computer";
+        if (isOffline() || !isAcceptingTasks()) return "symbol-computer-offline";
+        return "symbol-computer";
     }
 
     public String getIconAltText() {

diff --git a/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java b/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java
@@ -176,7 +176,7 @@ public String getDescription() {
 
     @Override
     public String getIconFileName() {
-        return "secure.svg";
+        return "symbol-lock-closed";
     }
 
     @Override

diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
@@ -846,7 +846,7 @@ public static final class ManageUserLinks extends ManagementLink {
         @Override
         public String getIconFileName() {
             if (Jenkins.get().getSecurityRealm() instanceof HudsonPrivateSecurityRealm)
-                return "user.svg";
+                return "symbol-people";
             else
                 return null;    // not applicable now
         }

diff --git a/core/src/main/java/hudson/tasks/UserAvatarResolver.java b/core/src/main/java/hudson/tasks/UserAvatarResolver.java
@@ -28,12 +28,10 @@
 import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
-import hudson.Functions;
 import hudson.model.User;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import jenkins.model.Jenkins;
 
 /**
  * Infers avatar image URLs for users
@@ -87,8 +85,7 @@ public abstract class UserAvatarResolver implements ExtensionPoint {
      */
     public static String resolve(User u, String avatarSize) {
         String avatar = resolveOrNull(u, avatarSize);
-        return avatar != null ? avatar : Jenkins.get().getRootUrl() + Functions.getResourcePath() +
-            "/images/svgs/person.svg";
+        return avatar != null ? avatar : "symbol-person-circle";
     }
 
     /**

diff --git a/core/src/main/java/jenkins/management/CliLink.java b/core/src/main/java/jenkins/management/CliLink.java
@@ -39,7 +39,7 @@ public class CliLink extends ManagementLink {
 
     @Override
     public String getIconFileName() {
-        return "terminal.svg";
+        return "symbol-terminal";
     }
 
     @Override

diff --git a/core/src/main/java/jenkins/management/ConsoleLink.java b/core/src/main/java/jenkins/management/ConsoleLink.java
@@ -39,7 +39,7 @@ public class ConsoleLink extends ManagementLink {
 
     @Override
     public String getIconFileName() {
-        return "notepad.svg";
+        return "symbol-code-working";
     }
 
     @Override

diff --git a/core/src/main/java/jenkins/management/NodesLink.java b/core/src/main/java/jenkins/management/NodesLink.java
@@ -39,7 +39,7 @@ public class NodesLink extends ManagementLink {
 
     @Override
     public String getIconFileName() {
-        return "network.svg";
+        return "symbol-cloud";
     }
 
     @Override

diff --git a/core/src/main/java/jenkins/management/PluginsLink.java b/core/src/main/java/jenkins/management/PluginsLink.java
@@ -73,12 +73,12 @@ public Category getCategory() {
     }
 
     @Restricted(NoExternalUse.class)
-    public boolean hasUpdates() {
+    public int getUpdateCount() {
         final UpdateCenter updateCenter = Jenkins.get().getUpdateCenter();
         if (!updateCenter.isSiteDataReady()) {
             // Do not display message during this page load, but possibly later.
-            return false;
+            return 0;
         }
-        return !updateCenter.getUpdates().isEmpty();
+        return updateCenter.getUpdates().size();
     }
 }
diff --git a/core/src/main/java/jenkins/management/ReloadLink.java b/core/src/main/java/jenkins/management/ReloadLink.java
@@ -39,7 +39,7 @@ public class ReloadLink extends ManagementLink {
 
     @Override
     public String getIconFileName() {
-        return "refresh.svg";
+        return "symbol-reload";
     }
 
     @Override

diff --git a/core/src/main/java/jenkins/management/ShutdownLink.java b/core/src/main/java/jenkins/management/ShutdownLink.java
@@ -47,7 +47,7 @@ public class ShutdownLink extends ManagementLink {
 
     @Override
     public String getIconFileName() {
-        return "system-log-out.svg";
+        return "symbol-power";
     }
 
     @Override

diff --git a/core/src/main/java/jenkins/management/StatisticsLink.java b/core/src/main/java/jenkins/management/StatisticsLink.java
@@ -39,7 +39,7 @@ public class StatisticsLink extends ManagementLink {
 
     @Override
     public String getIconFileName() {
-        return "monitor.svg";
+        return "symbol-analytics";
     }
 
     @Override

diff --git a/core/src/main/java/jenkins/management/SystemInfoLink.java b/core/src/main/java/jenkins/management/SystemInfoLink.java
@@ -39,7 +39,7 @@ public class SystemInfoLink extends ManagementLink {
 
     @Override
     public String getIconFileName() {
-        return "computer.svg";
+        return "symbol-server";
     }
 
     @Override

diff --git a/core/src/main/java/jenkins/management/SystemLogLink.java b/core/src/main/java/jenkins/management/SystemLogLink.java
@@ -39,7 +39,7 @@ public class SystemLogLink extends ManagementLink {
 
     @Override
     public String getIconFileName() {
-        return "clipboard.svg";
+        return "symbol-file-tray";
     }
 
     @Override

diff --git a/core/src/main/java/jenkins/tools/GlobalToolConfiguration.java b/core/src/main/java/jenkins/tools/GlobalToolConfiguration.java
@@ -51,7 +51,7 @@ public class GlobalToolConfiguration extends ManagementLink {
 
     @Override
     public String getIconFileName() {
-        return "setting.svg";
+        return "symbol-hammer";
     }
 
     @Override

diff --git a/core/src/main/java/org/jenkins/ui/icon/IconSet.java b/core/src/main/java/org/jenkins/ui/icon/IconSet.java
@@ -548,6 +548,7 @@ public static String tryTranslateTangoIconToSymbol(String tangoIcon) {
         translations.put("icon-gear", "symbol-settings");
         translations.put("icon-gear2", "symbol-settings");
         translations.put("icon-plugin", "symbol-plugins");
+        translations.put("icon-up", "symbol-arrow-up");
 
         return translations.getOrDefault(tangoIcon, null);
     }

diff --git a/core/src/main/resources/hudson/model/Computer/index.jelly b/core/src/main/resources/hudson/model/Computer/index.jelly
@@ -53,7 +53,9 @@ THE SOFTWARE.
       </div>
 
       <h1>
-        <l:icon class="${it.iconClassName} icon-xlg" />
+        <span class="icon-lg">
+          <l:icon src="${it.iconClassName}" />
+        </span>
         ${it.caption}
         <j:if test="${!empty(it.node.nodeDescription)}">
           <span style="font-size:smaller">(${it.node.nodeDescription})</span>

diff --git a/core/src/main/resources/hudson/model/ComputerSet/index.jelly b/core/src/main/resources/hudson/model/ComputerSet/index.jelly
@@ -64,9 +64,9 @@ THE SOFTWARE.
 
       <j:forEach var="c" items="${it._all}">
         <tr id="node_${c.name}">
-          <td data="${c.icon}" class="jenkins-table__cell--tight">
+          <td data="${c.icon}" class="jenkins-table__cell--tight jenkins-table__icon">
             <div class="jenkins-table__cell__button-wrapper">
-              <l:icon class="${c.iconClassName} icon-lg" alt="${c.iconAltText}"/>
+              <l:icon src="${c.iconClassName}" alt="${c.iconAltText}"/>
             </div>
           </td>
 

diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly b/core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly
@@ -33,8 +33,8 @@ THE SOFTWARE.
     <l:tasks>
       <l:task href="${rootURL}/" icon="icon-up icon-md" title="${%Back to Dashboard}"/>
       <l:task href="${rootURL}/manage" icon="symbol-settings" permissions="${app.MANAGE_AND_SYSTEM_READ}" title="${%Manage Jenkins}"/>
-      <l:task href="new" icon="icon-new-computer icon-md" permission="${createPermission}" title="${%New Node}"/>
-      <l:task href="${rootURL}/configureClouds" icon="icon-health-40to59 icon-md" permission="${app.SYSTEM_READ}"
+      <l:task href="new" icon="symbol-add" permission="${createPermission}" title="${%New Node}"/>
+      <l:task href="${rootURL}/configureClouds" icon="symbol-cloud" permission="${app.SYSTEM_READ}"
               title="${app.hasPermission(app.ADMINISTER) ? '%Configure Clouds' : '%View Clouds'}"/>
       <l:task href="configure" icon="symbol-settings" permissions="${app.MANAGE_AND_SYSTEM_READ}" title="${%Node Monitoring}"/>
     </l:tasks>

diff --git a/core/src/main/resources/hudson/model/User/builds.jelly b/core/src/main/resources/hudson/model/User/builds.jelly
@@ -27,7 +27,6 @@ THE SOFTWARE.
     <st:include page="sidepanel.jelly" />
     <l:main-panel>
       <h1>
-        <img src="${h.getUserAvatar(it,'48x48')}" alt="" height="48" width="48" />
         ${%title(it)}
       </h1>
 

diff --git a/core/src/main/resources/hudson/model/User/index.jelly b/core/src/main/resources/hudson/model/User/index.jelly
@@ -27,7 +27,9 @@ THE SOFTWARE.
     <st:include page="sidepanel.jelly" />
     <l:main-panel>
       <h1>
-        <img src="${h.getUserAvatar(it,'48x48')}" alt="" height="48" width="48" />
+        <span class="icon-lg">
+          <l:icon src="${h.getUserAvatar(user,'48x48')}" />
+        </span>
         ${it.fullName}
       </h1>
       <t:editableDescription permission="${app.ADMINISTER}" />

diff --git a/...rc/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryFormPage/resources.css b/...rc/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryFormPage/resources.css
@@ -1,4 +1,4 @@
-input {
+.form-content input {
 	/* match width with captcha image */
 	width:200px;
 }

diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
@@ -51,7 +51,7 @@ THE SOFTWARE.
             <tr>
               <td class="jenkins-table__cell--tight jenkins-table__icon">
                 <div class="jenkins-table__cell__button-wrapper">
-                  <img src="${h.getUserAvatar(user,'32x32')}" alt="" height="32" width="32"/>
+                  <l:icon src="${h.getUserAvatar(user,'32x32')}" />
                 </div>
               </td>
               <td>

diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel.jelly
@@ -29,8 +29,8 @@ THE SOFTWARE.
     <l:tasks>
       <l:task href="${rootURL}/" icon="icon-up icon-md" title="${%Back to Dashboard}" />
       <l:task href="${rootURL}/manage" icon="symbol-settings" permission="${app.MANAGE}" title="${%Manage Jenkins}" />
-      <l:task href="." icon="icon-new-user icon-md" permission="${app.ADMINISTER}" title="${%Users}" />
-      <l:task href="addUser" icon="icon-new-user icon-md" permission="${app.ADMINISTER}" title="${%Create User}" />
+      <l:task href="." icon="symbol-people" permission="${app.ADMINISTER}" title="${%Users}" />
+      <l:task href="addUser" icon="symbol-add" permission="${app.ADMINISTER}" title="${%Create User}" />
     </l:tasks>
   </l:side-panel>
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/management/PluginsLink/info.jelly b/core/src/main/resources/jenkins/management/PluginsLink/info.jelly
diff --git a/core/src/main/resources/jenkins/management/PluginsLink/info.properties b/core/src/main/resources/jenkins/management/PluginsLink/info.properties
diff --git a/core/src/main/resources/jenkins/management/PluginsLink/info_bg.properties b/core/src/main/resources/jenkins/management/PluginsLink/info_bg.properties
diff --git a/core/src/main/resources/jenkins/management/PluginsLink/info_ca.properties b/core/src/main/resources/jenkins/management/PluginsLink/info_ca.properties
diff --git a/core/src/main/resources/jenkins/management/PluginsLink/info_cs.properties b/core/src/main/resources/jenkins/management/PluginsLink/info_cs.properties
diff --git a/core/src/main/resources/jenkins/management/PluginsLink/info_da.properties b/core/src/main/resources/jenkins/management/PluginsLink/info_da.properties
diff --git a/core/src/main/resources/jenkins/management/PluginsLink/info_de.properties b/core/src/main/resources/jenkins/management/PluginsLink/info_de.properties