Merge branch 'master' into serpro_api

Joenio Costa
2 parents 16cfebe1 9e77f7f1
Showing 179 changed files with 1649 additions and 1093 deletions Show diff stats
.travis.yml
CHANGELOG
app/controllers/my_profile/profile_members_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/block_helper.rb
app/helpers/boxes_helper.rb
app/helpers/buttons_helper.rb
app/helpers/forms_helper.rb
app/mailers/mailing.rb
app/mailers/organization_mailing.rb
app/models/article_block.rb
app/models/blog.rb
app/models/blog_archives_block.rb
app/models/categories_block.rb
app/models/communities_block.rb
app/models/disabled_enterprise_message_block.rb
app/models/enterprises_block.rb
@@ -24,6 +24,9 @@ addons:
       - libreadline-dev
       - libsqlite3-dev
       - libxslt1-dev
+  artifacts:
+    paths:
+      - $(ls tmp/artifact* | tr "\n" ":")
 # workaround for https://github.com/travis-ci/travis-ci/issues/4536
 before_install:
@@ -32,7 +35,7 @@ before_install:
 cache: bundler
 before_script:
-  - mkdir -p tmp/{pids,cache} log
+  - mkdir -p tmp/{pids,cache} log cache
   - script/noosfero-plugins disableall
   #- bundle exec rake makemo &>/dev/null
 # database
@@ -0,0 +1,12 @@
+If you made any significant change to the code that you consider worth being
+reminded on the Release Notes, also include a correspondent entry here. If you
+are not sure in which release your code will be released, include it on the
+latest release and leave it to the commiter or RM responsible for it.
+
+v 1.5.0 (unreleased)
+  - Allow groups to disable admin email notificationo
+  - Add option to HighlightsBlock to open link in a new tab
+  - Move blocks html generation from models to helpers
+
+v 1.4.0
+  - Migration from Rails 3 to Rails 4!
@@ -2,8 +2,27 @@ class ProfileMembersController &lt; MyProfileController
   protect 'manage_memberships', :profile
   def index
-    @members = profile.members_by_name
-    @member_role = environment.roles.find_by_name('member')
+    @filters = params[:filters] || {:roles => []}
+    all_roles = Profile::Roles.organization_member_roles(environment.id) | Profile::Roles.organization_custom_roles(environment.id, profile.id)
+    @filters[:roles] = all_roles unless @filters[:roles].present?
+    @data = {}
+    field = 'name'
+    field = 'email' if @filters[:name] =~ /\@/
+
+    @data[:members] = profile.members_by(field,@filters[:name]).by_role(@filters[:roles])
+    session[:members_filtered] = @data[:members].map{|m|m.id} if request.post?
+    @data[:roles] = all_roles
+
+  end
+
+  def send_mail
+    session[:members_filtered] = params[:members_filtered].select{|value| value!="0"}
+    if session[:members_filtered].present?
+      redirect_to :controller => :profile, :action => :send_mail
+    else
+      session[:notice] = _("Select at least one member.")
+      redirect_to :action => :index
+    end
   end
   def update_roles
@@ -156,4 +175,13 @@ class ProfileMembersController &lt; MyProfileController
     end
   end
