diff --git a/brighter_planet_layout.gemspec b/brighter_planet_layout.gemspec index 98c0a4d..067c248 100644 --- a/brighter_planet_layout.gemspec +++ b/brighter_planet_layout.gemspec @@ -19,6 +19,5 @@ Gem::Specification.new do |s| s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } s.require_paths = ["lib"] - s.add_dependency 'tronprint', '>=1.2.0' s.add_development_dependency 'test-unit' end diff --git a/lib/brighter_planet_layout.rb b/lib/brighter_planet_layout.rb index 80cb072..06e2559 100644 --- a/lib/brighter_planet_layout.rb +++ b/lib/brighter_planet_layout.rb @@ -1,6 +1,5 @@ require 'fileutils' require 'singleton' -#require 'tronprint' require 'brighter_planet_metadata' require 'brighter_planet_layout/version' diff --git a/lib/brighter_planet_layout/rails.rb b/lib/brighter_planet_layout/rails.rb index 4a8ac36..95ca8ed 100644 --- a/lib/brighter_planet_layout/rails.rb +++ b/lib/brighter_planet_layout/rails.rb @@ -1,11 +1,9 @@ if defined? ::Rails and ::Rails::VERSION::MAJOR == 2 require 'brighter_planet_layout' - require 'tronprint/rails/tronprint_helper' require ::BrighterPlanet.layout.helper_file ::Rails.configuration.to_prepare do ::ApplicationController.helper ::BrighterPlanetHelper - ::ApplicationController.helper ::TronprintHelper # sabshere 7/29/10 this makes it impossible to apply selectively # ::ApplicationController.layout 'brighter_planet' # sabshere 7/29/10 the view path appears to be magically appended diff --git a/lib/brighter_planet_layout/railtie.rb b/lib/brighter_planet_layout/railtie.rb index b8fbf54..02c9e3d 100644 --- a/lib/brighter_planet_layout/railtie.rb +++ b/lib/brighter_planet_layout/railtie.rb @@ -19,9 +19,7 @@ class Railtie < ::Rails::Railtie end config.to_prepare do require ::BrighterPlanet.layout.helper_file - require 'tronprint/rails/tronprint_helper' ::ApplicationController.helper ::BrighterPlanetHelper - ::ApplicationController.helper ::TronprintHelper ::ApplicationController.layout 'brighter_planet' end end diff --git a/public/stylesheets/brighter_planet.css b/public/stylesheets/brighter_planet.css index d01ad79..3fe703e 100644 --- a/public/stylesheets/brighter_planet.css +++ b/public/stylesheets/brighter_planet.css @@ -751,9 +751,3 @@ ul.pages li a:hover { -webkit-border-radius: 3px; border-radius: 3px; } - -.tronprint-footprint { - margin-top: 15px !important; - font-size: 12px !important; - color: #555 !important; -} diff --git a/test/dummy/app/controllers/application_controller.rb b/test/dummy/app/controllers/application_controller.rb index cd52383..e8065d9 100644 --- a/test/dummy/app/controllers/application_controller.rb +++ b/test/dummy/app/controllers/application_controller.rb @@ -1,4 +1,3 @@ class ApplicationController < ActionController::Base - helper TronprintHelper protect_from_forgery end