From 20e51f12763f56600ae717f521919843da58ca70 Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Mon, 5 Mar 2012 19:27:27 -0800 Subject: [PATCH] Move all web stuff into /web, fix trailing slash issue. --- lib/sidekiq/web.rb | 8 ++++++-- .../images/bootstrap/glyphicons-halflings-white.png | Bin .../images/bootstrap/glyphicons-halflings.png | Bin {assets => web/assets}/javascripts/application.js | 0 .../assets}/javascripts/vendor/bootstrap.js | 0 .../javascripts/vendor/bootstrap/bootstrap-alert.js | 0 .../vendor/bootstrap/bootstrap-button.js | 0 .../vendor/bootstrap/bootstrap-carousel.js | 0 .../vendor/bootstrap/bootstrap-collapse.js | 0 .../vendor/bootstrap/bootstrap-dropdown.js | 0 .../javascripts/vendor/bootstrap/bootstrap-modal.js | 0 .../vendor/bootstrap/bootstrap-popover.js | 0 .../vendor/bootstrap/bootstrap-scrollspy.js | 0 .../javascripts/vendor/bootstrap/bootstrap-tab.js | 0 .../vendor/bootstrap/bootstrap-tooltip.js | 0 .../vendor/bootstrap/bootstrap-transition.js | 0 .../vendor/bootstrap/bootstrap-typeahead.js | 0 {assets => web/assets}/javascripts/vendor/jquery.js | 0 {assets => web/assets}/stylesheets/application.css | 0 .../stylesheets/vendor/bootstrap-responsive.css | 0 .../assets}/stylesheets/vendor/bootstrap.css | 0 {views => web/views}/index.slim | 0 {views => web/views}/layout.slim | 0 23 files changed, 6 insertions(+), 2 deletions(-) rename {assets => web/assets}/images/bootstrap/glyphicons-halflings-white.png (100%) rename {assets => web/assets}/images/bootstrap/glyphicons-halflings.png (100%) rename {assets => web/assets}/javascripts/application.js (100%) rename {assets => web/assets}/javascripts/vendor/bootstrap.js (100%) rename {assets => web/assets}/javascripts/vendor/bootstrap/bootstrap-alert.js (100%) rename {assets => web/assets}/javascripts/vendor/bootstrap/bootstrap-button.js (100%) rename {assets => web/assets}/javascripts/vendor/bootstrap/bootstrap-carousel.js (100%) rename {assets => web/assets}/javascripts/vendor/bootstrap/bootstrap-collapse.js (100%) rename {assets => web/assets}/javascripts/vendor/bootstrap/bootstrap-dropdown.js (100%) rename {assets => web/assets}/javascripts/vendor/bootstrap/bootstrap-modal.js (100%) rename {assets => web/assets}/javascripts/vendor/bootstrap/bootstrap-popover.js (100%) rename {assets => web/assets}/javascripts/vendor/bootstrap/bootstrap-scrollspy.js (100%) rename {assets => web/assets}/javascripts/vendor/bootstrap/bootstrap-tab.js (100%) rename {assets => web/assets}/javascripts/vendor/bootstrap/bootstrap-tooltip.js (100%) rename {assets => web/assets}/javascripts/vendor/bootstrap/bootstrap-transition.js (100%) rename {assets => web/assets}/javascripts/vendor/bootstrap/bootstrap-typeahead.js (100%) rename {assets => web/assets}/javascripts/vendor/jquery.js (100%) rename {assets => web/assets}/stylesheets/application.css (100%) rename {assets => web/assets}/stylesheets/vendor/bootstrap-responsive.css (100%) rename {assets => web/assets}/stylesheets/vendor/bootstrap.css (100%) rename {views => web/views}/index.slim (100%) rename {views => web/views}/layout.slim (100%) diff --git a/lib/sidekiq/web.rb b/lib/sidekiq/web.rb index 56a5f182..16f9a017 100644 --- a/lib/sidekiq/web.rb +++ b/lib/sidekiq/web.rb @@ -18,6 +18,10 @@ module Sidekiq end def call(env) + # Solve the problem of people requesting /sidekiq when they need to request /sidekiq/ so + # that relative links in templates resolve correctly. + return [301, { 'Location' => "#{env['SCRIPT_NAME']}/" }, []] if env['SCRIPT_NAME'] == env['REQUEST_PATH'] + return @app.call(env) unless @matcher =~ env["PATH_INFO"] env['PATH_INFO'].sub!(@matcher,'') @environment.call(env) @@ -25,10 +29,10 @@ module Sidekiq end class Web < Sinatra::Base - dir = File.expand_path(File.dirname(__FILE__) + "/../..") + dir = File.expand_path(File.dirname(__FILE__) + "/../../web") set :views, "#{dir}/views" set :root, "#{dir}/public" - use SprocketsMiddleware, :root => dir, :path => 'assets' + use SprocketsMiddleware, :root => dir get "/" do slim :index diff --git a/assets/images/bootstrap/glyphicons-halflings-white.png b/web/assets/images/bootstrap/glyphicons-halflings-white.png similarity index 100% rename from assets/images/bootstrap/glyphicons-halflings-white.png rename to web/assets/images/bootstrap/glyphicons-halflings-white.png diff --git a/assets/images/bootstrap/glyphicons-halflings.png b/web/assets/images/bootstrap/glyphicons-halflings.png similarity index 100% rename from assets/images/bootstrap/glyphicons-halflings.png rename to web/assets/images/bootstrap/glyphicons-halflings.png diff --git a/assets/javascripts/application.js b/web/assets/javascripts/application.js similarity index 100% rename from assets/javascripts/application.js rename to web/assets/javascripts/application.js diff --git a/assets/javascripts/vendor/bootstrap.js b/web/assets/javascripts/vendor/bootstrap.js similarity index 100% rename from assets/javascripts/vendor/bootstrap.js rename to web/assets/javascripts/vendor/bootstrap.js diff --git a/assets/javascripts/vendor/bootstrap/bootstrap-alert.js b/web/assets/javascripts/vendor/bootstrap/bootstrap-alert.js similarity index 100% rename from assets/javascripts/vendor/bootstrap/bootstrap-alert.js rename to web/assets/javascripts/vendor/bootstrap/bootstrap-alert.js diff --git a/assets/javascripts/vendor/bootstrap/bootstrap-button.js b/web/assets/javascripts/vendor/bootstrap/bootstrap-button.js similarity index 100% rename from assets/javascripts/vendor/bootstrap/bootstrap-button.js rename to web/assets/javascripts/vendor/bootstrap/bootstrap-button.js diff --git a/assets/javascripts/vendor/bootstrap/bootstrap-carousel.js b/web/assets/javascripts/vendor/bootstrap/bootstrap-carousel.js similarity index 100% rename from assets/javascripts/vendor/bootstrap/bootstrap-carousel.js rename to web/assets/javascripts/vendor/bootstrap/bootstrap-carousel.js diff --git a/assets/javascripts/vendor/bootstrap/bootstrap-collapse.js b/web/assets/javascripts/vendor/bootstrap/bootstrap-collapse.js similarity index 100% rename from assets/javascripts/vendor/bootstrap/bootstrap-collapse.js rename to web/assets/javascripts/vendor/bootstrap/bootstrap-collapse.js diff --git a/assets/javascripts/vendor/bootstrap/bootstrap-dropdown.js b/web/assets/javascripts/vendor/bootstrap/bootstrap-dropdown.js similarity index 100% rename from assets/javascripts/vendor/bootstrap/bootstrap-dropdown.js rename to web/assets/javascripts/vendor/bootstrap/bootstrap-dropdown.js diff --git a/assets/javascripts/vendor/bootstrap/bootstrap-modal.js b/web/assets/javascripts/vendor/bootstrap/bootstrap-modal.js similarity index 100% rename from assets/javascripts/vendor/bootstrap/bootstrap-modal.js rename to web/assets/javascripts/vendor/bootstrap/bootstrap-modal.js diff --git a/assets/javascripts/vendor/bootstrap/bootstrap-popover.js b/web/assets/javascripts/vendor/bootstrap/bootstrap-popover.js similarity index 100% rename from assets/javascripts/vendor/bootstrap/bootstrap-popover.js rename to web/assets/javascripts/vendor/bootstrap/bootstrap-popover.js diff --git a/assets/javascripts/vendor/bootstrap/bootstrap-scrollspy.js b/web/assets/javascripts/vendor/bootstrap/bootstrap-scrollspy.js similarity index 100% rename from assets/javascripts/vendor/bootstrap/bootstrap-scrollspy.js rename to web/assets/javascripts/vendor/bootstrap/bootstrap-scrollspy.js diff --git a/assets/javascripts/vendor/bootstrap/bootstrap-tab.js b/web/assets/javascripts/vendor/bootstrap/bootstrap-tab.js similarity index 100% rename from assets/javascripts/vendor/bootstrap/bootstrap-tab.js rename to web/assets/javascripts/vendor/bootstrap/bootstrap-tab.js diff --git a/assets/javascripts/vendor/bootstrap/bootstrap-tooltip.js b/web/assets/javascripts/vendor/bootstrap/bootstrap-tooltip.js similarity index 100% rename from assets/javascripts/vendor/bootstrap/bootstrap-tooltip.js rename to web/assets/javascripts/vendor/bootstrap/bootstrap-tooltip.js diff --git a/assets/javascripts/vendor/bootstrap/bootstrap-transition.js b/web/assets/javascripts/vendor/bootstrap/bootstrap-transition.js similarity index 100% rename from assets/javascripts/vendor/bootstrap/bootstrap-transition.js rename to web/assets/javascripts/vendor/bootstrap/bootstrap-transition.js diff --git a/assets/javascripts/vendor/bootstrap/bootstrap-typeahead.js b/web/assets/javascripts/vendor/bootstrap/bootstrap-typeahead.js similarity index 100% rename from assets/javascripts/vendor/bootstrap/bootstrap-typeahead.js rename to web/assets/javascripts/vendor/bootstrap/bootstrap-typeahead.js diff --git a/assets/javascripts/vendor/jquery.js b/web/assets/javascripts/vendor/jquery.js similarity index 100% rename from assets/javascripts/vendor/jquery.js rename to web/assets/javascripts/vendor/jquery.js diff --git a/assets/stylesheets/application.css b/web/assets/stylesheets/application.css similarity index 100% rename from assets/stylesheets/application.css rename to web/assets/stylesheets/application.css diff --git a/assets/stylesheets/vendor/bootstrap-responsive.css b/web/assets/stylesheets/vendor/bootstrap-responsive.css similarity index 100% rename from assets/stylesheets/vendor/bootstrap-responsive.css rename to web/assets/stylesheets/vendor/bootstrap-responsive.css diff --git a/assets/stylesheets/vendor/bootstrap.css b/web/assets/stylesheets/vendor/bootstrap.css similarity index 100% rename from assets/stylesheets/vendor/bootstrap.css rename to web/assets/stylesheets/vendor/bootstrap.css diff --git a/views/index.slim b/web/views/index.slim similarity index 100% rename from views/index.slim rename to web/views/index.slim diff --git a/views/layout.slim b/web/views/layout.slim similarity index 100% rename from views/layout.slim rename to web/views/layout.slim