From d3716f271d7e54e845a78044b357b3a2c42f5363 Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Sun, 28 Jul 2013 15:02:43 -0700 Subject: [PATCH] Rejigger web paths, float this thing right --- lib/sidekiq/web.rb | 10 ++++------ web/views/queue.slim | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/sidekiq/web.rb b/lib/sidekiq/web.rb index 186f6345..2da22576 100644 --- a/lib/sidekiq/web.rb +++ b/lib/sidekiq/web.rb @@ -12,12 +12,10 @@ module Sidekiq class Web < Sinatra::Base include Sidekiq::Paginator - dir = File.expand_path(File.dirname(__FILE__) + "/../../web") - - set :public_folder, "#{dir}/assets" - set :views, "#{dir}/views" - set :root, "#{dir}/public" - set :locales, "#{dir}/locales" + set :root, File.expand_path(File.dirname(__FILE__) + "/../../web") + set :public_folder, Proc.new { "#{root}/assets" } + set :views, Proc.new { "#{root}/views" } + set :locales, Proc.new { "#{root}/locales" } set :slim, :pretty => true helpers do diff --git a/web/views/queue.slim b/web/views/queue.slim index 715c21ec..57ebb1bb 100644 --- a/web/views/queue.slim +++ b/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"