fix merge with master conflit

Leandro Santos
2 parents 9d45a161 763189ac
Showing 209 changed files with 2548 additions and 1973 deletions Show diff stats
.gitlab-ci.yml
.travis.yml
CHANGELOG
Gemfile
Gemfile.lock
app/controllers/my_profile/tasks_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/boxes_helper.rb
app/helpers/buttons_helper.rb
app/helpers/forms_helper.rb
app/helpers/profile_image_helper.rb
app/helpers/tasks_helper.rb
app/helpers/theme_loader_helper.rb
app/models/article_block.rb
app/models/blog.rb
app/models/blog_archives_block.rb
app/models/categories_block.rb
app/models/comment.rb
app/models/communities_block.rb
@@ -6,12 +6,13 @@ before_script:
   - ./script/silent-quick-start
  
 stages:
-  - smoke-tests
+  #FIXME Selenium tests are randomly failing and this avoid other tests to run.
+  #- smoke-tests
   - all-tests
  
-smoke:
-  script: bundle exec rake ci:smoke
-  stage: smoke-tests
+#smoke:
+#  script: bundle exec rake ci:smoke
+#  stage: smoke-tests
  
 units:
   script: bundle exec rake test:units
@@ -55,7 +55,10 @@ env:
   - TASK=test:integration
   - TASK=cucumber LANG=en
   - TASK=selenium
-  - TASK=test:noosfero_plugins BUNDLE_OPTS=install
+  - SLICE=1/4 TASK=test:noosfero_plugins BUNDLE_OPTS=install
+  - SLICE=2/4 TASK=test:noosfero_plugins BUNDLE_OPTS=install
+  - SLICE=3/4 TASK=test:noosfero_plugins BUNDLE_OPTS=install
+  - SLICE=4/4 TASK=test:noosfero_plugins BUNDLE_OPTS=install
  
 script:
   - ./script/ci
@@ -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!
@@ -34,7 +34,7 @@ gem &#39;slim&#39;
  
 # API dependencies
 gem 'grape',                    '~> 0.12'
-gem 'grape-entity',             '= 0.4.8'
+gem 'grape-entity',             '0.4.8'
 gem 'grape_logging'
 gem 'grape-swagger'
 gem 'swagger-ui_rails'
@@ -43,7 +43,7 @@ gem &#39;rack-cors&#39;
 gem 'rack-contrib'
 gem 'liquid',                    '~> 3.0.3'
  
-gem 'api-pagination',           '~> 4.1.1'
+gem 'api-pagination',           '>= 4.1.1'
  
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
@@ -21,14 +21,14 @@ PATH
     access_control (0.0.0)
  
 PATH
-  remote: vendor/plugins/action_tracker
+  remote: vendor/plugins/action_tracker_has_comments
   specs:
-    action_tracker (0.0.1)
+    action_tracker_has_comments (0.0.0)
  
 PATH
-  remote: vendor/plugins/action_tracker_has_comments
+  remote: vendor/plugins/action_tracker
   specs:
-    action_tracker_has_comments (0.0.0)
+    action_tracker (0.0.1)
  
 PATH
   remote: vendor/plugins/acts_as_list
@@ -425,7 +425,7 @@ DEPENDENCIES
   acts_as_tree (= 0.0.0)!
   acts_as_versioned (> 0.0.0)!
   airbrake (~> 4)
-  api-pagination (~> 4.1.1)
+  api-pagination (>= 4.1.1)
   capybara (~> 2.2)
   contacts (> 0.0.0)!
   cucumber
@@ -491,3 +491,6 @@ DEPENDENCIES
   whenever
   will_paginate (~> 3.0.7)
   xss_terminate (= 0.0.0)!
+
+BUNDLED WITH
+   1.11.2
@@ -2,6 +2,8 @@ class TasksController &lt; MyProfileController
  
   protect [:perform_task, :view_tasks], :profile, :only => [:index, :save_tags, :search_tags]
   protect :perform_task, :profile, :only => [:processed, :change_responsible, :close, :new, :list_requested, :ticket_details, :search_tags]
+  include TasksHelper
+
  
   def index
     @rejection_email_templates = profile.email_templates.find_all_by_template_type(:task_rejection)
@@ -84,12 +86,12 @@ class TasksController &lt; MyProfileController
       end
     end
  
-    url = { :action => 'index' }
+    url = tasks_url(:action => 'index')
     if failed.blank?
       session[:notice] = _("All decisions were applied successfully.")
     else
       session[:notice] = _("Some decisions couldn't be applied.")
-      url[:failed] = failed
+      url = tasks_url(:action => 'index', :failed => failed)
     end
     redirect_to url
   end
@@ -50,6 +50,12 @@ module ApplicationHelper
  
   include TaskHelper
  
+  include ButtonsHelper
+
+  include ProfileImageHelper
+
+  include ThemeLoaderHelper
+
   def locale
     (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   end
@@ -211,52 +217,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)
@@ -327,48 +287,6 @@ module ApplicationHelper
     end
   end
  
-  def theme_path
-    if session[:theme]
-      '/user_themes/' + current_theme
-    else
-      '/designs/themes/' + current_theme
-    end
-  end
-
-  def current_theme
-    @current_theme ||=
-      begin
-        if session[:theme]
-          session[:theme]
-        else
-          # utility for developers: set the theme to 'random' in development mode and
-          # you will get a different theme every request. This is interesting for
-          # testing
-          if Rails.env.development? && environment.theme == 'random'
-            @random_theme ||= Dir.glob('public/designs/themes/*').map { |f| File.basename(f) }.rand
-            @random_theme
-          elsif Rails.env.development? && respond_to?(:params) && params[:theme] && File.exists?(Rails.root.join('public/designs/themes', params[:theme]))
-            params[:theme]
-          else
-            if profile && !profile.theme.nil?
-              profile.theme
-            elsif environment
-              environment.theme
-            else
-              if logger
-                logger.warn("No environment found. This is weird.")
-                logger.warn("Request environment: %s" % request.env.inspect)
-                logger.warn("Request parameters: %s" % params.inspect)
-              end
-
-              # could not determine the theme, so return the default one
-              'default'
-            end
-          end
-        end
-      end
-  end
-
   def theme_view_file(template, theme=nil)
     # Since we cannot control what people are doing in external themes, we
     # will keep looking for the deprecated .rhtml extension here.
@@ -441,141 +359,6 @@ module ApplicationHelper
     Theme.find(current_theme).owner.identifier
   end
  
-  # generates a image tag for the profile.
-  #
-  # If the profile has no image set yet, then a default image is used.
-  def profile_image(profile, size=:portrait, opt={})
-    return '' if profile.nil?
-    opt[:alt]   ||= profile.name()
-    opt[:title] ||= ''
-    opt[:class] ||= ''
-    opt[:class] += ( profile.class == Person ? ' photo' : ' logo' )
-    image_tag(profile_icon(profile, size), opt )
-  end
-
-  def profile_icon( profile, size=:portrait, return_mimetype=false )
-    filename, mimetype = '', 'image/png'
-    if profile.image
-      filename = profile.image.public_filename( size )
-      mimetype = profile.image.content_type
-    else
-      icon =
-        if profile.organization?
-          if profile.kind_of?(Community)
-            '/images/icons-app/community-'+ size.to_s() +'.png'
-          else
-            '/images/icons-app/enterprise-'+ size.to_s() +'.png'
-          end
-        else
-          pixels = Image.attachment_options[:thumbnails][size].split('x').first
-          gravatar_profile_image_url(
-            profile.email,
-            :size => pixels,
-            :d => gravatar_default
-          )
-        end
-      filename = default_or_themed_icon(icon)
-    end
-    return_mimetype ? [filename, mimetype] : filename
-  end
-
-  def default_or_themed_icon(icon)
-    if File.exists?(Rails.root.join('public', theme_path, icon))
-      theme_path + icon
-    else
-      icon
-    end
-  end
-
-  def profile_sex_icon( profile )
-    return '' unless profile.is_a?(Person)
-    return '' unless !environment.enabled?('disable_gender_icon')
-    sex = ( profile.sex ? profile.sex.to_s() : 'undef' )
-    title = ( sex == 'undef' ? _('non registered gender') : ( sex == 'male' ? _('Male') : _('Female') ) )
-    sex = content_tag 'span',
-                      content_tag( 'span', sex ),
-                      :class => 'sex-'+sex,
-                      :title => title
-    sex
-  end
-
-  def links_for_balloon(profile)
-    if environment.enabled?(:show_balloon_with_profile_links_when_clicked)
-      if profile.kind_of?(Person)
-        [
-          {_('Wall') => {:href => url_for(profile.public_profile_url)}},
-          {_('Friends') => {:href => url_for(:controller => :profile, :action => :friends, :profile => profile.identifier)}},
-          {_('Communities') => {:href => url_for(:controller => :profile, :action => :communities, :profile => profile.identifier)}},
-          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}},
-          {_('Add') => {:href => url_for(profile.add_url), :class => 'add-friend', :style => 'display: none'}}
-        ]
-      elsif profile.kind_of?(Community)
-        [
-          {_('Wall') => {:href => url_for(profile.public_profile_url)}},
-          {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
-          {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
-          {_('Join') => {:href => url_for(profile.join_url), :class => 'join-community', :style => 'display: none'}},
-          {_('Leave community') => {:href => url_for(profile.leave_url), :class => 'leave-community', :style => 'display:  none'}},
-          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}}
-        ]
-      elsif profile.kind_of?(Enterprise)
-        [
-          {_('Products') => {:href => catalog_path(profile.identifier)}},
-          {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
-          {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
-          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}},
-        ]
-      else
-        []
-      end
-    end
-  end
-
-  # displays a link to the profile homepage with its image (as generated by
-  # #profile_image) and its name below it.
-  def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )
-    if content = @plugins.dispatch_first(:profile_image_link, profile, size, tag, extra_info)
-      return instance_exec(&content)
-    end
-    name = profile.short_name
-    if profile.person?
-      url = url_for(profile.check_friendship_url)
-      trigger_class = 'person-trigger'
-    else
-      city = ''
-      url = url_for(profile.check_membership_url)
-      if profile.community?
-        trigger_class = 'community-trigger'
-      elsif profile.enterprise?
-        trigger_class = 'enterprise-trigger'
-      end
-    end
-
-    extra_info_tag = ''
-    img_class = 'profile-image'
-
-    if extra_info.is_a? Hash
-      extra_info_tag = content_tag( 'span', extra_info[:value], :class => 'extra_info '+extra_info[:class])
-      img_class +=' '+extra_info[:class]
-    else
-      extra_info_tag = content_tag( 'span', extra_info, :class => 'extra_info' )
-    end
-
-    links = links_for_balloon(profile)
-    content_tag('div', content_tag(tag,
-                                   (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ?
-                                   popover_menu(_('Profile links'),profile.short_name,links,{:class => trigger_class, :url => url}) : "") +
-    link_to(
-      content_tag( 'span', profile_image( profile, size ), :class => img_class ) +
-      content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
-      extra_info_tag + profile_sex_icon( profile ),
-      profile.url,
-      :class => 'profile_link url',
-      :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
-      :title => profile.name ),
-      :class => 'vcard'), :class => 'common-profile-list-block')
-  end
-
   def popover_menu(title,menu_title,links,html_options={})
     html_options[:class] = "" unless html_options[:class]
     html_options[:class] << " menu-submenu-trigger"
@@ -584,10 +367,6 @@ module ApplicationHelper
     link_to(content_tag(:span, title), '#', html_options)
   end
  
-  def gravatar_default
-    (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) || NOOSFERO_CONF['gravatar'] || 'mm'
-  end
-
   attr_reader :environment
  
   def select_categories(object_name, title=nil, title_size=4)
@@ -936,13 +715,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
@@ -1379,16 +1151,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
@@ -195,4 +195,21 @@ module ArticleHelper
     end
   end
  
+  def filter_html(html, source)
+    if @plugins && source && source.has_macro?
+      html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
+      #TODO This parse should be done through the macro infra, but since there
+      #     are old things that do not support it we are keeping this hot spot.
+      html = @plugins.pipeline(:parse_content, html, source).first
+    end
+    html && html.html_safe
+  end
+
+  def article_to_html(article, options = {})
+    options.merge!(:page => params[:npage])
+    content = article.to_html(options)
+    content = content.kind_of?(Proc) ? self.instance_exec(&content).html_safe : content.html_safe
+    filter_html(content, article)
+  end
+
 end
@@ -87,10 +87,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
@@ -137,7 +137,7 @@ module FormsHelper
     content_tag('table',rows.join("\n"))
   end
  
-  def date_field(name, value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
+  def date_field(name, value, datepicker_options = {}, html_options = {})
     datepicker_options[:disabled] ||= false
     datepicker_options[:alt_field] ||= ''
     datepicker_options[:alt_format] ||= ''
@@ -152,7 +152,7 @@ module FormsHelper
     datepicker_options[:close_text] ||= _('Done')
     datepicker_options[:constrain_input] ||= true
     datepicker_options[:current_text] ||= _('Today')
-    datepicker_options[:date_format] ||= 'yy/mm/dd'
+    datepicker_options[:date_format] ||= 'yy-mm-dd'
     datepicker_options[:day_names] ||= [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')]
     datepicker_options[:day_names_min] ||= [_('Su'), _('Mo'), _('Tu'), _('We'), _('Th'), _('Fr'), _('Sa')]
     datepicker_options[:day_names_short] ||= [_('Sun'), _('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'), _('Sat')]
@@ -184,10 +184,11 @@ module FormsHelper
     datepicker_options[:year_range] ||= 'c-10:c+10'
     datepicker_options[:year_suffix] ||= ''
  
+    date_format = datepicker_options[:time] ? "%Y-%m-%d %H:%M" : "%Y-%m-%d"
+    value = value.strftime(date_format) if value.present?
+
     element_id = html_options[:id] || 'datepicker-date'
-    value = value.strftime(format) if value.present?
     method = datepicker_options[:time] ? 'datetimepicker' : 'datepicker'
-    current_date_or_nil = value.present? ? "new Date('#{value}')" : "null"
     result = text_field_tag(name, value, html_options)
     result +=
     "
@@ -238,17 +239,17 @@ module FormsHelper
         weekHeader: #{datepicker_options[:week_header].to_json},
         yearRange: #{datepicker_options[:year_range].to_json},
         yearSuffix: #{datepicker_options[:year_suffix].to_json}
-      }).datepicker('setDate', current_date_or_nil)
+      }).datepicker()
     </script>
     ".html_safe
     result
   end
  
-  def date_range_field(from_name, to_name, from_value, to_value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
+  def date_range_field(from_name, to_name, from_value, to_value, datepicker_options = {}, html_options = {})
     from_id = html_options[:from_id] || 'datepicker-from-date'
     to_id = html_options[:to_id] || 'datepicker-to-date'
-    return _('From') +' '+ date_field(from_name, from_value, format, datepicker_options, html_options.merge({:id => from_id})) +
-    ' ' + _('until') +' '+ date_field(to_name, to_value, format, datepicker_options, html_options.merge({:id => to_id}))
+    return _('From') +' '+ date_field(from_name, from_value, datepicker_options, html_options.merge({:id => from_id})) +
+    ' ' + _('until') +' '+ date_field(to_name, to_value, datepicker_options, html_options.merge({:id => to_id}))
   end
  
   def select_folder(label_text, field_id, collection, default_value=nil, html_options = {}, js_options = {})
@@ -0,0 +1,140 @@
+module ProfileImageHelper
+  def default_or_themed_icon(icon)
+    if File.exists?(Rails.root.join('public', theme_path, icon))
+      theme_path + icon
+    else
+      icon
+    end
+  end
+
+  def gravatar_default
+    (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) || NOOSFERO_CONF['gravatar'] || 'mm'
+  end
+
+  def profile_sex_icon( profile )
+    return '' unless profile.is_a?(Person)
+    return '' unless !environment.enabled?('disable_gender_icon')
+    sex = ( profile.sex ? profile.sex.to_s() : 'undef' )
+    title = ( sex == 'undef' ? _('non registered gender') : ( sex == 'male' ? _('Male') : _('Female') ) )
+    sex = content_tag 'span',
+                      content_tag( 'span', sex ),
+                      :class => 'sex-'+sex,
+                      :title => title
+    sex
+  end
+
+  def profile_icon( profile, size=:portrait, return_mimetype=false )
+    filename, mimetype = '', 'image/png'
+    if profile.image
+      filename = profile.image.public_filename( size )
+      mimetype = profile.image.content_type
+    else
+      icon =
+        if profile.organization?
+          if profile.kind_of?(Community)
+            '/images/icons-app/community-'+ size.to_s() +'.png'
+          else
+            '/images/icons-app/enterprise-'+ size.to_s() +'.png'
+          end
+        else
+          pixels = Image.attachment_options[:thumbnails][size].split('x').first
+          gravatar_profile_image_url(
+            profile.email,
+            :size => pixels,
+            :d => gravatar_default
+          )
+        end
+      filename = default_or_themed_icon(icon)
+    end
+    return_mimetype ? [filename, mimetype] : filename
+  end
+
+  # generates a image tag for the profile.
+  #
+  # If the profile has no image set yet, then a default image is used.
+  def profile_image(profile, size=:portrait, opt={})
+    return '' if profile.nil?
+    opt[:alt]   ||= profile.name()
+    opt[:title] ||= ''
+    opt[:class] ||= ''
+    opt[:class] += ( profile.class == Person ? ' photo' : ' logo' )
+    image_tag(profile_icon(profile, size), opt )
+  end
+
+  def links_for_balloon(profile)
+    if environment.enabled?(:show_balloon_with_profile_links_when_clicked)
+      if profile.kind_of?(Person)
+        [
+          {_('Wall') => {:href => url_for(profile.public_profile_url)}},
+          {_('Friends') => {:href => url_for(:controller => :profile, :action => :friends, :profile => profile.identifier)}},
+          {_('Communities') => {:href => url_for(:controller => :profile, :action => :communities, :profile => profile.identifier)}},
+          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}},
+          {_('Add') => {:href => url_for(profile.add_url), :class => 'add-friend', :style => 'display: none'}}
+        ]
+      elsif profile.kind_of?(Community)
+        [
+          {_('Wall') => {:href => url_for(profile.public_profile_url)}},
+          {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
+          {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
+          {_('Join') => {:href => url_for(profile.join_url), :class => 'join-community', :style => 'display: none'}},
+          {_('Leave community') => {:href => url_for(profile.leave_url), :class => 'leave-community', :style => 'display:  none'}},
+          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}}
+        ]
+      elsif profile.kind_of?(Enterprise)
+        [
+          {_('Products') => {:href => catalog_path(profile.identifier)}},
+          {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
+          {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
+          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}},
+        ]
+      else
+        []
+      end
+    end
+  end
+
+  # displays a link to the profile homepage with its image (as generated by
+  # #profile_image) and its name below it.
+  def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )
+    if content = @plugins.dispatch_first(:profile_image_link, profile, size, tag, extra_info)
+      return instance_exec(&content)
+    end
+    name = profile.short_name
+    if profile.person?
+      url = url_for(profile.check_friendship_url)
+      trigger_class = 'person-trigger'
+    else
+      city = ''
+      url = url_for(profile.check_membership_url)
+      if profile.community?
+        trigger_class = 'community-trigger'
+      elsif profile.enterprise?
+        trigger_class = 'enterprise-trigger'
+      end
+    end
+
+    extra_info_tag = ''
+    img_class = 'profile-image'
+
+    if extra_info.is_a? Hash
+      extra_info_tag = content_tag( 'span', extra_info[:value], :class => 'extra_info '+extra_info[:class])
+      img_class +=' '+extra_info[:class]
+    else
+      extra_info_tag = content_tag( 'span', extra_info, :class => 'extra_info' )
+    end
+
+    links = links_for_balloon(profile)
+    content_tag('div', content_tag(tag,
+                                   (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ?
+                                   popover_menu(_('Profile links'),profile.short_name,links,{:class => trigger_class, :url => url}) : "") +
+    link_to(
+      content_tag( 'span', profile_image( profile, size ), :class => img_class ) +
+      content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
+      extra_info_tag + profile_sex_icon( profile ),
+      profile.url,
+      :class => 'profile_link url',
+      :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
+      :title => profile.name ),
+      :class => 'vcard'), :class => 'common-profile-list-block')
+  end
+end
 \ No newline at end of file
@@ -0,0 +1,12 @@
+module TasksHelper
+
+  def tasks_url options = {}
+    url_for(options.merge(filter_params))
+  end
+
+  def filter_params
+    filter_fields = ['filter_type', 'filter_text', 'filter_responsible', 'filter_tags']
+    params.select {|filter| filter if filter_fields.include? filter }
+  end
+
+end
@@ -0,0 +1,43 @@
+module ThemeLoaderHelper
+  def current_theme
+    @current_theme ||=
+      begin
+        if session[:theme]
+          session[:theme]
+        else
+          # utility for developers: set the theme to 'random' in development mode and
+          # you will get a different theme every request. This is interesting for
+          # testing
+          if Rails.env.development? && environment.theme == 'random'
+            @random_theme ||= Dir.glob('public/designs/themes/*').map { |f| File.basename(f) }.rand
+            @random_theme
+          elsif Rails.env.development? && respond_to?(:params) && params[:theme] && File.exists?(Rails.root.join('public/designs/themes', params[:theme]))
+            params[:theme]
+          else
+            if profile && !profile.theme.nil?
+              profile.theme
+            elsif environment
+              environment.theme
+            else
+              if logger
+                logger.warn("No environment found. This is weird.")
+                logger.warn("Request environment: %s" % request.env.inspect)
+                logger.warn("Request parameters: %s" % params.inspect)
+              end
+
+              # could not determine the theme, so return the default one
+              'default'
+            end
+          end
+        end
+      end
+  end
+
+  def theme_path
+    if session[:theme]
+      '/user_themes/' + current_theme
+    else
+      '/designs/themes/' + current_theme
+    end
+  end
+end
@@ -18,18 +18,6 @@ class ArticleBlock &lt; Block
     _('This block displays one of your articles. You can edit the block to select which one of your articles is going to be displayed in the block.')
   end
  
-  def content(args={})
-    block = self
-    proc do
-      block_title(block.title) +
-      (block.article ? article_to_html(FilePresenter.for(block.article),
-          :gallery_view => false,
-          :inside_block => block,               # For Blogs and folders
-          :format => block.visualization_format # For Articles and contents
-        ).html_safe : _('Article not selected yet.'))
-    end
-  end
-
   def article_id
     self.settings[:article_id]
   end
@@ -93,4 +93,20 @@ class Blog &lt; Folder
     posts.where("type != 'RssFeed'").order(:updated_at).limit(limit)
   end
  
