Download as
Browse Code »

Commit 6cc31ce6b554e278dbfe2ccc1df4cced5d37c1e1

Authored by AntonioTerceiro
1 parent 82426f9f
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

ActionItem154: adding a optional footer for blocks 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1345 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 14 additions and 1 deletions   Show diff stats
app/helpers/boxes_helper.rb
  Diff comments   View file @6cc31ce
@@ -42,10 +42,11 @@ module BoxesHelper @@ -42,10 +42,11 @@ module BoxesHelper
42 def display_block(block, main_content = nil) 42 def display_block(block, main_content = nil)
43 content = block.main? ? main_content : block.content 43 content = block.main? ? main_content : block.content
44 result = extract_block_content(content) 44 result = extract_block_content(content)
  45 + footer = extract_block_content(footer)
45 46
46 classes = ['block', block.css_class_name ].uniq.join(' ') 47 classes = ['block', block.css_class_name ].uniq.join(' ')
47 48
48 - box_decorator.block_target(block.box, block) + content_tag('div', result + box_decorator.block_edit_buttons(block), :class => classes, :id => "block-#{block.id}") + box_decorator.block_handle(block) 49 + box_decorator.block_target(block.box, block) + content_tag('div', result + footer + box_decorator.block_edit_buttons(block), :class => classes, :id => "block-#{block.id}") + box_decorator.block_handle(block)
49 end 50 end
50 51
51 def extract_block_content(content) 52 def extract_block_content(content)
app/models/block.rb
  Diff comments   View file @6cc31ce
@@ -49,4 +49,12 @@ class Block < ActiveRecord::Base @@ -49,4 +49,12 @@ class Block < ActiveRecord::Base
49 self.class.name.underscore.gsub('_', '-') 49 self.class.name.underscore.gsub('_', '-')
50 end 50 end
51 51
  52 + # A footer to be appended to the end of the block. Returns an empty string.
  53 + #
  54 + # Override in your subclasses. You can return the same types supported by
  55 + # #content.
  56 + def footer
  57 + ''
  58 + end
  59 +
52 end 60 end
test/unit/block_test.rb
  Diff comments   View file @6cc31ce
@@ -28,4 +28,8 @@ class BlockTest < Test::Unit::TestCase @@ -28,4 +28,8 @@ class BlockTest < Test::Unit::TestCase
28 assert_equal 'something-block', block.css_class_name 28 assert_equal 'something-block', block.css_class_name
29 end 29 end
30 30
  31 + should 'provide an empty footer by default' do
  32 + assert_equal '', Block.new.footer
  33 + end
  34 +
31 end 35 end