From 7e6ff7d5f9e22336064a95e1e5b6582db9523455 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Tue, 10 May 2011 23:47:39 -0300 Subject: [PATCH] Little fixes --- app/views/layouts/application-ng.rhtml | 2 +- lib/noosfero/plugin.rb | 2 +- test/functional/application_controller_test.rb | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/application-ng.rhtml b/app/views/layouts/application-ng.rhtml index fd446d2..8e16388 100644 --- a/app/views/layouts/application-ng.rhtml +++ b/app/views/layouts/application-ng.rhtml @@ -14,7 +14,7 @@ <%= stylesheet_link_tag theme_stylesheet_path %> <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %> <% @plugins.enabled_plugins.each do |plugin| %> - <% if plugin.stylesheets? %> + <% if plugin.stylesheet? %> <%= stylesheet_tag plugin.class.public_path('style.css'), {} %> <% end %> <% end %> diff --git a/lib/noosfero/plugin.rb b/lib/noosfero/plugin.rb index ec74dc1..ddf1a76 100644 --- a/lib/noosfero/plugin.rb +++ b/lib/noosfero/plugin.rb @@ -64,7 +64,7 @@ class Noosfero::Plugin # -> If true, noosfero will include plugin_dir/public/style.css into # application - def stylesheets? + def stylesheet? false end diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb index 2071eef..a551782 100644 --- a/test/functional/application_controller_test.rb +++ b/test/functional/application_controller_test.rb @@ -443,7 +443,7 @@ class ApplicationControllerTest < Test::Unit::TestCase should 'include stylesheets supplied by plugins' do plugin1 = mock() - plugin1.stubs(:stylesheets?).returns(true) + plugin1.stubs(:stylesheet?).returns(true) plugin1.stubs(:js_files).returns([]) plugin1_class = mock() plugin1_path = '/plugin1/style.css' @@ -451,7 +451,7 @@ class ApplicationControllerTest < Test::Unit::TestCase plugin1.stubs(:class).returns(plugin1_class) plugin2 = mock() - plugin2.stubs(:stylesheets?).returns(true) + plugin2.stubs(:stylesheet?).returns(true) plugin2.stubs(:js_files).returns([]) plugin2_class = mock() plugin2_path = '/plugin2/style.css' @@ -474,7 +474,7 @@ class ApplicationControllerTest < Test::Unit::TestCase should 'include javascripts supplied by plugins' do js1 = 'js1.js' plugin1 = mock() - plugin1.stubs(:stylesheets?).returns(false) + plugin1.stubs(:stylesheet?).returns(false) plugin1.stubs(:js_files).returns([js1]) plugin1_class = mock() plugin1_path = '/plugin1/'+js1 @@ -484,7 +484,7 @@ class ApplicationControllerTest < Test::Unit::TestCase js2 = 'js2.js' js3 = 'js3.js' plugin2 = mock() - plugin2.stubs(:stylesheets?).returns(false) + plugin2.stubs(:stylesheet?).returns(false) plugin2.stubs(:js_files).returns([js2, js3]) plugin2_class = mock() plugin2_path2 = '/plugin2/'+js2 -- libgit2 0.21.2