web/views/busy.erb in sidekiq-3.3.4 vs web/views/busy.erb in sidekiq-3.4.0

- old
+ new

@@ -11,74 +11,78 @@ </form> </div> </div> </div> -<table class="processes table table-hover table-bordered table-striped table-white"> - <thead> - <th><%= t('Name') %></th> - <th><%= t('Started') %></th> - <th><%= t('Threads') %></th> - <th><%= t('Busy') %></th> - <th>&nbsp;</th> - </thead> - <% processes.each do |process| %> - <tr> - <td width="50%"> - <%= "#{process['hostname']}:#{process['pid']}" %> - <span class="label label-success"><%= process.tag %></span> - <% process.labels.each do |label| %> - <span class="label label-info"><%= label %></span> - <% end %> - <br> - <b><%= "#{t('Queues')}: " %></b> - <%= process['queues'] * ", " %> - </td> - <td><%= relative_time(Time.at(process['started_at'])) %></td> - <td><%= process['concurrency'] %></td> - <td><%= process['busy'] %></td> - <td> - <div class="btn-group pull-right"> - <form method="POST"> - <input type="hidden" name="identity" value="<%= process['identity'] %>"/> - <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button> - <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button> - </form> - </div> - </td> - </tr> - <% end %> -</table> +<div class="table_container"> + <table class="processes table table-hover table-bordered table-striped table-white"> + <thead> + <th><%= t('Name') %></th> + <th><%= t('Started') %></th> + <th><%= t('Threads') %></th> + <th><%= t('Busy') %></th> + <th>&nbsp;</th> + </thead> + <% processes.each do |process| %> + <tr> + <td width="50%"> + <%= "#{process['hostname']}:#{process['pid']}" %> + <span class="label label-success"><%= process.tag %></span> + <% process.labels.each do |label| %> + <span class="label label-info"><%= label %></span> + <% end %> + <br> + <b><%= "#{t('Queues')}: " %></b> + <%= process['queues'] * ", " %> + </td> + <td><%= relative_time(Time.at(process['started_at'])) %></td> + <td><%= process['concurrency'] %></td> + <td><%= process['busy'] %></td> + <td> + <div class="btn-group pull-right"> + <form method="POST"> + <input type="hidden" name="identity" value="<%= process['identity'] %>"/> + <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button> + <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button> + </form> + </div> + </td> + </tr> + <% end %> + </table> +</div> <div class="row header"> <div class="col-sm-7"> <h3><%= t('Jobs') %></h3> </div> </div> -<table class="workers table table-hover table-bordered table-striped table-white"> - <thead> - <th><%= t('Process') %></th> - <th><%= t('TID') %></th> - <th><%= t('JID') %></th> - <th><%= t('Queue') %></th> - <th><%= t('Job') %></th> - <th><%= t('Arguments') %></th> - <th><%= t('Started') %></th> - </thead> - <% workers.each do |process, thread, msg| %> - <% job = Sidekiq::Job.new(msg['payload']) %> - <tr> - <td><%= process %></td> - <td><%= thread %></td> - <td><%= job.jid %></td> - <td> - <a href="<%= root_path %>queues/<%= msg['queue'] %>"><%= msg['queue'] %></a> - </td> - <td><%= job.display_class %></td> - <td> - <div class="args"><%= display_args(job.display_args) %></div> - </td> - <td><%= relative_time(Time.at(msg['run_at'])) %></td> - </tr> - <% end %> -</table> +<div class="table_container"> + <table class="workers table table-hover table-bordered table-striped table-white"> + <thead> + <th><%= t('Process') %></th> + <th><%= t('TID') %></th> + <th><%= t('JID') %></th> + <th><%= t('Queue') %></th> + <th><%= t('Job') %></th> + <th><%= t('Arguments') %></th> + <th><%= t('Started') %></th> + </thead> + <% workers.each do |process, thread, msg| %> + <% job = Sidekiq::Job.new(msg['payload']) %> + <tr> + <td><%= process %></td> + <td><%= thread %></td> + <td><%= job.jid %></td> + <td> + <a href="<%= root_path %>queues/<%= msg['queue'] %>"><%= msg['queue'] %></a> + </td> + <td><%= job.display_class %></td> + <td> + <div class="args"><%= display_args(job.display_args) %></div> + </td> + <td><%= relative_time(Time.at(msg['run_at'])) %></td> + </tr> + <% end %> + </table> +</div>