From 67c0f04a763b46d69886bf57f95adba22f39bc69 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Thu, 17 Feb 2022 09:17:59 +0100 Subject: [PATCH 1/2] fix: Register help icon --- core/src/main/java/org/jenkins/ui/icon/IconSet.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/main/java/org/jenkins/ui/icon/IconSet.java b/core/src/main/java/org/jenkins/ui/icon/IconSet.java index 32a9eaed17..280f010278 100644 --- a/core/src/main/java/org/jenkins/ui/icon/IconSet.java +++ b/core/src/main/java/org/jenkins/ui/icon/IconSet.java @@ -520,6 +520,7 @@ public class IconSet { images.add("video"); images.add("warning"); images.add("document-properties"); + images.add("help"); for (Map.Entry size : sizes.entrySet()) { for (String image : images) { @@ -549,6 +550,7 @@ public class IconSet { translations.put("icon-gear2", "symbol-settings"); translations.put("icon-plugin", "symbol-plugins"); translations.put("icon-up", "symbol-arrow-up"); + translations.put("icon-help", "symbol-help-circle"); return translations.getOrDefault(tangoIcon, null); } From 9e4487cd1bed584cbd70ea0482ec0dd6e4f3dd77 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Thu, 17 Feb 2022 21:02:37 +0000 Subject: [PATCH 2/2] JENKINS-67828 Don't prepend icon if it's already there --- core/src/main/java/org/jenkins/ui/icon/Icon.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/jenkins/ui/icon/Icon.java b/core/src/main/java/org/jenkins/ui/icon/Icon.java index c1e9247b4b..d4a5e9910c 100644 --- a/core/src/main/java/org/jenkins/ui/icon/Icon.java +++ b/core/src/main/java/org/jenkins/ui/icon/Icon.java @@ -221,7 +221,11 @@ public class Icon { if (string == null) { return null; } - return "icon-" + toNormalizedIconName(string); + String iconName = toNormalizedIconName(string); + if (iconName.startsWith("icon-")) { + return iconName; + } + return "icon-" + iconName; } /**