failed.erb in resque-1.14.0

- old
+ new
@@ -14,35 +14,45 @@
 <ul class='failed'>
   <%for job in failed%>
     <% index += 1 %>
     <li>
       <dl>
+        <% if job.nil? %>
+        <dt>Error</dt>
+        <dd>Job <%= index%> could not be parsed; perhaps it contains invalid JSON?</dd>
+        <% else %>
         <dt>Worker</dt>
         <dd>
-          <a href="<%= url(:workers, job['worker']) %>"><%= job['worker'].split(':')[0...2].join(':') %></a> on <b class='queue-tag'><%= job['queue'] %></b > at <b><span class="time"><%= job['failed_at'] %></span></b>
-          <div class='retry'>
-            <% if job['retried_at'] %>
+          <a href="<%= u(:workers, job['worker']) %>"><%= job['worker'].split(':')[0...2].join(':') %></a> on <b class='queue-tag'><%= job['queue'] %></b > at <b><span class="time"><%= job['failed_at'] %></span></b>
+          <% if job['retried_at'] %>
+            <div class='retried'>
               Retried <b><span class="time"><%= job['retried_at'] %></span></b>
-            <% else %>
+              <a href="<%= u "failed/remove/#{start + index - 1}" %>" class="remove" rel="remove">Remove</a>
+            </div>
+          <% else %>
+            <div class='controls'>
               <a href="<%= u "failed/requeue/#{start + index - 1}" %>" rel="retry">Retry</a>
-            <% end %>
-          </div>
+              or
+              <a href="<%= u "failed/remove/#{start + index - 1}" %>" rel="remove">Remove</a>
+            </div>
+          <% end %>
         </dd>
         <dt>Class</dt>
         <dd><code><%= job['payload'] ? job['payload']['class'] : 'nil' %></code></dd>
         <dt>Arguments</dt>
         <dd><pre><%=h job['payload'] ? show_args(job['payload']['args']) : 'nil' %></pre></dd>
-        <dt>Exception</td>
+        <dt>Exception</dt>
         <dd><code><%= job['exception'] %></code></dd>
         <dt>Error</dt>
         <dd class='error'>
           <% if job['backtrace'] %>
             <a href="#" class="backtrace"><%= h(job['error']) %></a>
             <pre style='display:none'><%=h job['backtrace'].join("\n") %></pre>
           <% else %>
             <%=h job['error'] %>
           <% end %>
         </dd>
+        <% end %>
       </dl>
       <div class='r'>
       </div>
     </li>
   <%end%>