sidekiq 2.13.0 → 2.13.1

data/web/views/index.slim

@@ -3,7 +3,7 @@
     h3 = t('Workers')
 
 == slim :_workers
-- if workers.size > 0
+- if workers_size > 0
   .row
     .span2.pull-right
       form action="#{root_path}reset" method="post"

data/web/views/layout.slim

@@ -6,6 +6,7 @@ html
     link href='#{{root_path}}stylesheets/bootstrap.css' media='screen' rel='stylesheet' type='text/css'
     link href='#{{root_path}}stylesheets/application.css' media='screen' rel='stylesheet' type='text/css'
     script type="text/javascript" src="#{{root_path}}javascripts/application.js"
+    script type="text/javascript" src="#{{root_path}}javascripts/locales/jquery.timeago.#{locale}.js"
 
   - if params[:poll]
     javascript:
@@ -14,35 +15,36 @@ html
   body.admin
     .navbar.navbar-fixed-top
       ==slim :_nav
-    .navbar.navbar-fixed-bottom.navbar-inverse
-      .navbar-inner
-        .container
-          ul.nav
-            li
-              p.navbar-text style="color:white;" Sidekiq v#{Sidekiq::VERSION}
-            li
-              p.navbar-text Redis: #{location}
-            li
-              p.navbar-text #{t('Time')}: #{Time.now.utc.strftime('%H:%M:%S UTC')}
-            - if namespace
-              li
-                p.navbar-text #{t('Namespace')}: #{namespace}
 
     #page
       .container
         .row
-          .span2.summary_bar
-            h4
-              span.title = t('Status')
-              == slim :_status
-            == slim :_summary
-            - unless current_path == ''
-              .row
-                .span2
+          .span12.summary_bar
+            .row
+              h4.span10
+                span.title = t('Status')
+                == slim :_status
+              - unless current_path == ''
+                .span2.pull-right.actions
                   - if params[:poll]
                     a#live-poll.btn.btn-block.btn-primary.active href='#{{root_path}}#{{current_path}}' = t('StopPolling')
                   - else
                     a#live-poll.btn.btn-block.btn-primary href='#{{root_path}}#{{current_path}}?poll=true' = t('LivePoll')
+            == slim :_summary
 
-          .span10
+          .span12
             == yield
+
+  .navbar.navbar-fixed-bottom.navbar-inverse
+    .navbar-inner
+      .container
+        ul.nav
+          li
+            p.navbar-text style="color:white;" Sidekiq v#{Sidekiq::VERSION}
+          li
+            p.navbar-text Redis: #{location}
+          li
+            p.navbar-text #{t('Time')}: #{Time.now.utc.strftime('%H:%M:%S UTC')}
+          - if namespace
+            li
+              p.navbar-text #{t('Namespace')}: #{namespace}

data/web/views/queue.slim

@@ -2,7 +2,7 @@ header.row
   .span5
     h3
       == t('CurrentMessagesInQueue', :queue => @name)
-  .span4
+  .span4.pull-right
     == slim :_paging, :locals => { :url => "#{root_path}queues/#{@name}" }
 
 table class="queue table table-hover table-bordered table-striped"

data/web/views/retries.slim

@@ -27,7 +27,8 @@ header.row
           td
             a href="#{root_path}queues/#{msg['queue']}" #{msg['queue']}
           td= msg['class']
-          td= display_args(msg['args'])
+          td
+            div.args=display_args(msg['args'])
     input.btn.btn-primary.btn-small.pull-left type="submit" name="retry" value="#{t('RetryNow')}"
     input.btn.btn-danger.btn-small.pull-left type="submit" name="delete" value="#{t('Delete')}"
 

data/web/views/retry.slim

@@ -1,47 +1,4 @@
-header
-  h3 = t('Job')
-
-table class="retry table table-bordered table-striped"
-  tbody
-    tr
-      th = t('Queue')
-      td
-        a href="#{root_path}queues/#{@retry['queue']}" #{@retry['queue']}
-    tr
-      th = t('Class')
-      td
-        code= @retry['class']
-    tr
-      th = t('Arguments')
-      td
-        code= display_args(@retry['args'], 1000)
-    tr
-      th JID
-      td
-        code= @retry.jid
-    tr
-      th = t('Enqueued')
-      td== relative_time(@retry.enqueued_at)
-    - unless retry_extra_items(@retry).empty?
-      tr
-        th = t('Extras')
-        td
-          code
-            = retry_extra_items(@retry).inspect
-    - if @retry['retry_count'] > 0
-      tr
-        th = t('RetryCount')
-        td= @retry['retry_count']
-      tr
-        th = t('LastRetry')
-        td== relative_time(@retry['retried_at'].is_a?(Numeric) ? Time.at(@retry['retried_at']) : Time.parse(@retry['retried_at']))
-    - else
-      tr
-        th = t('OriginallyFailed')
-        td== relative_time(@retry['failed_at'].is_a?(Numeric) ? Time.at(@retry['failed_at']) : Time.parse(@retry['failed_at']))
-    tr
-      th = t('NextRetry')
-      td== relative_time(@retry.at)
+== slim :_job_info, :locals => {:job => @retry, :type => :retry}
 
 h3 = t('Error')
 table class="error table table-bordered table-striped"

data/web/views/scheduled.slim

@@ -20,11 +20,13 @@ header.row
         tr
           td
             input type='checkbox' name='key[]' value='#{job_params(msg, score)}'
