Merge branch 'master' into serpro_api

Joenio Costa
2 parents 16cfebe1 9e77f7f1
Showing 179 changed files with 1649 additions and 1093 deletions Show diff stats
.travis.yml
CHANGELOG
app/controllers/my_profile/profile_members_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/block_helper.rb
app/helpers/boxes_helper.rb
app/helpers/buttons_helper.rb
app/helpers/forms_helper.rb
app/mailers/mailing.rb
app/mailers/organization_mailing.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
@@ -24,6 +24,9 @@ addons:
       - libreadline-dev
       - libsqlite3-dev
       - libxslt1-dev
+  artifacts:
+    paths:
+      - $(ls tmp/artifact* | tr "\n" ":")
 # workaround for https://github.com/travis-ci/travis-ci/issues/4536
 before_install:
@@ -32,7 +35,7 @@ before_install:
 cache: bundler
 before_script:
-  - mkdir -p tmp/{pids,cache} log
+  - mkdir -p tmp/{pids,cache} log cache
   - script/noosfero-plugins disableall
   #- bundle exec rake makemo &>/dev/null
 # database
@@ -0,0 +1,12 @@
+If you made any significant change to the code that you consider worth being
+reminded on the Release Notes, also include a correspondent entry here. If you
+are not sure in which release your code will be released, include it on the
+latest release and leave it to the commiter or RM responsible for it.
+
+v 1.5.0 (unreleased)
+  - Allow groups to disable admin email notificationo
+  - Add option to HighlightsBlock to open link in a new tab
+  - Move blocks html generation from models to helpers
+
+v 1.4.0
+  - Migration from Rails 3 to Rails 4!
@@ -2,8 +2,27 @@ class ProfileMembersController &lt; MyProfileController
   protect 'manage_memberships', :profile
   def index
-    @members = profile.members_by_name
-    @member_role = environment.roles.find_by_name('member')
+    @filters = params[:filters] || {:roles => []}
+    all_roles = Profile::Roles.organization_member_roles(environment.id) | Profile::Roles.organization_custom_roles(environment.id, profile.id)
+    @filters[:roles] = all_roles unless @filters[:roles].present?
+    @data = {}
+    field = 'name'
+    field = 'email' if @filters[:name] =~ /\@/
+
+    @data[:members] = profile.members_by(field,@filters[:name]).by_role(@filters[:roles])
+    session[:members_filtered] = @data[:members].map{|m|m.id} if request.post?
+    @data[:roles] = all_roles
+
+  end
+
+  def send_mail
+    session[:members_filtered] = params[:members_filtered].select{|value| value!="0"}
+    if session[:members_filtered].present?
+      redirect_to :controller => :profile, :action => :send_mail
+    else
+      session[:notice] = _("Select at least one member.")
+      redirect_to :action => :index
+    end
   end
   def update_roles
@@ -156,4 +175,13 @@ class ProfileMembersController &lt; MyProfileController
     end
   end
