From 65e8980dc273f39d1541487da57f7db5ba65582d Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Fri, 4 May 2012 21:00:48 -0700
Subject: [PATCH] Slight restructure to the retry page, make code style not
 suck

---
 lib/sidekiq/web.rb                     |  2 ++
 web/assets/stylesheets/application.css |  8 +++++--
 web/views/retry.slim                   | 30 +++++++++++++++-----------
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/lib/sidekiq/web.rb b/lib/sidekiq/web.rb
index 458abbdf..30457a6f 100644
--- a/lib/sidekiq/web.rb
+++ b/lib/sidekiq/web.rb
@@ -137,6 +137,8 @@ module Sidekiq
     get "/retries/:score" do
       halt 404 unless params[:score]
       @score = params[:score].to_f
+      @retries = retries_with_score(@score)
+      redirect root_path if @retries.empty?
       slim :retry
     end
 
diff --git a/web/assets/stylesheets/application.css b/web/assets/stylesheets/application.css
index f4aaff3c..4caf7ade 100644
--- a/web/assets/stylesheets/application.css
+++ b/web/assets/stylesheets/application.css
@@ -1,12 +1,11 @@
 /*
-*= require_self
 *= require vendor/bootstrap
 *= require vendor/bootstrap-responsive
+*= require_self
 */
 body {
   position: relative;
   padding-top: 90px;
-  background-color: #aaa;
 }
 
 td form {
@@ -17,3 +16,8 @@ td form .btn {
   margin: 0;
 }
 
+code {
+  padding: 0;
+  border: 0;
+  background-color: inherit;
+}
diff --git a/web/views/retry.slim b/web/views/retry.slim
index 17fcb277..aaebd89f 100644
--- a/web/views/retry.slim
+++ b/web/views/retry.slim
@@ -1,7 +1,7 @@
 header
-  h1 Retry Job
+  h1 Job
 
-- retries_with_score(@score).each do |msg|
+- @retries.each do |msg|
   table class="table table-striped table-bordered"
     tbody
       tr
@@ -16,17 +16,6 @@ header
         th Job Arguments
         td
           code= msg['args'].inspect[0..1000]
-      tr
-        th Error Class
-        td
-          code= msg['error_class']
-      tr
-        th Error Message
-        td= msg['error_message']
-      - if !msg['error_backtrace'].nil?
-        tr
-          th Error Backtrace
-          td== msg['error_backtrace'].join("<br/>")
       - if msg['retry_count'] > 0
         tr
           th Retry Count
@@ -42,6 +31,21 @@ header
         th Next Retry
         td== relative_time(Time.at(@score))
 
+  h1 Error
+  table class="table table-striped table-bordered"
+    tbody
+      tr
+        th Error Class
+        td
+          code= msg['error_class']
+      tr
+        th Error Message
+        td= msg['error_message']
+      - if !msg['error_backtrace'].nil?
+        tr
+          th Error Backtrace
+          td
+            code== msg['error_backtrace'].join("<br/>")
   form.form-horizontal action="#{root_path}retries/#{@score}" method="post"
     a.btn href="#{root_path}" &larr; Back
     input.btn.btn-primary type="submit" name="retry" value="Retry Now"