+  def search_members
+    field = 'name'
+    field = 'email' if params[:filter_name] =~ /\@/
+
+    result = profile.members_like field, params[:filter_name]
+    result = result.select{|member| member.can_view_field?(current_person, "email") } if field=="email"
+    render :json => result.map { |member| {:label => "#{member.name}#{member.can_view_field?(current_person, "email") ? " <#{member.email}>" : ""}", :value => member.name }}
+  end
+
 end
@@ -239,8 +239,12 @@ class ContentViewerController &lt; ApplicationController
   def get_posts(year = nil, month = nil)
     if year && month
-      filter_date = DateTime.parse("#{year}-#{month}-01")
-      return @page.posts.by_range(filter_date..filter_date.at_end_of_month)
+      begin
+        filter_date = DateTime.parse("#{year}-#{month}-01")
+        return @page.posts.by_range(filter_date..filter_date.at_end_of_month)
+      rescue ArgumentError
+        return @page.posts
+      end
     else
       return @page.posts
     end
@@ -370,6 +370,7 @@ class ProfileController &lt; PublicController
   def send_mail
     @mailing = profile.mailings.build(params[:mailing])
+    @mailing.data = session[:members_filtered] ? {:members_filtered => session[:members_filtered]} : {}
     if request.post?
       @mailing.locale = locale
       @mailing.person = user
@@ -48,6 +48,8 @@ module ApplicationHelper
   include PluginsHelper
+  include ButtonsHelper
+
   def locale
     (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   end
@@ -148,14 +150,8 @@ module ApplicationHelper
     link_to text, profile_path(:profile => profile) , options
   end
-  def link_to_homepage(text, profile = nil, options = {})
-    p = if profile
-          Profile[profile]
-        else
-          user
-        end
-
-    link_to text, p.url, options
+  def link_to_homepage(text, profile, options = {})
+    link_to text, profile.url, options
   end
   def link_if_permitted(link, permission = nil, target = nil)
@@ -215,52 +211,6 @@ module ApplicationHelper
     result
   end
-  def button(type, label, url, html_options = {})
-    html_options ||= {}
-    the_class = 'with-text'
-    if html_options.has_key?(:class)
-      the_class << ' ' << html_options[:class]
-    end
-    button_without_text type, label, url, html_options.merge(:class => the_class)
-  end
-
-  def button_without_text(type, label, url, html_options = {})
-    the_class = "button icon-#{type}"
-    if html_options.has_key?(:class)
-      the_class << ' ' << html_options[:class]
-    end
-    the_title = html_options[:title] || label
-    if html_options[:disabled]
-      content_tag('a', '&nbsp;'+content_tag('span', label), html_options.merge(:class => the_class, :title => the_title))
-    else
-      link_to('&nbsp;'+content_tag('span', label), url, html_options.merge(:class => the_class, :title => the_title))
-    end
-  end
-
-  def button_to_function(type, label, js_code, html_options = {}, &block)
-    html_options[:class] = "button with-text" unless html_options[:class]
-    html_options[:class] << " icon-#{type}"
-    link_to_function(label, js_code, html_options, &block)
-  end
-
-  def button_to_function_without_text(type, label, js_code, html_options = {}, &block)
-    html_options[:class] = "" unless html_options[:class]
-    html_options[:class] << " button icon-#{type}"
-    link_to_function(content_tag('span', label), js_code, html_options, &block)
-  end
-
-  def button_to_remote(type, label, options, html_options = {})
-    html_options[:class] = "button with-text" unless html_options[:class]
-    html_options[:class] << " icon-#{type}"
-    link_to_remote(label, options, html_options)
-  end
-
-  def button_to_remote_without_text(type, label, options, html_options = {})
-    html_options[:class] = "" unless html_options[:class]
-    html_options[:class] << " button icon-#{type}"
-    link_to_remote(content_tag('span', label), options, html_options.merge(:title => label))
-  end
-
   def icon(icon_name, html_options = {})
     the_class = "button #{icon_name}"
     if html_options.has_key?(:class)
@@ -940,13 +890,6 @@ module ApplicationHelper
     content_for(:head) { stylesheet_link_tag(*args) }
   end
-  def article_to_html(article, options = {})
-    options.merge!(:page => params[:npage])
-    content = article.to_html(options)
-    content = content.kind_of?(Proc) ? self.instance_exec(&content).html_safe : content.html_safe
-    filter_html(content, article)
-  end
-
   # Please, use link_to by default!
   # This method was created to work around to inexplicable
   # chain of problems when display_short_format was called
@@ -1049,10 +992,11 @@ module ApplicationHelper
   end
   def search_contents_menu
+    host = environment.default_hostname
     links = [
-      {s_('contents|More recent') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_recent'})}},
-      {s_('contents|More viewed') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}},
-      {s_('contents|Most commented') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_comments'})}}
+      {s_('contents|More recent') => {href: url_for({host: host, controller: 'search', action: 'contents', filter: 'more_recent'})}},
+      {s_('contents|More viewed') => {href: url_for({host: host, controller: 'search', action: 'contents', filter: 'more_popular'})}},
+      {s_('contents|Most commented') => {href: url_for({host: host, controller: 'search', action: 'contents', filter: 'more_comments'})}}
     ]
     if logged_in?
       links.push(_('New content') => modal_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
@@ -1064,10 +1008,11 @@ module ApplicationHelper
   alias :browse_contents_menu :search_contents_menu
   def search_people_menu
+    host = environment.default_hostname
      links = [
-       {s_('people|More recent') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_recent'})}},
-       {s_('people|More active') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_active'})}},
-       {s_('people|More popular') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_popular'})}}
+       {s_('people|More recent') => {href: url_for({host: host, controller: 'search', action: 'people', filter: 'more_recent'})}},
+       {s_('people|More active') => {href: url_for({host: host, controller: 'search', action: 'people', filter: 'more_active'})}},
+       {s_('people|More popular') => {href: url_for({host: host, controller: 'search', action: 'people', filter: 'more_popular'})}}
      ]
      if logged_in?
        links.push(_('My friends') => {:href => url_for({:profile => current_user.login, :controller => 'friends'})})
@@ -1080,10 +1025,11 @@ module ApplicationHelper
   alias :browse_people_menu :search_people_menu
   def search_communities_menu
+    host = environment.default_hostname
      links = [
-       {s_('communities|More recent') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_recent'})}},
-       {s_('communities|More active') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_active'})}},
-       {s_('communities|More popular') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_popular'})}}
+       {s_('communities|More recent') => {href: url_for({host: host, controller: 'search', action: 'communities', filter: 'more_recent'})}},
+       {s_('communities|More active') => {href: url_for({host: host, controller: 'search', action: 'communities', filter: 'more_active'})}},
+       {s_('communities|More popular') => {href: url_for({host: host, controller: 'search', action: 'communities', filter: 'more_popular'})}}
      ]
      if logged_in?
        links.push(_('My communities') => {:href => url_for({:profile => current_user.login, :controller => 'memberships'})})
@@ -1368,16 +1314,6 @@ module ApplicationHelper
     @no_design_blocks = true
   end
-  def filter_html(html, source)
-    if @plugins && source && source.has_macro?
-      html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
-      #TODO This parse should be done through the macro infra, but since there
-      #     are old things that do not support it we are keeping this hot spot.
-      html = @plugins.pipeline(:parse_content, html, source).first
-    end
-    html && html.html_safe
-  end
-
   def convert_macro(html, source)
     doc = Nokogiri::HTML.fragment html
     #TODO This way is more efficient but do not support macro inside of
@@ -181,4 +181,21 @@ module ArticleHelper
     end
   end
+  def filter_html(html, source)
+    if @plugins && source && source.has_macro?
+      html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
+      #TODO This parse should be done through the macro infra, but since there
+      #     are old things that do not support it we are keeping this hot spot.
+      html = @plugins.pipeline(:parse_content, html, source).first
+    end
+    html && html.html_safe
+  end
+
+  def article_to_html(article, options = {})
+    options.merge!(:page => params[:npage])
+    content = article.to_html(options)
+    content = content.kind_of?(Proc) ? self.instance_exec(&content).html_safe : content.html_safe
+    filter_html(content, article)
+  end
+
 end
@@ -14,6 +14,7 @@ module BlockHelper
       </td>
       <td>#{text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 20}</td>
       <td>#{text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 1}</td>
+      <td>#{check_box_tag 'block[images][][new_window]', '1', image[:new_window], :class => 'highlight-new_window', :size => 1}</td>
     </tr><tr class=\"image-title\" data-row-number='#{row_number}'>
       <td colspan=\"3\"><label>#{
         content_tag('span', _('Title')) +
@@ -87,10 +87,38 @@ module BoxesHelper
     box_decorator == DontMoveBlocks
   end
-  def display_block_content(block, person, main_content = nil)
-    content = block.main? ? wrap_main_content(main_content) : block.content({:person => person})
+  def render_block block, prefix = nil, klass = block.class
+    template_name = klass.name.underscore.sub '_block', ''
+    begin
+      render template: "blocks/#{prefix}#{template_name}", locals: { block: block }
+    rescue ActionView::MissingTemplate
+      return if klass.superclass === Block
+      render_block block, prefix, klass.superclass
+    end
+  end
+
+  def render_block_content block
+    # FIXME: this conditional should be removed after all
+    # block footer from plugins methods get refactored into helpers and views.
+    # They are a failsafe until all of them are done.
+    return block.content if block.method(:content).owner != Block
+    render_block block
+  end
+
+  def render_block_footer block
+    return block.footer if block.method(:footer).owner != Block
+    render_block block, 'footers/'
+  end
+
+  def display_block_content(block, main_content = nil)
+    content = nil
+    if block.main?
+      content = wrap_main_content(main_content)
+    else
+      content = render_block_content block
+    end
     result = extract_block_content(content)
-    footer_content = extract_block_content(block.footer)
+    footer_content = extract_block_content(render_block_footer block)
     unless footer_content.blank?
       footer_content = content_tag('div', footer_content, :class => 'block-footer-content' )
     end
@@ -0,0 +1,47 @@
+module ButtonsHelper
+  def button(type, label, url, html_options = {})
+    html_options ||= {}
+    the_class = 'with-text'
+    if html_options.has_key?(:class)
+      the_class << ' ' << html_options[:class]
+    end
+    button_without_text type, label, url, html_options.merge(:class => the_class)
+  end
+
+  def button_without_text(type, label, url, html_options = {})
+    the_class = "button icon-#{type}"
+    if html_options.has_key?(:class)
+      the_class << ' ' << html_options[:class]
+    end
+    the_title = html_options[:title] || label
+    if html_options[:disabled]
+      content_tag('a', '&nbsp;'+content_tag('span', label), html_options.merge(:class => the_class, :title => the_title))
+    else
+      link_to('&nbsp;'+content_tag('span', label), url, html_options.merge(:class => the_class, :title => the_title))
+    end
+  end
+
+  def button_to_function(type, label, js_code, html_options = {}, &block)
+    html_options[:class] = "button with-text" unless html_options[:class]
+    html_options[:class] << " icon-#{type}"
+    link_to_function(label, js_code, html_options, &block)
+  end
+
+  def button_to_function_without_text(type, label, js_code, html_options = {}, &block)
+    html_options[:class] = "" unless html_options[:class]
+    html_options[:class] << " button icon-#{type}"
+    link_to_function(content_tag('span', label), js_code, html_options, &block)
+  end
+
+  def button_to_remote(type, label, options, html_options = {})
+    html_options[:class] = "button with-text" unless html_options[:class]
+    html_options[:class] << " icon-#{type}"
+    link_to_remote(label, options, html_options)
+  end
+
+  def button_to_remote_without_text(type, label, options, html_options = {})
+    html_options[:class] = "" unless html_options[:class]
+    html_options[:class] << " button icon-#{type}"
+    link_to_remote(content_tag('span', label), options, html_options.merge(:title => label))
+  end
+end
@@ -7,9 +7,10 @@ module FormsHelper
   def labelled_check_box( human_name, name, value = "1", checked = false, options = {} )
     options[:id] ||= 'checkbox-' + FormsHelper.next_id_number
-    hidden_field_tag(name, '0') +
-      check_box_tag( name, value, checked, options ) +
-      content_tag( 'label', human_name, :for => options[:id] )
+    html = options[:add_hidden] == false ? "" : hidden_field_tag(name, '0')
+
+    html += check_box_tag( name, value, checked, options ) +
+         content_tag( 'label', human_name, :for => options[:id] )
   end
   def labelled_text_field( human_name, name, value=nil, options={} )
@@ -2,7 +2,10 @@ require_dependency &#39;mailing_job&#39;
 class Mailing < ActiveRecord::Base
-  attr_accessible :subject, :body
+  acts_as_having_settings :field => :data
+
+  attr_accessible :subject, :body, :data
+
   validates_presence_of :source_id, :subject, :body
   belongs_to :source, :foreign_key => :source_id, :polymorphic => true
   belongs_to :person
@@ -5,9 +5,17 @@ class OrganizationMailing &lt; Mailing
   end
   def recipients(offset=0, limit=100)
-    source.members.order(:id).offset(offset).limit(limit)
-      .joins("LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)")
+    result = source.members.order(:id).offset(offset).limit(limit)
+
+    if data.present? and data.is_a?(Hash) and data[:members_filtered]
+      result = result.where('profiles.id IN (?)', data[:members_filtered])
+    end
+
+    if result.blank?
+      result = result.joins("LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)")
       .where("m.person_id" => nil)
+    end
+    result
   end
   def each_recipient
@@ -18,18 +18,6 @@ class ArticleBlock &lt; Block
     _('This block displays one of your articles. You can edit the block to select which one of your articles is going to be displayed in the block.')
   end
-  def content(args={})
-    block = self
-    proc do
-      block_title(block.title) +
-      (block.article ? article_to_html(FilePresenter.for(block.article),
-          :gallery_view => false,
-          :inside_block => block,               # For Blogs and folders
-          :format => block.visualization_format # For Articles and contents
-        ).html_safe : _('Article not selected yet.'))
-    end
-  end
-
   def article_id
     self.settings[:article_id]
   end
@@ -93,4 +93,20 @@ class Blog &lt; Folder
     posts.where("type != 'RssFeed'").order(:updated_at).limit(limit)
   end
+  def total_number_of_posts(group_by, year = nil)
+    case group_by
+      when :by_year
+        posts.published.native_translations
+          .except(:order)
+          .count(:all, :group => 'EXTRACT(YEAR FROM published_at)')
+          .sort_by {|year, count| -year.to_i}
+      when :by_month
+        posts.published.native_translations
+          .except(:order)
+          .where('EXTRACT(YEAR FROM published_at)=?', year.to_i)
+          .group('EXTRACT(MONTH FROM published_at)')
+          .count
+          .sort_by {|month, count| -month.to_i}
+    end
+  end
 end
@@ -21,30 +21,6 @@ class BlogArchivesBlock &lt; Block
     blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog
   end
-  def visible_posts(person)
-    #FIXME Performance issues with display_to. Must convert it to a scope.
-    # Checkout this page for further information: http://noosfero.org/Development/ActionItem2705
-    blog.posts.published.native_translations #.select {|post| post.display_to?(person)}
-  end
-
-  def content(args={})
-    owner_blog = self.blog
-    return nil unless owner_blog
-    results = ''
-    posts = visible_posts(args[:person])
-    posts.except(:order).count(:all, :group => 'EXTRACT(YEAR FROM published_at)').sort_by {|year, count| -year.to_i}.each do |year, count|
-      results << content_tag('li', content_tag('strong', "#{year.to_i} (#{count})"))
-      results << "<ul class='#{year.to_i}-archive'>"
-      posts.except(:order).where('EXTRACT(YEAR FROM published_at)=?', year.to_i).group('EXTRACT(MONTH FROM published_at)').count.sort_by {|month, count| -month.to_i}.each do |month, count|
-        results << content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", owner_blog.url.merge(year: year.to_i, month: month.to_i)))
-      end
-      results << "</ul>"
-    end
-    block_title(title) +
-    content_tag('ul', results, :class => 'blog-archives') +
-    content_tag('div', link_to(_('Subscribe RSS Feed'), owner_blog.feed.url), :class => 'subscribe-feed')
-  end
-
   def self.expire_on
       { :profile => [:article], :environment => [:article] }
   end
@@ -30,13 +30,6 @@ class CategoriesBlock &lt; Block
     Category.top_level_for(self.owner).from_types(self.category_types)
   end
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/categories', :locals => { :block => block }
-    end
-  end
-
   def self.expire_on
       { :profile => [], :environment => [:category] }
   end
@@ -27,15 +27,6 @@ class CommunitiesBlock &lt; ProfileListBlock
     owner.profile_suggestions.of_community.enabled.limit(3).includes(:suggestion)
   end
-  def footer
-    owner = self.owner
-    suggestions = self.suggestions
-    return '' unless owner.kind_of?(Profile) || owner.kind_of?(Environment)
-    proc do
-      render :file => 'blocks/communities', :locals => { :owner => owner, :suggestions => suggestions }
-    end
-  end
-
   def profiles
     owner.communities
   end
@@ -12,13 +12,6 @@ class DisabledEnterpriseMessageBlock &lt; Block
     _('Message')
   end
-  def content(args={})
-    message = self.owner.environment.message_for_disabled_enterprise || ''
-    lambda do |_|
-       render :file => 'blocks/disabled_enterprise_message', :locals => {:message => message}
-    end
-  end
-
   def editable?(user=nil)
     false
   end
@@ -12,22 +12,6 @@ class EnterprisesBlock &lt; ProfileListBlock
     _('Enterprises')
   end
-  def footer
-    owner = self.owner
-    case owner
-    when Profile
-      proc do
-        link_to s_('enterprises|View all'), :profile => owner.identifier, :controller => 'profile', :action => 'enterprises'
-      end
-    when Environment
-      proc do
-        link_to s_('enterprises|View all'), :controller => 'search', :action => 'assets', :asset => 'enterprises'
-      end
-    else
-      ''
-    end
-  end
-
   def profiles
     owner.enterprises
   end
@@ -12,14 +12,6 @@ class FansBlock &lt; ProfileListBlock
     _('This block presents the fans of an enterprise.')
   end
-  def footer
-    profile = self.owner
-    proc do
-      link_to _('View all'), :profile => profile.identifier, :controller =>
-      'profile', :action => 'fans'
-    end
-  end
-
   def profiles
     owner.fans
   end
@@ -12,14 +12,6 @@ class FavoriteEnterprisesBlock &lt; ProfileListBlock
     _('Favorite Enterprises')
   end
-  def footer
-    owner = self.owner
-    return '' unless owner.kind_of?(Person)
-    proc do
-      link_to _('enterprises|View all'), {:profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'}, :class => 'view-all'
-    end
-  end
-
   def profiles
     owner.favorite_enterprises
   end
@@ -32,11 +32,4 @@ class FeaturedProductsBlock &lt; Block
     self.owner.highlighted_products_with_image
   end
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/featured_products', :locals => { :block => block }
-    end
-  end
-
 end
@@ -52,24 +52,6 @@ class FeedReaderBlock &lt; Block
     self.feed_title.nil? ? _('Feed Reader') : self.feed_title
   end
-  def formatted_feed_content
-    if error_message.blank?
-      "<ul>\n".html_safe +
-      self.feed_items[0..(limit-1)].map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n").html_safe +
-      "</ul>".html_safe
-    else
-      "<p>#{error_message}</p>".html_safe
-    end
-  end
-
-  def footer
-    if self.fetched_at.nil? or self.feed_items.empty?
-      _('Feed content was not loaded yet')
-    else
-      _("Updated: %s") % show_date(self.fetched_at)
-    end
-  end
-
   def add_item(title, link, date, content)
     self.feed_items.unshift( {:title => title, :link => link})
   end
@@ -85,8 +67,4 @@ class FeedReaderBlock &lt; Block
     self.save!
   end
-  def content(args={})
-    block_title(title) + formatted_feed_content
-  end
-
 end
@@ -15,6 +15,8 @@ class HighlightsBlock &lt; Block
       if !Noosfero.root.nil? and !i[:address].start_with?(Noosfero.root + '/')
         i[:address] = Noosfero.root + i[:address]
       end
+      i[:new_window] = i[:new_window] == '1' ? true : false
+
       begin
         file = UploadedFile.find(i[:image_id])
         i[:image_src] = file.public_filename
@@ -41,13 +43,6 @@ class HighlightsBlock &lt; Block
     end
   end
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/highlights', :locals => { :block => block }
-    end
-  end
-
   def folder_choices
     owner.image_galleries
   end
@@ -59,20 +59,6 @@ class LinkListBlock &lt; Block
     _('Link list')
   end
-  def content(args={})
-    block_title(title) +
-    content_tag('ul',
-      links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_html(i))}.join
-    )
-  end
-
-  def link_html(link)
-    klass = 'icon-' + link[:icon] if link[:icon]
-    sanitize_link(
-      link_to(link[:name], expand_address(link[:address]), :target => link[:target], :class => klass, :title => link[:title])
-    )
-  end
-
   def expand_address(address)
     add = if owner.respond_to?(:identifier)
       address.gsub('{profile}', owner.identifier)
@@ -99,8 +85,6 @@ class LinkListBlock &lt; Block
     end
   end
-  private
-
   def sanitize_link(text)
     sanitizer = HTML::WhiteListSanitizer.new
     sanitizer.sanitize(text)
@@ -13,12 +13,4 @@ class LocationBlock &lt; Block
     _('Shows where the profile is on the material world.')
   end
-  def content(args={})
-    block = self
-    profile = self.owner
-    proc do
-      render :file => 'blocks/location', :locals => {:block => block, :profile => profile}
-    end
-  end
-
 end
@@ -8,12 +8,6 @@ class LoginBlock &lt; Block
     _('This block presents a login/logout block.')
   end
-  def content(args={})
-    lambda do |context|
-      render :file => 'blocks/login_block'
-    end
-  end
-
   def cacheable?
     false
   end
@@ -8,10 +8,6 @@ class MainBlock &lt; Block
     _('This block presents the main content of your pages.')
   end
-  def content(args={})
-    nil
-  end
-
   def main?
     true
   end
@@ -14,16 +14,6 @@ class MyNetworkBlock &lt; Block
     _('This block displays some info about your networking.')
   end
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/my_network', :locals => {
-        :title => block.title,
-        :owner => block.owner
-      }
-    end
-  end
-
   def cacheable?
     false
   end
@@ -16,10 +16,13 @@ class Person &lt; Profile
   acts_as_trackable :after_add => Proc.new {|p,t| notify_activity(t)}
   acts_as_accessor
-  scope :members_of, -> resources {
+  scope :members_of, lambda { |resources, field = ''|
     resources = Array(resources)
+    joins = [:role_assignments]
+    joins << :user if User.attribute_names.include? field
+
     conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
-    distinct.select('profiles.*').joins(:role_assignments).where([conditions])
+    distinct.select('profiles.*').joins(joins).where([conditions])
   }
   scope :not_members_of, -> resources {
@@ -48,8 +51,7 @@ class Person &lt; Profile
       ['( roles.key = ? AND role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? ) OR (
         ( ( friendships.person_id = ? ) OR (profiles.public_profile = ?)) AND (profiles.visible = ?) )', 'environment_administrator', Profile.name, person.id, person.id,  true, true]
     ).uniq
-  }
-
+    }
   def has_permission_with_admin?(permission, resource)
     return true if resource.blank? || resource.admins.include?(self)
@@ -13,26 +13,6 @@ class ProductCategoriesBlock &lt; Block
     _('Helps to filter the products catalog.')
   end
-  def content(args={})
-    profile = owner
-    proc do
-      if @categories.nil? or @categories.length == 0
-        categories = ProductCategory.on_level(nil).order(:name)
-        if @categories and @categories.length == 0
-          notice = _('There are no sub-categories for %s') % @category.name
-        end
-      else
-        categories = @categories
-      end
-      render :file => 'blocks/product_categories',
-             :locals => {
-               :profile => profile,
-               :categories => categories,
-               :notice => notice
-             }
-    end
-  end
-
   DISPLAY_OPTIONS = DISPLAY_OPTIONS.merge('catalog_only' => _('Only on the catalog'))
   def display
@@ -19,26 +19,6 @@ class ProductsBlock &lt; Block
     _('This block presents a list of your products.')
   end
-  def content(args={})
-    block_title(title) +
-    content_tag(
-      'ul',
-      products.map {|product|
-        content_tag('li',
-          link_to( product.name,
-                   product.url,
-                   :style => 'background-image:url(%s)' % product.default_image('minor')
-                 ),
-          :class => 'product'
-        )
-      }.join
-    )
-  end
-
-  def footer
-    link_to(_('View all products'), owner.public_profile_url.merge(:controller => 'catalog', :action => 'index'))
-  end
-
   settings_items :product_ids, type: Array
   def product_ids=(array)
     self.settings[:product_ids] = array
@@ -5,7 +5,7 @@ class Profile &lt; ActiveRecord::Base
   attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time,
     :redirection_after_login, :custom_url_redirection,
-    :email_suggestions, :allow_members_to_invite, :invite_friends_only, :secret
+    :email_suggestions, :allow_members_to_invite, :invite_friends_only, :secret, :profile_admin_mail_notification
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
@@ -49,6 +49,9 @@ class Profile &lt; ActiveRecord::Base
     def self.organization_member_roles(env_id)
       all_roles(env_id).select{ |r| r.key.match(/^profile_/) unless r.key.blank? || !r.profile_id.nil?}
     end
+    def self.organization_custom_roles(env_id, profile_id)
+      all_roles(env_id).where('profile_id = ?', profile_id)
+    end
     def self.all_roles(env_id)
       Role.where(environment_id: env_id)
     end
@@ -155,15 +158,23 @@ class Profile &lt; ActiveRecord::Base
   include TimeScopes
-  def members
+  def members(by_field = '')
     scopes = plugins.dispatch_scopes(:organization_members, self)
-    scopes << Person.members_of(self)
+    scopes << Person.members_of(self,by_field)
     return scopes.first if scopes.size == 1
     ScopeTool.union *scopes
   end
-  def members_by_name
-    members.order('profiles.name')
+  def members_by(field,value = nil)
+    if value and !value.blank?
+      members_like(field,value).order('profiles.name')
+    else
+      members.order('profiles.name')
+    end
+  end
+
+  def members_like(field,value)
+    members(field).where("LOWER(#{field}) LIKE ?", "%#{value.downcase}%") if value
   end
   class << self
@@ -234,6 +245,7 @@ class Profile &lt; ActiveRecord::Base
   settings_items :description
   settings_items :fields_privacy, :type => :hash, :default => {}
   settings_items :email_suggestions, :type => :boolean, :default => false
+  settings_items :profile_admin_mail_notification, :type => :boolean, :default => true
   validates_length_of :description, :maximum => 550, :allow_nil => true
@@ -1102,6 +1114,10 @@ private :generate_url, :url_options
     end
   end
+  def can_view_field? current_person, field
+    display_private_info_to?(current_person) || (public_fields.include?(field) && public?)
+  end
+
   validates_inclusion_of :redirection_after_login, :in => Environment.login_redirection_options.keys, :allow_nil => true
   def preferred_login_redirection
     redirection_after_login.blank? ? environment.redirection_after_login : redirection_after_login
@@ -12,17 +12,6 @@ class ProfileImageBlock &lt; Block
     _('This block presents the profile image')
   end
-  def content(args={})
-    block = self
-    s = show_name
-    lambda do |object|
-      render(
-        :file => 'blocks/profile_image',
-        :locals => { :block => block, :show_name => s }
-      )
-    end
-  end
-
   def cacheable?
     false
   end
@@ -16,13 +16,6 @@ class ProfileInfoBlock &lt; Block
     _('Basic information about <i>%{user}</i>: how long <i>%{user}</i> is part of <i>%{env}</i> and useful links.') % { :user => self.owner.name(), :env => self.owner.environment.name() }
   end
-  def content(args={})
-    block = self
-    lambda do |_|
-      render :file => 'blocks/profile_info', :locals => { :block => block }
-    end
-  end
-
   def cacheable?
     false
   end
@@ -40,26 +40,6 @@ result = public_profiles.all(:limit =&gt; get_limit, :order =&gt; &#39;profiles.updated_at
     _('Clicking on the people or groups will take you to their home page.')
   end
-  def content(args={})
-    profiles = self.profile_list
-    title = self.view_title
-    nl = "\n"
-    proc do |context|
-      count=0
-      list = profiles.map {|item|
-               count+=1
-               send(:profile_image_link, item, :minor )
-             }.join("\n  ")
-      if list.empty?
-        list = content_tag 'div', _('None'), :class => 'common-profile-list-block-none'
-      else
-        list = content_tag 'ul', nl +'  '+ list + nl
-      end
-      block_title(title) + nl +
-      content_tag('div', nl + list + nl + tag('br', :style => 'clear:both'))
-    end
-  end
-
   def view_title
     title.gsub('{#}', profile_count.to_s)
   end
@@ -4,11 +4,4 @@ class ProfileSearchBlock &lt; Block
     _('Display a form to search the profile')
   end
-  def content(args={})
-    title = self.title
-    lambda do |_|
-      render :file => 'blocks/profile_search', :locals => { :title => title }
-    end
-  end
-
 end
@@ -12,10 +12,6 @@ class RawHTMLBlock &lt; Block
   attr_accessible :html
-  def content(args={})
-    (title.blank? ? '' : block_title(title)).html_safe + html.to_s.html_safe
-  end
-
   def has_macro?
     true
   end
@@ -22,24 +22,6 @@ class RecentDocumentsBlock &lt; Block
   settings_items :limit, :type => :integer, :default => 5
-  def content(args={})
-    docs = self.docs
-    title = self.title
-    proc do
-      block_title(title) +
-        content_tag('ul', docs.map {|item| content_tag('li', link_to(h(item.title), item.url))}.join("\n"))
-    end
-  end
-
-  def footer
-    return nil unless self.owner.is_a?(Profile)
-
-    profile = self.owner
-    proc do
-      link_to _('All content'), :profile => profile.identifier, :controller => 'profile', :action => 'sitemap'
-    end
-  end
-
   def docs
     self.limit.nil? ? owner.recent_documents(nil, {}, false) : owner.recent_documents(self.get_limit, {}, false)
   end
@@ -22,10 +22,4 @@ class SellersSearchBlock &lt; Block
     _('This block presents a search engine for products.')
   end
-  def content(args={})
-    title = self.title
-    lambda do |object|
-      render :file => 'search/_sellers_form', :locals => { :title => title }
-    end
-  end
 end
@@ -33,23 +33,6 @@ class SlideshowBlock &lt; Block
     gallery.images.reject {|item| item.folder?}
   end
-  def content(args={})
-    block = self
-    if gallery
-      images = block_images
-      if shuffle
-        images = images.shuffle
-      end
-      proc do
-        render :file => 'blocks/slideshow', :locals => { :block => block, :images => images }
-      end
-    else
-      proc do
-        render :file => 'blocks/slideshow', :locals => { :block => block, :images => nil }
-      end
-    end
-  end
-
   def folder_choices
     owner.image_galleries
   end
@@ -28,42 +28,6 @@ class TagsBlock &lt; Block
        Try to add some tags to some articles and you'l see your tag cloud growing.")
   end
-  def content(args={})
-    is_env = owner.class == Environment
-    tags = is_env ? owner.tag_counts : owner.article_tags
-    return '' if tags.empty?
-
-    if limit
-      tags_tmp = tags.sort_by{ |k,v| -v }[0..(limit-1)]
-      tags = {}
-      tags_tmp.map{ |k,v| tags[k] = v }
-    end
-
-    url = is_env ? {:host=>owner.default_hostname, :controller=>'search', :action => 'tag'} :
-          owner.public_profile_url.merge(:controller => 'profile', :action => 'content_tagged')
-    tagname_option = is_env ? :tag : :id
-
-    block_title(title) +
-    "\n<div class='tag_cloud'>\n".html_safe+
-    tag_cloud( tags, tagname_option, url, :max_size => 16, :min_size => 9 ) +
-    "\n</div><!-- end class='tag_cloud' -->\n".html_safe
-  end
-
-  def footer
-    if owner.class == Environment
-      proc do
-        link_to s_('tags|View all'),
-          :controller => 'search', :action => 'tags'
-      end
-    else
-      owner_id = owner.identifier
-      proc do
-        link_to s_('tags|View all'),
-          :profile => owner_id, :controller => 'profile', :action => 'tags'
-      end
-    end
-  end
-
   def timeout
     15.minutes
   end
@@ -67,7 +67,9 @@ class Task &lt; ActiveRecord::Base
       begin
         target_msg = task.target_notification_message
         if target_msg && task.target && !task.target.notification_emails.empty?
-          TaskMailer.target_notification(task, target_msg).deliver
+          if target_profile_accepts_notification?(task)
+            TaskMailer.target_notification(task, target_msg).deliver
+          end
         end
       rescue NotImplementedError => ex
         Rails.logger.info ex.to_s
@@ -75,6 +77,14 @@ class Task &lt; ActiveRecord::Base
     end
   end
+  def target_profile_accepts_notification?(task)
+    if task.target.kind_of? Organization
+      return task.target.profile_admin_mail_notification
+    else
+      true
+    end
+  end
+
   # this method finished the task. It calls #perform, which must be overriden
   # by subclasses. At the end a message (as returned by #finish_message) is
   # sent to the requestor with #notify_requestor.
@@ -11,7 +11,7 @@
 </p>
 <p>
-<%= link_to_homepage(_('My home page.')) %>
+<%= link_to_homepage(_('My home page.'), user) %>
 <%= _('See your homepage.') %>
 </p>
@@ -0,0 +1,12 @@
+<%= block_title(block.title) %>
+<% if block.article %>
+  <%=
+    h(article_to_html(FilePresenter.for(block.article),
+        :gallery_view => false,
+        :inside_block => block,               # For Blogs and folders
+        :format => block.visualization_format # For Articles and contents
+    ))
+  %>
+<% else %>
+  <%= _('Article not selected yet.') %>
+<% end %>
@@ -0,0 +1,16 @@
+<% if block.blog %>
+  <%= block_title(block.title) %>
+
+  <ul class='blog-archives'>
+    <% block.blog.total_number_of_posts(:by_year).each do |year, count| %>
+      <%= content_tag('li', content_tag('strong', "#{year.to_i} (#{count})")) %>
+      <ul class='<%= year.to_i %>-archive'>
+        <% block.blog.total_number_of_posts(:by_month, year).each do |month, count| %>
+          <%= content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", block.blog.url.merge(year: year.to_i, month: month.to_i))) %>
+        <% end %>
+      </ul>
+    <% end %>
+  </ul>
+
+  <%= content_tag('div', link_to(_('Subscribe RSS Feed'), block.blog.feed.url), :class => 'subscribe-feed') %>
+<% end %>
@@ -1,17 +0,0 @@
-<% if owner.kind_of?(Profile) %>
-  <%= link_to s_('communities|View all'), {:profile => owner.identifier, :controller => 'profile', :action => 'communities'}, :class => 'view-all' %>
-<% elsif owner.kind_of?(Environment) %>
-  <%= link_to s_('communities|View all'), {:controller => 'search', :action => 'communities'}, :class => 'view-all' %>
-<% end %>
-
-<% if user && user == profile && suggestions && !suggestions.empty? %>
-  <div class='suggestions-block common-profile-list-block'>
-    <h4 class='block-subtitle'><%= _('Some suggestions for you') %></h4>
-    <div class='profiles-suggestions'>
-      <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => suggestions, :collection => :communities_suggestions, :per_page => 3 } %>
-    </div>
-    <div class='more-suggestions'>
-      <%= link_to _('See all suggestions'), profile.communities_suggestions_url %>
-    </div>
-  </div>
-<% end %>
@@ -0,0 +1 @@
+profile_list.html.erb
 \ No newline at end of file
+<% message = block.owner.environment.message_for_disabled_enterprise || '' %>
+
 <div id='enterprise-disabled'>
   <%= message %>
   <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
@@ -0,0 +1 @@
+profile_list.html.erb
 \ No newline at end of file
@@ -0,0 +1 @@
+profile_list.html.erb
 \ No newline at end of file
@@ -0,0 +1 @@
+profile_list.html.erb
 \ No newline at end of file
@@ -0,0 +1,11 @@
+<%= block_title(block.title) %>
+
+<%=
+    if block.error_message.blank?
+      "<ul>\n".html_safe +
+      block.feed_items[0..(block.limit-1)].map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n").html_safe +
+      "</ul>".html_safe
+    else
+      "<p>#{block.error_message}</p>".html_safe
+    end
+%>
@@ -0,0 +1,19 @@
+<% if block.owner.kind_of?(Profile) || block.owner.kind_of?(Environment) %>
+  <% if block.owner.kind_of?(Profile) %>
+    <%= link_to s_('communities|View all'), {:profile => block.owner.identifier, :controller => 'profile', :action => 'communities'}, :class => 'view-all' %>
+  <% elsif block.owner.kind_of?(Environment) %>
+    <%= link_to s_('communities|View all'), {:controller => 'search', :action => 'communities'}, :class => 'view-all' %>
+  <% end %>
+
+  <% if user && user == profile && block.suggestions && !block.suggestions.empty? %>
+    <div class='suggestions-block common-profile-list-block'>
+      <h4 class='block-subtitle'><%= _('Some suggestions for you') %></h4>
+      <div class='profiles-suggestions'>
+        <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => block.suggestions, :collection => :communities_suggestions, :per_page => 3 } %>
+      </div>
+      <div class='more-suggestions'>
+        <%= link_to _('See all suggestions'), profile.communities_suggestions_url %>
+      </div>
+    </div>
+  <% end %>
+<% end %>
@@ -0,0 +1,5 @@
+<% if block.owner.is_a?(Profile) %>
+  <%= link_to s_('enterprises|View all'), :profile => block.owner.identifier, :controller => 'profile', :action => 'enterprises' %>
+<% elsif block.owner.is_a?(Environment) %>
+  <%= link_to s_('enterprises|View all'), :controller => 'search', :action => 'assets', :asset => 'enterprises' %>
+<% end %>
@@ -0,0 +1 @@
+<%= link_to _('View all'), :profile => block.owner.identifier, :controller => 'profile', :action => 'fans' %>
@@ -0,0 +1,3 @@
+<% if block.owner.is_a?(Person) %>
+  <%= link_to _('enterprises|View all'), {:profile => block.owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'}, :class => 'view-all' %>
+<% end %>
@@ -0,0 +1,5 @@
+<% if block.fetched_at.nil? or block.feed_items.empty? %>
+  <%= _('Feed content was not loaded yet') %>
+<% else %>
+  <%= _("Updated: %s") % show_date(block.fetched_at) %>
+<% end %>
@@ -0,0 +1 @@
+<%= link_to(_('View all products'), block.owner.public_profile_url.merge(:controller => 'catalog', :action => 'index')) %>
@@ -0,0 +1,3 @@
+<% if block.owner.is_a?(Profile) %>
+  <%= link_to _('All content'), :profile => block.owner.identifier, :controller => 'profile', :action => 'sitemap' %>
+<% end %>
@@ -0,0 +1,5 @@
+<% if block.owner.is_a?(Environment) %>
+  <%= link_to s_('tags|View all'), :controller => 'search', :action => 'tags' %>
+<% else %>
+  <%= link_to s_('tags|View all'), :profile => block.owner.identifier, :controller => 'profile', :action => 'tags' %>
+<% end %>
@@ -3,7 +3,7 @@
   <div class='highlights-border'>
     <div class='highlights-container'>
       <% block.featured_images.each do |img| %>
-        <a href="<%= img[:address] %>" title="<%= img[:title] %>" class="highlights-image-link">
+        <a href="<%= img[:address] %>" <%= 'target="_blank"' if img[:new_window] %> title="<%= img[:title] %>" class="highlights-image-link">
           <%= image_tag [Noosfero.root, img[:image_src]].join, alt: img[:title] %>
           <p class="highlights-label"><%= img[:title] %></p>
         </a>
@@ -0,0 +1,14 @@
+<%= block_title(block.title) %>
+
+<%= block.links.empty? && block.title.empty? ? content_tag('em', _('Please, edit this block to add links')) : '' %>
+
+<ul>
+  <% block.links.select{|i| !i[:name].blank? and !i[:address].blank?}.each do |link| %>
+    <li>
+      <%= block.sanitize_link(link_to(link[:name], block.expand_address(link[:address]),
+                :target => link[:target],
+                :class => (link[:icon] ? "icon-#{link[:icon]}" : ''),
+                :title => link[:title])) %>
+    </li>
+  <% end %>
+</ul>
-<% if profile.lat %>
+<% if block.owner.lat %>
   <%= block_title block.title %>
   <div class='the-localization-map'>
-    <img src="https://maps.google.com/maps/api/staticmap?center=<%=profile.lat%>,<%=profile.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=profile.lat%>,<%=profile.lng%>&sensor=false"/>
+    <img src="https://maps.google.com/maps/api/staticmap?center=<%=block.owner.lat%>,<%=block.owner.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=block.owner.lat%>,<%=block.owner.lng%>&sensor=false"/>
   </div>
 <% else %>
   <i><%= _('This profile has no geographical position registered.') %></i>
@@ -0,0 +1,16 @@
+<% if user.present? %>
+  <div class="logged-user-info">
+    <h2><%= _('Logged in as %s') % user.identifier %></h2>
+    <ul>
+      <li><%= _('User since %s/%s') % [user.created_at.month, user.created_at.year] %></li>
+      <li><%= link_to _('Homepage'), user.public_profile_url %></li>
+    </ul>
+    <div class="user-actions">
+      <%= button(:'menu-logout',  _('Logout'), :controller => 'account', :action => 'logout') %>
+    </div>
+  </div>
+<% else %>
+  <div class='not-logged-user'>
+    <%= render :file => 'account/login_block' %>
+  </div>
+<% end%>
@@ -1,16 +0,0 @@
-<% if user.present? %>
-  <div class="logged-user-info">
-    <h2><%= _('Logged in as %s') % user.identifier %></h2>
-    <ul>
-      <li><%= _('User since %s/%s') % [user.created_at.month, user.created_at.year] %></li>
-      <li><%= link_to _('Homepage'), user.public_profile_url %></li>
-    </ul>
-    <div class="user-actions">
-      <%= button(:'menu-logout',  _('Logout'), :controller => 'account', :action => 'logout') %>
-    </div>
-  </div>
-<% else %>
-  <div class='not-logged-user'>
-    <%= render :file => 'account/login_block' %>
-  </div>
-<% end%>
-<%= block_title(title) %>
+<%= block_title(block.title) %>
 <ul>
-  <li><%= link_to(_('Homepage'), owner.url, :class => 'url') %></li>
-  <li><%= link_to(_('View profile'), owner.public_profile_url) %></li>
-  <% if !user.nil? and owner.organization? and user.has_permission?('edit_profile', profile) %>
+  <li><%= link_to(_('Homepage'), block.owner.url, :class => 'url') %></li>
+  <li><%= link_to(_('View profile'), block.owner.public_profile_url) %></li>
+  <% if !user.nil? and block.owner.organization? and user.has_permission?('edit_profile', profile) %>
     <li><%= link_to _('Control panel'), :controller => 'profile_editor', :profile => profile.identifier %></li>
   <% end %>
 </ul>
 <div class="my-network-actions">
-  <%= render_profile_actions owner.class %>
+  <%= render_profile_actions block.owner.class %>
 </div>
-<%= link_to _('Catalog start'), profile.catalog_url, :class=>'catalog-home-link' %>
+<%
+  if @categories.nil? or @categories.length == 0
+    categories = ProductCategory.on_level(nil).order(:name)
+  else
+    categories = @categories
+  end
+%>
+
+<%= link_to _('Catalog start'), block.owner.catalog_url, :class=>'catalog-home-link' %>
 <ul class="catalog-categories-list">
   <% categories.each do |category| %>
     <%= category_with_sub_list(category) %>
   <% end %>
 </ul>
-<% if notice %>
-  <div class="catalog-categories-notice"><%= notice %></div>
+<% if @categories and @categories.length == 0 %>
+  <div class="catalog-categories-notice">
+    <%= _('There are no sub-categories for %s') % @category.name %>
+  </div>
 <% end %>
@@ -0,0 +1,9 @@
+<%= block_title(block.title) %>
+
+<ul>
+  <% block.products.each do |product| %>
+    <li class='product'>
+      <%= link_to(product.name, product.url, :style => 'background-image:url(%s)' % product.default_image('minor')) %>
+    </li>
+  <% end %>
+</ul>
@@ -12,7 +12,7 @@
   </div>
 </div>
-<% if show_name %>
+<% if block.show_name %>
   <p><%= h block.owner.short_name %></p>
 <% end %>
@@ -0,0 +1,17 @@
+<%= block_title(block.view_title) %>
+
+<%
+  list = block.profile_list.map do |item|
+    profile_image_link(item, :minor)
+  end.join("\n ")
+%>
+
+<div>
+  <% if list.empty? %>
+    <div class='common-profile-list-block-none'><%= _('None') %></div>
+  <% else %>
+    <ul><%= list %></ul>
+  <% end %>
+</div>
+ 
+<br style='clear:both'/>
-<%= block_title(title) %>
+<%= block_title(block.title) %>
 <%= render :partial => 'shared/profile_search_form' %>
@@ -0,0 +1,3 @@
+<%=h block_title(block.title) %>
+
+<%=h block.html %>
@@ -0,0 +1,7 @@
+<%= block_title(block.title) %>
+
+<ul>
+  <% block.docs.map do |item| %>
+    <%= content_tag('li', link_to(h(item.title), item.url)) %>
+  <% end %>
+</ul>
@@ -0,0 +1,24 @@
+<h3><%= block.title %></h3>
+
+<%= form_tag({:controller => 'search', :action => 'assets'}, {:method => 'get'}) do %>
+
+  <div class="search-in-opt"><%= _('Search in:') %>
+    <dir>
+      <%= labelled_radio_button _('Enterprises'), 'asset', 'enterprises', true %><br />
+      <%= labelled_radio_button _('Products'), 'asset', 'products', false %>
+    </dir>
+  </div>
+
+  <div class="formfield search-from-opt">
+    <%= select_city(true) %>
+  </div>
+
+  <div class="formfield search-distance-opt">
+    <%= labelled_select(_('Distance:'), 'radius', :first, :last, nil, [15, 30, 50, 100, 150, 200, 300, 400, 500, 1000].map{|n|[n, n.to_s + 'km']}) %>
+  </div>
+
+  <div class="button-bar">
+    <%= submit_button :search, _('Search') %>
+  </div>
+
+<% end %>
+<%
+  if block.gallery
+    images = block.block_images
+    if block.shuffle
+      images = images.shuffle
+    end
+  end
+%>
+
 <%= block_title(block.title) %>
+
 <% if images %>
   <% description = images.any? { |img| !img.abstract.blank? } %>
   <div class='slideshow-border<%= (description ? ' with-descriptions' : '')%>'>
@@ -0,0 +1,25 @@
+<%= block_title(block.title) %>
+
+<%
+  is_env = block.owner.class == Environment
+  tags = is_env ? block.owner.tag_counts : block.owner.article_tags
+  if block.limit
+    tags_tmp = tags.sort_by{ |k,v| -v }[0..(block.limit-1)]
+    tags = {}
+    tags_tmp.map{ |k,v| tags[k] = v }
+  end
+%>
+
+<% unless tags.empty? %>
+  <div class='tag_cloud'>
+    <% if is_env %>
+      <%= tag_cloud(tags, :tag,
+                    {:host => block.owner.default_hostname, :controller=>'search', :action => 'tag'},
+                    :max_size => 16, :min_size => 9) %>
+    <% else %>
+      <%= tag_cloud(tags, :id,
+                    block.owner.public_profile_url.merge(:controller => 'profile', :action => 'content_tagged'),
+                    :max_size => 16, :min_size => 9) %>
+  <% end %>
+  </div>
+<% end %>
@@ -3,7 +3,7 @@
 <strong><%= _('Highlights') %></strong>
 <table class="noborder"><tbody id="highlights-data-table">
-  <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th></tr>
+  <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th><th><%= _('New Window') %></th></tr>
   <% @block.images.each_with_index do |image, index| %>
     <%= highlights_block_config_image_fields @block, image, index %>
   <% end %>
 <p>
 <em>
-  <%= _('Drag images to add them to the text.') %>
-  <%= _('Click on file names to add links to the text.') %>
+  <%= _('Drag images to add them to the text or click on file names to add links to the text.') %>
 </em>
 </p>
@@ -17,8 +17,8 @@
                 :parent_id, profile, default_folder, {}, {},
                 "type='Folder' or type='Gallery'"
           ) %>
+          <%= button(:newfolder, _('New folder'), '#', :id => 'new-folder-button') %>
         </div>
-        <%= button(:newfolder, _('New folder'), '#', :id => 'new-folder-button') %>
         <p><%= file_field_tag('file', :multiple => true) %></p>
       <% end %>
     </div>
@@ -31,7 +31,7 @@
   <div id='published-media' class='text-editor-sidebar-box' data-url='<%= url_for({:controller => 'cms', :action => 'published_media_items', :profile => profile.identifier}) %>'>
     <%= select_profile_folder(nil, :parent_id, profile, 'recent-media', {}, {},
         "type='Folder' or type='Gallery'", {:root_label => _('Recent media')}) %>
-    <%= labelled_form_field _('Search'), text_field_tag('q') %>
+    <%= labelled_form_field _('Search among your uploaded files'), text_field_tag('q', '', placeholder: _('Write words about the file you are looking for')) %>
     <%= render :partial => 'drag_and_drop_note' %>
     <div class='items'>
       <%= render :partial => 'published_media_items' %>
@@ -4,6 +4,9 @@
 <%= error_messages_for :mailing %>
+  <% to = @mailing.data[:members_filtered].present? ? @mailing.recipients.map{|r| r.name}.join(', ') : _('All members')%>
+  <%= labelled_form_field(_('To:'), text_area(:data, 'members_filtered', :value => to, :rows => 4, :disabled => 'disabled', :class => 'send-mail-recipients'))  %>
+
 <%= form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
 <h2><%= _('Moderation options') %></h2>
 <% if profile.community? %>
   <div style='margin-bottom: 1em'>
+    <h4><%= _('Email Configuration:')%></h4>
+  </div>
+  <div style='margin-bottom: 0.5em'>
+    <%= check_box(:profile_data, :profile_admin_mail_notification, :style => 'float: left') %>
+    <div style='margin-left: 30px'>
+      <%= _('Send administrator Email for every task') %>
+    </div>
+  </div>
+
+  <div style='margin-bottom: 1em'>
     <h4><%= _('Invitation moderation:')%></h4>
   </div>
   <div style='margin-bottom: 0.5em'>
@@ -5,7 +5,7 @@
     <%= button :person, _('Invite people to join'), :controller => 'invite', :action => 'invite_friends' %>
   <% end %>
   <% if profile.community? and user.has_permission?(:send_mail_to_members, profile) %>
-    <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
+    <%= submit_button(:send, _('Send e-mail to members')) %>
   <% end %>
   <% @plugins.dispatch(:manage_members_extra_buttons).each do |plugin_button| %>
     <%= button plugin_button[:icon], plugin_button[:title], plugin_button[:url] %>
@@ -0,0 +1,18 @@
+<%= form_tag '#', :method => 'post' do %>
+
+    <%= field_set_tag _('Filter'), :class => 'filter_fields' do %>
+        <p>
+          <%= labelled_text_field(_('Name or Email')+': ', "filters[name]", @filters[:name], {:id => 'filter-name-autocomplete',:size => 30}) %>
+        </p>
+
+        <p><%= _('Roles:') %> </p>
+        <% @data[:roles].each do |r| %>
+          <%= labelled_check_box(r.name, 'filters[roles][]', r.id, @filters[:roles].include?(r.id.to_s), :add_hidden => false) %><br/>
+        <% end %>
+        <p>
+          <%= submit_button(:search, _('Search')) %>
+        </p>
+    <% end %>
+<% end %>
+
+<%= javascript_include_tag params[:controller] %>
 \ No newline at end of file
-<% collection = @collection == :profile_admins ? profile.admins : profile.members_by_name %>
+<% members = @data ? @data[:members] : profile.members_by('name') %>
+<% collection = @collection == :profile_admins ? profile.admins : members %>
 <% title = @title ? @title : _('Current members') %>
 <% remove_action = @remove_action ? @remove_action : {:action => 'unassociate'} %>
+<%= javascript_include_tag params[:controller] %>
 <h3><%= title %></h3>
 <table>
+  <col width="1">
   <tr>
+    <th><%= check_box_tag 'checkbox-all', 1, false, :onClick => "toggle(this)"  %></th>
     <th><%= _('Member') %></th>
     <th><%= _('Actions') %></th>
   </tr>
+
   <% collection.each do |m| %>
     <tr title="<%= m.name %>">
+      <td><%= labelled_check_box('', 'members_filtered[]', m.id.to_s, false, :id => 'checkbox-'+m.identifier) %></td>
       <td><%= link_to_profile m.short_name, m.identifier, :title => m.name %> </td>
       <td>
         <div class="members-buttons-cell">
@@ -26,3 +32,8 @@
     </tr>
   <% end %>
 </table>
+<% if collection.empty? %>
+  <p>
+    <em><%= _('No members found to: %s') % profile.name %></em>
+  </p>
+<% end %>
 <h1><%= h profile.short_name(50) %></h1>
-<%= render :partial => 'index_buttons' %>
+<%= render :partial => 'members_filter' %>
-<div id="members-list">
-  <%= render :partial => 'members_list' %>
-</div>
+<%= form_tag 'profile_members/send_mail', :method => 'post' do %>
+  <div id="members-list">
+    <%= render :partial => 'members_list' %>
+  </div>
-<%= render :partial => 'index_buttons' %>
+  <%= render :partial => 'index_buttons' %>
+
+<% end %>
@@ -5,7 +5,7 @@
 <ul>
   <% for validator in @region.validators %>
     <li>
-    <%= link_to_homepage validator.name, validator.identifier %>
+    <%= link_to_homepage validator.name, validator %>
     <%= link_to _('Remove validation rights'), { :action => 'remove', :id => @region.id, :validator_id => validator }, :method => 'post' %>
     </li>
   <% end %>
@@ -5,7 +5,7 @@
         @order == 'more_recent' ? enterprise.send(@order + '_label') + show_date(enterprise.created_at) : enterprise.send(@order + '_label') %>
     </div>
     <div class="search-enterprise-item-column-right">
-      <%= link_to_homepage(enterprise.name, enterprise.identifier, :class => "search-result-title") %>
+      <%= link_to_homepage enterprise.name, enterprise, class: "search-result-title" %>
       <div class="search-enterprise-description">
         <% if enterprise.description %>
           <% body_stripped = strip_tags(enterprise.description) %>
@@ -44,7 +44,7 @@
   <div class="search-product-item-second-column">
     <%= link_to_product product, :class => 'search-result-title' %>
     <div class="search-product-supplier">
-      <span class="search-field-label"><%= _('Supplier') %>  </span><%= link_to_homepage(product.enterprise.name, product.enterprise.identifier) %>
+      <span class="search-field-label"><%= _('Supplier') %>  </span><%= link_to_homepage product.enterprise.name, product.enterprise %>
     </div>
     <div class="search-product-description">
       <% if product.description %>
@@ -1,24 +0,0 @@
-<h3><%= title %></h3>
-
-<%= form_tag({:controller => 'search', :action => 'assets'}, {:method => 'get'}) do %>
-
-  <div class="search-in-opt"><%= _('Search in:') %>
-    <dir>
-      <%= labelled_radio_button _('Enterprises'), 'asset', 'enterprises', true %><br />
-      <%= labelled_radio_button _('Products'), 'asset', 'products', false %>
-    </dir>
-  </div>
-
-  <div class="formfield search-from-opt">
-    <%= select_city(true) %>
-  </div>
-  
-  <div class="formfield search-distance-opt">
-    <%= labelled_select(_('Distance:'), 'radius', :first, :last, nil, [15, 30, 50, 100, 150, 200, 300, 400, 500, 1000].map{|n|[n, n.to_s + 'km']}) %>
-  </div>
-
-  <div class="button-bar">
-    <%= submit_button :search, _('Search') %>
-  </div>
-
-<% end %>
 <% if block.cacheable? && use_cache %>
   <% cache_timeout(block.cache_key(language, user), block.timeout) do %>
-    <%= display_block_content(block, user, main_content) %>
+    <%= display_block_content(block, main_content) %>
   <% end %>
 <% else %>
-  <%= display_block_content(block, user, main_content) %>
+  <%= display_block_content(block, main_content) %>
 <% end %>
@@ -0,0 +1,5 @@
+class AddDataToMailing < ActiveRecord::Migration
+  def change
+    add_column :mailings, :data, :text
+  end
+end
@@ -0,0 +1,5 @@
+class AddIdToArticleFollower < ActiveRecord::Migration
+  def change
+    add_column :article_followers, :id, :primary_key
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20160202142247) do
+ActiveRecord::Schema.define(version: 20160309122141) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -51,7 +51,7 @@ ActiveRecord::Schema.define(version: 20160202142247) do
   add_index "action_tracker_notifications", ["profile_id", "action_tracker_id"], name: "index_action_tracker_notif_on_prof_id_act_tracker_id", unique: true, using: :btree
   add_index "action_tracker_notifications", ["profile_id"], name: "index_action_tracker_notifications_on_profile_id", using: :btree
-  create_table "article_followers", id: false, force: :cascade do |t|
+  create_table "article_followers", force: :cascade do |t|
     t.integer  "person_id"
     t.integer  "article_id"
     t.datetime "since"
@@ -471,6 +471,7 @@ ActiveRecord::Schema.define(version: 20160202142247) do
     t.string   "locale"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.text     "data"
   end
   create_table "national_region_types", force: :cascade do |t|
@@ -31,7 +31,8 @@ Feature: send emails to organization members
   Scenario: Send e-mail to members
     Given I am logged in as "joaosilva"
     And I go to Sample Community's members management
-    And I follow "Send e-mail to members"
+    And I check "checkbox-manoel"
+    And I press "Send e-mail to members"
     And I fill in "Subject" with "Hello, member!"
     And I fill in "Body" with "We have some news"
     When I press "Send"
@@ -40,7 +41,8 @@ Feature: send emails to organization members
   Scenario: Not send e-mail to members if subject is blank
     Given I am logged in as "joaosilva"
     And I go to Sample Community's members management
-    And I follow "Send e-mail to members"
+    And I check "checkbox-manoel"
+    And I press "Send e-mail to members"
     And I fill in "Body" with "We have some news"
     When I press "Send"
     Then I should be on /profile/sample-community/send_mail
@@ -48,7 +50,8 @@ Feature: send emails to organization members
   Scenario: Not send e-mail to members if body is blank
     Given I am logged in as "joaosilva"
     And I go to Sample Community's members management
-    And I follow "Send e-mail to members"
+    And I check "checkbox-manoel"
+    And I press "Send e-mail to members"
     And I fill in "Subject" with "Hello, user!"
     When I press "Send"
     Then I should be on /profile/sample-community/send_mail
@@ -56,7 +59,8 @@ Feature: send emails to organization members
   Scenario: Cancel creation of mailing
     Given I am logged in as "joaosilva"
     And I go to Sample Community's members management
-    And I follow "Send e-mail to members"
+    And I check "checkbox-manoel"
+    And I press "Send e-mail to members"
     When I follow "Cancel e-mail"
     Then I should be on Sample Community's members management
@@ -0,0 +1,9 @@
+
+After do |scenario|
+  if scenario.failed?
+    if ENV['TRAVIS']
+      build = ENV['TRAVIS_BUILD_NUMBER']
+      page.driver.save_screenshot "./tmp/artifact-travis-#{build}-#{scenario.name.parameterize}.png"
+    end
+  end
+end
@@ -23,6 +23,7 @@ public/user_themes
 public/designs/themes/default
 public/designs/themes/*
 public/designs/icons/default
+cache
 public/assets
 .sass-cache
@@ -57,7 +57,8 @@ namespace :ci do
     sh 'ruby', '-Itest', *tests unless tests.empty?
     sh 'cucumber', *features unless features.empty?
-    sh 'xvfb-run', '-a', 'cucumber', '-p', 'selenium', *features unless features.empty?
+    sh 'xvfb-run', '-a', '--server-args="-screen 0, 1280x1024x24"',
+      'cucumber', '-p', 'selenium', *features unless features.empty?
     changed_plugins.each do |plugin|
       if $broken_plugins.include?(plugin)
 desc 'Runs Seleniun acceptance tests'
 task :selenium do
   puts "Firefox version = #{`firefox --version`}"
-  sh "xvfb-run -a cucumber -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
+  sh "xvfb-run -a --server-args=\"-screen 0, 1280x1024x24\" cucumber -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
 end
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+If you made any significant change to the code that you consider worth being
	2	+reminded on the Release Notes, also include a correspondent entry here. If you
	3	+are not sure in which release your code will be released, include it on the
	4	+latest release and leave it to the commiter or RM responsible for it.
	5	+
	6	+v 1.5.0 (unreleased)
	7	+ - Allow groups to disable admin email notificationo
	8	+ - Add option to HighlightsBlock to open link in a new tab
	9	+ - Move blocks html generation from models to helpers
	10	+
	11	+v 1.4.0
	12	+ - Migration from Rails 3 to Rails 4!
	@@ -2,8 +2,27 @@ class ProfileMembersController < MyProfileController		@@ -2,8 +2,27 @@ class ProfileMembersController < MyProfileController
2	protect 'manage_memberships', :profile	2	protect 'manage_memberships', :profile
3		3
4	def index	4	def index
5	- @members = profile.members_by_name
6	- @member_role = environment.roles.find_by_name('member')	5	+ @filters = params[:filters] \|\| {:roles => []}
		6	+ all_roles = Profile::Roles.organization_member_roles(environment.id) \| Profile::Roles.organization_custom_roles(environment.id, profile.id)
		7	+ @filters[:roles] = all_roles unless @filters[:roles].present?
		8	+ @data = {}
		9	+ field = 'name'
		10	+ field = 'email' if @filters[:name] =~ /\@/
		11	+
		12	+ @data[:members] = profile.members_by(field,@filters[:name]).by_role(@filters[:roles])
		13	+ session[:members_filtered] = @data[:members].map{\|m\|m.id} if request.post?
		14	+ @data[:roles] = all_roles
		15	+
		16	+ end
		17	+
		18	+ def send_mail
		19	+ session[:members_filtered] = params[:members_filtered].select{\|value\| value!="0"}
		20	+ if session[:members_filtered].present?
		21	+ redirect_to :controller => :profile, :action => :send_mail
		22	+ else
		23	+ session[:notice] = _("Select at least one member.")
		24	+ redirect_to :action => :index
		25	+ end
7	end	26	end
8		27
9	def update_roles	28	def update_roles
	@@ -156,4 +175,13 @@ class ProfileMembersController < MyProfileController		@@ -156,4 +175,13 @@ class ProfileMembersController < MyProfileController
156	end	175	end
157	end	176	end
158		177
		178	+ def search_members
		179	+ field = 'name'
		180	+ field = 'email' if params[:filter_name] =~ /\@/
		181	+
		182	+ result = profile.members_like field, params[:filter_name]
		183	+ result = result.select{\|member\| member.can_view_field?(current_person, "email") } if field=="email"
		184	+ render :json => result.map { \|member\| {:label => "#{member.name}#{member.can_view_field?(current_person, "email") ? " <#{member.email}>" : ""}", :value => member.name }}
		185	+ end
		186	+
159	end	187	end
	@@ -370,6 +370,7 @@ class ProfileController < PublicController		@@ -370,6 +370,7 @@ class ProfileController < PublicController
370		370
371	def send_mail	371	def send_mail
372	@mailing = profile.mailings.build(params[:mailing])	372	@mailing = profile.mailings.build(params[:mailing])
		373	+ @mailing.data = session[:members_filtered] ? {:members_filtered => session[:members_filtered]} : {}
373	if request.post?	374	if request.post?
374	@mailing.locale = locale	375	@mailing.locale = locale
375	@mailing.person = user	376	@mailing.person = user
	@@ -48,6 +48,8 @@ module ApplicationHelper		@@ -48,6 +48,8 @@ module ApplicationHelper
48		48
49	include PluginsHelper	49	include PluginsHelper
50		50
		51	+ include ButtonsHelper
		52	+
51	def locale	53	def locale
52	(@page && !@page.language.blank?) ? @page.language : FastGettext.locale	54	(@page && !@page.language.blank?) ? @page.language : FastGettext.locale
53	end	55	end
	@@ -148,14 +150,8 @@ module ApplicationHelper		@@ -148,14 +150,8 @@ module ApplicationHelper
148	link_to text, profile_path(:profile => profile) , options	150	link_to text, profile_path(:profile => profile) , options
149	end	151	end
150		152
151	- def link_to_homepage(text, profile = nil, options = {})
152	- p = if profile
153	- Profile[profile]
154	- else
155	- user
156	- end
157	-
158	- link_to text, p.url, options	153	+ def link_to_homepage(text, profile, options = {})
		154	+ link_to text, profile.url, options
159	end	155	end
160		156
161	def link_if_permitted(link, permission = nil, target = nil)	157	def link_if_permitted(link, permission = nil, target = nil)
	@@ -215,52 +211,6 @@ module ApplicationHelper		@@ -215,52 +211,6 @@ module ApplicationHelper
215	result	211	result
216	end	212	end
217		213
218	- def button(type, label, url, html_options = {})
219	- html_options \|\|= {}
220	- the_class = 'with-text'
221	- if html_options.has_key?(:class)
222	- the_class << ' ' << html_options[:class]
223	- end
224	- button_without_text type, label, url, html_options.merge(:class => the_class)
225	- end
226	-
227	- def button_without_text(type, label, url, html_options = {})
228	- the_class = "button icon-#{type}"
229	- if html_options.has_key?(:class)
230	- the_class << ' ' << html_options[:class]
231	- end
232	- the_title = html_options[:title] \|\| label
233	- if html_options[:disabled]
234	- content_tag('a', ' '+content_tag('span', label), html_options.merge(:class => the_class, :title => the_title))
235	- else
236	- link_to(' '+content_tag('span', label), url, html_options.merge(:class => the_class, :title => the_title))
237	- end
238	- end
239	-
240	- def button_to_function(type, label, js_code, html_options = {}, &block)
241	- html_options[:class] = "button with-text" unless html_options[:class]
242	- html_options[:class] << " icon-#{type}"
243	- link_to_function(label, js_code, html_options, &block)
244	- end
245	-
246	- def button_to_function_without_text(type, label, js_code, html_options = {}, &block)
247	- html_options[:class] = "" unless html_options[:class]
248	- html_options[:class] << " button icon-#{type}"
249	- link_to_function(content_tag('span', label), js_code, html_options, &block)
250	- end
251	-
252	- def button_to_remote(type, label, options, html_options = {})
253	- html_options[:class] = "button with-text" unless html_options[:class]
254	- html_options[:class] << " icon-#{type}"
255	- link_to_remote(label, options, html_options)
256	- end
257	-
258	- def button_to_remote_without_text(type, label, options, html_options = {})
259	- html_options[:class] = "" unless html_options[:class]
260	- html_options[:class] << " button icon-#{type}"
261	- link_to_remote(content_tag('span', label), options, html_options.merge(:title => label))
262	- end
263	-
264	def icon(icon_name, html_options = {})	214	def icon(icon_name, html_options = {})
265	the_class = "button #{icon_name}"	215	the_class = "button #{icon_name}"
266	if html_options.has_key?(:class)	216	if html_options.has_key?(:class)
	@@ -940,13 +890,6 @@ module ApplicationHelper		@@ -940,13 +890,6 @@ module ApplicationHelper
940	content_for(:head) { stylesheet_link_tag(*args) }	890	content_for(:head) { stylesheet_link_tag(*args) }
941	end	891	end
942		892
943	- def article_to_html(article, options = {})
944	- options.merge!(:page => params[:npage])
945	- content = article.to_html(options)
946	- content = content.kind_of?(Proc) ? self.instance_exec(&content).html_safe : content.html_safe
947	- filter_html(content, article)
948	- end
949	-
950	# Please, use link_to by default!	893	# Please, use link_to by default!
951	# This method was created to work around to inexplicable	894	# This method was created to work around to inexplicable
952	# chain of problems when display_short_format was called	895	# chain of problems when display_short_format was called
	@@ -1049,10 +992,11 @@ module ApplicationHelper		@@ -1049,10 +992,11 @@ module ApplicationHelper
1049	end	992	end
1050		993
1051	def search_contents_menu	994	def search_contents_menu
		995	+ host = environment.default_hostname
1052	links = [	996	links = [
1053	- {s_('contents\|More recent') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_recent'})}},
1054	- {s_('contents\|More viewed') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}},
1055	- {s_('contents\|Most commented') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_comments'})}}	997	+ {s_('contents\|More recent') => {href: url_for({host: host, controller: 'search', action: 'contents', filter: 'more_recent'})}},
		998	+ {s_('contents\|More viewed') => {href: url_for({host: host, controller: 'search', action: 'contents', filter: 'more_popular'})}},
		999	+ {s_('contents\|Most commented') => {href: url_for({host: host, controller: 'search', action: 'contents', filter: 'more_comments'})}}
1056	]	1000	]
1057	if logged_in?	1001	if logged_in?
1058	links.push(_('New content') => modal_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))	1002	links.push(_('New content') => modal_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
	@@ -1064,10 +1008,11 @@ module ApplicationHelper		@@ -1064,10 +1008,11 @@ module ApplicationHelper
1064	alias :browse_contents_menu :search_contents_menu	1008	alias :browse_contents_menu :search_contents_menu
1065		1009
1066	def search_people_menu	1010	def search_people_menu
		1011	+ host = environment.default_hostname
1067	links = [	1012	links = [
1068	- {s_('people\|More recent') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_recent'})}},
1069	- {s_('people\|More active') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_active'})}},
1070	- {s_('people\|More popular') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_popular'})}}	1013	+ {s_('people\|More recent') => {href: url_for({host: host, controller: 'search', action: 'people', filter: 'more_recent'})}},
		1014	+ {s_('people\|More active') => {href: url_for({host: host, controller: 'search', action: 'people', filter: 'more_active'})}},
		1015	+ {s_('people\|More popular') => {href: url_for({host: host, controller: 'search', action: 'people', filter: 'more_popular'})}}
1071	]	1016	]
1072	if logged_in?	1017	if logged_in?
1073	links.push(_('My friends') => {:href => url_for({:profile => current_user.login, :controller => 'friends'})})	1018	links.push(_('My friends') => {:href => url_for({:profile => current_user.login, :controller => 'friends'})})
	@@ -1080,10 +1025,11 @@ module ApplicationHelper		@@ -1080,10 +1025,11 @@ module ApplicationHelper
1080	alias :browse_people_menu :search_people_menu	1025	alias :browse_people_menu :search_people_menu
1081		1026
1082	def search_communities_menu	1027	def search_communities_menu
		1028	+ host = environment.default_hostname
1083	links = [	1029	links = [
1084	- {s_('communities\|More recent') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_recent'})}},
1085	- {s_('communities\|More active') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_active'})}},
1086	- {s_('communities\|More popular') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_popular'})}}	1030	+ {s_('communities\|More recent') => {href: url_for({host: host, controller: 'search', action: 'communities', filter: 'more_recent'})}},
		1031	+ {s_('communities\|More active') => {href: url_for({host: host, controller: 'search', action: 'communities', filter: 'more_active'})}},
		1032	+ {s_('communities\|More popular') => {href: url_for({host: host, controller: 'search', action: 'communities', filter: 'more_popular'})}}
1087	]	1033	]
1088	if logged_in?	1034	if logged_in?
1089	links.push(_('My communities') => {:href => url_for({:profile => current_user.login, :controller => 'memberships'})})	1035	links.push(_('My communities') => {:href => url_for({:profile => current_user.login, :controller => 'memberships'})})
	@@ -1368,16 +1314,6 @@ module ApplicationHelper		@@ -1368,16 +1314,6 @@ module ApplicationHelper
1368	@no_design_blocks = true	1314	@no_design_blocks = true
1369	end	1315	end
1370		1316
1371	- def filter_html(html, source)
1372	- if @plugins && source && source.has_macro?
1373	- html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
1374	- #TODO This parse should be done through the macro infra, but since there
1375	- # are old things that do not support it we are keeping this hot spot.
1376	- html = @plugins.pipeline(:parse_content, html, source).first
1377	- end
1378	- html && html.html_safe
1379	- end
1380	-
1381	def convert_macro(html, source)	1317	def convert_macro(html, source)
1382	doc = Nokogiri::HTML.fragment html	1318	doc = Nokogiri::HTML.fragment html
1383	#TODO This way is more efficient but do not support macro inside of	1319	#TODO This way is more efficient but do not support macro inside of
	@@ -181,4 +181,21 @@ module ArticleHelper		@@ -181,4 +181,21 @@ module ArticleHelper
181	end	181	end
182	end	182	end
183		183
		184	+ def filter_html(html, source)
		185	+ if @plugins && source && source.has_macro?
		186	+ html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
		187	+ #TODO This parse should be done through the macro infra, but since there
		188	+ # are old things that do not support it we are keeping this hot spot.
		189	+ html = @plugins.pipeline(:parse_content, html, source).first
		190	+ end
		191	+ html && html.html_safe
		192	+ end
		193	+
		194	+ def article_to_html(article, options = {})
		195	+ options.merge!(:page => params[:npage])
		196	+ content = article.to_html(options)
		197	+ content = content.kind_of?(Proc) ? self.instance_exec(&content).html_safe : content.html_safe
		198	+ filter_html(content, article)
		199	+ end
		200	+
184	end	201	end
	@@ -87,10 +87,38 @@ module BoxesHelper		@@ -87,10 +87,38 @@ module BoxesHelper
87	box_decorator == DontMoveBlocks	87	box_decorator == DontMoveBlocks
88	end	88	end
89		89
90	- def display_block_content(block, person, main_content = nil)
91	- content = block.main? ? wrap_main_content(main_content) : block.content({:person => person})	90	+ def render_block block, prefix = nil, klass = block.class
		91	+ template_name = klass.name.underscore.sub '_block', ''
		92	+ begin
		93	+ render template: "blocks/#{prefix}#{template_name}", locals: { block: block }
		94	+ rescue ActionView::MissingTemplate
		95	+ return if klass.superclass === Block
		96	+ render_block block, prefix, klass.superclass
		97	+ end
		98	+ end
		99	+
		100	+ def render_block_content block
		101	+ # FIXME: this conditional should be removed after all
		102	+ # block footer from plugins methods get refactored into helpers and views.
		103	+ # They are a failsafe until all of them are done.
		104	+ return block.content if block.method(:content).owner != Block
		105	+ render_block block
		106	+ end
		107	+
		108	+ def render_block_footer block
		109	+ return block.footer if block.method(:footer).owner != Block
		110	+ render_block block, 'footers/'
		111	+ end
		112	+
		113	+ def display_block_content(block, main_content = nil)
		114	+ content = nil
		115	+ if block.main?
		116	+ content = wrap_main_content(main_content)
		117	+ else
		118	+ content = render_block_content block
		119	+ end
92	result = extract_block_content(content)	120	result = extract_block_content(content)
93	- footer_content = extract_block_content(block.footer)	121	+ footer_content = extract_block_content(render_block_footer block)
94	unless footer_content.blank?	122	unless footer_content.blank?
95	footer_content = content_tag('div', footer_content, :class => 'block-footer-content' )	123	footer_content = content_tag('div', footer_content, :class => 'block-footer-content' )
96	end	124	end
@@ -0,0 +1,47 @@		@@ -0,0 +1,47 @@
	1	+module ButtonsHelper
	2	+ def button(type, label, url, html_options = {})
	3	+ html_options \|\|= {}
	4	+ the_class = 'with-text'
	5	+ if html_options.has_key?(:class)
	6	+ the_class << ' ' << html_options[:class]
	7	+ end
	8	+ button_without_text type, label, url, html_options.merge(:class => the_class)
	9	+ end
	10	+
	11	+ def button_without_text(type, label, url, html_options = {})
	12	+ the_class = "button icon-#{type}"
	13	+ if html_options.has_key?(:class)
	14	+ the_class << ' ' << html_options[:class]
	15	+ end
	16	+ the_title = html_options[:title] \|\| label
	17	+ if html_options[:disabled]
	18	+ content_tag('a', ' '+content_tag('span', label), html_options.merge(:class => the_class, :title => the_title))
	19	+ else
	20	+ link_to(' '+content_tag('span', label), url, html_options.merge(:class => the_class, :title => the_title))
	21	+ end
	22	+ end
	23	+
	24	+ def button_to_function(type, label, js_code, html_options = {}, &block)
	25	+ html_options[:class] = "button with-text" unless html_options[:class]
	26	+ html_options[:class] << " icon-#{type}"
	27	+ link_to_function(label, js_code, html_options, &block)
	28	+ end
	29	+
	30	+ def button_to_function_without_text(type, label, js_code, html_options = {}, &block)
	31	+ html_options[:class] = "" unless html_options[:class]
	32	+ html_options[:class] << " button icon-#{type}"
	33	+ link_to_function(content_tag('span', label), js_code, html_options, &block)
	34	+ end
	35	+
	36	+ def button_to_remote(type, label, options, html_options = {})
	37	+ html_options[:class] = "button with-text" unless html_options[:class]
	38	+ html_options[:class] << " icon-#{type}"
	39	+ link_to_remote(label, options, html_options)
	40	+ end
	41	+
	42	+ def button_to_remote_without_text(type, label, options, html_options = {})
	43	+ html_options[:class] = "" unless html_options[:class]
	44	+ html_options[:class] << " button icon-#{type}"
	45	+ link_to_remote(content_tag('span', label), options, html_options.merge(:title => label))
	46	+ end
	47	+end
	@@ -5,9 +5,17 @@ class OrganizationMailing < Mailing		@@ -5,9 +5,17 @@ class OrganizationMailing < Mailing
5	end	5	end
6		6
7	def recipients(offset=0, limit=100)	7	def recipients(offset=0, limit=100)
8	- source.members.order(:id).offset(offset).limit(limit)
9	- .joins("LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)")	8	+ result = source.members.order(:id).offset(offset).limit(limit)
		9	+
		10	+ if data.present? and data.is_a?(Hash) and data[:members_filtered]
		11	+ result = result.where('profiles.id IN (?)', data[:members_filtered])
		12	+ end
		13	+
		14	+ if result.blank?
		15	+ result = result.joins("LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)")
10	.where("m.person_id" => nil)	16	.where("m.person_id" => nil)
		17	+ end
		18	+ result
11	end	19	end
12		20
13	def each_recipient	21	def each_recipient
	@@ -18,18 +18,6 @@ class ArticleBlock < Block		@@ -18,18 +18,6 @@ class ArticleBlock < Block
18	_('This block displays one of your articles. You can edit the block to select which one of your articles is going to be displayed in the block.')	18	_('This block displays one of your articles. You can edit the block to select which one of your articles is going to be displayed in the block.')
19	end	19	end
20		20
21	- def content(args={})
22	- block = self
23	- proc do
24	- block_title(block.title) +
25	- (block.article ? article_to_html(FilePresenter.for(block.article),
26	- :gallery_view => false,
27	- :inside_block => block, # For Blogs and folders
28	- :format => block.visualization_format # For Articles and contents
29	- ).html_safe : _('Article not selected yet.'))
30	- end
31	- end
32	-
33	def article_id	21	def article_id
34	self.settings[:article_id]	22	self.settings[:article_id]
35	end	23	end
	@@ -93,4 +93,20 @@ class Blog < Folder		@@ -93,4 +93,20 @@ class Blog < Folder
93	posts.where("type != 'RssFeed'").order(:updated_at).limit(limit)	93	posts.where("type != 'RssFeed'").order(:updated_at).limit(limit)
94	end	94	end
95		95
		96	+ def total_number_of_posts(group_by, year = nil)
		97	+ case group_by
		98	+ when :by_year
		99	+ posts.published.native_translations
		100	+ .except(:order)
		101	+ .count(:all, :group => 'EXTRACT(YEAR FROM published_at)')
		102	+ .sort_by {\|year, count\| -year.to_i}
		103	+ when :by_month
		104	+ posts.published.native_translations
		105	+ .except(:order)
		106	+ .where('EXTRACT(YEAR FROM published_at)=?', year.to_i)
		107	+ .group('EXTRACT(MONTH FROM published_at)')
		108	+ .count
		109	+ .sort_by {\|month, count\| -month.to_i}
		110	+ end
		111	+ end
96	end	112	end