Merge remote-tracking branch 'origin/master'

Weblate
2 parents 95cb82f9 e568ca79
Showing 92 changed files with 910 additions and 794 deletions Show diff stats
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/boxes_helper.rb
app/helpers/buttons_helper.rb
app/models/article_block.rb
app/models/blog.rb
app/models/blog_archives_block.rb
app/models/categories_block.rb
app/models/communities_block.rb
app/models/disabled_enterprise_message_block.rb
app/models/enterprises_block.rb
app/models/fans_block.rb
app/models/favorite_enterprises_block.rb
app/models/featured_products_block.rb
app/models/feed_reader_block.rb
app/models/highlights_block.rb
app/models/link_list_block.rb
app/models/location_block.rb
app/models/login_block.rb
app/models/main_block.rb
@@ -48,6 +48,8 @@ module ApplicationHelper
   include PluginsHelper
+  include ButtonsHelper
+
   def locale
     (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   end
@@ -209,52 +211,6 @@ module ApplicationHelper
     result
   end
-  def button(type, label, url, html_options = {})
-    html_options ||= {}
-    the_class = 'with-text'
-    if html_options.has_key?(:class)
-      the_class << ' ' << html_options[:class]
-    end
-    button_without_text type, label, url, html_options.merge(:class => the_class)
-  end
-
-  def button_without_text(type, label, url, html_options = {})
-    the_class = "button icon-#{type}"
-    if html_options.has_key?(:class)
-      the_class << ' ' << html_options[:class]
-    end
-    the_title = html_options[:title] || label
-    if html_options[:disabled]
-      content_tag('a', '&nbsp;'+content_tag('span', label), html_options.merge(:class => the_class, :title => the_title))
-    else
-      link_to('&nbsp;'+content_tag('span', label), url, html_options.merge(:class => the_class, :title => the_title))
-    end
-  end
-
-  def button_to_function(type, label, js_code, html_options = {}, &block)
-    html_options[:class] = "button with-text" unless html_options[:class]
-    html_options[:class] << " icon-#{type}"
-    link_to_function(label, js_code, html_options, &block)
-  end
-
-  def button_to_function_without_text(type, label, js_code, html_options = {}, &block)
-    html_options[:class] = "" unless html_options[:class]
-    html_options[:class] << " button icon-#{type}"
-    link_to_function(content_tag('span', label), js_code, html_options, &block)
-  end
-
-  def button_to_remote(type, label, options, html_options = {})
-    html_options[:class] = "button with-text" unless html_options[:class]
-    html_options[:class] << " icon-#{type}"
-    link_to_remote(label, options, html_options)
-  end
-
-  def button_to_remote_without_text(type, label, options, html_options = {})
-    html_options[:class] = "" unless html_options[:class]
-    html_options[:class] << " button icon-#{type}"
-    link_to_remote(content_tag('span', label), options, html_options.merge(:title => label))
-  end
-
   def icon(icon_name, html_options = {})
     the_class = "button #{icon_name}"
     if html_options.has_key?(:class)
@@ -934,13 +890,6 @@ module ApplicationHelper
     content_for(:head) { stylesheet_link_tag(*args) }
   end
-  def article_to_html(article, options = {})
-    options.merge!(:page => params[:npage])
-    content = article.to_html(options)
-    content = content.kind_of?(Proc) ? self.instance_exec(&content).html_safe : content.html_safe
-    filter_html(content, article)
-  end
-
   # Please, use link_to by default!
   # This method was created to work around to inexplicable
   # chain of problems when display_short_format was called
@@ -1365,16 +1314,6 @@ module ApplicationHelper
     @no_design_blocks = true
   end
-  def filter_html(html, source)
-    if @plugins && source && source.has_macro?
-      html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
-      #TODO This parse should be done through the macro infra, but since there
-      #     are old things that do not support it we are keeping this hot spot.
-      html = @plugins.pipeline(:parse_content, html, source).first
-    end
-    html && html.html_safe
-  end
-
   def convert_macro(html, source)
     doc = Nokogiri::HTML.fragment html
     #TODO This way is more efficient but do not support macro inside of
@@ -181,4 +181,21 @@ module ArticleHelper
     end
   end
+  def filter_html(html, source)
+    if @plugins && source && source.has_macro?
+      html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
+      #TODO This parse should be done through the macro infra, but since there
+      #     are old things that do not support it we are keeping this hot spot.
+      html = @plugins.pipeline(:parse_content, html, source).first
+    end
+    html && html.html_safe
+  end
+
+  def article_to_html(article, options = {})
+    options.merge!(:page => params[:npage])
+    content = article.to_html(options)
+    content = content.kind_of?(Proc) ? self.instance_exec(&content).html_safe : content.html_safe
+    filter_html(content, article)
+  end
+
 end
@@ -87,10 +87,30 @@ module BoxesHelper
     box_decorator == DontMoveBlocks
   end
-  def display_block_content(block, person, main_content = nil)
-    content = block.main? ? wrap_main_content(main_content) : block.content({:person => person})
+  def render_block_content(block)
+    template_name = block.class.name.underscore.gsub('_block', '')
+    template_filename = "#{template_name}.html.erb"
+    if File.exists? Rails.root.join('app', 'views', 'blocks', template_filename)
+      render :file => "blocks/#{template_name}", :locals => { :block => block }
+    else
+      nil
+    end
+  end
+
+  def render_block_footer(block)
+    template_name = block.class.name.underscore.gsub('_block', '')
+    template_filename = "#{template_name}.html.erb"
+    if File.exists? Rails.root.join('app', 'views', 'blocks', 'footers', template_filename)
+      render :file => "blocks/footers/#{template_name}", :locals => { :block => block }
+    else
+      nil
+    end
+  end
+
+  def display_block_content(block, main_content = nil)
+    content = block.main? ? wrap_main_content(main_content) : render_block_content(block)
     result = extract_block_content(content)
-    footer_content = extract_block_content(block.footer)
+    footer_content = extract_block_content(render_block_footer(block))
     unless footer_content.blank?
       footer_content = content_tag('div', footer_content, :class => 'block-footer-content' )
     end
@@ -0,0 +1,47 @@
+module ButtonsHelper
+  def button(type, label, url, html_options = {})
+    html_options ||= {}
+    the_class = 'with-text'
+    if html_options.has_key?(:class)
+      the_class << ' ' << html_options[:class]
+    end
+    button_without_text type, label, url, html_options.merge(:class => the_class)
+  end
+
+  def button_without_text(type, label, url, html_options = {})
+    the_class = "button icon-#{type}"
+    if html_options.has_key?(:class)
+      the_class << ' ' << html_options[:class]
+    end
+    the_title = html_options[:title] || label
+    if html_options[:disabled]
+      content_tag('a', '&nbsp;'+content_tag('span', label), html_options.merge(:class => the_class, :title => the_title))
+    else
+      link_to('&nbsp;'+content_tag('span', label), url, html_options.merge(:class => the_class, :title => the_title))
+    end
+  end
+
+  def button_to_function(type, label, js_code, html_options = {}, &block)
+    html_options[:class] = "button with-text" unless html_options[:class]
+    html_options[:class] << " icon-#{type}"
+    link_to_function(label, js_code, html_options, &block)
+  end
+
+  def button_to_function_without_text(type, label, js_code, html_options = {}, &block)
+    html_options[:class] = "" unless html_options[:class]
+    html_options[:class] << " button icon-#{type}"
+    link_to_function(content_tag('span', label), js_code, html_options, &block)
+  end
+
+  def button_to_remote(type, label, options, html_options = {})
+    html_options[:class] = "button with-text" unless html_options[:class]
+    html_options[:class] << " icon-#{type}"
+    link_to_remote(label, options, html_options)
+  end
+
+  def button_to_remote_without_text(type, label, options, html_options = {})
+    html_options[:class] = "" unless html_options[:class]
+    html_options[:class] << " button icon-#{type}"
+    link_to_remote(content_tag('span', label), options, html_options.merge(:title => label))
+  end
+end
@@ -18,18 +18,6 @@ class ArticleBlock &lt; Block
     _('This block displays one of your articles. You can edit the block to select which one of your articles is going to be displayed in the block.')
   end
-  def content(args={})
-    block = self
-    proc do
-      block_title(block.title) +
-      (block.article ? article_to_html(FilePresenter.for(block.article),
-          :gallery_view => false,
-          :inside_block => block,               # For Blogs and folders
-          :format => block.visualization_format # For Articles and contents
-        ).html_safe : _('Article not selected yet.'))
-    end
-  end
-
   def article_id
     self.settings[:article_id]
   end
@@ -93,4 +93,20 @@ class Blog &lt; Folder
     posts.where("type != 'RssFeed'").order(:updated_at).limit(limit)
   end
+  def total_number_of_posts(group_by, year = nil)
+    case group_by
+      when :by_year
+        posts.published.native_translations
+          .except(:order)
+          .count(:all, :group => 'EXTRACT(YEAR FROM published_at)')
+          .sort_by {|year, count| -year.to_i}
+      when :by_month
+        posts.published.native_translations
+          .except(:order)
+          .where('EXTRACT(YEAR FROM published_at)=?', year.to_i)
+          .group('EXTRACT(MONTH FROM published_at)')
+          .count
+          .sort_by {|month, count| -month.to_i}
+    end
+  end
 end
@@ -21,30 +21,6 @@ class BlogArchivesBlock &lt; Block
     blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog
   end
-  def visible_posts(person)
-    #FIXME Performance issues with display_to. Must convert it to a scope.
-    # Checkout this page for further information: http://noosfero.org/Development/ActionItem2705
-    blog.posts.published.native_translations #.select {|post| post.display_to?(person)}
-  end
-
-  def content(args={})
-    owner_blog = self.blog
-    return nil unless owner_blog
-    results = ''
-    posts = visible_posts(args[:person])
-    posts.except(:order).count(:all, :group => 'EXTRACT(YEAR FROM published_at)').sort_by {|year, count| -year.to_i}.each do |year, count|
-      results << content_tag('li', content_tag('strong', "#{year.to_i} (#{count})"))
-      results << "<ul class='#{year.to_i}-archive'>"
-      posts.except(:order).where('EXTRACT(YEAR FROM published_at)=?', year.to_i).group('EXTRACT(MONTH FROM published_at)').count.sort_by {|month, count| -month.to_i}.each do |month, count|
-        results << content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", owner_blog.url.merge(year: year.to_i, month: month.to_i)))
-      end
-      results << "</ul>"
-    end
-    block_title(title) +
-    content_tag('ul', results, :class => 'blog-archives') +
-    content_tag('div', link_to(_('Subscribe RSS Feed'), owner_blog.feed.url), :class => 'subscribe-feed')
-  end
-
   def self.expire_on
       { :profile => [:article], :environment => [:article] }
   end
@@ -30,13 +30,6 @@ class CategoriesBlock &lt; Block
     Category.top_level_for(self.owner).from_types(self.category_types)
   end
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/categories', :locals => { :block => block }
-    end
-  end
-
   def self.expire_on
       { :profile => [], :environment => [:category] }
   end
@@ -27,15 +27,6 @@ class CommunitiesBlock &lt; ProfileListBlock
     owner.profile_suggestions.of_community.enabled.limit(3).includes(:suggestion)
   end
-  def footer
-    owner = self.owner
-    suggestions = self.suggestions
-    return '' unless owner.kind_of?(Profile) || owner.kind_of?(Environment)
-    proc do
-      render :file => 'blocks/communities', :locals => { :owner => owner, :suggestions => suggestions }
-    end
-  end
-
   def profiles
     owner.communities
   end
@@ -12,13 +12,6 @@ class DisabledEnterpriseMessageBlock &lt; Block
     _('Message')
   end
-  def content(args={})
-    message = self.owner.environment.message_for_disabled_enterprise || ''
-    lambda do |_|
-       render :file => 'blocks/disabled_enterprise_message', :locals => {:message => message}
-    end
-  end
-
   def editable?(user=nil)
     false
   end
@@ -12,22 +12,6 @@ class EnterprisesBlock &lt; ProfileListBlock
     _('Enterprises')
   end
-  def footer
-    owner = self.owner
-    case owner
-    when Profile
-      proc do
-        link_to s_('enterprises|View all'), :profile => owner.identifier, :controller => 'profile', :action => 'enterprises'
-      end
-    when Environment
-      proc do
-        link_to s_('enterprises|View all'), :controller => 'search', :action => 'assets', :asset => 'enterprises'
-      end
-    else
-      ''
-    end
-  end
-
   def profiles
     owner.enterprises
   end
@@ -12,14 +12,6 @@ class FansBlock &lt; ProfileListBlock
     _('This block presents the fans of an enterprise.')
   end
-  def footer
-    profile = self.owner
-    proc do
-      link_to _('View all'), :profile => profile.identifier, :controller =>
-      'profile', :action => 'fans'
-    end
-  end
-
   def profiles
     owner.fans
   end
@@ -12,14 +12,6 @@ class FavoriteEnterprisesBlock &lt; ProfileListBlock
     _('Favorite Enterprises')
   end
-  def footer
-    owner = self.owner
-    return '' unless owner.kind_of?(Person)
-    proc do
-      link_to _('enterprises|View all'), {:profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'}, :class => 'view-all'
-    end
-  end
-
   def profiles
     owner.favorite_enterprises
   end
@@ -32,11 +32,4 @@ class FeaturedProductsBlock &lt; Block
     self.owner.highlighted_products_with_image
   end
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/featured_products', :locals => { :block => block }
-    end
-  end
-
 end
@@ -52,24 +52,6 @@ class FeedReaderBlock &lt; Block
     self.feed_title.nil? ? _('Feed Reader') : self.feed_title
   end
-  def formatted_feed_content
-    if error_message.blank?
-      "<ul>\n".html_safe +
-      self.feed_items[0..(limit-1)].map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n").html_safe +
-      "</ul>".html_safe
-    else
-      "<p>#{error_message}</p>".html_safe
-    end
-  end
-
-  def footer
-    if self.fetched_at.nil? or self.feed_items.empty?
-      _('Feed content was not loaded yet')
-    else
-      _("Updated: %s") % show_date(self.fetched_at)
-    end
-  end
-
   def add_item(title, link, date, content)
     self.feed_items.unshift( {:title => title, :link => link})
   end
@@ -85,8 +67,4 @@ class FeedReaderBlock &lt; Block
     self.save!
   end
-  def content(args={})
-    block_title(title) + formatted_feed_content
-  end
-
 end
@@ -43,13 +43,6 @@ class HighlightsBlock &lt; Block
     end
   end
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/highlights', :locals => { :block => block }
-    end
-  end
-
   def folder_choices
     owner.image_galleries
   end
@@ -59,20 +59,6 @@ class LinkListBlock &lt; Block
     _('Link list')
   end
-  def content(args={})
-    block_title(title) +
-    content_tag('ul',
-      links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_html(i))}.join
-    )
-  end
-
-  def link_html(link)
-    klass = 'icon-' + link[:icon] if link[:icon]
-    sanitize_link(
-      link_to(link[:name], expand_address(link[:address]), :target => link[:target], :class => klass, :title => link[:title])
-    )
-  end
-
   def expand_address(address)
     add = if owner.respond_to?(:identifier)
       address.gsub('{profile}', owner.identifier)
