Download as
Browse Code »

Commit 7e6ff7d5f9e22336064a95e1e5b6582db9523455

Authored by Rodrigo Souto
Committed by Daniela Feitosa
1 parent 67eaa01a
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Little fixes

Showing 3 changed files with 6 additions and 6 deletions   Show diff stats
app/views/layouts/application-ng.rhtml
  Diff comments   View file @7e6ff7d
... ... @@ -14,7 +14,7 @@
14 14 <%= stylesheet_link_tag theme_stylesheet_path %>
15 15 <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
16 16 <% @plugins.enabled_plugins.each do |plugin| %>
17   - <% if plugin.stylesheets? %>
  17 + <% if plugin.stylesheet? %>
18 18 <%= stylesheet_tag plugin.class.public_path('style.css'), {} %>
19 19 <% end %>
20 20 <% end %>
... ...
lib/noosfero/plugin.rb
  Diff comments   View file @7e6ff7d
... ... @@ -64,7 +64,7 @@ class Noosfero::Plugin
64 64  
65 65 # -> If true, noosfero will include plugin_dir/public/style.css into
66 66 # application
67   - def stylesheets?
  67 + def stylesheet?
68 68 false
69 69 end
70 70  
... ...
test/functional/application_controller_test.rb
  Diff comments   View file @7e6ff7d
... ... @@ -443,7 +443,7 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
443 443  
444 444 should 'include stylesheets supplied by plugins' do
445 445 plugin1 = mock()
446   - plugin1.stubs(:stylesheets?).returns(true)
  446 + plugin1.stubs(:stylesheet?).returns(true)
447 447 plugin1.stubs(:js_files).returns([])
448 448 plugin1_class = mock()
449 449 plugin1_path = '/plugin1/style.css'
... ... @@ -451,7 +451,7 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
451 451 plugin1.stubs(:class).returns(plugin1_class)
452 452  
453 453 plugin2 = mock()
454   - plugin2.stubs(:stylesheets?).returns(true)
  454 + plugin2.stubs(:stylesheet?).returns(true)
455 455 plugin2.stubs(:js_files).returns([])
456 456 plugin2_class = mock()
457 457 plugin2_path = '/plugin2/style.css'
... ... @@ -474,7 +474,7 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
474 474 should 'include javascripts supplied by plugins' do
475 475 js1 = 'js1.js'
476 476 plugin1 = mock()
477   - plugin1.stubs(:stylesheets?).returns(false)
  477 + plugin1.stubs(:stylesheet?).returns(false)
478 478 plugin1.stubs(:js_files).returns([js1])
479 479 plugin1_class = mock()
480 480 plugin1_path = '/plugin1/'+js1
... ... @@ -484,7 +484,7 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
484 484 js2 = 'js2.js'
485 485 js3 = 'js3.js'
486 486 plugin2 = mock()
487   - plugin2.stubs(:stylesheets?).returns(false)
  487 + plugin2.stubs(:stylesheet?).returns(false)
488 488 plugin2.stubs(:js_files).returns([js2, js3])
489 489 plugin2_class = mock()
490 490 plugin2_path2 = '/plugin2/'+js2
... ...