@@ -3,6 +3,8 @@ class ApplicationController < ActionController::Base include ExceptionNotifiable include AuthenticatedSystem include RoleRequirementSystem + + before_filter :blackbird_override helper :all # include all helpers, all the time protect_from_forgery :secret => 'b0a876313f3f9195e9bd01473bc5cd06' @@ -15,5 +17,11 @@ class ApplicationController < ActionController::Base def record_not_found render :file => File.join(RAILS_ROOT, 'public', '404.html'), :status => 404 end + + def blackbird_override + if 'true' == params[:force_blackbird] + session[:blackbird] = true + end + end end app/controllers/application.rb @@ -26,15 +26,15 @@ module ApplicationHelper end def blackbird_tags - if SiteConfig.blackbird + if SiteConfig.blackbird || true == session[:blackbird] '<script type="text/javascript" charset="utf-8" src="/blackbird/blackbird.js"></script> -<link href="/stylesheets/blackbird/blackbird.css" media="screen" rel="stylesheet" type="text/css" />' +<link href="/blackbird/blackbird.css" media="screen" rel="stylesheet" type="text/css" />' else no_blackbird end rescue no_blackbird end def no_blackbird - "<script type=\"text/javascript\" charset=\"utf-8\">var log = {toggle: function() {}, move: function() {}, resize: function() {}, clear: function() {}, debug: function() {}, info: function() {}, warn: function() {}, error: function() {}, profile: function() {} };</script>" + '<script type="text/javascript" charset="utf-8">var log = {toggle: function() {}, move: function() {}, resize: function() {}, clear: function() {}, debug: function() {}, info: function() {}, warn: function() {}, error: function() {}, profile: function() {} };</script>' end end app/helpers/application_helper.rb 12cf7608a3e77b775a7a9c76c2ef8abce9943b6f Michael Moen michael@underpantsgnome.com http://github.com/UnderpantsGnome/bort/commit/60a0d0cee93f9aa688db5d291345f0e243b6a8ca 60a0d0cee93f9aa688db5d291345f0e243b6a8ca 2008-10-27T18:44:58-07:00 2008-10-27T18:44:58-07:00 add in an override for blackbird e5a3b5db77f6c62ff4e5bfc4ad9e4812b57eee27 Michael Moen michael@underpantsgnome.com