Merge pull request #501 from panicking/fix-icon-trigger-animation

TriggerMonitor: Fix grey icon anime bug and modernize icon animation
jenkinsci · Jan 9, 2024 · cfc32a0 · cfc32a0
2 parents c563987 + a23ac1c
commit cfc32a0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...nyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/actions/manual/TriggerMonitor.java b/...nyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/actions/manual/TriggerMonitor.java
@@ -205,17 +205,17 @@ void setBuild(Run build) {
         @SuppressWarnings("unused") //called from jelly
         public String getBallColor() {
             if (!triggerScanStarted) {
-                return BallColor.GREY.getImage();
+                return BallColor.GREY.getIconClassName();
             } else if (!triggerScanDone) {
-                return BallColor.GREY_ANIME.getImage();
+                return BallColor.GREY_ANIME.getIconClassName();
             } else if (isUnTriggered()) {
-                return BallColor.DISABLED.getImage();
+                return BallColor.DISABLED.getIconClassName();
             } else {
                 Result result = getLeastFavorableResult();
                 if (result != null) {
-                    return result.color.getImage();
+                    return result.color.getIconClassName();
                 } else {
-                    return BallColor.GREY_ANIME.getImage();
+                    return BallColor.GREY_ANIME.getIconClassName();
                 }
             }
         }

diff --git a/...om/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritCause/description.jelly b/...om/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritCause/description.jelly
@@ -44,7 +44,7 @@
                     <j:choose>
                         <j:when test="${other.hasBuild()}">
                             <td width="18">
-                                <img src="${imagesURL}/16x16/${other.build.iconColor.image}"/>
+                                <l:icon class="${build.build.iconColor.iconClassName}"/>
                             </td>
                             <td>
                                 <a href="${rootURL}/${other.project.url}">${other.project.displayName}</a>

diff --git a/.../gerrit/trigger/hudsontrigger/actions/manual/ManualTriggerAction/ajaxTriggerMonitor.jelly b/.../gerrit/trigger/hudsontrigger/actions/manual/ManualTriggerAction/ajaxTriggerMonitor.jelly
@@ -30,7 +30,7 @@
             <j:forEach items="${monitor.eventsIterator}" var="state">
                 <tr>
                     <td width="14">
-                        <img src="${imagesURL}/16x16/${state.ballColor}"/>
+                        <l:icon class="${state.ballColor}" />
                     </td>
                     <td colspan="2" style="font-weight: bold;">
                         <a href="${it.getGerritUrl(state.event)}" target="_new">
@@ -56,7 +56,7 @@
                                 <j:choose>
                                     <j:when test="${build.hasBuild()}">
                                         <td width="18">
-                                            <img src="${imagesURL}/16x16/${build.build.iconColor.image}"/>
+                                            <l:icon class="${build.build.iconColor.iconClassName}"/>
                                         </td>
                                         <td>
                                             <a href="${rootURL}/${build.project.url}">${build.project.displayName}</a>
@@ -67,7 +67,7 @@
                                     </j:when>
                                     <j:otherwise>
                                         <td width="14">
-                                            <img src="${rootURL}/images/build-status/build-status-sprite.svg#never-built" class="icon-grey-anime icon-sm"/>
+                                            <l:icon class="icon-grey-anime icon-sm"/>
                                         </td>
                                         <td>
                                             <a href="${rootURL}/${build.project.url}">${build.project.displayName}</a>