Merge pull request #531 from lvotypko:scheduled-jobs-in-view

Conflicts: core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly
jenkinsci · Oct 7, 2013 · 82a10c1 · 82a10c1 · jglick · Oct 16, 2013
2 parents b533f77 + ff612d2
commit 82a10c1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly b/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly
@@ -30,17 +30,17 @@ THE SOFTWARE.
               <a href="${jobBaseUrl}${job.shortUrl}build?delay=0sec">
                   <j:choose>
                       <j:when test="${job.parameterized}">
-                          <img src="${imagesURL}/${subIconSize}/clock.png"
-                               title="${%Schedule a build with parameters}" alt="${%Schedule a build with parameters}"
-                               border="0"/>
+                          <j:set var="title" value="${%Schedule a build with parameters}"/>
                       </j:when>
                       <j:otherwise>
-                          <img src="${imagesURL}/${subIconSize}/clock.png"
-                               title="${%Schedule a build}" alt="${%Schedule a build}"
-                               onclick="return build_${id}(this)"
-                               border="0"/>
+                          <j:set var="title" value="${%Schedule a build}"/>
                       </j:otherwise>
                   </j:choose>
+                  <j:set var="icon" value="${app.queue.contains(job) ? 'clock_anime.gif' : 'clock.png'}"/>
+                  <img src="${imagesURL}/${subIconSize}/${icon}"
+                         title="${title}" alt="${title}"
+                         onclick="return build_${id}(this)"
+                         border="0"/>
               </a>
               <script>
                 function build_${id}(img) {
@@ -51,4 +51,4 @@ THE SOFTWARE.
               </script>
           </j:if>
       </td>
-</j:jelly>
+</j:jelly>
diff --git a/war/src/main/webapp/images/16x16/clock_anime.gif b/war/src/main/webapp/images/16x16/clock_anime.gif
diff --git a/war/src/main/webapp/images/24x24/clock_anime.gif b/war/src/main/webapp/images/24x24/clock_anime.gif
diff --git a/war/src/main/webapp/images/32x32/clock_anime.gif b/war/src/main/webapp/images/32x32/clock_anime.gif