[JENKINS-6936] Use dedicated claim icon everywhere

* switch to modern icon management
jenkinsci · Dec 24, 2017 · 570d338 · 570d338
1 parent 5f015f5
commit 570d338
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 24 deletions.
diff --git a/src/main/java/hudson/plugins/claim/ClaimPlugin.java b/src/main/java/hudson/plugins/claim/ClaimPlugin.java
@@ -0,0 +1,28 @@
+package hudson.plugins.claim;
+
+import hudson.Plugin;
+import org.jenkins.ui.icon.Icon;
+import org.jenkins.ui.icon.IconSet;
+
+public class ClaimPlugin extends Plugin {
+    @Override
+    public void start() throws Exception {
+        super.start();
+        IconSet.icons.addIcon(
+                new Icon("icon-claim-claim icon-sm",
+                        "plugin/claim/images/16x16/claim.png",
+                        Icon.ICON_SMALL_STYLE));
+        IconSet.icons.addIcon(
+                new Icon("icon-claim-claim icon-md",
+                        "plugin/claim/images/24x24/claim.png",
+                        Icon.ICON_MEDIUM_STYLE));
+        IconSet.icons.addIcon(
+                new Icon("icon-claim-claim icon-lg",
+                        "plugin/claim/images/32x32/claim.png",
+                        Icon.ICON_LARGE_STYLE));
+        IconSet.icons.addIcon(
+                new Icon("icon-claim-claim icon-xlg",
+                        "plugin/claim/images/48x48/claim.png",
+                        Icon.ICON_XLARGE_STYLE));
+    }
+}
diff --git a/src/main/java/hudson/plugins/claim/ClaimedBuildsReport.java b/src/main/java/hudson/plugins/claim/ClaimedBuildsReport.java
@@ -11,16 +11,34 @@
 import java.util.List;
 import jenkins.model.Jenkins;
 
+import org.apache.commons.jelly.JellyContext;
+import org.jenkins.ui.icon.Icon;
+import org.jenkins.ui.icon.IconSet;
+import org.jenkins.ui.icon.IconSpec;
 import org.kohsuke.stapler.Stapler;
 
 @Extension