@@ -99,8 +85,6 @@ class LinkListBlock &lt; Block
     end
   end
-  private
-
   def sanitize_link(text)
     sanitizer = HTML::WhiteListSanitizer.new
     sanitizer.sanitize(text)
@@ -13,12 +13,4 @@ class LocationBlock &lt; Block
     _('Shows where the profile is on the material world.')
   end
-  def content(args={})
-    block = self
-    profile = self.owner
-    proc do
-      render :file => 'blocks/location', :locals => {:block => block, :profile => profile}
-    end
-  end
-
 end
@@ -8,12 +8,6 @@ class LoginBlock &lt; Block
     _('This block presents a login/logout block.')
   end
-  def content(args={})
-    lambda do |context|
-      render :file => 'blocks/login_block'
-    end
-  end
-
   def cacheable?
     false
   end
@@ -8,10 +8,6 @@ class MainBlock &lt; Block
     _('This block presents the main content of your pages.')
   end
-  def content(args={})
-    nil
-  end
-
   def main?
     true
   end
@@ -14,16 +14,6 @@ class MyNetworkBlock &lt; Block
     _('This block displays some info about your networking.')
   end
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/my_network', :locals => {
-        :title => block.title,
-        :owner => block.owner
-      }
-    end
-  end
-
   def cacheable?
     false
   end
@@ -13,26 +13,6 @@ class ProductCategoriesBlock &lt; Block
     _('Helps to filter the products catalog.')
   end
-  def content(args={})
-    profile = owner
-    proc do
-      if @categories.nil? or @categories.length == 0
-        categories = ProductCategory.on_level(nil).order(:name)
-        if @categories and @categories.length == 0
-          notice = _('There are no sub-categories for %s') % @category.name
-        end
-      else
-        categories = @categories
-      end
-      render :file => 'blocks/product_categories',
-             :locals => {
-               :profile => profile,
-               :categories => categories,
-               :notice => notice
-             }
-    end
-  end
-
   DISPLAY_OPTIONS = DISPLAY_OPTIONS.merge('catalog_only' => _('Only on the catalog'))
   def display
@@ -19,26 +19,6 @@ class ProductsBlock &lt; Block
     _('This block presents a list of your products.')
   end
-  def content(args={})
-    block_title(title) +
-    content_tag(
-      'ul',
-      products.map {|product|
-        content_tag('li',
-          link_to( product.name,
-                   product.url,
-                   :style => 'background-image:url(%s)' % product.default_image('minor')
-                 ),
-          :class => 'product'
-        )
-      }.join
-    )
-  end
-
-  def footer
-    link_to(_('View all products'), owner.public_profile_url.merge(:controller => 'catalog', :action => 'index'))
-  end
-
   settings_items :product_ids, type: Array
   def product_ids=(array)
     self.settings[:product_ids] = array
@@ -12,17 +12,6 @@ class ProfileImageBlock &lt; Block
     _('This block presents the profile image')
   end
-  def content(args={})
-    block = self
-    s = show_name
-    lambda do |object|
-      render(
-        :file => 'blocks/profile_image',
-        :locals => { :block => block, :show_name => s }
-      )
-    end
-  end
-
   def cacheable?
     false
   end
@@ -16,13 +16,6 @@ class ProfileInfoBlock &lt; Block
     _('Basic information about <i>%{user}</i>: how long <i>%{user}</i> is part of <i>%{env}</i> and useful links.') % { :user => self.owner.name(), :env => self.owner.environment.name() }
   end
-  def content(args={})
-    block = self
-    lambda do |_|
-      render :file => 'blocks/profile_info', :locals => { :block => block }
-    end
-  end
-
   def cacheable?
     false
   end
@@ -40,26 +40,6 @@ result = public_profiles.all(:limit =&gt; get_limit, :order =&gt; &#39;profiles.updated_at
     _('Clicking on the people or groups will take you to their home page.')
   end
-  def content(args={})
-    profiles = self.profile_list
-    title = self.view_title
-    nl = "\n"
-    proc do |context|
-      count=0
-      list = profiles.map {|item|
-               count+=1
-               send(:profile_image_link, item, :minor )
-             }.join("\n  ")
-      if list.empty?
-        list = content_tag 'div', _('None'), :class => 'common-profile-list-block-none'
-      else
-        list = content_tag 'ul', nl +'  '+ list + nl
-      end
-      block_title(title) + nl +
-      content_tag('div', nl + list + nl + tag('br', :style => 'clear:both'))
-    end
-  end
-
   def view_title
     title.gsub('{#}', profile_count.to_s)
   end
@@ -4,11 +4,4 @@ class ProfileSearchBlock &lt; Block
     _('Display a form to search the profile')
   end
-  def content(args={})
-    title = self.title
-    lambda do |_|
-      render :file => 'blocks/profile_search', :locals => { :title => title }
-    end
-  end
-
 end
@@ -12,10 +12,6 @@ class RawHTMLBlock &lt; Block
   attr_accessible :html
-  def content(args={})
-    (title.blank? ? '' : block_title(title)).html_safe + html.to_s.html_safe
-  end
-
   def has_macro?
     true
   end
@@ -22,24 +22,6 @@ class RecentDocumentsBlock &lt; Block
   settings_items :limit, :type => :integer, :default => 5
-  def content(args={})
-    docs = self.docs
-    title = self.title
-    proc do
-      block_title(title) +
-        content_tag('ul', docs.map {|item| content_tag('li', link_to(h(item.title), item.url))}.join("\n"))
-    end
-  end
-
-  def footer
-    return nil unless self.owner.is_a?(Profile)
-
-    profile = self.owner
-    proc do
-      link_to _('All content'), :profile => profile.identifier, :controller => 'profile', :action => 'sitemap'
-    end
-  end
-
   def docs
     self.limit.nil? ? owner.recent_documents(nil, {}, false) : owner.recent_documents(self.get_limit, {}, false)
   end
@@ -22,10 +22,4 @@ class SellersSearchBlock &lt; Block
     _('This block presents a search engine for products.')
   end
-  def content(args={})
-    title = self.title
-    lambda do |object|
-      render :file => 'search/_sellers_form', :locals => { :title => title }
-    end
-  end
 end
@@ -33,23 +33,6 @@ class SlideshowBlock &lt; Block
     gallery.images.reject {|item| item.folder?}
   end
-  def content(args={})
-    block = self
-    if gallery
-      images = block_images
-      if shuffle
-        images = images.shuffle
-      end
-      proc do
-        render :file => 'blocks/slideshow', :locals => { :block => block, :images => images }
-      end
-    else
-      proc do
-        render :file => 'blocks/slideshow', :locals => { :block => block, :images => nil }
-      end
-    end
-  end
-
   def folder_choices
     owner.image_galleries
   end
@@ -28,42 +28,6 @@ class TagsBlock &lt; Block
        Try to add some tags to some articles and you'l see your tag cloud growing.")
   end
-  def content(args={})
-    is_env = owner.class == Environment
-    tags = is_env ? owner.tag_counts : owner.article_tags
-    return '' if tags.empty?
-
-    if limit
-      tags_tmp = tags.sort_by{ |k,v| -v }[0..(limit-1)]
-      tags = {}
-      tags_tmp.map{ |k,v| tags[k] = v }
-    end
-
-    url = is_env ? {:host=>owner.default_hostname, :controller=>'search', :action => 'tag'} :
-          owner.public_profile_url.merge(:controller => 'profile', :action => 'content_tagged')
-    tagname_option = is_env ? :tag : :id
-
-    block_title(title) +
-    "\n<div class='tag_cloud'>\n".html_safe+
-    tag_cloud( tags, tagname_option, url, :max_size => 16, :min_size => 9 ) +
-    "\n</div><!-- end class='tag_cloud' -->\n".html_safe
-  end
-
-  def footer
-    if owner.class == Environment
-      proc do
-        link_to s_('tags|View all'),
-          :controller => 'search', :action => 'tags'
-      end
-    else
-      owner_id = owner.identifier
-      proc do
-        link_to s_('tags|View all'),
-          :profile => owner_id, :controller => 'profile', :action => 'tags'
-      end
-    end
-  end
-
   def timeout
     15.minutes
   end
@@ -0,0 +1,12 @@
+<%= block_title(block.title) %>
+<% if block.article %>
+  <%=
+    h(article_to_html(FilePresenter.for(block.article),
+        :gallery_view => false,
+        :inside_block => block,               # For Blogs and folders
+        :format => block.visualization_format # For Articles and contents
+    ))
+  %>
+<% else %>
+  <%= _('Article not selected yet.') %>
+<% end %>
@@ -0,0 +1,16 @@
+<% if block.blog %>
+  <%= block_title(block.title) %>
+
+  <ul class='blog-archives'>
+    <% block.blog.total_number_of_posts(:by_year).each do |year, count| %>
+      <%= content_tag('li', content_tag('strong', "#{year.to_i} (#{count})")) %>
+      <ul class='<%= year.to_i %>-archive'>
+        <% block.blog.total_number_of_posts(:by_month, year).each do |month, count| %>
+          <%= content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", block.blog.url.merge(year: year.to_i, month: month.to_i))) %>
+        <% end %>
+      </ul>
+    <% end %>
+  </ul>
+
+  <%= content_tag('div', link_to(_('Subscribe RSS Feed'), block.blog.feed.url), :class => 'subscribe-feed') %>
+<% end %>
@@ -1,17 +0,0 @@
-<% if owner.kind_of?(Profile) %>
-  <%= link_to s_('communities|View all'), {:profile => owner.identifier, :controller => 'profile', :action => 'communities'}, :class => 'view-all' %>
-<% elsif owner.kind_of?(Environment) %>
-  <%= link_to s_('communities|View all'), {:controller => 'search', :action => 'communities'}, :class => 'view-all' %>
-<% end %>
-
-<% if user && user == profile && suggestions && !suggestions.empty? %>
-  <div class='suggestions-block common-profile-list-block'>
-    <h4 class='block-subtitle'><%= _('Some suggestions for you') %></h4>
-    <div class='profiles-suggestions'>
-      <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => suggestions, :collection => :communities_suggestions, :per_page => 3 } %>
-    </div>
-    <div class='more-suggestions'>
-      <%= link_to _('See all suggestions'), profile.communities_suggestions_url %>
-    </div>
-  </div>
-<% end %>
@@ -0,0 +1 @@
+profile_list.html.erb
 \ No newline at end of file
+<% message = block.owner.environment.message_for_disabled_enterprise || '' %>
+
 <div id='enterprise-disabled'>
   <%= message %>
   <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
@@ -0,0 +1 @@
+profile_list.html.erb
 \ No newline at end of file
@@ -0,0 +1 @@
+profile_list.html.erb
 \ No newline at end of file
@@ -0,0 +1 @@
+profile_list.html.erb
 \ No newline at end of file