+  def total_number_of_posts(group_by, year = nil)
+    case group_by
+      when :by_year
+        posts.published.native_translations
+          .except(:order)
+          .count(:all, :group => 'EXTRACT(YEAR FROM published_at)')
+          .sort_by {|year, count| -year.to_i}
+      when :by_month
+        posts.published.native_translations
+          .except(:order)
+          .where('EXTRACT(YEAR FROM published_at)=?', year.to_i)
+          .group('EXTRACT(MONTH FROM published_at)')
+          .count
+          .sort_by {|month, count| -month.to_i}
+    end
+  end
 end
@@ -21,30 +21,6 @@ class BlogArchivesBlock &lt; Block
     blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog
   end
  
-  def visible_posts(person)
-    #FIXME Performance issues with display_to. Must convert it to a scope.
-    # Checkout this page for further information: http://noosfero.org/Development/ActionItem2705
-    blog.posts.published.native_translations #.select {|post| post.display_to?(person)}
-  end
-
-  def content(args={})
-    owner_blog = self.blog
-    return nil unless owner_blog
-    results = ''
-    posts = visible_posts(args[:person])
-    posts.except(:order).count(:all, :group => 'EXTRACT(YEAR FROM published_at)').sort_by {|year, count| -year.to_i}.each do |year, count|
-      results << content_tag('li', content_tag('strong', "#{year.to_i} (#{count})"))
-      results << "<ul class='#{year.to_i}-archive'>"
-      posts.except(:order).where('EXTRACT(YEAR FROM published_at)=?', year.to_i).group('EXTRACT(MONTH FROM published_at)').count.sort_by {|month, count| -month.to_i}.each do |month, count|
-        results << content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", owner_blog.url.merge(year: year.to_i, month: month.to_i)))
-      end
-      results << "</ul>"
-    end
-    block_title(title) +
-    content_tag('ul', results, :class => 'blog-archives') +
-    content_tag('div', link_to(_('Subscribe RSS Feed'), owner_blog.feed.url), :class => 'subscribe-feed')
-  end
-
   def self.expire_on
       { :profile => [:article], :environment => [:article] }
   end
@@ -30,13 +30,6 @@ class CategoriesBlock &lt; Block
     Category.top_level_for(self.owner).from_types(self.category_types)
   end
  
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/categories', :locals => { :block => block }
-    end
-  end
-
   def self.expire_on
       { :profile => [], :environment => [:category] }
   end
@@ -117,7 +117,15 @@ class Comment &lt; ActiveRecord::Base
   end
  
   delegate :environment, :to => :profile
-  delegate :profile, :to => :source, :allow_nil => true
+
+  def environment
+    profile && profile.respond_to?(:environment) ? profile.environment : nil
+  end
+
+  def profile
+    return unless source
+    source.kind_of?(Profile) ? source : source.profile
+  end
  
   include Noosfero::Plugin::HotSpot
  
@@ -27,15 +27,6 @@ class CommunitiesBlock &lt; ProfileListBlock
     owner.profile_suggestions.of_community.enabled.limit(3).includes(:suggestion)
   end
  
-  def footer
-    owner = self.owner
-    suggestions = self.suggestions
-    return '' unless owner.kind_of?(Profile) || owner.kind_of?(Environment)
-    proc do
-      render :file => 'blocks/communities', :locals => { :owner => owner, :suggestions => suggestions }
-    end
-  end
-
   def profiles
     owner.communities
   end
@@ -12,13 +12,6 @@ class DisabledEnterpriseMessageBlock &lt; Block
     _('Message')
   end
  
-  def content(args={})
-    message = self.owner.environment.message_for_disabled_enterprise || ''
-    lambda do |_|
-       render :file => 'blocks/disabled_enterprise_message', :locals => {:message => message}
-    end
-  end
-
   def editable?(user=nil)
     false
   end
@@ -12,22 +12,6 @@ class EnterprisesBlock &lt; ProfileListBlock
     _('Enterprises')
   end
  
-  def footer
-    owner = self.owner
-    case owner
-    when Profile
-      proc do
-        link_to s_('enterprises|View all'), :profile => owner.identifier, :controller => 'profile', :action => 'enterprises'
-      end
-    when Environment
-      proc do
-        link_to s_('enterprises|View all'), :controller => 'search', :action => 'assets', :asset => 'enterprises'
-      end
-    else
-      ''
-    end
-  end
-
   def profiles
     owner.enterprises
   end
@@ -12,14 +12,6 @@ class FansBlock &lt; ProfileListBlock
     _('This block presents the fans of an enterprise.')
   end
  
-  def footer
-    profile = self.owner
-    proc do
-      link_to _('View all'), :profile => profile.identifier, :controller =>
-      'profile', :action => 'fans'
-    end
-  end
-
   def profiles
     owner.fans
   end
@@ -12,14 +12,6 @@ class FavoriteEnterprisesBlock &lt; ProfileListBlock
     _('Favorite Enterprises')
   end
  
-  def footer
-    owner = self.owner
-    return '' unless owner.kind_of?(Person)
-    proc do
-      link_to _('enterprises|View all'), {:profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'}, :class => 'view-all'
-    end
-  end
-
   def profiles
     owner.favorite_enterprises
   end
@@ -32,11 +32,4 @@ class FeaturedProductsBlock &lt; Block
     self.owner.highlighted_products_with_image
   end
  
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/featured_products', :locals => { :block => block }
-    end
-  end
-
 end
@@ -52,24 +52,6 @@ class FeedReaderBlock &lt; Block
     self.feed_title.nil? ? _('Feed Reader') : self.feed_title
   end
  
-  def formatted_feed_content
-    if error_message.blank?
-      "<ul>\n".html_safe +
-      self.feed_items[0..(limit-1)].map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n").html_safe +
-      "</ul>".html_safe
-    else
-      "<p>#{error_message}</p>".html_safe
-    end
-  end
-
-  def footer
-    if self.fetched_at.nil? or self.feed_items.empty?
-      _('Feed content was not loaded yet')
-    else
-      _("Updated: %s") % show_date(self.fetched_at)
-    end
-  end
-
   def add_item(title, link, date, content)
     self.feed_items.unshift( {:title => title, :link => link})
   end
@@ -85,8 +67,4 @@ class FeedReaderBlock &lt; Block
     self.save!
   end
  
-  def content(args={})
-    block_title(title) + formatted_feed_content
-  end
-
 end
@@ -43,13 +43,6 @@ class HighlightsBlock &lt; Block
     end
   end
  
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/highlights', :locals => { :block => block }
-    end
-  end
-
   def folder_choices
     owner.image_galleries
   end
@@ -59,20 +59,6 @@ class LinkListBlock &lt; Block
     _('Link list')
   end
  
-  def content(args={})
-    block_title(title) +
-    content_tag('ul',
-      links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_html(i))}.join
-    )
-  end
-
-  def link_html(link)
-    klass = 'icon-' + link[:icon] if link[:icon]
-    sanitize_link(
-      link_to(link[:name], expand_address(link[:address]), :target => link[:target], :class => klass, :title => link[:title])
-    )
-  end
-
   def expand_address(address)
     add = if owner.respond_to?(:identifier)
       address.gsub('{profile}', owner.identifier)
@@ -99,8 +85,6 @@ class LinkListBlock &lt; Block
     end
   end
  
-  private
-
   def sanitize_link(text)
     sanitizer = HTML::WhiteListSanitizer.new
     sanitizer.sanitize(text)
@@ -13,12 +13,4 @@ class LocationBlock &lt; Block
     _('Shows where the profile is on the material world.')
   end
  
-  def content(args={})
-    block = self
-    profile = self.owner
-    proc do
-      render :file => 'blocks/location', :locals => {:block => block, :profile => profile}
-    end
-  end
-
 end
@@ -8,12 +8,6 @@ class LoginBlock &lt; Block
     _('This block presents a login/logout block.')
   end
  
-  def content(args={})
-    lambda do |context|
-      render :file => 'blocks/login_block'
-    end
-  end
-
   def cacheable?
     false
   end
@@ -8,10 +8,6 @@ class MainBlock &lt; Block
     _('This block presents the main content of your pages.')
   end
  
-  def content(args={})
-    nil
-  end
-
   def main?
     true
   end
@@ -14,16 +14,6 @@ class MyNetworkBlock &lt; Block
     _('This block displays some info about your networking.')
   end
  
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/my_network', :locals => {
-        :title => block.title,
-        :owner => block.owner
-      }
-    end
-  end
-
   def cacheable?
     false
   end
@@ -13,26 +13,6 @@ class ProductCategoriesBlock &lt; Block
     _('Helps to filter the products catalog.')
   end
  
-  def content(args={})
-    profile = owner
-    proc do
-      if @categories.nil? or @categories.length == 0
-        categories = ProductCategory.on_level(nil).order(:name)
-        if @categories and @categories.length == 0
-          notice = _('There are no sub-categories for %s') % @category.name
-        end
-      else
-        categories = @categories
-      end
-      render :file => 'blocks/product_categories',
-             :locals => {
-               :profile => profile,
-               :categories => categories,
-               :notice => notice
-             }
-    end
-  end
-
   DISPLAY_OPTIONS = DISPLAY_OPTIONS.merge('catalog_only' => _('Only on the catalog'))
  
   def display
@@ -19,26 +19,6 @@ class ProductsBlock &lt; Block
     _('This block presents a list of your products.')
   end
  
-  def content(args={})
-    block_title(title) +
-    content_tag(
-      'ul',
-      products.map {|product|
-        content_tag('li',
-          link_to( product.name,
-                   product.url,
-                   :style => 'background-image:url(%s)' % product.default_image('minor')
-                 ),
-          :class => 'product'
-        )
-      }.join
-    )
-  end
-
-  def footer
-    link_to(_('View all products'), owner.public_profile_url.merge(:controller => 'catalog', :action => 'index'))
-  end
-
   settings_items :product_ids, type: Array
   def product_ids=(array)
     self.settings[:product_ids] = array
@@ -5,8 +5,8 @@ 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,
-    :custom_fields, :administrator_mail_notification, :region, :region_id
+    :email_suggestions, :allow_members_to_invite, :invite_friends_only, :secret, :profile_admin_mail_notification,
+    :custom_fields, :region, :region_id
  
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
@@ -277,7 +277,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 :administrator_mail_notification, :type => :boolean, :default => true
+  settings_items :profile_admin_mail_notification, :type => :boolean, :default => true
  
   validates_length_of :description, :maximum => 550, :allow_nil => true
  
@@ -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
@@ -81,17 +81,13 @@ class Task &lt; ActiveRecord::Base
   end
  
   def target_profile_accepts_notification?(task)
-    if target_is_profile?(task)
-      return task.target.administrator_mail_notification
+    if task.target.kind_of? Organization
+      return task.target.profile_admin_mail_notification
     else
       true
     end
   end
  
-  def target_is_profile?(task)
-    task.target.kind_of? Profile
-  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.
@@ -0,0 +1,12 @@
+<%= block_title(block.title) %>
+<% if block.article %>
+  <%=
+    h(article_to_html(FilePresenter.for(block.article),
+        :gallery_view => false,
+        :inside_block => block,               # For Blogs and folders
+        :format => block.visualization_format # For Articles and contents
+    ))
+  %>
+<% else %>
+  <%= _('Article not selected yet.') %>
+<% end %>
@@ -0,0 +1,16 @@
+<% if block.blog %>
+  <%= block_title(block.title) %>
+
+  <ul class='blog-archives'>
+    <% block.blog.total_number_of_posts(:by_year).each do |year, count| %>
+      <%= content_tag('li', content_tag('strong', "#{year.to_i} (#{count})")) %>
+      <ul class='<%= year.to_i %>-archive'>
+        <% block.blog.total_number_of_posts(:by_month, year).each do |month, count| %>
+          <%= content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", block.blog.url.merge(year: year.to_i, month: month.to_i))) %>
+        <% end %>
+      </ul>
+    <% end %>
+  </ul>
+
+  <%= content_tag('div', link_to(_('Subscribe RSS Feed'), block.blog.feed.url), :class => 'subscribe-feed') %>
+<% end %>
@@ -1,17 +0,0 @@
-<% if owner.kind_of?(Profile) %>
-  <%= link_to s_('communities|View all'), {:profile => owner.identifier, :controller => 'profile', :action => 'communities'}, :class => 'view-all' %>
-<% elsif owner.kind_of?(Environment) %>
-  <%= link_to s_('communities|View all'), {:controller => 'search', :action => 'communities'}, :class => 'view-all' %>
-<% end %>
-
-<% if user && user == profile && suggestions && !suggestions.empty? %>
-  <div class='suggestions-block common-profile-list-block'>
-    <h4 class='block-subtitle'><%= _('Some suggestions for you') %></h4>
-    <div class='profiles-suggestions'>
-      <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => suggestions, :collection => :communities_suggestions, :per_page => 3 } %>
-    </div>
-    <div class='more-suggestions'>
-      <%= link_to _('See all suggestions'), profile.communities_suggestions_url %>
-    </div>
-  </div>
-<% end %>
@@ -0,0 +1 @@
+profile_list.html.erb
 \ No newline at end of file
+<% message = block.owner.environment.message_for_disabled_enterprise || '' %>
+
 <div id='enterprise-disabled'>
   <%= message %>
   <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
@@ -0,0 +1 @@
+profile_list.html.erb
 \ No newline at end of file
@@ -0,0 +1 @@
+profile_list.html.erb
 \ No newline at end of file
@@ -0,0 +1 @@
+profile_list.html.erb
 \ No newline at end of file