-public class ClaimedBuildsReport implements RootAction {
+public class ClaimedBuildsReport implements RootAction, IconSpec {
 
     public ClaimedBuildsReport() {
     }
 
+    @Override
+    public String getIconClassName() {
+        return "icon-claim-claim";
+    }
+
     public String getIconFileName() {
-        return "/plugin/claim/icons/claim-24x24.png";
+        String iconClassName = getIconClassName();
+        if (iconClassName != null) {
+            Icon icon = IconSet.icons.getIconByClassSpec(iconClassName + " icon-md");
+            if (icon != null) {
+                JellyContext ctx = new JellyContext();
+                ctx.setVariable("resURL", Stapler.getCurrentRequest().getContextPath() + Jenkins.RESOURCE_PATH);
+                return icon.getQualifiedUrl(ctx);
+            }
+        }
+        return null;
     }
 
     public String getUrlName() {

diff --git a/src/main/resources/hudson/plugins/claim/AbstractClaimBuildAction/badge.jelly b/src/main/resources/hudson/plugins/claim/AbstractClaimBuildAction/badge.jelly
@@ -1,16 +1,12 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core">
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
 		<j:if test="${it.claimed}">
 		<j:choose>
 			<j:when test="${it.reason != null}">
-			<img width="16" height="16"
-			  title="${%claimed.reason(it.claimedByName,it.reason)}"
-			  src="${imagesURL}/16x16/lock.gif"/>
+				<l:icon class="icon-claim-claim icon-sm" title="${%claimed.reason(it.claimedByName,it.reason)}"/>
 			 </j:when>
 			 <j:otherwise>
-			<img width="16" height="16"
-			  title="${%claimed(it.claimedBy)}"
-			  src="${imagesURL}/16x16/lock.gif"/>
+				 <l:icon class="icon-claim-claim icon-sm" title="${%claimed(it.claimedBy)}"/>
 			 </j:otherwise>
 		</j:choose>
 		</j:if>

diff --git a/src/main/resources/hudson/plugins/claim/AbstractClaimBuildAction/summary.jelly b/src/main/resources/hudson/plugins/claim/AbstractClaimBuildAction/summary.jelly
@@ -28,7 +28,7 @@
         }
    </script>
 
-    <t:summary icon="${rootUrl}/plugin/claim/icons/claim-48x48.png">
+    <t:summary icon="icon-claim-claim">
         <j:choose>
             <j:when test="${it.isClaimedByMe()}">
                 <p>

diff --git a/src/main/resources/hudson/plugins/claim/ClaimColumn/column.jelly b/src/main/resources/hudson/plugins/claim/ClaimColumn/column.jelly
@@ -29,29 +29,25 @@ THE SOFTWARE.
         <j:choose>
                 <j:when test="${action.claim.reason != null}">   
                         <j:choose>
-                            <j:when test="${action.claim.claimedBy.equals(action.claim.assignedBy)}">                       
-                                <img width="16" height="16"
-                                title="${%climed.reason(action.combinationName,action.claim.claimedBy,action.claim.reason)}"
-                                src="${imagesURL}/16x16/lock.gif"/>
+                            <j:when test="${action.claim.claimedBy.equals(action.claim.assignedBy)}">
+                                <l:icon class="icon-claim-claim icon-sm"
+                                        title="${%climed.reason(action.combinationName,action.claim.claimedBy,action.claim.reason)}"/>
                             </j:when>
                             <j:otherwise>
-                                <img width="16" height="16"
-                                title="${%assigned.reason(action.claim.claimedBy,action.claim.assignedBy,action.claim.reason)}"
-                                src="${imagesURL}/16x16/lock.gif"/>
+                                <l:icon class="icon-claim-claim icon-sm"
+                                        title="${%assigned.reason(action.claim.claimedBy,action.claim.assignedBy,action.claim.reason)}"/>
                             </j:otherwise>
                       </j:choose>
                  </j:when>
                  <j:otherwise>
                     <j:choose>
-                        <j:when test="${action.claim.claimedBy.equals(action.claim.assignedBy)}"> 
-                            <img width="16" height="16"
-                            title="${%climed(action.combinationName,action.claim.claimedBy)}"
-                            src="${imagesURL}/16x16/lock.gif"/>
+                        <j:when test="${action.claim.claimedBy.equals(action.claim.assignedBy)}">
+                            <l:icon class="icon-claim-claim icon-sm"
+                                    title="${%climed(action.combinationName,action.claim.claimedBy)}"/>
                         </j:when>
                         <j:otherwise>
-                            <img width="16" height="16"
-                            title="${%climed(action.claim.claimedBy,action.claim.assignedBy)}"
-                            src="${imagesURL}/16x16/lock.gif"/>                    
+                            <l:icon class="icon-claim-claim icon-sm"
+                                    title="$${%climed(action.claim.claimedBy,action.claim.assignedBy)}"/>
                         </j:otherwise>
                     </j:choose>
                  </j:otherwise>

diff --git a/src/main/webapp/images/16x16/claim.png b/src/main/webapp/images/16x16/claim.png
diff --git a/src/main/webapp/icons/claim-24x24.png → src/main/webapp/images/24x24/claim.png b/src/main/webapp/icons/claim-24x24.png → src/main/webapp/images/24x24/claim.png
diff --git a/src/main/webapp/images/32x32/claim.png b/src/main/webapp/images/32x32/claim.png
diff --git a/src/main/webapp/icons/claim-48x48.png → src/main/webapp/images/48x48/claim.png b/src/main/webapp/icons/claim-48x48.png → src/main/webapp/images/48x48/claim.png