@@ -0,0 +1,11 @@
+<%= block_title(block.title) %>
+
+<%=
+    if block.error_message.blank?
+      "<ul>\n".html_safe +
+      block.feed_items[0..(block.limit-1)].map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n").html_safe +
+      "</ul>".html_safe
+    else
+      "<p>#{block.error_message}</p>".html_safe
+    end
+%>
@@ -0,0 +1,19 @@
+<% if block.owner.kind_of?(Profile) || block.owner.kind_of?(Environment) %>
+  <% if block.owner.kind_of?(Profile) %>
+    <%= link_to s_('communities|View all'), {:profile => block.owner.identifier, :controller => 'profile', :action => 'communities'}, :class => 'view-all' %>
+  <% elsif block.owner.kind_of?(Environment) %>
+    <%= link_to s_('communities|View all'), {:controller => 'search', :action => 'communities'}, :class => 'view-all' %>
+  <% end %>
+
+  <% if user && user == profile && block.suggestions && !block.suggestions.empty? %>
+    <div class='suggestions-block common-profile-list-block'>
+      <h4 class='block-subtitle'><%= _('Some suggestions for you') %></h4>
+      <div class='profiles-suggestions'>
+        <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => block.suggestions, :collection => :communities_suggestions, :per_page => 3 } %>
+      </div>
+      <div class='more-suggestions'>
+        <%= link_to _('See all suggestions'), profile.communities_suggestions_url %>
+      </div>
+    </div>
+  <% end %>
+<% end %>
@@ -0,0 +1,5 @@
+<% if block.owner.is_a?(Profile) %>
+  <%= link_to s_('enterprises|View all'), :profile => block.owner.identifier, :controller => 'profile', :action => 'enterprises' %>
+<% elsif block.owner.is_a?(Environment) %>
+  <%= link_to s_('enterprises|View all'), :controller => 'search', :action => 'assets', :asset => 'enterprises' %>
+<% end %>
@@ -0,0 +1 @@
+<%= link_to _('View all'), :profile => block.owner.identifier, :controller => 'profile', :action => 'fans' %>
@@ -0,0 +1,3 @@
+<% if block.owner.is_a?(Person) %>
+  <%= link_to _('enterprises|View all'), {:profile => block.owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'}, :class => 'view-all' %>
+<% end %>
@@ -0,0 +1,5 @@
+<% if block.fetched_at.nil? or block.feed_items.empty? %>
+  <%= _('Feed content was not loaded yet') %>
+<% else %>
+  <%= _("Updated: %s") % show_date(block.fetched_at) %>
+<% end %>
@@ -0,0 +1 @@
+<%= link_to(_('View all products'), block.owner.public_profile_url.merge(:controller => 'catalog', :action => 'index')) %>
@@ -0,0 +1,3 @@
+<% if block.owner.is_a?(Profile) %>
+  <%= link_to _('All content'), :profile => block.owner.identifier, :controller => 'profile', :action => 'sitemap' %>
+<% end %>
@@ -0,0 +1,5 @@
+<% if block.owner.is_a?(Environment) %>
+  <%= link_to s_('tags|View all'), :controller => 'search', :action => 'tags' %>
+<% else %>
+  <%= link_to s_('tags|View all'), :profile => block.owner.identifier, :controller => 'profile', :action => 'tags' %>
+<% end %>
@@ -0,0 +1,12 @@
+<%= block_title(block.title) %>
+
+<ul>
+  <% block.links.select{|i| !i[:name].blank? and !i[:address].blank?}.each do |link| %>
+    <li>
+      <%= block.sanitize_link(link_to(link[:name], block.expand_address(link[:address]),
+                :target => link[:target],
+                :class => (link[:icon] ? "icon-#{link[:icon]}" : ''),
+                :title => link[:title])) %>
+    </li>
+  <% end %>
+</ul>
-<% if profile.lat %>
+<% if block.owner.lat %>
   <%= block_title block.title %>
   <div class='the-localization-map'>
-    <img src="https://maps.google.com/maps/api/staticmap?center=<%=profile.lat%>,<%=profile.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=profile.lat%>,<%=profile.lng%>&sensor=false"/>
+    <img src="https://maps.google.com/maps/api/staticmap?center=<%=block.owner.lat%>,<%=block.owner.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=block.owner.lat%>,<%=block.owner.lng%>&sensor=false"/>
   </div>
 <% else %>
   <i><%= _('This profile has no geographical position registered.') %></i>
@@ -0,0 +1,16 @@
+<% if user.present? %>
+  <div class="logged-user-info">
+    <h2><%= _('Logged in as %s') % user.identifier %></h2>
+    <ul>
+      <li><%= _('User since %s/%s') % [user.created_at.month, user.created_at.year] %></li>
+      <li><%= link_to _('Homepage'), user.public_profile_url %></li>
+    </ul>
+    <div class="user-actions">
+      <%= button(:'menu-logout',  _('Logout'), :controller => 'account', :action => 'logout') %>
+    </div>
+  </div>
+<% else %>
+  <div class='not-logged-user'>
+    <%= render :file => 'account/login_block' %>
+  </div>
+<% end%>
@@ -1,16 +0,0 @@
-<% if user.present? %>
-  <div class="logged-user-info">
-    <h2><%= _('Logged in as %s') % user.identifier %></h2>
-    <ul>
-      <li><%= _('User since %s/%s') % [user.created_at.month, user.created_at.year] %></li>
-      <li><%= link_to _('Homepage'), user.public_profile_url %></li>
-    </ul>
-    <div class="user-actions">
-      <%= button(:'menu-logout',  _('Logout'), :controller => 'account', :action => 'logout') %>
-    </div>
-  </div>
-<% else %>
-  <div class='not-logged-user'>
-    <%= render :file => 'account/login_block' %>
-  </div>
-<% end%>
-<%= block_title(title) %>
+<%= block_title(block.title) %>
 <ul>
-  <li><%= link_to(_('Homepage'), owner.url, :class => 'url') %></li>
-  <li><%= link_to(_('View profile'), owner.public_profile_url) %></li>
-  <% if !user.nil? and owner.organization? and user.has_permission?('edit_profile', profile) %>
+  <li><%= link_to(_('Homepage'), block.owner.url, :class => 'url') %></li>
+  <li><%= link_to(_('View profile'), block.owner.public_profile_url) %></li>
+  <% if !user.nil? and block.owner.organization? and user.has_permission?('edit_profile', profile) %>
     <li><%= link_to _('Control panel'), :controller => 'profile_editor', :profile => profile.identifier %></li>
   <% end %>
 </ul>
 <div class="my-network-actions">
-  <%= render_profile_actions owner.class %>
+  <%= render_profile_actions block.owner.class %>
 </div>
-<%= link_to _('Catalog start'), profile.catalog_url, :class=>'catalog-home-link' %>
+<%
+  if @categories.nil? or @categories.length == 0
+    categories = ProductCategory.on_level(nil).order(:name)
+  else
+    categories = @categories
+  end
+%>
+
+<%= link_to _('Catalog start'), block.owner.catalog_url, :class=>'catalog-home-link' %>
 <ul class="catalog-categories-list">
   <% categories.each do |category| %>
     <%= category_with_sub_list(category) %>
   <% end %>
 </ul>
-<% if notice %>
-  <div class="catalog-categories-notice"><%= notice %></div>
+<% if @categories and @categories.length == 0 %>
+  <div class="catalog-categories-notice">
+    <%= _('There are no sub-categories for %s') % @category.name %>
+  </div>
 <% end %>
@@ -0,0 +1,9 @@
+<%= block_title(block.title) %>
+
+<ul>
+  <% block.products.each do |product| %>
+    <li class='product'>
+      <%= link_to(product.name, product.url, :style => 'background-image:url(%s)' % product.default_image('minor')) %>
+    </li>
+  <% end %>
+</ul>
@@ -12,7 +12,7 @@
   </div>
 </div>
-<% if show_name %>
+<% if block.show_name %>
   <p><%= h block.owner.short_name %></p>
 <% end %>
@@ -0,0 +1,17 @@
+<%= block_title(block.view_title) %>
+
+<%
+  list = block.profile_list.map do |item|
+    profile_image_link(item, :minor)
+  end.join("\n ")
+%>
+
+<div>
+  <% if list.empty? %>
+    <div class='common-profile-list-block-none'><%= _('None') %></div>
+  <% else %>
+    <ul><%= list %></ul>
+  <% end %>
+</div>
+ 
+<br style='clear:both'/>
-<%= block_title(title) %>
+<%= block_title(block.title) %>
 <%= render :partial => 'shared/profile_search_form' %>
@@ -0,0 +1,3 @@
+<%=h block_title(block.title) %>
+
+<%=h block.html %>
@@ -0,0 +1,7 @@
+<%= block_title(block.title) %>
+
+<ul>
+  <% block.docs.map do |item| %>
+    <%= content_tag('li', link_to(h(item.title), item.url)) %>
+  <% end %>
+</ul>
@@ -0,0 +1,24 @@
+<h3><%= block.title %></h3>
+
+<%= form_tag({:controller => 'search', :action => 'assets'}, {:method => 'get'}) do %>
+
+  <div class="search-in-opt"><%= _('Search in:') %>
+    <dir>
+      <%= labelled_radio_button _('Enterprises'), 'asset', 'enterprises', true %><br />
+      <%= labelled_radio_button _('Products'), 'asset', 'products', false %>
+    </dir>
+  </div>
+
+  <div class="formfield search-from-opt">
+    <%= select_city(true) %>
+  </div>
+
+  <div class="formfield search-distance-opt">
+    <%= labelled_select(_('Distance:'), 'radius', :first, :last, nil, [15, 30, 50, 100, 150, 200, 300, 400, 500, 1000].map{|n|[n, n.to_s + 'km']}) %>
+  </div>
+
+  <div class="button-bar">
+    <%= submit_button :search, _('Search') %>
+  </div>
+
+<% end %>
+<%
+  if block.gallery
+    images = block.block_images
+    if block.shuffle
+      images = images.shuffle
+    end
+  end
+%>
+
 <%= block_title(block.title) %>
+
 <% if images %>
   <% description = images.any? { |img| !img.abstract.blank? } %>
   <div class='slideshow-border<%= (description ? ' with-descriptions' : '')%>'>
@@ -0,0 +1,25 @@
+<%= block_title(block.title) %>
+
+<%
+  is_env = block.owner.class == Environment
+  tags = is_env ? block.owner.tag_counts : block.owner.article_tags
+  if block.limit
+    tags_tmp = tags.sort_by{ |k,v| -v }[0..(block.limit-1)]
+    tags = {}
+    tags_tmp.map{ |k,v| tags[k] = v }
+  end
+%>
+
+<% unless tags.empty? %>
+  <div class='tag_cloud'>
+    <% if is_env %>
+      <%= tag_cloud(tags, :tag,
+                    {:host => block.owner.default_hostname, :controller=>'search', :action => 'tag'},
+                    :max_size => 16, :min_size => 9) %>
+    <% else %>
+      <%= tag_cloud(tags, :id,
+                    block.owner.public_profile_url.merge(:controller => 'profile', :action => 'content_tagged'),
+                    :max_size => 16, :min_size => 9) %>
+  <% end %>
+  </div>
+<% end %>
@@ -1,24 +0,0 @@
-<h3><%= title %></h3>
-
-<%= form_tag({:controller => 'search', :action => 'assets'}, {:method => 'get'}) do %>
-
-  <div class="search-in-opt"><%= _('Search in:') %>
-    <dir>
-      <%= labelled_radio_button _('Enterprises'), 'asset', 'enterprises', true %><br />
-      <%= labelled_radio_button _('Products'), 'asset', 'products', false %>
-    </dir>
-  </div>
-
-  <div class="formfield search-from-opt">
-    <%= select_city(true) %>
-  </div>
-  
-  <div class="formfield search-distance-opt">
-    <%= labelled_select(_('Distance:'), 'radius', :first, :last, nil, [15, 30, 50, 100, 150, 200, 300, 400, 500, 1000].map{|n|[n, n.to_s + 'km']}) %>
-  </div>
-
-  <div class="button-bar">
-    <%= submit_button :search, _('Search') %>
-  </div>
-
-<% end %>
 <% if block.cacheable? && use_cache %>
   <% cache_timeout(block.cache_key(language, user), block.timeout) do %>
-    <%= display_block_content(block, user, main_content) %>
+    <%= display_block_content(block, main_content) %>
   <% end %>
 <% else %>
-  <%= display_block_content(block, user, main_content) %>
+  <%= display_block_content(block, main_content) %>
 <% end %>
@@ -80,12 +80,6 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_equal '', show_date(nil)
   end
-
-  should 'append with-text class and keep existing classes' do
-    expects(:button_without_text).with('type', 'label', 'url', { :class => 'with-text class1'})
-    button('type', 'label', 'url', { :class => 'class1' })
-  end
-
   should 'generate correct link to category' do
     cat = mock
     cat.expects(:path).returns('my-category/my-subcatagory')
@@ -7,15 +7,6 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     assert_not_equal Block.description, ArticleBlock.description
   end
-  should "take article's content" do
-    block = ArticleBlock.new
-    article = mock
-    article.expects(:to_html).returns("Article content")
-    block.stubs(:article).returns(article)
-
-    assert_match(/Article content/, instance_eval(&block.content))
-  end
-
   should 'refer to an article' do
     profile = create_user('testuser').person
     article = profile.articles.build(:name => 'test article')
@@ -85,6 +76,31 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     assert_equal [a],block.available_articles
   end
+  protected
+    include NoosferoTestHelper
+
+end
+
+require 'boxes_helper'
+require 'block_helper'
+
+class ArticleBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
+  ActionView::Base.send :include, ArticleHelper
+  ActionView::Base.send :include, ButtonsHelper
+  ActionView::Base.send :include, BlockHelper
+
+  should "take article's content" do
+    block = ArticleBlock.new
+    article = mock
+    article.expects(:to_html).returns("Article content")
+    block.stubs(:article).returns(article)
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+
+    assert_match(/Article content/, render_block_content(block))
+  end
+
   should "display empty title if title is blank" do
     block = ArticleBlock.new
     article = mock
@@ -92,7 +108,7 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     block.expects(:title).returns('')
     block.stubs(:article).returns(article)
-    assert_equal "<h3 class=\"block-title empty\"><span></span></h3>Article content", instance_eval(&block.content)
+    assert_equal "<h3 class=\"block-title empty\"><span></span></h3>\n  Article content\n", render_block_content(block)
   end
   should "display title if defined" do
@@ -102,7 +118,7 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     block.expects(:title).returns('Article title')
     block.stubs(:article).returns(article)
-    assert_equal "<h3 class=\"block-title\"><span>Article title</span></h3>Article content", instance_eval(&block.content)
+    assert_equal "<h3 class=\"block-title\"><span>Article title</span></h3>\n  Article content\n", render_block_content(block)
   end
   should 'display image if article is an image' do
@@ -113,7 +129,7 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     block.article = image
     block.save!
-    assert_tag_in_string instance_eval(&block.content),
+    assert_tag_in_string render_block_content(block),
         :tag => 'img',
         :attributes => {
             :src => image.public_filename(:display),
@@ -129,7 +145,7 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     block.article = image
     block.save!
-    assert_no_match(/Previous/, instance_eval(&block.content))
+    assert_no_match(/Previous/, render_block_content(block))
   end
   should 'display link to archive if article is an archive' do
@@ -141,11 +157,6 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     block.save!
     UploadedFile.any_instance.stubs(:url).returns('myhost.mydomain/path/to/file')
-
-    assert_tag_in_string instance_eval(&block.content), :tag => 'a', :content => _('Download')
+    assert_tag_in_string render_block_content(block), :tag => 'a', :content => _('Download')
   end
-
-  protected
-    include NoosferoTestHelper
-
 end
@@ -17,6 +17,69 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     assert l.editable?
   end
+  should 'has field to configure blog' do
+    b = BlogArchivesBlock.new
+    assert b.respond_to?(:blog_id)
+    assert b.respond_to?(:blog_id=)
+  end
+
+  should 'not try to load a removed blog' do
+    block = fast_create(BlogArchivesBlock)
+    block.blog_id = profile.blog.id
+    block.save!
+    block.stubs(:owner).returns(profile)
+    profile.blog.destroy
+    assert_nothing_raised do
+      assert_nil block.blog
+    end
+  end
+
+  should 'load next blog if configured blog was removed' do
+    other_blog = fast_create(Blog, :profile_id => profile.id)
+    block = fast_create(BlogArchivesBlock)
+    block.blog_id = profile.blog.id
+    block.save!
+    block.stubs(:owner).returns(profile)
+    profile.blog.destroy
+    assert_nothing_raised do
+      assert_equal other_blog, block.blog
+    end
+  end
+
+#FIXME Performance issues with display_to. Must convert it to a scope.
+# Checkout this page for further information: http://noosfero.org/Development/ActionItem2705
+#
+#  should 'not count articles if the user can\'t see them' do
+#    person = create_user('testuser').person
+#    blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog_path')
+#    block = fast_create(BlogArchivesBlock)
+#
+#    feed = mock()
+#    feed.stubs(:url).returns(blog.url)
+#    blog.stubs(:feed).returns(feed)
+#    block.stubs(:blog).returns(blog)
+#    block.stubs(:owner).returns(profile)
+#
+#    public_post = fast_create(TextileArticle, :profile_id => profile.id, :parent_id => blog.id, :published => true, :published_at => Time.mktime(2012, 'jan'))
+#    private_post = fast_create(TextileArticle, :profile_id => profile.id, :parent_id => blog.id, :published => false, :published_at => Time.mktime(2012, 'jan'))
+#
+#    assert_match /January \(1\)/, block.content({:person => person})
+#    assert_match /January \(1\)/, block.content()
+#    assert_match /January \(2\)/, block.content({:person => profile})
+#  end
+end
+
+require 'boxes_helper'
+
+class BlogArchivesBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
+  def setup
+    @profile = create_user('flatline').person
+    @profile.articles << Blog.new(:name => 'Blog One', :profile => @profile)
+  end
+  attr_reader :profile
+
   should 'list amount posts by year' do
     date = DateTime.parse('2008-01-10')
     blog = profile.blog
@@ -26,7 +89,9 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_tag_in_string block.content, :tag => 'li', :content => '2008 (10)'
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).returns("")
+    assert_tag_in_string render_block_content(block), :tag => 'li', :content => '2008 (10)'
   end
   should 'list amount posts by month' do
@@ -38,7 +103,18 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_tag_in_string block.content, :tag => 'a', :content => 'January (10)', :attributes => {:href => /^http:\/\/.*\/flatline\/blog-one\?month=1&year=2008$/ }
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).with(1).returns("January")
+    ActionView::Base.any_instance.stubs(:month_name).with(2).returns("February")
+    ActionView::Base.any_instance.stubs(:month_name).with(3).returns("March")
+    ActionView::Base.any_instance.stubs(:month_name).with(4).returns("April")
+    ActionView::Base.any_instance.stubs(:month_name).with(5).returns("May")
+    ActionView::Base.any_instance.stubs(:month_name).with(6).returns("June")
+    ActionView::Base.any_instance.stubs(:month_name).with(7).returns("July")
+    ActionView::Base.any_instance.stubs(:month_name).with(8).returns("August")
+    ActionView::Base.any_instance.stubs(:month_name).with(9).returns("September")
+    ActionView::Base.any_instance.stubs(:month_name).with(10).returns("Octuber")
+    assert_tag_in_string render_block_content(block), :tag => 'a', :content => 'January (10)', :attributes => {:href => /^http:\/\/.*\/flatline\/blog-one\?month=1&year=2008$/ }
   end
   should 'order list of amount posts' do
