Merge pull request #121 from kiela/master

Fix paginating

Author: quirkey

lib/resque/server/views/status.erb

@@ -1,18 +1,20 @@
 <%= status_view :status_styles, :layout => false %>
 
-<h1 class='wi'>Statuses: <%= @status.uuid %>/<%= @status.name %></h1>
+<h1 class='wi'>Status <%= @status.uuid %></h1>
 <p class='intro'>Viewing a specific job created with Resque::Plugins::Status. <a href="<%= u(:statuses) %>">Return to the list of statuses</a></p>
 
 <div class="status-holder" rel="<%= @status.status %>" id="status_<%= @status.uuid %>">
+  <h2>Overview</h2>
   <div class="status-progress">
     <div class="status-progress-bar status-<%= @status.status %>" style="width: <%= @status.pct_complete %>%;"></div>
     <p><%= @status.pct_complete %>%</p>
   </div>
   <div class="status-message"><%= @status.message %></div>
   <div class="status-time"><%= @status.time? ? @status.time : 'Not started' %></div>
+
   <h2>Details</h2>
   <div class="status-details">
-    <table>
+    <table class="vertically-top">
       <thead>
         <tr>
           <th>Key</th>
@@ -81,7 +83,7 @@
         time.setTime(value * 1000);
         return time.toUTCString();
       } else {
-        return JSON.stringify(value);
+        return JSON.stringify(value, null, " ");
       }
     }
 

lib/resque/server/views/status_styles.erb

@@ -26,6 +26,12 @@
     z-index: 10;
     color: #333;
   }
+  table.vertically-top td {
+    vertical-align: text-top;
+  }
+  table.vertically-top tr {
+    border: 1px solid #ccc;
+  }
 
   .status-holder {
     background: #F7F7F7;

lib/resque/server/views/statuses.erb

@@ -1,19 +1,21 @@
 <%= status_view :status_styles, :layout => false %>
 
 <h1 class='wi'>Statuses</h1>
+
 <%unless @statuses.empty?%>
-<form method="POST" action="<%= u(:statuses) %>/clear" class='clear-failed'>
-  <input type='submit' name='' value='Clear Statuses' onclick='return confirm("Are you absolutely sure? This cannot be undone.");' />
-</form>
-<form method="POST" action="<%= u(:statuses) %>/clear/completed" class='clear-failed'>
-  <input type='submit' name='' value='Clear Completed Statuses' onclick='return confirm("Are you absolutely sure? This cannot be undone.");' />
-</form>
-<form method="POST" action="<%= u(:statuses) %>/clear/failed" class='clear-failed'>
-  <input type='submit' name='' value='Clear Failed Statuses' onclick='return confirm("Are you absolutely sure? This cannot be undone.");' />
-</form>
+  <form method="POST" action="<%= u(:statuses) %>/clear" class='clear-failed'>
+    <input type='submit' name='' value='Clear Statuses' onclick='return confirm("Are you absolutely sure? This cannot be undone.");' />
+  </form>
+  <form method="POST" action="<%= u(:statuses) %>/clear/completed" class='clear-failed'>
+    <input type='submit' name='' value='Clear Completed Statuses' onclick='return confirm("Are you absolutely sure? This cannot be undone.");' />
+  </form>
+  <form method="POST" action="<%= u(:statuses) %>/clear/failed" class='clear-failed'>
+    <input type='submit' name='' value='Clear Failed Statuses' onclick='return confirm("Are you absolutely sure? This cannot be undone.");' />
+  </form>
 <%end%>
+
 <p class='intro'>These are recent jobs created with the Resque::Plugins::Status class</p>
-<table>
+<table class="vertically-top">
   <tr>
     <th>ID</th>
     <th>Name</th>
@@ -46,7 +48,7 @@
 </table>
 
 <% unless @statuses.empty? %>
-  <%= partial :next_more, :start => @start, :size => @size %>
+  <%= partial :next_more, :start => @start, :size => @size, :per_page => per_page %>
 <% end %>
 
 <%= status_poll(@start) %>

lib/resque/status_server.rb

@@ -5,14 +5,15 @@ module Resque
   module StatusServer
 
     VIEW_PATH = File.join(File.dirname(__FILE__), 'server', 'views')
+    PER_PAGE = 50
 
     def self.registered(app)
 
       app.get '/statuses' do
         @start = params[:start].to_i
-        @end = @start + (params[:per_page] || 50)
+        @end = @start + (params[:per_page] || per_page) - 1
         @statuses = Resque::Plugins::Status::Hash.statuses(@start, @end)
-        @size = @statuses.size
+        @size = Resque::Plugins::Status::Hash.count
         status_view(:statuses)
       end
 
@@ -52,14 +53,17 @@ def self.registered(app)
         @polling = true
 
         @start = params[:start].to_i
-        @end = @start + (params[:per_page] || 50)
+        @end = @start + (params[:per_page] || per_page) - 1
         @statuses = Resque::Plugins::Status::Hash.statuses(@start, @end)
-        @size = @statuses.size
-
+        @size = Resque::Plugins::Status::Hash.count
         status_view(:statuses, {:layout => false})
       end
 
       app.helpers do
+        def per_page
+          PER_PAGE
+        end
+
         def status_view(filename, options = {}, locals = {})
           erb(File.read(File.join(::Resque::StatusServer::VIEW_PATH, "#{filename}.erb")), options, locals)
         end