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
...	...	@@ -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
...	...