@@ -49,7 +125,18 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_tag_in_string block.content, :tag => 'li', :content => 'January (1)',
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).with(1).returns("January")
+    ActionView::Base.any_instance.stubs(:month_name).with(2).returns("February")
+    ActionView::Base.any_instance.stubs(:month_name).with(3).returns("March")
+    ActionView::Base.any_instance.stubs(:month_name).with(4).returns("April")
+    ActionView::Base.any_instance.stubs(:month_name).with(5).returns("May")
+    ActionView::Base.any_instance.stubs(:month_name).with(6).returns("June")
+    ActionView::Base.any_instance.stubs(:month_name).with(7).returns("July")
+    ActionView::Base.any_instance.stubs(:month_name).with(8).returns("August")
+    ActionView::Base.any_instance.stubs(:month_name).with(9).returns("September")
+    ActionView::Base.any_instance.stubs(:month_name).with(10).returns("Octuber")
+    assert_tag_in_string render_block_content(block), :tag => 'li', :content => 'January (1)',
       :sibling => {:tag => 'li', :content => 'February (1)',
         :sibling => {:tag => 'li', :content => 'March (1)',
           :sibling => {:tag => 'li', :content => 'April (1)',
@@ -63,7 +150,9 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_match(/2009.*2008.*2007.*2006.*2005/m, block.content)
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).returns("")
+    assert_match(/2009.*2008.*2007.*2006.*2005/m, render_block_content(block))
   end
   should 'order months from later to former' do
@@ -73,20 +162,20 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_match(/.*March.*February.*January.*/m, block.content)
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).with(1).returns("January")
+    ActionView::Base.any_instance.stubs(:month_name).with(2).returns("February")
+    ActionView::Base.any_instance.stubs(:month_name).with(3).returns("March")
+    assert_match(/.*March.*February.*January.*/m, render_block_content(block))
   end
   should 'not display any content if has no blog' do
     profile.blogs.destroy_all
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_nil block.content
-  end
-
-  should 'has field to configure blog' do
-    b = BlogArchivesBlock.new
-    assert b.respond_to?(:blog_id)
-    assert b.respond_to?(:blog_id=)
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).returns("")
+    assert_empty render_block_content(block)
   end
   should 'show posts from first blog' do
@@ -98,8 +187,10 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_match(/blog-one/m, block.content)
-    assert_no_match(/blog-two/m, block.content)
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).returns("")
+    assert_match(/blog-one/m, render_block_content(block))
+    assert_no_match(/blog-two/m, render_block_content(block))
   end
   should 'list amount native posts by year' do
@@ -115,7 +206,9 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_tag_in_string block.content, :tag => 'li', :content => '2008 (2)'
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).returns("")
+    assert_tag_in_string render_block_content(block), :tag => 'li', :content => '2008 (2)'
   end
   should 'list amount native posts by month' do
@@ -131,51 +224,8 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_tag_in_string block.content, :tag => 'a', :content => 'January (2)', :attributes => {:href => /^http:\/\/.*\/flatline\/blog-one\?month=1&year=2008$/ }
-  end
-
-  should 'not try to load a removed blog' do
-    block = fast_create(BlogArchivesBlock)
-    block.blog_id = profile.blog.id
-    block.save!
-    block.stubs(:owner).returns(profile)
-    profile.blog.destroy
-    assert_nothing_raised do
-      assert_nil block.blog
-    end
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).with(1).returns("January")
+    assert_tag_in_string render_block_content(block), :tag => 'a', :content => 'January (2)', :attributes => {:href => /^http:\/\/.*\/flatline\/blog-one\?month=1&year=2008$/ }
   end
-
-  should 'load next blog if configured blog was removed' do
-    other_blog = fast_create(Blog, :profile_id => profile.id)
-    block = fast_create(BlogArchivesBlock)
-    block.blog_id = profile.blog.id
-    block.save!
-    block.stubs(:owner).returns(profile)
-    profile.blog.destroy
-    assert_nothing_raised do
-      assert_equal other_blog, block.blog
-    end
-  end
-
-#FIXME Performance issues with display_to. Must convert it to a scope.
-# Checkout this page for further information: http://noosfero.org/Development/ActionItem2705
-#
-#  should 'not count articles if the user can\'t see them' do
-#    person = create_user('testuser').person
-#    blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog_path')
-#    block = fast_create(BlogArchivesBlock)
-#
-#    feed = mock()
-#    feed.stubs(:url).returns(blog.url)
-#    blog.stubs(:feed).returns(feed)
-#    block.stubs(:blog).returns(blog)
-#    block.stubs(:owner).returns(profile)
-#
-#    public_post = fast_create(TextileArticle, :profile_id => profile.id, :parent_id => blog.id, :published => true, :published_at => Time.mktime(2012, 'jan'))
-#    private_post = fast_create(TextileArticle, :profile_id => profile.id, :parent_id => blog.id, :published => false, :published_at => Time.mktime(2012, 'jan'))
-#
-#    assert_match /January \(1\)/, block.content({:person => person})
-#    assert_match /January \(1\)/, block.content()
-#    assert_match /January \(2\)/, block.content({:person => profile})
-#  end
 end
@@ -266,4 +266,23 @@ class BlogTest &lt; ActiveSupport::TestCase
     assert_equal blog.image(true).filename, 'noosfero-network.png'
   end
+
+  should 'count total number of posts by year' do
+    p = create_user('testuser').person
+    blog = fast_create(Blog, :profile_id => p.id, :name => 'Blog test')
+    create(TextileArticle, :name => 'Post 1', :parent => blog, :profile => p, :published_at => DateTime.parse('16-08-2010'))
+    create(TextileArticle, :name => 'Post 2', :parent => blog, :profile => p, :published_at => DateTime.parse('17-08-2010'))
+    create(TextileArticle, :name => 'Post 3', :parent => blog, :profile => p, :published_at => DateTime.parse('10-05-2012'))
+    assert_equal [[2012.0, 1], [2010.0, 2]], blog.total_number_of_posts(:by_year)
+  end
+
+  should 'count total number of posts by month' do
+    p = create_user('testuser').person
+    blog = fast_create(Blog, :profile_id => p.id, :name => 'Blog test')
+    create(TextileArticle, :name => 'Post 1', :parent => blog, :profile => p, :published_at => DateTime.parse('16-08-2010'))
+    create(TextileArticle, :name => 'Post 2', :parent => blog, :profile => p, :published_at => DateTime.parse('17-08-2010'))
+    create(TextileArticle, :name => 'Post 3', :parent => blog, :profile => p, :published_at => DateTime.parse('11-10-2010'))
+    assert_equal [[10.0, 1], [8.0, 2]], blog.total_number_of_posts(:by_month, 2010)
+  end
+
 end
@@ -0,0 +1,11 @@
+# encoding: UTF-8
+require_relative "../test_helper"
+
+class ButtonsHelperTest < ActionView::TestCase
+  include ButtonsHelper
+
+  should 'append with-text class and keep existing classes' do
+    expects(:button_without_text).with('type', 'label', 'url', { :class => 'with-text class1'})
+    button('type', 'label', 'url', { :class => 'class1' })
+  end
+end
 \ No newline at end of file
@@ -17,11 +17,13 @@ class CategoriesBlockTest &lt; ActiveSupport::TestCase
     assert_not_nil category_block.help
   end
+  include BoxesHelper
+
   should 'display category block' do
     block = CategoriesBlock.new
     self.expects(:render).with(:file => 'blocks/categories', :locals => { :block => block})
-    instance_eval(& block.content)
+    render_block_content(block)
   end
   should 'be editable' do
@@ -27,14 +27,44 @@ class CommunitiesBlockTest &lt; ActiveSupport::TestCase
     assert_same list, block.profiles
   end