-          td== relative_time(Time.at(score))
+          td
+             a href="#{root_path}scheduled/#{job_params(msg, score)}"== relative_time(Time.at(score))
           td
             a href="#{root_path}queues/#{msg['queue']}" #{msg['queue']}
           td= msg['class']
-          td= display_args(msg['args'])
+          td
+             div.args=display_args(msg['args'])
     input.btn.btn-danger.pull-right type="submit" name="delete" value="#{t('Delete')}"
     input.btn.btn-danger.pull-right type="submit" name="add_to_queue" value="#{t('AddToQueue')}"
 - else

data/web/views/scheduled_job_info.slim

@@ -0,0 +1,6 @@
+== slim :_job_info, :locals => {:job => @job, :type => :scheduled}
+
+form.form-horizontal action="#{root_path}scheduled/#{job_params(@job, @job.score)}" method="post"
+  a.btn href="#{root_path}scheduled" = t('GoBack')
+  input.btn.btn-primary type="submit" name="add_to_queue" value="#{t('AddToQueue')}"
+  input.btn.btn-danger type="submit" name="delete" value="#{t('Delete')}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.13.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -216,6 +216,7 @@ files:
 - .travis.yml
 - COMM-LICENSE
 - Changes.md
+- Contributing.md
 - Gemfile
 - LICENSE
 - Pro-Changes.md
@@ -288,6 +289,51 @@ files:
 - web/assets/images/status/idle.png
 - web/assets/javascripts/application.js
 - web/assets/javascripts/dashboard.js
+- web/assets/javascripts/locales/README.md
+- web/assets/javascripts/locales/jquery.timeago.ar.js
+- web/assets/javascripts/locales/jquery.timeago.bg.js
+- web/assets/javascripts/locales/jquery.timeago.bs.js
+- web/assets/javascripts/locales/jquery.timeago.ca.js
+- web/assets/javascripts/locales/jquery.timeago.cy.js
+- web/assets/javascripts/locales/jquery.timeago.cz.js
+- web/assets/javascripts/locales/jquery.timeago.da.js
+- web/assets/javascripts/locales/jquery.timeago.de.js
+- web/assets/javascripts/locales/jquery.timeago.el.js
+- web/assets/javascripts/locales/jquery.timeago.en-short.js
+- web/assets/javascripts/locales/jquery.timeago.en.js
+- web/assets/javascripts/locales/jquery.timeago.es.js
+- web/assets/javascripts/locales/jquery.timeago.et.js
+- web/assets/javascripts/locales/jquery.timeago.fa.js
+- web/assets/javascripts/locales/jquery.timeago.fi.js
+- web/assets/javascripts/locales/jquery.timeago.fr-short.js
+- web/assets/javascripts/locales/jquery.timeago.fr.js
+- web/assets/javascripts/locales/jquery.timeago.he.js
+- web/assets/javascripts/locales/jquery.timeago.hr.js
+- web/assets/javascripts/locales/jquery.timeago.hu.js
+- web/assets/javascripts/locales/jquery.timeago.hy.js
+- web/assets/javascripts/locales/jquery.timeago.id.js
+- web/assets/javascripts/locales/jquery.timeago.it.js
+- web/assets/javascripts/locales/jquery.timeago.ja.js
+- web/assets/javascripts/locales/jquery.timeago.ko.js
+- web/assets/javascripts/locales/jquery.timeago.lt.js
+- web/assets/javascripts/locales/jquery.timeago.mk.js
+- web/assets/javascripts/locales/jquery.timeago.nl.js
+- web/assets/javascripts/locales/jquery.timeago.no.js
+- web/assets/javascripts/locales/jquery.timeago.pl.js
+- web/assets/javascripts/locales/jquery.timeago.pt-br.js
+- web/assets/javascripts/locales/jquery.timeago.pt.js
+- web/assets/javascripts/locales/jquery.timeago.ro.js
+- web/assets/javascripts/locales/jquery.timeago.rs.js
+- web/assets/javascripts/locales/jquery.timeago.ru.js
+- web/assets/javascripts/locales/jquery.timeago.sk.js
+- web/assets/javascripts/locales/jquery.timeago.sl.js
+- web/assets/javascripts/locales/jquery.timeago.sv.js
+- web/assets/javascripts/locales/jquery.timeago.th.js
+- web/assets/javascripts/locales/jquery.timeago.tr.js
+- web/assets/javascripts/locales/jquery.timeago.uk.js
+- web/assets/javascripts/locales/jquery.timeago.uz.js
+- web/assets/javascripts/locales/jquery.timeago.zh-CN.js
+- web/assets/javascripts/locales/jquery.timeago.zh-TW.js
 - web/assets/stylesheets/application.css
 - web/assets/stylesheets/bootstrap.css
 - web/locales/da.yml
@@ -304,6 +350,7 @@ files:
 - web/locales/pt-br.yml
 - web/locales/pt.yml
 - web/locales/ru.yml
+- web/views/_job_info.slim
 - web/views/_nav.slim
 - web/views/_paging.slim
 - web/views/_status.slim
@@ -317,6 +364,7 @@ files:
 - web/views/retries.slim
 - web/views/retry.slim
 - web/views/scheduled.slim
+- web/views/scheduled_job_info.slim
 homepage: http://sidekiq.org
 licenses:
 - LGPL-3.0