diff --git a/app/models/article_block.rb b/app/models/article_block.rb index ef7d27d..135738d 100644 --- a/app/models/article_block.rb +++ b/app/models/article_block.rb @@ -4,7 +4,7 @@ class ArticleBlock < Block _('Display one of your contents.') end - def content(main = nil) + def content article ? article.to_html : _('Article not selected yet.') end diff --git a/app/models/block.rb b/app/models/block.rb index ab750bb..1b9e91e 100644 --- a/app/models/block.rb +++ b/app/models/block.rb @@ -26,7 +26,7 @@ class Block < ActiveRecord::Base _('A dummy block.') end - def content(main_content = nil) + def content "This is block number %d" % self.id end diff --git a/app/models/main_block.rb b/app/models/main_block.rb index c73d546..0d1a8a5 100644 --- a/app/models/main_block.rb +++ b/app/models/main_block.rb @@ -4,7 +4,7 @@ class MainBlock < Block _('Block for main content (i.e. your articles, photos, etc)') end - def content(main_content = nil) + def content main_content end diff --git a/app/models/tags_block.rb b/app/models/tags_block.rb index 8927ce9..d22b22c 100644 --- a/app/models/tags_block.rb +++ b/app/models/tags_block.rb @@ -7,7 +7,7 @@ class TagsBlock < Block _('List count of contents by tag') end - def content(main_content = nil) + def content content_tag('h3', _('Tags'), :class => 'block-title') + tag_cloud(owner.tags, :id, owner.generate_url(:controller => 'profile', :action => 'tag') + '/', :max_size => 20, :min_size => 10) end -- libgit2 0.21.2