+  should 'list non-public communities' do
+    user = create_user('testuser').person
+
+    public_community = fast_create(Community, :environment_id => Environment.default.id)
+    public_community.add_member(user)
+
+    private_community = fast_create(Community, :environment_id => Environment.default.id, :public_profile => false)
+    private_community.add_member(user)
+
+    block = CommunitiesBlock.new
+    block.expects(:owner).at_least_once.returns(user)
+
+    assert_equivalent [public_community, private_community], block.profiles
+  end
+
+end
+
+require 'boxes_helper'
+
+class CommunitiesBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
   should 'support profile as block owner' do
     profile = Profile.new
+    profile.identifier = 42
+
+    ActionView::Base.any_instance.stubs(:user).with(anything).returns(profile)
+    ActionView::Base.any_instance.stubs(:profile).with(anything).returns(profile)
     block = CommunitiesBlock.new
     block.expects(:owner).returns(profile).at_least_once
-    self.expects(:render).with(:file => 'blocks/communities', :locals => { :owner => profile, :suggestions => block.suggestions })
-    instance_eval(&block.footer)
+    footer = render_block_footer(block)
+
+    assert_tag_in_string footer, tag: 'a', attributes: {href: '/profile/42/communities'}
+
+    ActionView::Base.any_instance.unstub(:user)
+    ActionView::Base.any_instance.unstub(:profile)
   end
   should 'support environment as block owner' do
@@ -42,31 +72,24 @@ class CommunitiesBlockTest &lt; ActiveSupport::TestCase
     block = CommunitiesBlock.new
     block.expects(:owner).returns(env).at_least_once
-    self.expects(:render).with(:file => 'blocks/communities', :locals => { :owner => env, :suggestions => block.suggestions })
-    instance_eval(&block.footer)
-  end
-
-  should 'give empty footer on unsupported owner type' do
-    block = CommunitiesBlock.new
-    block.expects(:owner).returns(1).at_least_once
+    profile = Profile.new
+    profile.identifier = 42
-    self.expects(:render).with(anything).never
-    assert_equal '', block.footer
-  end
+    ActionView::Base.any_instance.stubs(:user).with(anything).returns(profile)
+    ActionView::Base.any_instance.stubs(:profile).with(anything).returns(profile)
-  should 'list non-public communities' do
-    user = create_user('testuser').person
+    footer = render_block_footer(block)
-    public_community = fast_create(Community, :environment_id => Environment.default.id)
-    public_community.add_member(user)
+    assert_tag_in_string footer, tag: 'a', attributes: {href: '/search/communities'}
-    private_community = fast_create(Community, :environment_id => Environment.default.id, :public_profile => false)
-    private_community.add_member(user)
+    ActionView::Base.any_instance.unstub(:user)
+    ActionView::Base.any_instance.unstub(:profile)
+  end
+  should 'give empty footer on unsupported owner type' do
     block = CommunitiesBlock.new
-    block.expects(:owner).at_least_once.returns(user)
+    block.expects(:owner).returns(1).at_least_once
-    assert_equivalent [public_community, private_community], block.profiles
+    assert_equal '', render_block_footer(block)
   end
-
 end
@@ -6,16 +6,25 @@ class DisabledEnterpriseMessageBlockTest &lt; ActiveSupport::TestCase
     assert_not_equal Block.description, DisabledEnterpriseMessageBlock.description
   end
+  include BoxesHelper
+
   should 'display message for disabled enterprise' do
-    e = Environment.default
-    e.expects(:message_for_disabled_enterprise).returns('This message is for disabled enterprises')
-    block = DisabledEnterpriseMessageBlock.new
-    p = Profile.new
-    block.expects(:owner).returns(p)
-    p.expects(:environment).returns(e)
-
-    expects(:render).with(:file => 'blocks/disabled_enterprise_message', :locals => { :message => 'This message is for disabled enterprises'})
-    instance_eval(&block.content)
+    environment = Environment.default
+    environment.message_for_disabled_enterprise = 'This message is for disabled enterprises'
+    environment.save
+
+    enterprise = fast_create(Enterprise, :identifier => 'disabled-enterprise', :environment_id => environment.id)
+    enterprise.boxes << Box.new
+    enterprise.boxes.first.blocks << DisabledEnterpriseMessageBlock.new
+    block = enterprise.boxes.first.blocks.first
+
+    ApplicationHelper.class_eval do
+     def profile
+       return Enterprise['disabled-enterprise']
+     end
+    end
+
+    assert_match 'This message is for disabled enterprises', render_block_content(block)
   end
   should 'not be editable' do
@@ -27,32 +27,6 @@ class EnterprisesBlockTest &lt; ActiveSupport::TestCase
     assert_same list, block.profiles
   end
-  should 'link to all enterprises for profile' do
-    profile = Profile.new
-    profile.expects(:identifier).returns('theprofile')
-    block = EnterprisesBlock.new
-    block.expects(:owner).returns(profile)
-
-    expects(:link_to).with('View all', :controller => 'profile', :profile => 'theprofile', :action => 'enterprises')
-
-    instance_eval(&block.footer)
-  end
-
-  should 'link to all enterprises for environment' do
-    env = Environment.default
-    block = EnterprisesBlock.new
-    block.expects(:owner).returns(env)
-
-    expects(:link_to).with('View all', :controller => 'search', :action => 'assets', :asset => 'enterprises')
-    instance_eval(&block.footer)
-  end
-
-  should 'give empty footer for unsupported owner type' do
-    block = EnterprisesBlock.new
-    block.expects(:owner).returns(1)
-    assert_equal '', block.footer
-  end
-
   should 'count number of owner enterprises' do
     user = create_user('testuser').person
@@ -71,3 +45,35 @@ class EnterprisesBlockTest &lt; ActiveSupport::TestCase
   end
 end
+
+require 'boxes_helper'
+
+class EnterprisesBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
+  should 'link to all enterprises for profile' do
+    profile = Profile.new
+    profile.identifier = 'theprofile'
+    block = EnterprisesBlock.new
+    block.expects(:owner).twice.returns(profile)
+
+    ActionView::Base.any_instance.expects(:link_to).with('View all', :controller => 'profile', :profile => 'theprofile', :action => 'enterprises')
+
+    render_block_footer(block)
+  end
+
+  should 'link to all enterprises for environment' do
+    env = Environment.default
+    block = EnterprisesBlock.new
+    block.expects(:owner).twice.returns(env)
+
+    ActionView::Base.any_instance.expects(:link_to).with('View all', :controller => 'search', :action => 'assets', :asset => 'enterprises')
+    render_block_footer(block)
+  end
+
+  should 'give empty footer for unsupported owner type' do
+    block = EnterprisesBlock.new
+    block.expects(:owner).twice.returns(1)
+    assert_equal '', render_block_footer(block)
+  end
+end
 require_relative "../test_helper"
+require 'boxes_helper'
 class FeaturedProductsBlockTest < ActiveSupport::TestCase
+  include BoxesHelper
   def setup
     @profile = fast_create(Profile)
@@ -108,7 +110,7 @@ class FeaturedProductsBlockTest &lt; ActiveSupport::TestCase
     block = FeaturedProductsBlock.new
     self.expects(:render).with(:file => 'blocks/featured_products', :locals => { :block => block})
-    instance_eval(& block.content)
+    render_block_content(block)
   end
   should "return just highlighted products with image for selection" do
@@ -26,19 +26,6 @@ class FeedReaderBlockTest &lt; ActiveSupport::TestCase
     assert feed.editable?
   end
-  should 'display feed posts from content' do
-    feed.feed_items = []
-    %w[ last-post second-post first-post ].each do |i|
-      feed.feed_items << {:title => i, :link => "http://localhost/#{i}"}
-    end
-    feed.feed_title = 'Feed for unit tests'
-    feed_content = feed.content
-    assert_tag_in_string feed_content, :tag => 'h3', :content => 'Feed for unit tests'
-    assert_tag_in_string feed_content, :tag => 'a', :attributes => { :href => 'http://localhost/last-post' }, :content => 'last-post'
-    assert_tag_in_string feed_content, :tag => 'a', :attributes => { :href => 'http://localhost/second-post' }, :content => 'second-post'
-    assert_tag_in_string feed_content, :tag => 'a', :attributes => { :href => 'http://localhost/first-post' }, :content => 'first-post'
-  end
-
   should 'display channel title as title by default' do
     feed.feed_title = 'Feed for unit tests'
     assert_equal 'Feed for unit tests', feed.title
@@ -48,17 +35,6 @@ class FeedReaderBlockTest &lt; ActiveSupport::TestCase
     assert_equal 'Feed Reader', feed.title
   end
-  should 'notice when content not fetched yet' do
-    assert_equal'Feed content was not loaded yet', feed.footer
-  end
-
-  should 'display last fetched date' do
-    now = Time.new(2014,1,1)
-    feed.feed_items = ['one', 'two']
-    feed.fetched_at = now
-    assert_equal "Updated: #{show_date(now)}", feed.footer
-  end
-
   should 'clear feed title and items' do
     feed.feed_items = %w[ last-post second-post first-post ]
     feed.feed_title = 'Feed Test'
@@ -90,26 +66,10 @@ class FeedReaderBlockTest &lt; ActiveSupport::TestCase
     assert_equal %w[ last-post second-post first-post ], feed.feed_items.map{|i|i[:title]}
   end
-  should 'display only limit posts' do
-    feed.limit = 1; feed.save!
-    %w[ first-post second-post ].each do |i|
-      feed.add_item(i, "http://localhost/#{i}", Date.today, "some contet for #{i}")
-    end
-
-    assert_tag_in_string feed.formatted_feed_content, :tag => 'a', :attributes => { :href => 'http://localhost/second-post' }, :content => 'second-post'
-    assert_no_tag_in_string feed.formatted_feed_content, :tag => 'a', :attributes => { :href => 'http://localhost/first-post' }, :content => 'first-post'
-  end
-
   should 'have empty error message by default' do
     assert FeedReaderBlock.new.error_message.blank?, 'new feed reader block expected to have empty error message'
   end
-  should "display error message as content when it's the case" do
-    msg = "there was a problem"
-    feed.error_message = msg
-    assert_match(msg, feed.content)
-  end
-
   should 'expire after a period' do
     # save current time
     now = Time.now
@@ -195,3 +155,67 @@ class FeedReaderBlockTest &lt; ActiveSupport::TestCase
   end
 end
+
+require 'boxes_helper'
+require 'block_helper'
+require 'dates_helper'
+
+class FeedReaderBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+  include DatesHelper
+
+  ActionView::Base.send :include, BlockHelper
+  ActionView::Base.send :include, DatesHelper
+
+  def setup
+    @feed = create(:feed_reader_block)
+  end
+  attr_reader :feed
+
+  should "display error message as content when it's the case" do
+    msg = "there was a problem"
+    feed.error_message = msg
+
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+
+    assert_match(msg, render_block_content(feed))
+  end
+
+  should 'display feed posts from content' do
+    feed.feed_items = []
+    %w[ last-post second-post first-post ].each do |i|
+      feed.feed_items << {:title => i, :link => "http://localhost/#{i}"}
+    end
+    feed.feed_title = 'Feed for unit tests'
+
+    feed_content = render_block_content(feed)
+
+    assert_tag_in_string feed_content, :tag => 'h3', :content => 'Feed for unit tests'
+    assert_tag_in_string feed_content, :tag => 'a', :attributes => { :href => 'http://localhost/last-post' }, :content => 'last-post'
+    assert_tag_in_string feed_content, :tag => 'a', :attributes => { :href => 'http://localhost/second-post' }, :content => 'second-post'
+    assert_tag_in_string feed_content, :tag => 'a', :attributes => { :href => 'http://localhost/first-post' }, :content => 'first-post'
+  end
+
+  should 'display only limit posts' do
+    feed.limit = 1; feed.save!
+    %w[ first-post second-post ].each do |i|
+      feed.add_item(i, "http://localhost/#{i}", Date.today, "some contet for #{i}")
+    end
+
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+
+    assert_tag_in_string render_block_content(feed), :tag => 'a', :attributes => { :href => 'http://localhost/second-post' }, :content => 'second-post'
+    assert_no_tag_in_string render_block_content(feed), :tag => 'a', :attributes => { :href => 'http://localhost/first-post' }, :content => 'first-post'
+  end
+
+  should 'notice when content not fetched yet' do
+    assert_equal "  Feed content was not loaded yet\n", render_block_footer(feed)
+  end
+
+  should 'display last fetched date' do
+    now = Time.new(2014,1,1)
+    feed.feed_items = ['one', 'two']
+    feed.fetched_at = now
+    assert_equal "  Updated: #{show_date(now)}\n", render_block_footer(feed)
+  end
+end
@@ -80,11 +80,13 @@ class HighlightsBlockTest &lt; ActiveSupport::TestCase
     assert_equal 'always', block.display
   end
+  include BoxesHelper
+
   should 'display highlights block' do
     block = HighlightsBlock.new
     self.expects(:render).with(:file => 'blocks/highlights', :locals => { :block => block})
-    instance_eval(& block.content)
+    render_block_content(block)
   end
   should 'not list non existent image' do
@@ -167,7 +169,7 @@ class HighlightsBlockTest &lt; ActiveSupport::TestCase
     block.images = [i1]
     block.save!