@@ -0,0 +1,11 @@
+<%= block_title(block.title) %>
+
+<%=
+    if block.error_message.blank?
+      "<ul>\n".html_safe +
+      block.feed_items[0..(block.limit-1)].map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n").html_safe +
+      "</ul>".html_safe
+    else
+      "<p>#{block.error_message}</p>".html_safe
+    end
+%>
@@ -0,0 +1,19 @@
+<% if block.owner.kind_of?(Profile) || block.owner.kind_of?(Environment) %>
+  <% if block.owner.kind_of?(Profile) %>
+    <%= link_to s_('communities|View all'), {:profile => block.owner.identifier, :controller => 'profile', :action => 'communities'}, :class => 'view-all' %>
+  <% elsif block.owner.kind_of?(Environment) %>
+    <%= link_to s_('communities|View all'), {:controller => 'search', :action => 'communities'}, :class => 'view-all' %>
+  <% end %>
+
+  <% if user && user == profile && block.suggestions && !block.suggestions.empty? %>
+    <div class='suggestions-block common-profile-list-block'>
+      <h4 class='block-subtitle'><%= _('Some suggestions for you') %></h4>
+      <div class='profiles-suggestions'>
+        <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => block.suggestions, :collection => :communities_suggestions, :per_page => 3 } %>
+      </div>
+      <div class='more-suggestions'>
+        <%= link_to _('See all suggestions'), profile.communities_suggestions_url %>
+      </div>
+    </div>
+  <% end %>
+<% end %>
@@ -0,0 +1,5 @@
+<% if block.owner.is_a?(Profile) %>
+  <%= link_to s_('enterprises|View all'), :profile => block.owner.identifier, :controller => 'profile', :action => 'enterprises' %>
+<% elsif block.owner.is_a?(Environment) %>
+  <%= link_to s_('enterprises|View all'), :controller => 'search', :action => 'assets', :asset => 'enterprises' %>
+<% end %>
@@ -0,0 +1 @@
+<%= link_to _('View all'), :profile => block.owner.identifier, :controller => 'profile', :action => 'fans' %>
@@ -0,0 +1,3 @@
+<% if block.owner.is_a?(Person) %>
+  <%= link_to _('enterprises|View all'), {:profile => block.owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'}, :class => 'view-all' %>
+<% end %>
@@ -0,0 +1,5 @@
+<% if block.fetched_at.nil? or block.feed_items.empty? %>
+  <%= _('Feed content was not loaded yet') %>
+<% else %>
+  <%= _("Updated: %s") % show_date(block.fetched_at) %>
+<% end %>
@@ -0,0 +1 @@
+<%= link_to(_('View all products'), block.owner.public_profile_url.merge(:controller => 'catalog', :action => 'index')) %>
@@ -0,0 +1,3 @@
+<% if block.owner.is_a?(Profile) %>
+  <%= link_to _('All content'), :profile => block.owner.identifier, :controller => 'profile', :action => 'sitemap' %>
+<% end %>
@@ -0,0 +1,5 @@
+<% if block.owner.is_a?(Environment) %>
+  <%= link_to s_('tags|View all'), :controller => 'search', :action => 'tags' %>
+<% else %>
+  <%= link_to s_('tags|View all'), :profile => block.owner.identifier, :controller => 'profile', :action => 'tags' %>
+<% end %>
@@ -0,0 +1,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 %>
@@ -8,7 +8,7 @@
 <%= render :partial => 'general_fields' %>
 <%= render :partial => 'translatable' %>
  
-<%= date_range_field('article[start_date]', 'article[end_date]', @article.start_date, @article.end_date, _('%Y-%m-%d %H:%M'), {:time => true}, {:id => 'article_start_date'} ) %>
+<%= date_range_field('article[start_date]', 'article[end_date]', @article.start_date, @article.end_date, {:time => true}, {:id => 'article_start_date'} ) %>
  
 <%= labelled_form_field(_('Presenter:'), text_field(:article, :presenter)) %>
  
-<%= labelled_form_field(_('Publish date'), date_field('article[published_at]', @article.published_at || DateTime.current, '%Y-%m-%d', {:max_date => '+0d', :date_format => 'yy-mm-dd'}, {:id => "article_published_at"})) %>
+<%= labelled_form_field(_('Publish date'), date_field('article[published_at]', @article.published_at || DateTime.current, {:max_date => '+0d', :date_format => 'yy-mm-dd'}, {:id => "article_published_at"})) %>
-<%= labelled_form_field(field.name, date_field(name, profile.custom_value(field.name).to_date, '%Y-%m-%d', {:change_month => true, :change_year => true, :year_range => '-100:-5', :date_format => 'yy-mm-dd'}, {:id => field.name.parameterize.underscore}))%>
+<%= labelled_form_field(field.name, date_field(name, profile.custom_value(field.name).to_date, {:change_month => true, :change_year => true, :year_range => '-100:-5', :date_format => 'yy-mm-dd'}, {:id => field.name.parameterize.underscore}))%>
@@ -4,9 +4,9 @@
     <h4><%= _('Email Configuration:')%></h4>
   </div>
   <div style='margin-bottom: 0.5em'>
-    <%= check_box(:profile_data, :administrator_mail_notification, :style => 'float: left') %>
+    <%= check_box(:profile_data, :profile_admin_mail_notification, :style => 'float: left') %>
     <div style='margin-left: 30px'>
-      <%= _('Send administrator Email for every task (Default: yes)') %>
+      <%= _('Send administrator Email for every task') %>
     </div>
   </div>
  
@@ -16,7 +16,7 @@
 <%= optional_field(@person, 'jabber_id', f.text_field(:jabber_id, :rel => _('Jabber'))) %>
 <%= optional_field(@person, 'personal_website', f.text_field(:personal_website, :rel => _('Personal website'))) %>
 <%= optional_field(@person, 'sex', f.radio_group(:profile_data, :sex, [ ['male',_('Male')], ['female',_('Female')] ])) %>
-<%= optional_field(@person, 'birth_date', labelled_form_field(_('Birth date'), date_field('profile_data[birth_date]', @profile_data. birth_date, '%Y-%m-%d', {:change_month => true, :change_year => true, :year_range => '-100:-5', :date_format => 'yy-mm-dd'}, {:id => 'profile_data_birth_date'}))) %>
+<%= optional_field(@person, 'birth_date', labelled_form_field(_('Birth date'), date_field('profile_data[birth_date]', @profile_data. birth_date, {:change_month => true, :change_year => true, :year_range => '-100:-5', :date_format => 'yy-mm-dd'}, {:id => 'profile_data_birth_date'}))) %>
 <%= optional_field(@person, 'nationality', f.text_field(:nationality, :rel => _('Nationality'))) %>
 <%= optional_field(@person, 'country', select_country(_('Country'), 'profile_data', 'country', {:class => 'type-select'})) %>
 <%= optional_field(@person, 'state', f.text_field(:state, :id => 'state_field', :rel => _('State'))) %>
@@ -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 %>
@@ -50,7 +50,7 @@
     <em><%= _('No pending tasks for %s') % profile.name %></em>
   </p>
 <% else %>
-  <%= form_tag task_action('close') do%>
+  <%= form_tag tasks_url(:action => 'close') do%>
     <% button_bar(:class => 'task-actions') do %>
       <%# FiXME button(:edit, _('View my requests'), :action => 'list_requested') %>
       <%# FIXME button('menu-mail',  _('Send request'), :action => 'new') %>
@@ -47,6 +47,7 @@ Depends: adduser,
          ruby-activerecord-session-store,
          ruby-activerecord-deprecated-finders,
          ruby-acts-as-taggable-on (>= 3.5),
+         ruby-api-pagination,
          ruby-daemons,
          ruby-dalli,
          ruby-delayed-job,
@@ -60,7 +61,7 @@ Depends: adduser,
          ruby-feedparser (>= 0.7-3~),
          ruby-gettext,
          ruby-grape,
-         ruby-grape-entity,
+         ruby-grape-entity (= 0.4.8),
          ruby-grape-logging,
          ruby-minitest,
          ruby-nokogiri,
@@ -0,0 +1,45 @@
+Feature: manage tasks
+  As an community admin user
+  I want to manage pending tasks
+  In order to approve or disapprove them
+
+  Background:
+    Given the following users
+      | login | name        | email            |
+      | bob   | Bob Rezende | bob@invalid.br   |
+      | maria | Maria Sousa | maria@invalid.br |
+      | marie | Marie Curie | marie@invalid.br |
+      | mario | Mario Souto | mario@invalid.br |
+    And the following community
+      | identifier  | name         |
+      | mycommunity | My Community |
+    And the community "My Community" is closed
+    And the articles of "My Community" are moderated
+    And "Bob Rezende" is admin of "My Community"
+    And "Mario Souto" is a member of "My Community"
+
+  @selenium
+  Scenario: keep filters after close tasks
+    Given "Marie Curie" asked to join "My Community"
+    And "Maria Sousa" asked to join "My Community"
+	And someone suggested the following article to be published
+	  |name             | target      | email            | body  | person |
+      |Sample Article   | mycommunity | mario@invalid.br | Corpo | mario  |
+      |Other Article    | mycommunity | maria@invalid.br | Corpo | maria  |
+      |Another Article  | mycommunity | marie@invalid.br | Corpo | marie  |
+    And I am logged in as "bob"
+    And I go to mycommunity's control panel
+    And I follow "Tasks"
+    And I should see "Marie Curie wants to be a member of 'My Community'"
+    And I should see "Maria Sousa wants to be a member of 'My Community'"
+    And I should see "Mario Souto suggested the publication of the article: Sample Article"
+    And I should see "Maria Sousa suggested the publication of the article: Other Article"
+    And I should see "Marie Curie suggested the publication of the article: Another Article"
+    When I select "New member" from "Type of task"
+    And I press "Search"
+    And I should see "wants to be a member of 'My Community'"
+    And I should not see "suggested the publication of the article:"
+    And I choose "Accept"
+    And I press "Apply"
+    And I should see "wants to be a member of 'My Community'"
+    Then I should not see "suggested the publication of the article:"
@@ -497,7 +497,9 @@ end
 Given /^someone suggested the following article to be published$/ do |table|
   table.hashes.map{|item| item.dup}.each do |item|
     target = Community[item.delete('target')]
-    task = SuggestArticle.create!(:target => target, :data => item)
+    article = {:name => item.delete('name'), :body => item.delete('body')}
+    person = Profile[item.delete('person')]
+    task = SuggestArticle.create!(:target => target, :article => article, :requestor => person)
   end
 end
  
@@ -132,7 +132,6 @@ module Noosfero
         expose :articles_count do |person, options|
           person.articles.count
         end
-
       end
  
       class Enterprise < Profile
@@ -246,7 +245,6 @@ module Noosfero
           type_map.first.represent(activity.target) unless type_map.nil?
         end
       end
-
     end
   end
 end
@@ -5,7 +5,7 @@ require_relative &#39;../../find_by_contents&#39;
     module API
       module APIHelpers
       PRIVATE_TOKEN_PARAM = :private_token
-      DEFAULT_ALLOWED_PARAMETERS = [:parent_id, :from, :until, :content_type, :author_id, :archived, :identifier]
+      DEFAULT_ALLOWED_PARAMETERS = [:parent_id, :from, :until, :content_type, :author_id, :identifier, :archived]
  
       include SanitizeParams
       include Noosfero::Plugin::HotSpot
@@ -116,6 +116,7 @@ require_relative &#39;../../find_by_contents&#39;
         end
       end
  
+      ARTICLE_TYPES = ['Article'] + Article.descendants.map{|a| a.to_s}
       TASK_TYPES = ['Task'] + Task.descendants.map{|a| a.to_s}
  
       def find_article(articles, id)
@@ -127,8 +128,7 @@ require_relative &#39;../../find_by_contents&#39;
         return forbidden! unless current_person.can_post_content?(asset)
  
         klass_type= params[:content_type].nil? ? TinyMceArticle.name : params[:content_type]
-        article_types = ['Article'] + Article.descendants.map{|a| a.to_s}
-        return forbidden! unless article_types.include?(klass_type)
+        return forbidden! unless ARTICLE_TYPES.include?(klass_type)
  
         article = klass_type.constantize.new(params[:article])
         article.last_changed_by = current_person
@@ -152,12 +152,7 @@ require_relative &#39;../../find_by_contents&#39;
       end
  
       def present_articles(articles)
-        present_partial articles, :with => Entities::Article
-      end
-
-      def present_articles_paginated(articles, per_page=nil)
-        articles = paginate(articles)
-        present_partial articles, :with => Entities::Article
+        present_partial paginate(articles), :with => Entities::Article
       end
  
       def find_articles(asset, method = 'articles')
@@ -239,15 +234,6 @@ require_relative &#39;../../find_by_contents&#39;
         return order
       end
  
-      def make_page_number_with_parameters(params)
-        params[:page] || 1
-      end
-
-      def make_per_page_with_parameters(params)
-        params[:per_page] ||= limit
-        params[:per_page].to_i
-      end
-
       def make_timestamp_with_parameters_and_method(params, method)
         timestamp = nil
         if params[:timestamp]
@@ -281,17 +267,17 @@ require_relative &#39;../../find_by_contents&#39;
       def select_filtered_collection_of(object, method, params)
         conditions = make_conditions_with_parameter(params)
         order = make_order_with_parameters(object,method,params)
-        page_number = make_page_number_with_parameters(params)
-        per_page = make_per_page_with_parameters(params)
         timestamp = make_timestamp_with_parameters_and_method(params, method)
  
         objects = object.send(method)
         objects = by_reference(objects, params)
         objects = by_categories(objects, params)
  
-        objects = objects.where(conditions).where(timestamp).page(page_number).per_page(per_page).reorder(order)
+        objects = objects.where(conditions).where(timestamp).reorder(order)
  
-        objects
+        params[:page] ||= 1
+        params[:per_page] ||= limit
+        paginate(objects)
       end
  
       def authenticate!
@@ -17,7 +17,7 @@ module Noosfero
           get ':id/network_activities' do
             #TODO
           end
-          
+
         end
       end
     end
@@ -9,8 +9,7 @@ module Noosfero
  
         resource :articles do
  
-          paginate per_page: MAX_PER_PAGE, max_per_page: MAX_PER_PAGE
-
+          paginate max_per_page: MAX_PER_PAGE
           # Collect articles
           #
           # Parameters:
@@ -132,8 +131,7 @@ module Noosfero
             named 'ArticleFollowers'
           end
           get 'voted_by_me' do
-            #FIXME refactor this method
-            present_articles_paginated(current_person.votes.where(:voteable_type => 'Article').collect(&:voteable))
+            present_articles(current_person.votes.where(:voteable_type => 'Article').collect(&:voteable))
           end
  
           desc 'Perform a vote on a article by id' do
@@ -176,6 +174,11 @@ module Noosfero
             {:total_followers => total}
           end
  
+          desc "Return the articles followed by me"
+          get 'followed_by_me' do
+            present_articles_for_asset(current_person, 'following_articles')
+          end
+
           desc "Add a follower for the article" do
             detail 'Add the current user identified by private token, like a follower of a article'
             params Noosfero::API::Entities::UserLogin.documentation
@@ -17,10 +17,29 @@ module Noosfero
                 end
               end
             end
-
           end
  
         end
+
+        resource :environments do
+          [ '/default', '/context', ':environment_id' ].each do |route|
+            segment route do
+              resource :boxes do
+                get do
+                  if (route.match(/default/))
+                    env = Environment.default
+                  elsif (route.match(/context/))
+                    env = environment
+                  else
+                    env = Environment.find(params[:environment_id])
+                  end
+                  present env.boxes, :with => Entities::Box
+                end
+              end
+            end
+          end
+        end
+
       end
  
     end
@@ -32,8 +32,7 @@ module Noosfero
             article = find_article(environment.articles, params[:id])
             options = params.select { |key,v| !['id','private_token'].include?(key) }.merge(:author => current_person, :source => article)
             begin
-              comment = Comment.create(options)
-              comment.save!
+              comment = Comment.create!(options)
             rescue ActiveRecord::RecordInvalid => e
               render_api_error!(e.message, 400)
             end
@@ -9,7 +9,17 @@ module Noosfero
           get '/signup_person_fields' do
             present environment.signup_person_fields
           end
-  
+
+          get ':id' do
+            if (params[:id] == "default")
+              present Environment.default
+            elsif (params[:id] == "context")
+              present environment
+            else
+              present Environment.find(params[:id])
+            end
+          end
+
         end
  
       end
@@ -9,6 +9,7 @@ module Noosfero
         desc 'API Root'
  
         resource :people do
+          paginate max_per_page: MAX_PER_PAGE
  
           # -- A note about privacy --
           # We wold find people by location, but we must test if the related
@@ -111,7 +112,7 @@ module Noosfero
         resource :profiles do
           segment '/:profile_id' do
             resource :members do
-              paginate per_page: MAX_PER_PAGE, max_per_page: MAX_PER_PAGE
+              paginate max_per_page: MAX_PER_PAGE
               get do
                 profile = environment.profiles.find_by_id(params[:profile_id])
                 members = select_filtered_collection_of(profile, 'members', params)
@@ -120,7 +121,6 @@ module Noosfero
             end
           end
         end
-
       end
     end
   end
@@ -5,7 +5,7 @@ module Noosfero
  
         resource :search do
           resource :article do
-            paginate per_page: 20, max_per_page: 200
+            paginate max_per_page: 200
             get do
               # Security checks
               sanitize_params_hash(params)
@@ -24,17 +24,11 @@ module Noosfero
  
               options = {:filter => order, :template_id => params[:template_id]}
  
-              paginate_options = params.select{|k,v| [:page, :per_page].include?(k.to_sym)}.symbolize_keys
-              paginate_options.each_pair{|k,v| v=v.to_i}
-              paginate_options[:page]=1 if !paginate_options.keys.include?(:page)
-
-              search_result = find_by_contents(asset, context, scope, query, paginate_options, options)
+              search_result = find_by_contents(asset, context, scope, query, {:page => 1}, options)
  
               articles = search_result[:results]
  
-              result = present_articles_paginated(articles)
-
-              result
+              present_articles(articles)
             end
           end
         end
@@ -762,6 +762,10 @@ class Noosfero::Plugin
     # returns = string with reason of expiration
     elsif method.to_s =~ /^content_expire_(#{content_actions.join('|')})$/
       nil
+    # -> Generic hotspots for models callbacks
+    # Example: article_after_create_callback
+    elsif method.to_s =~ /^(.+)_#{Noosfero::Plugin::HotSpot::CALLBACK_HOTSPOTS.join('|')}_callback$/
+      nil
     elsif context.respond_to?(method)
       context.send(method, *args)
     else
@@ -6,6 +6,7 @@
 # Environment will be used to determine which plugins are enabled and therefore
 # which plugins should be instantiated.
 module Noosfero::Plugin::HotSpot
+  CALLBACK_HOTSPOTS =[:after_save, :after_destroy, :before_save, :before_destroy, :after_create, :before_create]
  
   # Returns an instance of Noosfero::Plugin::Manager.
   #
@@ -15,4 +16,26 @@ module Noosfero::Plugin::HotSpot
     @plugins ||= Noosfero::Plugin::Manager.new(environment, self)
   end
  
+  def self.included(klass)
+    klass.extend(ClassMethods)
+  end
+
+  module ClassMethods
+    def self.extended base
+      CALLBACK_HOTSPOTS.each do |callback|
+        if base.respond_to?(callback)
+          base.class_eval do
+            self.send callback do |object|
+              current=self.class
+              while current.included_modules.include? Noosfero::Plugin::HotSpot do
+                callback_name = "#{current.name.underscore}_#{callback}_callback"
+                plugins.dispatch(callback_name, object)
+                current=current.superclass
+              end
+            end
+          end
+        end
+      end
+    end
+  end
 end
@@ -75,7 +75,8 @@ class Noosfero::Plugin::Manager
   end
  
   def enabled_plugins
-    @enabled_plugins ||= (Noosfero::Plugin.all & environment.enabled_plugins).map do |plugin|
+    environment_enabled_plugins = environment.present? ? environment.enabled_plugins : []
+    @enabled_plugins ||= (Noosfero::Plugin.all & environment_enabled_plugins).map do |plugin|
       Noosfero::Plugin.load_plugin_identifier(plugin).new context
     end
   end
@@ -215,7 +215,15 @@ namespace :test do
  
   desc "Run all tests for all plugins"
   task :noosfero_plugins do
-    test_sequence(@all_plugins - $broken_plugins, @all_tasks) do |failed|
+    plugins    = @all_plugins - $broken_plugins
+    if slice   = ENV['SLICE']
+      slice    = slice.split('/').map &:to_i
+      selected = slice[0]-1
+      size     = (plugins.size / slice[1].to_f).ceil
+      plugins  = plugins.each_slice(size).to_a[selected]
+    end
+
+    test_sequence plugins, @all_tasks do |failed|
       plugins_status_report(failed)
     end
   end
@@ -233,8 +241,10 @@ def plugins_status_report(failed)
  
   @all_plugins.each do |plugin|
     if $broken_plugins.include?(plugin)
+      status = "BROKEN"
+    elsif failed[plugin].nil?
       status = "SKIP"
-    elsif !failed[plugin] || failed[plugin].empty?
+    elsif failed[plugin].empty?
       status = "PASS"
     else
       status = "FAIL: #{failed[plugin].join(', ')}"
@@ -6,7 +6,6 @@
   <%= required f.text_field('name', :size => '64', :maxlength => 150) %>
   <%= labelled_form_field(_('Period'), (
     date_range_field('article[start_date]', 'article[end_date]', @article.start_date, @article.end_date,
-                     '%Y-%m-%d',
                      { :change_month => true, :change_year => true,
                        :date_format => 'yy-mm-dd' },
                      { :size => 14 })
@@ -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>
-
@@ -5,7 +5,6 @@
 <%= required labelled_form_field _('Name'), f.text_field(:name) %>
 <%= labelled_form_field(_('What is the time limit for this form to be filled?'), (
   date_range_field('form[begining]', 'form[ending]', @form.begining, @form.ending,
-                   '%Y/%m/%d %H:%M',
                    { :time => true, :change_month => true, :change_year => true,
                      :date_format => 'yy-mm-dd', :time_format => 'hh:mm' },
                      { :size => 14 })
 <%= 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/>
@@ -20,14 +20,6 @@ class FriendsBlock &lt; PeopleBlockBase
     owner.suggested_profiles.of_person.enabled.limit(3).includes(:suggestion)
   end
  
-  def footer
-    profile = self.owner
-    suggestions = self.suggestions
-    proc do
-      render :file => 'blocks/friends', :locals => { :profile => profile, :suggestions => suggestions }
-    end
-  end
-
   def self.expire_on
     { :profile => [:profile] }
   end
@@ -20,15 +20,6 @@ class MembersBlock &lt; PeopleBlockBase
     role ? owner.members.with_role(role.id) : owner.members
   end
  
-  def footer
-    profile = self.owner
-    role_key = visible_role
-    s = show_join_leave_button
-    proc do
-      render :file => 'blocks/members', :locals => { :profile => profile, :show_join_leave_button => s, :role_key => role_key}
-    end
-  end
-
   def role
     visible_role && !visible_role.empty? ? Role.find_by_key_and_environment_id(visible_role, owner.environment) : nil
   end
@@ -15,11 +15,4 @@ class PeopleBlock &lt; PeopleBlockBase
   def profiles
     owner.people
   end
-
-  def footer
-    proc do
-      render :file => 'blocks/people'
-    end
-  end
-
 end
@@ -42,57 +42,6 @@ class PeopleBlockBase &lt; Block
     profiles.visible.count
   end
  
-  def content(args={})
-    profiles = self.profile_list
-    title = self.view_title
-
-    if !self.name.blank? && !self.address.blank?
-      name = self.name
-      expanded_address = expand_address(self.address)
-    end
-
-    proc do
-      count = 0
-      list = profiles.map {|item|
-               count += 1
-               send(:profile_image_link, item, :minor )
-             }.join("\n")
-      if list.empty?
-        list = content_tag 'div', c_('None'), :class => 'common-profile-list-block-none'
-      else
-        if !name.blank? && !expanded_address.blank?
-          list << content_tag(
-                    'div',
-                    content_tag(
-                      'li',
-                      content_tag(
-                        'div',
-                        link_to(
-                          content_tag('span', name, :class => 'banner-span' ),
-                          expanded_address,
-                          :title => name
-                        ),
-                        :class => 'banner-div'
-                      ),
-                      :class => 'vcard'
-                    ),
-                    :class => 'common-profile-list-block'
-                  )
-        end
-        list = content_tag 'ul', list
-      end
-      block_title(title) + content_tag('div', list + tag('br', :style => 'clear:both'))
-    end
-  end
-
-  def expand_address(address)
-    if address !~ /^[a-z]+:\/\// && address !~ /^\//
-      'http://' + address
-    else
-      address
-    end
-  end
-
   def extra_option
     { }
   end
@@ -0,0 +1,9 @@
+module PeopleBlockHelper
+  def profiles_images_list(profiles)
+    profiles.map { |profile| profile_image_link(profile, :minor) }.join("\n")
+  end
+
+  def set_address_protocol(address)
+    !URI.parse(address).scheme ? 'http://'+address : address
+  end
+end
@@ -60,39 +60,6 @@ class FriendsBlockTest &lt; ActionView::TestCase
     assert_equal 20, block.limit
   end
  
-  should 'list friends from person' do
-    owner = fast_create(Person)
-    friend1 = fast_create(Person)
-    friend2 = fast_create(Person)
-    owner.add_friend(friend1)
-    owner.add_friend(friend2)
-
-    block = FriendsBlock.new
-
-    block.expects(:owner).returns(owner).at_least_once
-    expects(:profile_image_link).with(friend1, :minor).returns(friend1.name)
-    expects(:profile_image_link).with(friend2, :minor).returns(friend2.name)
-    expects(:block_title).with(anything).returns('')
-
-    content = instance_eval(&block.content)
-
-    assert_match(/#{friend1.name}/, content)
-    assert_match(/#{friend2.name}/, content)
-  end
-
-  should 'link to "all friends"' do
-    person1 = create_user('mytestperson').person
-
-    block = FriendsBlock.new
-    block.stubs(:suggestions).returns([])
-    block.expects(:owner).returns(person1).at_least_once
-
-    instance_eval(&block.footer)
-    assert_select 'a.view-all' do |elements|
-      assert_select '[href=/profile/mytestperson/friends]'
-    end
-  end
-
   should 'count number of owner friends' do
     owner = fast_create(Person)
     friend1 = fast_create(Person)
@@ -151,3 +118,39 @@ class FriendsBlockTest &lt; ActionView::TestCase
   include NoosferoTestHelper
  
 end
+
+require 'boxes_helper'
+
+class FriendsBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
+  should 'list friends from person' do
+    owner = fast_create(Person)
+    friend1 = fast_create(Person)
+    friend2 = fast_create(Person)
+    owner.add_friend(friend1)
+    owner.add_friend(friend2)
+
+    block = FriendsBlock.new
+
+    block.expects(:owner).returns(owner).at_least_once
+    ActionView::Base.any_instance.expects(:profile_image_link).with(friend1, :minor).returns(friend1.name)
+    ActionView::Base.any_instance.expects(:profile_image_link).with(friend2, :minor).returns(friend2.name)
+    ActionView::Base.any_instance.expects(:block_title).with(anything).returns('')
+
+    content = render_block_content(block)
+
+    assert_match(/#{friend1.name}/, content)
+    assert_match(/#{friend2.name}/, content)
+  end
+
+  should 'link to "all friends"' do
+    person1 = create_user('mytestperson').person
+
+    block = FriendsBlock.new
+    block.stubs(:suggestions).returns([])
+    block.expects(:owner).returns(person1).at_least_once
+
+    assert_tag_in_string render_block_footer(block), tag: 'a', attributes: {class: 'view-all', href: '/profile/mytestperson/friends' }
+  end
+end
@@ -90,26 +90,6 @@ class MembersBlockTest &lt; ActionView::TestCase
   end
  
  
-  should 'list members from community' do
-    owner = fast_create(Community)
-    person1 = fast_create(Person)
-    person2 = fast_create(Person)
-    owner.add_member(person1)
-    owner.add_member(person2)
-
-    block = MembersBlock.new
-
-    block.expects(:owner).returns(owner).at_least_once
-    expects(:profile_image_link).with(person1, :minor).returns(person1.name)
-    expects(:profile_image_link).with(person2, :minor).returns(person2.name)
-    expects(:block_title).with(anything).returns('')
-
-    content = instance_eval(&block.content)
-
-    assert_match(/#{person1.name}/, content)
-    assert_match(/#{person2.name}/, content)
-  end
-
   should 'count number of public and private members' do
     owner = fast_create(Community)
     private_p = fast_create(Person, {:public_profile => false})
@@ -139,57 +119,6 @@ class MembersBlockTest &lt; ActionView::TestCase
     assert_equal 1, block.profile_count
   end
  
-  should 'provide link to members page without a visible_role selected' do
-    profile = create_user('mytestuser').person
-    block = MembersBlock.new
-    block.box = profile.boxes.first
-    block.save!
-
-    instance_eval(&block.footer)
-    assert_select 'a.view-all' do |elements|
-      assert_select "[href=/profile/mytestuser/members#members-tab]"
-    end
-  end
-
-  should 'provide link to members page when visible_role is profile_member' do
-    profile = create_user('mytestuser').person
-    block = MembersBlock.new
-    block.box = profile.boxes.first
-    block.visible_role = 'profile_member'
-    block.save!
-
-    instance_eval(&block.footer)
-    assert_select 'a.view-all' do |elements|
-      assert_select '[href=/profile/mytestuser/members#members-tab]'
-    end
-  end
-
-  should 'provide link to members page when visible_role is profile_moderator' do
-    profile = create_user('mytestuser').person
-    block = MembersBlock.new
-    block.box = profile.boxes.first
-    block.visible_role = 'profile_moderator'
-    block.save!
-
-    instance_eval(&block.footer)
-    assert_select 'a.view-all' do |elements|
-      assert_select '[href=/profile/mytestuser/members#members-tab]'
-    end
-  end
-
-  should 'provide link to admins page when visible_role is profile_admin' do
-    profile = create_user('mytestuser').person
-    block = MembersBlock.new
-    block.box = profile.boxes.first
-    block.visible_role = 'profile_admin'
-    block.save!
-
-    instance_eval(&block.footer)
-    assert_select 'a.view-all' do |elements|
-      assert_select '[href=/profile/mytestuser/members#admins-tab]'
-    end
-  end
-
   should 'provide a role to be displayed (and default to nil)' do
     env = fast_create(Environment)
     env.boxes << Box.new
@@ -299,3 +228,82 @@ class MembersBlockTest &lt; ActionView::TestCase
   include NoosferoTestHelper
  
 end
+
+require 'boxes_helper'
+
+class MembersBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
+  should 'list members from community' do
+    owner = fast_create(Community)
+    person1 = fast_create(Person)
+    person2 = fast_create(Person)
+    owner.add_member(person1)
+    owner.add_member(person2)
+    profile = Profile.new
+    profile.identifier = 42
+
+    block = MembersBlock.new
+
+    block.expects(:owner).returns(owner).at_least_once
+    ActionView::Base.any_instance.expects(:profile_image_link).with(person1, :minor).returns(person1.name)
+    ActionView::Base.any_instance.expects(:profile_image_link).with(person2, :minor).returns(person2.name)
+    ActionView::Base.any_instance.expects(:block_title).with(anything).returns('')
+
+    content = render_block_content(block)
+
+    assert_match(/#{person1.name}/, content)
+    assert_match(/#{person2.name}/, content)
+  end
+
+  should 'provide link to members page without a visible_role selected' do
+    profile = create_user('mytestuser').person
+    block = MembersBlock.new
+    block.box = profile.boxes.first
+    block.save!
+
+    render_block_footer(block)
+    assert_select 'a.view-all' do |elements|
+      assert_select "[href=/profile/mytestuser/members#members-tab]"
+    end
+  end
+
+  should 'provide link to members page when visible_role is profile_member' do
+    profile = create_user('mytestuser').person
+    block = MembersBlock.new
+    block.box = profile.boxes.first
+    block.visible_role = 'profile_member'
+    block.save!
+
+    render_block_footer(block)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestuser/members#members-tab]'
+    end
+  end
+
+  should 'provide link to members page when visible_role is profile_moderator' do
+    profile = create_user('mytestuser').person
+    block = MembersBlock.new
+    block.box = profile.boxes.first
+    block.visible_role = 'profile_moderator'
+    block.save!
+
+    render_block_footer(block)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestuser/members#members-tab]'
+    end
+  end
+
+  should 'provide link to admins page when visible_role is profile_admin' do
+    profile = create_user('mytestuser').person
+    block = MembersBlock.new
+    block.box = profile.boxes.first
+    block.visible_role = 'profile_admin'
+    block.save!
+
+    render_block_footer(block)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestuser/members#admins-tab]'
+    end
+  end
+end
@@ -0,0 +1,37 @@
+require 'test_helper'
+
+class PeopleBlockHelperTest < ActionView::TestCase
+  include PeopleBlockHelper
+
+  should 'list profiles as images links' do
+    owner = fast_create(Environment)
+    profiles = [
+      fast_create(Person, :environment_id => owner.id),
+      fast_create(Person, :environment_id => owner.id),
+      fast_create(Person, :environment_id => owner.id)
+    ]
+    link_html = "<a href=#><img src='' /></a>"
+
+    profiles.each do |profile|
+      expects(:profile_image_link).with(profile, :minor).returns(link_html)
+    end
+
+    list = profiles_images_list(profiles)
+
+    assert_equal list, ([link_html]*profiles.count).join("\n")
+  end
+
+  should 'prepend the protocol to urls missing it' do
+    address = 'noosfero.org'
+
+    assert_equal set_address_protocol(address), 'http://'+address
+  end
+
+  should 'leave urls already with protocol unchanged' do
+    address = 'http://noosfero.org'
+    ssl_address = 'https://noosfero.org'
+
+    assert_equal set_address_protocol(address), address
+    assert_equal set_address_protocol(ssl_address), ssl_address
+  end
+end
 \ No newline at end of file
@@ -85,36 +85,6 @@ class PeopleBlockTest &lt; ActionView::TestCase
   end
  
  
-  should 'list people from environment' do
-    owner = fast_create(Environment)
-    person1 = fast_create(Person, :environment_id => owner.id)
-    person2 = fast_create(Person, :environment_id => owner.id)
-
-    block = PeopleBlock.new
-
-    block.expects(:owner).returns(owner).at_least_once
-    expects(:profile_image_link).with(person1, :minor).returns(person1.name)
-    expects(:profile_image_link).with(person2, :minor).returns(person2.name)
-    expects(:block_title).with(anything).returns('')
-
-    content = instance_exec(&block.content)
-
-    assert_match(/#{person1.name}/, content)
-    assert_match(/#{person2.name}/, content)
-  end
-
-
-  should 'link to "all people"' do
-    env = fast_create(Environment)
-    block = PeopleBlock.new
-
-    instance_eval(&block.footer)
-    assert_select 'a.view-all' do |elements|
-      assert_select '[href=/search/people]'
-    end
-  end
-
-
   should 'count number of public and private people' do
     owner = fast_create(Environment)
     private_p = fast_create(Person, :public_profile => false, :environment_id => owner.id)
@@ -142,3 +112,37 @@ class PeopleBlockTest &lt; ActionView::TestCase
   include NoosferoTestHelper
  
 end
+
+require 'boxes_helper'
+
+class PeopleBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
+  should 'list people from environment' do
+    owner = fast_create(Environment)
+    person1 = fast_create(Person, :environment_id => owner.id)
+    person2 = fast_create(Person, :environment_id => owner.id)
+
+    block = PeopleBlock.new
+
+    block.expects(:owner).returns(owner).at_least_once
+    ActionView::Base.any_instance.expects(:profile_image_link).with(person1, :minor).returns(person1.name)
+    ActionView::Base.any_instance.expects(:profile_image_link).with(person2, :minor).returns(person2.name)
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+
+    content = render_block_content(block)
+
+    assert_match(/#{person1.name}/, content)
+    assert_match(/#{person2.name}/, content)
+  end
+
+  should 'link to "all people"' do
+    env = fast_create(Environment)
+    block = PeopleBlock.new
+
+    render_block_footer(block)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/search/people]'
+    end
+  end
+end
@@ -0,0 +1,13 @@
+<%= link_to s_('friends|View all'), {:profile => block.owner.identifier, :controller => 'profile', :action => 'friends'}, :class => 'view-all' %>
+
+<% if !block.suggestions.empty? && user == block.owner %>
+  <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 => :friends_suggestions } %>
+    </div>
+    <div class='more-suggestions'>
+      <%= link_to _('See all suggestions'), block.owner.people_suggestions_url %>
+    </div>
+  </div>
+<% end %>
@@ -0,0 +1,6 @@
+<% anchor = block.visible_role == "profile_admin" ? "admins-tab" : "members-tab" %>
+<%= link_to c_('View all'), {:profile => block.owner.identifier, :controller => 'profile', :action => 'members', :anchor =>anchor }, :class => 'view-all' %>
+
+<% if block.show_join_leave_button %>
+  <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
+<% end %>
@@ -0,0 +1 @@
+<%= link_to c_('View all'), {:controller => 'search', :action => 'people'}, :class => 'view-all' %>
@@ -1,13 +0,0 @@
-<%= link_to s_('friends|View all'), {:profile => profile.identifier, :controller => 'profile', :action => 'friends'}, :class => 'view-all' %>
-
-<% if !suggestions.empty? && user == profile %>
-  <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 => :friends_suggestions } %>
-    </div>
-    <div class='more-suggestions'>
-      <%= link_to _('See all suggestions'), profile.people_suggestions_url %>
-    </div>
-  </div>
-<% end %>
@@ -1,6 +0,0 @@
-<% anchor = role_key == "profile_admin" ? "admins-tab" : "members-tab" %>
-<%= link_to c_('View all'), {:profile => profile.identifier, :controller => 'profile', :action => 'members', :anchor =>anchor }, :class => 'view-all' %>
-
-<% if show_join_leave_button %>
-  <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
-<% end %>
@@ -1 +0,0 @@
-<%= link_to c_('View all'), {:controller => 'search', :action => 'people'}, :class => 'view-all' %>
@@ -0,0 +1,28 @@
+<% extend PeopleBlockHelper %>
+
+<%= block_title(block.view_title) %>
+
+<div>
+  <% unless block.profiles.count == 0 %>
+    <ul>
+      <%= profiles_images_list(block.profiles) %>
+
+      <% unless block.name.blank? || block.address.blank? %>
+        <div class="common-profile-list-block">
+          <li class="vcard">
+            <div class="banner-div">
+              <%= link_to(
+                    content_tag('span', block.name, :class => 'banner-span' ),
+                    set_address_protocol(block.address),
+                    title: block.name
+                  ) %>
+            </div>
+          </li>
+        </div>
+      <% end %>
+    </ul>
+  <% else %>
+    <div class="common-profile-list-block-none"><%= c_('None') %></div>
+  <% end %>
+  <br style="clear:both" />
+</div>
-Subproject commit d93f0935020155e1774d64c1e2fab91045cf76c3
+Subproject commit 195958f5b26e1e117edff66122b0a388563baa99
@@ -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 SnifferPluginMyprofileController < MyProfileController
  
-  before_filter :fetch_sniffer_profile, :only => [:edit, :search]
-
   include SnifferPlugin::Helper
   helper SnifferPlugin::Helper
   helper CmsHelper
  
   def edit
     if request.post?
-      begin
-        @sniffer_profile.update(params[:sniffer_plugin_profile])
-        @sniffer_profile.enabled = true
-        @sniffer_profile.save!
+      if @profile.update params[:profile_data]
         session[:notice] = _('Consumer interests updated')
-      rescue Exception => exception
-        flash[:error] = _('Could not save consumer interests')
       end
     end
   end
@@ -22,22 +15,21 @@ class SnifferPluginMyprofileController &lt; MyProfileController
   def product_category_search
     query = params[:q] || params[:term]
  
-    scope = ProductCategory.by_environment(environment)
-    @categories = find_by_contents(:product_categories, @profile, scope, query, {:per_page => 10, :page => 1})[:results]
+    @categories = find_by_contents(:categories, @profile, environment.product_categories, query, {per_page: 10, page: 1})[:results]
  
     autocomplete = params.has_key?(:term)
-    render :json => @categories.map { |i| autocomplete ? {:value => i.id, :label => i.name} : {:id => i.id, :name => i.name} }
+    render json: @categories.map { |i| autocomplete ? {value: i.id, label: i.name} : {id: i.id, name: i.name} }
   end
  
   def product_category_add
     product_category = environment.categories.find params[:id]
-    response = { :productCategory => {
+    response = { productCategory: {
         :id   => product_category.id
       }
     }
     response[:enterprises] = product_category.sniffer_plugin_enterprises.enabled.visible.map do |enterprise|
       profile_data = filter_visible_attr_profile(enterprise)
-      profile_data[:balloonUrl] = url_for :controller => :sniffer_plugin_myprofile, :action => :map_balloon, :id => enterprise[:id], :escape => false
+      profile_data[:balloonUrl] = url_for controller: :sniffer_plugin_myprofile, action: :map_balloon, id: enterprise[:id], escape: false
       profile_data[:sniffer_plugin_distance] = Noosfero::GeoRef.dist(@profile.lat, @profile.lng, enterprise.lat, enterprise.lng)
       profile_data[:suppliersProducts] = filter_visible_attr_suppliers_products(
         enterprise.products.sniffer_plugin_products_from_category(product_category)
@@ -45,14 +37,14 @@ class SnifferPluginMyprofileController &lt; MyProfileController
       profile_data[:consumersProducts] = []
       profile_data
     end
-    render :text => response.to_json
+    render text: response.to_json
   end
  
   def search
     @no_design_blocks = true
  
-    suppliers_products = @sniffer_profile.suppliers_products
-    consumers_products = @sniffer_profile.consumers_products
+    suppliers_products = @profile.sniffer_suppliers_products
+    consumers_products = @profile.sniffer_consumers_products
  
     profiles_of_interest = fetch_profiles(suppliers_products + consumers_products)
  
@@ -67,13 +59,13 @@ class SnifferPluginMyprofileController &lt; MyProfileController
     @profiles_data = {}
     suppliers.each do |id, products|
       @profiles_data[id] = {
-        :profile => profiles_of_interest[id],
-        :suppliers_products => products,
-        :consumers_products => []
+        profile: profiles_of_interest[id],
+        suppliers_products: products,
+        consumers_products: []
       }
     end
     consumers.each do |id, products|
-      @profiles_data[id] ||= { :profile => profiles_of_interest[id] }
+      @profiles_data[id] ||= { profile: profiles_of_interest[id] }
       @profiles_data[id][:suppliers_products] ||= []
       @profiles_data[id][:consumers_products] = products
     end
@@ -91,22 +83,18 @@ class SnifferPluginMyprofileController &lt; MyProfileController
     @suppliers = build_products(suppliers_products).values.first
     @consumers = build_products(consumers_products).values.first
  
-    render :layout => false
+    render layout: false
   end
  
   def my_map_balloon
     @categories = @profile.categories
-    render :layout => false
+    render layout: false
   end
  
   protected
  
-  def fetch_sniffer_profile
-    @sniffer_profile = SnifferPlugin::Profile.find_or_create profile
-  end
-
   def fetch_profiles(products)
-    profiles = Profile.all :conditions => {:id => products.map { |p| target_profile_id(p) }}
+    profiles = Profile.all conditions: {id: products.map { |p| target_profile_id(p) }}
     profiles_by_id = {}
     profiles.each do |p|
       p.sniffer_plugin_distance = Noosfero::GeoRef.dist(@profile.lat, @profile.lng, p.lat, p.lng)
@@ -125,9 +113,9 @@ class SnifferPluginMyprofileController &lt; MyProfileController
  
     id_profiles = fetch_profiles(data)
  
-    products = Product.all :conditions => {:id => grab_id.call('id')}, :include => [:enterprise, :product_category]
+    products = Product.all conditions: {id: grab_id.call('id')}, include: [:enterprise, :product_category]
     products.each{ |p| id_products[p.id] ||= p }
-    knowledges = Article.all :conditions => {:id => grab_id.call('knowledge_id')}
+    knowledges = Article.all conditions: {id: grab_id.call('knowledge_id')}
     knowledges.each{ |k| id_knowledges[k.id] ||= k}
  
     data.each do |attributes|
@@ -135,9 +123,9 @@ class SnifferPluginMyprofileController &lt; MyProfileController
  
       results[profile.id] ||= []
       results[profile.id] << {
-        :partial => attributes['view'],
-        :product => id_products[attributes['id'].to_i],
-        :knowledge => id_knowledges[attributes['knowledge_id'].to_i]
+        partial: attributes['view'],
+        product: id_products[attributes['id'].to_i],
+        knowledge: id_knowledges[attributes['knowledge_id'].to_i]
       }
     end
     results
@@ -0,0 +1,25 @@
+SnifferPlugin.send :remove_const, :Opportunity if defined? SnifferPlugin::Opportunity
+
+class SnifferPlugin::Profile < ActiveRecord::Base
+  belongs_to :profile
+end
+class SnifferPlugin::Opportunity < ActiveRecord::Base
+  belongs_to :sniffer_profile, class_name: 'SnifferPlugin::Profile', foreign_key: :profile_id
+end
+
+class DropSnifferProfileTable < ActiveRecord::Migration
+  def self.up
+    SnifferPlugin::Opportunity.find_each do |opportunity|
+      sniffer_profile = opportunity.sniffer_profile
+      next unless sniffer_profile.profile
+
+      opportunity.profile_id = sniffer_profile.profile.id
+      opportunity.save!
+    end
+
+    drop_table :sniffer_plugin_profiles
+  end
+
+  def self.down
+  end
+end
@@ -5,16 +5,16 @@ class Article
   # search for interests of interested that matches the knowledges of wise
   scope :sniffer_plugin_knowledges_interests, lambda { |wise, interested|
     {
-     :select => "op.opportunity_id AS interest_cat,
+     select: "op.opportunity_id AS interest_cat,
                 articles.name AS knowledge_name, articles.id AS id,
                 article_resources.resource_id AS knowledge_cat",
-      :joins => "INNER JOIN article_resources ON (articles.id = article_resources.article_id)
+      joins: "INNER JOIN article_resources ON (articles.id = article_resources.article_id)
                 INNER JOIN sniffer_plugin_opportunities AS op ON (article_resources.resource_id = op.opportunity_id
                       AND article_resources.resource_type = 'ProductCategory' AND op.opportunity_type = 'ProductCategory')
-                INNER JOIN sniffer_plugin_profiles sniffer ON (op.profile_id = sniffer.id AND sniffer.enabled = true)",
-      :conditions => "articles.type = 'CmsLearningPlugin::Learning'
+                INNER JOIN profiles sniffer ON op.profile_id = sniffer.id",
+      conditions: "articles.type = 'CmsLearningPlugin::Learning'
                 AND articles.profile_id = #{wise.id}
-                AND sniffer.profile_id = #{interested.id}"
+                AND sniffer.id = #{interested.id}"
     }
   }
 end
@@ -13,13 +13,13 @@ class Product
   #   -> Enterprise 1 as a parameter to this scope would return product B
   scope :sniffer_plugin_suppliers_products, lambda { |enterprise|
     {
-      :select => "DISTINCT products_2.*,
+      select: "DISTINCT products_2.*,
       'product' as view",
-    :joins => "INNER JOIN inputs ON ( products.id = inputs.product_id )
+    joins: "INNER JOIN inputs ON ( products.id = inputs.product_id )
       INNER JOIN categories ON ( inputs.product_category_id = categories.id )
       INNER JOIN products products_2 ON ( categories.id = products_2.product_category_id )
       INNER JOIN profiles ON ( profiles.id = products_2.profile_id )",
-    :conditions => "products.profile_id = #{enterprise.id}
+    conditions: "products.profile_id = #{enterprise.id}
       AND profiles.public_profile = true AND profiles.visible = true
       AND profiles.enabled = true
       AND profiles.id <> #{enterprise.id}"
@@ -36,14 +36,14 @@ class Product
   #   with an extra column `consumer_profile_id` equal to Enterprise 2 id
   scope :sniffer_plugin_consumers_products, lambda { |enterprise|
     {
-    :select => "DISTINCT products_2.*,
+    select: "DISTINCT products_2.*,
       profiles.id as consumer_profile_id,
       'product' as view",
-    :joins => "INNER JOIN inputs ON ( products.id = inputs.product_id )
+    joins: "INNER JOIN inputs ON ( products.id = inputs.product_id )
       INNER JOIN categories ON ( inputs.product_category_id = categories.id )
       INNER JOIN products products_2 ON ( categories.id = products_2.product_category_id )
       INNER JOIN profiles ON ( profiles.id = products.profile_id )",
-    :conditions => "products_2.profile_id = #{enterprise.id}
+    conditions: "products_2.profile_id = #{enterprise.id}
       AND profiles.public_profile = true AND profiles.visible = true
       AND profiles.enabled = true
       AND profiles.id <> #{enterprise.id}"
@@ -59,14 +59,14 @@ class Product
   #   -> Enterprise 1 as a parameter to this scope would return product B
   scope :sniffer_plugin_interests_suppliers_products, lambda { |profile|
     {
-    :from => "sniffer_plugin_profiles sniffer",
-    :select => "DISTINCT products.*,
+    from: "profiles sniffer",
+    select: "DISTINCT products.*,
       'product' as view",
-    :joins => "INNER JOIN sniffer_plugin_opportunities AS op ON ( sniffer.id = op.profile_id AND op.opportunity_type = 'ProductCategory' )
+    joins: "INNER JOIN sniffer_plugin_opportunities AS op ON ( sniffer.id = op.profile_id AND op.opportunity_type = 'ProductCategory' )
       INNER JOIN categories ON ( op.opportunity_id = categories.id )
       INNER JOIN products ON ( products.product_category_id = categories.id )
       INNER JOIN profiles ON ( products.profile_id = profiles.id )",
-    :conditions => "sniffer.enabled = true AND sniffer.profile_id = #{profile.id} AND products.profile_id <> #{profile.id}
+    conditions: "sniffer.id = #{profile.id} AND products.profile_id <> #{profile.id}
       AND profiles.public_profile = true AND profiles.visible = true
       AND profiles.enabled = true
       AND profiles.id <> #{profile.id}"
@@ -83,14 +83,13 @@ class Product
   #   with an extra column `consumer_profile_id` equal to Enterprise 2 id
   scope :sniffer_plugin_interests_consumers_products, lambda { |profile|
     {
-    :select => "DISTINCT products.*,
+    select: "DISTINCT products.*,
       profiles.id as consumer_profile_id,
       'product' as view",
-    :joins => "INNER JOIN categories ON ( categories.id = products.product_category_id )
+    joins: "INNER JOIN categories ON ( categories.id = products.product_category_id )
       INNER JOIN sniffer_plugin_opportunities as op ON ( categories.id = op.opportunity_id AND op.opportunity_type = 'ProductCategory' )
-      INNER JOIN sniffer_plugin_profiles sniffer ON ( op.profile_id = sniffer.id AND sniffer.enabled = true )
-      INNER JOIN profiles ON ( sniffer.profile_id = profiles.id )",
-    :conditions => "products.profile_id = #{profile.id}
+      INNER JOIN profiles ON ( op.profile_id = profiles.id )",
+    conditions: "products.profile_id = #{profile.id}
       AND profiles.public_profile = true AND profiles.visible = true
       AND profiles.enabled = true
       AND profiles.id <> #{profile.id}"
@@ -100,14 +99,14 @@ class Product
   # knowledge x inputs
   scope :sniffer_plugin_knowledge_consumers_inputs, lambda { |profile|
     {
-    :select => "DISTINCT products.*,
+    select: "DISTINCT products.*,
       articles.id AS knowledge_id,
       'knowledge' as view",
-    :joins => "INNER JOIN inputs ON ( products.id = inputs.product_id )
+    joins: "INNER JOIN inputs ON ( products.id = inputs.product_id )
       INNER JOIN article_resources ON (article_resources.resource_id = inputs.product_category_id AND article_resources.resource_type = 'ProductCategory')
       INNER JOIN articles ON (article_resources.article_id = articles.id)
       INNER JOIN profiles ON ( products.profile_id = profiles.id )",
-    :conditions => "articles.type = 'CmsLearningPlugin::Learning'
+    conditions: "articles.type = 'CmsLearningPlugin::Learning'
       AND articles.profile_id = #{profile.id}
       AND products.profile_id <> #{profile.id}"
     }
@@ -116,14 +115,14 @@ class Product
   # inputs x knowledge
   scope :sniffer_plugin_knowledge_suppliers_inputs, lambda { |profile|
     {
-    :select => "DISTINCT products.*,
+    select: "DISTINCT products.*,
       profiles.id as supplier_profile_id, articles.id AS knowledge_id,
       'knowledge' as view",
-    :joins => "INNER JOIN inputs ON ( products.id = inputs.product_id )
+    joins: "INNER JOIN inputs ON ( products.id = inputs.product_id )
       INNER JOIN article_resources ON (article_resources.resource_id = inputs.product_category_id AND article_resources.resource_type = 'ProductCategory')
       INNER JOIN articles ON (article_resources.article_id = articles.id)
       INNER JOIN profiles ON ( articles.profile_id = profiles.id )",
-    :conditions => "articles.type = 'CmsLearningPlugin::Learning'
+    conditions: "articles.type = 'CmsLearningPlugin::Learning'
       AND articles.profile_id <> #{profile.id}
       AND products.profile_id = #{profile.id}"
     }
@@ -132,16 +131,15 @@ class Product
   # knowledge x interests
   scope :sniffer_plugin_knowledge_consumers_interests, lambda { |profile|
     {
-    :select => "DISTINCT articles.id AS knowledge_id,
+    select: "DISTINCT articles.id AS knowledge_id,
               op.opportunity_id AS product_category_id,
               profiles.id as profile_id,
               'knowledge' as view",
-    :from => "articles",
-    :joins =>   "INNER JOIN article_resources ON (articles.id = article_resources.article_id)
+    from: "articles",
+    joins:   "INNER JOIN article_resources ON (articles.id = article_resources.article_id)
                INNER JOIN sniffer_plugin_opportunities as op ON ( article_resources.resource_id = op.opportunity_id AND op.opportunity_type = 'ProductCategory' AND article_resources.resource_type = 'ProductCategory' )
-               INNER JOIN sniffer_plugin_profiles sniffer ON ( op.profile_id = sniffer.id AND sniffer.enabled = true )
-               INNER JOIN profiles ON ( sniffer.profile_id = profiles.id )",
-    :conditions => "articles.profile_id = #{profile.id}
+               INNER JOIN profiles ON ( op.profile_id = profiles.id )",
+    conditions: "articles.profile_id = #{profile.id}
                   AND profiles.public_profile = true
                   AND profiles.visible = true
                   AND profiles.enabled = true
@@ -152,28 +150,27 @@ class Product
   # interests x knowledge
   scope :sniffer_plugin_knowledge_suppliers_interests, lambda { |profile|
     {
-    :select => "DISTINCT articles.id AS knowledge_id,
+    select: "DISTINCT articles.id AS knowledge_id,
               op.opportunity_id AS product_category_id,
               profiles.id as profile_id,
               'knowledge' as view",
-    :from => "articles",
-    :joins =>   "INNER JOIN article_resources ON (articles.id = article_resources.article_id)
+    from: "articles",
+    joins:   "INNER JOIN article_resources ON (articles.id = article_resources.article_id)
                INNER JOIN sniffer_plugin_opportunities as op ON ( article_resources.resource_id = op.opportunity_id AND op.opportunity_type = 'ProductCategory' AND article_resources.resource_type = 'ProductCategory' )
-               INNER JOIN sniffer_plugin_profiles sniffer ON ( op.profile_id = sniffer.id AND sniffer.enabled = true )
                INNER JOIN profiles ON ( articles.profile_id = profiles.id )",
-    :conditions => "articles.profile_id <> #{profile.id}
+    conditions: "articles.profile_id <> #{profile.id}
                   AND profiles.public_profile = true
                   AND profiles.visible = true
                   AND profiles.enabled = true
-                  AND sniffer.profile_id = #{profile.id}"
+                  AND profiles.id = #{profile.id}"
     }
   }
  
   # searches for products as supplies for a given product category
   scope :sniffer_plugin_products_from_category, lambda { |product_category|
     {
-      :conditions => { :product_category_id => product_category.id },
-      :select => "*, 'product' as view"
+      conditions: { product_category_id: product_category.id },
+      select: "*, 'product' as view"
     }
   }
  
 require_dependency 'profile'
-# WORKAROUND: plugin class don't scope subclasses causing core classes conflict
-require_dependency File.expand_path "#{File.dirname __FILE__}/../../lib/sniffer_plugin/profile"
  
 class Profile
  
-  has_one :sniffer_plugin_profile, :class_name => 'SnifferPlugin::Profile'
-  has_many :sniffer_plugin_interests, :source => :product_categories, :through => :sniffer_plugin_profile
-  has_many :sniffer_plugin_opportunities, :source => :opportunities, :through => :sniffer_plugin_profile
-
   attr_accessor :sniffer_plugin_distance
  
+  has_many :sniffer_opportunities, :class_name => 'SnifferPlugin::Opportunity', :dependent => :destroy
+  has_many :sniffer_interested_product_categories, :through => :sniffer_opportunities, :source => :product_category, :class_name => 'ProductCategory',
+    :conditions => ['sniffer_plugin_opportunities.opportunity_type = ?', 'ProductCategory']
+
+  attr_accessor :sniffer_interested_product_category_string_ids
+  descendants.each do |k|
+    k.attr_accessible :sniffer_interested_product_category_string_ids
+  end
+
+  def sniffer_interested_product_category_string_ids
+    ''
+  end
+  def sniffer_interested_product_category_string_ids=(ids)
+    ids = ids.split(',')
+    self.sniffer_interested_product_categories = []
+    r = environment.product_categories.find ids
+    self.sniffer_interested_product_categories = ids.collect{ |id| r.detect {|x| x.id == id.to_i} }
+    self.sniffer_opportunities.where(:opportunity_id => ids).each{|o| o.opportunity_type = 'ProductCategory'; o.save! }
+  end
+
+  def sniffer_categories
+    (self.product_categories + self.input_categories + self.sniffer_interested_product_categories).uniq
+  end
+
+  def sniffer_suppliers_products
+    products = []
+
+    products += Product.sniffer_plugin_suppliers_products self if self.enterprise?
+    products += Product.sniffer_plugin_interests_suppliers_products self
+    if defined?(CmsLearningPlugin)
+      products += Product.sniffer_plugin_knowledge_suppliers_inputs self
+      products += Product.sniffer_plugin_knowledge_suppliers_interests self
+    end
+
+    products
+  end
+
+  def sniffer_consumers_products
+    products = []
+
+    products += Product.sniffer_plugin_consumers_products self if self.enterprise?
+    products += Product.sniffer_plugin_interests_consumers_products self
+    if defined?(CmsLearningPlugin)
+      products += Product.sniffer_plugin_knowledge_consumers_inputs self
+      products += Product.sniffer_plugin_knowledge_consumers_interests self
+    end
+
+    products
+  end
+
 end
@@ -18,11 +18,11 @@ class SnifferPlugin::InterestsBlock &lt; Block
  
   def content(args = {})
     block = self
+    profile = block.owner
     proc do
       if block.owner.is_a?(Profile)
-        sniffer = SnifferPlugin::Profile.find_or_create(block.owner)
-        interests = sniffer.opportunities
-        interests |= sniffer.profile.inputs if sniffer.profile.enterprise?
+        interests = profile.snnifer_opportunities
+        interests |= profile.inputs if sniffer.profile.enterprise?
       else # Environment
         interests = SnifferPlugin::Opportunity.product_categories :limit => 5, :order => 'created_at DESC'
         interests += Input.all :limit => 5, :order => 'created_at DESC'
@@ -1,34 +0,0 @@
-class SnifferPlugin::Opportunity < ActiveRecord::Base
-
-  self.table_name = :sniffer_plugin_opportunities
-
-  belongs_to :sniffer_profile, :class_name => 'SnifferPlugin::Profile', :foreign_key => :profile_id
-  has_one :profile, :through => :sniffer_profile
-
-  belongs_to :opportunity, :polymorphic => true
-
-  # for has_many :through
-  belongs_to :product_category, :class_name => 'ProductCategory', :foreign_key => :opportunity_id,
-    :conditions => ['sniffer_plugin_opportunities.opportunity_type = ?', 'ProductCategory']
-  # getter
-  def product_category
-    opportunity_type == 'ProductCategory' ? opportunity : nil
-  end
-
-  scope :product_categories, {
-    :conditions => ['sniffer_plugin_opportunities.opportunity_type = ?', 'ProductCategory']
-  }
-
-  if defined? SolrPlugin
-    acts_as_searchable :fields => [
-        # searched fields
-        # filtered fields
-        # ordered/query-boosted fields
-      ], :include => [
-        {:product_category => {:fields => [:name, :path, :slug, :lat, :lng, :acronym, :abbreviation]}},
-      ]
-
-    handle_asynchronously :solr_save
-  end
-
-end
@@ -1,79 +0,0 @@
-class SnifferPlugin::Profile < ActiveRecord::Base
-
-  self.table_name = :sniffer_plugin_profiles
-
-  belongs_to :profile, :class_name => '::Profile'
-
-  has_many :opportunities, :class_name => 'SnifferPlugin::Opportunity', :foreign_key => :profile_id, :dependent => :destroy
-  has_many :product_categories, :through => :opportunities, :source => :product_category, :foreign_key => :profile_id, :class_name => 'ProductCategory',
-    :conditions => ['sniffer_plugin_opportunities.opportunity_type = ?', 'ProductCategory']
-
-  validates_presence_of :profile
-
-  attr_accessible :product_category_string_ids, :enabled
-
-  def self.find_or_create profile
-    sniffer = SnifferPlugin::Profile.find_by_profile_id profile.id
-    if sniffer.nil?
-      sniffer = SnifferPlugin::Profile.new
-      sniffer.profile = profile
-      sniffer.enabled = true
-      sniffer.save!
-    end
-    sniffer
-  end
-
-  def product_category_string_ids
-    ''
-  end
-
-  def product_category_string_ids=(ids)
-    ids = ids.split(',')
-    self.product_categories = []
-    self.product_categories = ProductCategory.find(ids)
-    self.opportunities.
-         find(:all, :conditions => {:opportunity_id => ids}).each do |o|
-           o.opportunity_type = 'ProductCategory'
-           o.save!
-         end
-  end
-
-  def profile_input_categories
-    profile.input_categories
-  end
-
-  def profile_product_categories
-    profile.product_categories
-  end
-
-  def all_categories
-    (profile_product_categories + profile_input_categories + product_categories).uniq
-  end
-
-  def suppliers_products
-    products = []
-
-    products += Product.sniffer_plugin_suppliers_products profile if profile.enterprise?
-    products += Product.sniffer_plugin_interests_suppliers_products profile
-    if defined?(CmsLearningPlugin)
-      products += Product.sniffer_plugin_knowledge_suppliers_inputs profile
-      products += Product.sniffer_plugin_knowledge_suppliers_interests profile
-    end
-
-    products
-  end
-
-  def consumers_products
-    products = []
-
-    products += Product.sniffer_plugin_consumers_products profile if profile.enterprise?
-    products += Product.sniffer_plugin_interests_consumers_products profile
-    if defined?(CmsLearningPlugin)
-      products += Product.sniffer_plugin_knowledge_consumers_inputs profile
-      products += Product.sniffer_plugin_knowledge_consumers_interests profile
-    end
-
-    products
-  end
-
-end
@@ -0,0 +1,48 @@
+class SnifferPlugin::Opportunity < ActiveRecord::Base
+
+  self.table_name = :sniffer_plugin_opportunities
+
+  belongs_to :profile
+
+  belongs_to :opportunity, polymorphic: true
+
+  # for has_many :through
+  belongs_to :product_category, class_name: 'ProductCategory', foreign_key: :opportunity_id,
+    conditions: ['sniffer_plugin_opportunities.opportunity_type = ?', 'ProductCategory']
+  # getter
+  def product_category
+    opportunity_type == 'ProductCategory' ? opportunity : nil
+  end
+
+  scope :product_categories, {
+    conditions: ['sniffer_plugin_opportunities.opportunity_type = ?', 'ProductCategory']
+  }
+
+  if defined? SolrPlugin
+    acts_as_searchable fields: [
+        # searched fields
+        # filtered fields
+        # ordered/query-boosted fields
+      ], include: [
+        {product_category: {fields: [:name, :path, :slug, :lat, :lng, :acronym, :abbreviation]}},
+      ]
+
+    handle_asynchronously :solr_save
+  end
+
+  delegate :lat, :lng, :to => :product_category, :allow_nil => true
+
+  # delegate missing methods to opportunity
+  def method_missing method, *args, &block
+    if self.opportunity.respond_to? method
+      self.opportunity.send method, *args, &block
+    else
+      super method, *args, &block
+    end
+  end
+  def respond_to_with_opportunity? method, p2 = true
+    respond_to_without_opportunity? method, p2 or (self.opportunity and self.opportunity.respond_to? method)
+  end
+  alias_method_chain :respond_to?, :opportunity
+
+end
@@ -165,10 +165,9 @@ class SnifferMapTest &lt; ActionDispatch::IntegrationTest
       :identifier => 'acme', :name => 'ACME S.A.', :lat => 0, :lng => 0
     )
     # get the extended sniffer profile for the enterprise:
-    sniffer_acme = SnifferPlugin::Profile.find_or_create acme
-    sniffer_acme.product_category_string_ids = "#{@c[1].id},#{@c[4].id}"
-    sniffer_acme.enabled = true
-    sniffer_acme.save!
+    acme.sniffer_interested_product_category_string_ids = "#{@c[1].id},#{@c[4].id}"
+    acme.enabled = true
+    acme.save!
  
     # visit the map page:
     get url_plugin_myprofile(acme, :search)
@@ -0,0 +1,96 @@
+require 'test_helper'
+
+class ProfileTest < ActiveSupport::TestCase
+
+  should 'register interest on a product category for a profile' do
+    # crate an entreprise
+    coop = create(Enterprise,
+      :identifier => 'coop', :name => 'A Cooperative', :lat => 0, :lng => 0
+    )
+    # create categories
+    c1 = create(ProductCategory, :name => 'Category 1')
+    c2 = create(ProductCategory, :name => 'Category 2')
+    # get the extended sniffer profile for the enterprise:
+    coop.sniffer_interested_product_category_string_ids = "#{c1.id},#{c2.id}"
+    coop.enabled = true
+    coop.save!
+
+    categories = coop.sniffer_interested_product_categories
+    assert_equal 2, categories.length
+    assert_equal 'Category 1', categories[0].name
+    assert_equal 'Category 2', categories[1].name
+  end
+
+  should 'find suppliers and consumers products' do
+    # Enterprises:
+    e1 = fast_create(Enterprise, :identifier => 'ent1' )
+    e2 = fast_create(Enterprise, :identifier => 'ent2' )
+    e3 = fast_create(Enterprise, :identifier => 'ent3' )
+    # Categories:
+    c1 = fast_create(ProductCategory, :name => 'Category 1')
+    c2 = fast_create(ProductCategory, :name => 'Category 2')
+    c3 = fast_create(ProductCategory, :name => 'Category 3')
+    c4 = fast_create(ProductCategory, :name => 'Category 4') # not used by products
+    # Products (for enterprise 1):
+    p1 = fast_create(Product, :product_category_id => c1.id, :profile_id => e1.id )
+    p2 = fast_create(Product, :product_category_id => c2.id, :profile_id => e1.id )
+    # Products (for enterprise 2):
+    p3 = fast_create(Product, :product_category_id => c3.id, :profile_id => e2.id )
+    p3.inputs.build.product_category = c1 # p3 uses p1 as input on its production
+    p3.save!
+    # Products (for enterprise 3):
+    p4 = fast_create(Product, :product_category_id => c3.id, :profile_id => e3.id )
+    p5 = fast_create(Product, :product_category_id => c3.id, :profile_id => e3.id )
+    p4.inputs.build.product_category = c1 # p4 uses p1 as input on its production
+    p5.inputs.build.product_category = c1 # as does p5
+    p4.save!
+    p5.save!
+
+    # register e2 interest for 'Category 2' use by p2
+    e2.sniffer_interested_product_category_string_ids = "#{c2.id},#{c4.id}"
+    e2.enabled = true
+    e2.save!
+
+    assert_equal [p1.id, p1.id, p2.id],
+      e1.sniffer_consumers_products.sort_by(&:id).map(&:id)
+
+    # since they have interest in the same product, e2 and e3 position
+    # may vary here, but the last enterprise should be e2
+    assert_equivalent [e2.id, e3.id],
+      e1.sniffer_consumers_products.sort_by(&:id).map{|p| p[:consumer_profile_id].to_i}.first(2)
+    assert_equal e2.id,
+      e1.sniffer_consumers_products.sort_by(&:id).map{|p| p[:consumer_profile_id].to_i}.last
+
+    assert_equal [p1.id, p2.id],
+      e2.sniffer_suppliers_products.sort_by(&:id).map(&:id)
+    assert_equal [], e2.sniffer_consumers_products
+  end
+
+  should 'not search for suppliers and consumers on disabled enterprises' do
+    # Enterprises:
+    e1 = fast_create(Enterprise, :identifier => 'ent1' )
+    e2 = fast_create(Enterprise, :identifier => 'ent2' )
+    # Categories:
+    c1 = fast_create(ProductCategory, :name => 'Category 1')
+    c2 = fast_create(ProductCategory, :name => 'Category 2')
+    # Products (for enterprise 1):
+    p1 = fast_create(Product, :product_category_id => c1.id, :profile_id => e1.id )
+
+    # Products (for enterprise 2):
+    p2 = fast_create(Product, :product_category_id => c2.id, :profile_id => e2.id )
+    p2.inputs.build.product_category = c1
+    p2.save!
+
+    # register e2 interest for 'Category 1' used by p1
+    e2.sniffer_interested_product_category_string_ids = "#{c1.id}"
+    e2.enabled = true
+    e2.save!
+
+    # should not find anything for disabled enterprise
+    e1.enabled = false
+    e1.save!
+    assert_equal [], e2.sniffer_consumers_products
+    assert_equal [], e2.sniffer_suppliers_products
+  end
+
+end
@@ -1,106 +0,0 @@
-require 'test_helper'
-
-class SnifferPluginProfileTest < ActiveSupport::TestCase
-
-  should 'register interest on a product category for a profile' do
-    # crate an entreprise
-    coop = fast_create(Enterprise,
-      :identifier => 'coop', :name => 'A Cooperative', :lat => 0, :lng => 0
-    )
-    # create categories
-    c1 = fast_create(ProductCategory, :name => 'Category 1')
-    c2 = fast_create(ProductCategory, :name => 'Category 2')
-    # get the extended sniffer profile for the enterprise:
-    sniffer_coop = SnifferPlugin::Profile.find_or_create coop
-    sniffer_coop.product_category_string_ids = "#{c1.id},#{c2.id}"
-    sniffer_coop.enabled = true
-    sniffer_coop.save!
-
-    # search for and instance again the profile sniffer for coop
-    same_sniffer = SnifferPlugin::Profile.find_or_create coop
-
-    categories = same_sniffer.product_categories
-    assert_equal 2, categories.length
-    assert_equal 'Category 1', categories[0].name
-    assert_equal 'Category 2', categories[1].name
-  end
-
-  should 'find suppliers and consumers products' do
-    # Enterprises:
-    e1 = fast_create(Enterprise, :identifier => 'ent1' )
-    e2 = fast_create(Enterprise, :identifier => 'ent2' )
-    e3 = fast_create(Enterprise, :identifier => 'ent3' )
-    # Categories:
-    c1 = fast_create(ProductCategory, :name => 'Category 1')
-    c2 = fast_create(ProductCategory, :name => 'Category 2')
-    c3 = fast_create(ProductCategory, :name => 'Category 3')
-    c4 = fast_create(ProductCategory, :name => 'Category 4') # not used by products
-    # Products (for enterprise 1):
-    p1 = fast_create(Product, :product_category_id => c1.id, :profile_id => e1.id )
-    p2 = fast_create(Product, :product_category_id => c2.id, :profile_id => e1.id )
-    # Products (for enterprise 2):
-    p3 = fast_create(Product, :product_category_id => c3.id, :profile_id => e2.id )
-    p3.inputs.build.product_category = c1 # p3 uses p1 as input on its production
-    p3.save!
-    # Products (for enterprise 3):
-    p4 = fast_create(Product, :product_category_id => c3.id, :profile_id => e3.id )
-    p5 = fast_create(Product, :product_category_id => c3.id, :profile_id => e3.id )
-    p4.inputs.build.product_category = c1 # p4 uses p1 as input on its production
-    p5.inputs.build.product_category = c1 # as does p5
-    p4.save!
-    p5.save!
-
-    # get the extended sniffer profile for the enterprise:
-    e1_sniffer = SnifferPlugin::Profile.find_or_create e1
-    e2_sniffer = SnifferPlugin::Profile.find_or_create e2
-    # register e2 interest for 'Category 2' use by p2
-    e2_sniffer.product_category_string_ids = "#{c2.id},#{c4.id}"
-    e2_sniffer.enabled = true
-    e2_sniffer.save!
-
-    assert_equal [p1.id, p1.id, p2.id],
-      e1_sniffer.consumers_products.sort_by(&:id).map(&:id)
-
-    # since they have interest in the same product, e2 and e3 position
-    # may vary here, but the last enterprise should be e2
-    assert_equivalent [e2.id, e3.id],
-      e1_sniffer.consumers_products.sort_by(&:id).map{|p| p[:consumer_profile_id].to_i}.first(2)
-    assert_equal e2.id,
-      e1_sniffer.consumers_products.sort_by(&:id).map{|p| p[:consumer_profile_id].to_i}.last
-
-    assert_equal [p1.id, p2.id],
-      e2_sniffer.suppliers_products.sort_by(&:id).map(&:id)
-    assert_equal [], e2_sniffer.consumers_products
-  end
-
-  should 'not search for suppliers and consumers on disabled enterprises' do
-    # Enterprises:
-    e1 = fast_create(Enterprise, :identifier => 'ent1' )
-    e2 = fast_create(Enterprise, :identifier => 'ent2' )
-    # Categories:
-    c1 = fast_create(ProductCategory, :name => 'Category 1')
-    c2 = fast_create(ProductCategory, :name => 'Category 2')
-    # Products (for enterprise 1):
-    p1 = fast_create(Product, :product_category_id => c1.id, :profile_id => e1.id )
-
-    # Products (for enterprise 2):
-    p2 = fast_create(Product, :product_category_id => c2.id, :profile_id => e2.id )
-    p2.inputs.build.product_category = c1
-    p2.save!
-
-    # get the extended sniffer profile for the enterprise:
-    e1_sniffer = SnifferPlugin::Profile.find_or_create e1
-    e2_sniffer = SnifferPlugin::Profile.find_or_create e2
-    # register e2 interest for 'Category 1' used by p1
-    e2_sniffer.product_category_string_ids = "#{c1.id}"
-    e2_sniffer.enabled = true
-    e2_sniffer.save!
-
-    # should not find anything for disabled enterprise
-    e1.enabled = false
-    e1.save!
-    assert_equal [], e2_sniffer.consumers_products
-    assert_equal [], e2_sniffer.suppliers_products
-  end
-
-end
@@ -4,18 +4,21 @@
 <%= _('Select here products and services categories that you have an interest on buying. Then you can go to the Opportunity Sniffer and check out enterprises near you that offer such products. Type in some characters and choose your interests from our list.') %>
 </p>
  
-<%= form_for(@sniffer_profile, :url => {:action => 'edit'}, :method => 'post') do |f| %>
+<%= form_for(@profile, as: :profile_data, url: {action: 'edit'}, method: 'post') do |f| %>
  
   <div id='sniffer-plugin-product-select'>
-    <% current_categories = @sniffer_profile.product_categories.collect{ |i| {:id => i.id, :name => i.name} } %>
+    <% current_categories = @profile.sniffer_interested_product_categories.map{ |i| {id: i.id, name: i.name} } %>
  
-    <%= token_input_field_tag('sniffer_plugin_profile[product_category_string_ids]', 'sniffer_product_category_string_ids', { :action => 'product_category_search' }, {search_delay: 150, pre_populate: current_categories, prevent_duplicates: true, hint_text: _('Type in a keyword') }) %>
+    <%= token_input_field_tag('profile_data[sniffer_interested_product_category_string_ids]',
+                              'sniffer_interested_product_category_string_ids',
+                              { action: 'product_category_search' },
+                              {search_delay: 150, pre_populate: current_categories, prevent_duplicates: true, hint_text: _('Type in a keyword') }) %>
  
   </div>
  
   <% button_bar do %>
     <%= submit_button(:save, _('Save')) %>
-    <%= button :back, _('Back to control panel'), :controller => 'profile_editor' %>
+    <%= button :back, _('Back to control panel'), controller: 'profile_editor' %>
   <% end %>
 <% end %>
  
@@ -96,7 +96,8 @@ class SpaminatorPlugin::SpaminatorTest &lt; ActiveSupport::TestCase
   end
  
   should 'process person by network' do
-    person = create_user('spammer').person
+    user   = User.current = create_user 'spammer'
+    person = user.person
     person.created_at = Time.now - 2.months
     person.save!
     c1 = fast_create(Community)
@@ -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"
@@ -167,6 +167,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,7 +130,7 @@ fi
 # create needed directory
 mkdir -p tmp/pids
 mkdir -p tmp/cache
-mkdir cache
+mkdir -p cache
  
 # use default gitignore rules
 if [ ! -f .gitignore ]; then
@@ -1224,4 +1224,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
@@ -104,6 +104,17 @@ class TasksControllerTest &lt; ActionController::TestCase
     ok('task should be finished') { t.status == Task::Status::FINISHED }
   end
  
+  should 'keep filters after close a task' do
+    t = profile.tasks.build; t.save!
+
+    post :close, :tasks => {t.id => {:decision => 'finish', :task => {}}}, :filter_type => t.type
+    assert_redirected_to :action => 'index', :filter_type => t.type
+    assert_equal @controller.params[:filter_type], t.type
+
+    t.reload
+    ok('task should be finished') { t.status == Task::Status::FINISHED }
+  end
+
   should 'be able to cancel a task' do
     t = profile.tasks.build; t.save!
  
@@ -0,0 +1,22 @@
+require_relative 'test_helper'
+
+class ActivitiesTest < ActiveSupport::TestCase
+
+  def setup
+    login_api
+  end
+
+  should 'get activity from profile' do
+    person = fast_create(Person)
+    organization = fast_create(Organization)
+    assert_difference 'organization.activities_count' do
+      ActionTracker::Record.create! :verb => :leave_scrap, :user => person, :target => organization
+      organization.reload
+    end
+    get "/api/v1/profiles/#{organization.id}/activities?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert 1, json["activities"].count
+    assert_equal organization.activities.map(&:activity).first.id, json["activities"].first["id"]
+  end
+
+end
@@ -13,6 +13,16 @@ class ArticlesTest &lt; ActiveSupport::TestCase
     assert_includes json["articles"].map { |a| a["id"] }, article.id
   end
  
+  should 'get profile homepage' do
+    article = fast_create(Article, :profile_id => user.person.id, :name => "Some thing")
+    person.home_page=article
+    person.save!
+
+    get "/api/v1/profiles/#{person.id}/home_page?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal article.id, json["article"]["id"]
+  end
+
   should 'not list forbidden article when listing articles' do
     person = fast_create(Person)
     article = fast_create(Article, :profile_id => person.id, :name => "Some thing", :published => false)
@@ -74,6 +84,16 @@ class ArticlesTest &lt; ActiveSupport::TestCase
     assert_equal 1, json['total_followers']
   end
  
+  should 'list articles followed by me' do
+    article1 = fast_create(Article, :profile_id => user.person.id, :name => "Some thing")
+    fast_create(Article, :profile_id => user.person.id, :name => "Some other thing")
+    article1.person_followers << @person
+    get "/api/v1/articles/followed_by_me?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal [article1.id], json['articles'].map { |a| a['id'] }
+  end
+
+
   should 'list article children' do
     article = create(Article, :profile_id => user.person.id, :name => "Parent")
     child1 = create(Article, :parent_id => article.id, :profile_id => user.person.id, :name => "Some Child")
@@ -190,6 +210,33 @@ class ArticlesTest &lt; ActiveSupport::TestCase
     end
   end
  
+  should 'not perform a vote twice in same article' do
+    article = fast_create(Article, :profile_id => @person.id, :name => "Some thing")
+    @params[:value] = 1
+    ## Perform a vote twice in API should compute only one vote
+    post "/api/v1/articles/#{article.id}/vote?#{params.to_query}"
+    post "/api/v1/articles/#{article.id}/vote?#{params.to_query}"
+
+    total = article.votes_total
+
+    assert_equal 1, total
+  end
+
+  should 'not perform a vote in favor and against a proposal' do
+    article = fast_create(Article, :profile_id => @person.id, :name => "Some thing")
+    @params[:value] = 1
+    ## Perform a vote in favor a proposal
+    post "/api/v1/articles/#{article.id}/vote?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal 201, last_response.status
+    ## Perform a vote against a proposal
+    @params[:value] = -1
+    post "/api/v1/articles/#{article.id}/vote?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    ## The api should not allow to save this vote
+    assert_equal 400, last_response.status
+  end
+
   should "update body of article created by me" do
     new_value = "Another body"
     params[:article] = {:body => new_value}
@@ -685,7 +732,6 @@ class ArticlesTest &lt; ActiveSupport::TestCase
       json = JSON.parse(last_response.body)
       assert_not_nil json['article'][attribute]
     end
-
   end
  
 end
@@ -0,0 +1,42 @@
+require_relative 'test_helper'
+
+class BoxesTest < ActiveSupport::TestCase
+
+  def setup
+    @controller = AccountController.new
+    @request = ActionController::TestRequest.new
+    login_api
+#    @request = ActionController::TestRequest.new
+  end
+
+  kinds= %w[Profile Community Person Enterprise Environment]
+  kinds.each do |kind|
+    should "get_boxes_from_#{kind.downcase.pluralize}" do
+      context_obj = fast_create(kind.constantize)
+      box = fast_create(Box, :owner_id => context_obj.id, :owner_type => (kind == 'Environment') ? 'Environment' : 'Profile')
+      get "/api/v1/#{kind.downcase.pluralize}/#{context_obj.id}/boxes?#{params.to_query}"
+      json = JSON.parse(last_response.body)
+      assert_equal box.id, json["boxes"].first["id"]
+    end
+  end
+
+  should 'get boxes from default environment' do
+    Environment.delete_all
+    environment = fast_create(Environment, :is_default => true)
+    box = fast_create(Box, :owner_id => environment.id, :owner_type => 'Environment')
+    get "/api/v1/environments/default/boxes?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal box.id, json["boxes"].first["id"]
+  end
+
+  should 'get boxes from context environment' do
+    env = fast_create(Environment, :is_default => true)
+    env2 = fast_create(Environment).domains << Domain.new(:name => 'test.host')
+    box = fast_create(Box, :owner_id => environment.id, :owner_type => 'Environment')
+    get "/api/v1/environments/context/boxes?#{params.to_query}"
+
+    json = JSON.parse(last_response.body)
+    assert_equal box.id, json["boxes"].first["id"]
+  end
+
+end
@@ -0,0 +1,38 @@
+require_relative 'test_helper'
+
+class EnvironmentTest < ActiveSupport::TestCase
+
+  def setup
+    @person = create_user('testing').person
+  end
+  attr_reader :person
+
+  should 'return the default environment' do
+    environment = Environment.default
+    get "/api/v1/environment/default"
+    json = JSON.parse(last_response.body)
+    assert_equal environment.id, json['id']
+  end
+
+  should 'return created environment' do
+    environment = fast_create(Environment)
+    default_env = Environment.default
+    assert_not_equal environment.id, default_env.id
+    get "/api/v1/environment/#{environment.id}"
+    json = JSON.parse(last_response.body)
+    assert_equal environment.id, json['id']
+  end
+
+  should 'return context environment' do
+    context_env = fast_create(Environment)
+    context_env.name = "example org"
+    context_env.save
+    context_env.domains<< Domain.new(:name => 'example.org')
+    default_env = Environment.default
+    assert_not_equal context_env.id, default_env.id
+    get "/api/v1/environment/context"
+    json = JSON.parse(last_response.body)
+    assert_equal context_env.id, json['id']
+  end  
+
+end
@@ -205,6 +205,7 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
     filter_disabled_plugins_endpoints
   end
  
+<<<<<<< HEAD
   should 'find all published articles on environment' do
     #user = create_user('someuser')
     #p = fast_create(Profile)
@@ -218,6 +219,8 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
     #assert_equals [article1, article2], present_articles
   end
  
+=======
+>>>>>>> master
   should 'not touch in options when no fields parameter is passed' do
     model = mock
     expects(:present).with(model, {})
@@ -15,6 +15,19 @@ class PeopleTest &lt; ActiveSupport::TestCase
     assert_equivalent [person1.id, person2.id, person.id], json['people'].map {|c| c['id']}
   end
  
+  should 'list all members of a community' do
+    person1 = fast_create(Person)
+    person2 = fast_create(Person)
+    community = fast_create(Community)
+    community.add_member(person1)
+    community.add_member(person2)
+
+    get "/api/v1/profiles/#{community.id}/members?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal 2, json["people"].count
+    assert_equivalent [person1.id,person2.id], json["people"].map{|p| p["id"]}
+  end
+
   should 'not list invisible people' do
     invisible_person = fast_create(Person, :visible => false)
  
@@ -55,14 +68,13 @@ class PeopleTest &lt; ActiveSupport::TestCase
   end
  
   should 'people endpoint filter by fields parameter with hierarchy' do
-    fields = {only: [:name, {user: [:login]}]}.to_json
+    fields = URI.encode({only: [:name, {user: [:login]}]}.to_json)
     get "/api/v1/people?#{params.to_query}&fields=#{fields}"
     json = JSON.parse(last_response.body)
     expected = {'people' => [{'name' => person.name, 'user' => {'login' => 'testapi'}}]}
     assert_equal expected, json
   end
  
-
   should 'get logged person' do
     get "/api/v1/people/me?#{params.to_query}"
     json = JSON.parse(last_response.body)
@@ -228,7 +240,7 @@ class PeopleTest &lt; ActiveSupport::TestCase
     assert_equal "www.blog.org", json['person']['additional_data']['Custom Blog']
   end
  
-  PERSON_ATTRIBUTES = %w(vote_count comments_count following_articles_count articles_count)
+  PERSON_ATTRIBUTES = %w(vote_count comments_count articles_count following_articles_count)
  
   PERSON_ATTRIBUTES.map do |attribute|
  
@@ -243,7 +255,6 @@ class PeopleTest &lt; ActiveSupport::TestCase
       json = JSON.parse(last_response.body)
       assert_not_nil json['person'][attribute]
     end
-
   end
  
 end
@@ -0,0 +1,32 @@
+require_relative 'test_helper'
+
+class ProfilesTest < ActiveSupport::TestCase
+
+  def setup
+    Profile.delete_all
+    login_api
+  end
+
+  should 'list all profiles' do
+    person1 = fast_create(Person)
+    person2 = fast_create(Person)
+    community = fast_create(Community)
+    get "/api/v1/profiles?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equivalent [person.id, person1.id, person2.id, community.id], json.map {|p| p['id']}
+  end
+
+  should 'get person from profile id' do
+    some_person = fast_create(Person)
+    get "/api/v1/profiles/#{some_person.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal some_person.id, json['id']
+  end
+
+  should 'get community from profile id' do
+    community = fast_create(Community)
+    get "/api/v1/profiles/#{community.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal community.id, json['id']
+  end
+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')
@@ -151,35 +145,6 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_tag_in_string rolename_for(member2, community), :tag => 'span', :content => 'Profile Administrator'
   end
  
-  should 'get theme from environment by default' do
-    @environment = mock
-    @environment.stubs(:theme).returns('my-environment-theme')
-    stubs(:profile).returns(nil)
-    assert_equal 'my-environment-theme', current_theme
-  end
-
-  should 'get theme from profile when profile is present' do
-    profile = mock
-    profile.stubs(:theme).returns('my-profile-theme')
-    stubs(:profile).returns(profile)
-    assert_equal 'my-profile-theme', current_theme
-  end
-
-  should 'override theme with testing theme from session' do
-    stubs(:session).returns(:theme => 'theme-under-test')
-    assert_equal 'theme-under-test', current_theme
-  end
-
-  should 'point to system theme path by default' do
-    expects(:current_theme).returns('my-system-theme')
-    assert_equal '/designs/themes/my-system-theme', theme_path
-  end
-
-  should 'point to user theme path when testing theme' do
-    stubs(:session).returns({:theme => 'theme-under-test'})
-    assert_equal '/user_themes/theme-under-test', theme_path
-  end
-
   should 'render theme footer' do
     stubs(:theme_path).returns('/user_themes/mytheme')
     footer_path = Rails.root.join('public', 'user_themes', 'mytheme', 'footer.html.erb')
@@ -301,38 +266,6 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_nil select_categories(mock)
   end
  
-  should 'provide sex icon for males' do
-    stubs(:environment).returns(Environment.default)
-    expects(:content_tag).with(anything, 'male').returns('MALE!!')
-    expects(:content_tag).with(anything, 'MALE!!', is_a(Hash)).returns("FINAL")
-    assert_equal "FINAL", profile_sex_icon(build(Person, :sex => 'male'))
-  end
-
-  should 'provide sex icon for females' do
-    stubs(:environment).returns(Environment.default)
-    expects(:content_tag).with(anything, 'female').returns('FEMALE!!')
-    expects(:content_tag).with(anything, 'FEMALE!!', is_a(Hash)).returns("FINAL")
-    assert_equal "FINAL", profile_sex_icon(build(Person, :sex => 'female'))
-  end
-
-  should 'provide undef sex icon' do
-    stubs(:environment).returns(Environment.default)
-    expects(:content_tag).with(anything, 'undef').returns('UNDEF!!')
-    expects(:content_tag).with(anything, 'UNDEF!!', is_a(Hash)).returns("FINAL")
-    assert_equal "FINAL", profile_sex_icon(build(Person, :sex => nil))
-  end
-
-  should 'not draw sex icon for non-person profiles' do
-    assert_equal '', profile_sex_icon(Community.new)
-  end
-
-  should 'not draw sex icon when disabled in the environment' do
-    env = fast_create(Environment, :name => 'env test')
-    env.expects(:enabled?).with('disable_gender_icon').returns(true)
-    stubs(:environment).returns(env)
-    assert_equal '', profile_sex_icon(build(Person, :sex => 'male'))
-  end
-
   should 'display field on person signup' do
     env = create(Environment, :name => 'env test')
     stubs(:environment).returns(env)
@@ -530,19 +463,6 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_equal Environment.default.name, page_title
   end
  
-  should 'gravatar default parameter' do
-    profile = mock
-    profile.stubs(:theme).returns('some-theme')
-    stubs(:profile).returns(profile)
-
-    NOOSFERO_CONF.stubs(:[]).with('gravatar').returns('crazyvatar')
-    assert_equal gravatar_default, 'crazyvatar'
-
-    stubs(:theme_option).returns('gravatar' => 'nicevatar')
-    NOOSFERO_CONF.stubs(:[]).with('gravatar').returns('nicevatar')
-    assert_equal gravatar_default, 'nicevatar'
-  end
-
   should 'use theme passed via param when in development mode' do
     stubs(:environment).returns(build(Environment, :theme => 'environment-theme'))
     Rails.env.stubs(:development?).returns(true)
@@ -564,48 +484,6 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_equal environment.theme, current_theme
   end
  
-  should 'return nil when :show_balloon_with_profile_links_when_clicked is not enabled in environment' do
-    env = Environment.default
-    env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(false)
-    stubs(:environment).returns(env)
-    profile = Profile.new
-    assert_nil links_for_balloon(profile)
-  end
-
-  should 'return ordered list of links to balloon to Person' do
-    env = Environment.default
-    env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(true)
-    stubs(:environment).returns(env)
-    person = Person.new identifier: 'person'
-    person.stubs(:url).returns('url for person')
-    person.stubs(:public_profile_url).returns('url for person')
-    links = links_for_balloon(person)
-    assert_equal ['Wall', 'Friends', 'Communities', 'Send an e-mail', 'Add'], links.map{|i| i.keys.first}
-  end
-
-  should 'return ordered list of links to balloon to Community' do
-    env = Environment.default
-    env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(true)
-    stubs(:environment).returns(env)
-    community = Community.new identifier: 'comm'
-    community.stubs(:url).returns('url for community')
-    community.stubs(:public_profile_url).returns('url for community')
-    links = links_for_balloon(community)
-    assert_equal ['Wall', 'Members', 'Agenda', 'Join', 'Leave community', 'Send an e-mail'], links.map{|i| i.keys.first}
-  end
-
-  should 'return ordered list of links to balloon to Enterprise' do
-    env = Environment.default
-    env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(true)
-    stubs(:environment).returns(env)
-    enterprise = Enterprise.new identifier: 'coop'
-    enterprise.stubs(:url).returns('url for enterprise')
-    enterprise.stubs(:public_profile_url).returns('url for enterprise')
-    stubs(:catalog_path)
-    links = links_for_balloon(enterprise)
-    assert_equal ['Products', 'Members', 'Agenda', 'Send an e-mail'], links.map{|i| i.keys.first}
-  end
-
   should 'use favicon from environment theme if does not have profile' do
     stubs(:environment).returns(fast_create(Environment, :theme => 'new-theme'))
     stubs(:profile).returns(nil)
@@ -657,24 +535,6 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert admin_link.present?
   end
  
-  should 'not return mime type of profile icon if not requested' do
-    stubs(:profile).returns(Person.new)
-    stubs(:current_theme).returns('default')
-
-    filename, mime = profile_icon(Person.new, :thumb)
-    assert_not_nil filename
-    assert_nil mime
-  end
-
-  should 'return mime type of profile icon' do
-    stubs(:profile).returns(Person.new)
-    stubs(:current_theme).returns('default')
-
-    filename, mime = profile_icon(Person.new, :thumb, true)
-    assert_not_nil filename
-    assert_not_nil mime
-  end
-
   should 'pluralize without count' do
     assert_equal "tests", pluralize_without_count(2, "test")
     assert_equal "test", pluralize_without_count(1, "test")
@@ -1043,31 +903,6 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_equal c.top_url, top_url
   end
  
-  should "Extra info with hash" do
-    @plugins = mock
-    @plugins.stubs(:dispatch_first).returns(false)
-    env = Environment.default
-    stubs(:environment).returns(env)
-    stubs(:profile).returns(profile)
-    profile = fast_create(Person, :environment_id => env.id)
-    info = {:value =>_('New'), :class => 'new-profile'}
-    html = profile_image_link(profile, size=:portrait, tag='li', extra_info = info)
-    assert_tag_in_string html, :tag => 'span', :attributes => { :class => 'profile-image new-profile' }
-    assert_tag_in_string html, :tag => 'span', :attributes => { :class => 'extra_info new-profile' }, :content => 'New'
-  end
-
-  should "Extra info without hash" do
-    @plugins = mock
-    @plugins.stubs(:dispatch_first).returns(false)
-    env = Environment.default
-    stubs(:environment).returns(env)
-    stubs(:profile).returns(profile)
-    profile = fast_create(Person, :environment_id => env.id)
-    info = 'new'
-    html = profile_image_link(profile, size=:portrait, tag='li', extra_info = info)
-    assert_tag_in_string html, :tag => 'span', :attributes => { :class => 'extra_info' }, :content => 'new'
-  end
-
   protected
   include NoosferoTestHelper
  
@@ -7,15 +7,6 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     assert_not_equal Block.description, ArticleBlock.description
   end
  
-  should "take article's content" do
-    block = ArticleBlock.new
-    article = mock
-    article.expects(:to_html).returns("Article content")
-    block.stubs(:article).returns(article)
-
-    assert_match(/Article content/, instance_eval(&block.content))
-  end
-
   should 'refer to an article' do
     profile = create_user('testuser').person
     article = profile.articles.build(:name => 'test article')
@@ -85,6 +76,31 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     assert_equal [a],block.available_articles
   end
  
+  protected
+    include NoosferoTestHelper
+
+end
+
+require 'boxes_helper'
+require 'block_helper'
+
+class ArticleBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
+  ActionView::Base.send :include, ArticleHelper
+  ActionView::Base.send :include, ButtonsHelper
+  ActionView::Base.send :include, BlockHelper
+
+  should "take article's content" do
+    block = ArticleBlock.new
+    article = mock
+    article.expects(:to_html).returns("Article content")
+    block.stubs(:article).returns(article)
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+
+    assert_match(/Article content/, render_block_content(block))
+  end
+
   should "display empty title if title is blank" do
     block = ArticleBlock.new
     article = mock
@@ -92,7 +108,7 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     block.expects(:title).returns('')
     block.stubs(:article).returns(article)
  
-    assert_equal "<h3 class=\"block-title empty\"><span></span></h3>Article content", instance_eval(&block.content)
+    assert_equal "<h3 class=\"block-title empty\"><span></span></h3>\n  Article content\n", render_block_content(block)
   end
  
   should "display title if defined" do
@@ -102,7 +118,7 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     block.expects(:title).returns('Article title')
     block.stubs(:article).returns(article)
  
-    assert_equal "<h3 class=\"block-title\"><span>Article title</span></h3>Article content", instance_eval(&block.content)
+    assert_equal "<h3 class=\"block-title\"><span>Article title</span></h3>\n  Article content\n", render_block_content(block)
   end
  
   should 'display image if article is an image' do
@@ -113,7 +129,7 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     block.article = image
     block.save!
  
-    assert_tag_in_string instance_eval(&block.content),
+    assert_tag_in_string render_block_content(block),
         :tag => 'img',
         :attributes => {
             :src => image.public_filename(:display),
@@ -129,7 +145,7 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     block.article = image
     block.save!
  
-    assert_no_match(/Previous/, instance_eval(&block.content))
+    assert_no_match(/Previous/, render_block_content(block))
   end
  
   should 'display link to archive if article is an archive' do
@@ -141,11 +157,6 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     block.save!
  
     UploadedFile.any_instance.stubs(:url).returns('myhost.mydomain/path/to/file')
-
-    assert_tag_in_string instance_eval(&block.content), :tag => 'a', :content => _('Download')
+    assert_tag_in_string render_block_content(block), :tag => 'a', :content => _('Download')
   end
-
-  protected
-    include NoosferoTestHelper
-
 end
@@ -17,6 +17,69 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     assert l.editable?
   end
  
+  should 'has field to configure blog' do
+    b = BlogArchivesBlock.new
+    assert b.respond_to?(:blog_id)
+    assert b.respond_to?(:blog_id=)
+  end
+
+  should 'not try to load a removed blog' do
+    block = fast_create(BlogArchivesBlock)
+    block.blog_id = profile.blog.id
+    block.save!
+    block.stubs(:owner).returns(profile)
+    profile.blog.destroy
+    assert_nothing_raised do
+      assert_nil block.blog
+    end
+  end
+
+  should 'load next blog if configured blog was removed' do
+    other_blog = fast_create(Blog, :profile_id => profile.id)
+    block = fast_create(BlogArchivesBlock)
+    block.blog_id = profile.blog.id
+    block.save!
+    block.stubs(:owner).returns(profile)
+    profile.blog.destroy
+    assert_nothing_raised do
+      assert_equal other_blog, block.blog
+    end
+  end
+
+#FIXME Performance issues with display_to. Must convert it to a scope.
+# Checkout this page for further information: http://noosfero.org/Development/ActionItem2705
+#
+#  should 'not count articles if the user can\'t see them' do
+#    person = create_user('testuser').person
+#    blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog_path')
+#    block = fast_create(BlogArchivesBlock)
+#
+#    feed = mock()
+#    feed.stubs(:url).returns(blog.url)
+#    blog.stubs(:feed).returns(feed)
+#    block.stubs(:blog).returns(blog)
+#    block.stubs(:owner).returns(profile)
+#
+#    public_post = fast_create(TextileArticle, :profile_id => profile.id, :parent_id => blog.id, :published => true, :published_at => Time.mktime(2012, 'jan'))
+#    private_post = fast_create(TextileArticle, :profile_id => profile.id, :parent_id => blog.id, :published => false, :published_at => Time.mktime(2012, 'jan'))
+#
+#    assert_match /January \(1\)/, block.content({:person => person})
+#    assert_match /January \(1\)/, block.content()
+#    assert_match /January \(2\)/, block.content({:person => profile})
+#  end
+end
+
+require 'boxes_helper'
+
+class BlogArchivesBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
+  def setup
+    @profile = create_user('flatline').person
+    @profile.articles << Blog.new(:name => 'Blog One', :profile => @profile)
+  end
+  attr_reader :profile
+
   should 'list amount posts by year' do
     date = DateTime.parse('2008-01-10')
     blog = profile.blog
@@ -26,7 +89,9 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_tag_in_string block.content, :tag => 'li', :content => '2008 (10)'
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).returns("")
+    assert_tag_in_string render_block_content(block), :tag => 'li', :content => '2008 (10)'
   end
  
   should 'list amount posts by month' do
@@ -38,7 +103,18 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_tag_in_string block.content, :tag => 'a', :content => 'January (10)', :attributes => {:href => /^http:\/\/.*\/flatline\/blog-one\?month=1&year=2008$/ }
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).with(1).returns("January")
+    ActionView::Base.any_instance.stubs(:month_name).with(2).returns("February")
+    ActionView::Base.any_instance.stubs(:month_name).with(3).returns("March")
+    ActionView::Base.any_instance.stubs(:month_name).with(4).returns("April")
+    ActionView::Base.any_instance.stubs(:month_name).with(5).returns("May")
+    ActionView::Base.any_instance.stubs(:month_name).with(6).returns("June")
+    ActionView::Base.any_instance.stubs(:month_name).with(7).returns("July")
+    ActionView::Base.any_instance.stubs(:month_name).with(8).returns("August")
+    ActionView::Base.any_instance.stubs(:month_name).with(9).returns("September")
+    ActionView::Base.any_instance.stubs(:month_name).with(10).returns("Octuber")
+    assert_tag_in_string render_block_content(block), :tag => 'a', :content => 'January (10)', :attributes => {:href => /^http:\/\/.*\/flatline\/blog-one\?month=1&year=2008$/ }
   end
  
   should 'order list of amount posts' do
@@ -49,7 +125,18 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_tag_in_string block.content, :tag => 'li', :content => 'January (1)',
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).with(1).returns("January")
+    ActionView::Base.any_instance.stubs(:month_name).with(2).returns("February")
+    ActionView::Base.any_instance.stubs(:month_name).with(3).returns("March")
+    ActionView::Base.any_instance.stubs(:month_name).with(4).returns("April")
+    ActionView::Base.any_instance.stubs(:month_name).with(5).returns("May")
+    ActionView::Base.any_instance.stubs(:month_name).with(6).returns("June")
+    ActionView::Base.any_instance.stubs(:month_name).with(7).returns("July")
+    ActionView::Base.any_instance.stubs(:month_name).with(8).returns("August")
+    ActionView::Base.any_instance.stubs(:month_name).with(9).returns("September")
+    ActionView::Base.any_instance.stubs(:month_name).with(10).returns("Octuber")
+    assert_tag_in_string render_block_content(block), :tag => 'li', :content => 'January (1)',
       :sibling => {:tag => 'li', :content => 'February (1)',
         :sibling => {:tag => 'li', :content => 'March (1)',
           :sibling => {:tag => 'li', :content => 'April (1)',
@@ -63,7 +150,9 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_match(/2009.*2008.*2007.*2006.*2005/m, block.content)
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).returns("")
+    assert_match(/2009.*2008.*2007.*2006.*2005/m, render_block_content(block))
   end
  
   should 'order months from later to former' do
@@ -73,20 +162,20 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_match(/.*March.*February.*January.*/m, block.content)
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).with(1).returns("January")
+    ActionView::Base.any_instance.stubs(:month_name).with(2).returns("February")
+    ActionView::Base.any_instance.stubs(:month_name).with(3).returns("March")
+    assert_match(/.*March.*February.*January.*/m, render_block_content(block))
   end
  
   should 'not display any content if has no blog' do
     profile.blogs.destroy_all
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_nil block.content
-  end
-
-  should 'has field to configure blog' do
-    b = BlogArchivesBlock.new
-    assert b.respond_to?(:blog_id)
-    assert b.respond_to?(:blog_id=)
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).returns("")
+    assert_empty render_block_content(block)
   end
  
   should 'show posts from first blog' do
@@ -98,8 +187,10 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_match(/blog-one/m, block.content)
-    assert_no_match(/blog-two/m, block.content)
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).returns("")
+    assert_match(/blog-one/m, render_block_content(block))
+    assert_no_match(/blog-two/m, render_block_content(block))
   end
  
   should 'list amount native posts by year' do
@@ -115,7 +206,9 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_tag_in_string block.content, :tag => 'li', :content => '2008 (2)'
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).returns("")
+    assert_tag_in_string render_block_content(block), :tag => 'li', :content => '2008 (2)'
   end
  
   should 'list amount native posts by month' do
@@ -131,51 +224,8 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
     block = BlogArchivesBlock.new
     block.stubs(:owner).returns(profile)
-    assert_tag_in_string block.content, :tag => 'a', :content => 'January (2)', :attributes => {:href => /^http:\/\/.*\/flatline\/blog-one\?month=1&year=2008$/ }
-  end
-
-  should 'not try to load a removed blog' do
-    block = fast_create(BlogArchivesBlock)
-    block.blog_id = profile.blog.id
-    block.save!
-    block.stubs(:owner).returns(profile)
-    profile.blog.destroy
-    assert_nothing_raised do
-      assert_nil block.blog
-    end
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+    ActionView::Base.any_instance.stubs(:month_name).with(1).returns("January")
+    assert_tag_in_string render_block_content(block), :tag => 'a', :content => 'January (2)', :attributes => {:href => /^http:\/\/.*\/flatline\/blog-one\?month=1&year=2008$/ }
   end
-
-  should 'load next blog if configured blog was removed' do
-    other_blog = fast_create(Blog, :profile_id => profile.id)
-    block = fast_create(BlogArchivesBlock)
-    block.blog_id = profile.blog.id
-    block.save!
-    block.stubs(:owner).returns(profile)
-    profile.blog.destroy
-    assert_nothing_raised do
-      assert_equal other_blog, block.blog
-    end
-  end
-
-#FIXME Performance issues with display_to. Must convert it to a scope.
-# Checkout this page for further information: http://noosfero.org/Development/ActionItem2705
-#
-#  should 'not count articles if the user can\'t see them' do
-#    person = create_user('testuser').person
-#    blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog_path')
-#    block = fast_create(BlogArchivesBlock)
-#
-#    feed = mock()
-#    feed.stubs(:url).returns(blog.url)
-#    blog.stubs(:feed).returns(feed)
-#    block.stubs(:blog).returns(blog)
-#    block.stubs(:owner).returns(profile)
-#
-#    public_post = fast_create(TextileArticle, :profile_id => profile.id, :parent_id => blog.id, :published => true, :published_at => Time.mktime(2012, 'jan'))
-#    private_post = fast_create(TextileArticle, :profile_id => profile.id, :parent_id => blog.id, :published => false, :published_at => Time.mktime(2012, 'jan'))
-#
-#    assert_match /January \(1\)/, block.content({:person => person})
-#    assert_match /January \(1\)/, block.content()
-#    assert_match /January \(2\)/, block.content({:person => profile})
-#  end
 end
@@ -266,4 +266,23 @@ class BlogTest &lt; ActiveSupport::TestCase
  
     assert_equal blog.image(true).filename, 'noosfero-network.png'
   end
+
+  should 'count total number of posts by year' do
+    p = create_user('testuser').person
+    blog = fast_create(Blog, :profile_id => p.id, :name => 'Blog test')
+    create(TextileArticle, :name => 'Post 1', :parent => blog, :profile => p, :published_at => DateTime.parse('16-08-2010'))
+    create(TextileArticle, :name => 'Post 2', :parent => blog, :profile => p, :published_at => DateTime.parse('17-08-2010'))
+    create(TextileArticle, :name => 'Post 3', :parent => blog, :profile => p, :published_at => DateTime.parse('10-05-2012'))
+    assert_equal [[2012.0, 1], [2010.0, 2]], blog.total_number_of_posts(:by_year)
+  end
+
+  should 'count total number of posts by month' do
+    p = create_user('testuser').person
+    blog = fast_create(Blog, :profile_id => p.id, :name => 'Blog test')
+    create(TextileArticle, :name => 'Post 1', :parent => blog, :profile => p, :published_at => DateTime.parse('16-08-2010'))
+    create(TextileArticle, :name => 'Post 2', :parent => blog, :profile => p, :published_at => DateTime.parse('17-08-2010'))
+    create(TextileArticle, :name => 'Post 3', :parent => blog, :profile => p, :published_at => DateTime.parse('11-10-2010'))
+    assert_equal [[10.0, 1], [8.0, 2]], blog.total_number_of_posts(:by_month, 2010)
+  end
+
 end
@@ -0,0 +1,11 @@
+# encoding: UTF-8
+require_relative "../test_helper"
+
+class ButtonsHelperTest < ActionView::TestCase
+  include ButtonsHelper
+
+  should 'append with-text class and keep existing classes' do
+    expects(:button_without_text).with('type', 'label', 'url', { :class => 'with-text class1'})
+    button('type', 'label', 'url', { :class => 'class1' })
+  end
+end
 \ No newline at end of file
@@ -17,11 +17,13 @@ class CategoriesBlockTest &lt; ActiveSupport::TestCase
     assert_not_nil category_block.help
   end
  
+  include BoxesHelper
+
   should 'display category block' do
     block = CategoriesBlock.new
  
-    self.expects(:render).with(:file => 'blocks/categories', :locals => { :block => block})
-    instance_eval(& block.content)
+    self.expects(:render).with(template: 'blocks/categories', locals: {block: block})
+    render_block_content(block)
   end
  
   should 'be editable' do
@@ -36,14 +36,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
@@ -51,31 +81,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
@@ -80,11 +80,13 @@ class HighlightsBlockTest &lt; ActiveSupport::TestCase
     assert_equal 'always', block.display
   end
  
+  include BoxesHelper
+
   should 'display highlights block' do
     block = HighlightsBlock.new
-    self.expects(:render).with(:file => 'blocks/highlights', :locals => { :block => block})
+    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
@@ -167,7 +169,7 @@ class HighlightsBlockTest &lt; ActiveSupport::TestCase
     block.images = [i1]
     block.save!
  
-    assert_tag_in_string instance_eval(& block.content), :tag => 'img', :attributes => { :src => "/social/img_address" }
+    assert_tag_in_string render_block_content(block), :tag => 'img', :attributes => { :src => "/social/img_address" }
   end
  
   [Environment, Profile].each do |klass|
@@ -2,6 +2,8 @@ require_relative &quot;../test_helper&quot;
  
 class LinkListBlockTest < ActiveSupport::TestCase
  
+  include BoxesHelper
+
   should 'default describe' do
     assert_not_equal Block.description, LinkListBlock.description
   end
@@ -23,7 +25,7 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
  
   should 'list links' do
     l = LinkListBlock.new(:links => [{:name => 'products', :address => '/cat/products'}])
-    assert_match /products/, l.content
+    assert_match /products/, render_block_content(l)
   end
  
   should 'remove links with blank fields' do
@@ -36,7 +38,7 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
     profile = Profile.new(:identifier => 'test_profile')
     l = LinkListBlock.new(:links => [{:name => 'categ', :address => '/{profile}/address'}])
     l.stubs(:owner).returns(profile)
-    assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => '/test_profile/address'}
+    assert_tag_in_string render_block_content(l), :tag => 'a', :attributes => {:href => '/test_profile/address'}
   end
  
   should 'replace {portal} with environment portal identifier' do
@@ -49,7 +51,7 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
     stubs(:environment).returns(env)
     l = LinkListBlock.new(:links => [{:name => 'categ', :address => '/{portal}/address'}])
     l.stubs(:owner).returns(env)
-    assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => '/portal-community/address'}
+    assert_tag_in_string render_block_content(l), :tag => 'a', :attributes => {:href => '/portal-community/address'}
   end
  
   should 'not change address if no {portal} there' do
@@ -62,19 +64,19 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
     stubs(:environment).returns(env)
     l = LinkListBlock.new(:links => [{:name => 'categ', :address => '/address'}])
     l.stubs(:owner).returns(env)
-    assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => '/address'}
+    assert_tag_in_string render_block_content(l), :tag => 'a', :attributes => {:href => '/address'}
   end
  
   should 'handle /prefix if not already added' do
     Noosfero.stubs(:root).returns('/prefix')
     l = LinkListBlock.new(:links => [{:name => "foo", :address => '/bar'}] )
-    assert_tag_in_string l.content, :tag => 'a', :attributes => { :href => '/prefix/bar' }
+    assert_tag_in_string render_block_content(l), :tag => 'a', :attributes => { :href => '/prefix/bar' }
   end
  
   should 'not add /prefix if already there' do
     Noosfero.stubs(:root).returns('/prefix')
     l = LinkListBlock.new(:links => [{:name => "foo", :address => '/prefix/bar'}] )
-    assert_tag_in_string l.content, :tag => 'a', :attributes => { :href => '/prefix/bar' }
+    assert_tag_in_string render_block_content(l), :tag => 'a', :attributes => { :href => '/prefix/bar' }
   end
  
   should 'display options for icons' do
@@ -85,29 +87,29 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
   end
  
   should 'link with icon' do
-    l = LinkListBlock.new
-    assert_match /class="icon-save"/, l.link_html({:icon => 'save', :name => 'test', :address => 'test.com'})
+    l = LinkListBlock.new(:links => [{:icon => 'save', :name => 'test', :address => 'test.com'}])
+    assert_match /a class="icon-[^"]+"/, render_block_content(l)
   end
  
   should 'no class without icon' do
-    l = LinkListBlock.new
-    assert_no_match /class="/, l.link_html({:icon => nil, :name => 'test', :address => 'test.com'})
+    l = LinkListBlock.new(:links => [{:icon => nil, :name => 'test', :address => 'test.com'}])
+    assert_no_match /a class="icon-[^"]+"/, render_block_content(l)
   end
  
   should 'not add link to javascript' do
     l = LinkListBlock.new(:links => [{:name => 'link', :address => "javascript:alert('Message test')"}])
-    assert_no_match /href="javascript/, l.link_html(l.links.first)
+    assert_no_match /href="javascript/, render_block_content(l)
   end
  
   should 'not add link to onclick' do
     l = LinkListBlock.new(:links => [{:name => 'link', :address => "#\" onclick=\"alert(123456)"}])
-    assert_no_tag_in_string l.link_html(l.links.first), :attributes => { :onclick => /.*/ }
+    assert_no_tag_in_string render_block_content(l), :attributes => { :onclick => /.*/ }
   end
  
   should 'add protocol in front of incomplete external links' do
     {'/local/link' => '/local/link', 'http://example.org' => 'http://example.org', 'example.org' => '//example.org'}.each do |input, output|
       l = LinkListBlock.new(:links => [{:name => 'categ', :address => input}])
-      assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => output}
+      assert_tag_in_string render_block_content(l), :tag => 'a', :attributes => {:href => output}
     end
   end
  
@@ -128,7 +130,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
@@ -1939,7 +1939,7 @@ 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
@@ -15,4 +15,19 @@ class PluginHotSpotTest &lt; ActiveSupport::TestCase
     assert_same @client.plugins, @client.plugins
   end
  
+  Noosfero::Plugin::HotSpot::CALLBACK_HOTSPOTS.each do |callback|
+    should "call #{callback} hotspot" do
+      class CoolPlugin < Noosfero::Plugin; end
+
+      Noosfero::Plugin.stubs(:all).returns([CoolPlugin.name])
+      Environment.default.enable_plugin(CoolPlugin)
+      CoolPlugin.any_instance.expects("comment_#{callback}_callback".to_sym)
+
+      person = fast_create(Person)
+      article = fast_create(Article, :profile_id => person.id)
+      comment = Comment.create!(:author => person, :title => 'test comment', :body => 'body!', :source => article)
+      comment.destroy
+    end
+  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
@@ -0,0 +1,138 @@
+# encoding: UTF-8
+require_relative "../test_helper"
+
+class ProfileImageHelperTest < ActionView::TestCase
+  include Noosfero::Gravatar
+  include ThemeLoaderHelper
+  include ProfileImageHelper
+
+  should "Extra info with hash" do
+    @plugins = mock
+    @plugins.stubs(:dispatch_first).returns(false)
+    env = Environment.default
+    stubs(:environment).returns(env)
+    stubs(:profile).returns(profile)
+    profile = fast_create(Person, :environment_id => env.id)
+    info = {:value =>_('New'), :class => 'new-profile'}
+    html = profile_image_link(profile, size=:portrait, tag='li', extra_info = info)
+    assert_tag_in_string html, :tag => 'span', :attributes => { :class => 'profile-image new-profile' }
+    assert_tag_in_string html, :tag => 'span', :attributes => { :class => 'extra_info new-profile' }, :content => 'New'
+  end
+
+  should "Extra info without hash" do
+    @plugins = mock
+    @plugins.stubs(:dispatch_first).returns(false)
+    env = Environment.default
+    stubs(:environment).returns(env)
+    stubs(:profile).returns(profile)
+    profile = fast_create(Person, :environment_id => env.id)
+    info = 'new'
+    html = profile_image_link(profile, size=:portrait, tag='li', extra_info = info)
+    assert_tag_in_string html, :tag => 'span', :attributes => { :class => 'extra_info' }, :content => 'new'
+  end
+
+  should 'return nil when :show_balloon_with_profile_links_when_clicked is not enabled in environment' do
+    env = Environment.default
+    env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(false)
+    stubs(:environment).returns(env)
+    profile = Profile.new
+    assert_nil links_for_balloon(profile)
+  end
+
+  should 'return ordered list of links to balloon to Person' do
+    env = Environment.default
+    env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(true)
+    stubs(:environment).returns(env)
+    person = Person.new identifier: 'person'
+    person.stubs(:url).returns('url for person')
+    person.stubs(:public_profile_url).returns('url for person')
+    links = links_for_balloon(person)
+    assert_equal ['Wall', 'Friends', 'Communities', 'Send an e-mail', 'Add'], links.map{|i| i.keys.first}
+  end
+
+  should 'return ordered list of links to balloon to Community' do
+    env = Environment.default
+    env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(true)
+    stubs(:environment).returns(env)
+    community = Community.new identifier: 'comm'
+    community.stubs(:url).returns('url for community')
+    community.stubs(:public_profile_url).returns('url for community')
+    links = links_for_balloon(community)
+    assert_equal ['Wall', 'Members', 'Agenda', 'Join', 'Leave community', 'Send an e-mail'], links.map{|i| i.keys.first}
+  end
+
+  should 'return ordered list of links to balloon to Enterprise' do
+    env = Environment.default
+    env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(true)
+    stubs(:environment).returns(env)
+    enterprise = Enterprise.new identifier: 'coop'
+    enterprise.stubs(:url).returns('url for enterprise')
+    enterprise.stubs(:public_profile_url).returns('url for enterprise')
+    stubs(:catalog_path)
+    links = links_for_balloon(enterprise)
+    assert_equal ['Products', 'Members', 'Agenda', 'Send an e-mail'], links.map{|i| i.keys.first}
+  end
+
+  should 'not return mime type of profile icon if not requested' do
+    stubs(:profile).returns(Person.new)
+    stubs(:current_theme).returns('default')
+
+    filename, mime = profile_icon(Person.new, :thumb)
+    assert_not_nil filename
+    assert_nil mime
+  end
+
+  should 'return mime type of profile icon' do
+    stubs(:profile).returns(Person.new)
+    stubs(:current_theme).returns('default')
+
+    filename, mime = profile_icon(Person.new, :thumb, true)
+    assert_not_nil filename
+    assert_not_nil mime
+  end
+
+  should 'provide sex icon for males' do
+    stubs(:environment).returns(Environment.default)
+    expects(:content_tag).with(anything, 'male').returns('MALE!!')
+    expects(:content_tag).with(anything, 'MALE!!', is_a(Hash)).returns("FINAL")
+    assert_equal "FINAL", profile_sex_icon(build(Person, :sex => 'male'))
+  end
+
+  should 'provide sex icon for females' do
+    stubs(:environment).returns(Environment.default)
+    expects(:content_tag).with(anything, 'female').returns('FEMALE!!')
+    expects(:content_tag).with(anything, 'FEMALE!!', is_a(Hash)).returns("FINAL")
+    assert_equal "FINAL", profile_sex_icon(build(Person, :sex => 'female'))
+  end
+
+  should 'provide undef sex icon' do
+    stubs(:environment).returns(Environment.default)
+    expects(:content_tag).with(anything, 'undef').returns('UNDEF!!')
+    expects(:content_tag).with(anything, 'UNDEF!!', is_a(Hash)).returns("FINAL")
+    assert_equal "FINAL", profile_sex_icon(build(Person, :sex => nil))
+  end
+
+  should 'not draw sex icon for non-person profiles' do
+    assert_equal '', profile_sex_icon(Community.new)
+  end
+
+  should 'not draw sex icon when disabled in the environment' do
+    env = fast_create(Environment, :name => 'env test')
+    env.expects(:enabled?).with('disable_gender_icon').returns(true)
+    stubs(:environment).returns(env)
+    assert_equal '', profile_sex_icon(build(Person, :sex => 'male'))
+  end
+
+  should 'gravatar default parameter' do
+    profile = mock
+    profile.stubs(:theme).returns('some-theme')
+    stubs(:profile).returns(profile)
+
+    NOOSFERO_CONF.stubs(:[]).with('gravatar').returns('crazyvatar')
+    assert_equal gravatar_default, 'crazyvatar'
+
+    stubs(:theme_option).returns('gravatar' => 'nicevatar')
+    NOOSFERO_CONF.stubs(:[]).with('gravatar').returns('nicevatar')
+    assert_equal gravatar_default, 'nicevatar'
+  end
+end
 \ No newline at end of file
@@ -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
@@ -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
@@ -184,9 +184,9 @@ class TaskTest &lt; ActiveSupport::TestCase
  
   should 'not send notification to target if notification is disabled in profile' do
     task = Task.new
-    target = fast_create(Profile)
+    target = fast_create(Organization)
     target.stubs(:notification_emails).returns(['adm@example.com'])
-    target.stubs(:administrator_mail_notification).returns(false)
+    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
@@ -195,13 +195,12 @@ class TaskTest &lt; ActiveSupport::TestCase
  
   should 'send notification to target if notification is enabled in profile' do
     task = Task.new
-    target = fast_create(Profile)
+    target = fast_create(Organization)
     target.stubs(:notification_emails).returns(['adm@example.com'])
-    target.stubs(:administrator_mail_notification).returns(true)
+    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
@@ -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
@@ -0,0 +1,36 @@
+# encoding: UTF-8
+require_relative "../test_helper"
+
+class ThemeLoaderHelperTest < ActionView::TestCase
+  include ThemeLoaderHelper
+
+  should 'get theme from environment by default' do
+    @environment = mock
+    @environment.stubs(:theme).returns('my-environment-theme')
+    stubs(:profile).returns(nil)
+    stubs(:environment).returns(@environment)
+    assert_equal 'my-environment-theme', current_theme
+  end
+
+  should 'get theme from profile when profile is present' do
+    profile = mock
+    profile.stubs(:theme).returns('my-profile-theme')
+    stubs(:profile).returns(profile)
+    assert_equal 'my-profile-theme', current_theme
+  end
+
+  should 'override theme with testing theme from session' do
+    stubs(:session).returns(:theme => 'theme-under-test')
+    assert_equal 'theme-under-test', current_theme
+  end
+
+  should 'point to system theme path by default' do
+    expects(:current_theme).returns('my-system-theme')
+    assert_equal '/designs/themes/my-system-theme', theme_path
+  end
+
+  should 'point to user theme path when testing theme' do
+    stubs(:session).returns({:theme => 'theme-under-test'})
+    assert_equal '/user_themes/theme-under-test', theme_path
+  end
+end
 \ No newline at end of file
@@ -5,7 +5,8 @@ class TinyMceArticleTest &lt; ActiveSupport::TestCase
  
   def setup
     super
-    @profile = create_user('zezinho').person
+    @user = User.current = create_user('zezinho')
+    @profile = @user.person
   end
   attr_reader :profile
  
@@ -114,24 +115,22 @@ class TinyMceArticleTest &lt; ActiveSupport::TestCase
  
   should 'notify activity on create' do
     ActionTracker::Record.delete_all
-    create TinyMceArticle, :name => 'test', :profile_id => fast_create(Profile).id, :published => true
+    create TinyMceArticle, 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
     ActionTracker::Record.delete_all
-    profile = fast_create(Profile)
-    create TinyMceArticle, :name => 'bar', :profile_id => profile.id, :published => true
-    create TinyMceArticle, :name => 'another bar', :profile_id => profile.id, :published => true
+    create TinyMceArticle, name: 'bar', profile_id: profile.id, published: true
+    create TinyMceArticle, name: 'another bar', profile_id: profile.id, published: true
     assert_equal 2, ActionTracker::Record.count
-    create TinyMceArticle, :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
+    create TinyMceArticle, name: 'another bar 2', profile_id: profile.id, published: true
     assert_equal 3, ActionTracker::Record.count
   end
  
   should 'not update activity on update of an article' do
     ActionTracker::Record.delete_all
-    profile = fast_create(Profile)
-    article = create(TinyMceArticle, :profile_id => profile.id)
+    article = create TinyMceArticle, profile_id: profile.id
     time = article.activity.updated_at
     Time.stubs(:now).returns(time + 1.day)
     assert_no_difference 'ActionTracker::Record.count' do
@@ -143,8 +142,8 @@ class TinyMceArticleTest &lt; ActiveSupport::TestCase
  
   should 'not create trackers activity when updating articles' do
     ActionTracker::Record.delete_all
-    a1 = create TinyMceArticle, :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
-    a2 = create TinyMceArticle, :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
+    a1 = create TinyMceArticle, name: 'bar', profile_id: profile.id, published: true
+    a2 = create TinyMceArticle, 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!
@@ -153,34 +152,32 @@ class TinyMceArticleTest &lt; ActiveSupport::TestCase
  
   should 'remove activity when an article is destroyed' do
     ActionTracker::Record.delete_all
-    a1 = create TinyMceArticle, :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
-    a2 = create TinyMceArticle, :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
+    a1 = create TinyMceArticle, name: 'bar', profile_id: profile.id, published: true
+    a2 = create TinyMceArticle, name: 'another bar', profile_id: profile.id, published: true
     assert_difference 'ActionTracker::Record.count', -2 do
       a1.destroy
       a2.destroy
-end
+    end
   end
  
   should "the tracker action target be defined as the article on articles'creation in communities" do
     ActionTracker::Record.delete_all
     community = fast_create(Community)
-    p1 = Person.first
-    community.add_member(p1)
-    assert p1.is_member_of?(community)
-    article = create TinyMceArticle, :name => 'test', :profile_id => community.id
+    community.add_member profile
+    assert profile.is_member_of?(community)
+    article = create TinyMceArticle, 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 TinyMceArticle, :name => 'test', :profile_id => person.id
+    article = create TinyMceArticle, name: 'test', profile_id: profile.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 TinyMceArticle, :name => 'bar', :profile_id => fast_create(Profile).id, :published => true, :advertise => false
+    a = create TinyMceArticle, 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?
@@ -7,6 +7,8 @@ module ActionTracker
     belongs_to :user, :polymorphic => true
     belongs_to :target, :polymorphic => true
  
+    alias :profile :user
+
     serialize :params, Hash
  
     before_validation :stringify_verb
...	...	@@ -6,12 +6,13 @@ before_script:
6	6	- ./script/silent-quick-start
7	7
8	8	stages:
9		- - smoke-tests
	9	+ #FIXME Selenium tests are randomly failing and this avoid other tests to run.
	10	+ #- smoke-tests
10	11	- all-tests
11	12
12		-smoke:
13		- script: bundle exec rake ci:smoke
14		- stage: smoke-tests
	13	+#smoke:
	14	+# script: bundle exec rake ci:smoke
	15	+# stage: smoke-tests
15	16
16	17	units:
17	18	script: bundle exec rake test:units
...	...
...	...	@@ -55,7 +55,10 @@ env:
55	55	- TASK=test:integration
56	56	- TASK=cucumber LANG=en
57	57	- TASK=selenium
58		- - TASK=test:noosfero_plugins BUNDLE_OPTS=install
	58	+ - SLICE=1/4 TASK=test:noosfero_plugins BUNDLE_OPTS=install
	59	+ - SLICE=2/4 TASK=test:noosfero_plugins BUNDLE_OPTS=install
	60	+ - SLICE=3/4 TASK=test:noosfero_plugins BUNDLE_OPTS=install
	61	+ - SLICE=4/4 TASK=test:noosfero_plugins BUNDLE_OPTS=install
59	62
60	63	script:
61	64	- ./script/ci
...	...
...	...	@@ -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!
...	...
...	...	@@ -34,7 +34,7 @@ gem 'slim'
34	34
35	35	# API dependencies
36	36	gem 'grape', '~> 0.12'
37		-gem 'grape-entity', '= 0.4.8'
	37	+gem 'grape-entity', '0.4.8'
38	38	gem 'grape_logging'
39	39	gem 'grape-swagger'
40	40	gem 'swagger-ui_rails'
...	...	@@ -43,7 +43,7 @@ gem 'rack-cors'
43	43	gem 'rack-contrib'
44	44	gem 'liquid', '~> 3.0.3'
45	45
46		-gem 'api-pagination', '~> 4.1.1'
	46	+gem 'api-pagination', '>= 4.1.1'
47	47
48	48	# asset pipeline
49	49	gem 'uglifier', '>= 1.0.3'
...	...
...	...	@@ -21,14 +21,14 @@ PATH
21	21	access_control (0.0.0)
22	22
23	23	PATH
24		- remote: vendor/plugins/action_tracker
	24	+ remote: vendor/plugins/action_tracker_has_comments
25	25	specs:
26		- action_tracker (0.0.1)
	26	+ action_tracker_has_comments (0.0.0)
27	27
28	28	PATH
29		- remote: vendor/plugins/action_tracker_has_comments
	29	+ remote: vendor/plugins/action_tracker
30	30	specs:
31		- action_tracker_has_comments (0.0.0)
	31	+ action_tracker (0.0.1)
32	32
33	33	PATH
34	34	remote: vendor/plugins/acts_as_list
...	...	@@ -425,7 +425,7 @@ DEPENDENCIES
425	425	acts_as_tree (= 0.0.0)!
426	426	acts_as_versioned (> 0.0.0)!
427	427	airbrake (~> 4)
428		- api-pagination (~> 4.1.1)
	428	+ api-pagination (>= 4.1.1)
429	429	capybara (~> 2.2)
430	430	contacts (> 0.0.0)!
431	431	cucumber
...	...	@@ -491,3 +491,6 @@ DEPENDENCIES
491	491	whenever
492	492	will_paginate (~> 3.0.7)
493	493	xss_terminate (= 0.0.0)!
	494	+
	495	+BUNDLED WITH
	496	+ 1.11.2
...	...
...	...	@@ -2,6 +2,8 @@ class TasksController < MyProfileController
2	2
3	3	protect [:perform_task, :view_tasks], :profile, :only => [:index, :save_tags, :search_tags]
4	4	protect :perform_task, :profile, :only => [:processed, :change_responsible, :close, :new, :list_requested, :ticket_details, :search_tags]
	5	+ include TasksHelper
	6	+
5	7
6	8	def index
7	9	@rejection_email_templates = profile.email_templates.find_all_by_template_type(:task_rejection)
...	...	@@ -84,12 +86,12 @@ class TasksController < MyProfileController
84	86	end
85	87	end
86	88
87		- url = { :action => 'index' }
	89	+ url = tasks_url(:action => 'index')
88	90	if failed.blank?
89	91	session[:notice] = _("All decisions were applied successfully.")
90	92	else
91	93	session[:notice] = _("Some decisions couldn't be applied.")
92		- url[:failed] = failed
	94	+ url = tasks_url(:action => 'index', :failed => failed)
93	95	end
94	96	redirect_to url
95	97	end
...	...
...	...	@@ -50,6 +50,12 @@ module ApplicationHelper
50	50
51	51	include TaskHelper
52	52
	53	+ include ButtonsHelper
	54	+
	55	+ include ProfileImageHelper
	56	+
	57	+ include ThemeLoaderHelper
	58	+
53	59	def locale
54	60	(@page && !@page.language.blank?) ? @page.language : FastGettext.locale
55	61	end
...	...	@@ -211,52 +217,6 @@ module ApplicationHelper
211	217	result
212	218	end
213	219
214		- def button(type, label, url, html_options = {})
215		- html_options \|\|= {}
216		- the_class = 'with-text'
217		- if html_options.has_key?(:class)
218		- the_class << ' ' << html_options[:class]
219		- end
220		- button_without_text type, label, url, html_options.merge(:class => the_class)
221		- end
222		-
223		- def button_without_text(type, label, url, html_options = {})
224		- the_class = "button icon-#{type}"
225		- if html_options.has_key?(:class)
226		- the_class << ' ' << html_options[:class]
227		- end
228		- the_title = html_options[:title] \|\| label
229		- if html_options[:disabled]
230		- content_tag('a', ' '+content_tag('span', label), html_options.merge(:class => the_class, :title => the_title))
231		- else
232		- link_to(' '+content_tag('span', label), url, html_options.merge(:class => the_class, :title => the_title))
233		- end
234		- end
235		-
236		- def button_to_function(type, label, js_code, html_options = {}, &block)
237		- html_options[:class] = "button with-text" unless html_options[:class]
238		- html_options[:class] << " icon-#{type}"
239		- link_to_function(label, js_code, html_options, &block)
240		- end
241		-
242		- def button_to_function_without_text(type, label, js_code, html_options = {}, &block)
243		- html_options[:class] = "" unless html_options[:class]
244		- html_options[:class] << " button icon-#{type}"
245		- link_to_function(content_tag('span', label), js_code, html_options, &block)
246		- end
247		-
248		- def button_to_remote(type, label, options, html_options = {})
249		- html_options[:class] = "button with-text" unless html_options[:class]
250		- html_options[:class] << " icon-#{type}"
251		- link_to_remote(label, options, html_options)
252		- end
253		-
254		- def button_to_remote_without_text(type, label, options, html_options = {})
255		- html_options[:class] = "" unless html_options[:class]
256		- html_options[:class] << " button icon-#{type}"
257		- link_to_remote(content_tag('span', label), options, html_options.merge(:title => label))
258		- end
259		-
260	220	def icon(icon_name, html_options = {})
261	221	the_class = "button #{icon_name}"
262	222	if html_options.has_key?(:class)
...	...	@@ -327,48 +287,6 @@ module ApplicationHelper
327	287	end
328	288	end
329	289
330		- def theme_path
331		- if session[:theme]
332		- '/user_themes/' + current_theme
333		- else
334		- '/designs/themes/' + current_theme
335		- end
336		- end
337		-
338		- def current_theme
339		- @current_theme \|\|=
340		- begin
341		- if session[:theme]
342		- session[:theme]
343		- else
344		- # utility for developers: set the theme to 'random' in development mode and
345		- # you will get a different theme every request. This is interesting for
346		- # testing
347		- if Rails.env.development? && environment.theme == 'random'
348		- @random_theme \|\|= Dir.glob('public/designs/themes/*').map { \|f\| File.basename(f) }.rand
349		- @random_theme
350		- elsif Rails.env.development? && respond_to?(:params) && params[:theme] && File.exists?(Rails.root.join('public/designs/themes', params[:theme]))
351		- params[:theme]
352		- else
353		- if profile && !profile.theme.nil?
354		- profile.theme
355		- elsif environment
356		- environment.theme
357		- else
358		- if logger
359		- logger.warn("No environment found. This is weird.")
360		- logger.warn("Request environment: %s" % request.env.inspect)
361		- logger.warn("Request parameters: %s" % params.inspect)
362		- end
363		-
364		- # could not determine the theme, so return the default one
365		- 'default'
366		- end
367		- end
368		- end
369		- end
370		- end
371		-
372	290	def theme_view_file(template, theme=nil)
373	291	# Since we cannot control what people are doing in external themes, we
374	292	# will keep looking for the deprecated .rhtml extension here.
...	...	@@ -441,141 +359,6 @@ module ApplicationHelper
441	359	Theme.find(current_theme).owner.identifier
442	360	end
443	361
444		- # generates a image tag for the profile.
445		- #
446		- # If the profile has no image set yet, then a default image is used.
447		- def profile_image(profile, size=:portrait, opt={})
448		- return '' if profile.nil?
449		- opt[:alt] \|\|= profile.name()
450		- opt[:title] \|\|= ''
451		- opt[:class] \|\|= ''
452		- opt[:class] += ( profile.class == Person ? ' photo' : ' logo' )
453		- image_tag(profile_icon(profile, size), opt )
454		- end
455		-
456		- def profile_icon( profile, size=:portrait, return_mimetype=false )
457		- filename, mimetype = '', 'image/png'
458		- if profile.image
459		- filename = profile.image.public_filename( size )
460		- mimetype = profile.image.content_type
461		- else
462		- icon =
463		- if profile.organization?
464		- if profile.kind_of?(Community)
465		- '/images/icons-app/community-'+ size.to_s() +'.png'
466		- else
467		- '/images/icons-app/enterprise-'+ size.to_s() +'.png'
468		- end
469		- else
470		- pixels = Image.attachment_options[:thumbnails][size].split('x').first
471		- gravatar_profile_image_url(
472		- profile.email,
473		- :size => pixels,
474		- :d => gravatar_default
475		- )
476		- end
477		- filename = default_or_themed_icon(icon)
478		- end
479		- return_mimetype ? [filename, mimetype] : filename
480		- end
481		-
482		- def default_or_themed_icon(icon)
483		- if File.exists?(Rails.root.join('public', theme_path, icon))
484		- theme_path + icon
485		- else
486		- icon
487		- end
488		- end
489		-
490		- def profile_sex_icon( profile )
491		- return '' unless profile.is_a?(Person)
492		- return '' unless !environment.enabled?('disable_gender_icon')
493		- sex = ( profile.sex ? profile.sex.to_s() : 'undef' )
494		- title = ( sex == 'undef' ? _('non registered gender') : ( sex == 'male' ? _('Male') : _('Female') ) )
495		- sex = content_tag 'span',
496		- content_tag( 'span', sex ),
497		- :class => 'sex-'+sex,
498		- :title => title
499		- sex
500		- end
501		-
502		- def links_for_balloon(profile)
503		- if environment.enabled?(:show_balloon_with_profile_links_when_clicked)
504		- if profile.kind_of?(Person)
505		- [
506		- {_('Wall') => {:href => url_for(profile.public_profile_url)}},
507		- {_('Friends') => {:href => url_for(:controller => :profile, :action => :friends, :profile => profile.identifier)}},
508		- {_('Communities') => {:href => url_for(:controller => :profile, :action => :communities, :profile => profile.identifier)}},
509		- {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}},
510		- {_('Add') => {:href => url_for(profile.add_url), :class => 'add-friend', :style => 'display: none'}}
511		- ]
512		- elsif profile.kind_of?(Community)
513		- [
514		- {_('Wall') => {:href => url_for(profile.public_profile_url)}},
515		- {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
516		- {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
517		- {_('Join') => {:href => url_for(profile.join_url), :class => 'join-community', :style => 'display: none'}},
518		- {_('Leave community') => {:href => url_for(profile.leave_url), :class => 'leave-community', :style => 'display: none'}},
519		- {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}}
520		- ]
521		- elsif profile.kind_of?(Enterprise)
522		- [
523		- {_('Products') => {:href => catalog_path(profile.identifier)}},
524		- {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
525		- {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
526		- {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}},
527		- ]
528		- else
529		- []
530		- end
531		- end
532		- end
533		-
534		- # displays a link to the profile homepage with its image (as generated by
535		- # #profile_image) and its name below it.
536		- def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )
537		- if content = @plugins.dispatch_first(:profile_image_link, profile, size, tag, extra_info)
538		- return instance_exec(&content)
539		- end
540		- name = profile.short_name
541		- if profile.person?
542		- url = url_for(profile.check_friendship_url)
543		- trigger_class = 'person-trigger'
544		- else
545		- city = ''
546		- url = url_for(profile.check_membership_url)
547		- if profile.community?
548		- trigger_class = 'community-trigger'
549		- elsif profile.enterprise?
550		- trigger_class = 'enterprise-trigger'
551		- end
552		- end
553		-
554		- extra_info_tag = ''
555		- img_class = 'profile-image'
556		-
557		- if extra_info.is_a? Hash
558		- extra_info_tag = content_tag( 'span', extra_info[:value], :class => 'extra_info '+extra_info[:class])
559		- img_class +=' '+extra_info[:class]
560		- else
561		- extra_info_tag = content_tag( 'span', extra_info, :class => 'extra_info' )
562		- end
563		-
564		- links = links_for_balloon(profile)
565		- content_tag('div', content_tag(tag,
566		- (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ?
567		- popover_menu(_('Profile links'),profile.short_name,links,{:class => trigger_class, :url => url}) : "") +
568		- link_to(
569		- content_tag( 'span', profile_image( profile, size ), :class => img_class ) +
570		- content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
571		- extra_info_tag + profile_sex_icon( profile ),
572		- profile.url,
573		- :class => 'profile_link url',
574		- :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
575		- :title => profile.name ),
576		- :class => 'vcard'), :class => 'common-profile-list-block')
577		- end
578		-
579	362	def popover_menu(title,menu_title,links,html_options={})
580	363	html_options[:class] = "" unless html_options[:class]
581	364	html_options[:class] << " menu-submenu-trigger"
...	...	@@ -584,10 +367,6 @@ module ApplicationHelper
584	367	link_to(content_tag(:span, title), '#', html_options)
585	368	end
586	369
587		- def gravatar_default
588		- (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) \|\| NOOSFERO_CONF['gravatar'] \|\| 'mm'
589		- end
590		-
591	370	attr_reader :environment
592	371
593	372	def select_categories(object_name, title=nil, title_size=4)
...	...	@@ -936,13 +715,6 @@ module ApplicationHelper
936	715	content_for(:head) { stylesheet_link_tag(*args) }
937	716	end
938	717
939		- def article_to_html(article, options = {})
940		- options.merge!(:page => params[:npage])
941		- content = article.to_html(options)
942		- content = content.kind_of?(Proc) ? self.instance_exec(&content).html_safe : content.html_safe
943		- filter_html(content, article)
944		- end
945		-
946	718	# Please, use link_to by default!
947	719	# This method was created to work around to inexplicable
948	720	# chain of problems when display_short_format was called
...	...	@@ -1379,16 +1151,6 @@ module ApplicationHelper
1379	1151	@no_design_blocks = true
1380	1152	end
1381	1153
1382		- def filter_html(html, source)
1383		- if @plugins && source && source.has_macro?
1384		- html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
1385		- #TODO This parse should be done through the macro infra, but since there
1386		- # are old things that do not support it we are keeping this hot spot.
1387		- html = @plugins.pipeline(:parse_content, html, source).first
1388		- end
1389		- html && html.html_safe
1390		- end
1391		-
1392	1154	def convert_macro(html, source)
1393	1155	doc = Nokogiri::HTML.fragment html
1394	1156	#TODO This way is more efficient but do not support macro inside of
...	...
...	...	@@ -195,4 +195,21 @@ module ArticleHelper
195	195	end
196	196	end
197	197
	198	+ def filter_html(html, source)
	199	+ if @plugins && source && source.has_macro?
	200	+ html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
	201	+ #TODO This parse should be done through the macro infra, but since there
	202	+ # are old things that do not support it we are keeping this hot spot.
	203	+ html = @plugins.pipeline(:parse_content, html, source).first
	204	+ end
	205	+ html && html.html_safe
	206	+ end
	207	+
	208	+ def article_to_html(article, options = {})
	209	+ options.merge!(:page => params[:npage])
	210	+ content = article.to_html(options)
	211	+ content = content.kind_of?(Proc) ? self.instance_exec(&content).html_safe : content.html_safe
	212	+ filter_html(content, article)
	213	+ end
	214	+
198	215	end
...	...
...	...	@@ -87,10 +87,38 @@ module BoxesHelper
87	87	box_decorator == DontMoveBlocks
88	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	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	122	unless footer_content.blank?
95	123	footer_content = content_tag('div', footer_content, :class => 'block-footer-content' )
96	124	end
...	...
...	...	@@ -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
...	...