+  def search_members
+    field = 'name'
+    field = 'email' if params[:filter_name] =~ /\@/
+
+    result = profile.members_like field, params[:filter_name]
+    result = result.select{|member| member.can_view_field?(current_person, "email") } if field=="email"
+    render :json => result.map { |member| {:label => "#{member.name}#{member.can_view_field?(current_person, "email") ? " <#{member.email}>" : ""}", :value => member.name }}
+  end
+
 end
@@ -239,8 +239,12 @@ class ContentViewerController &lt; ApplicationController
   def get_posts(year = nil, month = nil)
     if year && month
-      filter_date = DateTime.parse("#{year}-#{month}-01")
-      return @page.posts.by_range(filter_date..filter_date.at_end_of_month)
+      begin
+        filter_date = DateTime.parse("#{year}-#{month}-01")
+        return @page.posts.by_range(filter_date..filter_date.at_end_of_month)
+      rescue ArgumentError
+        return @page.posts
+      end
     else
       return @page.posts
     end
@@ -370,6 +370,7 @@ class ProfileController &lt; PublicController
   def send_mail
     @mailing = profile.mailings.build(params[:mailing])
+    @mailing.data = session[:members_filtered] ? {:members_filtered => session[:members_filtered]} : {}
     if request.post?
       @mailing.locale = locale
       @mailing.person = user
@@ -48,6 +48,8 @@ module ApplicationHelper
   include PluginsHelper
+  include ButtonsHelper
+
   def locale
     (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   end
@@ -148,14 +150,8 @@ module ApplicationHelper
     link_to text, profile_path(:profile => profile) , options
   end
-  def link_to_homepage(text, profile = nil, options = {})
-    p = if profile
-          Profile[profile]
-        else
-          user
-        end
-
-    link_to text, p.url, options
+  def link_to_homepage(text, profile, options = {})
+    link_to text, profile.url, options
   end
   def link_if_permitted(link, permission = nil, target = nil)
@@ -215,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)
@@ -940,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
@@ -1049,10 +992,11 @@ module ApplicationHelper
   end
   def search_contents_menu
+    host = environment.default_hostname
     links = [
-      {s_('contents|More recent') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_recent'})}},
-      {s_('contents|More viewed') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}},
-      {s_('contents|Most commented') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_comments'})}}
+      {s_('contents|More recent') => {href: url_for({host: host, controller: 'search', action: 'contents', filter: 'more_recent'})}},
+      {s_('contents|More viewed') => {href: url_for({host: host, controller: 'search', action: 'contents', filter: 'more_popular'})}},
+      {s_('contents|Most commented') => {href: url_for({host: host, controller: 'search', action: 'contents', filter: 'more_comments'})}}
     ]
     if logged_in?
       links.push(_('New content') => modal_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
@@ -1064,10 +1008,11 @@ module ApplicationHelper
   alias :browse_contents_menu :search_contents_menu
   def search_people_menu
+    host = environment.default_hostname
      links = [
-       {s_('people|More recent') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_recent'})}},
-       {s_('people|More active') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_active'})}},
-       {s_('people|More popular') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_popular'})}}
+       {s_('people|More recent') => {href: url_for({host: host, controller: 'search', action: 'people', filter: 'more_recent'})}},
+       {s_('people|More active') => {href: url_for({host: host, controller: 'search', action: 'people', filter: 'more_active'})}},
+       {s_('people|More popular') => {href: url_for({host: host, controller: 'search', action: 'people', filter: 'more_popular'})}}
      ]
      if logged_in?
        links.push(_('My friends') => {:href => url_for({:profile => current_user.login, :controller => 'friends'})})
@@ -1080,10 +1025,11 @@ module ApplicationHelper
   alias :browse_people_menu :search_people_menu
   def search_communities_menu
+    host = environment.default_hostname
      links = [
-       {s_('communities|More recent') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_recent'})}},
-       {s_('communities|More active') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_active'})}},
-       {s_('communities|More popular') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_popular'})}}
+       {s_('communities|More recent') => {href: url_for({host: host, controller: 'search', action: 'communities', filter: 'more_recent'})}},
+       {s_('communities|More active') => {href: url_for({host: host, controller: 'search', action: 'communities', filter: 'more_active'})}},
+       {s_('communities|More popular') => {href: url_for({host: host, controller: 'search', action: 'communities', filter: 'more_popular'})}}
      ]
      if logged_in?
        links.push(_('My communities') => {:href => url_for({:profile => current_user.login, :controller => 'memberships'})})
@@ -1368,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
@@ -14,6 +14,7 @@ module BlockHelper
       </td>
       <td>#{text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 20}</td>
       <td>#{text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 1}</td>
+      <td>#{check_box_tag 'block[images][][new_window]', '1', image[:new_window], :class => 'highlight-new_window', :size => 1}</td>
     </tr><tr class=\"image-title\" data-row-number='#{row_number}'>
       <td colspan=\"3\"><label>#{
         content_tag('span', _('Title')) +
@@ -87,10 +87,38 @@ 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 block, prefix = nil, klass = block.class
+    template_name = klass.name.underscore.sub '_block', ''
+    begin
+      render template: "blocks/#{prefix}#{template_name}", locals: { block: block }
+    rescue ActionView::MissingTemplate
+      return if klass.superclass === Block
+      render_block block, prefix, klass.superclass
+    end
+  end
+
+  def render_block_content block
+    # FIXME: this conditional should be removed after all
+    # block footer from plugins methods get refactored into helpers and views.
+    # They are a failsafe until all of them are done.
+    return block.content if block.method(:content).owner != Block
+    render_block block
+  end
+
+  def render_block_footer block
+    return block.footer if block.method(:footer).owner != Block
+    render_block block, 'footers/'
+  end
+
+  def display_block_content(block, main_content = nil)
+    content = nil
+    if block.main?
+      content = wrap_main_content(main_content)
+    else
+      content = render_block_content block
+    end
     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
@@ -7,9 +7,10 @@ module FormsHelper
   def labelled_check_box( human_name, name, value = "1", checked = false, options = {} )
     options[:id] ||= 'checkbox-' + FormsHelper.next_id_number
-    hidden_field_tag(name, '0') +
-      check_box_tag( name, value, checked, options ) +
-      content_tag( 'label', human_name, :for => options[:id] )
+    html = options[:add_hidden] == false ? "" : hidden_field_tag(name, '0')
+
+    html += check_box_tag( name, value, checked, options ) +
+         content_tag( 'label', human_name, :for => options[:id] )
   end
   def labelled_text_field( human_name, name, value=nil, options={} )
@@ -2,7 +2,10 @@ require_dependency &#39;mailing_job&#39;
 class Mailing < ActiveRecord::Base
-  attr_accessible :subject, :body
+  acts_as_having_settings :field => :data
+
+  attr_accessible :subject, :body, :data
+
   validates_presence_of :source_id, :subject, :body
   belongs_to :source, :foreign_key => :source_id, :polymorphic => true
   belongs_to :person
@@ -5,9 +5,17 @@ class OrganizationMailing &lt; Mailing
   end
   def recipients(offset=0, limit=100)
-    source.members.order(:id).offset(offset).limit(limit)
-      .joins("LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)")
+    result = source.members.order(:id).offset(offset).limit(limit)
+
+    if data.present? and data.is_a?(Hash) and data[:members_filtered]
+      result = result.where('profiles.id IN (?)', data[:members_filtered])
+    end
+
+    if result.blank?
+      result = result.joins("LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)")
       .where("m.person_id" => nil)
+    end
+    result
   end
   def each_recipient
@@ -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
@@ -15,6 +15,8 @@ class HighlightsBlock &lt; Block
       if !Noosfero.root.nil? and !i[:address].start_with?(Noosfero.root + '/')
         i[:address] = Noosfero.root + i[:address]
       end
+      i[:new_window] = i[:new_window] == '1' ? true : false
+
       begin
         file = UploadedFile.find(i[:image_id])
         i[:image_src] = file.public_filename
@@ -41,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
@@ -16,10 +16,13 @@ class Person &lt; Profile
   acts_as_trackable :after_add => Proc.new {|p,t| notify_activity(t)}
   acts_as_accessor
-  scope :members_of, -> resources {
+  scope :members_of, lambda { |resources, field = ''|
     resources = Array(resources)
+    joins = [:role_assignments]
+    joins << :user if User.attribute_names.include? field
+
     conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
-    distinct.select('profiles.*').joins(:role_assignments).where([conditions])
+    distinct.select('profiles.*').joins(joins).where([conditions])
   }
   scope :not_members_of, -> resources {
@@ -48,8 +51,7 @@ class Person &lt; Profile
       ['( roles.key = ? AND role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? ) OR (
         ( ( friendships.person_id = ? ) OR (profiles.public_profile = ?)) AND (profiles.visible = ?) )', 'environment_administrator', Profile.name, person.id, person.id,  true, true]
     ).uniq
-  }
-
+    }
   def has_permission_with_admin?(permission, resource)
     return true if resource.blank? || resource.admins.include?(self)
@@ -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
@@ -5,7 +5,7 @@ class Profile &lt; ActiveRecord::Base
   attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time,
     :redirection_after_login, :custom_url_redirection,
-    :email_suggestions, :allow_members_to_invite, :invite_friends_only, :secret
+    :email_suggestions, :allow_members_to_invite, :invite_friends_only, :secret, :profile_admin_mail_notification
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
@@ -49,6 +49,9 @@ class Profile &lt; ActiveRecord::Base
     def self.organization_member_roles(env_id)
       all_roles(env_id).select{ |r| r.key.match(/^profile_/) unless r.key.blank? || !r.profile_id.nil?}
     end
+    def self.organization_custom_roles(env_id, profile_id)
+      all_roles(env_id).where('profile_id = ?', profile_id)
+    end
     def self.all_roles(env_id)
       Role.where(environment_id: env_id)
     end
@@ -155,15 +158,23 @@ class Profile &lt; ActiveRecord::Base
   include TimeScopes
-  def members
+  def members(by_field = '')
     scopes = plugins.dispatch_scopes(:organization_members, self)
-    scopes << Person.members_of(self)
+    scopes << Person.members_of(self,by_field)
     return scopes.first if scopes.size == 1
     ScopeTool.union *scopes
   end
-  def members_by_name
-    members.order('profiles.name')
+  def members_by(field,value = nil)
+    if value and !value.blank?
+      members_like(field,value).order('profiles.name')
+    else
+      members.order('profiles.name')
+    end
+  end
+
+  def members_like(field,value)
+    members(field).where("LOWER(#{field}) LIKE ?", "%#{value.downcase}%") if value
   end
   class << self
@@ -234,6 +245,7 @@ class Profile &lt; ActiveRecord::Base
   settings_items :description
   settings_items :fields_privacy, :type => :hash, :default => {}
   settings_items :email_suggestions, :type => :boolean, :default => false
+  settings_items :profile_admin_mail_notification, :type => :boolean, :default => true
   validates_length_of :description, :maximum => 550, :allow_nil => true
@@ -1102,6 +1114,10 @@ private :generate_url, :url_options
     end
   end
+  def can_view_field? current_person, field
+    display_private_info_to?(current_person) || (public_fields.include?(field) && public?)
+  end
+
   validates_inclusion_of :redirection_after_login, :in => Environment.login_redirection_options.keys, :allow_nil => true
   def preferred_login_redirection
     redirection_after_login.blank? ? environment.redirection_after_login : redirection_after_login
@@ -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
@@ -67,7 +67,9 @@ class Task &lt; ActiveRecord::Base
       begin
         target_msg = task.target_notification_message
         if target_msg && task.target && !task.target.notification_emails.empty?
-          TaskMailer.target_notification(task, target_msg).deliver
+          if target_profile_accepts_notification?(task)
+            TaskMailer.target_notification(task, target_msg).deliver
+          end
         end
       rescue NotImplementedError => ex
         Rails.logger.info ex.to_s
@@ -75,6 +77,14 @@ class Task &lt; ActiveRecord::Base
     end
   end
+  def target_profile_accepts_notification?(task)
+    if task.target.kind_of? Organization
+      return task.target.profile_admin_mail_notification
+    else
+      true
+    end
+  end
+
   # this method finished the task. It calls #perform, which must be overriden
   # by subclasses. At the end a message (as returned by #finish_message) is
   # sent to the requestor with #notify_requestor.
@@ -11,7 +11,7 @@
 </p>
 <p>
-<%= link_to_homepage(_('My home page.')) %>
+<%= link_to_homepage(_('My home page.'), user) %>
 <%= _('See your homepage.') %>
 </p>
@@ -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 %>
@@ -3,7 +3,7 @@
   <div class='highlights-border'>
     <div class='highlights-container'>
       <% block.featured_images.each do |img| %>
-        <a href="<%= img[:address] %>" title="<%= img[:title] %>" class="highlights-image-link">
+        <a href="<%= img[:address] %>" <%= 'target="_blank"' if img[:new_window] %> title="<%= img[:title] %>" class="highlights-image-link">
           <%= image_tag [Noosfero.root, img[:image_src]].join, alt: img[:title] %>
           <p class="highlights-label"><%= img[:title] %></p>
         </a>
@@ -0,0 +1,14 @@
+<%= block_title(block.title) %>
+
+<%= block.links.empty? && block.title.empty? ? content_tag('em', _('Please, edit this block to add links')) : '' %>
+
+<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 %>
@@ -3,7 +3,7 @@
 <strong><%= _('Highlights') %></strong>
 <table class="noborder"><tbody id="highlights-data-table">
-  <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th></tr>
+  <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th><th><%= _('New Window') %></th></tr>
   <% @block.images.each_with_index do |image, index| %>
     <%= highlights_block_config_image_fields @block, image, index %>
   <% end %>
 <p>
 <em>
-  <%= _('Drag images to add them to the text.') %>
-  <%= _('Click on file names to add links to the text.') %>
+  <%= _('Drag images to add them to the text or click on file names to add links to the text.') %>
 </em>
 </p>
@@ -17,8 +17,8 @@
                 :parent_id, profile, default_folder, {}, {},
                 "type='Folder' or type='Gallery'"
           ) %>
+          <%= button(:newfolder, _('New folder'), '#', :id => 'new-folder-button') %>
         </div>
-        <%= button(:newfolder, _('New folder'), '#', :id => 'new-folder-button') %>
         <p><%= file_field_tag('file', :multiple => true) %></p>
       <% end %>
     </div>
@@ -31,7 +31,7 @@
   <div id='published-media' class='text-editor-sidebar-box' data-url='<%= url_for({:controller => 'cms', :action => 'published_media_items', :profile => profile.identifier}) %>'>
     <%= select_profile_folder(nil, :parent_id, profile, 'recent-media', {}, {},
         "type='Folder' or type='Gallery'", {:root_label => _('Recent media')}) %>
-    <%= labelled_form_field _('Search'), text_field_tag('q') %>
+    <%= labelled_form_field _('Search among your uploaded files'), text_field_tag('q', '', placeholder: _('Write words about the file you are looking for')) %>
     <%= render :partial => 'drag_and_drop_note' %>
     <div class='items'>
       <%= render :partial => 'published_media_items' %>
@@ -4,6 +4,9 @@
 <%= error_messages_for :mailing %>
+  <% to = @mailing.data[:members_filtered].present? ? @mailing.recipients.map{|r| r.name}.join(', ') : _('All members')%>
+  <%= labelled_form_field(_('To:'), text_area(:data, 'members_filtered', :value => to, :rows => 4, :disabled => 'disabled', :class => 'send-mail-recipients'))  %>
+
 <%= form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
 <h2><%= _('Moderation options') %></h2>
 <% if profile.community? %>
   <div style='margin-bottom: 1em'>
+    <h4><%= _('Email Configuration:')%></h4>
+  </div>
+  <div style='margin-bottom: 0.5em'>
+    <%= check_box(:profile_data, :profile_admin_mail_notification, :style => 'float: left') %>
+    <div style='margin-left: 30px'>
+      <%= _('Send administrator Email for every task') %>
+    </div>
+  </div>
+
+  <div style='margin-bottom: 1em'>
     <h4><%= _('Invitation moderation:')%></h4>
   </div>
   <div style='margin-bottom: 0.5em'>
@@ -5,7 +5,7 @@
     <%= button :person, _('Invite people to join'), :controller => 'invite', :action => 'invite_friends' %>
   <% end %>
   <% if profile.community? and user.has_permission?(:send_mail_to_members, profile) %>
-    <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
+    <%= submit_button(:send, _('Send e-mail to members')) %>
   <% end %>
   <% @plugins.dispatch(:manage_members_extra_buttons).each do |plugin_button| %>
     <%= button plugin_button[:icon], plugin_button[:title], plugin_button[:url] %>
@@ -0,0 +1,18 @@
+<%= form_tag '#', :method => 'post' do %>
+
+    <%= field_set_tag _('Filter'), :class => 'filter_fields' do %>
+        <p>
+          <%= labelled_text_field(_('Name or Email')+': ', "filters[name]", @filters[:name], {:id => 'filter-name-autocomplete',:size => 30}) %>
+        </p>
+
+        <p><%= _('Roles:') %> </p>
+        <% @data[:roles].each do |r| %>
+          <%= labelled_check_box(r.name, 'filters[roles][]', r.id, @filters[:roles].include?(r.id.to_s), :add_hidden => false) %><br/>
+        <% end %>
+        <p>
+          <%= submit_button(:search, _('Search')) %>
+        </p>
+    <% end %>
+<% end %>
+
+<%= javascript_include_tag params[:controller] %>
 \ No newline at end of file
-<% collection = @collection == :profile_admins ? profile.admins : profile.members_by_name %>
+<% members = @data ? @data[:members] : profile.members_by('name') %>
+<% collection = @collection == :profile_admins ? profile.admins : members %>
 <% title = @title ? @title : _('Current members') %>
 <% remove_action = @remove_action ? @remove_action : {:action => 'unassociate'} %>
+<%= javascript_include_tag params[:controller] %>
 <h3><%= title %></h3>
 <table>
+  <col width="1">
   <tr>
+    <th><%= check_box_tag 'checkbox-all', 1, false, :onClick => "toggle(this)"  %></th>
     <th><%= _('Member') %></th>
     <th><%= _('Actions') %></th>
   </tr>
+
   <% collection.each do |m| %>
     <tr title="<%= m.name %>">
+      <td><%= labelled_check_box('', 'members_filtered[]', m.id.to_s, false, :id => 'checkbox-'+m.identifier) %></td>
       <td><%= link_to_profile m.short_name, m.identifier, :title => m.name %> </td>
       <td>
         <div class="members-buttons-cell">
@@ -26,3 +32,8 @@
     </tr>
   <% end %>
 </table>
+<% if collection.empty? %>
+  <p>
+    <em><%= _('No members found to: %s') % profile.name %></em>
+  </p>
+<% end %>
 <h1><%= h profile.short_name(50) %></h1>
-<%= render :partial => 'index_buttons' %>
+<%= render :partial => 'members_filter' %>
-<div id="members-list">
-  <%= render :partial => 'members_list' %>
-</div>
+<%= form_tag 'profile_members/send_mail', :method => 'post' do %>
+  <div id="members-list">
+    <%= render :partial => 'members_list' %>
+  </div>
-<%= render :partial => 'index_buttons' %>
+  <%= render :partial => 'index_buttons' %>
+
+<% end %>
@@ -5,7 +5,7 @@
 <ul>
   <% for validator in @region.validators %>
     <li>
-    <%= link_to_homepage validator.name, validator.identifier %>
+    <%= link_to_homepage validator.name, validator %>
     <%= link_to _('Remove validation rights'), { :action => 'remove', :id => @region.id, :validator_id => validator }, :method => 'post' %>
     </li>
   <% end %>
@@ -5,7 +5,7 @@
         @order == 'more_recent' ? enterprise.send(@order + '_label') + show_date(enterprise.created_at) : enterprise.send(@order + '_label') %>
     </div>
     <div class="search-enterprise-item-column-right">
-      <%= link_to_homepage(enterprise.name, enterprise.identifier, :class => "search-result-title") %>
+      <%= link_to_homepage enterprise.name, enterprise, class: "search-result-title" %>
       <div class="search-enterprise-description">
         <% if enterprise.description %>
           <% body_stripped = strip_tags(enterprise.description) %>
@@ -44,7 +44,7 @@
   <div class="search-product-item-second-column">
     <%= link_to_product product, :class => 'search-result-title' %>
     <div class="search-product-supplier">
-      <span class="search-field-label"><%= _('Supplier') %>  </span><%= link_to_homepage(product.enterprise.name, product.enterprise.identifier) %>
+      <span class="search-field-label"><%= _('Supplier') %>  </span><%= link_to_homepage product.enterprise.name, product.enterprise %>
     </div>
     <div class="search-product-description">
       <% if product.description %>
@@ -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 %>
@@ -0,0 +1,5 @@
+class AddDataToMailing < ActiveRecord::Migration
+  def change
+    add_column :mailings, :data, :text
+  end
+end
@@ -0,0 +1,5 @@
+class AddIdToArticleFollower < ActiveRecord::Migration
+  def change
+    add_column :article_followers, :id, :primary_key
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20160202142247) do
+ActiveRecord::Schema.define(version: 20160309122141) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -51,7 +51,7 @@ ActiveRecord::Schema.define(version: 20160202142247) do
   add_index "action_tracker_notifications", ["profile_id", "action_tracker_id"], name: "index_action_tracker_notif_on_prof_id_act_tracker_id", unique: true, using: :btree
   add_index "action_tracker_notifications", ["profile_id"], name: "index_action_tracker_notifications_on_profile_id", using: :btree
-  create_table "article_followers", id: false, force: :cascade do |t|
+  create_table "article_followers", force: :cascade do |t|
     t.integer  "person_id"
     t.integer  "article_id"
     t.datetime "since"
@@ -471,6 +471,7 @@ ActiveRecord::Schema.define(version: 20160202142247) do
     t.string   "locale"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.text     "data"
   end
   create_table "national_region_types", force: :cascade do |t|
@@ -31,7 +31,8 @@ Feature: send emails to organization members
   Scenario: Send e-mail to members
     Given I am logged in as "joaosilva"
     And I go to Sample Community's members management
-    And I follow "Send e-mail to members"
+    And I check "checkbox-manoel"
+    And I press "Send e-mail to members"
     And I fill in "Subject" with "Hello, member!"
     And I fill in "Body" with "We have some news"
     When I press "Send"
@@ -40,7 +41,8 @@ Feature: send emails to organization members
   Scenario: Not send e-mail to members if subject is blank
     Given I am logged in as "joaosilva"
     And I go to Sample Community's members management
-    And I follow "Send e-mail to members"
+    And I check "checkbox-manoel"
+    And I press "Send e-mail to members"
     And I fill in "Body" with "We have some news"
     When I press "Send"
     Then I should be on /profile/sample-community/send_mail
@@ -48,7 +50,8 @@ Feature: send emails to organization members
   Scenario: Not send e-mail to members if body is blank
     Given I am logged in as "joaosilva"
     And I go to Sample Community's members management
-    And I follow "Send e-mail to members"
+    And I check "checkbox-manoel"
+    And I press "Send e-mail to members"
     And I fill in "Subject" with "Hello, user!"
     When I press "Send"
     Then I should be on /profile/sample-community/send_mail
@@ -56,7 +59,8 @@ Feature: send emails to organization members
   Scenario: Cancel creation of mailing
     Given I am logged in as "joaosilva"
     And I go to Sample Community's members management
-    And I follow "Send e-mail to members"
+    And I check "checkbox-manoel"
+    And I press "Send e-mail to members"
     When I follow "Cancel e-mail"
     Then I should be on Sample Community's members management
@@ -0,0 +1,9 @@
+
+After do |scenario|
+  if scenario.failed?
+    if ENV['TRAVIS']
+      build = ENV['TRAVIS_BUILD_NUMBER']
+      page.driver.save_screenshot "./tmp/artifact-travis-#{build}-#{scenario.name.parameterize}.png"
+    end
+  end
+end
@@ -23,6 +23,7 @@ public/user_themes
 public/designs/themes/default
 public/designs/themes/*
 public/designs/icons/default
+cache
 public/assets
 .sass-cache
@@ -57,7 +57,8 @@ namespace :ci do
     sh 'ruby', '-Itest', *tests unless tests.empty?
     sh 'cucumber', *features unless features.empty?
-    sh 'xvfb-run', '-a', 'cucumber', '-p', 'selenium', *features unless features.empty?
+    sh 'xvfb-run', '-a', '--server-args="-screen 0, 1280x1024x24"',
+      'cucumber', '-p', 'selenium', *features unless features.empty?
     changed_plugins.each do |plugin|
       if $broken_plugins.include?(plugin)
 desc 'Runs Seleniun acceptance tests'
 task :selenium do
   puts "Firefox version = #{`firefox --version`}"
-  sh "xvfb-run -a cucumber -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
+  sh "xvfb-run -a --server-args=\"-screen 0, 1280x1024x24\" cucumber -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
 end
@@ -0,0 +1,13 @@
+class CreateTextFieldTypeInCustomFormsPlugin < ActiveRecord::Migration
+  def up
+    rename_column :custom_forms_plugin_fields, :select_field_type, :show_as
+    change_column :custom_forms_plugin_fields, :show_as, :string, :null => true, :default => nil
+    update("UPDATE custom_forms_plugin_fields SET show_as='text' WHERE type = 'CustomFormsPlugin::TextField'")
+  end
+
+  def down
+    rename_column :custom_forms_plugin_fields, :show_as, :select_field_type
+    change_column :custom_forms_plugin_fields, :select_field_type, :string, :null => false, :default => 'radio'
+    update("UPDATE custom_forms_plugin_fields SET select_field_type='radio' WHERE type = 'CustomFormsPlugin::TextField'")
+  end
+end
@@ -2,8 +2,9 @@ class CustomFormsPlugin::Field &lt; ActiveRecord::Base
   self.table_name = :custom_forms_plugin_fields
   validates_presence_of :name
+  validates_length_of :default_value, :maximum => 255
-  attr_accessible :name, :form, :mandatory, :type, :position, :default_value, :select_field_type, :alternatives_attributes
+  attr_accessible :name, :form, :mandatory, :type, :position, :default_value, :show_as, :alternatives_attributes
   belongs_to :form, :class_name => 'CustomFormsPlugin::Form'
   has_many :answers, :class_name => 'CustomFormsPlugin::Answer', :dependent => :destroy
@@ -85,7 +85,11 @@ module CustomFormsPlugin::Helper
   def display_text_field(field, answer, form)
     value = answer.present? ? answer.value : field.default_value
-    text_field(form, "#{field.id}", :value => value, :disabled => display_disabled?(field, answer))
+    if field.show_as == 'textarea'
+      text_area(form, "#{field.id}", :value => value, :disabled => display_disabled?(field, answer))
+    else
+      text_field(form, "#{field.id}", :value => value, :disabled => display_disabled?(field, answer))
+    end
   end
   def default_selected(field, answer)
@@ -93,7 +97,7 @@ module CustomFormsPlugin::Helper
   end
   def display_select_field(field, answer, form)
-    case field.select_field_type
+    case field.show_as
     when 'select'
       selected = default_selected(field, answer)
       select_tag form.to_s + "[#{field.id}]", options_for_select([['','']] + field.alternatives.map {|a| [a.label, a.id.to_s]}, selected), :disabled => display_disabled?(field, answer)
@@ -114,11 +118,11 @@ module CustomFormsPlugin::Helper
   end
   def radio_button?(field)
-    type_for_options(field.class) == 'select_field' && field.select_field_type == 'radio'
+    type_for_options(field.class) == 'select_field' && field.show_as == 'radio'
   end
   def check_box?(field)
-    type_for_options(field.class) == 'select_field' && field.select_field_type == 'check_box'
+    type_for_options(field.class) == 'select_field' && field.show_as == 'check_box'
   end
 end
 class CustomFormsPlugin::SelectField < CustomFormsPlugin::Field
   self.table_name = :custom_forms_plugin_fields
-  validates_inclusion_of :select_field_type, :in => %w(radio check_box select multiple_select)
+  validates_inclusion_of :show_as, :in => %w(radio check_box select multiple_select)
   validates_length_of :alternatives, :minimum => 1, :message => 'can\'t be empty'
+
+  after_initialize do
+    self.show_as ||= 'radio'
+  end
 end
@@ -2,4 +2,9 @@ class CustomFormsPlugin::TextField &lt; CustomFormsPlugin::Field
   self.table_name = :custom_forms_plugin_fields
+  validates_inclusion_of :show_as, :in => %w(text textarea)
+
+  after_initialize do
+    self.show_as ||= 'text'
+  end
 end
@@ -13,16 +13,16 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-1-ga15645d\n"
 "POT-Creation-Date: 2015-10-30 16:35-0300\n"
-"PO-Revision-Date: 2015-08-07 16:48+0200\n"
-"Last-Translator: Antonio Terceiro <terceiro@softwarelivre.org>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
-"plugin-custom-forms/pt/>\n"
+"PO-Revision-Date: 2016-03-14 15:58+0000\n"
+"Last-Translator: Eduardo Vital <vitaldu@gmail.com>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
+"/plugin-custom-forms/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.4-dev\n"
+"X-Generator: Weblate 2.5\n"
 #: plugins/custom_forms/lib/custom_forms_plugin/form.rb:67
 msgid "Invalid string format of access."
@@ -184,7 +184,7 @@ msgstr &quot;E-mail&quot;
 #: plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb:31
 msgid "Your e-mail will be visible to this form's owners."
-msgstr ""
+msgstr "Seu e-mail ficará visível para o dono deste formulário."
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/new.html.erb:1
 msgid "New form"
@@ -220,11 +220,11 @@ msgstr &quot;Radio&quot;
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_select_field.html.erb:7
 msgid "Checkbox"
-msgstr "Checkbox"
+msgstr "Caixa de seleção"
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_select_field.html.erb:9
 msgid "Drop down"
-msgstr "Drop down"
+msgstr "Lista suspensa"
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_select_field.html.erb:11
 msgid "Multiple Select"
@@ -262,7 +262,7 @@ msgstr &quot;Disparado depois da aprovação de um novo integrante&quot;
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:29
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:38
 msgid "This field will be added automatically to your form"
-msgstr ""
+msgstr "Esse campo será adicionado automaticamente no seu formulário"
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:55
 msgid "Add a new text field"
@@ -315,18 +315,16 @@ msgid &quot;Back to forms&quot;
 msgstr "Voltar para os formulários"
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/show_submission.html.erb:10
-#, fuzzy
 msgid "Submission date"
-msgstr "Submissão salva"
+msgstr "Data da submissão"
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/show_submission.html.erb:14
-#, fuzzy
 msgid "Author"
-msgstr "Nome do autor"
+msgstr "Autor"
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/show_submission.html.erb:26
 msgid "Unauthenticated"
-msgstr ""
+msgstr "Não autenticado"
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/show_submission.html.erb:48
 msgid "Back to submissions"
@@ -95,6 +95,11 @@ tr.addition-buttons {
   color: rgba(0,0,0,0.5);
 }
+#custom-forms-plugin_submission textarea {
+  width: 100%;
+  height: 10em;
+}
+
 #custom-forms-plugin_submission-view th {
   border: none;
   text-align: right;
@@ -54,7 +54,7 @@ class CustomFormsPluginMyprofileControllerTest &lt; ActionController::TestCase
             },
             2 => {
               :name => 'Color',
-              :select_field_type => 'radio',
+              :show_as => 'radio',
               :type => 'CustomFormsPlugin::SelectField',
               :alternatives_attributes => {
                 1 => {:label => 'Red'},
@@ -82,7 +82,7 @@ class CustomFormsPluginMyprofileControllerTest &lt; ActionController::TestCase
     assert_equal 'Color', f2.name
     assert_equal f2.alternatives.map(&:label).sort, ['Red', 'Blue', 'Black'].sort
-    assert_equal f2.select_field_type, 'radio'
+    assert_equal f2.show_as, 'radio'
     assert f2.kind_of?(CustomFormsPlugin::SelectField)
   end
@@ -13,16 +13,16 @@ class CustomFormsPlugin::SelectFieldTest &lt; ActiveSupport::TestCase
     select = CustomFormsPlugin::SelectField.new(:name => 'select_field001' )
     select.alternatives << CustomFormsPlugin::Alternative.new(:label => 'option')
-    select.update_attribute(:select_field_type, 'random')
+    select.update_attribute(:show_as, 'random')
     assert select.invalid?
-    select.update_attribute(:select_field_type, 'radio')
+    select.update_attribute(:show_as, 'radio')
     assert select.valid?
-    select.update_attribute(:select_field_type, 'check_box')
+    select.update_attribute(:show_as, 'check_box')
     assert select.valid?
-    select.update_attribute(:select_field_type, 'select')
+    select.update_attribute(:show_as, 'select')
     assert select.valid?
-    select.update_attribute(:select_field_type, 'multiple_select')
+    select.update_attribute(:show_as, 'multiple_select')
     assert select.valid?
   end
 end
@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class CustomFormsPlugin::TextFieldTest < ActiveSupport::TestCase
+  should 'validate type' do
+    text = CustomFormsPlugin::TextField.new(:name => 'text-field-010' )
+
+    text.update_attribute(:show_as, 'random')
+    assert text.invalid?
+    text.update_attribute(:show_as, 'radio')
+    assert text.invalid?
+
+    text.update_attribute(:show_as, 'text')
+    assert text.valid?
+    text.update_attribute(:show_as, 'textarea')
+    assert text.valid?
+  end
+
+  should 'field type defaults to text when initialized' do
+    text = CustomFormsPlugin::TextField.new(:name => 'text_field001' )
+    assert_equal 'text', text.show_as
+  end
+end
@@ -1,32 +0,0 @@
-<div class='edit-information edit-select'>
-  <h2><%= c_('Options') %></h2>
-  <table class='action-table' style='width: 420px'>
-    <tr>
-      <th style='width: 40%'><%= _('Name') %></th>
-      <th style='width: 40%'><%= _('Value') %></th>
-      <th style='width: 20%'><%= c_('Delete') %></th>
-    </tr>
-    <% option_counter = 1 %>
-    <% (field.choices || {}).each do |name, value| %>
-      <%= render :partial => 'option', :locals => {:name => name, :value => value, :counter => counter, :option_counter => option_counter} %>
-      <% option_counter += 1 %>
-    <% end %>
-    <%= render :partial => 'empty_option', :locals => {:counter => counter, :option_counter => option_counter} %>
-    <tr class='new-item'>
-      <td colspan='3'>
-        <%= button(:add, _('Add a new option'), '#', :class => 'new-option', :field_id => counter)%>
-      </td>
-    </tr>
-  </table>
-
-  <h3><%= c_('Type') %></h3>
-  <%= labelled_radio_button 'Radio', "fields[#{counter}][kind]", 'radio', !field.multiple && !field.list %><br />
-  <%= labelled_radio_button 'Checkbox', "fields[#{counter}][kind]", 'check_box', field.multiple && !field.list %><br />
-  <%= labelled_radio_button 'Select', "fields[#{counter}][kind]", 'select', !field.multiple && field.list %><br />
-  <%= labelled_radio_button 'Multiple Select', "fields[#{counter}][kind]", 'multiple_select', field.multiple && field.list %><br />
-
-  <% button_bar do %>
-    <%= button :ok, _('Ok'), '#', :div_id => elem_id %>
-  <% end %>
-</div>
-
@@ -1,10 +0,0 @@
-<tr id="empty-field" style='display: none' last_id=<%= counter %>>
-  <td style="text-align: left"><%= text_field "fields[#{counter}]", :name, :size => 25 %></td>
-  <td><%= select "fields[#{counter}]", :type, type_options, :selected => type_for_options(field.class) %></td>
-  <td><%= check_box "fields[#{counter}]", :mandatory %></td>
-  <%= hidden_field "fields[#{counter}]", :form_id, :value => @form.id %>
-  <td class='actions'>
-    <%= button_without_text :edit, c_('Edit'), '', :field_id => counter %>
-    <%= button_without_text :remove, c_('Remove'), '#', class: 'remove-field', field_id: counter, data: {confirm: _('Are you sure you want to remove this field?')} %>
-  </td>
-</tr>
@@ -1,8 +0,0 @@
-<tr id=<%= "empty-option-#{counter}" %> option_id=<%= option_counter %> style="display: none;">
-  <td><%= text_field_tag("fields[#{counter}][choices][#{option_counter}][name]") %></td>
-  <td><%= text_field_tag("fields[#{counter}][choices][#{option_counter}][value]") %></td>
-  <td class='actions'>
-    <%= button_without_text :remove, c_('Remove'), '#', class: 'remove-option', field_id: counter, option_id: option_counter, data: {confirm: _('Are you sure you want to remove this option?')} %>
-  </td>
-</tr>
-
 <%= render :layout => 'field', :locals => { :f => f } do %>
   <div class="field-select-type">
     <%= _('Type:') %>
-    <%= f.radio_button(:select_field_type, 'radio') %>
-    <%= f.label(:select_field_type, _('Radio'), :value => 'radio') %>
-    <%= f.radio_button(:select_field_type, 'check_box') %>
-    <%= f.label(:select_field_type, _('Checkbox'), :value => 'check_box') %>
-    <%= f.radio_button(:select_field_type, 'select') %>
-    <%= f.label(:select_field_type, _('Drop down'), :value => 'select') %>
-    <%= f.radio_button(:select_field_type, 'multiple_select') %>
-    <%= f.label(:select_field_type, _('Multiple Select'), :value => 'multiple_select') %>
+    <%= f.radio_button(:show_as, 'radio') %>
+    <%= f.label(:show_as, _('Radio'), :value => 'radio') %>
+    <%= f.radio_button(:show_as, 'check_box') %>
+    <%= f.label(:show_as, _('Checkbox'), :value => 'check_box') %>
+    <%= f.radio_button(:show_as, 'select') %>
+    <%= f.label(:show_as, _('Drop down'), :value => 'select') %>
+    <%= f.radio_button(:show_as, 'multiple_select') %>
+    <%= f.label(:show_as, _('Multiple Select'), :value => 'multiple_select') %>
   </div>
   <table>
 <%= render :layout => 'field', :locals => { :f => f } do %>
+  <div class="field-select-type">
+    <%= _('Type:') %>
+    <%= f.radio_button(:show_as, 'text') %>
+    <%= f.label(:show_as, _('One-line text'), :value => 'text') %>
+    <%= f.radio_button(:show_as, 'textarea') %>
+    <%= f.label(:show_as, _('Multiline text'), :value => 'textarea') %>
+  </div>
+
   <div class="field-text-default">
     <%= f.label(:default_value, _('Default text:')) %>
     <%= f.text_field(:default_value) %>
+    <small><%= _('Maximum of 255 characters') %></small>
   </div>
 <% end %>
@@ -13,16 +13,16 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-1-ga15645d\n"
 "POT-Creation-Date: 2015-10-30 16:35-0300\n"
-"PO-Revision-Date: 2014-12-18 18:40-0200\n"
-"Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
-"noosfero/pt/>\n"
+"PO-Revision-Date: 2016-03-14 16:09+0000\n"
+"Last-Translator: Eduardo Vital <vitaldu@gmail.com>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
+"/plugin-ldap/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.0\n"
+"X-Generator: Weblate 2.5\n"
 #: plugins/ldap/lib/ldap_plugin.rb:11
 msgid "A plugin that add ldap support."
@@ -42,7 +42,7 @@ msgstr &quot;Gerenciamento do Ldap&quot;
 #: plugins/ldap/views/ldap_plugin_admin/index.html.erb:7
 msgid "LDAP Configuration"
-msgstr ""
+msgstr "Configuração do LDAP"
 #: plugins/ldap/views/ldap_plugin_admin/index.html.erb:8
 msgid "Value"
@@ -85,9 +85,8 @@ msgid &quot;Attributes&quot;
 msgstr "Atributos"
 #: plugins/ldap/views/ldap_plugin_admin/index.html.erb:47
-#, fuzzy
 msgid "LDAP Field"
-msgstr "Filtro LDAP"
+msgstr "Campo do LDAP"
 #: plugins/ldap/views/ldap_plugin_admin/index.html.erb:54
 msgid "Fullname"
@@ -98,12 +97,13 @@ msgid &quot;Mail&quot;
 msgstr "Mail"
 #: plugins/ldap/views/ldap_plugin_admin/index.html.erb:65
+#, fuzzy
 msgid "Behaviour Configuration"
-msgstr ""
+msgstr "Configuração de comportamento"
 #: plugins/ldap/views/ldap_plugin_admin/index.html.erb:70
 msgid "Allow password recovery"
-msgstr ""
+msgstr "Permitir recuperação de senha"
 #: plugins/ldap/views/ldap_plugin_admin/index.html.erb:78
 msgid "Back to plugins administration panel"
@@ -30,14 +30,14 @@ class NewsletterPluginAdminController &lt; PluginAdminController
   end
   #TODO: Make this query faster
-  def search_communities
-    communities = environment.communities
+  def search_profiles
+    profiles = environment.profiles
     blogs = Blog.joins(:profile).where(profiles: {environment_id: environment.id})
-    found_communities = find_by_contents(:communities, environment, communities, params['q'], {:page => 1})[:results]
+    found_profiles = find_by_contents(:profiles, environment, profiles, params['q'], {:page => 1})[:results]
     found_blogs = find_by_contents(:blogs, environment, blogs, params['q'], {:page => 1})[:results]
-    results = (found_blogs + found_communities.map(&:blogs).flatten).uniq
+    results = (found_blogs + found_profiles.map(&:blogs).flatten).uniq
     render :text => results.map { |blog| {:id => blog.id, :name => _("%s in %s") % [blog.name, blog.profile.name]} }.to_json
   end
 Feature: newsletter plugin
   Background:
-    Given the following users
-      | login | name |
-      | joaosilva | Joao Silva |
-    And I am logged in as "joaosilva"
+    Given I am logged in as admin
   Scenario: as admin I can configure plugin
-    Given I am logged in as admin
     When I go to the environment control panel
     And I follow "Plugins"
     Then I should see "Configuration" linking to "/admin/plugin/newsletter"
   Scenario: in the newsletter settings I can see the field to enable/disable
-    Given I am logged in as admin
     When I go to the environment control panel
     And I follow "Plugins"
     And I follow "Configuration"
     Then I should see "Enable send of newsletter to members on this environment"
   Scenario: redirect to newsletter visualization after save and visualize
-    Given I am logged in as admin
-    And "NewsletterPlugin" plugin is enabled
+    Given "NewsletterPlugin" plugin is enabled
     When I go to the environment control panel
     And I follow "Plugins"
     And I follow "Configuration"
@@ -30,11 +24,58 @@ Feature: newsletter plugin
     And I should not see "Newsletter settings"
   Scenario: stay on newsletter settings page after save
-    Given I am logged in as admin
-    And "NewsletterPlugin" plugin is enabled
+    Given "NewsletterPlugin" plugin is enabled
     When I go to the environment control panel
     And I follow "Plugins"
     And I follow "Configuration"
     And I press "Save"
     Then I should see "Newsletter settings"
     And I should not see "If you can't view this email, click here"
+
+  @selenium
+  Scenario: search community and select blog for newsletter
+    Given the following communities
+      | identifier | name |
+      | sample-community | Sample Community |
+    And the following blogs
+      | owner | name |
+      | sample-community | Sample Blog |
+    And "NewsletterPlugin" plugin is enabled
+    When I go to the environment control panel
+    And I follow "Plugins"
+    And I follow "Configuration"
+    And I type in "Sample Community" into autocomplete list "search-profiles" and I choose "Sample Blog in Sample Community"
+    And I press "Save"
+    Then I should see "Sample Blog in Sample Community"
+
+  @selenium
+  Scenario: search profile and select blog for newsletter
+    Given the following users
+      | login | name |
+      | joaosilva | Joao Silva |
+    And the following blogs
+      | owner | name |
+      | joaosilva | Joao Blog |
+    And "NewsletterPlugin" plugin is enabled
+    When I go to the environment control panel
+    And I follow "Plugins"
+    And I follow "Configuration"
+    And I type in "Silva" into autocomplete list "search-profiles" and I choose "Joao Blog in Joao Silva"
+    And I press "Save"
+    Then I should see "Joao Blog in Joao Silva"
+
+  @selenium
+  Scenario: search blog and select it for newsletter
+    Given the following communities
+      | identifier | name |
+      | sample-community | Sample Community |
+    And the following blogs
+      | owner | name |
+      | sample-community | Sample Blog |
+    And "NewsletterPlugin" plugin is enabled
+    When I go to the environment control panel
+    And I follow "Plugins"
+    And I follow "Configuration"
+    And I type in "Sample Blog" into autocomplete list "search-profiles" and I choose "Sample Blog in Sample Community"
+    And I press "Save"
+    Then I should see "Sample Blog in Sample Community"
@@ -158,7 +158,7 @@ msgid &quot;Blogs from which news will be compiled&quot;
 msgstr ""
 #: plugins/newsletter/views/newsletter_plugin_admin/index.html.erb:36
-msgid "Type in the communities' or blogs' names"
+msgid "Type in the profiles' or blogs' names"
 msgstr ""
 #: plugins/newsletter/views/newsletter_plugin_admin/index.html.erb:42
@@ -164,8 +164,8 @@ msgid &quot;Blogs from which news will be compiled&quot;
 msgstr "Blogs utilizados como fonte do boletim informativo"
 #: plugins/newsletter/views/newsletter_plugin_admin/index.html.erb:36
-msgid "Type in the communities' or blogs' names"
-msgstr "Digite nomes de comunidades ou blogs"
+msgid "Type in the profiles' or blogs' names"
+msgstr "Digite nomes de perfis ou blogs"
 #: plugins/newsletter/views/newsletter_plugin_admin/index.html.erb:42
 msgid "Recipients"
@@ -29,11 +29,11 @@
   %>
   <p><%= _('Blogs from which news will be compiled') %></p>
-  <% search_action = url_for(:action => 'search_communities') %>
+  <% search_action = url_for(:action => 'search_profiles') %>
   <% selected_blogs = @blogs.map { |blog| {:id => blog.id, :name => _("%s in %s") % [blog.name, blog.profile.name]} } %>
   <%= token_input_field_tag(
-    'newsletter[blog_ids]', 'search-communities', search_action,
-    { hint_text: _('Type in the communities\' or blogs\' names'),
+    'newsletter[blog_ids]', 'search-profiles', search_action,
+    { hint_text: _('Type in the profiles\' or blogs\' names'),
       focus: false, pre_populate: selected_blogs }) %>
   <br/>
 require_dependency 'profile'
-Profile.descendants.each do |subclass|
-  subclass.class_eval do
+class Profile
-    has_many :oauth_auths, foreign_key: :profile_id, class_name: 'OauthClientPlugin::Auth', dependent: :destroy
-    has_many :oauth_providers, through: :oauth_auths, source: :provider
+  has_many :oauth_auths, foreign_key: :profile_id, class_name: 'OauthClientPlugin::Auth', dependent: :destroy
+  has_many :oauth_providers, through: :oauth_auths, source: :provider
-  end
 end
@@ -13,16 +13,16 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-1-ga15645d\n"
 "POT-Creation-Date: 2015-10-30 16:34-0300\n"
-"PO-Revision-Date: 2015-11-15 18:17-0300\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
-"plugin-shopping-cart/pt/>\n"
+"PO-Revision-Date: 2016-03-14 15:52+0000\n"
+"Last-Translator: Eduardo Vital <vitaldu@gmail.com>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
+"/plugin-shopping-cart/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.3-dev\n"
+"X-Generator: Weblate 2.5\n"
 #: plugins/shopping_cart/lib/shopping_cart_plugin.rb:10
 msgid "A shopping basket feature for enterprises"
@@ -304,7 +304,7 @@ msgstr &quot;Nome&quot;
 #: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:16
 msgid "Email"
-msgstr ""
+msgstr "E-mail"
 #: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:17
 msgid "Contact phone"
-class Person
+require_dependency 'person'
+class Person
   settings_items :site_tour_plugin_actions, :type => Array, :default => []
-
 end
@@ -10,7 +10,7 @@
           <%= profile_image_link organization, :big, 'div' %>
         </div>
         <div class="related-organizations-item-column-right">
-          <%= link_to_homepage(organization.name, organization.identifier, :class => "search-result-title") %>
+          <%= link_to_homepage(organization.name, organization, :class => "search-result-title") %>
           <div class="related-organizations-description">
             <% if organization.description %>
               <% body_stripped = strip_tags(organization.description) %>
@@ -13,16 +13,16 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-1-ga15645d\n"
 "POT-Creation-Date: 2015-10-30 16:35-0300\n"
-"PO-Revision-Date: 2014-12-18 18:40-0200\n"
-"Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
-"noosfero/pt/>\n"
+"PO-Revision-Date: 2016-03-14 16:06+0000\n"
+"Last-Translator: Eduardo Vital <vitaldu@gmail.com>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
+"/plugin-tolerance-time/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.0\n"
+"X-Generator: Weblate 2.5\n"
 #: plugins/tolerance_time/lib/tolerance_time_plugin.rb:8
 msgid "Adds a tolerance time for editing content after its publication"
@@ -43,24 +43,23 @@ msgstr &quot;&quot;
 #: plugins/tolerance_time/lib/tolerance_time_plugin.rb:59
 msgid "editing"
-msgstr ""
+msgstr "edição"
 #: plugins/tolerance_time/lib/tolerance_time_plugin.rb:63
 msgid "cloning"
-msgstr ""
+msgstr "clonagem"
 #: plugins/tolerance_time/lib/tolerance_time_plugin.rb:70
-#, fuzzy
 msgid "The tolerance time for %s this content is over."
-msgstr "O tempo de tolerância para edição deste conteúdo acabou."
+msgstr "O tempo de tolerância para %s deste conteúdo acabou."
 #: plugins/tolerance_time/controllers/tolerance_time_plugin_myprofile_controller.rb:10
 msgid "Tolerance updated"
-msgstr "A tolerância foi atualizada"
+msgstr "O tempo de tolerância foi atualizado"
 #: plugins/tolerance_time/controllers/tolerance_time_plugin_myprofile_controller.rb:12
 msgid "Tolerance could not be updated"
-msgstr "A tolerância não pode ser atualizada"
+msgstr "O tempo de tolerância não pode ser atualizado"
 #: plugins/tolerance_time/views/tolerance_time_plugin_myprofile/index.html.erb:1
 msgid "Tolerance Adjustments"
@@ -79,6 +78,7 @@ msgid &quot;Hours&quot;
 msgstr "Horas"
 #: plugins/tolerance_time/views/tolerance_time_plugin_myprofile/index.html.erb:10
+#, fuzzy
 msgid "Content edition tolerance time"
 msgstr "Tempo de tolerância para edição de conteúdo"
@@ -87,5 +87,6 @@ msgid &quot;Comment edition tolerance time&quot;
 msgstr "Tempo de tolerância para edição de comentários"
 #: plugins/tolerance_time/views/tolerance_time_plugin_myprofile/index.html.erb:18
+#, fuzzy
 msgid "Empty means unlimited and zero means right away."
-msgstr "Vazio significa ilimitado e zero significa imediatamente."
+msgstr "Campo vazio significa ilimitado e zero significa imediatamente."
@@ -13,16 +13,16 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-1-ga15645d\n"
 "POT-Creation-Date: 2015-10-30 16:35-0300\n"
-"PO-Revision-Date: 2015-08-07 16:48+0200\n"
-"Last-Translator: Antonio Terceiro <terceiro@softwarelivre.org>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
-"plugin-work-assignment/pt/>\n"
+"PO-Revision-Date: 2016-03-14 15:58+0000\n"
+"Last-Translator: Eduardo Vital <vitaldu@gmail.com>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
+"/plugin-work-assignment/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.4-dev\n"
+"X-Generator: Weblate 2.5\n"
 #: plugins/work_assignment/lib/work_assignment_plugin.rb:8
 msgid "New kind of content for organizations."
@@ -66,7 +66,7 @@ msgstr &quot;Nome&quot;
 #: plugins/work_assignment/lib/work_assignment_plugin/helper.rb:9
 msgid "Submission date"
-msgstr "Data de submissão"
+msgstr "Data da submissão"
 #: plugins/work_assignment/lib/work_assignment_plugin/helper.rb:10
 msgid "Versions"
@@ -13,7 +13,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-8-g01ea9f7\n"
 "POT-Creation-Date: 2015-11-04 12:36-0300\n"
-"PO-Revision-Date: 2016-02-18 14:44+0000\n"
+"PO-Revision-Date: 2016-03-14 15:58+0000\n"
 "Last-Translator: Eduardo Vital <vitaldu@gmail.com>\n"
 "Language-Team: Portuguese "
 "<https://hosted.weblate.org/projects/noosfero/noosfero/pt/>\n"
@@ -22,7 +22,7 @@ msgstr &quot;&quot;
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.5-dev\n"
+"X-Generator: Weblate 2.5\n"
 #: app/models/approve_comment.rb:17
 msgid "Anonymous"
@@ -48,3 +48,9 @@
   width: 80px;
 }
+.action-profile-send_mail .send-mail-recipients {
+  color: #888888;
+  padding: 10px;
+  width: 475px;
+  line-height: 15px;
+}
@@ -0,0 +1,25 @@
+(function($) {
+
+  //Autocomplete to list members
+  $('#filter-name-autocomplete').autocomplete({
+   minLength:2,
+   source:function(request,response){
+      $.ajax({
+        url:document.location.pathname+'/search_members',
+        dataType:'json',
+        data:{
+          filter_name:request.term
+        },
+        success:response
+      });
+   }
+  });
+})(jQuery);
+
+
+function toggle(source) {
+  checkboxes = document.getElementsByName('members_filtered[]');
+  for(var i=0, n=checkboxes.length;i<n;i++) {
+    checkboxes[i].checked = source.checked;
+  }
+}
@@ -166,6 +166,12 @@ table.cms-articles .icon:hover {
   white-space: nowrap;
 }
+.controller-cms td.article-name {
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
 .controller-cms .article-controls {
   white-space: nowrap;
 }
@@ -7,6 +7,7 @@
 }
 #content .title {
   margin-bottom: 2px;
+  word-wrap: break-word;
 }
 .blog-post .post-pic {
   background-position: 50% 40%;
@@ -2,6 +2,7 @@
 .article-body ul.folder-content {
   list-style-type: none;
   padding: 0;
+  word-wrap: break-word;
 }
 .folder-content .folder-item img {
@@ -13,6 +13,7 @@
   list-style: none;
   overflow: hidden;
   background-repeat: no-repeat;
+  word-wrap: break-word;
 }
 .image-gallery-item span {
   text-align: center;
-binary_packages='deb http://download.noosfero.org/debian/jessie ./'
+binary_packages='deb http://download.noosfero.org/debian/jessie-test ./'
 source_packages=$(echo "$binary_packages" | sed -e 's/^deb/deb-src/')
@@ -10,7 +10,7 @@ EOF
   sudo apt-key add - <<EOF
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v1.4.12 (GNU/Linux)
 mQGiBE1HCIURBADw6SnRbc1qCHdTV9wD0rxSMIWevzUX+bnDgvV455yudqtVFUhX
 2QYvtlwclllbLWKzRdiM7GsBi+2DyWli4B17xl86A5RBQNdc1v1vWZG3QwURxd4E
@@ -130,6 +130,7 @@ fi
 # create needed directory
 mkdir -p tmp/pids
 mkdir -p tmp/cache
+mkdir -p cache
 # use default gitignore rules
 if [ ! -f .gitignore ]; then
@@ -71,8 +71,10 @@ class MailconfControllerTest &lt; ActionController::TestCase
     env = Environment.default
     env.force_www = true
     env.save!
+    env.domains.delete_all
+    env.domains.create! name: 'example.com'
     get :index, :profile => 'ze'
-    assert_tag :tag => 'li', :content => /ze@colivre.net/
+    assert_tag :tag => 'li', :content => /ze@example.com/
   end
   should 'not display www in email address when force_www=false' do
@@ -80,8 +82,10 @@ class MailconfControllerTest &lt; ActionController::TestCase
     env = Environment.default
     env.force_www = false
     env.save!
+    env.domains.delete_all
+    env.domains.create! name: 'example.com'
     get :index, :profile => 'ze'
-    assert_tag :tag => 'li', :content => /ze@colivre.net/
+    assert_tag :tag => 'li', :content => /ze@example.com/
   end
   should 'create task to environment admin when enable email' do
@@ -1465,11 +1465,41 @@ class ProfileControllerTest &lt; ActionController::TestCase
     create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
     login_as('profile_moderator_user')
     @controller.stubs(:locale).returns('pt')
+
     assert_difference 'Delayed::Job.count', 1 do
       post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
     end
   end
+  should 'send to members_filtered if available' do
+    community = fast_create(Community)
+    create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
+    person = create_user('Any').person
+    community.add_member(person)
+    community.save!
+    login_as('profile_moderator_user')
+
+    post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
+    assert_equivalent community.members, OrganizationMailing.last.recipients
+
+    @request.session[:members_filtered] = [person.id]
+    post :send_mail, :profile => community.identifier, :mailing => {:subject => 'RUN!!', :body => 'Run to the hills!!'}
+    assert_equal [person], OrganizationMailing.last.recipients
+  end
+
+  should 'send email to all members if there is no valid member in members_filtered' do
+    community = fast_create(Community)
+    create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
+    person = create_user('Any').person
+    community.add_member(person)
+    community.save!
+    login_as('profile_moderator_user')
+
+    @request.session[:members_filtered] = [Profile.last.id+1]
+    post :send_mail, :profile => community.identifier, :mailing => {:subject => 'RUN!!', :body => 'Run to the hills!!'}
+    assert_empty OrganizationMailing.last.recipients
+  end
+
   should 'save mailing' do
     community = fast_create(Community)
     create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
@@ -1213,4 +1213,11 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/default_user/profile_roles" }
   end
+  should 'save profile admin option to receive email for every task' do
+    comm = fast_create(Community)
+    assert comm.profile_admin_mail_notification
+    post :edit, :profile => comm.identifier, :profile_data => { :profile_admin_mail_notification => '0' }
+    refute comm.reload.profile_admin_mail_notification
+  end
+
 end
@@ -31,6 +31,31 @@ class ProfileMembersControllerTest &lt; ActionController::TestCase
     assert_template 'index'
   end
+  should 'access index and filter members by name and roles' do
+
+    ent = fast_create(Enterprise, :identifier => 'test_enterprise', :name => 'test enterprise')
+    roles = {
+     :admin => Profile::Roles.admin(Environment.default),
+     :member => Profile::Roles.member(Environment.default)
+    }
+
+    member = create_user('test_member', :email => 'testmember@test.com.br').person
+    member.add_role(roles[:member], ent)
+
+    admin = create_user('test_admin').person
+    admin.add_role roles[:admin], ent
+
+    user = create_user_with_permission('test_user', 'manage_memberships', ent)
+    login_as :test_user
+
+    post :index, :profile => 'test_enterprise' , :filters => {:name => 'testmember@test.com.br', :roles => [roles[:member].id]}
+
+    assert_response :success
+    assert_template 'index'
+
+    assert_includes assigns(:data)[:members], member
+  end
+
   should 'show form to change role' do
     ent = fast_create(Enterprise, :identifier => 'test_enterprise', :name => 'test enterprise')
     role = Profile::Roles.member(Environment.default)
@@ -171,7 +196,7 @@ class ProfileMembersControllerTest &lt; ActionController::TestCase
     login_as :test_user
     get :index, :profile => community.identifier
-    assert_tag :tag => 'a', :attributes => {:href => /send_mail/}
+    assert_tag :tag => 'input', :attributes => {:value => 'Send e-mail to members'}
   end
   should 'not display send email to members if doesn\'t have the permission' do
@@ -13,17 +13,15 @@ class EnableDisableFeaturesTest &lt; ActionDispatch::IntegrationTest
     assert_tag :tag => 'input', :attributes => { :name => 'environment[enabled_features][]', :value => 'feature2' }
     assert_tag :tag => 'input', :attributes => { :name => 'environment[enabled_features][]', :value => 'feature3' }
-    post '/admin/features/update'
-    assert_response :redirect
+    post_via_redirect '/admin/features/update'
+    assert_response :success
-    follow_redirect!
     assert_response :success
     assert_equal '/admin/features', path
-    post '/admin/features/update', :environments => { :enabled_features => [ 'feature1' ], :organization_approval_method => 'region' }
-    assert_response :redirect
+    post_via_redirect '/admin/features/update', :environments => { :enabled_features => [ 'feature1' ], :organization_approval_method => 'region' }
+    assert_response :success
-    follow_redirect!
     assert_equal '/admin/features', path
   end
@@ -61,10 +61,9 @@ class EnterpriseRegistrationTest &lt; ActionDispatch::IntegrationTest
     assert_response :success
     assert_tag :form, :attributes => { :action => "/myprofile/myorg/enterprise_validation/approve/#{code}" }
-    post "/myprofile/myorg/enterprise_validation/approve/#{code}"
-    assert_response :redirect
+    post_via_redirect "/myprofile/myorg/enterprise_validation/approve/#{code}"
+    assert_response :success
-    follow_redirect!
     assert_equal "/myprofile/myorg/enterprise_validation/view_processed/#{code}", path
     assert_tag :span, :attributes =>  { :class => 'validation_approved' }
   end
@@ -24,11 +24,10 @@ class ManageDocumentsTest &lt; ActionDispatch::IntegrationTest
     assert_tag :tag => 'form', :attributes => { :action => '/myprofile/myuser/cms/new', :method => /post/i }
     assert_difference 'Article.count' do
-      post '/myprofile/myuser/cms/new', :type => 'TinyMceArticle', :article => { :name => 'my article', :body => 'this is the body of ther article'}
+      post_via_redirect '/myprofile/myuser/cms/new', :type => 'TinyMceArticle', :article => { :name => 'my article', :body => 'this is the body of ther article'}
     end
-    assert_response :redirect
-    follow_redirect!
+    assert_response :success
     a = Article.find_by_path('my-article')
     assert_equal "/myuser/#{a.slug}", path
   end
@@ -55,14 +54,13 @@ class ManageDocumentsTest &lt; ActionDispatch::IntegrationTest
     assert_tag :tag => 'form', :attributes => { :action => "/myprofile/myuser/cms/edit/#{article.id}", :method => /post/i }
     assert_no_difference 'Article.count' do
-      post "/myprofile/myuser/cms/edit/#{article.id}", :article => { :name => 'my article', :body => 'this is the body of the article'}
+      post_via_redirect "/myprofile/myuser/cms/edit/#{article.id}", :article => { :name => 'my article', :body => 'this is the body of the article'}
     end
     article.reload
     assert_equal 'this is the body of the article', article.body
-    assert_response :redirect
-    follow_redirect!
+    assert_response :success
     a = Article.find_by_path('my-article')
     assert_equal "/myuser/#{a.slug}", path
   end
@@ -84,10 +82,9 @@ class ManageDocumentsTest &lt; ActionDispatch::IntegrationTest
     assert_response :success
     assert_tag tag: 'a', attributes: { href: "/myprofile/myuser/cms/destroy/#{article.id}", 'data-confirm' => /Are you sure/ }
-    post "/myprofile/myuser/cms/destroy/#{article.id}"
+    post_via_redirect "/myprofile/myuser/cms/destroy/#{article.id}"
-    assert_response :redirect
-    follow_redirect!
+    assert_response :success
     assert_equal "/myuser", path
     # the article was actually deleted
@@ -24,11 +24,10 @@ class ManageFriendshipsTest &lt; ActionDispatch::IntegrationTest
     get "/myprofile/#{@person.identifier}/friends/remove/#{@friend.id}"
     assert_response :success
-    post "/myprofile/#{@person.identifier}/friends/remove/#{@friend.id}",
+    post_via_redirect "/myprofile/#{@person.identifier}/friends/remove/#{@friend.id}",
       :confirmation => '1'
-    assert_response :redirect
+    assert_response :success
-    follow_redirect!
     assert assigns(:friends).empty?
     refute @person.is_a_friend?(@friend)
@@ -14,9 +14,8 @@ class ActionDispatch::IntegrationTest
   def login(username, password)
     ActionDispatch::Integration::Session.any_instance.stubs(:https?).returns(true)
-    post '/account/login', :user => { :login => username, :password => password }
-    assert_response :redirect
-    follow_redirect!
+    post_via_redirect '/account/login', :user => { :login => username, :password => password }
+    assert_response :success
     assert_not_equal '/account/login', path
   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
@@ -22,21 +22,6 @@ class ArticleTest &lt; ActiveSupport::TestCase
     refute a.errors[:profile_id.to_s].present?
   end
-  should 'keep unique users in list of followers' do
-    person1 = create_user('article_owner').person
-    person2 = create_user('article_follower').person
-
-    article = fast_create(Article, :profile_id => person1.id)
-
-    article.person_followers=[person2]
-    article.save
-    article.reload
-    article.person_followers=[person2]
-    article.save
-
-    assert_equal 1, article.reload.person_followers.size
-  end
-
   should 'require value for name' do
     a = Article.new
     a.valid?
@@ -1713,11 +1698,6 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert post.allow_edit?(author)
   end
-  should 'has a empty list of followers by default' do
-    a = Article.new
-    assert_equal [], a.person_followers
-  end
-
   should 'get first image from lead' do
     a = fast_create(Article, :body => '<p>Foo</p><p><img src="bar.png" />Bar<img src="foo.png" /></p>',
                              :abstract => '<p>Lead</p><p><img src="leadbar.png" />Bar<img src="leadfoo.png" /></p>')
@@ -2252,4 +2232,61 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal "/#{a2.path}", a2.full_path
   end
+  should "increment followers count when a person follow an article" do
+    a = fast_create(Article)
+    p = fast_create(Person)
+    assert_difference "a.reload.followers_count" do
+      a.person_followers << p
+    end 
+  end
+    
+  should "decrement followers count when a person unfollow an article" do
+    p = fast_create(Person)
+    a = fast_create(Article, :profile_id => p)
+    a.person_followers << p
+    assert_difference "a.reload.followers_count", -1 do
+      a.person_followers.destroy_all
+    end
+  end
+
+  should 'the owner not in followers list' do
+    person1 = create_user('article_owner').person
+    person2 = create_user('article_follower').person
+
+    article = fast_create(Article, :profile_id => person1.id)
+
+    article.person_followers=[person2]
+    article.save
+    article.reload
+    article.person_followers=[person2]
+    article.save
+
+    assert_equal [person2], article.reload.person_followers
+  end
+
+  should 'has a empty list of followers by default' do
+    a = Article.new
+    assert_equal [], a.person_followers
+  end
+
+  should 'a follower not be duplicated' do
+    follower = create_user('article_follower').person
+
+    article = fast_create(Article, :profile_id => fast_create(Person))
+
+    article.person_followers<< follower
+    assert_raises (ActiveRecord::RecordNotUnique) { article.person_followers<< follower }
+  end
+
+  should 'an article be follower by many users' do
+    article = fast_create(Article, :profile_id => fast_create(Person))
+
+    1.upto(10).map do |n|
+      article.person_followers<< fast_create(Person)
+    end
+    article.save
+    assert_equal 10, article.reload.person_followers.count
+  end
+
+
 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)
+    self.expects(:render).with(template: 'blocks/categories', locals: {block: block})
+    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
@@ -3,7 +3,8 @@ require_relative &quot;../test_helper&quot;
 class CommunityTest < ActiveSupport::TestCase
   def setup
-    @person = fast_create(Person)
+    @user = User.current = create_user
+    @person = @user.person
   end
   attr_reader :person
@@ -287,8 +288,8 @@ class CommunityTest &lt; ActiveSupport::TestCase
   should "update the action of article creation when an community's article is commented" do
     ActionTrackerNotification.delete_all
-    p1 = Person.first
     community = fast_create(Community)
+    p1 = person
     p2 = create_user.person
     p3 = create_user.person
     community.add_member(p3)
@@ -6,16 +6,30 @@ 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
+      alias_method :original_profile, :profile
+     def profile
+       return Enterprise['disabled-enterprise']
+     end
+    end
+
+    assert_match 'This message is for disabled enterprises', render_block_content(block)
+
+    ApplicationHelper.class_eval do
+      alias_method :profile, :original_profile
+    end
   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)
@@ -107,8 +109,8 @@ class FeaturedProductsBlockTest &lt; ActiveSupport::TestCase
   should 'display feature products block' do
     block = FeaturedProductsBlock.new
-    self.expects(:render).with(:file => 'blocks/featured_products', :locals => { :block => block})
-    instance_eval(& block.content)
+    self.expects(:render).with(template: 'blocks/featured_products', locals: {block: block})
+    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
@@ -54,7 +54,19 @@ class HighlightsBlockTest &lt; ActiveSupport::TestCase
   should 'remove images with blank fields' do
     h = HighlightsBlock.new(:images => [{:image_id => 1, :address => '/address', :position => 1, :title => 'address'}, {:image_id => '', :address => '', :position => '', :title => ''}])
     h.save!
-    assert_equal [{:image_id => 1, :address => '/address', :position => 1, :title => 'address', :image_src => nil}], h.images
+    assert_equal [{:image_id => 1, :address => '/address', :position => 1, :title => 'address', :new_window => false, :image_src => nil}], h.images
+  end
+
+  should 'replace 1 and 0 by true and false in new_window attribute' do
+    image1 = {:image_id => 1, :address => '/address-1', :position => 1, :title => 'address-1', :new_window => '0'}
+    image2 = {:image_id => 2, :address => '/address-2', :position => 2, :title => 'address-2', :new_window => '1'}
+    h = HighlightsBlock.new(:images => [image1, image2])
+    h.save!
+    image1[:new_window] = false
+    image1[:image_src] = nil
+    image2[:new_window] = true
+    image2[:image_src] = nil
+    assert_equivalent [image1, image2], h.images
   end
   should 'be able to update display setting' do
@@ -68,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})
+    self.expects(:render).with(template: 'blocks/highlights', locals: {block: block})
-    instance_eval(& block.content)
+    render_block_content(block)
   end
   should 'not list non existent image' do
@@ -84,7 +98,7 @@ class HighlightsBlockTest &lt; ActiveSupport::TestCase
     block.save!
     block.reload
     assert_equal 2, block.images.count
-    assert_equal [{:image_id => 1, :address => '/address', :position => 1, :title => 'address', :image_src => 'address'}], block.featured_images
+    assert_equal [{:image_id => 1, :address => '/address', :position => 1, :title => 'address', :new_window => false, :image_src => 'address'}], block.featured_images
   end
   should 'list images in order' do
@@ -155,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,13 @@ 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
+
+  should 'display default message to brand new blocks with no links' do
+    l = LinkListBlock.new
+    assert_match /Please, edit this block to add links/, 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
@@ -43,7 +44,7 @@ class ManageProductsHelperTest &lt; ActionView::TestCase
   end
   should 'display link to edit product when user has permission' do
-    user = mock
+    user = User.new(:email => 'display-link@email.invalid.com')
     user.expects(:has_permission?).with(anything, anything).returns(true)
     @controller = mock
     @controller.expects(:user).returns(user).at_least_once
@@ -57,7 +58,7 @@ class ManageProductsHelperTest &lt; ActionView::TestCase
   end
   should 'not display link to edit product category when user does not have permission' do
-    user = mock
+    user = User.new(:email => 'not-display-link@email.invalid.com')
     user.expects(:has_permission?).with(anything, anything).returns(false)
     @controller = mock
     @controller.expects(:user).returns(user).at_least_once
@@ -68,7 +69,7 @@ class ManageProductsHelperTest &lt; ActionView::TestCase
   end
   should 'display link to edit product category when user has permission' do
-    user = mock
+    user = User.new(:email => 'display-link@email.invalid.com')
     user.expects(:has_permission?).with(anything, anything).returns(true)
     @controller = mock
     @controller.expects(:user).returns(user).at_least_once
@@ -82,7 +83,7 @@ class ManageProductsHelperTest &lt; ActionView::TestCase
   end
   should 'not display ui_button to edit product when user does not have permission' do
-    user = mock
+    user = User.new(:email => 'not-display-uibutton@email.invalid.com')
     user.expects(:has_permission?).with(anything, anything).returns(false)
     @controller = mock
     @controller.expects(:user).returns(user).at_least_once
@@ -93,7 +94,7 @@ class ManageProductsHelperTest &lt; ActionView::TestCase
   end
   should 'display ui_button_to_remote to edit product when user has permission' do
-    user = mock
+    user = User.new(:email => 'display-uibuttontoremote@email.invalid.com')
     user.expects(:has_permission?).with(anything, anything).returns(true)
     @controller = mock
     @controller.expects(:user).returns(user).at_least_once
@@ -108,7 +109,7 @@ class ManageProductsHelperTest &lt; ActionView::TestCase
   should 'display ui_button to edit product when user has permission' do
-    user = mock
+    user = User.new(:email => 'display-uibutton@email.invalid.com')
     user.expects(:has_permission?).with(anything, anything).returns(true)
     @controller = mock
     @controller.expects(:user).returns(user).at_least_once
@@ -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
@@ -98,6 +98,11 @@ class OrganizationMailingTest &lt; ActiveSupport::TestCase
     assert_equal [Person['user_one'], Person['user_two']], mailing.recipients
   end
+  should 'return recipients previously filtered' do
+    mailing = create(OrganizationMailing, :source => community, :subject => 'Hello', :body => 'We have some news', :person => person, :data => {:members_filtered => [Person['user_one'].id,Person['user_two'].id]})
+    assert_equivalent [Person['user_one'], Person['user_two']], mailing.recipients
+  end
+
   should 'return recipients according to limit' do
     mailing = create(OrganizationMailing, :source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
     assert_equal [Person['user_one']], mailing.recipients(0, 1)
@@ -1932,6 +1932,16 @@ class PersonTest &lt; ActiveSupport::TestCase
     community.add_member person
     assert !person.member_relation_of(community).empty?, "Person '#{person.identifier}' is not a member of Community '#{community.identifier}'"
-    assert person.member_since_date(community) == Date.today,"Person '#{person.identifier}' is not added like a member of Community '#{community.identifier}' today"
+    assert_equal Date.current, person.member_since_date(community), "Person '#{person.identifier}' is not added like a member of Community '#{community.identifier}' today"
   end
+
+  should 'a person follows many articles' do
+    person = create_user('article_follower').person
+  
+    1.upto(10).map do |n|
+      person.following_articles <<  fast_create(Article, :profile_id => fast_create(Person))
+    end
+    assert_equal 10, person.following_articles.count
+  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(template: '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(template: '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,20 @@ 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
+      alias_method :original_profile_image_link, :profile_image_link
+      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
+    ApplicationHelper.class_eval do
+      alias_method :profile_image_link, :original_profile_image_link
+    end
   end
   should 'list private profiles' do
@@ -10,20 +10,22 @@ 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(template: 'blocks/profile_search', locals: { block: block })
+    render_block_content(block)
   end
   should 'provide view_title' do
     person = fast_create(Person)
     person.boxes << Box.new
-    block = ProfileSearchBlock.new(:title => 'Title from block')
+    block = ProfileSearchBlock.new(title: 'Title from block')
     person.boxes.first.blocks << block
     block.save!
     assert_equal 'Title from block', block.view_title
@@ -1816,6 +1816,21 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_equal [person], community.members
   end
+  should 'return a list members by email of a community' do
+    someone = create_user('Someone', email:'someone@test.com.br')
+    someperson = create_user('Someperson',email:'someperson@test.com.br')
+
+    community = fast_create(Community)
+    community.add_member(someone.person)
+    community.add_member(someperson.person)
+
+    result = community.members_like 'email', '@test.com.br'
+
+    assert_includes result, someone.person
+    assert_includes result, someperson.person
+
+  end
+
   should 'count unique members of a community' do
     person = fast_create(Person)
     community = fast_create(Community)
@@ -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
@@ -182,6 +182,31 @@ class TaskTest &lt; ActiveSupport::TestCase
     task.save!
   end
+  should 'not send notification to target if notification is disabled in profile' do
+    task = Task.new
+    target = fast_create(Organization)
+    target.stubs(:notification_emails).returns(['adm@example.com'])
+    target.stubs(:profile_admin_mail_notification).returns(false)
+    task.target = target
+    task.stubs(:target_notification_message).returns('some non nil message to be sent to target')
+    TaskMailer.expects(:target_notification).never
+    task.save!
+  end
+
+  should 'send notification to target if notification is enabled in profile' do
+    task = Task.new
+    target = fast_create(Organization)
+    target.stubs(:notification_emails).returns(['adm@example.com'])
+    target.stubs(:profile_admin_mail_notification).returns(true)
+    task.target = target
+    task.stubs(:target_notification_message).returns('some non nil message to be sent to target')
+
+    mailer = mock
+    mailer.expects(:deliver).once
+    TaskMailer.expects(:target_notification).returns(mailer).once
+    task.save!
+  end
+
   should 'be able to list pending tasks' do
     Task.delete_all
     t1 = Task.create!
@@ -3,7 +3,8 @@ require_relative &quot;../test_helper&quot;
 class TextileArticleTest < ActiveSupport::TestCase
   def setup
-    @profile = create_user('testing').person
+    @user = User.current = create_user 'testing'
+    @profile = @user.person
   end
   attr_reader :profile
@@ -16,7 +17,7 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
   end
   should 'convert Textile to HTML' do
-    assert_equal '<p><strong>my text</strong></p>', build(TextileArticle, :body => '*my text*').to_html
+    assert_equal '<p><strong>my text</strong></p>', build(TextileArticle, body: '*my text*').to_html
   end
   should 'accept empty body' do
@@ -34,23 +35,21 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
   should 'notify activity on create' do
     ActionTracker::Record.delete_all
-    create TextileArticle, :name => 'test', :profile_id => fast_create(Profile).id, :published => true
+    create TextileArticle, name: 'test', profile_id: profile.id, published: true
     assert_equal 1, ActionTracker::Record.count
   end
   should 'not group trackers activity of article\'s creation' do
-    profile = fast_create(Profile)
     assert_difference 'ActionTracker::Record.count', 3 do
-      create TextileArticle, :name => 'bar', :profile_id => profile.id, :published => true
-      create TextileArticle, :name => 'another bar', :profile_id => profile.id, :published => true
-      create TextileArticle, :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
+      create TextileArticle, name: 'bar', profile_id: profile.id, published: true
+      create TextileArticle, name: 'another bar', profile_id: profile.id, published: true
+      create TextileArticle, name: 'another bar 2', profile_id: profile.id, published: true
     end
   end
   should 'not update activity on update of an article' do
     ActionTracker::Record.delete_all
-    profile = fast_create(Profile)
-    article = create(TextileArticle, :profile_id => profile.id)
+    article = create(TextileArticle, profile_id: profile.id)
     time = article.activity.updated_at
     Time.stubs(:now).returns(time + 1.day)
     assert_no_difference 'ActionTracker::Record.count' do
@@ -62,8 +61,8 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
   should 'not create trackers activity when updating articles' do
     ActionTracker::Record.delete_all
-    a1 = create TextileArticle, :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
-    a2 = create TextileArticle, :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
+    a1 = create TextileArticle, name: 'bar', profile_id: profile.id, published: true
+    a2 = create TextileArticle, name: 'another bar', profile_id: profile.id, published: true
     assert_no_difference 'ActionTracker::Record.count' do
       a1.name = 'foo';a1.save!
       a2.name = 'another foo';a2.save!
@@ -72,7 +71,7 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
   should 'remove activity after destroying article' do
     ActionTracker::Record.delete_all
-    a = create TextileArticle, :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
+    a = create TextileArticle, name: 'bar', profile_id: profile.id, published: true
     assert_difference 'ActionTracker::Record.count', -1 do
       a.destroy
     end
@@ -80,8 +79,8 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
   should 'remove activity after article is destroyed' do
     ActionTracker::Record.delete_all
-    a1 = create TextileArticle, :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
-    a2 = create TextileArticle, :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
+    a1 = create TextileArticle, name: 'bar', profile_id: profile.id, published: true
+    a2 = create TextileArticle, name: 'another bar', profile_id: profile.id, published: true
     assert_equal 2, ActionTracker::Record.count
     assert_difference 'ActionTracker::Record.count', -2 do
       a1.destroy
@@ -95,20 +94,20 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
     p1 = Person.first
     community.add_member(p1)
     assert p1.is_member_of?(community)
-    article = create TextileArticle, :name => 'test', :profile_id => community.id
+    article = create TextileArticle, name: 'test', profile_id: community.id
     assert_equal article, ActionTracker::Record.last.target
   end
   should "the tracker action target be defined as the article on articles'creation in profile" do
     ActionTracker::Record.delete_all
     person = Person.first
-    article = create TextileArticle, :name => 'test', :profile_id => person.id
+    article = create TextileArticle, name: 'test', profile_id: person.id
     assert_equal article, ActionTracker::Record.last.target
   end
   should 'not notify activity if the article is not advertise' do
     ActionTracker::Record.delete_all
-    a = create TextileArticle, :name => 'bar', :profile_id => fast_create(Profile).id, :published => true, :advertise => false
+    a = create TextileArticle, name: 'bar', profile_id: profile.id, published: true, advertise: false
     assert_equal true, a.published?
     assert_equal true, a.notifiable?
     assert_equal false, a.image?
@@ -121,7 +120,7 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
   end
   should "the common trackable conditions return the correct value" do
-    a =  build(TextileArticle, :profile => profile)
+    a =  build(TextileArticle, profile: profile)
     a.published = a.advertise = true
     assert_equal true, a.published?
     assert_equal true, a.notifiable?
@@ -139,7 +138,7 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
   end
   should 'generate proper HTML for links' do
-    assert_tag_in_string build_article('"Noosfero":http://noosfero.org/').to_html, :tag => 'a', :attributes => { :href => 'http://noosfero.org/' }
+    assert_tag_in_string build_article('"Noosfero":http://noosfero.org/').to_html, tag: 'a', attributes: { href: 'http://noosfero.org/' }
   end
   should 'not mess up with textile markup' do
@@ -153,7 +152,7 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
   end
   should 'not allow Javascript on links' do
-    assert_no_tag_in_string build_article('<a href="javascript: alert(\'BOOM\')" onclick="javascript: alert(\'BOOM\')"></a>').to_html, :tag => 'a', :attributes => { :href => /./, :onclick => /./ }
+    assert_no_tag_in_string build_article('<a href="javascript: alert(\'BOOM\')" onclick="javascript: alert(\'BOOM\')"></a>').to_html, tag: 'a', attributes: { href: /./, onclick: /./ }
   end
   should 'allow harmless HTML' do
@@ -163,11 +162,11 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
   end
   should 'use Textile markup for lead as well' do
-    assert_tag_in_string build_article(nil, :abstract => '"Noosfero":http://noosfero.org/').lead, :tag => 'a', :attributes => { :href => 'http://noosfero.org/' }
+    assert_tag_in_string build_article(nil, abstract: '"Noosfero":http://noosfero.org/').lead, tag: 'a', attributes: { href: 'http://noosfero.org/' }
   end
   should 'not allow arbitrary HTML in the lead' do
-    assert_not_equal '<script>alert(1)</script>', build_article(nil, :abstract => '<script>alert(1)</script>').lead
+    assert_not_equal '<script>alert(1)</script>', build_article(nil, abstract: '<script>alert(1)</script>').lead
   end
   should 'not add hard breaks for single line breaks' do
@@ -182,7 +181,7 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
   protected
   def build_article(input = nil, options = {})
-    article = build(TextileArticle, {:body => input}.merge(options))
+    article = build(TextileArticle, {body: input}.merge(options))
     article.valid? # trigger the xss terminate thingy
     article
   end
@@ -509,6 +509,7 @@ class UserTest &lt; ActiveSupport::TestCase
   should 'deliver e-mail with activation code after creation' do
     assert_difference 'ActionMailer::Base.deliveries.size', 1 do
       new_user :email => 'pending@activation.com'
+      process_delayed_job_queue
     end
     assert_equal 'pending@activation.com', ActionMailer::Base.deliveries.last['to'].to_s
   end
@@ -639,6 +640,7 @@ class UserTest &lt; ActiveSupport::TestCase
     env.save
     user = new_user :email => 'pending@activation.com'
+    process_delayed_job_queue
     assert_difference 'ActionMailer::Base.deliveries.size', 1 do
       user.activate
       process_delayed_job_queue
@@ -659,6 +661,7 @@ class UserTest &lt; ActiveSupport::TestCase
     env.save
     user = new_user :email => 'pending@activation.com'
+    process_delayed_job_queue
     assert_difference 'ActionMailer::Base.deliveries.size', 1 do
       user.activate
       process_delayed_job_queue
@@ -678,6 +681,7 @@ class UserTest &lt; ActiveSupport::TestCase
     env.save
     user = new_user :name => 'John Doe', :email => 'pending@activation.com'
+    process_delayed_job_queue
     assert_difference 'ActionMailer::Base.deliveries.size', 1 do
       user.activate
       process_delayed_job_queue
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+If you made any significant change to the code that you consider worth being
	2	+reminded on the Release Notes, also include a correspondent entry here. If you
	3	+are not sure in which release your code will be released, include it on the
	4	+latest release and leave it to the commiter or RM responsible for it.
	5	+
	6	+v 1.5.0 (unreleased)
	7	+ - Allow groups to disable admin email notificationo
	8	+ - Add option to HighlightsBlock to open link in a new tab
	9	+ - Move blocks html generation from models to helpers
	10	+
	11	+v 1.4.0
	12	+ - Migration from Rails 3 to Rails 4!
	@@ -2,8 +2,27 @@ class ProfileMembersController < MyProfileController		@@ -2,8 +2,27 @@ class ProfileMembersController < MyProfileController
2	protect 'manage_memberships', :profile	2	protect 'manage_memberships', :profile
3		3
4	def index	4	def index
5	- @members = profile.members_by_name
6	- @member_role = environment.roles.find_by_name('member')	5	+ @filters = params[:filters] \|\| {:roles => []}
		6	+ all_roles = Profile::Roles.organization_member_roles(environment.id) \| Profile::Roles.organization_custom_roles(environment.id, profile.id)
		7	+ @filters[:roles] = all_roles unless @filters[:roles].present?
		8	+ @data = {}
		9	+ field = 'name'
		10	+ field = 'email' if @filters[:name] =~ /\@/
		11	+
		12	+ @data[:members] = profile.members_by(field,@filters[:name]).by_role(@filters[:roles])
		13	+ session[:members_filtered] = @data[:members].map{\|m\|m.id} if request.post?
		14	+ @data[:roles] = all_roles
		15	+
		16	+ end
		17	+
		18	+ def send_mail
		19	+ session[:members_filtered] = params[:members_filtered].select{\|value\| value!="0"}
		20	+ if session[:members_filtered].present?
		21	+ redirect_to :controller => :profile, :action => :send_mail
		22	+ else
		23	+ session[:notice] = _("Select at least one member.")
		24	+ redirect_to :action => :index
		25	+ end
7	end	26	end
8		27
9	def update_roles	28	def update_roles
	@@ -156,4 +175,13 @@ class ProfileMembersController < MyProfileController		@@ -156,4 +175,13 @@ class ProfileMembersController < MyProfileController
156	end	175	end
157	end	176	end
158		177
		178	+ def search_members
		179	+ field = 'name'
		180	+ field = 'email' if params[:filter_name] =~ /\@/
		181	+
		182	+ result = profile.members_like field, params[:filter_name]
		183	+ result = result.select{\|member\| member.can_view_field?(current_person, "email") } if field=="email"
		184	+ render :json => result.map { \|member\| {:label => "#{member.name}#{member.can_view_field?(current_person, "email") ? " <#{member.email}>" : ""}", :value => member.name }}
		185	+ end
		186	+
159	end	187	end
	@@ -370,6 +370,7 @@ class ProfileController < PublicController		@@ -370,6 +370,7 @@ class ProfileController < PublicController
370		370
371	def send_mail	371	def send_mail
372	@mailing = profile.mailings.build(params[:mailing])	372	@mailing = profile.mailings.build(params[:mailing])
		373	+ @mailing.data = session[:members_filtered] ? {:members_filtered => session[:members_filtered]} : {}
373	if request.post?	374	if request.post?
374	@mailing.locale = locale	375	@mailing.locale = locale
375	@mailing.person = user	376	@mailing.person = user
	@@ -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
	@@ -148,14 +150,8 @@ module ApplicationHelper		@@ -148,14 +150,8 @@ module ApplicationHelper
148	link_to text, profile_path(:profile => profile) , options	150	link_to text, profile_path(:profile => profile) , options
149	end	151	end
150		152
151	- def link_to_homepage(text, profile = nil, options = {})
152	- p = if profile
153	- Profile[profile]
154	- else
155	- user
156	- end
157	-
158	- link_to text, p.url, options	153	+ def link_to_homepage(text, profile, options = {})
		154	+ link_to text, profile.url, options
159	end	155	end
160		156
161	def link_if_permitted(link, permission = nil, target = nil)	157	def link_if_permitted(link, permission = nil, target = nil)
	@@ -215,52 +211,6 @@ module ApplicationHelper		@@ -215,52 +211,6 @@ module ApplicationHelper
215	result	211	result
216	end	212	end
217		213
218	- def button(type, label, url, html_options = {})
219	- html_options \|\|= {}
220	- the_class = 'with-text'
221	- if html_options.has_key?(:class)
222	- the_class << ' ' << html_options[:class]
223	- end
224	- button_without_text type, label, url, html_options.merge(:class => the_class)
225	- end
226	-
227	- def button_without_text(type, label, url, html_options = {})
228	- the_class = "button icon-#{type}"
229	- if html_options.has_key?(:class)
230	- the_class << ' ' << html_options[:class]
231	- end
232	- the_title = html_options[:title] \|\| label
233	- if html_options[:disabled]
234	- content_tag('a', ' '+content_tag('span', label), html_options.merge(:class => the_class, :title => the_title))
235	- else
236	- link_to(' '+content_tag('span', label), url, html_options.merge(:class => the_class, :title => the_title))
237	- end
238	- end
239	-
240	- def button_to_function(type, label, js_code, html_options = {}, &block)
241	- html_options[:class] = "button with-text" unless html_options[:class]
242	- html_options[:class] << " icon-#{type}"
243	- link_to_function(label, js_code, html_options, &block)
244	- end
245	-
246	- def button_to_function_without_text(type, label, js_code, html_options = {}, &block)
247	- html_options[:class] = "" unless html_options[:class]
248	- html_options[:class] << " button icon-#{type}"
249	- link_to_function(content_tag('span', label), js_code, html_options, &block)
250	- end
251	-
252	- def button_to_remote(type, label, options, html_options = {})
253	- html_options[:class] = "button with-text" unless html_options[:class]
254	- html_options[:class] << " icon-#{type}"
255	- link_to_remote(label, options, html_options)
256	- end
257	-
258	- def button_to_remote_without_text(type, label, options, html_options = {})
259	- html_options[:class] = "" unless html_options[:class]
260	- html_options[:class] << " button icon-#{type}"
261	- link_to_remote(content_tag('span', label), options, html_options.merge(:title => label))
262	- end
263	-
264	def icon(icon_name, html_options = {})	214	def icon(icon_name, html_options = {})
265	the_class = "button #{icon_name}"	215	the_class = "button #{icon_name}"
266	if html_options.has_key?(:class)	216	if html_options.has_key?(:class)
	@@ -940,13 +890,6 @@ module ApplicationHelper		@@ -940,13 +890,6 @@ module ApplicationHelper
940	content_for(:head) { stylesheet_link_tag(*args) }	890	content_for(:head) { stylesheet_link_tag(*args) }
941	end	891	end
942		892
943	- def article_to_html(article, options = {})
944	- options.merge!(:page => params[:npage])
945	- content = article.to_html(options)
946	- content = content.kind_of?(Proc) ? self.instance_exec(&content).html_safe : content.html_safe
947	- filter_html(content, article)
948	- end
949	-
950	# Please, use link_to by default!	893	# Please, use link_to by default!
951	# This method was created to work around to inexplicable	894	# This method was created to work around to inexplicable
952	# chain of problems when display_short_format was called	895	# chain of problems when display_short_format was called
	@@ -1049,10 +992,11 @@ module ApplicationHelper		@@ -1049,10 +992,11 @@ module ApplicationHelper
1049	end	992	end
1050		993
1051	def search_contents_menu	994	def search_contents_menu
		995	+ host = environment.default_hostname
1052	links = [	996	links = [
1053	- {s_('contents\|More recent') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_recent'})}},
1054	- {s_('contents\|More viewed') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}},
1055	- {s_('contents\|Most commented') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_comments'})}}	997	+ {s_('contents\|More recent') => {href: url_for({host: host, controller: 'search', action: 'contents', filter: 'more_recent'})}},
		998	+ {s_('contents\|More viewed') => {href: url_for({host: host, controller: 'search', action: 'contents', filter: 'more_popular'})}},
		999	+ {s_('contents\|Most commented') => {href: url_for({host: host, controller: 'search', action: 'contents', filter: 'more_comments'})}}
1056	]	1000	]
1057	if logged_in?	1001	if logged_in?
1058	links.push(_('New content') => modal_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))	1002	links.push(_('New content') => modal_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
	@@ -1064,10 +1008,11 @@ module ApplicationHelper		@@ -1064,10 +1008,11 @@ module ApplicationHelper
1064	alias :browse_contents_menu :search_contents_menu	1008	alias :browse_contents_menu :search_contents_menu
1065		1009
1066	def search_people_menu	1010	def search_people_menu
		1011	+ host = environment.default_hostname
1067	links = [	1012	links = [
1068	- {s_('people\|More recent') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_recent'})}},
1069	- {s_('people\|More active') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_active'})}},
1070	- {s_('people\|More popular') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_popular'})}}	1013	+ {s_('people\|More recent') => {href: url_for({host: host, controller: 'search', action: 'people', filter: 'more_recent'})}},
		1014	+ {s_('people\|More active') => {href: url_for({host: host, controller: 'search', action: 'people', filter: 'more_active'})}},
		1015	+ {s_('people\|More popular') => {href: url_for({host: host, controller: 'search', action: 'people', filter: 'more_popular'})}}
1071	]	1016	]
1072	if logged_in?	1017	if logged_in?
1073	links.push(_('My friends') => {:href => url_for({:profile => current_user.login, :controller => 'friends'})})	1018	links.push(_('My friends') => {:href => url_for({:profile => current_user.login, :controller => 'friends'})})
	@@ -1080,10 +1025,11 @@ module ApplicationHelper		@@ -1080,10 +1025,11 @@ module ApplicationHelper
1080	alias :browse_people_menu :search_people_menu	1025	alias :browse_people_menu :search_people_menu
1081		1026
1082	def search_communities_menu	1027	def search_communities_menu
		1028	+ host = environment.default_hostname
1083	links = [	1029	links = [
1084	- {s_('communities\|More recent') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_recent'})}},
1085	- {s_('communities\|More active') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_active'})}},
1086	- {s_('communities\|More popular') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_popular'})}}	1030	+ {s_('communities\|More recent') => {href: url_for({host: host, controller: 'search', action: 'communities', filter: 'more_recent'})}},
		1031	+ {s_('communities\|More active') => {href: url_for({host: host, controller: 'search', action: 'communities', filter: 'more_active'})}},
		1032	+ {s_('communities\|More popular') => {href: url_for({host: host, controller: 'search', action: 'communities', filter: 'more_popular'})}}
1087	]	1033	]
1088	if logged_in?	1034	if logged_in?
1089	links.push(_('My communities') => {:href => url_for({:profile => current_user.login, :controller => 'memberships'})})	1035	links.push(_('My communities') => {:href => url_for({:profile => current_user.login, :controller => 'memberships'})})
	@@ -1368,16 +1314,6 @@ module ApplicationHelper		@@ -1368,16 +1314,6 @@ module ApplicationHelper
1368	@no_design_blocks = true	1314	@no_design_blocks = true
1369	end	1315	end
1370		1316
1371	- def filter_html(html, source)
1372	- if @plugins && source && source.has_macro?
1373	- html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
1374	- #TODO This parse should be done through the macro infra, but since there
1375	- # are old things that do not support it we are keeping this hot spot.
1376	- html = @plugins.pipeline(:parse_content, html, source).first
1377	- end
1378	- html && html.html_safe
1379	- end
1380	-
1381	def convert_macro(html, source)	1317	def convert_macro(html, source)
1382	doc = Nokogiri::HTML.fragment html	1318	doc = Nokogiri::HTML.fragment html
1383	#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,38 @@ module BoxesHelper		@@ -87,10 +87,38 @@ 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 block, prefix = nil, klass = block.class
		91	+ template_name = klass.name.underscore.sub '_block', ''
		92	+ begin
		93	+ render template: "blocks/#{prefix}#{template_name}", locals: { block: block }
		94	+ rescue ActionView::MissingTemplate
		95	+ return if klass.superclass === Block
		96	+ render_block block, prefix, klass.superclass
		97	+ end
		98	+ end
		99	+
		100	+ def render_block_content block
		101	+ # FIXME: this conditional should be removed after all
		102	+ # block footer from plugins methods get refactored into helpers and views.
		103	+ # They are a failsafe until all of them are done.
		104	+ return block.content if block.method(:content).owner != Block
		105	+ render_block block
		106	+ end
		107	+
		108	+ def render_block_footer block
		109	+ return block.footer if block.method(:footer).owner != Block
		110	+ render_block block, 'footers/'
		111	+ end
		112	+
		113	+ def display_block_content(block, main_content = nil)
		114	+ content = nil
		115	+ if block.main?
		116	+ content = wrap_main_content(main_content)
		117	+ else
		118	+ content = render_block_content block
		119	+ end
92	result = extract_block_content(content)	120	result = extract_block_content(content)
93	- footer_content = extract_block_content(block.footer)	121	+ footer_content = extract_block_content(render_block_footer block)
94	unless footer_content.blank?	122	unless footer_content.blank?
95	footer_content = content_tag('div', footer_content, :class => 'block-footer-content' )	123	footer_content = content_tag('div', footer_content, :class => 'block-footer-content' )
96	end	124	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
	@@ -5,9 +5,17 @@ class OrganizationMailing < Mailing		@@ -5,9 +5,17 @@ class OrganizationMailing < Mailing
5	end	5	end
6		6
7	def recipients(offset=0, limit=100)	7	def recipients(offset=0, limit=100)
8	- source.members.order(:id).offset(offset).limit(limit)
9	- .joins("LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)")	8	+ result = source.members.order(:id).offset(offset).limit(limit)
		9	+
		10	+ if data.present? and data.is_a?(Hash) and data[:members_filtered]
		11	+ result = result.where('profiles.id IN (?)', data[:members_filtered])
		12	+ end
		13	+
		14	+ if result.blank?
		15	+ result = result.joins("LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)")
10	.where("m.person_id" => nil)	16	.where("m.person_id" => nil)
		17	+ end
		18	+ result
11	end	19	end
12		20
13	def each_recipient	21	def each_recipient
	@@ -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