-    assert_tag_in_string instance_eval(& block.content), :tag => 'img', :attributes => { :src => "/social/img_address" }
+    assert_tag_in_string render_block_content(block), :tag => 'img', :attributes => { :src => "/social/img_address" }
   end
   [Environment, Profile].each do |klass|
@@ -2,6 +2,8 @@ require_relative &quot;../test_helper&quot;
 class LinkListBlockTest < ActiveSupport::TestCase
+  include BoxesHelper
+
   should 'default describe' do
     assert_not_equal Block.description, LinkListBlock.description
   end
@@ -23,7 +25,7 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
   should 'list links' do
     l = LinkListBlock.new(:links => [{:name => 'products', :address => '/cat/products'}])
-    assert_match /products/, l.content
+    assert_match /products/, render_block_content(l)
   end
   should 'remove links with blank fields' do
@@ -36,7 +38,7 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
     profile = Profile.new(:identifier => 'test_profile')
     l = LinkListBlock.new(:links => [{:name => 'categ', :address => '/{profile}/address'}])
     l.stubs(:owner).returns(profile)
-    assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => '/test_profile/address'}
+    assert_tag_in_string render_block_content(l), :tag => 'a', :attributes => {:href => '/test_profile/address'}
   end
   should 'replace {portal} with environment portal identifier' do
@@ -49,7 +51,7 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
     stubs(:environment).returns(env)
     l = LinkListBlock.new(:links => [{:name => 'categ', :address => '/{portal}/address'}])
     l.stubs(:owner).returns(env)
-    assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => '/portal-community/address'}
+    assert_tag_in_string render_block_content(l), :tag => 'a', :attributes => {:href => '/portal-community/address'}
   end
   should 'not change address if no {portal} there' do
@@ -62,19 +64,19 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
     stubs(:environment).returns(env)
     l = LinkListBlock.new(:links => [{:name => 'categ', :address => '/address'}])
     l.stubs(:owner).returns(env)
-    assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => '/address'}
+    assert_tag_in_string render_block_content(l), :tag => 'a', :attributes => {:href => '/address'}
   end
   should 'handle /prefix if not already added' do
     Noosfero.stubs(:root).returns('/prefix')
     l = LinkListBlock.new(:links => [{:name => "foo", :address => '/bar'}] )
-    assert_tag_in_string l.content, :tag => 'a', :attributes => { :href => '/prefix/bar' }
+    assert_tag_in_string render_block_content(l), :tag => 'a', :attributes => { :href => '/prefix/bar' }
   end
   should 'not add /prefix if already there' do
     Noosfero.stubs(:root).returns('/prefix')
     l = LinkListBlock.new(:links => [{:name => "foo", :address => '/prefix/bar'}] )
-    assert_tag_in_string l.content, :tag => 'a', :attributes => { :href => '/prefix/bar' }
+    assert_tag_in_string render_block_content(l), :tag => 'a', :attributes => { :href => '/prefix/bar' }
   end
   should 'display options for icons' do
@@ -85,29 +87,29 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
   end
   should 'link with icon' do
-    l = LinkListBlock.new
-    assert_match /class="icon-save"/, l.link_html({:icon => 'save', :name => 'test', :address => 'test.com'})
+    l = LinkListBlock.new(:links => [{:icon => 'save', :name => 'test', :address => 'test.com'}])
+    assert_match /a class="icon-[^"]+"/, render_block_content(l)
   end
   should 'no class without icon' do
-    l = LinkListBlock.new
-    assert_no_match /class="/, l.link_html({:icon => nil, :name => 'test', :address => 'test.com'})
+    l = LinkListBlock.new(:links => [{:icon => nil, :name => 'test', :address => 'test.com'}])
+    assert_no_match /a class="icon-[^"]+"/, render_block_content(l)
   end
   should 'not add link to javascript' do
     l = LinkListBlock.new(:links => [{:name => 'link', :address => "javascript:alert('Message test')"}])
-    assert_no_match /href="javascript/, l.link_html(l.links.first)
+    assert_no_match /href="javascript/, render_block_content(l)
   end
   should 'not add link to onclick' do
     l = LinkListBlock.new(:links => [{:name => 'link', :address => "#\" onclick=\"alert(123456)"}])
-    assert_no_tag_in_string l.link_html(l.links.first), :attributes => { :onclick => /.*/ }
+    assert_no_tag_in_string render_block_content(l), :attributes => { :onclick => /.*/ }
   end
   should 'add protocol in front of incomplete external links' do
     {'/local/link' => '/local/link', 'http://example.org' => 'http://example.org', 'example.org' => '//example.org'}.each do |input, output|
       l = LinkListBlock.new(:links => [{:name => 'categ', :address => input}])
-      assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => output}
+      assert_tag_in_string render_block_content(l), :tag => 'a', :attributes => {:href => output}
     end
   end
@@ -128,7 +130,8 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
   should 'link with title' do
     l = LinkListBlock.new
-    assert_match /title="mytitle"/, l.link_html({:name => 'mylink', :address => '/myaddress', :title => 'mytitle'})
+    l = LinkListBlock.new(:links => [{:name => 'mylink', :address => '/myaddress', :title => 'mytitle'}])
+    assert_match /title="mytitle"/, render_block_content(l)
   end
 end
@@ -18,7 +18,7 @@ class LocationBlockTest &lt; ActiveSupport::TestCase
   end
   should 'display no localization map without lat' do
-    assert_tag_in_string extract_block_content(block.content), :tag => 'i'
+    assert_tag_in_string extract_block_content(render_block_content(block)), :tag => 'i'
   end
   should 'be editable' do
@@ -31,7 +31,7 @@ class LocationBlockTest &lt; ActiveSupport::TestCase
   should 'use google maps api v3 with ssl' do
     @block.owner.lat = '-12.34'; @block.owner.save!
-    content = extract_block_content(@block.content)
+    content = extract_block_content(render_block_content(@block))
     assert_match 'https://maps.google.com/maps/api/staticmap', content
     assert_no_match /key=/, content
@@ -5,6 +5,7 @@ class ManageProductsHelperTest &lt; ActionView::TestCase
   include ManageProductsHelper
   include ContentViewerHelper
+  include ArticleHelper
   include ActionView::Helpers::AssetTagHelper
   include ApplicationHelper
@@ -19,14 +19,6 @@ class MyNetworkBlockTest &lt; ActiveSupport::TestCase
     assert_not_equal Block.new.default_title, MyNetworkBlock.new.default_title
   end
-  should 'display my-profile' do
-    self.expects(:render).with(:file => 'blocks/my_network', :locals => {
-        :title => 'My network',
-        :owner => owner
-    })
-    instance_eval(&block.content)
-  end
-
   should 'be able to update display setting' do
     user = create_user('testinguser').person
     box = fast_create(Box, :owner_id => user.id)
@@ -37,3 +29,22 @@ class MyNetworkBlockTest &lt; ActiveSupport::TestCase
   end
 end
+
+class MyNetworkBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
+  def setup
+    @block = MyNetworkBlock.new
+    @owner = Person.new(:identifier => 'testuser')
+    @block.stubs(:owner).returns(@owner)
+    owner.stubs(:environment).returns(Environment.default)
+  end
+  attr_reader :owner, :block
+
+  should 'display my-profile' do
+    ActionView::Base.any_instance.stubs(:block_title).with(anything).returns(true)
+    ActionView::Base.any_instance.stubs(:user).with(anything).returns(owner)
+    ActionView::Base.any_instance.stubs(:render_profile_actions)
+    assert_match "#{Environment.default.top_url}/profile/testuser", render_block_content(block)
+  end
+end
@@ -20,33 +20,6 @@ class ProductsBlockTest &lt; ActiveSupport::TestCase
     assert_not_equal Block.description, ProductsBlock.description
   end
-  should "list owner products" do
-    enterprise = create(Enterprise, :name => 'testenterprise', :identifier => 'testenterprise')
-    create(Product, :enterprise => enterprise, :name => 'product one', :product_category => @product_category)
-    create(Product, :enterprise => enterprise, :name => 'product two', :product_category => @product_category)
-
-    block.expects(:products).returns(enterprise.products)
-
-    content = block.content
-
-    assert_tag_in_string content, :content => 'Products'
-
-    assert_tag_in_string content, :tag => 'li', :attributes => { :class => 'product' }, :descendant => { :tag => 'a', :content => /product one/ }
-    assert_tag_in_string content, :tag => 'li', :attributes => { :class => 'product' }, :descendant => { :tag => 'a', :content => /product two/ }
-  end
-
-  should 'point to all products in footer' do
-    enterprise = create(Enterprise, :name => 'testenterprise', :identifier => 'testenterprise')
-    create(Product, :enterprise => enterprise, :name => 'product one', :product_category => @product_category)
-    create(Product, :enterprise => enterprise, :name => 'product two', :product_category => @product_category)
-
-    block.stubs(:owner).returns(enterprise)
-
-    footer = block.footer
-
-    assert_tag_in_string footer, :tag => 'a', :attributes => { :href => /\/catalog\/testenterprise$/ }, :content => 'View all products'
-  end
-
   should 'list 4 random products by default' do
     enterprise = create(Enterprise, :name => 'testenterprise', :identifier => 'testenterprise')
     create(Product, :enterprise => enterprise, :name => 'product one', :product_category => @product_category)
@@ -120,18 +93,35 @@ class ProductsBlockTest &lt; ActiveSupport::TestCase
       assert_equivalent [p1, p2, p3, p4], block.products
     end
   end
+end
-  should 'generate footer when enterprise has own hostname' do
+require 'boxes_helper'
+require 'block_helper'
+
+class ProductsBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
+  ActionView::Base.send :include, BlockHelper
+
+  def setup
+    @block = ProductsBlock.new
+    @product_category = fast_create(ProductCategory, :name => 'Products')
+  end
+  attr_reader :block
+
+  should "list owner products" do
     enterprise = create(Enterprise, :name => 'testenterprise', :identifier => 'testenterprise')
-    enterprise.domains << Domain.new(:name => 'sometest.com'); enterprise.save!
     create(Product, :enterprise => enterprise, :name => 'product one', :product_category => @product_category)
     create(Product, :enterprise => enterprise, :name => 'product two', :product_category => @product_category)
-    block.stubs(:owner).returns(enterprise)
+    block.expects(:products).returns(enterprise.products)
-    footer = block.footer
+    content = render_block_content(block)
-    assert_tag_in_string footer, :tag => 'a', :attributes => { :href => /\/catalog\/testenterprise$/ }, :content => 'View all products'
+    assert_tag_in_string content, :content => 'Products'
+
+    assert_tag_in_string content, :tag => 'li', :attributes => { :class => 'product' }, :descendant => { :tag => 'a', :content => /product one/ }
+    assert_tag_in_string content, :tag => 'li', :attributes => { :class => 'product' }, :descendant => { :tag => 'a', :content => /product two/ }
   end
   should 'display the default minor image if thumbnails were not processed' do
@@ -139,8 +129,9 @@ class ProductsBlockTest &lt; ActiveSupport::TestCase
     create(Product, :enterprise => enterprise, :name => 'product', :product_category => @product_category, :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')})
     block.expects(:products).returns(enterprise.products)
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
-    content = block.content
+    content = render_block_content(block)
     assert_tag_in_string content, :tag => 'a', :attributes => { :style => /image-loading-minor.png/ }
   end
@@ -151,9 +142,34 @@ class ProductsBlockTest &lt; ActiveSupport::TestCase
     process_delayed_job_queue
     block.expects(:products).returns(enterprise.products.reload)
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
-    content = block.content
+    content = render_block_content(block)
     assert_tag_in_string content, :tag => 'a', :attributes => { :style => /rails_minor.png/ }
   end
+  should 'point to all products in footer' do
+    enterprise = create(Enterprise, :name => 'testenterprise', :identifier => 'testenterprise')
+    create(Product, :enterprise => enterprise, :name => 'product one', :product_category => @product_category)
+    create(Product, :enterprise => enterprise, :name => 'product two', :product_category => @product_category)
+
+    block.stubs(:owner).returns(enterprise)
+
+    footer = render_block_footer(block)
+
+    assert_tag_in_string footer, :tag => 'a', :attributes => { :href => /\/catalog\/testenterprise$/ }, :content => 'View all products'
+  end
+
+  should 'generate footer when enterprise has own hostname' do
+    enterprise = create(Enterprise, :name => 'testenterprise', :identifier => 'testenterprise')
+    enterprise.domains << Domain.new(:name => 'sometest.com'); enterprise.save!
+    create(Product, :enterprise => enterprise, :name => 'product one', :product_category => @product_category)
+    create(Product, :enterprise => enterprise, :name => 'product two', :product_category => @product_category)
+
+    block.stubs(:owner).returns(enterprise)
+
+    footer = render_block_footer(block)
+
+    assert_tag_in_string footer, :tag => 'a', :attributes => { :href => /\/catalog\/testenterprise$/ }, :content => 'View all products'
+  end
 end
 require_relative "../test_helper"
+require 'boxes_helper'
 class ProfileImageBlockTest < ActiveSupport::TestCase
+  include BoxesHelper
   should 'provide description' do
     assert_not_equal Block.description, ProfileImageBlock.description
@@ -9,8 +11,8 @@ class ProfileImageBlockTest &lt; ActiveSupport::TestCase
   should 'display profile image' do
     block = ProfileImageBlock.new
-    self.expects(:render).with(:file => 'blocks/profile_image', :locals => { :block => block, :show_name => false})
-    instance_eval(& block.content)
+    self.expects(:render).with(:file => 'blocks/profile_image', :locals => { :block => block })
+    render_block_content(block)
   end
   should 'be editable' do
@@ -16,9 +16,11 @@ class ProfileInfoBlockTest &lt; ActiveSupport::TestCase
     assert_not_equal Block.description, ProfileInfoBlock.description
   end
+  include BoxesHelper
+
   should 'display profile information' do
-    self.expects(:render).with(:file => 'blocks/profile_info', :locals => { :block => block})
-    instance_eval(& block.content)
+    self.expects(:render).with(:file => 'blocks/profile_info', :locals => { :block => block })
+    render_block_content(block)
   end
 end
@@ -20,6 +20,8 @@ class ProfileListBlockTest &lt; ActiveSupport::TestCase
     assert_equal 20, block.limit
   end
+  include BoxesHelper
+
   should 'list people' do
     env = fast_create(Environment)
@@ -30,15 +32,16 @@ class ProfileListBlockTest &lt; ActiveSupport::TestCase
     block = ProfileListBlock.new
     block.stubs(:owner).returns(env)
-    self.expects(:profile_image_link).with(person1, :minor).once
-    self.expects(:profile_image_link).with(person2, :minor).once
-    self.expects(:profile_image_link).with(person3, :minor).once
-
-    self.stubs(:tag).returns('<div></div>')
-    self.expects(:content_tag).returns('<div></div>').at_least_once
-    self.expects(:block_title).returns('block title').at_least_once
+    ApplicationHelper.class_eval do
+      def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )
+        "<#{profile.name}>"
+      end
+    end
-    assert_kind_of String, instance_eval(&block.content)
+    content = render_block_content(block)
+    assert_match '<testperson1>', content
+    assert_match '<testperson2>', content
+    assert_match '<testperson3>', content
   end
   should 'list private profiles' do
@@ -10,14 +10,16 @@ class ProfileSearchBlockTest &lt; ActiveSupport::TestCase
     assert_equal Block.new.default_title, ProfileSearchBlock.new.default_title
   end
+  include BoxesHelper
+
   should 'render profile search' do
     person = fast_create(Person)
     block = ProfileSearchBlock.new
     block.stubs(:owner).returns(person)
-    self.expects(:render).with(:file => 'blocks/profile_search', :locals => { :title => block.title})
-    instance_eval(& block.content)
+    self.expects(:render).with(:file => 'blocks/profile_search', :locals => { :block => block })
+    render_block_content(block)
   end
   should 'provide view_title' do
@@ -17,9 +17,11 @@ class RawHTMLBlockTest &lt; ActiveSupport::TestCase
     assert_equal html, block.html
   end
+  include BoxesHelper
+
   should 'return html as content' do
     block = RawHTMLBlock.new(:html => "HTML")
-    assert_match(/HTML$/, block.content)
+    assert_match /HTML$/, render_block_content(block)
   end
   should 'not be editable for users without permission' do
@@ -35,17 +35,6 @@ class RecentDocumentsBlockTest &lt; ActiveSupport::TestCase
     assert_equivalent block.docs, articles
   end
-  should 'link to documents' do
-    articles.each do |a|
-      expects(:link_to).with(a.title, a.url)
-    end
-    stubs(:block_title).returns("")
-    stubs(:content_tag).returns("")
-    stubs(:li).returns("")
-
-    instance_eval(&block.content)
-  end
-
   should 'respect the maximum number of items as configured' do
     block.limit = 3
@@ -68,21 +57,6 @@ class RecentDocumentsBlockTest &lt; ActiveSupport::TestCase
     assert block.limit > 0
   end
-  should 'display a link to sitemap with title "All content"' do
-    expects(:link_to).with('All content', :controller => 'profile', :action => 'sitemap', :profile => profile.identifier)
-    expects(:_).with('All content').returns('All content')
-
-    instance_eval(&(block.footer))
-  end
-
-  should 'not display link to sitemap when owner is environment' do
-    block = RecentDocumentsBlock.new
-    box = mock
-    block.expects(:box).returns(box).at_least_once
-    box.expects(:owner).returns(Environment.new).at_least_once
-    assert_equal nil, block.footer
-  end
-
   should 'be able to update display setting' do
     assert @block.update!(:display => 'always')
     @block.reload
@@ -100,3 +74,56 @@ class RecentDocumentsBlockTest &lt; ActiveSupport::TestCase
     assert_equal 0, block.get_limit
   end
 end
+
+require 'boxes_helper'
+
+class RecentDocumentsBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
+  def setup
+    @articles = []
+    @profile = create_user('testinguser').person
+    @profile.articles.destroy_all
+    ['first', 'second', 'third', 'fourth', 'fifth'].each do |name|
+      article = @profile.articles.create!(:name => name)
+      @articles << article
+    end
+
+    box = Box.new
+    box.owner = profile
+    box.save!
+
+
+    @block = RecentDocumentsBlock.new
+    @block.box_id = box.id
+    @block.save!
+
+  end
+  attr_reader :block, :profile, :articles
+
+  should 'link to documents' do
+    articles.each do |a|
+      ActionView::Base.any_instance.expects(:link_to).with(a.title, a.url)
+    end
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:content_tag).returns("")
+    ActionView::Base.any_instance.stubs(:li).returns("")
+
+    render_block_content(block)
+  end
+
+  should 'display a link to sitemap with title "All content"' do
+    ActionView::Base.any_instance.expects(:link_to).with('All content', :controller => 'profile', :action => 'sitemap', :profile => profile.identifier)
+    ActionView::Base.any_instance.expects(:_).with('All content').returns('All content')
+
+    render_block_footer(block)
+  end
+
+  should 'not display link to sitemap when owner is environment' do
+    block = RecentDocumentsBlock.new
+    box = mock
+    block.expects(:box).returns(box).at_least_once
+    box.expects(:owner).returns(Environment.new).at_least_once
+    assert_equal '', render_block_footer(block)
+  end
+end
@@ -10,10 +10,4 @@ class SellersSearchBlockTest &lt; ActiveSupport::TestCase
     assert_not_equal Block.new.default_title, SellersSearchBlock.new.default_title
   end
-  should 'not use a fixed title' do
-    block = SellersSearchBlock.new(:title => 'my custom title')
-    expects(:render).with(:file => 'search/_sellers_form', :locals => { :title => 'my custom title'})
-    instance_eval(&block.content)
-  end
-
 end
 require_relative "../test_helper"
+require 'boxes_helper'
 class SlideshowBlockTest < ActiveSupport::TestCase
+  include BoxesHelper
   def setup
     @profile = fast_create(Profile)
@@ -30,7 +32,7 @@ class SlideshowBlockTest &lt; ActiveSupport::TestCase
     block = SlideshowBlock.new
     block.stubs(:gallery).returns(gallery)
-    block.content
+    render_block_content(block)
   end
   should 'list in random order' do
@@ -42,7 +44,7 @@ class SlideshowBlockTest &lt; ActiveSupport::TestCase
     block.stubs(:block_images).returns(images)
     images.expects(:shuffle).once.returns(shuffled)
-    block.content
+    render_block_content(block)
   end
   should 'not shuffle by default' do
@@ -25,47 +25,80 @@ class TagsBlockTest &lt; ActiveSupport::TestCase
     assert_not_equal Block.new.default_title, TagsBlock.new.default_title
   end
-  should 'generate links to tags' do
-    assert_match /profile\/testinguser\/tags\/first-tag/,  block.content
-    assert_match /profile\/testinguser\/tags\/second-tag/, block.content
-    assert_match /profile\/testinguser\/tags\/third-tag/,  block.content
+  include BoxesHelper
+
+  should 'return the max value in the range between zero and limit' do
+    block = TagsBlock.new
+    assert_equal 12, block.get_limit
   end
-  should 'generate links to tags on a environment page' do
-    @otheruser = create_user('othertestinguser').person
-    @otheruser.articles.build(:name => 'article A', :tag_list => 'other-tag').save!
-    @otheruser.articles.build(:name => 'article B', :tag_list => 'other-tag, second-tag').save!
-    box = create(Box, :owner => Environment.default)
-    @block = create(TagsBlock, :box => box)
+  should '' do
+    block = TagsBlock.new
+    block.limit = -5
+    assert_equal 0, block.get_limit
+  end
+end
+
+require 'tags_helper'
+
+class TagsBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
+  ActionView::Base.send :include, TagsHelper
+
+  def setup
+    @user = create_user('testinguser').person
+    @user.articles.build(:name => 'article 1', :tag_list => 'first-tag').save!
+    @user.articles.build(:name => 'article 2', :tag_list => 'first-tag, second-tag').save!
+    @user.articles.build(:name => 'article 3', :tag_list => 'first-tag, second-tag, third-tag').save!
-    assert_match /3 items[^>]+\/tag\/first-tag/,  block.content
-    assert_match /3 items[^>]+\/tag\/second-tag/, block.content
-    assert_match /one item[^>]+\/tag\/third-tag/, block.content
-    assert_match /2 item[^>]+\/tag\/other-tag"/,  block.content
+    box = Box.new
+    box.owner = @user
+    box.save!
+    @block = TagsBlock.new
+    @block.box = box
+    @block.save
   end
+  attr_reader :block
   should 'return (none) when no tags to display' do
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
     block.owner.expects(:article_tags).returns([])
-    assert_equal '', block.content
+    assert_equal "\n\n\n", render_block_content(block)
   end
-  should 'generate links when profile has own hostname' do
-    @user.domains << Domain.new(:name => 'testuser.net'); @user.save!
-    assert_match /profile\/testinguser\/tags\/first-tag/, block.content
+  should 'order tags alphabetically' do
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    assert /\/first-tag".*\/second-tag".*\/third-tag"/m =~ render_block_content(block)
   end
-  should 'order tags alphabetically' do
-    assert /\/first-tag".*\/second-tag".*\/third-tag"/m =~  block.content
+  should 'generate links to tags' do
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    content = render_block_content(block)
+    assert_match /profile\/testinguser\/tags\/first-tag/,  content
+    assert_match /profile\/testinguser\/tags\/second-tag/, content
+    assert_match /profile\/testinguser\/tags\/third-tag/,  content
   end
-  should 'return the max value in the range between zero and limit' do
-    block = TagsBlock.new
-    assert_equal 12, block.get_limit
+  should 'generate links to tags on a environment page' do
+    @otheruser = create_user('othertestinguser').person
+    @otheruser.articles.build(:name => 'article A', :tag_list => 'other-tag').save!
+    @otheruser.articles.build(:name => 'article B', :tag_list => 'other-tag, second-tag').save!
+    box = create(Box, :owner => Environment.default)
+    @block = create(TagsBlock, :box => box)
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+
+    content = render_block_content(block)
+    assert_match /3 items[^>]+\/tag\/first-tag/,  content
+    assert_match /3 items[^>]+\/tag\/second-tag/, content
+    assert_match /one item[^>]+\/tag\/third-tag/, content
+    assert_match /2 item[^>]+\/tag\/other-tag"/,  content
   end
-  should '' do
-    block = TagsBlock.new
-    block.limit = -5
-    assert_equal 0, block.get_limit
+
+  should 'generate links when profile has own hostname' do
+    @user.domains << Domain.new(:name => 'testuser.net'); @user.save!
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    assert_match /profile\/testinguser\/tags\/first-tag/, render_block_content(block)
   end
 end
	@@ -48,6 +48,8 @@ module ApplicationHelper		@@ -48,6 +48,8 @@ module ApplicationHelper
48		48
49	include PluginsHelper	49	include PluginsHelper
50		50
		51	+ include ButtonsHelper
		52	+
51	def locale	53	def locale
52	(@page && !@page.language.blank?) ? @page.language : FastGettext.locale	54	(@page && !@page.language.blank?) ? @page.language : FastGettext.locale
53	end	55	end
	@@ -209,52 +211,6 @@ module ApplicationHelper		@@ -209,52 +211,6 @@ module ApplicationHelper
209	result	211	result
210	end	212	end
211		213
212	- def button(type, label, url, html_options = {})
213	- html_options \|\|= {}
214	- the_class = 'with-text'
215	- if html_options.has_key?(:class)
216	- the_class << ' ' << html_options[:class]
217	- end
218	- button_without_text type, label, url, html_options.merge(:class => the_class)
219	- end
220	-
221	- def button_without_text(type, label, url, html_options = {})
222	- the_class = "button icon-#{type}"
223	- if html_options.has_key?(:class)
224	- the_class << ' ' << html_options[:class]
225	- end
226	- the_title = html_options[:title] \|\| label
227	- if html_options[:disabled]
228	- content_tag('a', ' '+content_tag('span', label), html_options.merge(:class => the_class, :title => the_title))
229	- else
230	- link_to(' '+content_tag('span', label), url, html_options.merge(:class => the_class, :title => the_title))
231	- end
232	- end
233	-
234	- def button_to_function(type, label, js_code, html_options = {}, &block)
235	- html_options[:class] = "button with-text" unless html_options[:class]
236	- html_options[:class] << " icon-#{type}"
237	- link_to_function(label, js_code, html_options, &block)
238	- end
239	-
240	- def button_to_function_without_text(type, label, js_code, html_options = {}, &block)
241	- html_options[:class] = "" unless html_options[:class]
242	- html_options[:class] << " button icon-#{type}"
243	- link_to_function(content_tag('span', label), js_code, html_options, &block)
244	- end
245	-
246	- def button_to_remote(type, label, options, html_options = {})
247	- html_options[:class] = "button with-text" unless html_options[:class]
248	- html_options[:class] << " icon-#{type}"
249	- link_to_remote(label, options, html_options)
250	- end
251	-
252	- def button_to_remote_without_text(type, label, options, html_options = {})
253	- html_options[:class] = "" unless html_options[:class]
254	- html_options[:class] << " button icon-#{type}"
255	- link_to_remote(content_tag('span', label), options, html_options.merge(:title => label))
256	- end
257	-
258	def icon(icon_name, html_options = {})	214	def icon(icon_name, html_options = {})
259	the_class = "button #{icon_name}"	215	the_class = "button #{icon_name}"
260	if html_options.has_key?(:class)	216	if html_options.has_key?(:class)
	@@ -934,13 +890,6 @@ module ApplicationHelper		@@ -934,13 +890,6 @@ module ApplicationHelper
934	content_for(:head) { stylesheet_link_tag(*args) }	890	content_for(:head) { stylesheet_link_tag(*args) }
935	end	891	end
936		892
937	- def article_to_html(article, options = {})
938	- options.merge!(:page => params[:npage])
939	- content = article.to_html(options)
940	- content = content.kind_of?(Proc) ? self.instance_exec(&content).html_safe : content.html_safe
941	- filter_html(content, article)
942	- end
943	-
944	# Please, use link_to by default!	893	# Please, use link_to by default!
945	# This method was created to work around to inexplicable	894	# This method was created to work around to inexplicable
946	# chain of problems when display_short_format was called	895	# chain of problems when display_short_format was called
	@@ -1365,16 +1314,6 @@ module ApplicationHelper		@@ -1365,16 +1314,6 @@ module ApplicationHelper
1365	@no_design_blocks = true	1314	@no_design_blocks = true
1366	end	1315	end
1367		1316
1368	- def filter_html(html, source)
1369	- if @plugins && source && source.has_macro?
1370	- html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
1371	- #TODO This parse should be done through the macro infra, but since there
1372	- # are old things that do not support it we are keeping this hot spot.
1373	- html = @plugins.pipeline(:parse_content, html, source).first
1374	- end
1375	- html && html.html_safe
1376	- end
1377	-
1378	def convert_macro(html, source)	1317	def convert_macro(html, source)
1379	doc = Nokogiri::HTML.fragment html	1318	doc = Nokogiri::HTML.fragment html
1380	#TODO This way is more efficient but do not support macro inside of	1319	#TODO This way is more efficient but do not support macro inside of
	@@ -181,4 +181,21 @@ module ArticleHelper		@@ -181,4 +181,21 @@ module ArticleHelper
181	end	181	end
182	end	182	end
183		183
		184	+ def filter_html(html, source)
		185	+ if @plugins && source && source.has_macro?
		186	+ html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
		187	+ #TODO This parse should be done through the macro infra, but since there
		188	+ # are old things that do not support it we are keeping this hot spot.
		189	+ html = @plugins.pipeline(:parse_content, html, source).first
		190	+ end
		191	+ html && html.html_safe
		192	+ end
		193	+
		194	+ def article_to_html(article, options = {})
		195	+ options.merge!(:page => params[:npage])
		196	+ content = article.to_html(options)
		197	+ content = content.kind_of?(Proc) ? self.instance_exec(&content).html_safe : content.html_safe
		198	+ filter_html(content, article)
		199	+ end
		200	+
184	end	201	end
	@@ -87,10 +87,30 @@ module BoxesHelper		@@ -87,10 +87,30 @@ module BoxesHelper
87	box_decorator == DontMoveBlocks	87	box_decorator == DontMoveBlocks
88	end	88	end
89		89
90	- def display_block_content(block, person, main_content = nil)
91	- content = block.main? ? wrap_main_content(main_content) : block.content({:person => person})	90	+ def render_block_content(block)
		91	+ template_name = block.class.name.underscore.gsub('_block', '')
		92	+ template_filename = "#{template_name}.html.erb"
		93	+ if File.exists? Rails.root.join('app', 'views', 'blocks', template_filename)
		94	+ render :file => "blocks/#{template_name}", :locals => { :block => block }
		95	+ else
		96	+ nil
		97	+ end
		98	+ end
		99	+
		100	+ def render_block_footer(block)
		101	+ template_name = block.class.name.underscore.gsub('_block', '')
		102	+ template_filename = "#{template_name}.html.erb"
		103	+ if File.exists? Rails.root.join('app', 'views', 'blocks', 'footers', template_filename)
		104	+ render :file => "blocks/footers/#{template_name}", :locals => { :block => block }
		105	+ else
		106	+ nil
		107	+ end
		108	+ end
		109	+
		110	+ def display_block_content(block, main_content = nil)
		111	+ content = block.main? ? wrap_main_content(main_content) : render_block_content(block)
92	result = extract_block_content(content)	112	result = extract_block_content(content)
93	- footer_content = extract_block_content(block.footer)	113	+ footer_content = extract_block_content(render_block_footer(block))
94	unless footer_content.blank?	114	unless footer_content.blank?
95	footer_content = content_tag('div', footer_content, :class => 'block-footer-content' )	115	footer_content = content_tag('div', footer_content, :class => 'block-footer-content' )
96	end	116	end
@@ -0,0 +1,47 @@		@@ -0,0 +1,47 @@
	1	+module ButtonsHelper
	2	+ def button(type, label, url, html_options = {})
	3	+ html_options \|\|= {}
	4	+ the_class = 'with-text'
	5	+ if html_options.has_key?(:class)
	6	+ the_class << ' ' << html_options[:class]
	7	+ end
	8	+ button_without_text type, label, url, html_options.merge(:class => the_class)
	9	+ end
	10	+
	11	+ def button_without_text(type, label, url, html_options = {})
	12	+ the_class = "button icon-#{type}"
	13	+ if html_options.has_key?(:class)
	14	+ the_class << ' ' << html_options[:class]
	15	+ end
	16	+ the_title = html_options[:title] \|\| label
	17	+ if html_options[:disabled]
	18	+ content_tag('a', ' '+content_tag('span', label), html_options.merge(:class => the_class, :title => the_title))
	19	+ else
	20	+ link_to(' '+content_tag('span', label), url, html_options.merge(:class => the_class, :title => the_title))
	21	+ end
	22	+ end
	23	+
	24	+ def button_to_function(type, label, js_code, html_options = {}, &block)
	25	+ html_options[:class] = "button with-text" unless html_options[:class]
	26	+ html_options[:class] << " icon-#{type}"
	27	+ link_to_function(label, js_code, html_options, &block)
	28	+ end
	29	+
	30	+ def button_to_function_without_text(type, label, js_code, html_options = {}, &block)
	31	+ html_options[:class] = "" unless html_options[:class]
	32	+ html_options[:class] << " button icon-#{type}"
	33	+ link_to_function(content_tag('span', label), js_code, html_options, &block)
	34	+ end
	35	+
	36	+ def button_to_remote(type, label, options, html_options = {})
	37	+ html_options[:class] = "button with-text" unless html_options[:class]
	38	+ html_options[:class] << " icon-#{type}"
	39	+ link_to_remote(label, options, html_options)
	40	+ end
	41	+
	42	+ def button_to_remote_without_text(type, label, options, html_options = {})
	43	+ html_options[:class] = "" unless html_options[:class]
	44	+ html_options[:class] << " button icon-#{type}"
	45	+ link_to_remote(content_tag('span', label), options, html_options.merge(:title => label))
	46	+ end
	47	+end
	@@ -18,18 +18,6 @@ class ArticleBlock < Block		@@ -18,18 +18,6 @@ class ArticleBlock < Block
18	_('This block displays one of your articles. You can edit the block to select which one of your articles is going to be displayed in the block.')	18	_('This block displays one of your articles. You can edit the block to select which one of your articles is going to be displayed in the block.')
19	end	19	end
20		20
21	- def content(args={})
22	- block = self
23	- proc do
24	- block_title(block.title) +
25	- (block.article ? article_to_html(FilePresenter.for(block.article),
26	- :gallery_view => false,
27	- :inside_block => block, # For Blogs and folders
28	- :format => block.visualization_format # For Articles and contents
29	- ).html_safe : _('Article not selected yet.'))
30	- end
31	- end
32	-
33	def article_id	21	def article_id
34	self.settings[:article_id]	22	self.settings[:article_id]
35	end	23	end
	@@ -93,4 +93,20 @@ class Blog < Folder		@@ -93,4 +93,20 @@ class Blog < Folder
93	posts.where("type != 'RssFeed'").order(:updated_at).limit(limit)	93	posts.where("type != 'RssFeed'").order(:updated_at).limit(limit)
94	end	94	end
95		95
		96	+ def total_number_of_posts(group_by, year = nil)
		97	+ case group_by
		98	+ when :by_year
		99	+ posts.published.native_translations
		100	+ .except(:order)
		101	+ .count(:all, :group => 'EXTRACT(YEAR FROM published_at)')
		102	+ .sort_by {\|year, count\| -year.to_i}
		103	+ when :by_month
		104	+ posts.published.native_translations
		105	+ .except(:order)
		106	+ .where('EXTRACT(YEAR FROM published_at)=?', year.to_i)
		107	+ .group('EXTRACT(MONTH FROM published_at)')
		108	+ .count
		109	+ .sort_by {\|month, count\| -month.to_i}
		110	+ end
		111	+ end
96	end	112	end
	@@ -21,30 +21,6 @@ class BlogArchivesBlock < Block		@@ -21,30 +21,6 @@ class BlogArchivesBlock < Block
21	blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog	21	blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog
22	end	22	end
23		23
24	- def visible_posts(person)
25	- #FIXME Performance issues with display_to. Must convert it to a scope.
26	- # Checkout this page for further information: http://noosfero.org/Development/ActionItem2705
27	- blog.posts.published.native_translations #.select {\|post\| post.display_to?(person)}
28	- end
29	-
30	- def content(args={})
31	- owner_blog = self.blog
32	- return nil unless owner_blog
33	- results = ''
34	- posts = visible_posts(args[:person])
35	- posts.except(:order).count(:all, :group => 'EXTRACT(YEAR FROM published_at)').sort_by {\|year, count\| -year.to_i}.each do \|year, count\|
36	- results << content_tag('li', content_tag('strong', "#{year.to_i} (#{count})"))
37	- results << "<ul class='#{year.to_i}-archive'>"
38	- posts.except(:order).where('EXTRACT(YEAR FROM published_at)=?', year.to_i).group('EXTRACT(MONTH FROM published_at)').count.sort_by {\|month, count\| -month.to_i}.each do \|month, count\|
39	- results << content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", owner_blog.url.merge(year: year.to_i, month: month.to_i)))
40	- end
41	- results << "</ul>"
42	- end
43	- block_title(title) +
44	- content_tag('ul', results, :class => 'blog-archives') +
45	- content_tag('div', link_to(_('Subscribe RSS Feed'), owner_blog.feed.url), :class => 'subscribe-feed')
46	- end
47	-
48	def self.expire_on	24	def self.expire_on
49	{ :profile => [:article], :environment => [:article] }	25	{ :profile => [:article], :environment => [:article] }
50	end	26	end
	@@ -30,13 +30,6 @@ class CategoriesBlock < Block		@@ -30,13 +30,6 @@ class CategoriesBlock < Block
30	Category.top_level_for(self.owner).from_types(self.category_types)	30	Category.top_level_for(self.owner).from_types(self.category_types)
31	end	31	end
32		32
33	- def content(args={})
34	- block = self
35	- proc do
36	- render :file => 'blocks/categories', :locals => { :block => block }
37	- end
38	- end
39	-
40	def self.expire_on	33	def self.expire_on
41	{ :profile => [], :environment => [:category] }	34	{ :profile => [], :environment => [:category] }
42	end	35	end
	@@ -27,15 +27,6 @@ class CommunitiesBlock < ProfileListBlock		@@ -27,15 +27,6 @@ class CommunitiesBlock < ProfileListBlock
27	owner.profile_suggestions.of_community.enabled.limit(3).includes(:suggestion)	27	owner.profile_suggestions.of_community.enabled.limit(3).includes(:suggestion)
28	end	28	end
29		29
30	- def footer
31	- owner = self.owner
32	- suggestions = self.suggestions
33	- return '' unless owner.kind_of?(Profile) \|\| owner.kind_of?(Environment)
34	- proc do
35	- render :file => 'blocks/communities', :locals => { :owner => owner, :suggestions => suggestions }
36	- end
37	- end
38	-
39	def profiles	30	def profiles
40	owner.communities	31	owner.communities
41	end	32	end
	@@ -12,13 +12,6 @@ class DisabledEnterpriseMessageBlock < Block		@@ -12,13 +12,6 @@ class DisabledEnterpriseMessageBlock < Block
12	_('Message')	12	_('Message')
13	end	13	end
14		14
15	- def content(args={})
16	- message = self.owner.environment.message_for_disabled_enterprise \|\| ''
17	- lambda do \|_\|
18	- render :file => 'blocks/disabled_enterprise_message', :locals => {:message => message}
19	- end
20	- end
21	-
22	def editable?(user=nil)	15	def editable?(user=nil)
23	false	16	false
24	end	17	end