Merge branch 'rails235' into AI3031-community_track_embed_block

Conflicts: test/unit/block_test.rb

Merge branch 'rails235' into AI3031-community_track_embed_block
Conflicts: test/unit/block_test.rb
Joenio Costa
2 parents 1249505f 4bceb5e5
Showing 230 changed files with 4737 additions and 681 deletions Show diff stats
AUTHORS
app/controllers/admin/environment_design_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/box_organizer_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/events_controller.rb
app/controllers/public/profile_controller.rb
app/controllers/public/search_controller.rb
app/controllers/themes_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/boxes_helper.rb
app/helpers/cache_counter_helper.rb
app/helpers/categories_helper.rb
app/helpers/comment_helper.rb
app/helpers/content_viewer_helper.rb
@@ -7,6 +7,7 @@ Developers
 ==========
 Alan Freihof Tygel <alantygel@gmail.com>
+alcampelo <alcampelo@alcampelo.(none)>
 Alessandro Palmeira <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
@@ -38,6 +39,7 @@ Alessandro Palmeira + João M. M. Silva &lt;alessandro.palmeira@gmail.com&gt;
 Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
+Ana Losnak <analosnak@gmail.com>
 Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
 Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
 Antonio Terceiro <terceiro@colivre.coop.br>
@@ -85,6 +87,7 @@ Daniel Alves + Rafael Manzo &lt;rr.manzo@gmail.com&gt;
 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
 Daniel Bucher <daniel.bucher88@gmail.com>
 Daniel Cunha <daniel@colivre.coop.br>
+David Carlos <ddavidcarlos1392@gmail.com>
 diegoamc <diegoamc90@gmail.com>
 Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
 Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
@@ -114,12 +117,16 @@ Diego Martinez &lt;diegoamc90@gmail.com&gt;
 Diego Martinez <diego@diego-K55A.(none)>
 Diego + Renan <renanteruoc@gmail.com>
 Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
+Fabio Teixeira <fabio1079@gmail.com>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
 Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
 Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
 Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
 Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
+Gabriela Navarro <navarro1703@gmail.com>
 Grazieno Pellegrino <grazieno@gmail.com>
+Gust <darksshades@hotmail.com>
+Hugo Melo <hugo@riseup.net>
 Isaac Canan <isaac@intelletto.com.br>
 Italo Valcy <italo@dcc.ufba.br>
 Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
@@ -202,6 +209,7 @@ Renan Teruo + Diego Araujo &lt;renanteruoc@gmail.com&gt;
 Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
 Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
 Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
+Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
 Rodrigo Souto <diguliu@gmail.com>
 Rodrigo Souto <rodrigo@colivre.coop.br>
 Ronny Kursawe <kursawe.ronny@googlemail.com>
@@ -3,6 +3,8 @@ class EnvironmentDesignController &lt; BoxOrganizerController
   protect 'edit_environment_design', :environment
   def available_blocks
+    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+    #      the Noosfero core soon, see ActionItem3045
     @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
     @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
   end
@@ -45,6 +45,20 @@ class UsersController &lt; AdminController
     redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
   end
+
+  def destroy_user
+    if request.post?
+      person = environment.people.find_by_id(params[:id])
+      if person && person.destroy
+        session[:notice] = _('The profile was deleted.')
+      else
+        session[:notice] = _('Could not remove profile')
+      end
+    end
+    redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
+  end
+
+
   def download
     respond_to do |format|
       format.html
@@ -80,6 +80,22 @@ class BoxOrganizerController &lt; ApplicationController
     render :action => 'edit', :layout => false
   end
+  def search_autocomplete
+    if request.xhr? and params[:query]
+      search = params[:query]
+      path_list = if boxes_holder.is_a?(Environment) && boxes_holder.enabled?('use_portal_community') && boxes_holder.portal_community
+        boxes_holder.portal_community.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { |content| "/{portal}/"+content.path }
+      elsif boxes_holder.is_a?(Profile)
+        boxes_holder.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { |content| "/{profile}/"+content.path }
+      else
+        []
+      end
+      render :json => path_list.to_json
+    else
+      redirect_to "/"
+    end
+  end
+
   def save
     @block = boxes_holder.blocks.find(params[:id])
     @block.update_attributes(params[:block])
@@ -99,6 +115,12 @@ class BoxOrganizerController &lt; ApplicationController
     end
   end
+  def clone_block
+    block = Block.find(params[:id])
+    block.duplicate
+    redirect_to :action => 'index'
+  end
+
   protected :boxes_editor?
 end
@@ -24,10 +24,16 @@ class CmsController &lt; MyProfileController
     (user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile)))
   end
-  protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish, :upload_files] do |c, user, profile|
+  protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish, :upload_files, :new] do |c, user, profile|
     user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile))
   end
+  protect_if :only => :new do |c, user, profile|
+    article = profile.articles.find_by_id(c.params[:parent_id])
+    (!article.nil? && (article.allow_create?(user) || article.parent.allow_create?(user))) ||
+    (user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile)))
+  end
+
   protect_if :only => [:destroy, :publish] do |c, user, profile|
     profile.articles.find(c.params[:id]).allow_post_content?(user)
   end
@@ -221,11 +227,10 @@ class CmsController &lt; MyProfileController
   def update_categories
     @object = params[:id] ? @profile.articles.find(params[:id]) : Article.new
+    @categories = @toplevel_categories = environment.top_level_categories
     if params[:category_id]
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
-    else
-      @categories = environment.top_level_categories.select{|i| !i.children.empty?}
     end
     render :partial => 'shared/select_categories', :locals => {:object_name => 'article', :multiple => true}, :layout => false
   end
@@ -55,10 +55,4 @@ class ProfileDesignController &lt; BoxOrganizerController
     blocks
   end
-  def clone
-    block = Block.find(params[:id])
-    block.duplicate
-    redirect_to :action => 'index'
-  end
-
 end
@@ -55,11 +55,10 @@ class ProfileEditorController &lt; MyProfileController
   def update_categories
     @object = profile
+    @categories = @toplevel_categories = environment.top_level_categories
     if params[:category_id]
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
-    else
-      @categories = environment.top_level_categories.select{|i| !i.children.empty?}
     end
     render :partial => 'shared/select_categories', :locals => {:object_name => 'profile_data', :multiple => true}, :layout => false
   end
@@ -69,6 +69,8 @@ class AccountController &lt; ApplicationController
       session[:notice] = _("This environment doesn't allow user registration.")
     end
+    store_location(request.referer) unless params[:return_to] or session[:return_to]
+
     @block_bot = !!session[:may_be_a_bot]
     @invitation_code = params[:invitation_code]
     begin
@@ -77,6 +79,7 @@ class AccountController &lt; ApplicationController
       @user.environment = environment
       @terms_of_use = environment.terms_of_use
       @user.person_data = params[:profile_data]
+      @user.return_to = session[:return_to]
       @person = Person.new(params[:profile_data])
       @person.environment = @user.environment
       if request.post?
@@ -98,7 +101,7 @@ class AccountController &lt; ApplicationController
           end
           if @user.activated?
             self.current_user = @user
-            redirect_to '/'
+            go_to_signup_initial_page
           else
             @register_pending = true
           end
@@ -368,32 +371,29 @@ class AccountController &lt; ApplicationController
   end
   def go_to_initial_page
+    if params[:redirection]
+      session[:return_to] = @user.return_to
+      @user.return_to = nil
+      @user.save
+    end
+
     if params[:return_to]
       redirect_to params[:return_to]
     elsif environment.enabled?('allow_change_of_redirection_after_login')
-      case user.preferred_login_redirection
-        when 'keep_on_same_page'
-          redirect_back_or_default(user.admin_url)
-        when 'site_homepage'
-          redirect_to :controller => :home
-        when 'user_profile_page'
-          redirect_to user.public_profile_url
-        when 'user_homepage'
-          redirect_to user.url
-        when 'user_control_panel'
-          redirect_to user.admin_url
-      else
-        redirect_back_or_default(user.admin_url)
-      end
+      check_redirection_options(user, user.preferred_login_redirection, user.admin_url)
     else
       if environment == current_user.environment
-        redirect_back_or_default(user.admin_url)
+        check_redirection_options(user, environment.redirection_after_login, user.admin_url)
       else
         redirect_back_or_default(:controller => 'home')
       end
     end
   end
+  def go_to_signup_initial_page
+    check_redirection_options(user, user.environment.redirection_after_signup, user.url)
+  end
+
   def redirect_if_logged_in
     if logged_in?
       go_to_initial_page
@@ -409,4 +409,22 @@ class AccountController &lt; ApplicationController
     user
   end
+  protected
+
+  def check_redirection_options(user, condition, default)
+    case condition
+      when 'keep_on_same_page'
+        redirect_back_or_default(user.admin_url)
+      when 'site_homepage'
+        redirect_to :controller => :home
+      when 'user_profile_page'
+        redirect_to user.public_profile_url
+      when 'user_homepage'
+        redirect_to user.url
+      when 'user_control_panel'
+        redirect_to user.admin_url
+    else
+      redirect_back_or_default(default)
+    end
+  end
 end
@@ -111,6 +111,15 @@ class ContentViewerController &lt; ApplicationController
     @comments = @plugins.filter(:unavailable_comments, @comments)
     @comments_count = @comments.count
     @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
+    @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
+
+    if request.xhr? and params[:comment_order]
+      if @comment_order == 'newest'
+        @comments = @comments.reverse
+      end
+
+      return render :partial => 'comment/comment', :collection => @comments
+    end
     if params[:slideshow]
       render :action => 'slideshow', :layout => 'slideshow'
@@ -7,11 +7,11 @@ class EventsController &lt; PublicController
     @date = build_date(params[:year], params[:month], params[:day])
     if !params[:year] && !params[:month] && !params[:day]
-      @events = profile.events.next_events_from_month(@date)
+      @events = profile.events.next_events_from_month(@date).paginate(:per_page => per_page, :page => params[:page])
     end
     if params[:year] || params[:month]
-      @events = profile.events.by_month(@date)
+      @events = profile.events.by_month(@date).paginate(:per_page => per_page, :page => params[:page])
     end
     events_in_range = profile.events.by_range((@date - 1.month).at_beginning_of_month .. (@date + 1.month).at_end_of_month)
@@ -29,4 +29,7 @@ class EventsController &lt; PublicController
   include EventsHelper
+  def per_page
+    20
+  end
 end
@@ -304,14 +304,6 @@ class ProfileController &lt; PublicController
     end
   end
-  def profile_info
-    begin
-      @block = profile.blocks.find(params[:block_id])
-    rescue
-      render :text => _('Profile information could not be loaded')
-    end
-  end
-
   def report_abuse
     @abuse_report = AbuseReport.new
     render :layout => false
@@ -99,14 +99,14 @@ class SearchController &lt; PublicController
     @events = []
     if params[:day] || !params[:year] && !params[:month]
       @events = @category ?
-        environment.events.by_day(@date).in_category(Category.find(@category_id)) :
-        environment.events.by_day(@date)
+        environment.events.by_day(@date).in_category(Category.find(@category_id)).paginate(:per_page => per_page, :page => params[:page]) :
+        environment.events.by_day(@date).paginate(:per_page => per_page, :page => params[:page])
     end
     if params[:year] || params[:month]
       @events = @category ?
-        environment.events.by_month(@date).in_category(Category.find(@category_id)) :
-        environment.events.by_month(@date)
+        environment.events.by_month(@date).in_category(Category.find(@category_id)).paginate(:per_page => per_page, :page => params[:page]) :
+        environment.events.by_month(@date).paginate(:per_page => per_page, :page => params[:page])
     end
     @scope = date_range && params[:action] == 'events' ? environment.events.by_range(date_range) : environment.events
@@ -139,7 +139,7 @@ class SearchController &lt; PublicController
   def events_by_day
     @date = build_date(params[:year], params[:month], params[:day])
-    @events = environment.events.by_day(@date)
+    @events = environment.events.by_day(@date).paginate(:per_page => per_page, :page => params[:page])
     render :partial => 'events/events'
   end
@@ -224,4 +224,8 @@ class SearchController &lt; PublicController
     @environment.send(klass.name.underscore.pluralize).visible.includes(relations)
   end
+  def per_page
+    20
+  end
+
 end
@@ -12,7 +12,7 @@ class ThemesController &lt; ApplicationController
   def index
     @environment = environment
-    @themes = environment.themes + Theme.approved_themes(target)
+    @themes = (environment.themes + Theme.approved_themes(target)).sort_by { |t| t.name }
     @current_theme = target.theme
@@ -608,49 +608,18 @@ module ApplicationHelper
   end
   attr_reader :environment
+
   def select_categories(object_name, title=nil, title_size=4)
     return nil if environment.enabled?(:disable_categories)
     if title.nil?
       title = _('Categories')
     end
-    object = instance_variable_get("@#{object_name}")
-
-    result = content_tag 'h'+title_size.to_s(), title
-    result << javascript_tag( 'function open_close_cat( link ) {
-      var div = link.parentNode.getElementsByTagName("div")[0];
-      var end = function(){
-        if ( div.style.display == "none" ) {
-          this.link.className="button icon-button icon-down"
-        } else {
-          this.link.className="button icon-button icon-up-red"
-        }
-      }
-      Effect.toggle( div, "slide", { link:link, div:div, afterFinish:end } )
-    }')
-    environment.top_level_categories.select{|i| !i.children.empty?}.each do |toplevel|
-      next unless object.accept_category?(toplevel)
-      # FIXME
-      ([toplevel] + toplevel.children_for_menu).each do |cat|
-        if cat.top_level?
-          result << '<div class="categorie_box">'.html_safe
-          result << icon_button( :down, _('open'), '#', :onclick => 'open_close_cat(this); return false' )
-          result << content_tag('h5', toplevel.name)
-          result << '<div style="display:none"><ul class="categories">'.html_safe
-        else
-          checkbox_id = "#{object_name}_#{cat.full_name.downcase.gsub(/\s+|\//, '_')}"
-          result << content_tag('li', labelled_check_box(
-                      cat.full_name_without_leading(1, " &rarr; "),
-                      "#{object_name}[category_ids][]", cat.id,
-                      object.category_ids.include?(cat.id), :id => checkbox_id,
-                      :onchange => 'this.parentNode.className=(this.checked?"cat_checked":"")' ),
-                    :class => ( object.category_ids.include?(cat.id) ? 'cat_checked' : '' ) ) + "\n"
-        end
-      end
-      result << '</ul></div></div>'.html_safe
-    end
+    @object = instance_variable_get("@#{object_name}")
+    @categories = environment.top_level_categories
-    content_tag('div', result)
+    @current_categories = environment.top_level_categories.select{|i| !i.children.empty?}
+    render :partial => 'shared/select_categories_top', :locals => {:object_name => object_name, :title => title, :title_size => title_size, :multiple => true, :categories_selected => @object.categories }, :layout => false
   end
   def theme_option(opt = nil)
@@ -920,12 +889,11 @@ module ApplicationHelper
   def page_title
     (@page ? @page.title + ' - ' : '') +
-    (profile ? profile.short_name + ' - ' : '') +
     (@topic ? @topic.title + ' - ' : '') +
     (@section ? @section.title + ' - ' : '') +
     (@toc ? _('Online Manual') + ' - ' : '') +
     (@controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
-    environment.name +
+    (profile ? profile.short_name : environment.name) +
     (@category ? " - #{@category.full_name}" : '')
   end
@@ -49,8 +49,14 @@ module ArticleHelper
         'div',
         check_box(:article, :display_versions) +
         content_tag('label', _('I want this article to display a link to older versions'), :for => 'article_display_versions')
-      ) : '')
+      ) : '') +
+      (article.forum? && article.profile.community? ?
+      content_tag(
+        'div',
+        check_box(:article, :allows_members_to_create_topics) +
+        content_tag('label', _('Allow members to create topics'), :for => 'article_allows_members_to_create_topics')
+        ) : '')
     )
   end
@@ -65,7 +65,7 @@ module BoxesHelper
   end
   def display_box_content(box, main_content)
-    context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params }
+    context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params, :user => user }
     box_decorator.select_blocks(box.blocks.includes(:box), context).map { |item| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
   end
@@ -212,7 +212,7 @@ module BoxesHelper
     if !block.main?
       buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
-      buttons << icon_button(:clone, _('Clone'), { :action => 'clone', :id => block.id }, { :method => 'post' })
+      buttons << icon_button(:clone, _('Clone'), { :action => 'clone_block', :id => block.id }, { :method => 'post' })
     end
     if block.respond_to?(:help)
@@ -0,0 +1,7 @@
+module CacheCounterHelper
+  def update_cache_counter(name, object, value)
+    if object.present?
+      object.class.update_counters(object.id, name => value)
+    end
+  end
+end
@@ -48,4 +48,12 @@ module CategoriesHelper
     labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))
   end
+  #FIXME make this test
+  def selected_category_link(cat)
+    content_tag('div', button_to_function_without_text(:remove, _('Remove'), nil) {|page| page["selected-category-#{cat.id}"].remove} +
+      link_to_function(cat.full_name(' &rarr; '), nil, :id => "remove-selected-category-#{cat.id}-button", :class => 'select-subcategory-link') {|page| page["selected-category-#{cat.id}"].remove},
+      :class => 'selected-category'
+    )
+  end
+
 end
@@ -2,7 +2,6 @@ module CommentHelper
   def article_title(article, args = {})
     title = article.title
-    title = article.display_title if article.kind_of?(UploadedFile) && article.image?
     title = content_tag('h1', h(title), :class => 'title')
     if article.belongs_to_blog?
       unless args[:no_link]
@@ -22,6 +21,12 @@ module CommentHelper
     title
   end
+  def comment_extra_contents(comment)
+    @plugins.dispatch(:comment_extra_contents, comment).collect do |extra_content|
+      extra_content.kind_of?(Proc) ? self.instance_eval(&extra_content) : extra_content
+    end.join('\n')
+  end
+
   def comment_actions(comment)
     url = url_for(:profile => profile.identifier, :controller => :comment, :action => :check_actions, :id => comment.id)
     links = links_for_comment_actions(comment)
@@ -14,8 +14,7 @@ module ContentViewerHelper
   end
   def article_title(article, args = {})
-    title = article.display_title if article.kind_of?(UploadedFile) && article.image?
-    title = article.title if title.blank?
+    title = article.title
     title = content_tag('h1', h(title), :class => 'title')
     if article.belongs_to_blog? || article.belongs_to_forum?
       unless args[:no_link]
@@ -52,15 +51,6 @@ module ContentViewerHelper
     end
   end
-  def addthis_facebook_url(article)
-    "http://www.facebook.com/sharer.php?s=100&p[title]=%{title}&p[summary]=%{summary}&p[url]=%{url}&p[images][0]=%{image}" % {
-      :title => CGI.escape(article.title),
-      :url => CGI.escape(url_for(article.url)),
-      :summary => CGI.escape(truncate(strip_tags(article.body.to_s), :length => 300)),
-      :image => CGI.escape(article.body_images_paths.first.to_s)
-    }
-  end
-
   def addthis_image_tag
     if File.exists?(File.join(Rails.root, 'public', theme_path, 'images', 'addthis.gif'))
       image_tag(File.join(theme_path, 'images', 'addthis.gif'), :border => 0, :alt => '')
@@ -90,5 +90,8 @@ module LayoutHelper
     end
   end
+  def meta_description_tag(article=nil)
+    article ? truncate(strip_tags(article.body.to_s), :length => 200) : environment.name
+  end
 end
@@ -20,14 +20,16 @@ module MacrosHelper
         jQuery('<div>'+#{macro_configuration_dialog(macro).to_json}+'</div>').dialog({
           title: #{macro_title(macro).to_json},
           modal: true,
-          buttons: [
-            {text: #{_('Ok').to_json}, click: function(){
+          buttons: {
+            #{_('Ok').to_json}: function(){
               tinyMCE.activeEditor.execCommand('mceInsertContent', false,
               (function(dialog){ #{macro_generator(macro)} })(this));
               jQuery(this).dialog('close');
-            }},
-            {text: #{_('Cancel').to_json}, click: function(){jQuery(this).dialog('close');}}
-          ]
+            },
+            #{_('Cancel').to_json}: function(){
+              jQuery(this).dialog('close');
+            }
+          }
         });
       }"
     end
@@ -57,7 +59,11 @@ module MacrosHelper
   def macro_generator(macro)
     if macro.configuration[:generator]
-      macro.configuration[:generator]
+      if macro.configuration[:generator].respond_to?(:call)
+        macro.configuration[:generator].call(macro)
+      else
+        macro.configuration[:generator]
+      end
     else
       macro_default_generator(macro)
     end
@@ -66,8 +72,7 @@ module MacrosHelper
   def macro_default_generator(macro)
     code = "var params = {};"
-    configuration = macro_configuration(macro)
-    configuration[:params].map do |field|
+    macro.configuration[:params].map do |field|
       code += "params.#{field[:name]} = jQuery('*[name=#{field[:name]}]', dialog).val();"
     end
     code + "
@@ -0,0 +1,15 @@
+module PersonNotifierHelper
+
+  include ApplicationHelper
+
+  private
+
+  def path_to_image(source)
+    top_url + source
+  end
+
+  def top_url
+    top_url = @profile.environment ? @profile.environment.top_url : ''
+  end
+
+end
@@ -27,7 +27,7 @@ module TokenHelper
         hintText: #{options[:hint_text].to_json},
         noResultsText: #{options[:no_results_text].to_json},
         searchingText: #{options[:searching_text].to_json},
-        searchDelay: #{options[:serach_delay].to_json},
+        searchDelay: #{options[:search_delay].to_json},
         preventDuplicates: #{options[:prevent_duplicates].to_json},
         backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
         queryParam: #{name.to_json},
@@ -30,11 +30,13 @@ class Block &lt; ActiveRecord::Base
   #
   # * <tt>:article</tt>: the article being viewed currently
   # * <tt>:language</tt>: in which language the block will be displayed
+  # * <tt>:user</tt>: the logged user
   def visible?(context = nil)
     return false if display == 'never'
     if context
       return false if language != 'all' && language != context[:locale]
+      return false unless display_to_user?(context[:user])
       begin
         return self.send("display_#{display}", context)
@@ -46,6 +48,10 @@ class Block &lt; ActiveRecord::Base
     true
   end
+  def display_to_user?(user)
+    display_user == 'all' || (user.nil? && display_user == 'not_logged') || (user && display_user == 'logged')
+  end
+
   def display_always(context)
     true
   end
@@ -76,6 +82,14 @@ class Block &lt; ActiveRecord::Base
   #   the homepage of its owner.
   settings_items :display, :type => :string, :default => 'always'
+
+  # The condition for displaying a block to users. It can assume the following values:
+  #
+  # * <tt>'all'</tt>: the block is always displayed
+  # * <tt>'logged'</tt>: the block is displayed to logged users only
+  # * <tt>'not_logged'</tt>: the block is displayed only to not logged users
+  settings_items :display_user, :type => :string, :default => 'all'
+
   # The block can be configured to be displayed in all languages or in just one language. It can assume any locale of the environment:
   #
   # * <tt>'all'</tt>: the block is always displayed
@@ -149,7 +163,7 @@ class Block &lt; ActiveRecord::Base
   end
   alias :active_record_cache_key :cache_key
-  def cache_key(language='en')
+  def cache_key(language='en', user=nil)
     active_record_cache_key+'-'+language
   end
@@ -179,12 +193,20 @@ class Block &lt; ActiveRecord::Base
     'never'            => __('Don\'t display'),
   }
-  def display_options
+  def display_options_available
     DISPLAY_OPTIONS.keys
   end
-  def display_option_label(option)
-    DISPLAY_OPTIONS[option]
+  def display_options
+    DISPLAY_OPTIONS.slice(*display_options_available)
+  end
+
+  def display_user_options
+    @display_user_options ||= {
+      'all'            => __('All users'),
+      'logged'         => __('Logged'),
+      'not_logged'     => __('Not logged'),
+    }
   end
   def duplicate
@@ -26,6 +26,8 @@ class Box &lt; ActiveRecord::Base
       CategoriesBlock,
       CommunitiesBlock,
       EnterprisesBlock,
+      # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+      #      the Noosfero core soon, see ActionItem3045
       EnvironmentStatisticsBlock,
       FansBlock,
       FavoriteEnterprisesBlock,
@@ -52,6 +54,8 @@ class Box &lt; ActiveRecord::Base
       CommunitiesBlock,
       DisabledEnterpriseMessageBlock,
       EnterprisesBlock,
+      # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+      #      the Noosfero core soon, see ActionItem3045
       EnvironmentStatisticsBlock,
       FansBlock,
       FavoriteEnterprisesBlock,
@@ -172,7 +172,7 @@ class Comment &lt; ActiveRecord::Base
     def mail(comment)
       profile = comment.article.profile
       recipients comment.notification_emails
-      from "#{profile.environment.name} <#{profile.environment.contact_email}>"
+      from "#{profile.environment.name} <#{profile.environment.noreply_email}>"
       subject _("[%s] you got a new comment!") % [profile.environment.name]
       body :recipient => profile.nickname || profile.name,
         :sender => comment.author_name,
@@ -187,7 +187,7 @@ class Comment &lt; ActiveRecord::Base
     def mail_to_followers(comment, emails)
       profile = comment.article.profile
       bcc emails
-      from "#{profile.environment.name} <#{profile.environment.contact_email}>"
+      from "#{profile.environment.name} <#{profile.environment.noreply_email}>"
       subject _("[%s] %s commented on a content of %s") % [profile.environment.name, comment.author_name, profile.short_name]
       body :recipient => profile.nickname || profile.name,
         :sender => comment.author_name,
@@ -26,7 +26,7 @@ class Contact &lt; ActiveRecord::Base #WithoutTable
       content_type 'text/html'
       emails = contact.dest.notification_emails
       recipients emails
-      from "#{contact.name} <#{contact.dest.environment.contact_email}>"
+      from "#{contact.name} <#{contact.dest.environment.noreply_email}>"
       reply_to contact.email
       if contact.sender
         headers 'X-Noosfero-Sender' => contact.sender.identifier
@@ -145,6 +145,18 @@ class Environment &lt; ActiveRecord::Base
   end
   validates_inclusion_of :redirection_after_login, :in => Environment.login_redirection_options.keys, :allow_nil => true
+  def self.signup_redirection_options
+    {
+      'keep_on_same_page' => _('Stays on the same page the user was before signup.'),
+      'site_homepage' => _('Redirects the user to the environment homepage.'),
+      'user_profile_page' => _('Redirects the user to his profile page.'),
+      'user_homepage' => _('Redirects the user to his homepage.'),
+      'user_control_panel' => _('Redirects the user to his control panel.')
+    }
+  end
+  validates_inclusion_of :redirection_after_signup, :in => Environment.signup_redirection_options.keys, :allow_nil => true
+
+
   # #################################################
   # Relationships and applied behaviour
   # #################################################
@@ -161,6 +173,8 @@ class Environment &lt; ActiveRecord::Base
     # "left" area
     env.boxes[1].blocks << LoginBlock.new
+    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+    #      the Noosfero core soon, see ActionItem3045
     env.boxes[1].blocks << EnvironmentStatisticsBlock.new
     env.boxes[1].blocks << RecentDocumentsBlock.new
@@ -592,7 +606,7 @@ class Environment &lt; ActiveRecord::Base
   # only one environment can be the default one
   validates_uniqueness_of :is_default, :if => (lambda do |environment| environment.is_default? end), :message => N_('Only one Virtual Community can be the default one')
-  validates_format_of :contact_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |record| ! record.contact_email.blank? })
+  validates_format_of :contact_email, :noreply_email, :with => Noosfero::Constants::EMAIL_FORMAT, :allow_blank => true
   xss_terminate :only => [ :message_for_disabled_enterprise ], :with => 'white_list', :on => 'validation'
@@ -779,7 +793,7 @@ class Environment &lt; ActiveRecord::Base
   end
   def notification_emails
-    [contact_email.blank? ? nil : contact_email].compact + admins.map(&:email)
+    [noreply_email.blank? ? nil : noreply_email].compact + admins.map(&:email)
   end
   after_create :create_templates
+# TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+#      the Noosfero core soon, see ActionItem3045
+
 class EnvironmentStatisticsBlock < Block
   def self.description
-    _('Environment stastistics')
+    _('Environment stastistics (DEPRECATED)')
   end
   def default_title
@@ -38,15 +38,12 @@ class Event &lt; Article
   named_scope :next_events_from_month, lambda { |date|
     date_temp = date.strftime("%Y-%m-%d")
     { :conditions => ["start_date >= ?","#{date_temp}"],
-      :limit => 10,
       :order => 'start_date ASC'
     }
   }
   named_scope :by_month, lambda { |date|
-    date_temp = date.strftime("%Y-%m")
     { :conditions => ["EXTRACT(YEAR FROM start_date) = ? AND EXTRACT(MONTH FROM start_date) = ?",date.year,date.month],
-      :limit => 10,
       :order => 'start_date ASC'
     }
   }
@@ -5,6 +5,7 @@ class Forum &lt; Folder
   settings_items :terms_of_use, :type => :string, :default => ""
   settings_items :has_terms_of_use, :type => :boolean, :default => false
+  settings_items :allows_members_to_create_topics, :type => :boolean, :default => false
   has_and_belongs_to_many :users_with_agreement, :class_name => 'Person', :join_table => 'terms_forum_people'
   before_save do |forum|
@@ -66,4 +67,11 @@ class Forum &lt; Folder
     self.users_with_agreement.exists? user
   end
+  def can_create_topic?(user, profile)
+    return profile.community? && profile.members.include?(user) && self.allows_members_to_create_topics
+  end
+
+  def allow_create?(user)
+    super || can_create_topic?(user, profile)
+  end
 end
 class Friendship < ActiveRecord::Base
   track_actions :new_friendship, :after_create, :keep_params => ["friend.name", "friend.url", "friend.profile_custom_icon"], :custom_user => :person
-  
+
+  extend CacheCounterHelper
+
   belongs_to :person, :foreign_key => :person_id
   belongs_to :friend, :class_name => 'Person', :foreign_key => 'friend_id'
+
+  after_create do |friendship|
+    update_cache_counter(:friends_count, friendship.person, 1)
+    update_cache_counter(:friends_count, friendship.friend, 1)
+  end
+
+  after_destroy do |friendship|
+    update_cache_counter(:friends_count, friendship.person, -1)
+    update_cache_counter(:friends_count, friendship.friend, -1)
+  end
 end
@@ -16,15 +16,15 @@ class LayoutTemplate
   end
   def name
-    @config['name']
+    _ @config['name']
   end
   def title
-    @config['title']
+    _ @config['title']
   end
   def description
-    @config['description']
+    _ @config['description']
   end
   def number_of_boxes
@@ -70,6 +70,8 @@ class LinkListBlock &lt; Block
   def expand_address(address)
     add = if owner.respond_to?(:identifier)
       address.gsub('{profile}', owner.identifier)
+    elsif owner.is_a?(Environment) && owner.enabled?('use_portal_community') && owner.portal_community
+      address.gsub('{portal}', owner.portal_community.identifier)
     else
       address
     end
@@ -17,7 +17,7 @@ class Mailing &lt; ActiveRecord::Base
   end
   def generate_from
-    "#{source.name} <#{source.contact_email}>"
+    "#{source.name} <#{if source.is_a? Environment then source.noreply_email else source.contact_email end}>"
   end
   def generate_subject
@@ -24,7 +24,7 @@ class MainBlock &lt; Block
     false
   end
-  def display_options
+  def display_options_available
     ['always', 'except_home_page']
   end
@@ -36,4 +36,15 @@ class MembersBlock &lt; ProfileListBlock
     }
   end
+  def cache_key(language='en', user=nil)
+    logged = ''
+    if user
+      logged += '-logged-in'
+      if user.is_member_of? self.owner
+        logged += '-member'
+      end
+    end
+    super + logged
+  end
+
 end
@@ -26,18 +26,7 @@ class Organization &lt; Profile
   has_many :mailings, :class_name => 'OrganizationMailing', :foreign_key => :source_id, :as => 'source'
-  named_scope :more_popular,
-    :select => "#{Profile.qualified_column_names}, count(resource_id) as total",
-    :group => Profile.qualified_column_names,
-    :joins => "LEFT OUTER JOIN role_assignments ON profiles.id = role_assignments.resource_id",
-    :order => "total DESC"
-
-  named_scope :more_active,
-    :select => "#{Profile.qualified_column_names}, count(action_tracker.id) as total",
-    :joins => "LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.target_id",
-    :group => Profile.qualified_column_names,
-    :order => 'total DESC',
-    :conditions => ['action_tracker.created_at >= ? OR action_tracker.id IS NULL', ActionTracker::Record::RECENT_DELAY.days.ago]
+  named_scope :more_popular, :order => 'members_count DESC'
   def validation_methodology
     self.validation_info ? self.validation_info.validation_methodology : nil
 class OrganizationMailing < Mailing
   def generate_from
-    "#{person.name} <#{source.environment.contact_email}>"
+    "#{person.name} <#{source.environment.noreply_email}>"
   end
   def recipients(offset=0, limit=100)
@@ -2,7 +2,7 @@ class PendingTaskNotifier &lt; ActionMailer::Base
   def notification(person)
     recipients person.email
-    from "#{person.environment.name} <#{person.environment.contact_email}>"
+    from "#{person.environment.name} <#{person.environment.noreply_email}>"
     subject _("[%s] Pending tasks") % person.environment.name
     body :person => person,
       :tasks => person.tasks.pending,
@@ -71,18 +71,7 @@ class Person &lt; Profile
   has_and_belongs_to_many :acepted_forums, :class_name => 'Forum', :join_table => 'terms_forum_people'
   has_and_belongs_to_many :articles_with_access, :class_name => 'Article', :join_table => 'article_privacy_exceptions'
-  named_scope :more_popular,
-      :select => "#{Profile.qualified_column_names}, count(friend_id) as total",
-      :group => Profile.qualified_column_names,
-      :joins => "LEFT OUTER JOIN friendships on profiles.id = friendships.person_id",
-      :order => "total DESC"
-
-  named_scope :more_active,
-    :select => "#{Profile.qualified_column_names}, count(action_tracker.id) as total",
-    :joins => "LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.user_id",
-    :group => Profile.qualified_column_names,
-    :order => 'total DESC',
-    :conditions => ['action_tracker.created_at >= ? OR action_tracker.id IS NULL', ActionTracker::Record::RECENT_DELAY.days.ago]
+  named_scope :more_popular, :order => 'friends_count DESC'
   named_scope :abusers, :joins => :abuse_complaints, :conditions => ['tasks.status = 3'], :select => 'DISTINCT profiles.*'
   named_scope :non_abusers, :joins => "LEFT JOIN tasks ON profiles.id = tasks.requestor_id AND tasks.type='AbuseComplaint'", :conditions => ["tasks.status != 3 OR tasks.id is NULL"], :select => "DISTINCT profiles.*"
@@ -501,6 +490,17 @@ class Person &lt; Profile
     gravatar_profile_image_url(self.email, :size=>20, :d => gravatar_default)
   end
+  settings_items :last_notification, :type => DateTime
+  settings_items :notification_time, :type => :integer, :default => 0
+
+  def notifier
+    @notifier ||= PersonNotifier.new(self)
+  end
+
+  after_update do |person|
+    person.notifier.reschedule_next_notification_mail
+  end
+
   protected
   def followed_by?(profile)
@@ -0,0 +1,89 @@
+class PersonNotifier
+
+  def initialize(person)
+    @person = person
+  end
+
+  def self.schedule_all_next_notification_mail
+    Delayed::Job.enqueue(NotifyAllJob.new) unless NotifyAllJob.exists?
+  end
+
+  def schedule_next_notification_mail
+    dispatch_notification_mail if !NotifyJob.exists?(@person.id)
+  end
+
+  def dispatch_notification_mail
+    Delayed::Job.enqueue(NotifyJob.new(@person.id), nil, @person.notification_time.hours.from_now) if @person.notification_time>0
+  end
+
+  def reschedule_next_notification_mail
+    return nil unless @person.setting_changed?(:notification_time) || @person.setting_changed?(:last_notification)
+    NotifyJob.find(@person.id).delete_all
+    schedule_next_notification_mail
+  end
+
+  def notify
+    if @person.notification_time && @person.notification_time > 0
+      from = @person.last_notification || DateTime.now - @person.notification_time.hours
+      notifications = @person.tracked_notifications.find(:all, :conditions => ["created_at > ?", from])
+      Noosfero.with_locale @person.environment.default_language do
+        Mailer::deliver_content_summary(@person, notifications) unless notifications.empty?
+      end
+      @person.settings[:last_notification] = DateTime.now
+      @person.save!
+    end
+  end
+
+  class NotifyAllJob
+    def self.exists?
+      Delayed::Job.where(:handler => "--- !ruby/object:PersonNotifier::NotifyAllJob {}\n\n").count > 0
+    end
+
+    def perform
+      Person.find_each {|person| person.notifier.schedule_next_notification_mail }
+    end
+  end
+
+  class NotifyJob < Struct.new(:person_id)
+
+    def self.exists?(person_id)
+      !find(person_id).empty?
+    end
+
+    def self.find(person_id)
+      Delayed::Job.where(:handler => "--- !ruby/struct:PersonNotifier::NotifyJob \nperson_id: #{person_id}\n")
+    end
+
+    def perform
+      Person.find(person_id).notifier.notify
+    end
+
+    def on_permanent_failure
+      person = Person.find(person_id)
+      person.notifier.dispatch_notification_mail
+    end
+
+  end
+
+  class Mailer < ActionMailer::Base
+
+    add_template_helper(PersonNotifierHelper)
+
+    def session
+      {:theme => nil}
+    end
+
+    def content_summary(person, notifications)
+      @current_theme = 'default'
+      @profile = person
+      recipients person.email
+      from "#{@profile.environment.name} <#{@profile.environment.contact_email}>"
+      subject _("[%s] Network Activity") % [@profile.environment.name]
+      body :recipient => @profile.nickname || @profile.name,
+        :environment => @profile.environment.name,
+        :url => @profile.environment.top_url,
+        :notifications => notifications
+      content_type "text/html"
+    end
+  end
+end
@@ -92,10 +92,6 @@ class Profile &lt; ActiveRecord::Base
     members.order(:name)
   end
-  def members_count
-    members.count
-  end
-
   class << self
     def count_with_distinct(*args)
       options = args.last || {}
@@ -118,10 +114,11 @@ class Profile &lt; ActiveRecord::Base
   named_scope :visible, :conditions => { :visible => true }
   named_scope :public, :conditions => { :visible => true, :public_profile => true }
-  # Subclasses must override these methods
+
+  # Subclasses must override this method
   named_scope :more_popular
-  named_scope :more_active
+  named_scope :more_active,  :order => 'activities_count DESC'
   named_scope :more_recent, :order => "created_at DESC"
   acts_as_trackable :dependent => :destroy
@@ -616,10 +613,10 @@ private :generate_url, :url_options
   # Adds a person as member of this Profile.
   def add_member(person)
     if self.has_members?
-      if self.closed? && members_count > 0
+      if self.closed? && members.count > 0
         AddMember.create!(:person => person, :organization => self) unless self.already_request_membership?(person)
       else
-        self.affiliate(person, Profile::Roles.admin(environment.id)) if members_count == 0
+        self.affiliate(person, Profile::Roles.admin(environment.id)) if members.count == 0
         self.affiliate(person, Profile::Roles.member(environment.id))
       end
     else
@@ -14,7 +14,7 @@ class Scrap &lt; ActiveRecord::Base
   named_scope :not_replies, :conditions => {:scrap_id => nil}
-  track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target 
+  track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target
   track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender == s.receiver}
@@ -59,7 +59,7 @@ class Scrap &lt; ActiveRecord::Base
       sender, receiver = scrap.sender, scrap.receiver
       recipients receiver.email
-      from "#{sender.environment.name} <#{sender.environment.contact_email}>"
+      from "#{sender.environment.name} <#{sender.environment.noreply_email}>"
       subject _("[%s] You received a scrap!") % [sender.environment.name]
       body :recipient => receiver.name,
         :sender => sender.name,
@@ -60,7 +60,7 @@ class TaskMailer &lt; ActionMailer::Base
   end
   def self.generate_from(task)
-    "#{task.environment.name} <#{task.environment.contact_email}>"
+    "#{task.environment.name} <#{task.environment.noreply_email}>"
   end
   def generate_environment_url(task, url = {})
@@ -42,17 +42,25 @@ class Theme
     end
     def approved_themes(owner)
-      Dir.glob(File.join(system_themes_dir, '*')).select do |item|
-        if File.exists?( File.join(item, 'theme.yml') )
-          config = YAML.load_file(File.join(item, 'theme.yml'))
-          (config['owner_type'] == owner.class.base_class.name) &&
-          (config['owner_id'] == owner.id) || config['public']
+      Dir.glob(File.join(system_themes_dir, '*')).map do |item|
+        next unless File.exists? File.join(item, 'theme.yml')
+        id = File.basename item
+        config = YAML.load_file File.join(item, 'theme.yml')
+
+        approved = config['public']
+        unless approved
+          begin
+            approved = owner.kind_of?(config['owner_type'].constantize)
+          rescue
+          end
+          approved &&= config['owner_id'] == owner.id if config['owner_id'].present?
         end
-      end.map do |desc|
-        new(File.basename(desc))
+
+        [id, config] if approved
+      end.compact.map do |id, config|
+        new id, config
       end
     end
-
   end
   class DuplicatedIdentifier < Exception; end
@@ -12,15 +12,12 @@ class UploadedFile &lt; Article
   include ShortFilename
-  settings_items :title, :type => 'string'
-  xss_terminate :only => [ :title ]
-
-  def title_with_default
-    title_without_default || short_filename(name, 60)
+  def title
+    if self.name.present? then self.name else self.filename end
+  end
+  def title= value
+    self.name = value
   end
-  alias_method_chain :title, :default
-
-  validates_size_of :title, :maximum => 60, :if => (lambda { |file| !file.title.blank? })
   sanitize_filename
@@ -32,10 +29,6 @@ class UploadedFile &lt; Article
     self.image? ? self.full_filename(:display).gsub(File.join(RAILS_ROOT, 'public'), '') : nil
   end
-  def display_title
-    title.blank? ? name : title
-  end
-
   def first_paragraph
     ''
   end
@@ -109,7 +102,7 @@ class UploadedFile &lt; Article
   alias :orig_set_filename :filename=
   def filename=(value)
     orig_set_filename(value)
-    self.name = self.filename
+    self.name ||= self.filename
   end
   def download_headers
@@ -54,7 +54,7 @@ class User &lt; ActiveRecord::Base
     def activation_email_notify(user)
       user_email = "#{user.login}@#{user.email_domain}"
       recipients user_email
-      from "#{user.environment.name} <#{user.environment.contact_email}>"
+      from "#{user.environment.name} <#{user.environment.noreply_email}>"
       subject _("[%{environment}] Welcome to %{environment} mail!") % { :environment => user.environment.name }
       body :name => user.name,
         :email => user_email,
@@ -66,12 +66,13 @@ class User &lt; ActiveRecord::Base
     def activation_code(user)
       recipients user.email
-      from "#{user.environment.name} <#{user.environment.contact_email}>"
+      from "#{user.environment.name} <#{user.environment.noreply_email}>"
       subject _("[%s] Activate your account") % [user.environment.name]
       body :recipient => user.name,
         :activation_code => user.activation_code,
         :environment => user.environment.name,
-        :url => user.environment.top_url
+        :url => user.environment.top_url,
+        :redirection => (true if user.return_to)
     end
     def signup_welcome_email(user)
@@ -81,7 +82,7 @@ class User &lt; ActiveRecord::Base
       content_type 'text/html'
       recipients user.email
-      from "#{user.environment.name} <#{user.environment.contact_email}>"
+      from "#{user.environment.name} <#{user.environment.noreply_email}>"
       subject email_subject.blank? ? _("Welcome to environment %s") % [user.environment.name] : email_subject
       body email_body
     end
@@ -93,7 +94,7 @@ class User &lt; ActiveRecord::Base
       self.person.save!
     end
   end
-  
+
   has_one :person, :dependent => :destroy
   belongs_to :environment
@@ -183,7 +184,7 @@ class User &lt; ActiveRecord::Base
     encryption_methods[sym] = block
   end
-  # the encryption method used for this instance 
+  # the encryption method used for this instance
   def encryption_method
     (password_type || User.system_encryption_method).to_sym
   end
@@ -226,7 +227,7 @@ class User &lt; ActiveRecord::Base
   end
   def remember_token?
-    remember_token_expires_at && Time.now.utc < remember_token_expires_at 
+    remember_token_expires_at && Time.now.utc < remember_token_expires_at
   end
   # These create and unset the fields required for remembering users between browser closes
@@ -255,7 +256,7 @@ class User &lt; ActiveRecord::Base
     raise IncorrectPassword unless self.authenticated?(current)
     self.force_change_password!(new, confirmation)
   end
-  
+
   # Changes the password of a user without asking for the old password. This
   # method is intended to be used by the "I forgot my password", and must be
   # used with care.
@@ -326,7 +327,7 @@ class User &lt; ActiveRecord::Base
   end
   protected
-    # before filter 
+    # before filter
     def encrypt_password
       return if password.blank?
       self.salt ||= Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record?
@@ -8,6 +8,8 @@ class ProfileSweeper # &lt; ActiveRecord::Observer
   end
   def after_create(profile)
+    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+    #      the Noosfero core soon, see ActionItem3045
     expire_statistics_block_cache(profile)
   end
@@ -29,6 +31,8 @@ protected
     expire_blogs(profile) if profile.organization?
   end
+  # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+  #      the Noosfero core soon, see ActionItem3045
   def expire_statistics_block_cache(profile)
     blocks = profile.environment.blocks.select { |b| b.kind_of?(EnvironmentStatisticsBlock) }
     BlockSweeper.expire_blocks(blocks)
@@ -7,6 +7,8 @@
 <% @profile_data = @person %>
+<%= javascript_include_tag('sign_up_password_rate') %>
+
 <%= error_messages_for :user, :person, :header_message => _('The account could not be created') %>
 <% labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form', :honeypot => true } do |f| %>
@@ -52,7 +54,20 @@
   <div id='signup-password'>
     <%= required f.password_field(:password, :id => 'user_pw') %>
     <%= content_tag(:small,_('Choose a password that you can remember easily. It must have at least 4 characters.'), :id => 'password-balloon') %>
-    <div id='fake-check'><p>&nbsp;</p></div>
+    <div id='password-rate'>
+      <p><span class="invalid hidden" id='result-short'>
+        <%=_('Short') %>
+      </span></p>
+      <p><span class="invalid hidden" id='result-bad'>
+        <%=_('Bad') %>
+      </span></p>
+      <p><span class="invalid hidden" id='result-good'>
+        <%=_('Good') %>
+      </span></p>
+      <p><span class="invalid hidden" id='result-strong'>
+        <%=_('Strong') %>
+      </span></p>
+    </div>
   </div>
   <div id='signup-password-confirmation'>
@@ -182,4 +197,5 @@ jQuery(function($) {
     else $(this).addClass('validated');
   });
 });
+
 </script>
 <%= required labelled_form_field(_('Site name'), text_field(:environment, :name)) %>
 <%= labelled_form_field(_('Contact email'), text_field(:environment, :contact_email)) %>
+<%= labelled_form_field(_('No reply email'), text_field(:environment, :noreply_email)) %>
 <% themes_options = Theme.system_themes.map {|theme| [theme.name, theme.id] }.sort %>
 <%= labelled_form_field(_('Theme'), select(:environment, :theme, options_for_select(themes_options, environment.theme))) %>
 <%= required f.text_field(:reports_lower_bound, :size => 3) %>
 <div class="vcard">
-<p><%= block.title %></p>
+<% if block.title.present? %>
+  <p><%= block.title %></p>
+<% end %>
 <div class="profile-big-image">
   <div class="profile-big-image-inner1">
@@ -16,7 +18,7 @@
 <% if !user.nil? and user.has_permission?('edit_profile', profile) %>
   <div class='admin-link'>
-    <%= link_to _('Control panel'), :controller => 'profile_editor' %>
+    <%= link_to _('Control panel'), block.owner.admin_url %>
   </div>
 <% end %>
@@ -21,7 +21,7 @@
     <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
   <% end %>
   <% if !user.nil? and user.has_permission?('edit_profile', profile) %>
-    <li><%= link_to _('Control panel'), :controller => 'profile_editor' %></li>
+    <li><%= link_to _('Control panel'), block.owner.admin_url %></li>
   <% end %>
   <% if profile.person? %>
     <li><%= _('Since %{year}/%{month}') % { :year => block.owner.created_at.year, :month => block.owner.created_at.month } %></li>
@@ -40,7 +40,7 @@
 <% end %>
 <div class="profile-info-options">
-  <%= render :file => view_for_profile_actions(@block.owner.class) %>
+  <%= render :file => view_for_profile_actions(block.owner.class) %>
 </div>
 </div><!-- end class="vcard" -->
+<%= javascript_include_tag "edit-link-list.js" %>
+
 <strong><%= _('Links') %></strong>
 <div id='edit-link-list-block'>
-<table id='links' class='noborder'>
-  <tr>
-    <th><%= _('Icon') %></th>
-    <th><%= _('Name') %></th>
-    <th><%= _('Address') %></th>
-    <th><%= _('Title') %></th>
-    <th><%= _('Target') %></th>
-  </tr>
-  <% for link in @block.links do %>
-  <tr>
-    <td><%= icon_selector(link['icon']) %></td>
-    <td><%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %></td>
-    <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %></td>
-    <td><%= text_field_tag 'block[links][][title]', link[:title], :class => 'link-title' %></td>
-    <td><%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %></td>
-  </tr>
-  <% end %>
-</table>
+  <ul class='link-list-header'>
+    <li class='link-list-icon'><%= _('Icon') %></li>
+    <li class='link-list-name'><%= _('Name') %></li>
+    <li class='link-list-address'><%= _('Address') %></li>
+    <li class='link-list-target'><%= _('Target') %></li>
+  </ul>
+  <ul id="dropable-link-list">
+    <% for link in @block.links do %>
+      <li>
+        <ul class="link-list-row">
+          <li>
+            <%= icon_selector(link['icon']) %>
+          </li>
+          <li>
+            <%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %>
+          </li>
+          <li>
+            <%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %>
+          </li>
+          <li>
+            <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
+          </li>
+          <li>
+            <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row") %>
+          </li>
+        </ul>
+      </li>
+    <% end %>
+  </ul>
+  <input type="hidden" id="page_url" value="<%=url_for(:action=>'search_autocomplete')%>" />
 </div>
 <%= link_to_function(_('New link'), nil, :class => 'button icon-add with-text') do |page|
-    page.insert_html :bottom, 'links', content_tag('tr',
-      content_tag('td', icon_selector('ok')) +
-      content_tag('td', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
-      content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'link-address'), :class => 'cel-address') +
-      content_tag('td', text_field_tag('block[links][][title]', '', :class => 'link-title')) +
-      content_tag('td', select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, '_self')))
+    page.insert_html :bottom, 'dropable-link-list', content_tag('li',
+      content_tag('ul',
+        content_tag('li', icon_selector('ok')) +
+        content_tag('li', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
+        content_tag('li', text_field_tag('block[links][][address]', nil, :class => 'link-address')) +
+        content_tag('li', select_tag('block[links][][target]',
+        options_for_select(LinkListBlock::TARGET_OPTIONS, '_self'))) +
+        content_tag('li', button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row")),
+      :class=>"link-list-row new_link_row")
     ) +
-    javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
+    javascript_tag("new_link_action()")
 end %>
@@ -7,13 +7,14 @@
     <%= render :partial => partial_for_class(@block.class) %>
-    <%= labelled_form_field _('Display this block:'), '' %>
-    <div style='margin-left: 10px'>
-      <% @block.display_options.each do |option| %>
-        <%= radio_button(:block, :display, option) %>
-        <%= label_tag("block_display_#{option}", _(@block.display_option_label(option))) %>
-        <br/>
-      <% end %>
+    <div class="display">
+      <%= labelled_form_field _('Display this block:'),
+        select_tag('block[display]', options_from_collection_for_select(@block.display_options, :first, :last, @block.display))
+      %>
+    </div>
+    <div class="display_user">
+      <%= labelled_form_field _('Display to users:'), '' %>
+      <%= select_tag('block[display_user]', options_from_collection_for_select(@block.display_user_options, :first, :last, @block.display_user)) %>
     </div>
     <%= labelled_form_field(_('Show for:'), select(:block, :language, [ [ _('all languages'), 'all']] + environment.locales.map {|key, value| [value, key]} )) %>
@@ -0,0 +1,8 @@
+<div id="addThis">
+  <script type="text/javascript">
+    addthis_pub = '<%= escape_javascript( NOOSFERO_CONF['addthis_pub'] ) %>';
+    addthis_logo = '<%= escape_javascript( NOOSFERO_CONF['addthis_logo'] ) %>';
+    addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>';
+  </script>
+  <a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><%= addthis_image_tag %></a>
+</div>
@@ -26,7 +26,7 @@
       <%= expirable_button @page, :spread, content, url if url %>
     <% end %>
-    <% if !@page.gallery? && @page.allow_create?(user) %>
+    <% if !@page.gallery? && (@page.allow_create?(user) || (@page.parent && @page.parent.allow_create?(user))) %>
       <% if @page.translatable? && !@page.native_translation.language.blank? && !remove_content_button(:locale) %>
         <% content = _('Add translation') %>
         <% parent_id = (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)) %>
@@ -43,21 +43,7 @@
 <%= render :partial => 'shared/disabled_enterprise' %>
 <% if NOOSFERO_CONF['addthis_enabled'] %>
-<div id="addThis">
-<script type="text/javascript">
-  addthis_pub = '<%= escape_javascript( NOOSFERO_CONF['addthis_pub'] ) %>';
-  addthis_logo = '<%= escape_javascript( NOOSFERO_CONF['addthis_logo'] ) %>';
-  addthis_config = {
-    services_custom: {
-      name: 'Facebook',
-      url: '<%= addthis_facebook_url(@page) %>',
-      icon: 'http://cache.addthiscdn.com/icons/v1/thumbs/facebook.gif'
-    }
-  };
-  addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>';
-</script>
-<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><%= addthis_image_tag %></a>
-</div>
+  <%= render :partial => 'addthis' %>
 <% end %>
 <% cache(@page.cache_key(params, user, language)) do %>
@@ -84,6 +70,8 @@
 <%= display_source_info(@page) %>
+<%= @plugins.dispatch(:article_extra_contents, @page).collect { |content| instance_eval(&content) }.join("") %>
+
 <div class="comments" id="comments_list">
   <% if @page.accept_comments? || @comments_count > 0 %>
@@ -92,8 +80,26 @@
     </h3>
   <% end %>
-  <% if @page.accept_comments? && @comments.count > 1 %>
+  <% if @page.accept_comments? && @comments_count > 1 %>
     <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button', :onclick => "jQuery('#page-comment-form .display-comment-form').first().click();") %>
+
+    <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier)) %>
+    <%= javascript_include_tag "comment_order.js" %>
+    <div class="comment-order">
+      <% form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %>
+        <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <% if @page.accept_comments? and @comments.count > 1 %>
+    <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier)) %>
+    <%= javascript_include_tag "comment_order.js" %>
+    <div class="comment-order">
+      <% form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %>
+        <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %>
+      <% end %>
+    </div>
   <% end %>
   <ul class="article-comments-list">
-<%= list_events(@date, @events) %>
 \ No newline at end of file
+<%= list_events(@date, @events) %>
+
+<%= pagination_links @events, :param_name => 'page' %>
-<h2><%= __('Manage community fields') %></h2>
-
 <% labelled_form_for(:environment, @environment, :url => {:action => 'manage_community_fields'}) do |f| %>
 <table id='community_fields_conf'>
@@ -9,21 +7,37 @@
     <th><%= _('Required') %></th>
     <th><%= _('Display on creation?') %></th>
   </tr>
+
+  <tr class='manage-fields-batch-actions'>
+    <td>
+      <%= _("Check/Uncheck All")%>
+    </td>
+    <td>
+      <input type="checkbox" id="community_active" />
+    </td>
+    <td>
+      <input type="checkbox" id="community_required" />
+    </td>
+    <td>
+      <input type="checkbox" id="community_signup" />
+    </td>
+  </tr>
+
   <% @community_fields.each do |field| %>
   <tr>
     <td><label for="community_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
     <td>
       <%= hidden_field_tag  "community_fields[#{field}][active]", false %>
-      <%= check_box_tag "community_fields[#{field}][active]", true, environment.custom_community_field(field, 'active'), :onclick => "$('community_fields[#{field}][required]').disabled=$('community_fields[#{field}][signup]').disabled=!this.checked;" %>
+      <%= check_box_tag "community_fields[#{field}][active]", true, environment.custom_community_field(field, 'active'), :onclick => "active_action(this, 'community_fields[#{field}][required]', 'community_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "community_fields[#{field}][required]", false %>
-      <%= check_box_tag "community_fields[#{field}][required]", true, environment.custom_community_field(field, 'required'), :onclick => "if(this.checked) $('community_fields[#{field}][signup]').checked = true;" %>
+      <%= check_box_tag "community_fields[#{field}][required]", true, environment.custom_community_field(field, 'required'), :onclick => "required_action('community_fields[#{field}][active]','community_fields[#{field}][required]', 'community_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "community_fields[#{field}][signup]", false %>
-      <%= check_box_tag "community_fields[#{field}][signup]", true, environment.custom_community_field(field, 'signup'), :onclick => "if(!this.checked) $('community_fields[#{field}][required]').checked = false;" %>
+      <%= check_box_tag "community_fields[#{field}][signup]", true, environment.custom_community_field(field, 'signup'), :onclick => "signup_action('community_fields[#{field}][active]','community_fields[#{field}][required]', 'community_fields[#{field}][signup]')" %>
     </td>
   </tr>
@@ -31,18 +45,18 @@
 </table>
 <script type='text/javascript'>
-  var trs = $$('#community_fields_conf tr');
+  var trs = jQuery('#community_fields_conf tr');
   var tr, td2;
-  for ( var i=0; tr=trs[i]; i++ ) {
+  for ( var i=2; tr=trs[i]; i++ ) {
     if ( td2 = tr.getElementsByTagName('td')[1] ) {
-      td2.getElementsByTagName('input')[0].onclick();
+      td2.getElementsByTagName('input')[1].onclick();
     }
   }
 </script>
 <div>
   <% button_bar do %>
-    <%= submit_button('save', _('Save changes')) %>
+    <%= submit_button('save', _('Save changes'), :id=>"save_community_fields") %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
 </div>
-<h2><%= __('Manage enterprise fields') %></h2>
-
 <% labelled_form_for(:environment, @environment, :url => {:action => 'manage_enterprise_fields'}) do |f| %>
 <table id='enterprise_fields_conf'>
@@ -9,21 +7,37 @@
     <th><%= _('Required') %></th>
     <th><%= _('Display on registration?') %></th>
   </tr>
+
+  <tr class='manage-fields-batch-actions'>
+    <td>
+      <%= _("Check/Uncheck All")%>
+    </td>
+    <td>
+      <input type="checkbox" id="enterprise_active" />
+    </td>
+    <td>
+      <input type="checkbox" id="enterprise_required" />
+    </td>
+    <td>
+      <input type="checkbox" id="enterprise_signup" />
+    </td>
+  </tr>
+
   <% @enterprise_fields.each do |field| %>
   <tr>
     <td><label for="enterprise_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
     <td>
       <%= hidden_field_tag  "enterprise_fields[#{field}][active]", false %>
-      <%= check_box_tag "enterprise_fields[#{field}][active]", true, environment.custom_enterprise_field(field, 'active'), :onclick => "$('enterprise_fields[#{field}][required]').disabled=$('enterprise_fields[#{field}][signup]').disabled=!this.checked;" %>
+      <%= check_box_tag "enterprise_fields[#{field}][active]", true, environment.custom_enterprise_field(field, 'active'), :onclick => "active_action(this, 'enterprise_fields[#{field}][required]', 'enterprise_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "enterprise_fields[#{field}][required]", false %>
-      <%= check_box_tag "enterprise_fields[#{field}][required]", true, environment.custom_enterprise_field(field, 'required'), :onclick => "if(this.checked) $('enterprise_fields[#{field}][signup]').checked = true;" %>
+      <%= check_box_tag "enterprise_fields[#{field}][required]", true, environment.custom_enterprise_field(field, 'required'), :onclick => "required_action('enterprise_fields[#{field}][active]','enterprise_fields[#{field}][required]', 'enterprise_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "enterprise_fields[#{field}][signup]", false %>
-      <%= check_box_tag "enterprise_fields[#{field}][signup]", true, environment.custom_enterprise_field(field, 'signup'), :onclick => "if(!this.checked) $('enterprise_fields[#{field}][required]').checked = false;" %>
+      <%= check_box_tag "enterprise_fields[#{field}][signup]", true, environment.custom_enterprise_field(field, 'signup'), :onclick => "signup_action('enterprise_fields[#{field}][active]','enterprise_fields[#{field}][required]', 'enterprise_fields[#{field}][signup]')" %>
     </td>
   </tr>
@@ -31,18 +45,18 @@
 </table>
 <script type='text/javascript'>
-  var trs = $$('#enterprise_fields_conf tr');
+  var trs = jQuery('#enterprise_fields_conf tr');
   var tr, td2;
-  for ( var i=0; tr=trs[i]; i++ ) {
+  for ( var i=2; tr=trs[i]; i++ ) {
     if ( td2 = tr.getElementsByTagName('td')[1] ) {
-      td2.getElementsByTagName('input')[0].onclick();
+      td2.getElementsByTagName('input')[1].onclick();
     }
   }
 </script>
 <div>
   <% button_bar do %>
-    <%= submit_button('save', _('Save changes')) %>
+    <%= submit_button('save', _('Save changes'), :id=>"save_enterprise_fields") %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
 </div>
-<h2><%= _('Manage person fields') %></h2>
-
 <% labelled_form_for(:environment, @environment, :url => {:action => 'manage_person_fields'}) do |f| %>
 <table id='person_fields_conf'>
@@ -9,31 +7,48 @@
     <th><%= _('Required') %></th>
     <th><%= _('Display on signup?') %></th>
   </tr>
+
+  <tr class='manage-fields-batch-actions'>
+    <td>
+      <%= _("Check/Uncheck All")%>
+    </td>
+    <td>
+      <input type="checkbox" id="person_active" />
+    </td>
+    <td>
+      <input type="checkbox" id="person_required" />
+    </td>
+    <td>
+      <input type="checkbox" id="person_signup" />
+    </td>
+  </tr>
+
   <% @person_fields.each do |field| %>
   <tr>
     <td><label for="person_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
     <td>
       <%= hidden_field_tag  "person_fields[#{field}][active]", false %>
-      <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "$('person_fields[#{field}][required]').disabled=$('person_fields[#{field}][signup]').disabled=!this.checked;" %>
+      <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "active_action(this, 'person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "person_fields[#{field}][required]", false %>
-      <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required'), :onclick => "if(this.checked) $('person_fields[#{field}][signup]').checked = true;" %>
+      <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required'), :onclick => "required_action('person_fields[#{field}][active]','person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "person_fields[#{field}][signup]", false %>
-      <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup'), :onclick => "if(!this.checked) $('person_fields[#{field}][required]').checked = false;" %>
+      <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup'), :onclick => "signup_action('person_fields[#{field}][active]','person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
     </td>
   </tr>
   <% end %>
 </table>
 <script type='text/javascript'>// <!--
-  var trs = $$('#person_fields_conf tr');
+  var trs = jQuery('#person_fields_conf tr');
+
   var tr, td2;
-  for ( var i=0; tr=trs[i]; i++ ) {
+  for ( var i=2; tr=trs[i]; i++ ) {
     if ( td2 = tr.getElementsByTagName('td')[1] ) {
-      td2.getElementsByTagName('input')[0].onclick();
+      td2.getElementsByTagName('input')[1].onclick();
     }
   }
   // -->
@@ -41,7 +56,7 @@
 <div>
   <% button_bar do %>
-    <%= submit_button('save', _('Save changes')) %>
+    <%= submit_button('save', _('Save changes'), :id=>"save_person_fields") %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
 </div>
@@ -26,9 +26,13 @@ Check all the features you want to enable for your environment, uncheck all the 
 <h2><%= _('Configure features') %></h2>
+<h3><%= _('Page to redirect after signup') %></h3>
+  <%=  select 'environment', 'redirection_after_signup', Environment.signup_redirection_options.map{|key,value|[value,key]} %>
+<hr/>
 <h3><%= _('Page to redirect after login') %></h3>
   <%=  select 'environment', 'redirection_after_login', Environment.login_redirection_options.map{|key,value|[value,key]} %>
 <hr/>
+
 <h3><%= _('Organization Approval Method') %></h3>
   <%= select_organization_approval_method('environment', 'organization_approval_method') %>
 <hr/>
-<%= render :partial => 'manage_person_fields' %>
+<h1><%= _('Manage fields displayed for profiles') %></h1>
-<% if !environment.enabled?('disable_asset_enterprises') %>
-  <%= render :partial => 'manage_enterprise_fields' %>
+<% tabs = [] %>
+<% tabs << {:title => _("Person's fields"), :id => 'person-fields',
+  :content => (render :partial => 'manage_person_fields')} %>
+<% tabs << {:title => _("Community's fields"), :id => 'community-fields',
+  :content => (render :partial => 'manage_community_fields')} %>
+<% unless environment.enabled?('disable_asset_enterprises') %>
+  <% tabs << {:title => _("Enterprise's fields"), :id => 'enterprise-fields',
+  :content => (render :partial => 'manage_enterprise_fields')} %>
 <% end %>
-<%= render :partial => 'manage_community_fields' %>
+<%= render_tabs(tabs) %>
+
+<%= javascript_include_tag "manage-fields.js" %>
@@ -6,6 +6,27 @@
     <!--<meta http-equiv="refresh" content="1"/>-->
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta name="description" content="<%= @environment.name %>" />
+
+    <!-- Twitter Card -->
+    <meta name="twitter:card" value="summary">
+    <meta name="twitter:title" content="<%= h page_title %>">
+    <meta name="twitter:description" content="<%= meta_description_tag(@page) %>">
+
+    <!-- Open Graph -->
+    <meta property="og:type" content="<%= @page ? 'article' : 'website' %>">
+    <meta property="og:url" content="<%= @page ? url_for(@page.url) : @environment.top_url %>">
+    <meta property="og:title" content="<%= h page_title %>">
+    <meta property="og:site_name" content="<%= profile ? profile.name : @environment.name %>">
+    <meta property="og:description" content="<%= @page ? truncate(strip_tags(@page.body.to_s), :length => 200) : @environment.name %>">
+
+    <% if @page %>
+      <meta property="article:published_time" content="<%= show_date(@page.published_at) %>">
+      <% @page.body_images_paths.each do |img| %>
+        <meta name="twitter:image" content="<%= img.to_s %>">
+        <meta property="og:image" content="<%= img.to_s %>">
+      <% end %>
+    <% end %>
+
     <link rel="shortcut icon" href="<%= image_path(theme_favicon) %>" type="image/x-icon" />
     <%= noosfero_javascript %>
     <%= noosfero_stylesheets %>
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => { :activity => activity } %>
@@ -0,0 +1,33 @@
+<% Comment %>
+<% Profile %>
+<% Person %>
+
+<table style="background: #f0f0f1;border-bottom: 1px solid #d2d2d2 !important;border-top: 1px solid #fff;margin-bottom: 0;">
+<tr>
+  <td>
+  <% if comment.author %>
+    <%= link_to profile_image(comment.author, :minor),
+        comment.author_url,
+        :class => 'comment-picture',
+        :title => comment.author_name
+    %>
+  <% end %>
+  </td>
+  <td>
+      <%= comment.author.present? ? link_to(comment.author_name, comment.author.url, :style => "font-size: 12px; color: #333; font-weight: bold; text-decoration: none;") : content_tag('strong', comment.author_name) %>
+      <% unless comment.title.blank? %>
+        <span style="font-size: 12px;"><%= comment.title %></span><br/>
+      <% end %>
+      <span style="font-size: 10px;"><%= txt2html comment.body %></span><br/>
+      <span style="font-size: 8px; color: #444444"><%= time_ago_as_sentence(comment.created_at) %></span>
+  <br style="clear: both;" />
+
+  <% unless comment.replies.blank? %>
+  <ul class="comment-replies">
+    <% comment.replies.each do |reply| %>
+      <%= render :partial => 'comment', :locals => { :comment => reply } %>
+    <% end %>
+  </ul>
+  <% end %>
+  </td>
+</table>
@@ -0,0 +1,27 @@
+<table>
+<tr>
+  <td>
+    <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+  </td>
+  <td>
+    <p style="width:550px">
+    <span style="font-size: 14px;"><%= link_to activity.user.short_name(20), activity.user.url %></span>
+    <span style="font-size: 14px;"><%= _("has published on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url, :style => "color: #333; font-weight: bold; text-decoration: none;") if activity.target.profile.is_a?(Community) %></span>
+    <span style="font-size: 10px; color: #444444; float:right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+    </p>
+    <p>
+    <span style="font-size: 14px;"><%= link_to(activity.params['name'], activity.params['url'], :style => "color: #333; font-weight: bold; text-decoration: none;") %></span>
+    <br/>
+    <span title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-new<%= activity.target.class.icon_name %>'></span>
+    <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'], :length => 1000, :ommision => '...')).gsub(/(\xC2\xA0|\s)+/, ' ').gsub(/^\s+/, '') %>
+    </p>
+    <p><%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %></p>
+  </td>
+</tr>
+<tr>
+  <td></td>
+  <td>
+    <%= render :partial => 'profile_comments', :locals => { :activity => activity } %>
+  </td>
+</tr>
+</table>
@@ -0,0 +1,19 @@
+<table>
+<tr>
+  <td>
+    <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+  </td>
+  <td>
+    <p style="width:550px">
+      <span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>
+      <span style="font-size: 10px; color: #444444; float: right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+    </p>
+  </td>
+</tr>
+<tr>
+  <td></td>
+  <td>
+    <%= render :partial => 'profile_comments', :locals => { :activity => activity } %>
+  </td>
+</tr>
+</table>
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => { :activity => activity } %>
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => { :activity => activity } %>
@@ -0,0 +1 @@
+_leave_scrap.rhtml
 \ No newline at end of file
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => { :activity => activity } %>
@@ -0,0 +1,13 @@
+<% if activity.comments_count > 2 %>
+  <div style="font-size: 10px;">
+    <% if activity.params['url'].blank?  %>
+      <%= _("%s comments") % activity.comments_count %>
+    <% else %>
+      <%= link_to(_("View all %s comments") % activity.comments_count, activity.params['url']) %>
+    <% end %>
+  </div>
+<% else %>
+  <ul>
+    <%= render :partial => 'comment', :collection => activity.comments %>
+  </ul>
+<% end %>
@@ -0,0 +1 @@
+_leave_scrap.rhtml
 \ No newline at end of file
@@ -0,0 +1,15 @@
+<table>
+  <tr>
+    <td>
+      <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+    </td>
+    <td>
+      <p style="width:550px">
+        <span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>
+        <span style="font-size: 10px; color: #444444; float:right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+      </p>
+  </td>
+</tr>
+</table>
+<div title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-newgallery'></div>
+<br/>
@@ -0,0 +1,18 @@
+<h3><%= _("%s's network activity") % @profile.name %></h3>
+<br/>
+<div>
+<% @notifications.each do |activity| %>
+  <div style="border-left:none;border-right:none;border-top:1px solid #ccc;border-bottom:none;padding:10px;width:600px">
+    <%= render :partial => activity.verb, :locals => { :activity => activity } rescue "cannot render notification for #{activity.verb}" %>
+  </div>
+<% end %>
+</div>
+
+<div style="color:#444444;font-size:11px;">
+<p><%= _("Greetings,") %></p>
+<br/>
+<p>--</p>
+<p><%= _('%s team.') % @environment %></p>
+<p><%= url_for @url %></p>
+</div>
+<br/>
@@ -19,3 +19,8 @@
   <%= @plugins.dispatch(:profile_info_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
   <%= render :partial => 'person_form', :locals => {:f => f} %>
+
+  <h2><%= _('Notification options') %></h2>
+  <div>
+    <%= select_tag 'profile_data[notification_time]', options_for_select([[_('Disabled'), 0], [_('Hourly'), 1], [_('Half Day'), 12], [_('Daily'), 24]], @profile.notification_time) %>
+  </div>
-<div id="category-ajax-selector">
+<% extend CategoriesHelper %>
+
 <% if !@current_category.nil? %>
-  <h3 class="box-title"><%= _('Current category:') %></h3>
   <%= hidden_field_tag "#{object_name}[#{object_name}_category_id]", @current_category.id unless multiple %>
+  <%= hidden_field_tag "#{object_name}[category_ids][]", @current_category.id if multiple %>
+  <%= button_to_remote_without_text(:back, _('Back'),
+      { :update => "select-categories",
+        :url => { :action => 'update_categories', :id => @object },
+        :loaded => visual_effect(:highlight, "select-categories")
+      },
+      :id => 'cancel-category-button') %>
   <%
     categories = [@current_category]
     categories.push(@current_category) while @current_category = @current_category.parent
   %>
   <%= categories.compact.reverse.map{|i|
-    link_to_remote(i.name, 
+    link_to_remote(i.name,
       :update => "select-categories",
       :url => { :action => 'update_categories', :category_id => i.id, :id => @object },
       :loaded => visual_effect(:highlight, "select-categories"),
       :class => 'select-current-category-link')}.join(' &rarr; ')
   %>
-  <strong>
-  <%= button_to_function_without_text(:save, _('Save'), nil, :id => 'save-category-button') do |page|
-    page.insert_html :bottom, 'selected-categories', content_tag('li', categories.first.full_name +
+  <%= button_to_function_without_text(:add, _('Add'), nil, :id => 'save-category-button') do |page|
+    page.insert_html :bottom, 'selected-categories', content_tag('div',
       hidden_field_tag("#{object_name}[category_ids][]", categories.first.id) +
-      button_to_function_without_text(:cancel, _('Remove'), nil, :id => "remove-selected-category-#{categories.first.id}-button") {|page| page["selected-category-#{categories.first.id}"].remove}, :id => "selected-category-#{categories.first.id}")
+      selected_category_link(categories.first), :id => "selected-category-#{categories.first.id}")
+    page.replace_html 'select-categories', :partial => 'shared/select_subcategories',
+      :locals => {:object_name => object_name, :categories => @toplevel_categories}
   end if multiple %>
-  <%= button_to_remote_without_text(:cancel, _('Cancel'),
-      { :update => "select-categories",
-        :url => { :action => 'update_categories', :id => @object },
-        :loaded => visual_effect(:highlight, "select-categories")
-      },
-      :id => 'cancel-category-button') %>
-  </strong>
-<% else %>
-  <h3 class="box-title"><%= _('Select a category:') %></h3>
 <% end %>
-<% if !@categories.empty? %>
-  <h3><%= _('Categories:') %></h3>
-  <% @categories.select{|i| !@object.respond_to?(:accept_category?) || @object.accept_category?(i)}.each do |category| %>
-    <%= link_to_remote category.name,
-      { :update => "select-categories",
-        :url => { :action => "update_categories", :category_id => category.id, :id => @object},
-        :loaded => visual_effect(:highlight, "select-categories")
-      },
-      :class => 'select-subcategory-link',
-      :id => "select-category-#{category.id}-link"
-    %>
-  <% end %> &nbsp;
-<% end %>
+<div class="toplevel-categories">
+  <%= render :partial => 'shared/select_subcategories', :locals => {:object_name => object_name, :categories => @categories} %>
 </div>
@@ -0,0 +1,26 @@
+<% categories_selected ||= nil %>
+<% title ||= nil %>
+
+<% extend CategoriesHelper %>
+
+<%= content_tag "h#{title_size}", title, :class => "box-title" %>
+
+<%= hidden_field_tag "#{object_name}[category_ids][]", nil %>
+
+<div id="category-ajax-selector">
+<% unless categories_selected.nil? %>
+<div id="selected-categories">
+  <div class="label"><%= _('Selected categories:') %></div>
+  <% categories_selected.each do |cat| %>
+    <div id="selected-category-<%= cat.id %>">
+      <%= hidden_field_tag("#{object_name}[category_ids][]", cat.id) %>
+      <%= selected_category_link(cat) %>
+    </div>
+  <% end %>
+</div>
+<% end %>
+<div id="select-categories">
+  <%= render :partial => 'shared/select_categories', :locals => {:object_name => object_name, :multiple => true, :categories_selected => categories_selected }, :layout => false %>
+</div>
+
+</div>
@@ -0,0 +1,16 @@
+<% if !categories.nil? && !categories.empty? && !@object.nil? %>
+  <hr>
+  <div class="category-helper-label"><%= _('Click to select a category') %></div>
+
+  <% categories.select{|i| @object.accept_category?(i)}.each do |category| %>
+
+    <%= link_to_remote category.name,
+      { :update => "select-categories",
+        :url => { :action => "update_categories", :category_id => category.id, :id => @object},
+        :loaded => visual_effect(:highlight, "select-categories")
+      },
+      :class => 'select-subcategory-link',
+      :id => "select-category-#{category.id}-link"
+    %>
+  <% end %>
+<% end %>
 <% if block.cacheable? && use_cache %>
-  <% cache_timeout(block.cache_key(language), block.timeout) do %>
+  <% cache_timeout(block.cache_key(language, user), block.timeout) do %>
     <%= display_block_content(block, user, main_content) %>
   <% end %>
 <% else %>
@@ -12,7 +12,7 @@
           "/designs/templates/#{template.id}/thumbnail.png",
           :alt => _('The "%s" template')) +
         '<div class="opt-info">'.html_safe +
-        content_tag('strong', template.name, :class => 'name') +
+        content_tag('strong', template.name, :title => template.title, :class => 'name') +
         ' <br/> '.html_safe
         if @current_template == template.id  # selected
 <%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
-<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code) }) %>
+<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection) }) %>
 <%= _("Greetings,") %>
@@ -19,16 +19,17 @@
       <td class='actions'>
         <div class="members-buttons-cell">
           <% if p.is_admin? %>
-            <%= button_without_text :'reset-admin-role', _('Reset admin role'), :action => 'reset_admin_role', :id => p, :q => @q, :filter => @filter %>
+            <%= button_without_text :'reset-admin-role', _('Reset admin role'), {:action => 'reset_admin_role', :id => p, :q => @q}, :filter => @filter, :confirm => _("Do you want to reset this user as administrator?") %>
           <% else %>
-            <%= button_without_text :'set-admin-role', _('Set admin role'), :action => 'set_admin_role', :id => p, :q => @q, :filter => @filter %>
+            <%= button_without_text :'set-admin-role', _('Set admin role'), {:action => 'set_admin_role', :id => p, :q => @q}, :filter => @filter, :confirm => _("Do you want to set this user as administrator?") %>
           <% end %>
           <% if !p.user.activated? %>
-            <%= button_without_text :'activate-user', _('Activate user'), :action => 'activate', :id => p, :q => @q, :filter => @filter %>
+            <%= button_without_text :'activate-user', _('Activate user'), {:action => 'activate', :id => p, :q => @q}, :filter => @filter, :confirm => _("Do you want to activate this user?") %>
           <% else %>
-            <%= button_without_text :'deactivate-user', _('Deactivate user'), :action => 'deactivate', :id => p, :q => @q, :filter => @filter %>
+            <%= button_without_text :'deactivate-user', _('Deactivate user'), {:action => 'deactivate', :id => p, :q => @q}, :filter => @filter, :confirm => _("Do you want to deactivate this user?") %>
           <% end %>
-        </div>
+          <%= button_without_text :'delete', _('Remove'), {:action => :destroy_user, :id => p, :q => @q}, :method => :post, :filter => @filter, :confirm => _("Do you want to remove this user?") %>
+       </div>
       </td>
     </tr>
   <% end %>
@@ -0,0 +1,6 @@
+if Delayed::Backend::ActiveRecord::Job.table_exists?
+  job = Delayed::Backend::ActiveRecord::Job.all :conditions => ['handler LIKE ?', "%ActivitiesCounterCacheJob%"]
+  if job.blank?
+    Delayed::Backend::ActiveRecord::Job.enqueue(ActivitiesCounterCacheJob.new, -3)
+  end
+end
 Delayed::Worker.backend = :active_record
 Delayed::Worker.max_attempts = 2
-Delayed::Worker.max_run_time = 10.minutes
+
+# TODO This is consuming ton of space on development with a postgres connection
+# error on the jobs. This must be verified before going into production.
+# Logging jobs backtraces
+#class Delayed::Worker
+#  def handle_failed_job_with_loggin(job, error)
+#    handle_failed_job_without_loggin(job,error)
+#    Delayed::Worker.logger.error(error.message)
+#    Delayed::Worker.logger.error(error.backtrace.join("\n"))
+#  end
+#  alias_method_chain :handle_failed_job, :loggin
+#end
@@ -0,0 +1,2 @@
+require 'noosfero/role_assignment_ext'
+require 'noosfero/action_tracker_ext'
@@ -0,0 +1,3 @@
+if Delayed::Backend::ActiveRecord::Job.table_exists?
+  PersonNotifier.schedule_all_next_notification_mail
+end
@@ -0,0 +1,9 @@
+class AddRedirectionAfterSignupToEnvironment < ActiveRecord::Migration
+  def self.up
+    add_column :environments, :redirection_after_signup, :string, :default => 'keep_on_same_page'
+  end
+
+  def self.down
+    remove_column :environments, :redirection_after_signup
+  end
+end
@@ -0,0 +1,12 @@
+class MoveTitleVirtualFieldToNameInUploadedFile < ActiveRecord::Migration
+  def self.up
+    UploadedFile.find_each do |uploaded_file|
+      uploaded_file.name = uploaded_file.setting.delete :title
+      uploaded_file.send :update_without_callbacks
+    end
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
@@ -0,0 +1,16 @@
+class MoveContactEmailToNoreplyEmailAtEnvironment < ActiveRecord::Migration
+  def self.up
+    add_column :environments, :noreply_email, :string
+    Environment.reset_column_information
+
+    Environment.find_each do |environment|
+      environment.noreply_email = environment.contact_email
+      environment.contact_email = nil
+      environment.save!
+    end
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
@@ -0,0 +1,13 @@
+class AddIndexesForArticleSearch < ActiveRecord::Migration
+  def self.up
+    add_index :articles, :created_at
+    add_index :articles, :hits
+    add_index :articles, :comments_count
+  end
+
+  def self.down
+    remove_index :articles, :created_at
+    remove_index :articles, :hits
+    remove_index :articles, :comments_count
+  end
+end
@@ -0,0 +1,9 @@
+class AddIndexesForProfileSearch < ActiveRecord::Migration
+  def self.up
+    add_index :profiles, :created_at
+  end
+
+  def self.down
+    remove_index :profiles, :created_at
+  end
+end
@@ -0,0 +1,19 @@
+class CreateCacheCountsForProfiles < ActiveRecord::Migration
+  def self.up
+    add_column :profiles, :friends_count, :integer, :null => false, :default => 0
+    add_column :profiles, :members_count, :integer, :null => false,  :default => 0
+    add_column :profiles, :activities_count, :integer, :null => false,  :default => 0
+    add_index :profiles, :friends_count
+    add_index :profiles, :members_count
+    add_index :profiles, :activities_count
+  end
+
+  def self.down
+    remove_column :profiles, :friends_count
+    remove_column :profiles, :members_count
+    remove_column :profiles, :activities_count
+    remove_index :profiles, :friends_count
+    remove_index :profiles, :members_count
+    remove_index :profiles, :activities_count
+  end
+end
@@ -0,0 +1,12 @@
+class DefineInitialValueForProfilesFriendsCount < ActiveRecord::Migration
+  def self.up
+    friends_counts = execute("SELECT profiles.id, count(profiles.id) FROM profiles INNER JOIN friendships ON ( profiles.id = friendships.friend_id AND profiles.type = E'Person') GROUP BY profiles.id;")
+    friends_counts.each do |count|
+      execute("UPDATE profiles SET friends_count=#{count['count'].to_i} WHERE profiles.id=#{count['id']};")
+    end
+  end
+
+  def self.down
+      execute("UPDATE profiles SET friends_count=0;")
+  end
+end
@@ -0,0 +1,14 @@
+class DefineInitialValueForProfilesActivitiesCount < ActiveRecord::Migration
+  def self.up
+    person_activities_counts = execute("SELECT profiles.id, count(action_tracker.id) as count FROM profiles LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.user_id WHERE (action_tracker.created_at >= '#{30.days.ago.to_s(:db)}') AND ( (profiles.type = 'Person' ) ) GROUP BY profiles.id;")
+    organization_activities_counts = execute("SELECT profiles.id, count(action_tracker.id) as count FROM profiles LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.target_id WHERE (action_tracker.created_at >= '#{30.days.ago.to_s(:db)}') AND ( (profiles.type = 'Community' OR profiles.type = 'Enterprise' OR profiles.type = 'Organization' ) ) GROUP BY profiles.id;")
+    activities_counts = person_activities_counts.entries + organization_activities_counts.entries
+    activities_counts.each do |count|
+      execute("UPDATE profiles SET activities_count=#{count['count'].to_i} WHERE profiles.id=#{count['id']};")
+    end
+  end
+
+  def self.down
+    execute("UPDATE profiles SET activities_count=0;")
+  end
+end
@@ -0,0 +1,9 @@
+class AddReturnToToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :return_to, :string
+  end
+
+  def self.down
+    remove_column :users, :return_to, :string
+  end
+end
@@ -0,0 +1,12 @@
+class DefineInitialValueForProfilesMembersCount < ActiveRecord::Migration
+   def self.up
+    members_counts = execute("SELECT profiles.id, count(profiles.id) FROM profiles LEFT OUTER JOIN role_assignments ON profiles.id = role_assignments.resource_id WHERE (profiles.type = 'Organization' OR profiles.type = 'Community' OR profiles.type = 'Enterprise') GROUP BY profiles.id;")
+    members_counts.each do |count|
+      execute("UPDATE profiles SET members_count=#{count['count'].to_i} WHERE profiles.id=#{count['id']};")
+    end
+  end
+
+  def self.down
+      execute("UPDATE profiles SET members_count=0;")
+  end
+end
@@ -0,0 +1,9 @@
+class AddIndexesForProductsSearch < ActiveRecord::Migration
+  def self.up
+    add_index :products, :created_at
+  end
+
+  def self.down
+    remove_index :products, :created_at
+  end
+end
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# This file is auto-generated from the current state of the database. Instead of editing this file,
 # please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
 #
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20140108132730) do
+ActiveRecord::Schema.define(:version => 20140314200103) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -140,6 +140,9 @@ ActiveRecord::Schema.define(:version =&gt; 20140108132730) do
     t.integer  "position"
   end
+  add_index "articles", ["comments_count"], :name => "index_articles_on_comments_count"
+  add_index "articles", ["created_at"], :name => "index_articles_on_created_at"
+  add_index "articles", ["hits"], :name => "index_articles_on_hits"
   add_index "articles", ["name"], :name => "index_articles_on_name"
   add_index "articles", ["parent_id"], :name => "index_articles_on_parent_id"
   add_index "articles", ["profile_id"], :name => "index_articles_on_profile_id"
@@ -282,6 +285,8 @@ ActiveRecord::Schema.define(:version =&gt; 20140108132730) do
     t.text     "signup_welcome_text"
     t.string   "languages"
     t.string   "default_language"
+    t.string   "redirection_after_signup",     :default => "keep_on_same_page"
+    t.string   "noreply_email"
   end
   create_table "external_feeds", :force => true do |t|
@@ -432,6 +437,7 @@ ActiveRecord::Schema.define(:version =&gt; 20140108132730) do
     t.boolean  "archived",            :default => false
   end
+  add_index "products", ["created_at"], :name => "index_products_on_created_at"
   add_index "products", ["product_category_id"], :name => "index_products_on_product_category_id"
   add_index "products", ["profile_id"], :name => "index_products_on_profile_id"
@@ -470,10 +476,17 @@ ActiveRecord::Schema.define(:version =&gt; 20140108132730) do
     t.string   "redirection_after_login"
     t.string   "personal_website"
     t.string   "jabber_id"
+    t.integer  "friends_count",                         :default => 0,     :null => false
+    t.integer  "members_count",                         :default => 0,     :null => false
+    t.integer  "activities_count",                      :default => 0,     :null => false
   end
+  add_index "profiles", ["activities_count"], :name => "index_profiles_on_activities_count"
+  add_index "profiles", ["created_at"], :name => "index_profiles_on_created_at"
   add_index "profiles", ["environment_id"], :name => "index_profiles_on_environment_id"
+  add_index "profiles", ["friends_count"], :name => "index_profiles_on_friends_count"
   add_index "profiles", ["identifier"], :name => "index_profiles_on_identifier"
+  add_index "profiles", ["members_count"], :name => "index_profiles_on_members_count"
   add_index "profiles", ["region_id"], :name => "index_profiles_on_region_id"
   create_table "qualifier_certifiers", :force => true do |t|
@@ -619,6 +632,7 @@ ActiveRecord::Schema.define(:version =&gt; 20140108132730) do
     t.datetime "chat_status_at"
     t.string   "activation_code",           :limit => 40
     t.datetime "activated_at"
+    t.string   "return_to"
   end
   create_table "validation_infos", :force => true do |t|
+noosfero (0.47.0~rc1) squeeze-test; urgency=low
+
+  * New features Release Candidate 1
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Thu, 20 Mar 2014 20:26:45 +0000
+
+noosfero (0.46.2) unstable; urgency=low
+
+  * Bugfix release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Wed, 19 Mar 2014 23:41:06 +0000
+
 noosfero (0.46.1) unstable; urgency=low
   * Bugfixes release
@@ -97,3 +97,41 @@ Feature: comment
     Given I am on /booking/article-to-comment
     And I follow "Post a comment"
     Then "Post a comment" should not be visible within "#article"
+
+  @selenium
+  Scenario: the newest post from a forum should be displayed first.
+    Given the following users
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And the following forums
+       | owner     | name  |
+       | joaosilva | Forum |
+    And the following articles
+       | owner     | name     | parent |
+       | joaosilva | Post one | Forum  |
+    And the following comments
+       | article  | author    | title  | body   |
+       | Post one | joaosilva | Hi all | Hi all |
+       | Post one | joaosilva | Hello  | Hello  |
+   When I go to /joaosilva/forum/post-one
+   And I select "Newest first" from "comment_order" within ".comment-order"
+   Then I should see "Hello" within ".article-comment"
+
+  @selenium
+  Scenario: the oldest post from a forum should be displayed first.
+    Given the following users
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And the following forums
+       | owner     | name  |
+       | joaosilva | Forum |
+    And the following articles
+       | owner     | name     | parent |
+       | joaosilva | Post one | Forum  |
+    And the following comments
+       | article  | author    | title  | body   |
+       | Post one | joaosilva | Hi all | Hi all |
+       | Post one | joaosilva | Hello  | Hello  |
+   When I go to /joaosilva/forum/post-one
+   And I select "Oldest first" from "comment_order" within ".comment-order"
+   Then I should see "Hi all" within ".article-comment"
 \ No newline at end of file
@@ -244,3 +244,38 @@ Feature: events
     Given I am on /profile/josesilva/events/2009/10
     When I follow "Oktoberfest"
     Then I should see "Oktoberfest"
+
+  Scenario: list events paginated for a specific profile for the month
+    Given I am logged in as admin
+    And the following users
+      | login      |
+      | josemanuel |
+    And I am logged in as "josemanuel"
+    And the following events
+      | owner      | name              | start_date |
+      | josemanuel | Event 5           | 2009-10-12 |
+      | josemanuel | Event 3           | 2009-10-15 |
+      | josemanuel | Test Event        | 2009-10-15 |
+      | josemanuel | Oktoberfest       | 2009-10-19 |
+      | josemanuel | WikiSym           | 2009-10-21 |
+      | josemanuel | Free Software     | 2009-10-22 |
+      | josemanuel | Rachel Birthday   | 2009-10-23 |
+      | josemanuel | Manuel Birthday   | 2009-10-24 |
+      | josemanuel | Michelle Birthday | 2009-10-25 |
+      | josemanuel | Lecture Allien 10 | 2009-10-26 |
+      | josemanuel | Lecture Allien 11 | 2009-10-26 |
+      | josemanuel | Lecture Allien 12 | 2009-10-26 |
+      | josemanuel | Lecture Allien 13 | 2009-10-26 |
+      | josemanuel | Lecture Allien 14 | 2009-10-26 |
+      | josemanuel | Lecture Allien 15 | 2009-10-26 |
+      | josemanuel | Lecture Allien 16 | 2009-10-26 |
+      | josemanuel | Lecture Allien 17 | 2009-10-26 |
+      | josemanuel | Lecture Allien 18 | 2009-10-26 |
+      | josemanuel | Lecture Allien 19 | 2009-10-26 |
+      | josemanuel | Lecture Allien 20 | 2009-10-26 |
+      | josemanuel | Party On          | 2009-10-27 |
+
+    When I am on /profile/josemanuel/events/2009/10
+    Then I should not see "Party On" within "#agenda-items"
+    When I follow "Next"
+    Then I should see "Party On" within "#agenda-items"
@@ -166,3 +166,121 @@ Feature: forum
        | Post one | joaosilva | Hi all | Hi all |
    When I go to /joaosilva/forum
    Then I should see "Joao" linking to "http://localhost/joaosilva"
+
+   @selenium
+   Scenario: community member should be able to see the discussion topic button
+    Given the following community
+      | identifier       | name             | owner     |
+      | sample-community | Sample Community | joaosilva |
+    And the following forums
+      | owner            | name  |
+      | sample-community | Forum |
+    And the following users
+      | login      | name       |
+      | mariasilva | Maria Silva|
+    And "Maria Silva" is a member of "Sample Community"
+    And I am logged in as "joaosilva"
+    When I go to /sample-community/forum
+    And I follow "Configure forum"
+    And I check "Allow member to create topics"
+    And I press "Save"
+    And I am logged in as "mariasilva"
+    And I go to /sample-community/forum
+    Then I should see "New discussion topic"
+
+   @selenium
+   Scenario: a non community member should not be able to see the discussion topic button
+    Given the following community
+      | identifier       | name             | owner     |
+      | sample-community | Sample Community | joaosilva |
+    And the following forums
+      | owner            | name  |
+      | sample-community | Forum |
+    And the following users
+      | login      | name       |
+      | mariasilva | Maria Silva|
+    And I am logged in as "joaosilva"
+    When I go to /sample-community/forum
+    And I follow "Configure forum"
+    And I check "Allow member to create topics"
+    And I press "Save"
+    And I am logged in as "mariasilva"
+    And I go to /sample-community/forum
+    Then I should not see "New discussion topic"
+
+   @selenium
+   Scenario: community member should not be able to see the discussion topic button
+    Given the following community
+      | identifier       | name             | owner     |
+      | sample-community | Sample Community | joaosilva |
+    And the following forums
+      | owner            | name  |
+      | sample-community | Forum |
+    And the following users
+      | login      | name       |
+      | mariasilva | Maria Silva|
+    And "Maria Silva" is a member of "Sample Community"
+    And I am logged in as "joaosilva"
+    When I go to /sample-community/forum
+    And I follow "Configure forum"
+    And I uncheck "Allow member to create topics"
+    And I press "Save"
+    And I am logged in as "mariasilva"
+    And I go to /sample-community/forum
+    Then I should not see "New discussion topic"
+
+   @selenium
+   Scenario: community member should be able to create a topic with the discussion topic button
+    Given the following community
+      | identifier       | name             | owner     |
+      | sample-community | Sample Community | joaosilva |
+    And the following forums
+      | owner            | name  |
+      | sample-community | Forum |
+    And the following users
+      | login      | name       |
+      | mariasilva | Maria Silva|
+    And "Maria Silva" is a member of "Sample Community"
+    And I am logged in as "joaosilva"
+    When I go to /sample-community/forum
+    And I follow "Configure forum"
+    And I check "Allow member to create topics"
+    And I press "Save"
+    And I am logged in as "mariasilva"
+    And I go to /sample-community/forum
+    And I follow "New discussion topic"
+    And I follow "Text article with visual editor"
+    And I fill in "Title" with "Test"
+    And I press "Save"
+    Then I should see "Test"
+
+   @selenium
+   Scenario: community member should be able to create a topic on a topic page
+    Given the following community
+      | identifier       | name             | owner     |
+      | sample-community | Sample Community | joaosilva |
+    And the following forums
+      | owner            | name  |
+      | sample-community | Forum |
+    And the following users
+      | login      | name       |
+      | mariasilva | Maria Silva|
+    And "Maria Silva" is a member of "Sample Community"
+    And I am logged in as "joaosilva"
+    When I go to /sample-community/forum
+    And I follow "Configure forum"
+    And I check "Allow member to create topics"
+    And I press "Save"
+    And I am logged in as "mariasilva"
+    And I go to /sample-community/forum
+    And I follow "New discussion topic"
+    And I follow "Text article with visual editor"
+    And I fill in "Title" with "Test"
+    And I press "Save"
+    And I go to /sample-community/forum/test
+    And I follow "New discussion topic"
+    And I follow "Text article with visual editor"
+    And I fill in "Title" with "Test inside the topic page"
+    And I press "Save"
+    And I go to /sample-community/forum
+    Then I should see "Test inside the topic page"
 \ No newline at end of file
@@ -0,0 +1,76 @@
+Feature: check all manage fields
+  As an administrator
+  I want to check and uncheck all person, enterprise and community's fields
+
+  Background:
+    Given the following users
+      | login      | name        |
+      | mariasilva | Maria Silva |
+    And the following enterprises
+      | identifier   | owner      | name         | contact_email               | contact_phone  | enabled |
+      | paper-street | mariasilva | Paper Street | marial.silva@workerbees.org | (288) 555-0153 | true    |
+    And the following community
+      | identifier  | name         |
+      | mycommunity | My Community |
+    And I am logged in as admin
+    And I go to /admin/features/manage_fields
+
+  @selenium
+  Scenario: check all active person fields
+    Given I follow "Person's fields"
+    And I check "person_active"
+    And I press "save_person_fields"
+    When I go to admin_user's control panel
+    And I follow "Edit Profile"
+    Then I should see "Custom area of study"
+
+  @selenium
+  Scenario: check all active enterprise fields
+    Given I follow "Enterprise's fields"
+    And I check "enterprise_active"
+    And I press "save_enterprise_fields"
+    When I go to paper-street's control panel
+    And I follow "Enterprise Info and settings"
+    Then I should see "Historic and current context"
+
+  @selenium
+  Scenario: check all active community fields
+    Given I follow "Community's fields"
+    And I check "community_active"
+    And I press "save_community_fields"
+    When I go to mycommunity's control panel
+    And I follow "Community Info and settings"
+    Then I should see "Economic activity"
+
+  @selenium
+  Scenario: uncheck Check/Uncheck All active person field
+    Given I follow "Person's fields"
+    And I check "person_active"
+    And I press "save_person_fields"
+    And I uncheck "person_active"
+    And I press "save_person_fields"
+    And I follow "Control panel"
+    When I follow "Edit Profile"
+    Then I should not see "Custom area of study"
+
+  @selenium
+  Scenario: uncheck Check/Uncheck All active community field
+    Given I follow "Community's fields"
+    And I check "community_active"
+    And I press "save_community_fields"
+    And I uncheck "community_active"
+    And I press "save_community_fields"
+    When I go to mycommunity's control panel
+    And I follow "Community Info and settings"
+    Then I should not see "Economic activity"
+
+  @selenium
+  Scenario: uncheck Check/Uncheck All active enterprise field
+    Given I follow "Enterprise's fields"
+    And I check "enterprise_active"
+    And I press "save_enterprise_fields"
+    And I uncheck "enterprise_active"
+    And I press "save_enterprise_fields"
+    When I go to paper-street's control panel
+    And I follow "Enterprise Info and settings"
+    Then I should not see "Historic and current context"
@@ -0,0 +1,47 @@
+Feature: manage users
+  As an environment administrator
+  I want to manage users
+  In order to remove, activate, deactivate users, and set admin roles.
+
+Background:
+  Given the following users
+    | login       | name         |
+    | joaosilva   | Joao Silva   |
+    | paulosantos | Paulo Santos |
+  Given I am logged in as admin
+  Given I go to /admin/users
+
+  @selenium
+  Scenario: deactive user
+    When I follow "Deactivate user" within "tr[title='Joao Silva']"
+    And I confirm the "Do you want to deactivate this user?" dialog
+    Then I should see "Activate user" within "tr[title='Joao Silva']"
+
+  @selenium
+  Scenario: activate user
+    Given I follow "Deactivate user" within "tr[title='Paulo Santos']"
+    Given I confirm the "Do you want to deactivate this user?" dialog
+    When I follow "Activate user" within "tr[title='Paulo Santos']"
+    And I confirm the "Do you want to activate this user?" dialog
+    Then I should see "Deactivate user" within "tr[title='Paulo Santos']"
+
+  @selenium
+  Scenario: remove user
+    When I follow "Remove" within "tr[title='Joao Silva']"
+    And I confirm the "Do you want to remove this user?" dialog
+    And I go to /admin/users
+    Then I should not see "Joao Silva"
+
+  @selenium
+  Scenario: admin user
+    When I follow "Set admin role" within "tr[title='Joao Silva']"
+    And I confirm the "Do you want to set this user as administrator?" dialog
+    Then I should see "Reset admin role" within "tr[title='Joao Silva']"
+
+  @selenium
+  Scenario: unadmin user
+    Given I follow "Set admin role" within "tr[title='Paulo Santos']"
+    And I confirm the "Do you want to set this user as administrator?" dialog
+    When I follow "Reset admin role" within "tr[title='Paulo Santos']"
+    And I confirm the "Do you want to reset this user as administrator?" dialog
+    Then I should see "Set admin role" within "tr[title='Paulo Santos']"
@@ -3,7 +3,7 @@ Feature: signup
   I want to sign up to the site
   So I can have fun using its features
-@selenium
+  @selenium
   Scenario: successfull registration
     Given I am on the homepage
     When I follow "Login"
@@ -60,3 +60,183 @@ Feature: signup
     And I fill in "Name" with ""
     When I press "Save"
     Then I should see "Name can't be blank"
+
+  @selenium
+  Scenario: user should stay on same page after signup
+    Given the environment is configured to stay on the same page after signup
+    And feature "skip_new_user_email_confirmation" is enabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    Then I should be on /search/people
+
+  @selenium
+  Scenario: user should go to his homepage after signup
+    Given the environment is configured to redirect to profile homepage after signup
+    And feature "skip_new_user_email_confirmation" is enabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    Then I should be on josesilva's profile
+
+  @selenium
+  Scenario: user should go to his control panel after signup
+    Given the environment is configured to redirect to profile control panel after signup
+    And feature "skip_new_user_email_confirmation" is enabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    Then I should be on josesilva's control panel
+
+  @selenium
+  Scenario: user should go to his profile page after signup
+    Given the environment is configured to redirect to user profile page after signup
+    And feature "skip_new_user_email_confirmation" is enabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    Then I should be on josesilva's profile
+
+  @selenium
+  Scenario: user should go to the environment's homepage after signup
+    Given the environment is configured to redirect to site homepage after signup
+    And feature "skip_new_user_email_confirmation" is enabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    Then I should be on the homepage
+
+  @selenium
+  Scenario: user should stay on same page after following confirmation link
+    Given the environment is configured to stay on the same page after login
+    And feature "skip_new_user_email_confirmation" is disabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    And I go to josesilva's confirmation URL
+    And I fill in "Username" with "josesilva"
+    And I fill in "Password" with "secret"
+    And I press "Log in"
+    Then I should be on /search/people
+
+  @selenium
+  Scenario: user should go to his homepage after following confirmation link
+    Given the environment is configured to redirect to profile homepage after login
+    And feature "skip_new_user_email_confirmation" is disabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    And I go to josesilva's confirmation URL
+    And I fill in "Username" with "josesilva"
+    And I fill in "Password" with "secret"
+    And I press "Log in"
+    Then I should be on /profile/josesilva
+
+  @selenium
+  Scenario: user should go to his control panel after following confirmation link
+    Given the environment is configured to redirect to profile control panel after login
+    And feature "skip_new_user_email_confirmation" is disabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    And I go to josesilva's confirmation URL
+    And I fill in "Username" with "josesilva"
+    And I fill in "Password" with "secret"
+    And I press "Log in"
+    Then I should be on /myprofile/josesilva
+
+  @selenium
+  Scenario: user should go to his profile page after following confirmation link
+    Given the environment is configured to redirect to user profile page after login
+    And feature "skip_new_user_email_confirmation" is disabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    And I go to josesilva's confirmation URL
+    And I fill in "Username" with "josesilva"
+    And I fill in "Password" with "secret"
+    And I press "Log in"
+    Then I should be on /profile/josesilva
+
+  @selenium
+  Scenario: user should go to the environment homepage after following confirmation link
+    Given the environment is configured to redirect to site homepage after login
+    And feature "skip_new_user_email_confirmation" is disabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    And I go to josesilva's confirmation URL
+    And I fill in "Username" with "josesilva"
+    And I fill in "Password" with "secret"
+    And I press "Log in"
+    Then I should be on the homepage
@@ -738,6 +738,24 @@ Given /^the profile (.*) is configured to (.*) after login$/ do |profile, option
   profile.save
 end
+Given /^the environment is configured to (.*) after signup$/ do |option|
+  redirection = case option
+    when 'stay on the same page'
+      'keep_on_same_page'
+    when 'redirect to site homepage'
+      'site_homepage'
+    when 'redirect to user profile page'
+      'user_profile_page'
+    when 'redirect to profile homepage'
+      'user_homepage'
+    when 'redirect to profile control panel'
+      'user_control_panel'
+  end
+  environment = Environment.default
+  environment.redirection_after_signup = redirection
+  environment.save
+end
+
 When /^wait for the captcha signup time$/ do
   environment = Environment.default
   sleep environment.min_signup_delay + 1
@@ -111,6 +111,10 @@ module NavigationHelpers
     when /the user data path/
       '/account/user_data'
+    when /^(.+)'s confirmation URL/
+      user = User[$1]
+      "/account/activate?activation_code=#{user.activation_code}&redirection=" + (user.return_to.nil? ? 'false' : 'true')
+
     when /^(.+)'s members page/
       '/profile/%s/members' % profile_identifier($1)
@@ -0,0 +1,11 @@
+class ActivitiesCounterCacheJob
+  def perform
+    person_activities_counts = ActiveRecord::Base.connection.execute("SELECT profiles.id, count(action_tracker.id) as count FROM profiles LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.user_id WHERE (action_tracker.created_at >= '#{ActionTracker::Record::RECENT_DELAY.days.ago.to_s(:db)}') AND ( (profiles.type = 'Person' ) ) GROUP BY profiles.id;")
+    organization_activities_counts = ActiveRecord::Base.connection.execute("SELECT profiles.id, count(action_tracker.id) as count FROM profiles LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.target_id WHERE (action_tracker.created_at >= '#{ActionTracker::Record::RECENT_DELAY.days.ago.to_s(:db)}') AND ( (profiles.type = 'Community' OR profiles.type = 'Enterprise' OR profiles.type = 'Organization' ) ) GROUP BY profiles.id;")
+    activities_counts = person_activities_counts.entries + organization_activities_counts.entries
+    activities_counts.each do |count|
+      ActiveRecord::Base.connection.execute("UPDATE profiles SET activities_count=#{count['count'].to_i} WHERE profiles.id=#{count['id']};")
+    end
+    Delayed::Job.enqueue(ActivitiesCounterCacheJob.new, -3, 1.day.from_now)
+  end
+end
@@ -14,6 +14,17 @@ module ActsAsHavingSettings
         def #{settings_field}
           self[:#{settings_field}] ||= Hash.new
         end
+
+        def setting_changed?(setting_field)
+          setting_field = setting_field.to_sym
+          changed_settings = self.changes['#{settings_field}']
+          return false if changed_settings.nil?
+
+          old_setting_value = changed_settings.first.nil? ? nil : changed_settings.first[setting_field]
+          new_setting_value = changed_settings.last[setting_field]
+          old_setting_value != new_setting_value
+        end
+
         before_save :symbolize_settings_keys
         private
         def symbolize_settings_keys
@@ -36,11 +47,9 @@ module ActsAsHavingSettings
             val.nil? ? (#{default}.is_a?(String) ? gettext(#{default}) : #{default}) : val
           end
           def #{setting}=(value)
-
-            #UPGRADE Leandro: I add this line to save the serialize attribute
-            send(self.class.settings_field.to_s + '_will_change!')
-
-            send(self.class.settings_field)[:#{setting}] = self.class.acts_as_having_settings_type_cast(value, #{data_type.inspect})
+            h = send(self.class.settings_field).clone
+            h[:#{setting}] = self.class.acts_as_having_settings_type_cast(value, #{data_type.inspect})
+            send(self.class.settings_field.to_s + '=', h)
           end
         CODE
       end
@@ -24,8 +24,8 @@ class FeedUpdater
       environment = Environment.default
       recipients NOOSFERO_CONF['exception_recipients']
-      from       environment.contact_email
-      reply_to   environment.contact_email
+      from       environment.noreply_email
+      reply_to   environment.noreply_email
       subject    "[#{environment.name}] Feed-updater: #{error.message}"
       body       render(:text => "
 Container:
@@ -13,6 +13,10 @@ class FilePresenter
     klass.accepts?(f) ? klass.new(f) : f
   end
+  def self.base_class
+    Article
+  end
+
   def initialize(f)
     @file = f
   end
@@ -31,6 +35,10 @@ class FilePresenter
     self
   end
+  def kind_of?(klass)
+    @file.kind_of?(klass)
+  end
+
   # This method must be overridden in subclasses.
   #
   # If the class accepts the file, return a number that represents the
@@ -43,7 +51,12 @@ class FilePresenter
   end
   def short_description
-    _("File (%s)") % content_type.sub(/^application\//, '').sub(/^x-/, '').sub(/^image\//, '')
+    file_type = if content_type.present?
+      content_type.sub(/^application\//, '').sub(/^x-/, '').sub(/^image\//, '')
+    else
+      _('Unknown')
+    end
+    _("File (%s)") % file_type
   end
   # Define the css classes to style the page fragment with the file related
@@ -3,7 +3,7 @@ require &#39;fast_gettext&#39;
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.46.1'
+  VERSION = '0.47.0~rc1'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -0,0 +1,21 @@
+Rails.configuration.to_prepare do
+  ActionTracker::Record.module_eval do
+    extend CacheCounterHelper
+
+    after_create do |record|
+      update_cache_counter(:activities_count, record.user, 1)
+      if record.target.kind_of?(Organization)
+        update_cache_counter(:activities_count, record.target, 1)
+      end
+    end
+
+    after_destroy do |record|
+      if record.created_at >= ActionTracker::Record::RECENT_DELAY.days.ago
+        update_cache_counter(:activities_count, record.user, -1)
+        if record.target.kind_of?(Organization)
+          update_cache_counter(:activities_count, record.target, -1)
+        end
+      end
+    end
+  end
+end
@@ -16,14 +16,7 @@ class Noosfero::Plugin
     end
     def init_system
-      enabled_plugins = Dir.glob(File.join(Rails.root, 'config', 'plugins', '*'))
-      if Rails.env.test? && !enabled_plugins.include?(File.join(Rails.root, 'config', 'plugins', 'foo'))
-        enabled_plugins << File.join(Rails.root, 'plugins', 'foo')
-      end
-
-      enabled_plugins.select do |entry|
-        File.directory?(entry)
-      end.each do |dir|
+      available_plugins.each do |dir|
         load_plugin dir
       end
     end
@@ -76,12 +69,19 @@ class Noosfero::Plugin
       klass(plugin_name)
     end
-    def all
-      @all ||= []
+    def available_plugins
+      unless @available_plugins
+        path = File.join(Rails.root, 'config', 'plugins', '*')
+        @available_plugins = Dir.glob(path).select{ |i| File.directory?(i) }
+        if Rails.env.test? && !@available_plugins.include?(File.join(Rails.root, 'config', 'plugins', 'foo'))
+          @available_plugins << File.join(Rails.root, 'plugins', 'foo')
+        end
+      end
+      @available_plugins
     end
-    def inherited(subclass)
-      all << subclass.to_s unless all.include?(subclass.to_s)
+    def all
+      @all ||= available_plugins.map{ |dir| (File.basename(dir) + "_plugin").camelize }
     end
     def public_name
@@ -349,6 +349,12 @@ class Noosfero::Plugin
     []
   end
+  # -> Adds adicional content to article
+  # returns = lambda block that creates html code
+  def article_extra_contents(article)
+    nil
+  end
+
   # -> Adds fields to the signup form
   # returns = lambda block that creates html code
   def signup_extra_contents
@@ -0,0 +1,29 @@
+Rails.configuration.to_prepare do
+  RoleAssignment.module_eval do
+    extend CacheCounterHelper
+
+    after_create do |role_assignment|
+      accessor = role_assignment.accessor
+      resource = role_assignment.resource
+      if resource.kind_of?(Organization)
+        #FIXME This will only work as long as the role_assignment associations
+        #happen only between profiles, due to the polymorphic column type.
+        if resource.role_assignments.where(:accessor_id => accessor.id).count == 1
+          update_cache_counter(:members_count, resource, 1)
+        end
+      end
+    end
+
+    after_destroy do |role_assignment|
+      accessor = role_assignment.accessor
+      resource = role_assignment.resource
+      if resource.kind_of?(Organization)
+        #FIXME This will only work as long as the role_assignment associations
+        #happen only between profiles, due to the polymorphic column type.
+        if resource.role_assignments.where(:accessor_id => accessor.id).count == 0
+          update_cache_counter(:members_count, resource, -1)
+        end
+      end
+    end
+  end
+end
@@ -144,8 +144,8 @@ EOF
     version_name = new_version = ask(version_question)
     if release_kind == 'test'
-      timestamp = Time.now.strftime('%Y%m%d%H%M%S')
-      version_name += "~rc#{timestamp}"
+      rc_version = ask('RC version', Time.now.strftime('%Y%m%d%H%M%S'))
+      version_name += "~rc#{rc_version}"
     end
     release_message = ask("Release message")
@@ -216,6 +216,9 @@ EOF
   task :release, :release_kind do |t, args|
     release_kind = args[:release_kind] || 'stable'
+    puts "==> Updating authors..."
+    Rake::Task['noosfero:authors'].invoke
+
     Rake::Task['noosfero:set_version'].invoke(release_kind)
     puts "==> Checking tags..."
@@ -230,9 +233,6 @@ EOF
       commit_changes(['public/500.html', 'public/503.html'], 'Updating public error pages')
     end
-    puts "==> Updating authors..."
-    Rake::Task['noosfero:authors'].invoke
-
     puts "==> Checking repository..."
     Rake::Task['noosfero:check_repo'].invoke
@@ -46,10 +46,6 @@ class CommentClassificationPlugin &lt; Noosfero::Plugin
     end
   end
- def js_files
-    'comment_classification.js'
-  end
-
   def stylesheet?
     true
   end
 <% if contents.total_pages > 1 %>
-  <%= link_to_remote(nil, :url => {:id => block.id, :controller => 'context_content_plugin_profile', :action => 'view_content', :page => contents.previous_page, :article_id => article_id }, :html => {:class => "button icon-button icon-left #{contents.previous_page ? '':'disabled'}".strip}, :condition => "#{!contents.previous_page.nil?}", :success => "jQuery('#context_content_#{block.id}').effect('slide', {direction: 'left'});" )%>
-  <%= link_to_remote(nil, :url => {:id => block.id, :controller => 'context_content_plugin_profile', :action => 'view_content', :page => contents.next_page, :article_id => article_id }, :html => {:class => "button icon-button icon-right #{contents.next_page ? '':'disabled'}".strip}, :condition => "#{!contents.next_page.nil?}", :success => "jQuery('#context_content_#{block.id}').effect('slide', {direction: 'right'});" )%>
+  <%= link_to_remote(nil, :url => {:profile => block.owner.identifier, :id => block.id, :controller => 'context_content_plugin_profile', :action => 'view_content', :page => contents.previous_page, :article_id => article_id }, :html => {:class => "button icon-button icon-left #{contents.previous_page ? '':'disabled'}".strip}, :condition => "#{!contents.previous_page.nil?}", :success => "jQuery('#context_content_#{block.id}').effect('slide', {direction: 'left'});" )%>
+  <%= link_to_remote(nil, :url => {:profile => block.owner.identifier, :id => block.id, :controller => 'context_content_plugin_profile', :action => 'view_content', :page => contents.next_page, :article_id => article_id }, :html => {:class => "button icon-button icon-right #{contents.next_page ? '':'disabled'}".strip}, :condition => "#{!contents.next_page.nil?}", :success => "jQuery('#context_content_#{block.id}').effect('slide', {direction: 'right'});" )%>
 <% end %>
@@ -61,9 +61,12 @@ class DisplayContentBlock &lt; Block
   VALID_CONTENT = ['RawHTMLArticle', 'TextArticle', 'TextileArticle', 'TinyMceArticle', 'Folder', 'Blog', 'Forum']
+  include Noosfero::Plugin::HotSpot
+
   def articles_of_parent(parent = nil)
     return [] if self.holder.nil?
-    holder.articles.find(:all, :conditions => {:type => VALID_CONTENT, :parent_id => (parent.nil? ? nil : parent)})
+    types = VALID_CONTENT + plugins.dispatch(:content_types).map(&:name)
+    holder.articles.find(:all, :conditions => {:type => types, :parent_id => (parent.nil? ? nil : parent)})
   end
   include ActionController::UrlWriter
@@ -238,6 +238,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block.nodes= [a1.id, a2.id, a3.id]
     box = mock()
     box.stubs(:owner).returns(profile)
+    box.stubs(:environment).returns(Environment.default)
     block.stubs(:box).returns(box)
     assert_equal [], [a1, a2] - block.articles_of_parent
     assert_equal [], block.articles_of_parent - [a1, a2]
@@ -253,6 +254,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block = DisplayContentBlock.new
     box = mock()
     box.stubs(:owner).returns(profile)
+    box.stubs(:environment).returns(Environment.default)
     block.stubs(:box).returns(box)
     assert_equal [], [a3] - block.articles_of_parent(a2)
     assert_equal [], block.articles_of_parent(a2) - [a3]
@@ -270,6 +272,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(environment)
+    box.stubs(:environment).returns(Environment.default)
     environment.stubs(:portal_community).returns(profile)
     assert_equal [], [a1, a2] - block.articles_of_parent
@@ -288,6 +291,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(environment)
+    box.stubs(:environment).returns(Environment.default)
     environment.stubs(:portal_community).returns(profile)
     assert_equal [], [a3] - block.articles_of_parent(a2)
@@ -301,6 +305,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(environment)
+    box.stubs(:environment).returns(Environment.default)
     assert_equal [], block.articles_of_parent()
   end
@@ -316,6 +321,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
       block = DisplayContentBlock.new
       box = mock()
       box.stubs(:owner).returns(profile)
+      box.stubs(:environment).returns(Environment.default)
       block.stubs(:box).returns(box)
       assert_equal [], [a2] - block.articles_of_parent
       assert_equal [], block.articles_of_parent - [a2]
@@ -334,6 +340,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
       block = DisplayContentBlock.new
       box = mock()
       box.stubs(:owner).returns(profile)
+      box.stubs(:environment).returns(Environment.default)
       block.stubs(:box).returns(box)
       assert_equal [a1], block.articles_of_parent
     end
@@ -526,4 +533,28 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     assert_equivalent [f1.id, a1.id, a2.id, a3.id], block.nodes
   end
+  should "test should return plugins articles in articles of parent method" do
+    class PluginArticle < Article; end
+
+    class Plugin1 < Noosfero::Plugin
+      def content_types
+        [PluginArticle]
+      end
+    end
+
+    profile = create_user('testuser').person
+    Article.delete_all
+    a1 = fast_create(PluginArticle, :name => 'test article 1', :profile_id => profile.id)
+
+    env = fast_create(Environment)
+    env.enable_plugin(Plugin1)
+
+    block = DisplayContentBlock.new
+    box = mock()
+    box.stubs(:owner).returns(profile)
+    box.stubs(:environment).returns(env)
+    block.stubs(:box).returns(box)
+    assert_equal [a1], block.articles_of_parent
+  end
+
 end
@@ -0,0 +1,17 @@
+class MarkCommentAsReadPluginProfileController < ProfileController
+
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  def mark_as_read
+    comment = Comment.find(params[:id])
+    comment.mark_as_read(user)
+    render :text => {'ok' => true}.to_json, :content_type => 'application/json'
+  end
+
+  def mark_as_not_read
+    comment = Comment.find(params[:id])
+    comment.mark_as_not_read(user)
+    render :text => {'ok' => true}.to_json, :content_type => 'application/json'
+  end
+
+end
@@ -0,0 +1,13 @@
+class CreateMarkCommentAsReadPlugin < ActiveRecord::Migration
+  def self.up
+    create_table :mark_comment_as_read_plugin do |t|
+      t.integer :comment_id
+      t.integer :person_id
+    end
+    add_index :mark_comment_as_read_plugin, [:comment_id, :person_id], :unique => true
+  end
+
+  def self.down
+    drop_table :mark_comment_as_read_plugin
+  end
+end
@@ -0,0 +1,45 @@
+require_dependency 'mark_comment_as_read_plugin/ext/comment'
+
+class MarkCommentAsReadPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "MarkCommentAsReadPlugin"
+  end
+
+  def self.plugin_description
+    _("Provide a button to mark a comment as read.")
+  end
+
+  def js_files
+    'mark_comment_as_read.js'
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def comment_actions(comment)
+    lambda do
+      [{:link => link_to_function(_('Mark as not read'), 'toggle_comment_read(this, %s, false);' % url_for(:controller => 'mark_comment_as_read_plugin_profile', :profile => profile.identifier, :action => 'mark_as_not_read', :id => comment.id).to_json, :class => 'comment-footer comment-footer-link comment-footer-hide comment-action-extra', :style => 'display: none', :id => "comment-action-mark-as-not-read-#{comment.id}")},
+      {:link => link_to_function(_('Mark as read'), 'toggle_comment_read(this, %s, true);' % url_for(:controller => 'mark_comment_as_read_plugin_profile', :profile => profile.identifier, :action => 'mark_as_read', :id => comment.id).to_json, :class => 'comment-footer comment-footer-link comment-footer-hide comment-action-extra', :style => 'display: none', :id => "comment-action-mark-as-read-#{comment.id}")}] if user
+    end
+  end
+
+  def check_comment_actions(comment)
+    lambda do
+      if user
+        comment.marked_as_read?(user) ? "#comment-action-mark-as-not-read-#{comment.id}" : "#comment-action-mark-as-read-#{comment.id}"
+      end
+    end
+  end
+
+  def article_extra_contents(article)
+    lambda do
+      if user
+        ids = article.comments.marked_as_read(user).collect { |comment| comment.id}
+        "<script type=\"text/javascript\">mark_comments_as_read(#{ids.to_json});</script>" if !ids.empty?
+      end
+    end
+  end
+
+end
@@ -0,0 +1,24 @@
+require_dependency 'comment'
+
+class Comment
+
+  has_many :read_comments, :class_name => 'MarkCommentAsReadPlugin::ReadComments'
+  has_many :people, :through => :read_comments
+
+  def mark_as_read(person)
+    people << person
+  end
+
+  def mark_as_not_read(person)
+    people.delete(person)
+  end
+
+  def marked_as_read?(person)
+    person && people.find(:first, :conditions => {:id => person.id})
+  end
+
+  def self.marked_as_read(person)
+    find(:all, :joins => [:read_comments], :conditions => {:author_id => person.id})
+  end
+
+end
@@ -0,0 +1,7 @@
+class MarkCommentAsReadPlugin::ReadComments < Noosfero::Plugin::ActiveRecord
+  set_table_name 'mark_comment_as_read_plugin'
+  belongs_to :comment
+  belongs_to :person
+
+  validates_presence_of :comment, :person
+end
@@ -0,0 +1,28 @@
+function mark_comments_as_read(comments) {
+  jQuery(document).ready(function($) {
+    for(var i=0; i<comments.length; i++) {
+      $comment = jQuery('#comment-'+comments[i]);
+      $comment.find('.comment-content').first().addClass('comment-mark-read');
+    }
+  });
+}
+
+function toggle_comment_read(button, url, mark) {
+  var $ = jQuery;
+  var $button = $(button);
+  $button.addClass('comment-button-loading');
+  $.post(url, function(data) {
+    if (data.ok) {
+      var $comment = $button.closest('.article-comment');
+      var $content = $comment.find('.comment-content').first();
+      if(mark)
+        $content.addClass('comment-mark-read');
+      else
+        $content.removeClass('comment-mark-read');
+      $button.hide();
+      $button.removeClass('comment-button-loading');
+      return;
+    }
+  });
+}
+
@@ -0,0 +1,3 @@
+.article-comments-list .comment-mark-read .comment-text, .article-comments-list .comment-mark-read h4, .article-comments-list .comment-mark-read .comment-picture {
+  opacity: 0.2;
+}
@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../controllers/mark_comment_as_read_plugin_profile_controller'
+
+# Re-raise errors caught by the controller.
+class MarkCommentAsReadPluginProfileController; def rescue_action(e) raise e end; end
+
+class MarkCommentAsReadPluginProfileControllerTest < ActionController::TestCase
+  def setup
+    @controller = MarkCommentAsReadPluginProfileController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @profile = create_user('profile').person
+    @article = TinyMceArticle.create!(:profile => @profile, :name => 'An article')
+    @comment = Comment.new(:source => @article, :author => @profile, :body => 'test')
+    @comment.save!
+    login_as(@profile.identifier)
+    environment = Environment.default
+    environment.enable_plugin(MarkCommentAsReadPlugin)
+    self.stubs(:user).returns(@profile)
+  end
+
+  attr_reader :profile, :comment
+
+  should 'mark comment as read' do
+    xhr :post, :mark_as_read, :profile => profile.identifier, :id => comment.id
+    assert_match /\{\"ok\":true\}/, @response.body
+  end
+
+  should 'mark comment as not read' do
+    xhr :post, :mark_as_not_read, :profile => profile.identifier, :id => comment.id
+    assert_match /\{\"ok\":true\}/, @response.body
+  end
+end
@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class MarkCommentAsReadPlugin::CommentTest < ActiveSupport::TestCase
+
+  def setup
+    @person = create_user('user').person
+    @article = TinyMceArticle.create!(:profile => @person, :name => 'An article')
+    @comment = Comment.create!(:title => 'title', :body => 'body', :author_id => @person.id, :source => @article)
+  end
+
+  should 'mark comment as read' do
+    assert !@comment.marked_as_read?(@person)
+    @comment.mark_as_read(@person)
+    assert @comment.marked_as_read?(@person)
+  end
+
+  should 'do not mark a comment as read again' do
+    @comment.mark_as_read(@person)
+    assert_raise ActiveRecord::StatementInvalid do
+      @comment.mark_as_read(@person)
+    end
+  end
+
+  should 'mark comment as not read' do
+    @comment.mark_as_read(@person)
+    assert @comment.marked_as_read?(@person)
+    @comment.mark_as_not_read(@person)
+    assert !@comment.marked_as_read?(@person)
+  end
+
+  should 'return comments marked as read for a user' do
+    person2 = create_user('user2').person
+    @comment.mark_as_read(@person)
+    assert_equal [], @article.comments.marked_as_read(@person) - [@comment]
+    assert_equal [], @article.comments.marked_as_read(person2)
+  end
+
+end
@@ -0,0 +1,87 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class MarkCommentAsReadPluginTest < ActiveSupport::TestCase
+
+  include ActionView::Helpers::TagHelper
+  include NoosferoTestHelper
+
+  def setup
+    @plugin = MarkCommentAsReadPlugin.new
+    @person = create_user('user').person
+    @article = TinyMceArticle.create!(:profile => @person, :name => 'An article')
+    @comment = Comment.create!(:source => @article, :author => @person, :body => 'test')
+    self.stubs(:user).returns(@person)
+    self.stubs(:profile).returns(@person)
+  end
+
+  attr_reader :plugin, :comment
+
+  should 'show link when person is logged in' do
+    action = @plugin.comment_actions(@comment)
+    link = self.instance_eval(&action)
+    assert link
+  end
+
+  should 'do not show link when person is not logged in' do
+    self.stubs(:user).returns(nil)
+    action = @plugin.comment_actions(@comment)
+    link = self.instance_eval(&action)
+    assert !link
+  end
+
+  should 'return actions when comment is not read' do
+    action = @plugin.comment_actions(@comment)
+    links = self.instance_eval(&action)
+    assert_equal 2, links.size
+  end
+
+  should 'return actions when comment is read' do
+    @comment.mark_as_read(@person)
+    action = @plugin.comment_actions(@comment)
+    links = self.instance_eval(&action)
+    assert_equal 2, links.size
+  end
+
+  should 'do not return any id when user is not logged in' do
+    self.stubs(:user).returns(nil)
+    action = @plugin.check_comment_actions(@comment)
+    id = self.instance_eval(&action)
+    assert !id
+  end
+
+  should 'return id of mark as not read link when comment is read' do
+    @comment.mark_as_read(@person)
+    action = @plugin.check_comment_actions(@comment)
+    id = self.instance_eval(&action)
+    assert_equal "#comment-action-mark-as-not-read-#{@comment.id}", id
+  end
+
+  should 'return id of mark as read link when comment is not read' do
+    action = @plugin.check_comment_actions(@comment)
+    id = self.instance_eval(&action)
+    assert_equal "#comment-action-mark-as-read-#{@comment.id}", id
+  end
+
+  should 'return javascript to mark comment as read' do
+    @comment.mark_as_read(@person)
+    content = @plugin.article_extra_contents(@article)
+    assert self.instance_eval(&content)
+  end
+
+  should 'do not return extra content if comment is not marked as read' do
+    content = @plugin.article_extra_contents(@article)
+    assert !self.instance_eval(&content)
+  end
+
+  should 'do not return extra content if user is not logged in' do
+    @comment.mark_as_read(@person)
+    self.stubs(:user).returns(nil)
+    content = @plugin.article_extra_contents(@article)
+    assert !self.instance_eval(&content)
+  end
+
+  def link_to_function(content, url, options = {})
+    link_to(content, url, options)
+  end
+
+end
@@ -2,11 +2,9 @@ require_dependency &#39;active_record&#39;
 class ActiveRecord::Base
   def self.pg_search_plugin_search(query)
-    query.gsub!(/\|/,' ')
-    formatted_query = query.split.map{|w| w += ":*"}.join('|')
-    
+    filtered_query = query.gsub(/[\|\(\)\\\/\s\[\]'"*%&!:]/,' ').split.map{|w| w += ":*"}.join('|')
     if defined?(self::SEARCHABLE_FIELDS)
-      where("to_tsvector('simple', #{pg_search_plugin_fields}) @@ to_tsquery('#{formatted_query}')")
+      where("to_tsvector('simple', #{pg_search_plugin_fields}) @@ to_tsquery('#{filtered_query}')")
     else
       raise "No searchable fields defined for #{self.name}"
     end
@@ -21,6 +21,11 @@ class PgSearchPluginTest &lt; ActiveSupport::TestCase
     assert_includes search(Profile, 'admin deb'), profile2
   end
+  should 'locate profile escaping special characters' do
+    profile = fast_create(Profile, :name => 'John', :identifier => 'waterfall')
+    assert_includes search(Profile, ') ( /\/\/\/\/\ o_o oOo o_o /\/\/\/\/\ ) ((tx waterfall)'), profile
+  end
+
   # TODO This feature is available only on Postgresql 9.0
   # http://www.postgresql.org/docs/9.0/static/unaccent.html
   # should 'ignore accents' do
@@ -3,7 +3,7 @@ module SendEmailPluginBaseController
     if request.post?
       @context_url = profile ? profile.url : {:host => environment.default_hostname, :controller => 'home'}
       @mail = SendEmailPlugin::Mail.new(
-        :from => environment.contact_email,
+        :from => environment.noreply_email,
         :to => params[:to],
         :message => params[:message],
         :environment => environment,
 <h1> <%= _('Basket options') %> </h1>
 <% form_for(:settings, @settings, :url => {:action => 'edit'}, :html => {:method => 'post'}) do |f| %>
-  <%= labelled_form_field(_('Enabled?'), f.check_box(:enabled)) %>
-  <%= labelled_form_field(_('Delivery?'), f.check_box(:delivery)) %>
+  <%= labelled_form_field(_('Enable shopping basket'), f.check_box(:enabled)) %>
+  <%= labelled_form_field(_('Enable delivery fields on orders'), f.check_box(:delivery)) %>
   <% display_delivery_settings = @settings.delivery ? 'auto' : 'none' %>
   <fieldset id='delivery_settings' style="display: <%= display_delivery_settings %>"><legend><%=_('Delivery')%></legend>
     <table>
@@ -33,8 +33,8 @@
       </tr>
     </table>
-    <%= labelled_form_field(_('Free delivery price:'), f.text_field(:free_delivery_price)) %>
-    <%= content_tag('small', _('Empty stands for no free delivery price.')) %>
+    <%= labelled_form_field(_("Order's minimum price for free delivery:"), f.text_field(:free_delivery_price)) %>
+    <%= content_tag('small', _('Leave empty to always charge the delivery.')) %>
   </fieldset>
   <br style='clear: both'/>
   <br style='clear: both'/>
@@ -2,7 +2,7 @@ class SpaminatorPlugin::Mailer &lt; Noosfero::Plugin::MailerBase
   def inactive_person_notification(person)
     recipients    person.email
-    from          "#{person.environment.name} <#{person.environment.contact_email}>"
+    from          "#{person.environment.name} <#{person.environment.noreply_email}>"
     subject       _("[%s] You must reactivate your account.") % person.environment.name
     content_type  'text/html'
     body :person => person,
@@ -14,7 +14,7 @@ class SpaminatorPlugin::MailerTest &lt; ActiveSupport::TestCase
   attr_accessor :environment, :settings
   should 'be able to send a inactive person notification message' do
-    environment.contact_email = 'no-reply@noosfero.org'
+    environment.noreply_email = 'no-reply@noosfero.org'
     environment.save
     person = create_user('spammer').person
@@ -0,0 +1,54 @@
+README - Statistics (Statistics Plugin)
+================================
+
+Statistics is a plugin to allow the user adds a block where you could see statistics of it's context.
+
+The Statistics block will be available for all layout columns of communities, peole, enterprises and environments.
+
+INSTALL
+=======
+
+Enable Plugin
+-------------
+
+Also, you need to enable Statistics Plugin at you Noosfero:
+
+cd <your_noosfero_dir>
+./script/noosfero-plugins enable statistics
+
+Active Plugin
+-------------
+
+As a Noosfero administrator user, go to administrator panel:
+
+- Click on "Enable/disable plugins" option
+- Click on "Statistics Plugin" check-box
+
+Running Statistics tests
+--------------------
+
+$ rake test:noosfero_plugins:statistics
+
+
+Get Involved
+============
+
+If you found any bug and/or want to collaborate, please send an e-mail to eduardo.edington@gmail.com
+
+LICENSE
+=======
+
+Copyright (c) The Author developers.
+
+See Noosfero license.
+
+
+AUTHORS
+=======
+
+ Eduardo Tourinho Edington (eduardo.edington at gmail.com)
+
+ACKNOWLEDGMENTS
+===============
+
+The author has been supported by Serpro
@@ -0,0 +1,146 @@
+class StatisticsBlock < Block
+
+  settings_items :community_counter, :default => false
+  settings_items :user_counter, :default => true
+  settings_items :enterprise_counter, :default => false
+  settings_items :category_counter, :default => false
+  settings_items :tag_counter, :default => true
+  settings_items :comment_counter, :default => true
+  settings_items :hit_counter, :default => false
+  settings_items :templates_ids_counter, Hash, :default => {}
+
+  USER_COUNTERS = [:community_counter, :user_counter, :enterprise_counter, :tag_counter, :comment_counter, :hit_counter]
+  COMMUNITY_COUNTERS = [:user_counter, :tag_counter, :comment_counter, :hit_counter]
+  ENTERPRISE_COUNTERS = [:user_counter, :tag_counter, :comment_counter, :hit_counter]
+
+  def self.description
+    _('Statistics')
+  end
+
+  def default_title
+    _('Statistics for %s') % owner.name
+  end
+
+  def is_visible? counter
+    value = self.send(counter)
+    value == '1' || value == true
+  end
+
+  def is_counter_available? counter
+    if owner.kind_of?(Environment)
+      true
+    elsif owner.kind_of?(Person)
+      USER_COUNTERS.include?(counter)
+    elsif owner.kind_of?(Community)
+      COMMUNITY_COUNTERS.include?(counter)
+    elsif owner.kind_of?(Enterprise)
+      ENTERPRISE_COUNTERS.include?(counter)
+    end
+
+  end
+
+  def help
+    _('This block presents some statistics about your context.')
+  end
+
+  def timeout
+    60.minutes
+  end
+
+  def environment
+    if owner.kind_of?(Environment)
+      owner
+    elsif owner.kind_of?(Profile)
+      owner.environment
+    else
+      nil
+    end
+  end
+
+  def templates
+    Community.templates(environment)
+  end
+
+  def is_template_counter_active? template_id
+    self.templates_ids_counter[template_id.to_s].to_s == 'true'
+  end
+
+  def template_counter_count(template_id)
+    owner.communities.visible.count(:conditions => {:template_id => template_id})
+  end
+
+  def users
+    if owner.kind_of?(Environment)
+      owner.people.visible.count
+    elsif owner.kind_of?(Organization)
+      owner.members.visible.count
+    elsif owner.kind_of?(Person)
+      owner.friends.visible.count
+    else
+      0
+    end
+  end
+
+  def enterprises
+    if owner.kind_of?(Environment) || owner.kind_of?(Person)
+      owner.enterprises.visible.count
+    else
+      0
+    end
+  end
+
+  def communities
+    if owner.kind_of?(Environment) || owner.kind_of?(Person)
+      owner.communities.visible.count
+    else
+      0
+    end
+  end
+
+  def categories
+    if owner.kind_of?(Environment) then
+      owner.categories.count
+    else
+      0
+    end
+  end
+
+  def tags
+    if owner.kind_of?(Environment) then
+      owner.tag_counts.count
+    elsif owner.kind_of?(Profile) then
+      owner.article_tags.count
+    else
+      0
+    end
+  end
+
+  def comments
+    if owner.kind_of?(Environment) then
+      owner.profiles.joins(:articles).sum(:comments_count).to_i
+    elsif owner.kind_of?(Profile) then
+      owner.articles.sum(:comments_count)
+    else
+      0
+    end
+  end
+
+  def hits
+    if owner.kind_of?(Environment) then
+      owner.profiles.joins(:articles).sum(:hits).to_i
+    elsif owner.kind_of?(Profile) then
+      owner.articles.sum(:hits)
+    else
+      0
+    end
+  end
+
+  def content(args={})
+    block = self
+
+    lambda do
+      render :file => 'statistics_block', :locals => { :block => block }
+    end
+  end
+
+end
@@ -0,0 +1,19 @@
+require_dependency File.dirname(__FILE__) + '/statistics_block'
+
+class StatisticsPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Statistics Plugin"
+  end
+
+  def self.plugin_description
+    _("A plugin that adds a block where you can see statistics of it's context.")
+  end
+
+  def self.extra_blocks
+    {
+      StatisticsBlock => {}
+    }
+  end
+
+end
@@ -0,0 +1,161 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class EnvironmentDesignController; def rescue_action(e) raise e end; end
+
+class EnvironmentDesignControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = EnvironmentDesignController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    Environment.delete_all
+
+    @environment = Environment.create(:name => 'testenv', :is_default => true)
+    @environment.enabled_plugins = ['StatisticsPlugin']
+    @environment.save!
+
+    user = create_user('testinguser')
+    @environment.add_admin(user.person)
+
+    StatisticsBlock.delete_all
+    @box1 = Box.create!(:owner => @environment)
+    @environment.boxes = [@box1]
+
+    @block = StatisticsBlock.new
+    @block.box = @box1
+    @block.save!
+
+    login_as(user.login)
+  end
+
+  attr_accessor :block
+
+  should 'be able to edit StatisticsBlock' do
+    get :edit, :id => @block.id
+    assert_tag :tag => 'input', :attributes => { :id => 'block_title' }
+  end
+
+  should 'be able to save StatisticsBlock' do
+    get :edit, :id => @block.id
+    post :save, :id => @block.id, :block => {:title => 'Statistics' }
+    @block.reload
+    assert_equal 'Statistics', @block.title
+  end
+
+  should 'be able to uncheck core counters' do
+    @block.user_counter = true
+    @block.community_counter = true
+    @block.enterprise_counter = true
+    @block.category_counter = true
+    @block.tag_counter = true
+    @block.comment_counter = true
+    @block.hit_counter = true
+    @block.save!
+    get :edit, :id => @block.id
+    post :save, :id => @block.id, :block => {:user_counter => '0', :community_counter => '0', :enterprise_counter => '0',
+      :category_counter => '0', :tag_counter => '0', :comment_counter => '0', :hit_counter => '0' }
+    @block.reload
+    any_checked = @block.is_visible?('user_counter') ||
+                  @block.is_visible?('community_counter') ||
+                  @block.is_visible?('enterprise_counter') ||
+                  @block.is_visible?('category_counter') ||
+                  @block.is_visible?('tag_counter') ||
+                  @block.is_visible?('comment_counter') ||
+                  @block.is_visible?('hit_counter')
+    assert_equal false, any_checked
+
+  end
+
+  should 'be able to check core counters' do
+    @block.user_counter = false
+    @block.community_counter = false
+    @block.enterprise_counter = false
+    @block.category_counter = false
+    @block.tag_counter = false
+    @block.comment_counter = false
+    @block.hit_counter = false
+    @block.save!
+    get :edit, :id => @block.id
+    post :save, :id => @block.id, :block => {:user_counter => '1', :community_counter => '1', :enterprise_counter => '1',
+      :category_counter => '1', :tag_counter => '1', :comment_counter => '1', :hit_counter => '1' }
+    @block.reload
+    all_checked = @block.is_visible?('user_counter') &&
+                  @block.is_visible?('community_counter') &&
+                  @block.is_visible?('enterprise_counter') &&
+                  @block.is_visible?('category_counter') &&
+                  @block.is_visible?('tag_counter') &&
+                  @block.is_visible?('comment_counter') &&
+                  @block.is_visible?('hit_counter')
+    assert all_checked
+
+  end
+
+  should 'be able to check template counters' do
+    template = fast_create(Community, :name => 'Councils', :is_template => true, :environment_id => @environment.id)
+    @block.templates_ids_counter = {template.id.to_s => 'false'}
+    @block.save!
+    get :edit, :id => @block.id
+    post :save, :id => @block.id, :block => {:templates_ids_counter => {template.id.to_s => 'true'}}
+    @block.reload
+
+    assert @block.is_template_counter_active?(template.id)
+  end
+
+  should 'be able to uncheck template counters' do
+    template = fast_create(Community, :name => 'Councils', :is_template => true, :environment_id => @environment.id)
+    @block.templates_ids_counter = {template.id.to_s => 'true'}
+    @block.save!
+    get :edit, :id => @block.id
+    post :save, :id => @block.id, :block => {:templates_ids_counter => {template.id.to_s => 'false'}}
+    @block.reload
+
+    assert_equal false, @block.is_template_counter_active?(template.id)
+  end
+
+  should 'input user counter be checked by default' do
+    get :edit, :id => @block.id
+
+    assert_tag :input, :attributes => {:id => 'block_user_counter', :checked => 'checked'}
+  end
+
+  should 'not input community counter be checked by default' do
+    get :edit, :id => @block.id
+
+    assert_tag :input, :attributes => {:id => 'block_community_counter'}
+    assert_no_tag :input, :attributes => {:id => 'block_community_counter', :checked => 'checked'}
+  end
+
+  should 'not input enterprise counter be checked by default' do
+    get :edit, :id => @block.id
+
+    assert_tag :input, :attributes => {:id => 'block_enterprise_counter'}
+    assert_no_tag :input, :attributes => {:id => 'block_enterprise_counter', :checked => 'checked'}
+  end
+
+    should 'not input category counter be checked by default' do
+    get :edit, :id => @block.id
+
+    assert_tag :input, :attributes => {:id => 'block_category_counter'}
+    assert_no_tag :input, :attributes => {:id => 'block_category_counter', :checked => 'checked'}
+  end
+
+    should 'input tag counter be checked by default' do
+    get :edit, :id => @block.id
+
+    assert_tag :input, :attributes => {:id => 'block_tag_counter', :checked => 'checked'}
+  end
+
+  should 'input comment counter be checked by default' do
+    get :edit, :id => @block.id
+
+    assert_tag :input, :attributes => {:id => 'block_comment_counter', :checked => 'checked'}
+  end
+
+  should 'input hit counter not be checked by default' do
+    get :edit, :id => @block.id
+
+    assert_no_tag :input, :attributes => {:id => 'block_hit_counter', :checked => 'checked'}
+  end
+end
@@ -0,0 +1,147 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class HomeController; def rescue_action(e) raise e end; end
+
+class HomeControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = HomeController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    Environment.delete_all
+
+    @environment = Environment.create(:name => 'testenv', :is_default => true)
+    @environment.enabled_plugins = ['StatisticsPlugin']
+    @environment.save!
+
+    user = create_user('testinguser')
+    @environment.add_admin(user.person)
+
+    StatisticsBlock.delete_all
+    @box1 = Box.create!(:owner => @environment)
+    @environment.boxes = [@box1]
+
+    @block = StatisticsBlock.new
+    @block.box = @box1
+    @block.save!
+
+    login_as(user.login)
+  end
+
+  attr_accessor :block
+
+  should 'display statistics-block-data class in environment block edition' do
+    get :index
+
+    assert_tag :div, :attributes => {:class => 'statistics-block-data'}
+  end
+
+  should 'display users class in statistics-block-data block' do
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'users'} }
+  end
+
+  should 'not display users class in statistics-block-data block' do
+    @block.user_counter = false
+    @block.save!
+    get :index
+
+    assert_no_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'users'} }
+  end
+
+  should 'display communities class in statistics-block-data block' do
+    @block.community_counter = true
+    @block.save!
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'communities'} }
+  end
+
+  should 'not display communities class in statistics-block-data block' do
+    get :index
+
+    assert_no_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'communities'} }
+  end
+
+  should 'display enterprises class in statistics-block-data block' do
+    @block.enterprise_counter = true
+    @block.save!
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'enterprises'} }
+  end
+
+  should 'not display enterprises class in statistics-block-data block' do
+    get :index
+
+    assert_no_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'enterprises'} }
+  end
+
+  should 'display categories class in statistics-block-data block' do
+    @block.category_counter = true
+    @block.save!
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'categories'} }
+  end
+
+  should 'not display categories class in statistics-block-data block' do
+    get :index
+
+    assert_no_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'categories'} }
+  end
+
+  should 'display tags class in statistics-block-data block' do
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'tags'} }
+  end
+
+  should 'not display tags class in statistics-block-data block' do
+    @block.tag_counter = false
+    @block.save!
+    get :index
+
+    assert_no_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'tags'} }
+  end
+
+  should 'display comments class in statistics-block-data block' do
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'comments'} }
+  end
+
+  should 'not display comments class in statistics-block-data block' do
+    @block.comment_counter = false
+    @block.save!
+    get :index
+
+    assert_no_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'comments'} }
+  end
+
+  should 'display hits class in statistics-block-data block' do
+    @block.hit_counter = true
+    @block.save!
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'hits'} }
+  end
+
+  should 'not display hits class in statistics-block-data block' do
+    get :index
+
+    assert_no_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'hits'} }
+  end
+
+  should 'display template name in class in statistics-block-data block' do
+    template = fast_create(Community, :name => 'Councils', :is_template => true, :environment_id => @environment.id)
+    @block.templates_ids_counter = {template.id.to_s => 'true'}
+    @block.save!
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'statistics-block-data'}, :descendant => { :tag => 'li', :attributes => {:class => 'councils'} }
+  end
+end
@@ -0,0 +1,85 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class ProfileDesignController; def rescue_action(e) raise e end; end
+
+class ProfileDesignControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = ProfileDesignController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    Environment.delete_all
+
+    @environment = Environment.create(:name => 'testenv', :is_default => true)
+    @environment.enabled_plugins = ['StatisticsPlugin']
+    @environment.save!
+
+    user = create_user('testinguser')
+    @person = user.person
+    @environment.add_admin(@person)
+
+    StatisticsBlock.delete_all
+    @box1 = Box.create!(:owner => @person)
+    @environment.boxes = [@box1]
+
+    @block = StatisticsBlock.new
+    @block.box = @box1
+    @block.save!
+
+    login_as(user.login)
+  end
+
+  attr_accessor :block
+
+  should 'be able to edit StatisticsBlock' do
+    get :edit, :id => @block.id, :profile => @person.identifier
+    assert_tag :tag => 'input', :attributes => { :id => 'block_title' }
+  end
+
+  should 'be able to save StatisticsBlock' do
+    get :edit, :id => @block.id, :profile => @person.identifier
+    post :save, :id => @block.id, :block => {:title => 'Statistics' }, :profile => @person.identifier
+    @block.reload
+    assert_equal 'Statistics', @block.title
+  end
+
+  should 'be able to uncheck core counters' do
+    @block.user_counter = true
+    @block.tag_counter = true
+    @block.comment_counter = true
+    @block.hit_counter = true
+    @block.save!
+    get :edit, :id => @block.id, :profile => @person.identifier
+    post :save, :id => @block.id, :block => {:user_counter => '0', :tag_counter => '0', :comment_counter => '0', :hit_counter => '0' }, :profile => @person.identifier
+    @block.reload
+    any_checked = @block.is_visible?('user_counter') ||
+                  @block.is_visible?('tag_counter') ||
+                  @block.is_visible?('comment_counter') ||
+                  @block.is_visible?('hit_counter')
+    assert_equal false, any_checked
+  end
+
+  should 'be able to check core counters' do
+    @block.user_counter = false
+    @block.community_counter = false
+    @block.enterprise_counter = false
+    @block.category_counter = false
+    @block.tag_counter = false
+    @block.comment_counter = false
+    @block.hit_counter = false
+    @block.save!
+    get :edit, :id => @block.id, :profile => @person.identifier
+    post :save, :id => @block.id, :block => {:user_counter => '1',
+      :tag_counter => '1', :comment_counter => '1', :hit_counter => '1' }, :profile => @person.identifier
+    @block.reload
+    all_checked = @block.is_visible?('user_counter') &&
+                  @block.is_visible?('tag_counter') &&
+                  @block.is_visible?('comment_counter') &&
+                  @block.is_visible?('hit_counter')
+    assert all_checked
+
+  end
+
+end
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,336 @@
+require File.dirname(__FILE__) + '/../test_helper'
+class StatisticsBlockTest < ActiveSupport::TestCase
+
+  ['user_counter', 'tag_counter', 'comment_counter'].map do |counter|
+    should "#{counter} be true by default" do
+      b = StatisticsBlock.new
+      assert b.is_visible?(counter)
+    end
+  end
+
+  ['community_counter', 'enterprise_counter', 'category_counter', 'hit_counter'].map do |counter|
+    should "#{counter} be false by default" do
+      b = StatisticsBlock.new
+      assert !b.is_visible?(counter)
+    end
+  end
+
+  should 'inherit from Block' do
+    assert_kind_of Block, StatisticsBlock.new
+  end
+
+  should 'provide a default title' do
+    block = StatisticsBlock.new
+
+    owner = mock
+    owner.expects(:name).returns('my environment')
+    block.expects(:owner).returns(owner)
+    assert_equal 'Statistics for my environment', block.title
+  end
+
+  should 'describe itself' do
+    assert_not_equal StatisticsBlock.description, Block.description
+  end
+
+  should 'is_visible? return true if setting is true' do
+    b = StatisticsBlock.new
+    b.community_counter = true
+    assert b.is_visible?('community_counter')
+  end
+
+  should 'is_visible? return false if setting is false' do
+    b = StatisticsBlock.new
+    b.community_counter = false
+    assert !b.is_visible?('community_counter')
+  end
+
+  should 'templates return the Community templates of the Environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    t1 = fast_create(Community, :is_template => true, :environment_id => e.id)
+    t2 = fast_create(Community, :is_template => true, :environment_id => e.id)
+    fast_create(Community, :is_template => false)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    t = b.templates
+    assert_equal [], [t1,t2] - t
+    assert_equal [], t - [t1,t2]
+  end
+
+  should 'users return the amount of users of the Environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    fast_create(Person, :environment_id => e.id)
+    fast_create(Person, :environment_id => e.id)
+    fast_create(Person, :visible => false, :environment_id => e.id)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert_equal 2, b.users
+  end
+
+  should 'users return the amount of members of the community' do
+    b = StatisticsBlock.new
+
+    c1 = fast_create(Community)
+    c1.add_member(fast_create(Person))
+    c1.add_member(fast_create(Person))
+    c1.add_member(fast_create(Person))
+    c1.add_member(fast_create(Person, :visible => false))
+    c1.add_member(fast_create(Person, :visible => false))
+
+    b.expects(:owner).at_least_once.returns(c1)
+    assert_equal 3, b.users
+  end
+
+  should 'users return the amount of friends of the person' do
+    b = StatisticsBlock.new
+
+    p1 = fast_create(Person)
+    p1.add_friend(fast_create(Person))
+    p1.add_friend(fast_create(Person))
+    p1.add_friend(fast_create(Person))
+    p1.add_friend(fast_create(Person, :visible => false))
+    p1.add_friend(fast_create(Person, :visible => false))
+
+    b.expects(:owner).at_least_once.returns(p1)
+    assert_equal 3, b.users
+  end
+
+  should 'communities return the amount of communities of the Environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    fast_create(Community, :environment_id => e.id)
+    fast_create(Community, :environment_id => e.id)
+    fast_create(Community, :visible => false, :environment_id => e.id)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert_equal 2, b.communities
+  end
+
+  should 'enterprises return the amount of enterprises of the Environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    fast_create(Enterprise, :environment_id => e.id)
+    fast_create(Enterprise, :environment_id => e.id)
+    fast_create(Enterprise, :visible => false, :environment_id => e.id)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert_equal 2, b.enterprises
+  end
+
+  should 'categories return the amount of categories of the Environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    fast_create(Category, :environment_id => e.id)
+    fast_create(Category, :environment_id => e.id)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert_equal 2, b.categories
+  end
+
+  should 'tags return the amount of tags of the Environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    p1 = fast_create(Person, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => p1.id)
+    t1 = fast_create(Tag, :name => 'T1')
+    t2 = fast_create(Tag, :name => 'T2')
+    a1.tags << t1
+    a1.tags << t2
+    a2 = fast_create(Article, :profile_id => p1.id)
+    t3 = fast_create(Tag, :name => 'T3')
+    t4 = fast_create(Tag, :name => 'T4')
+    a2.tags << t3
+    a2.tags << t4
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert_equal 4, b.tags
+  end
+
+  should 'tags return the amount of tags of the community' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    c1 = fast_create(Community, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => c1.id)
+    t1 = fast_create(Tag, :name => 'T1')
+    t2 = fast_create(Tag, :name => 'T2')
+    a1.tags << t1
+    a1.tags << t2
+    a2 = fast_create(Article, :profile_id => c1.id)
+    t3 = fast_create(Tag, :name => 'T3')
+    t4 = fast_create(Tag, :name => 'T4')
+    a2.tags << t3
+    a2.tags << t4
+
+    b.expects(:owner).at_least_once.returns(c1)
+
+    assert_equal 4, b.tags
+  end
+
+  should 'tags return the amount of tags of the profile (person)' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    p1 = fast_create(Person, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => p1.id)
+    t1 = fast_create(Tag, :name => 'T1')
+    t2 = fast_create(Tag, :name => 'T2')
+    a1.tags << t1
+    a1.tags << t2
+    a2 = fast_create(Article, :profile_id => p1.id)
+    t3 = fast_create(Tag, :name => 'T3')
+    t4 = fast_create(Tag, :name => 'T4')
+    a2.tags << t3
+    a2.tags << t4
+
+    b.expects(:owner).at_least_once.returns(p1)
+
+    assert_equal 4, b.tags
+  end
+
+  should 'comments return the amount of comments of the Environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    p1 = fast_create(Person, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => p1.id)
+
+    Comment.create!(:source => a1, :body => 'C1', :author_id => 1)
+    Comment.create!(:source => a1, :body => 'C2', :author_id => 1)
+
+    a2 = fast_create(Article, :profile_id => p1.id)
+    Comment.create!(:source => a2, :body => 'C3', :author_id => 1)
+    Comment.create!(:source => a2, :body => 'C4', :author_id => 1)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert_equal 4, b.comments
+  end
+
+  should 'comments return the amount of comments of the community' do
+    b = StatisticsBlock.new
+    e = Environment.default
+
+    c1 = fast_create(Community, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => c1.id)
+    Comment.create!(:source => a1, :body => 'C1', :author_id => 1)
+    Comment.create!(:source => a1, :body => 'C2', :author_id => 1)
+
+    a2 = fast_create(Article, :profile_id => c1.id)
+    Comment.create!(:source => a2, :body => 'C3', :author_id => 1)
+    Comment.create!(:source => a2, :body => 'C4', :author_id => 1)
+
+    b.expects(:owner).at_least_once.returns(c1)
+
+    assert_equal 4, b.comments
+  end
+
+  should 'comments return the amount of comments of the profile (person)' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    p1 = fast_create(Person, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => p1.id)
+    Comment.create!(:source => a1, :body => 'C1', :author_id => 1)
+    Comment.create!(:source => a1, :body => 'C2', :author_id => 1)
+
+    a2 = fast_create(Article, :profile_id => p1.id)
+    Comment.create!(:source => a1, :body => 'C3', :author_id => 1)
+    Comment.create!(:source => a1, :body => 'C4', :author_id => 1)
+
+    b.expects(:owner).at_least_once.returns(p1)
+
+    assert_equal 4, b.comments
+  end
+
+  should 'hits return the amount of hits of the Environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    p1 = fast_create(Person, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => p1.id, :hits => 2)
+    a2 = fast_create(Article, :profile_id => p1.id, :hits => 5)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert_equal 7, b.hits
+  end
+
+  should 'hits return the amount of hits of the community' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    c1 = fast_create(Community, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => c1.id, :hits => 2)
+    a2 = fast_create(Article, :profile_id => c1.id, :hits => 5)
+
+    b.expects(:owner).at_least_once.returns(c1)
+
+    assert_equal 7, b.hits
+  end
+
+  should 'hits return the amount of hits of the profile (person)' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    p1 = fast_create(Person, :environment_id => e.id)
+    a1 = fast_create(Article, :profile_id => p1.id, :hits => 2)
+    a2 = fast_create(Article, :profile_id => p1.id, :hits => 5)
+
+    b.expects(:owner).at_least_once.returns(p1)
+
+    assert_equal 7, b.hits
+  end
+
+  should 'is_counter_available? return true for all counters if owner is environment' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert b.is_counter_available?(:user_counter)
+  end
+
+  should 'is_template_counter_active? return true if setting is true' do
+    b = StatisticsBlock.new
+    b.templates_ids_counter = {'1' => 'true'}
+    assert b.is_template_counter_active?(1)
+  end
+
+  should 'is_template_counter_active? return false if setting is false' do
+    b = StatisticsBlock.new
+    b.templates_ids_counter = {'1' => 'false'}
+    assert !b.is_template_counter_active?(1)
+  end
+
+  should 'template_counter_count return the amount of communities of the Environment using a template' do
+    b = StatisticsBlock.new
+    e = fast_create(Environment)
+
+    t1 = fast_create(Community, :is_template => true, :environment_id => e.id)
+    t2 = fast_create(Community, :is_template => true, :environment_id => e.id)
+    fast_create(Community, :is_template => false, :environment_id => e.id, :template_id => t1.id, :visible => true)
+    fast_create(Community, :is_template => false, :environment_id => e.id, :template_id => t1.id, :visible => true)
+    fast_create(Community, :is_template => false, :environment_id => e.id, :template_id => t1.id, :visible => false)
+
+    fast_create(Community, :is_template => false, :environment_id => e.id, :template_id => t2.id, :visible => true)
+    fast_create(Community, :is_template => false, :environment_id => e.id, :template_id => t2.id, :visible => false)
+
+    b.expects(:owner).at_least_once.returns(e)
+
+    assert_equal 2, b.template_counter_count(t1.id)
+  end
+end
@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class StatisticsPluginTest < ActiveSupport::TestCase
+
+  should "return StatisticsBlock in extra_mlocks class method" do
+    assert  StatisticsPlugin.extra_blocks.keys.include?(StatisticsBlock)
+  end
+
+end
@@ -0,0 +1,32 @@
+<%= labelled_form_field check_box(:block, :user_counter) + _('Show user counter'), '' %>
+
+<% if @block.is_counter_available?(:community_counter) %>
+<%= labelled_form_field check_box(:block, :community_counter) + _('Show community counter'), '' %>
+<% end %>
+
+<% if @block.is_counter_available?(:enterprise_counter) %>
+<%= labelled_form_field check_box(:block, :enterprise_counter) + _('Show enterprise counter'), '' %>
+<% end %>
+
+<% if @block.is_counter_available?(:category_counter) %>
+<%= labelled_form_field check_box(:block, :category_counter) + _('Show category counter'), '' %>
+<% end %>
+
+<% if @block.is_counter_available?(:tag_counter) %>
+<%= labelled_form_field check_box(:block, :tag_counter) + _('Show tag counter'), '' %>
+<% end %>
+
+<% if @block.is_counter_available?(:comment_counter) %>
+<%= labelled_form_field check_box(:block, :comment_counter) + _('Show comment counter'), '' %>
+<% end %>
+
+<% if @block.is_counter_available?(:hit_counter) %>
+<%= labelled_form_field check_box(:block, :hit_counter) + _('Show hit counter'), '' %>
+<% end %>
+
+<% if @block.is_counter_available?(:templates_ids_counter) %>
+<%   @block.templates.map do |item|%>
+   <%= hidden_field_tag("block[templates_ids_counter][#{item.id}]", false)%>
+   <%= labelled_form_field check_box_tag("block[templates_ids_counter][#{item.id}]", true, @block.is_template_counter_active?(item.id)) + _("Show counter for communities with template %s" % item.name), '' %>
+<%   end %>
+<% end %>
@@ -0,0 +1 @@
+box_organizer
 \ No newline at end of file
@@ -0,0 +1 @@
+box_organizer
 \ No newline at end of file
@@ -0,0 +1,36 @@
+<h3 class="block-title">
+  <span><%=block.title%></span>
+</h3>
+<div class="statistics-block-data">
+  <ul>
+    <% if block.is_visible?('user_counter') %>
+      <li class="users"><span class="amount"><%= block.users%> </span><span class="label"><%= _('users')%></span></li>
+    <% end %>
+    <% if block.is_visible?('enterprise_counter') && !block.environment.enabled?('disable_asset_enterprises') %>
+      <li class="enterprises"><span class="amount"><%= block.enterprises%> </span><span class="label"><%= _('enterprises')%></span></li>
+    <% end %>
+    <% if block.is_visible?('community_counter') %>
+      <li class="communities"><span class="amount"><%= block.communities%> </span><span class="label"><%= _('communities')%></span></li>
+    <% end %>
+    <% if block.is_visible?('category_counter') %>
+      <li class="categories"><span class="amount"><%= block.categories%> </span><span class="label"><%= _('categories')%></span></li>
+    <% end %>
+    <% if block.is_visible?('tag_counter') %>
+      <li class="tags"><span class="amount"><%= block.tags%> </span><span class="label"><%= _('tags')%></span></li>
+    <% end %>
+    <% if block.is_visible?('comment_counter') %>
+      <li class="comments"><span class="amount"><%= block.comments%> </span><span class="label"><%= _('comments')%></span></li>
+    <% end %>
+    <% if block.is_visible?('hit_counter') %>
+      <li class="hits"><span class="amount"><%= block.hits%> </span><span class="label"><%= _('hits')%></span></li>
+    <% end %>
+
+    <% if block.owner.kind_of?(Environment) then %>
+      <% block.templates.each do |item|  %>
+        <% if block.is_template_counter_active? item.id %>
+          <li class="<%= item.name.to_slug%>"><span class="amount"><%= block.template_counter_count(item.id)%> </span><span class="label"><%= item.name%></span></li>
+        <% end %>
+      <% end %>
+    <% end %>
+  </ul>
+</div>
@@ -5,8 +5,7 @@ class ToleranceTimePlugin::Publication &lt; Noosfero::Plugin::ActiveRecord
   class << self
     def find_by_target(target)
-      kind = target.kind_of?(Article) ? 'Article' : 'Comment'
-      find_by_target_id_and_target_type(target.id, kind)
+      find_by_target_id_and_target_type(target.id, target.class.base_class.name)
     end
   end
@@ -0,0 +1,39 @@
+h1. Variables Plugin
+
+A set of simple variables to be used in a macro context.
+
+h2. Usage
+
+* Create a HTML content using RawHTMLBlock, TinyMceArticle or other
+  article with HTML support
+* Add a HTML div tag with css class "macro" (see Example)
+* Add inner that div tag the variable desired, like {profile}
+
+h2. Usage with TinyMceArticle
+
+The Noosfero's macros add a extra button in toolbar of the editor
+to use macros in a single way, that way this plugin add a option
+called "Variables" under this option.
+
+h2. Supported variables
+
+* {profile} - will be replaced by the identifier of the profile
+* {name} - will be replaced by the name of the profile
+
+h2. Example
+
+<pre>
+<div class="macro" data-macro="variables_plugin/profile">
+  the identifier of the profile = {profile}
+  the name of the profile = {name}
+</div>
+</pre>
+
+h2. Info
+
+This plugin was inspired by the solution proposed by the Serpro in
+the merge-request #419 on the Gitorious:
+
+* https://gitorious.org/noosfero/noosfero/merge_requests/419
+
+And improved by the guys from the UnB.
@@ -0,0 +1,13 @@
+class VariablesPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Variables Plugin"
+  end
+
+  def self.plugin_description
+    _("A set of simple variables to be used in a macro context")
+  end
+
+end
+
+require_dependency 'variables_plugin/macros/profile'
@@ -0,0 +1,37 @@
+ActionView::Base.sanitized_allowed_attributes += ['data-macro']
+
+class VariablesPlugin::Profile < Noosfero::Plugin::Macro
+
+  def self.configuration
+    {
+      :title => _('Variables'),
+      :skip_dialog => false,
+      :generator => method(:macro_default_generator),
+      :params => [
+        {
+          :name   => 'variable',
+          :label  => _('Select the desired variable'),
+          :type   => 'select',
+          :values => ['{profile}', '{name}']
+        }
+      ],
+    }
+  end
+
+  def self.macro_default_generator(macro)
+    "
+      '<div class=\"macro mceNonEditable\" data-macro=\"#{macro.identifier}\">'
+      + jQuery('*[name=variable]', dialog).val()
+      + '</div>';
+    "
+  end
+
+  def parse(params, inner_html, source)
+    if context.profile
+      inner_html.gsub!(/\{profile\}/, context.profile.identifier)
+      inner_html.gsub!(/\{name\}/, context.profile.name)
+    end
+    inner_html
+  end
+
+end
@@ -0,0 +1,41 @@
+class ProfileTest < ActiveSupport::TestCase
+
+  def setup
+    @macro = VariablesPlugin::Profile.new
+    @macro.context = mock()
+    @profile = fast_create(Community)
+    @macro.context.stubs(:profile).returns(@profile)
+  end
+
+  attr_reader :macro, :profile
+
+  should 'have a configuration' do
+    assert VariablesPlugin::Profile.configuration
+  end
+
+  should 'substitute the {profile} variable by the profile idenfifier' do
+    html = 'the profile identifier is {profile}'
+    content = macro.parse({}, html, profile)
+    assert_equal "the profile identifier is #{profile.identifier}", content
+  end
+
+  should 'substitute the {name} variable by the profile name' do
+    html = 'the profile name is {name}'
+    content = macro.parse({}, html, profile)
+    assert_equal "the profile name is #{profile.name}", content
+  end
+
+  should 'do not change the content if the variable is not supported' do
+    html = 'the variable {unsupported} is not supported'
+    content = macro.parse({}, html, profile)
+    assert_equal html, content
+  end
+
+  should 'do nothing out of profile context' do
+    macro.context.stubs(:profile).returns(nil)
+    html = 'there is no {support} out of profile context'
+    content = macro.parse({}, html, profile)
+    assert_equal html, content
+  end
+
+end
@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class VariablesPluginTest < ActiveSupport::TestCase
+
+  def setup
+    @environment = Environment.default
+    @plugin = VariablesPlugin.new
+  end
+
+  attr_reader :environment, :plugin
+
+  should 'have a name' do
+    assert_not_equal Noosfero::Plugin.plugin_name, VariablesPlugin::plugin_name
+  end
+
+  should 'describe yourself' do
+    assert_not_equal Noosfero::Plugin.plugin_description, VariablesPlugin::plugin_description
+  end
+
+end
@@ -7,7 +7,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: noosfero 0.45.2\n"
 "POT-Creation-Date: 2014-01-17 18:26-0000\n"
-"PO-Revision-Date: 2011-03-30 20:52-0300\n"
+"PO-Revision-Date: 2014-03-25 15:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: eo\n"
@@ -107,7 +107,7 @@ msgstr &quot;&quot;
 #: app/views/blocks/profile_info_actions/_join_leave_community.rhtml:25
 #: app/views/profile/_private_profile.rhtml:10
 msgid "Join"
-msgstr ""
+msgstr "Eniri"
 #: app/helpers/application_helper.rb:554
 #: app/views/blocks/profile_info_actions/_join_leave_community.rhtml:4
@@ -291,7 +291,7 @@ msgstr &quot;&quot;
 #: app/helpers/application_helper.rb:1118
 msgid "See all"
-msgstr ""
+msgstr "Vidi ĉiujn"
 #: app/helpers/application_helper.rb:1121
 msgid "<span>Manage</span> %s"
@@ -678,11 +678,11 @@ msgstr &quot;&quot;
 #: app/helpers/forum_helper.rb:14 app/helpers/blog_helper.rb:23
 msgid "&laquo; Newer posts"
-msgstr ""
+msgstr "&laquo; Pli freŝaj afiŝoj"
 #: app/helpers/forum_helper.rb:15 app/helpers/blog_helper.rb:24
 msgid "Older posts &raquo;"
-msgstr ""
+msgstr "Malpli freŝaj afiŝoj &raquo"
 #: app/helpers/forum_helper.rb:18
 msgid "Discussion topic"
@@ -763,63 +763,63 @@ msgstr &quot;&quot;
 #: app/helpers/dates_helper.rb:7 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:4
 msgid "January"
-msgstr ""
+msgstr "Januaro"
 #: app/helpers/dates_helper.rb:8 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:5
 msgid "February"
-msgstr ""
+msgstr "Februaro"
 #: app/helpers/dates_helper.rb:9 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:6
 msgid "March"
-msgstr ""
+msgstr "Marto"
 #: app/helpers/dates_helper.rb:10 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:7
 msgid "April"
-msgstr ""
+msgstr "Aprilo"
 #: app/helpers/dates_helper.rb:11 app/helpers/forms_helper.rb:172
 #: app/helpers/forms_helper.rb:173
 #: plugins/display_content/lib/display_content_block.rb:8
 msgid "May"
-msgstr ""
+msgstr "Majo"
 #: app/helpers/dates_helper.rb:12 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:9
 msgid "June"
-msgstr ""
+msgstr "Junio"
 #: app/helpers/dates_helper.rb:13 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:10
 msgid "July"
-msgstr ""
+msgstr "Julio"
 #: app/helpers/dates_helper.rb:14 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:11
 msgid "August"
-msgstr ""
+msgstr "Aŭgusto"
 #: app/helpers/dates_helper.rb:15 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:12
 msgid "September"
-msgstr ""
+msgstr "Septembro"
 #: app/helpers/dates_helper.rb:16 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:13
 msgid "October"
-msgstr ""
+msgstr "Oktobro"
 #: app/helpers/dates_helper.rb:17 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:14
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 #: app/helpers/dates_helper.rb:18 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:15
 msgid "December"
-msgstr ""
+msgstr "Decembro"
 #: app/helpers/dates_helper.rb:28
 #: plugins/display_content/lib/display_content_block.rb:153
@@ -834,7 +834,7 @@ msgstr &quot;&quot;
 #: app/helpers/dates_helper.rb:31
 #: plugins/display_content/lib/display_content_block.rb:156
 msgid "%{month_name} %{day}, %{year}"
-msgstr ""
+msgstr "La %{day}-a de %{month_name} %{year}"
 #: app/helpers/dates_helper.rb:31
 #: plugins/display_content/lib/display_content_block.rb:156
@@ -8043,7 +8043,7 @@ msgstr &quot;&quot;
 #: app/views/account/index_anonymous.rhtml:10
 msgid "Sign up."
-msgstr ""
+msgstr "Aliĝi"
 #: app/views/account/index_anonymous.rhtml:11
 msgid ""
@@ -7,7 +7,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: noosfero 0.45.2\n"
 "POT-Creation-Date: 2014-01-17 18:26-0000\n"
-"PO-Revision-Date: 2013-01-03 18:39-0300\n"
+"PO-Revision-Date: 2014-03-25 14:55+0000\n"
 "Last-Translator: Luis David Aguilar Carlos <ludwig9003@gmail.com>,Freddy "
 "Martín Hernández Facio <fmhf14@gmail.com>, Pedro Alonzo Ramírez Tovar <pedro."
 "alonzo709@gmail.com>\n"
@@ -292,7 +292,6 @@ msgid &quot;Next&quot;
 msgstr "Siguiente"
 #: app/helpers/application_helper.rb:1118
-#, fuzzy
 msgid "See all"
 msgstr "Ver todos"
@@ -690,11 +689,11 @@ msgstr &quot;Configurar foro&quot;
 #: app/helpers/forum_helper.rb:14 app/helpers/blog_helper.rb:23
 msgid "&laquo; Newer posts"
-msgstr "&laquo; Entradas recientes"
+msgstr "&laquo; Noticias más nuevas"
 #: app/helpers/forum_helper.rb:15 app/helpers/blog_helper.rb:24
 msgid "Older posts &raquo;"
-msgstr "Entradas antiguas &raquo;"
+msgstr "Noticias más viejas &raquo;"
 #: app/helpers/forum_helper.rb:18
 msgid "Discussion topic"
@@ -841,15 +840,13 @@ msgstr &quot;%{day} de %{month} %{year}&quot;
 #: app/helpers/dates_helper.rb:28 app/helpers/dates_helper.rb:40
 #: plugins/display_content/lib/display_content_block.rb:153
-#, fuzzy
 msgid "%{month}/%{day}"
-msgstr "%{day} de %{month} %{year}"
+msgstr "%{day}/%{month}"
 #: app/helpers/dates_helper.rb:31
 #: plugins/display_content/lib/display_content_block.rb:156
-#, fuzzy
 msgid "%{month_name} %{day}, %{year}"
-msgstr "%{day} de %{month} %{year}"
+msgstr "%{day} de %{month} de %{year}"
 # LAs cadenas de este tipo NO se traducen
 #: app/helpers/dates_helper.rb:31
@@ -877,21 +874,19 @@ msgstr &quot;%{month} %{year}&quot;
 #: app/helpers/dates_helper.rb:53
 msgid "%{day} %{month} %{year}, %{hour}:%{minutes}"
-msgstr "%{day} %{month} %{year}, %{hour}:%{minutes}"
+msgstr "%{day} de %{month} de %{year}, %{hour}:%{minutes}"
 #: app/helpers/dates_helper.rb:65
-#, fuzzy
 msgid "from %{month} %{day1} to %{day2}, %{year}"
-msgstr "%{day} de %{month} %{year}"
+msgstr "de %{day1} para %{day2} de %{month} de %{year}"
 #: app/helpers/dates_helper.rb:72
-#, fuzzy
 msgid "from %{date1} to %{date2}, %{year}"
-msgstr "Por %{author} el %{date}"
+msgstr "de %{date1} para %{date2} de %{year}"
 #: app/helpers/dates_helper.rb:79
 msgid "from %{date1} to %{date2}"
-msgstr "Por %{author} el %{date}"
+msgstr "de %{date1} para %{date2}"
 #: app/helpers/dates_helper.rb:89 app/helpers/forms_helper.rb:163
 msgid "Sun"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: noosfero 0.45.2\n"
 "POT-Creation-Date: 2014-01-17 18:26-0000\n"
-"PO-Revision-Date: 2012-06-05 10:27-0300\n"
+"PO-Revision-Date: 2014-03-25 15:39+0000\n"
 "Last-Translator: Daniela Feitosa <danielafeitosa@colivre.coop.br>\n"
 "Language-Team: LANGUAGE TEAM <LL@li.org>\n"
 "Language: it\n"
@@ -109,7 +109,7 @@ msgstr &quot;&quot;
 #: app/views/blocks/profile_info_actions/_join_leave_community.rhtml:25
 #: app/views/profile/_private_profile.rhtml:10
 msgid "Join"
-msgstr ""
+msgstr "Accedere"
 #: app/helpers/application_helper.rb:554
 #: app/views/blocks/profile_info_actions/_join_leave_community.rhtml:4
@@ -752,63 +752,63 @@ msgstr &quot;&quot;
 #: app/helpers/dates_helper.rb:7 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:4
 msgid "January"
-msgstr ""
+msgstr "gennaio"
 #: app/helpers/dates_helper.rb:8 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:5
 msgid "February"
-msgstr ""
+msgstr "febbraio"
 #: app/helpers/dates_helper.rb:9 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:6
 msgid "March"
-msgstr ""
+msgstr "marzo"
 #: app/helpers/dates_helper.rb:10 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:7
 msgid "April"
-msgstr ""
+msgstr "aprile"
 #: app/helpers/dates_helper.rb:11 app/helpers/forms_helper.rb:172
 #: app/helpers/forms_helper.rb:173
 #: plugins/display_content/lib/display_content_block.rb:8
 msgid "May"
-msgstr ""
+msgstr "maggio"
 #: app/helpers/dates_helper.rb:12 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:9
 msgid "June"
-msgstr ""
+msgstr "giugno"
 #: app/helpers/dates_helper.rb:13 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:10
 msgid "July"
-msgstr ""
+msgstr "luglio"
 #: app/helpers/dates_helper.rb:14 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:11
 msgid "August"
-msgstr ""
+msgstr "agosto"
 #: app/helpers/dates_helper.rb:15 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:12
 msgid "September"
-msgstr ""
+msgstr "settembre"
 #: app/helpers/dates_helper.rb:16 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:13
 msgid "October"
-msgstr ""
+msgstr "ottobre"
 #: app/helpers/dates_helper.rb:17 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:14
 msgid "November"
-msgstr ""
+msgstr "novembre"
 #: app/helpers/dates_helper.rb:18 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:15
 msgid "December"
-msgstr ""
+msgstr "dicembre"
 #: app/helpers/dates_helper.rb:28
 #: plugins/display_content/lib/display_content_block.rb:153
@@ -823,7 +823,7 @@ msgstr &quot;&quot;
 #: app/helpers/dates_helper.rb:31
 #: plugins/display_content/lib/display_content_block.rb:156
 msgid "%{month_name} %{day}, %{year}"
-msgstr ""
+msgstr "%{day} %{month_name} %{year}"
 #: app/helpers/dates_helper.rb:31
 #: plugins/display_content/lib/display_content_block.rb:156
@@ -8016,7 +8016,7 @@ msgstr &quot;&quot;
 #: app/views/account/index_anonymous.rhtml:10
 msgid "Sign up."
-msgstr ""
+msgstr "Registro"
 #: app/views/account/index_anonymous.rhtml:11
 msgid ""
@@ -2875,6 +2875,30 @@ msgstr &quot;Artigo de texto com linguagem de marcação Textile&quot;
 msgid "Accessible alternative for visually impaired users."
 msgstr "Alternativa acessível para usuários com deficiência visual."
+#: app/models/layout_template.rb
+msgid "Left Bar"
+msgstr "Uma barra à esquerda"
+
+#: app/models/layout_template.rb
+msgid "2 Left Bars"
+msgstr "Duas barras à esquerda"
+
+#: app/models/layout_template.rb
+msgid "Left and Bottom Bar"
+msgstr "Uma barra à esquerda e outra ao final"
+
+#: app/models/layout_template.rb
+msgid "Right Bar"
+msgstr "Uma barra à direita"
+
+#: app/models/layout_template.rb
+msgid "Default"
+msgstr "Padrão"
+
+#: app/models/layout_template.rb
+msgid "No Sidebars"
+msgstr "Nenhuma barra lateral"
+
 #: app/models/login_block.rb:4
 msgid "Login/logout"
 msgstr "Login/Sair"
@@ -7219,8 +7243,8 @@ msgstr &quot;Funcionalidade&quot;
 #: app/views/features/index.rhtml:16
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:4
-msgid "Enabled?"
-msgstr "Habilitada?"
+msgid "Enable shopping basket"
+msgstr "Habilitar cesto de compras"
 #: app/views/features/index.rhtml:27
 msgid "Configure features"
@@ -12462,8 +12486,8 @@ msgid &quot;Basket options&quot;
 msgstr "Opções do cesto"
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:5
-msgid "Delivery?"
-msgstr "Entrega?"
+msgid "Enable delivery fields on orders"
+msgstr "Ativar campos de entrega para pedidos"
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10
 msgid "Option"
@@ -12480,12 +12504,12 @@ msgid &quot;ADD NEW OPTION&quot;
 msgstr "ADCIONAR NOVA OPÇÂO"
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:36
-msgid "Free delivery price:"
-msgstr "Preço de entrega grátis:"
+msgid "Order's minimum price for free delivery:"
+msgstr "Preço mínimo do pedido para entrega grátis:"
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:37
-msgid "Empty stands for no free delivery price."
-msgstr "Vazio significa sem preço de frete grátis."
+msgid "Leave empty to always charge the delivery."
+msgstr "Deixe vazio para sempre cobrar a entrega."
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/reports.html.erb:1
 msgid "Purchase Reports"
-name: "Left and Bottom bar"
+name: "Left and Bottom Bar"
 title: "Style 2 columns and a box at bottom of content"
 description: "A theme with 2 columns and a box below the content"
 number_of_boxes: 3
-name: "No Side Bars"
+name: "No Sidebars"
 title: "No sidebars, only content"
 description: "A template without sidebars, only content"
 number_of_boxes: 1
@@ -1275,6 +1275,11 @@ hr.pre-posts, hr.sep-posts {
   padding-right: 9px;
 }
+.comment-order {
+  float: right;
+  display: block;
+}
+
 .comment-from-owner .comment-created-at {
   color: #333;
 }
@@ -1101,4 +1101,4 @@ jQuery(document).ready(function(){
   jQuery("#article_has_terms_of_use").click(function(){
     showHideTermsOfUse();
   });
-});
 \ No newline at end of file
+});
@@ -0,0 +1,21 @@
+function send_order(order, url) {
+  open_loading(DEFAULT_LOADING_MESSAGE);
+
+  jQuery.ajax({
+    url:url,
+    data: {"comment_order":order},
+    success: function(response) {
+      close_loading();
+      jQuery(".article-comments-list").html(response);
+    },
+    error: function() { close_loading() }
+  });
+}
+
+
+jQuery(document).ready(function(){
+  jQuery("#comment_order").change(function(){
+    var url = jQuery("#page_url").val();
+    send_order(this.value, url);
+  });
+});
 \ No newline at end of file
@@ -0,0 +1,39 @@
+function send_ajax(source_url) {
+  jQuery(".link-address").autocomplete({
+    source : function(request, response){
+      jQuery.ajax({
+        type: "GET",
+        url: source_url,
+        data: {query: request.term},
+        success: function(result){
+          response(result);
+        },
+        error: function(ajax, stat, errorThrown) {
+          console.log('Link not found : ' + errorThrown);
+        }
+      });
+    },
+
+    minLength: 3
+  });
+}
+
+function new_link_action(){
+  send_ajax(jQuery("#page_url").val());
+
+  jQuery(".delete-link-list-row").click(function(){
+    jQuery(this).parent().parent().remove();
+    return false;
+  });
+
+  jQuery(document).scrollTop(jQuery('#dropable-link-list').scrollTop());
+}
+
+jQuery(document).ready(function(){
+  new_link_action();
+
+  jQuery("#dropable-link-list").sortable({
+    revert: true,
+    axis: "y"
+  });
+});
 \ No newline at end of file
@@ -0,0 +1,83 @@
+function update_active(name_active, name_required, name_signup) {
+  var required = jQuery("input[name='" + name_required + "']")[1]
+  var signup = jQuery("input[name='" + name_signup + "']")[1]
+  var active = jQuery("input[name='" + name_active + "']")[1]
+
+  if(required.checked || signup.checked)
+    active.checked = true
+}
+
+function active_action(obj_active, name_required, name_signup) {
+  var required = jQuery("input[name='" + name_required + "']")[0]
+  var signup = jQuery("input[name='" + name_signup + "']")[0]
+
+  required.disabled = signup.disabled = !obj_active.checked
+}
+
+function required_action(name_active, name_required, name_signup) {
+  var obj_required = jQuery("input[name='" + name_required + "']")[1]
+
+  if(obj_required.checked) {
+    jQuery("input[name='" + name_signup + "']")[0].checked = true
+    jQuery("input[name='" + name_signup + "']")[1].checked = true
+  }
+
+  update_active(name_active, name_required, name_signup)
+}
+
+function signup_action(name_active, name_required, name_signup) {
+  var obj_signup = jQuery("input[name='" + name_signup + "']")[1]
+
+  if(!obj_signup.checked) {
+    jQuery("input[name='" + name_required + "']")[0].checked = false
+    jQuery("input[name='" + name_required + "']")[1].checked = false
+  }
+
+  update_active(name_active, name_required, name_signup)
+}
+
+
+jQuery(document).ready(function(){
+  function check_fields(check, table_id, start) {
+    var checkboxes = jQuery("#" + table_id + " tbody tr td input[type='checkbox']")
+    for (var i = start; i < checkboxes.length; i+=3) {
+      checkboxes[i].checked = check
+    }
+  }
+
+  function verify_checked(fields_id){
+    var checkboxes = jQuery("#" + fields_id + "_fields_conf tbody tr td input[type='checkbox']")
+    for (var i = 2; i >= 0; i--) {
+      var allchecked = true
+      for (var j = i+3; j < checkboxes.length; j+=3) {
+        if(!checkboxes[j].checked) {
+          allchecked = false
+          break
+        }
+      }
+
+      var checkbox = jQuery(checkboxes[i+3]).attr("id").split("_")
+      jQuery("#" + checkbox.first() + "_" + checkbox.last()).attr("checked", allchecked)
+    }
+  }
+
+  function check_all(fields_id) {
+    jQuery("#" + fields_id + "_active").click(function (){check_fields(this.checked, fields_id + "_fields_conf", 0)})
+    jQuery("#" + fields_id + "_required").click(function (){check_fields(this.checked, fields_id + "_fields_conf", 1)})
+    jQuery("#" + fields_id +"_signup").click(function (){check_fields(this.checked, fields_id + "_fields_conf", 2)})
+    verify_checked(fields_id)
+  }
+
+  check_all("person")
+  check_all("enterprise")
+  check_all("community")
+
+  jQuery("input[type='checkbox']").click(function (){
+    var checkbox = jQuery(this).attr("id").split("_")
+    verify_checked(checkbox.first())
+
+    if(this.checked == false) {
+      jQuery("#" + checkbox.first() + "_" + checkbox.last()).attr("checked", false)
+    }
+  })
+})
@@ -0,0 +1,121 @@
+// This jQuery plugin is written by firas kassem [2007.04.05] and was modified to fit noosfero
+// Firas Kassem  phiras.wordpress.com || phiras at gmail {dot} com
+// for more information : http://phiras.wordpress.com/2007/04/08/password-strength-meter-a-jquery-plugin/
+
+var blankPass    = -1
+var shortPass   = 0
+var badPass     = 1
+var goodPass    = 2
+var strongPass  = 3
+
+
+function passwordStrength(password,username)
+{
+  score = 0
+
+  if(password.length == 0) return blankPass
+
+  //password < 4
+  if (password.length < 4 ) { return shortPass }
+
+  //password == username
+  if (password.toLowerCase()==username.toLowerCase()) badPass
+
+  //password length
+  score += password.length * 4
+  score += ( checkRepetition(1,password).length - password.length ) * 1
+  score += ( checkRepetition(2,password).length - password.length ) * 1
+  score += ( checkRepetition(3,password).length - password.length ) * 1
+  score += ( checkRepetition(4,password).length - password.length ) * 1
+
+  //password has 3 numbers
+  if (password.match(/(.*[0-9].*[0-9].*[0-9])/))  score += 5
+
+  //password has 2 sybols
+  if (password.match(/(.*[!,@,#,$,%,^,&,*,?,_,~].*[!,@,#,$,%,^,&,*,?,_,~])/)) score += 5
+
+  //password has Upper and Lower chars
+  if (password.match(/([a-z].*[A-Z])|([A-Z].*[a-z])/))  score += 10
+
+  //password has number and chars
+  if (password.match(/([a-zA-Z])/) && password.match(/([0-9])/))  score += 15
+  //
+  //password has number and symbol
+  if (password.match(/([!,@,#,$,%,^,&,*,?,_,~])/) && password.match(/([0-9])/))  score += 15
+
+  //password has char and symbol
+  if (password.match(/([!,@,#,$,%,^,&,*,?,_,~])/) && password.match(/([a-zA-Z])/))  score += 15
+
+  //password is just a nubers or chars
+  if (password.match(/^\w+$/) || password.match(/^\d+$/) )  score -= 10
+
+  //verifing 0 < score < 100
+  if ( score < 0 )  score = 0
+  if ( score > 100 )  score = 100
+
+  if (score < 34 )  return badPass
+  if (score < 68 )  return goodPass
+  return strongPass
+}
+
+function checkRepetition(pLen,str)
+{
+  res = ""
+  for ( i=0; i<str.length ; i++ )
+  {
+      repeated=true
+      for (j=0;j < pLen && (j+i+pLen) < str.length;j++)
+          repeated=repeated && (str.charAt(j+i)==str.charAt(j+i+pLen))
+      if (j<pLen) repeated=false
+      if (repeated)
+      {
+          i+=pLen-1
+          repeated=false
+      }
+      else
+      {
+          res+=str.charAt(i)
+      }
+  }
+  return res
+}
+
+jQuery(document).ready(function() {
+    jQuery('#user_pw').keyup(function()
+    {
+      var result = passwordStrength(jQuery('#user_pw').val(),jQuery('#user_login').val())
+      if(result == blankPass)
+      {
+        showRateField('#result-blank')
+      } else
+      if(result == shortPass)
+      {
+        showRateField('#result-short')
+      } else
+      if( result == badPass )
+      {
+        showRateField('#result-bad')
+      } else
+      if( result == goodPass )
+      {
+        showRateField('#result-good')
+      } else
+      if( result == strongPass )
+      {
+        showRateField('#result-strong')
+      }
+
+    })
+})
+
+function showRateField(validation)
+{
+  jQuery('#result-blank').addClass('hidden')
+  jQuery('#result-short').addClass('hidden')
+  jQuery('#result-bad').addClass('hidden')
+  jQuery('#result-good').addClass('hidden')
+  jQuery('#result-strong').addClass('hidden')
+
+  jQuery(validation).removeClass('hidden')
+
+}
 \ No newline at end of file
@@ -354,21 +354,32 @@ div.pending-tasks {
   margin-bottom: 1px;
 }
 /* * * category ajax selector * * */
-
+#category-ajax-selector .category-helper-label {
+  font-size: 16px;
+  color: rgb(158, 158, 158);
+  padding: 5px 0px;
+}
 #category-ajax-selector {
   border: 1px solid #AAA;
-  background: #EEE;
-  padding: 15px 0px 15px 20px;
-  margin: 30px 0px 0px 0px;
+  padding: 3px 10px 10px 10px;
+  margin: 0px 0px 0px 0px;
   position: relative;
-  font-size: 18px;
+  font-size: 10px;
+  background-color: #fcfcf9;
 }
 #category-ajax-selector a {
-  font-size: 14px;
+  font-size: 12px;
 }
-#category-ajax-selector h3 {
-  margin: 10px 0px;
-  font-size: 14px;
+#selected-categories {
+  padding-bottom: 5px;
+}
+#selected-categories .label {
+  font-size: 16px;
+  margin-bottom: 10px;
+  margin-top: 5px;
+}
+.selected-category {
+  padding: 2px 0;
 }
 #category-ajax-selector .box-title {
   position: absolute;
@@ -384,25 +395,32 @@ div.pending-tasks {
 .msie6 #category-ajax-selector .box-title {
   top: -29px;
 }
-#category-ajax-selector .select-subcategory-link {
+#category-ajax-selector .select-subcategory-link,
+.select-subcategory-link {
   border: 1px solid #BBB;
   padding: 1px 3px;
   margin: 0px 1px;
   text-decoration: none;
   white-space: nowrap;
-  font-size: 11px;
+  font-size: 12px;
+  line-height: 20px;
+  border-radius: 3px;
+}
+#category-ajax-selector .selected-category .select-subcategory-link {
+  border: 0;
 }
-#category-ajax-selector .select-subcategory-link:hover {
+#category-ajax-selector .select-subcategory-link:hover,
+.select-subcategory-link:hover {
   background-color: black;
 }
 #category-ajax-selector .button {
-  display: block;
-  position: absolute;
   top: 4px;
   right: 2px;
 }
-#category-ajax-selector .icon-save {
-  right: 25px;
+#category-ajax-selector hr {
+  border: 0;
+  border-bottom: 1px solid #EEE;
+  margin-top: 15px;
 }
 #profile-header, #profile-footer {
   clear: both;
@@ -1841,20 +1859,70 @@ a.button.disabled, input.disabled {
   text-decoration: none;
 }
 /* ==> blocks/link-list-block.css <<= */
-
 #edit-link-list-block {
-  width: 820px;
+  width: 620px;
+  position: relative;
+  left: -24px;
 }
-
-#edit-link-list-block table {
-  width: auto;
-  margin-bottom: 10px;
+.link-list-header {
+  width: 98%;
+  height: 25px;
+  padding: 10px 1px 10px 10px;
+  margin-bottom: 5px;
+  cursor: pointer;
 }
-#edit-link-list-block table .cel-address {
-  width: 220px;
+.link-list-header li {
+  list-style-type: none;
+  display: inline;
+  font-weight: bold;
+  font-size: 14px;
+  text-align: center;
 }
-#edit-link-list-block table .cel-address input {
-  width: 100%;
+#dropable-link-list {
+  padding-left: 23px;
+  margin-top: -12px;
+}
+#dropable-link-list li {
+  list-style-type: none;
+}
+.link-list-row {
+  line-height: 25px;
+  margin-bottom: 5px;
+  padding: 10px 1px 10px 10px;
+  cursor: pointer;
+  width: 97%;
+}
+.link-list-row:hover {
+  background: #ddd url(/images/drag-and-drop.png) no-repeat;
+  background-position: 98% 15px;
+}
+.link-list-row li {
+  list-style-type: none;
+  display: inline;
+  margin-left: 5px;
+}
+.link-list-row li div {
+  float: left;
+  margin-top: 4px;
+}
+.link-list-row li a {
+  line-height: 27px !important;
+  padding-right: 5px;
+}
+.link-list-icon {
+  margin-left: 14px;
+}
+.link-list-name {
+  margin-left: 40px;
+}
+.link-list-address {
+  margin-left: 90px;
+}
+.link-list-target {
+  margin-left: 77px;
+}
+.new_link_row li {
+  margin-left: 7px;
 }
 #content .link-list-block {
   padding: 10px 0px 10px 10px;
@@ -3543,9 +3611,10 @@ div#article-parent {
 }
 #agenda .agenda-calendar {
   width: 50%;
+  display: inline-block;
 }
 #agenda td, #agenda th {
-  padding: 15px;
+  padding: 10px;
   padding-right: 0px;
 }
 #agenda .agenda-calendar .previous-month td, #agenda .agenda-calendar .previous-month th, #agenda .agenda-calendar .next-month td, #agenda .agenda-calendar .next-month th {
@@ -3603,26 +3672,25 @@ div#article-parent {
   vertical-align: middle;
 }
 #agenda .agenda-calendar .current-month caption {
-  margin-bottom: 10px;
+  margin: 10px 0px;
 }
 #agenda #events-of-the-day {
-  position: absolute;
-  left: 50%;
   width: 45%;
-  top: 0px;
   height: 100%;
   padding-left: 20px;
+  display: inline-block;
+  vertical-align: top;
 }
 #agenda #events-of-the-day #agenda-items {
   display: block;
   overflow: auto;
   overflow-x: hidden;
-  height: 80%;
+  height: 250px;
   background: white;
   border: none;
 }
 #agenda-toolbar {
-  float: right;
+  text-align: right;
   font-variant: normal;
   font-weight: normal;
 }
@@ -3645,6 +3713,9 @@ h1#agenda-title {
   display: block;
   margin-top: 10px;
 }
+#agenda .pagination {
+  margin-top: 15px;
+}
 /* ==> public/stylesheets/controller_favorite_enterprises.css <== */
 /* ==> @import url(manage_contacts_list.css); <== */
@@ -4196,6 +4267,11 @@ h1#agenda-title {
   display: block;
   float: left;
 }
+
+.actions .members-buttons-cell {
+  width : 100px
+}
+
 .controller-profile_members .msie6 .button-bar a {
   position: relative;
 }
@@ -5966,6 +6042,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
 #email-check,
 #fake-check,
+#password-rate,
 #password-check {
   margin: -2px 16px -5px 13px;
   text-align: right;
@@ -5974,10 +6051,20 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
 #email-check p,
 #fake-check p,
+#password-rate p,
 #password-check p {
   margin: 0;
 }
+#password-rate {
+  font-weight:bold;
+}
+
+.hidden {
+  visibility: hidden;
+  display: none;
+}
+
 .available {
   color: #88BD00;
 }
@@ -5991,6 +6078,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
 }
 #email-check p,
+#password-rate p,
 #password-check p,
 #url-check p {
   margin: 0;
@@ -6488,3 +6576,31 @@ ul.article-versions li {
   font-size: 13px;
   padding: 3px 0px;
 }
+
+/* * * Admin manage fields * * */
+
+.controller-features .manage-fields-batch-actions,
+.controller-features .manage-fields-batch-actions:hover {
+  border-bottom:solid 2px #000;
+  background-color: #EEE;
+}
+
+.controller-features .manage-fields-batch-actions td {
+  font-style: italic;
+}
+
+#signup-form #result-short {
+  color: red;
+}
+
+#signup-form #result-bad {
+  color: #825A2C;
+}
+
+#signup-form #result-good {
+  color: #32CD32;
+}
+
+#signup-form #result-strong {
+  color: green;
+}
@@ -689,6 +689,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         {:test => 5}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
     e = User.find_by_login('ze').environment
     e.enable_plugin(Plugin1.name)
@@ -779,6 +780,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         lambda {"<strong>Plugin2 text</strong>"}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
     Environment.default.enable_plugin(Plugin1.name)
     Environment.default.enable_plugin(Plugin2.name)
@@ -795,6 +797,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         User.new(:login => 'testuser')
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
     Environment.default.enable_plugin(Plugin1.name)
     post :login, :user => {:login => "testuser"}
@@ -809,6 +812,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         nil
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
     Environment.default.enable_plugin(Plugin1.name)
     post :login, :user => {:login => 'johndoe', :password => 'test'}
     assert session[:user]
@@ -822,6 +826,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         false
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([TestRegistrationPlugin.name])
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestRegistrationPlugin.new])
     post :signup, :user => { :login => 'testuser', :password => '123456', :password_confirmation => '123456', :email => 'testuser@example.com' }
@@ -840,6 +845,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         true
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([Plugin1.new, Plugin2.new])
     get :login
@@ -853,6 +859,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         false
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([TestRegistrationPlugin.name])
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestRegistrationPlugin.new])
     #Redirect on get action
@@ -876,6 +883,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         true
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.new, Plugin2.new])
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([Plugin1.new, Plugin2.new])
     get :login
@@ -894,6 +902,7 @@ class AccountControllerTest &lt; ActionController::TestCase
         lambda {"<strong>Plugin2 text</strong>"}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
     Environment.default.enable_plugin(Plugin1.name)
     Environment.default.enable_plugin(Plugin2.name)
@@ -233,7 +233,7 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     get :index
     assert_tag :tag => 'div', :attributes => { :id => 'theme-test-panel' }, :descendant => {
-      :tag => 'a', :attributes => { :href => '/myprofile/testinguser/themes/edit/my-test-theme'}
+      :tag => 'a', :attributes => { :href => '/myprofile/testinguser/profile_themes/edit/my-test-theme'}
     }
       #{ :tag => 'a', :attributes => { :href => '/myprofile/testinguser/themes/stop_test/my-test-theme'} }
   end
@@ -263,7 +263,7 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     assert_no_tag :tag => 'a', :content => /Category 2/
   end
-  should 'show name of article as title of page' do
+  should 'show name of article as title of page without environment' do
     p = create_user('test_user').person
     a = p.articles.create!(:name => 'test article')
@@ -271,17 +271,22 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     @controller.instance_variable_set('@page', a)
     get :index
-    assert_tag 'title', :content => 'test article - ' + p.name + ' - ' + p.environment.name
+    assert_tag 'title', :content => 'test article - ' + p.name
   end
-  should 'diplay name of profile in the title' do
+  should 'diplay name of profile in the title without environment' do
     p = create_user('test_user').person
     p.name = 'Some Test User'
     p.save!
     @controller.instance_variable_set('@profile', p)
     get :index, :profile => p.identifier
-    assert_tag 'title', :content => p.name + ' - ' + p.environment.name
+    assert_tag 'title', :content => p.name
+  end
+
+  should 'display environment name in title when profile and page are not defined' do
+    get :index
+    assert_tag 'title', :content => assigns(:environment).name
   end
   should 'display menu links for my environment when logged in other environment' do
@@ -324,7 +329,8 @@ class ApplicationControllerTest &lt; ActionController::TestCase
   end
   should 'set html lang as the article language if an article is present and has a language' do
-    a = fast_create(Article, :name => 'test article', :language => 'fr')
+    p = create_user('test_user').person
+    a = fast_create(Article, :name => 'test article', :language => 'fr', :profile_id => p.id )
     @controller.instance_variable_set('@page', a)
     FastGettext.stubs(:locale).returns('es')
     get :index
@@ -338,7 +344,9 @@ class ApplicationControllerTest &lt; ActionController::TestCase
   end
   should 'set html lang as locale if page has no language' do
-    a = fast_create(Article, :name => 'test article', :language => nil)
+    p = create_user('test_user').person
+    a = fast_create(Article, :name => 'test article', :language => nil, :profile_id => p.id )
+
     @controller.instance_variable_set('@page', a)
     FastGettext.stubs(:locale).returns('es')
     get :index
@@ -366,6 +374,8 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     end
     plugin2_path = '/plugin2/style.css'
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
+
     environment = Environment.default
     environment.enable_plugin(Plugin1.name)
     environment.enable_plugin(Plugin2.name)
@@ -397,6 +407,8 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     plugin2_path2 = '/plugin2/'+js2
     plugin2_path3 = '/plugin2/'+js3
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
+
     environment = Environment.default
     environment.enable_plugin(Plugin1.name)
     environment.enable_plugin(Plugin2.name)
@@ -423,6 +435,8 @@ class ApplicationControllerTest &lt; ActionController::TestCase
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([TestBodyBeginning1Plugin.name, TestBodyBeginning2Plugin.name])
+
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestBodyBeginning1Plugin.new, TestBodyBeginning2Plugin.new])
     get :index
@@ -447,6 +461,8 @@ class ApplicationControllerTest &lt; ActionController::TestCase
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([TestHeadEnding1Plugin.name, TestHeadEnding2Plugin.name])
+
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestHeadEnding1Plugin.new, TestHeadEnding2Plugin.new])
     get :index
@@ -511,6 +527,7 @@ class ApplicationControllerTest &lt; ActionController::TestCase
           :block => lambda {} }
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([FilterPlugin.name])
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([FilterPlugin.new])
@@ -529,6 +546,7 @@ class ApplicationControllerTest &lt; ActionController::TestCase
           :block => lambda {'plugin block called'} }
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([OtherFilterPlugin.name])
     environment1 = fast_create(Environment, :name => 'test environment')
     environment1.enable_plugin(OtherFilterPlugin.name)
@@ -542,4 +560,18 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     assert_equal nil, @controller.application_controller_test_other_filter_plugin_filter_plugin
   end
+  should 'display meta tags for social media' do
+    get :index
+    assert_tag :tag => 'meta', :attributes => { :name => 'twitter:card', :value => 'summary' }
+    assert_tag :tag => 'meta', :attributes => { :name => 'twitter:title', :content => assigns(:environment).name }
+    assert_tag :tag => 'meta', :attributes => { :name => 'twitter:description', :content => assigns(:environment).name }
+    assert_no_tag :tag => 'meta', :attributes => { :name => 'twitter:image' }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:type', :content => 'website' }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:url', :content => assigns(:environment).top_url }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:title', :content => assigns(:environment).name }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:site_name', :content => assigns(:environment).name }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:description', :content => assigns(:environment).name }
+    assert_no_tag :tag => 'meta', :attributes => { :property => 'article:published_time' }
+    assert_no_tag :tag => 'meta', :attributes => { :property => 'og:image' }
+  end
 end
@@ -91,6 +91,7 @@ class CatalogControllerTest &lt; ActionController::TestCase
         lambda {"<span id='plugin2'>This is Plugin2 speaking!</span>"}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
     product = fast_create(Product, :profile_id => @enterprise.id)
     environment = Environment.default
@@ -451,24 +451,23 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'h3', :content => /max size #{UploadedFile.max_size.to_humanreadable}/
   end
-  should 'display link for selecting categories' do
-    # FIXME
-    assert true
-    #env = Environment.default
-    #top = env.categories.build(:display_in_menu => true, :name => 'Top-Level category'); top.save!
-    #c1  = env.categories.build(:display_in_menu => true, :name => "Test category 1", :parent_id => top.id); c1.save!
-    #c2  = env.categories.build(:display_in_menu => true, :name => "Test category 2", :parent_id => top.id); c2.save!
-    #c3  = env.categories.build(:display_in_menu => true, :name => "Test Category 3", :parent_id => top.id); c3.save!
-
-    #article = Article.new(:name => 'test')
-    #article.profile = profile
-    #article.save!
-
-    #get :edit, :profile => profile.identifier, :id => article.id
-
-    #[c1,c2,c3].each do |item|
-    #  assert_tag :tag => 'a', :attributes => { :id => "select-category-#{item.id}-link" }
-    #end
+  should 'display link for selecting top categories' do
+    env = Environment.default
+    top = env.categories.build(:display_in_menu => true, :name => 'Top-Level category'); top.save!
+    top2 = env.categories.build(:display_in_menu => true, :name => 'Top-Level category 2'); top2.save!
+    c1  = env.categories.build(:display_in_menu => true, :name => "Test category 1", :parent_id => top.id); c1.save!
+    c2  = env.categories.build(:display_in_menu => true, :name => "Test category 2", :parent_id => top.id); c2.save!
+    c3  = env.categories.build(:display_in_menu => true, :name => "Test Category 3", :parent_id => top.id); c3.save!
+
+    article = Article.new(:name => 'test')
+    article.profile = profile
+    article.save!
+
+    get :edit, :profile => profile.identifier, :id => article.id
+
+    [top, top2].each do |item|
+      assert_tag :tag => 'a', :attributes => { :id => "select-category-#{item.id}-link" }
+    end
   end
   should 'be able to associate articles with categories' do
@@ -741,16 +741,6 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'li', :attributes => {:title => 'my img title', :class => 'image-gallery-item'}, :child => {:tag => 'span', :content => 'my img title'}
   end
-  should 'not allow html on title of the images' do
-    login_as(profile.identifier)
-    folder = fast_create(Gallery, :profile_id => profile.id)
-    file = UploadedFile.create!(:title => '<b>my img title</b>', :profile => profile, :parent => folder, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
-
-    get :view_page, :profile => profile.identifier, :page => folder.explode_path
-
-    assert_tag :tag => 'li', :attributes => {:title => 'my img title', :class => 'image-gallery-item'}, :child => {:tag => 'span', :content => 'my img title'}
-  end
-
   should 'allow publisher owner view private articles' do
     c = Community.create!(:name => 'test_com')
     u = create_user_with_permission('test_user', 'publish_content', c)
@@ -1209,6 +1199,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     class Plugin2 < Noosfero::Plugin
       def content_remove_edit(content); false; end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
     environment.enable_plugin(Plugin1.name)
     environment.enable_plugin(Plugin2.name)
@@ -1225,6 +1216,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     class Plugin2 < Noosfero::Plugin
       def content_expire_edit(content); nil; end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
     environment.enable_plugin(Plugin1.name)
     environment.enable_plugin(Plugin2.name)
@@ -1270,6 +1262,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
          }
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
     Environment.default.enable_plugin(Plugin1.name)
     Environment.default.enable_plugin(Plugin2.name)
@@ -1294,6 +1287,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
         scope.where(:referrer => 'kernel.org')
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
     Environment.default.enable_plugin(Plugin1)
     Environment.default.enable_plugin(Plugin2)
@@ -1351,6 +1345,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
          }
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
     Environment.default.enable_plugin(Plugin1.name)
     Environment.default.enable_plugin(Plugin2.name)
@@ -1369,4 +1364,28 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_match /this is a sample text file/, @response.body
   end
+  should 'add meta tags with article info' do
+    a = TinyMceArticle.create(:name => 'Article to be shared', :body => 'This article should be shared with all social networks', :profile => profile)
+
+    get :view_page, :profile => profile.identifier, :page => [ a.name.to_slug ]
+
+    assert_tag :tag => 'meta', :attributes => { :name => 'twitter:title', :content => /#{a.name} - #{a.profile.name}/ }
+    assert_tag :tag => 'meta', :attributes => { :name => 'twitter:description', :content => a.body }
+    assert_no_tag :tag => 'meta', :attributes => { :name => 'twitter:image' }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:type', :content => 'article' }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:url', :content => /\/#{profile.identifier}\/#{a.name.to_slug}/ }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:title', :content => /#{a.name} - #{a.profile.name}/ }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:site_name', :content => a.profile.name }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:description', :content => a.body }
+    assert_no_tag :tag => 'meta', :attributes => { :property => 'og:image' }
+  end
+
+  should 'add meta tags with article images' do
+    a = TinyMceArticle.create(:name => 'Article to be shared with images', :body => 'This article should be shared with all social networks <img src="/images/x.png" />', :profile => profile)
+
+    get :view_page, :profile => profile.identifier, :page => [ a.name.to_slug ]
+    assert_tag :tag => 'meta', :attributes => { :name => 'twitter:image', :content => /\/images\/x.png/ }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:image', :content => /\/images\/x.png/  }
+  end
+
 end
@@ -193,6 +193,7 @@ class EnterpriseRegistrationControllerTest &lt; ActionController::TestCase
         {'plugin2' => 'Plugin 2'}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
     environment = Environment.default
     environment.enable_plugin(Plugin1.name)
@@ -6,6 +6,8 @@ class EnvironmentDesignController; def rescue_action(e) raise e end; end
 class EnvironmentDesignControllerTest < ActionController::TestCase
+  # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+  #      the Noosfero core soon, see ActionItem3045
   ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
   def setup
@@ -83,6 +85,8 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'p', :attributes => { :id => 'no_portal_community' }
   end
+  # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+  #      the Noosfero core soon, see ActionItem3045
   should 'be able to edit EnvironmentStatisticsBlock' do
     login_as(create_admin_user(Environment.default))
     b = EnvironmentStatisticsBlock.create!
@@ -366,4 +370,47 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
     assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock8)
   end
+  should 'clone a block' do
+    login_as(create_admin_user(Environment.default))
+    block = TagsBlock.create!
+    assert_difference TagsBlock, :count, 1 do
+      post :clone_block, :id => block.id
+      assert_response :redirect
+    end
+  end
+
+  should 'return a list of paths from portal related to the words used in the query search' do
+    env = Environment.default
+    login_as(create_admin_user(env))
+    community = fast_create(Community, :environment_id => env)
+    env.portal_community = community
+    env.enable('use_portal_community')
+    env.save
+    @controller.stubs(:boxes_holder).returns(env)
+    article1 = fast_create(Article, :profile_id => community.id, :name => "Some thing")
+    article2 = fast_create(Article, :profile_id => community.id, :name => "Some article")
+    article3 = fast_create(Article, :profile_id => community.id, :name => "Not an article")
+
+    xhr :get, :search_autocomplete, :query => 'Some'
+
+    json_response = ActiveSupport::JSON.decode(@response.body)
+
+    assert_response :success
+    assert_equal json_response.include?("/{portal}/"+article1.path), true
+    assert_equal json_response.include?("/{portal}/"+article2.path), true
+    assert_equal json_response.include?("/{portal}/"+article3.path), false
+  end
+
+  should 'return empty if portal not configured' do
+    env = Environment.default
+    login_as(create_admin_user(env))
+
+    xhr :get, :search_autocomplete, :query => 'Some'
+
+    json_response = ActiveSupport::JSON.decode(@response.body)
+
+    assert_response :success
+    assert_equal json_response, []
+  end
+
 end
@@ -38,4 +38,12 @@ class EventsControllerTest &lt; ActionController::TestCase
     assert_tag :tag =>'a', :attributes => {:href => "/profile/#{profile.identifier}/events/#{next_month.year}/#{next_month.month}"}, :content => next_month_name
   end
+  should 'see the events paginated' do
+    30.times do |i|
+      profile.events << Event.new(:name => "Lesson #{i}", :start_date => Date.today)
+    end
+    get :events, :profile => profile.identifier
+    assert_equal 20, assigns(:events).count
+  end
+
 end
@@ -68,6 +68,7 @@ class FriendsControllerTest &lt; ActionController::TestCase
         false
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
     e = profile.environment
     e.enable_plugin(Plugin1.name)
@@ -107,6 +107,7 @@ class HomeControllerTest &lt; ActionController::TestCase
         lambda {"<a href='plugin2'>Plugin2 link</a>"}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
     Environment.default.enable_plugin(Plugin1)
     Environment.default.enable_plugin(Plugin2)
@@ -129,6 +130,7 @@ class HomeControllerTest &lt; ActionController::TestCase
         true
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([Plugin1.new, Plugin2.new])
     get :index
@@ -7,6 +7,7 @@ class InviteControllerTest &lt; ActionController::TestCase
     @friend = create_user('thefriend').person
     @community = fast_create(Community)
     login_as ('testuser')
+    Delayed::Job.destroy_all
   end
   attr_accessor :profile, :friend, :community
@@ -230,7 +231,8 @@ class InviteControllerTest &lt; ActionController::TestCase
     contact_list = ContactList.create
     post :select_friends, :profile => profile.identifier, :manual_import_addresses => "#{friend.name} <#{friend.email}>", :import_from => "manual", :mail_template => "click: <url>", :contact_list => contact_list.id
-    assert_equal 'pt', Delayed::Job.first.payload_object.locale
+    job = Delayed::Job.where("handler LIKE '%InvitationJob%'").first
+    assert_equal 'pt', job.payload_object.locale
   end
   private
@@ -234,6 +234,7 @@ class MembershipsControllerTest &lt; ActionController::TestCase
         {'plugin2' => 'Plugin 2'}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
     environment = Environment.default
     environment.enable_plugin(Plugin1.name)
@@ -47,7 +47,7 @@ class PluginsControllerTest &lt; ActionController::TestCase
       end
     end
-    Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s,Plugin2.to_s])
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin2.to_s])
     get :index
@@ -176,7 +176,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   should 'not show Leave This Community button for non-registered users' do
     community = Community.create!(:name => 'my test community')
     community.boxes.first.blocks << block = ProfileInfoBlock.create!
-    get :profile_info, :profile => community.identifier, :block_id => block.id
+    get :index, :profile => community.identifier
     assert_no_match /\/profile\/#{@profile.identifier}\/leave/, @response.body
   end
@@ -206,7 +206,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     friend = create_user_full('friendtestuser').person
     friend.user.activate
     friend.boxes.first.blocks << block = ProfileInfoBlock.create!
-    get :profile_info, :profile => friend.identifier, :block_id => block.id
+    get :index, :profile => friend.identifier
     assert_match /Add friend/, @response.body
   end
@@ -215,7 +215,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     friend = create_user_full('friendtestuser').person
     friend.boxes.first.blocks << block = ProfileInfoBlock.create!
     AddFriend.create!(:person => @profile, :friend => friend)
-    get :profile_info, :profile => friend.identifier, :block_id => block.id
+    get :index, :profile => friend.identifier
     assert_no_match /Add friend/, @response.body
   end
@@ -226,7 +226,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     @profile.add_friend(friend)
     @profile.friends.reload
     assert @profile.is_a_friend?(friend)
-    get :profile_info, :profile => friend.identifier, :block_id => block.id
+    get :index, :profile => friend.identifier
     assert_no_match /Add friend/, @response.body
   end
@@ -301,13 +301,13 @@ class ProfileControllerTest &lt; ActionController::TestCase
   should 'display contact us for enterprises' do
     ent = Enterprise.create!(:name => 'my test enterprise', :identifier => 'my-test-enterprise')
     ent.boxes.first.blocks << block = ProfileInfoBlock.create!
-    get :profile_info, :profile => 'my-test-enterprise', :block_id => block.id
+    get :index, :profile => 'my-test-enterprise'
     assert_match /\/contact\/my-test-enterprise\/new/, @response.body
   end
   should 'not display contact us for non-enterprises' do
     @profile.boxes.first.blocks << block = ProfileInfoBlock.create!
-    get :profile_info, :profile => @profile.identifier, :block_id => block.id
+    get :index, :profile => @profile.identifier
     assert_no_match /\/contact\/#{@profile.identifier}\/new/, @response.body
   end
@@ -315,7 +315,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     ent = Enterprise.create! :name => 'my test enterprise', :identifier => 'my-test-enterprise'
     ent.boxes.first.blocks << block = ProfileInfoBlock.create!
     ent.update_attribute(:enable_contact_us, false)
-    get :profile_info, :profile => 'my-test-enterprise', :block_id => block.id
+    get :index, :profile => 'my-test-enterprise'
     assert_no_match /\/contact\/my-test-enterprise\/new/, @response.body
   end
@@ -328,7 +328,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     env.disable('disable_contact_person')
     env.save!
     login_as(@profile.identifier)
-    get :profile_info, :profile => friend.identifier, :block_id => block.id
+    get :index, :profile => friend.identifier
     assert_match /\/contact\/#{friend.identifier}\/new/, @response.body
   end
@@ -336,7 +336,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     nofriend = create_user_full('no_friend').person
     nofriend.boxes.first.blocks << block = ProfileInfoBlock.create!
     login_as(@profile.identifier)
-    get :profile_info, :profile => nofriend.identifier, :block_id => block.id
+    get :index, :profile => nofriend.identifier
     assert_no_match /\/contact\/#{nofriend.identifier}\/new/, @response.body
   end
@@ -349,7 +349,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     env.save!
     @profile.add_friend(friend)
     login_as(@profile.identifier)
-    get :profile_info, :profile => friend.identifier, :block_id => block.id
+    get :index, :profile => friend.identifier
     assert_match /\/contact\/#{friend.identifier}\/new/, @response.body
   end
@@ -361,7 +361,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     env.save!
     @profile.add_friend(friend)
     login_as(@profile.identifier)
-    get :profile_info, :profile => friend.identifier, :block_id => block.id
+    get :index, :profile => friend.identifier
     assert_no_match /\/contact\/#{friend.identifier}\/new/, @response.body
   end
@@ -373,7 +373,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     env.save!
     community.add_member(@profile)
     login_as(@profile.identifier)
-    get :profile_info, :profile => community.identifier, :block_id => block.id
+    get :index, :profile => community.identifier
     assert_match /\/contact\/#{community.identifier}\/new/, @response.body
   end
@@ -385,7 +385,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     env.save!
     community.add_member(@profile)
     login_as(@profile.identifier)
-    get :profile_info, :profile => community.identifier, :block_id => block.id
+    get :index, :profile => community.identifier
     assert_no_match /\/contact\/#{community.identifier}\/new/, @response.body
   end
@@ -766,23 +766,28 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
   should 'see all the activities in the current profile network' do
-    p1= Person.first
+    p1= fast_create(Person)
     p2= fast_create(Person)
     assert !p1.is_a_friend?(p2)
+
     p3= fast_create(Person)
     p3.add_friend(p1)
     assert p3.is_a_friend?(p1)
-    ActionTracker::Record.destroy_all
+
+    ActionTracker::Record.delete_all
+
+    UserStampSweeper.any_instance.stubs(:current_user).returns(p1)
     Scrap.create!(defaults_for_scrap(:sender => p1, :receiver => p1))
     a1 = ActionTracker::Record.last
+
     UserStampSweeper.any_instance.stubs(:current_user).returns(p2)
     Scrap.create!(defaults_for_scrap(:sender => p2, :receiver => p3))
     a2 = ActionTracker::Record.last
+
     UserStampSweeper.any_instance.stubs(:current_user).returns(p3)
     Scrap.create!(defaults_for_scrap(:sender => p3, :receiver => p1))
     a3 = ActionTracker::Record.last
-
     @controller.stubs(:logged_in?).returns(true)
     user = mock()
     user.stubs(:person).returns(p3)
@@ -792,24 +797,29 @@ class ProfileControllerTest &lt; ActionController::TestCase
     process_delayed_job_queue
     get :index, :profile => p1.identifier
-    assert_not_nil assigns(:network_activities)
-    assert_equal [], [a1,a3] - assigns(:network_activities)
-    assert_equal assigns(:network_activities) - [a1, a3], []
+
+    assert_equivalent [a1,a3].map(&:id), assigns(:network_activities).map(&:id)
   end
   should 'the network activity be visible only to profile followers' do
-    p1= Person.first
+    p1= fast_create(Person)
     p2= fast_create(Person)
     assert !p1.is_a_friend?(p2)
+
     p3= fast_create(Person)
     p3.add_friend(p1)
     assert p3.is_a_friend?(p1)
-    ActionTracker::Record.destroy_all
+
+    ActionTracker::Record.delete_all
+
+    UserStampSweeper.any_instance.stubs(:current_user).returns(p1)
     Scrap.create!(defaults_for_scrap(:sender => p1, :receiver => p1))
     a1 = ActionTracker::Record.last
+
     UserStampSweeper.any_instance.stubs(:current_user).returns(p2)
     Scrap.create!(defaults_for_scrap(:sender => p2, :receiver => p3))
     a2 = ActionTracker::Record.last
+
     UserStampSweeper.any_instance.stubs(:current_user).returns(p3)
     Scrap.create!(defaults_for_scrap(:sender => p3, :receiver => p1))
     a3 = ActionTracker::Record.last
@@ -819,8 +829,9 @@ class ProfileControllerTest &lt; ActionController::TestCase
     user.stubs(:person).returns(p2)
     user.stubs(:login).returns('some')
     @controller.stubs(:current_user).returns(user)
+
     get :index, :profile => p1.identifier
-    assert_equal [], assigns(:network_activities)
+    assert assigns(:network_activities).blank?
     user = mock()
     user.stubs(:person).returns(p3)
@@ -828,9 +839,9 @@ class ProfileControllerTest &lt; ActionController::TestCase
     @controller.stubs(:current_user).returns(user)
     Person.any_instance.stubs(:follows?).returns(true)
     process_delayed_job_queue
+
     get :index, :profile => p3.identifier
-    assert_equal [], [a1,a3] - assigns(:network_activities)
-    assert_equal assigns(:network_activities) - [a1, a3], []
+    assert_equivalent [a1,a3], assigns(:network_activities)
   end
   should 'the network activity be paginated' do
@@ -1244,6 +1255,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
         {:title => 'Plugin2 tab', :id => 'plugin2_tab', :content => lambda { 'Content from plugin2.' }}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin2.to_s])
     e = profile.environment
     e.enable_plugin(Plugin1.name)
@@ -173,7 +173,8 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
   should 'have options to display blocks' do
     get :edit, :profile => 'designtestuser', :id => @b1.id
     %w[always home_page_only except_home_page never].each do |option|
-      assert_tag :input, :attributes => { :type => 'radio', :value => option}
+      assert_tag :select, :attributes => {:name => 'block[display]'},
+       :descendant => {:tag => 'option', :attributes => {:value => option}}
     end
   end
@@ -302,24 +303,42 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
   should 'not edit main block with never option' do
     get :edit, :profile => 'designtestuser', :id => @b4.id
-    assert_no_tag :input, :attributes => { :type => 'radio', :value => 'never'}
+    assert_no_tag :select, :attributes => {:name => 'block[display]'},
+      :descendant => {:tag => 'option', :attributes => {:value => 'never'}}
   end
   should 'not edit main block with home_page_only option' do
     get :edit, :profile => 'designtestuser', :id => @b4.id
-    assert_no_tag :input, :attributes => { :type => 'radio', :value => 'home_page_only'}
+    assert_no_tag :select, :attributes => {:name => 'block[display]'},
+     :descendant => {:tag => 'option', :attributes => {:value => 'home_page_only'}}
   end
   should 'edit main block with always option' do
     get :edit, :profile => 'designtestuser', :id => @b4.id
-    assert_tag :input, :attributes => { :type => 'radio', :value => 'always'}
+    assert_tag :select, :attributes => {:name => 'block[display]'},
+     :descendant => {:tag => 'option', :attributes => {:value => 'always'}}
   end
   should 'edit main block with except_home_page option' do
     get :edit, :profile => 'designtestuser', :id => @b4.id
-    assert_tag :input, :attributes => { :type => 'radio', :value => 'except_home_page'}
+    assert_tag :select, :attributes => {:name=> 'block[display]'},
+     :descendant => {:tag => 'option', :attributes => {:value => 'except_home_page'}}
   end
+  should 'return a list of paths related to the words used in the query search' do
+    article1 = fast_create(Article, :profile_id => @profile.id, :name => "Some thing")
+    article2 = fast_create(Article, :profile_id => @profile.id, :name => "Some article")
+    article3 = fast_create(Article, :profile_id => @profile.id, :name => "Not an article")
+
+    xhr :get, :search_autocomplete, :profile => 'designtestuser' , :query => 'Some'
+
+    json_response = ActiveSupport::JSON.decode(@response.body)
+
+    assert_response :success
+    assert_equal json_response.include?("/{profile}/"+article1.path), true
+    assert_equal json_response.include?("/{profile}/"+article2.path), true
+    assert_equal json_response.include?("/{profile}/"+article3.path), false
+  end
   ######################################################
   # END - tests for BoxOrganizerController features
@@ -739,7 +758,7 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
   should 'clone a block' do
     block = ProfileImageBlock.create!(:box => profile.boxes.first)
     assert_difference ProfileImageBlock, :count, 1 do
-      post :clone, :id => block.id, :profile => profile.identifier
+      post :clone_block, :id => block.id, :profile => profile.identifier
       assert_response :redirect
     end
   end
@@ -73,7 +73,8 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     get :edit, :profile => profile.identifier
     assert_response :success
     assert_template 'edit'
-    assert_tag :tag => 'input', :attributes => {:name => 'profile_data[category_ids][]', :value => cat2.id}
+    assert_tag :tag => 'input', :attributes => {:name => 'profile_data[category_ids][]'}
+    assert_tag :tag => 'a', :attributes => { :class => 'select-subcategory-link', :id => "select-category-#{cat1.id}-link" }
   end
   should 'save categorization of profile' do
@@ -236,7 +237,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     cat2 = Environment.default.categories.create!(:display_in_menu => true, :name => 'sub category', :parent => cat1)
     person = create_user('testuser').person
     get :edit, :profile => 'testuser'
-    assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'profile_data[category_ids][]', :value => cat2.id}
+    assert_tag :tag => 'a', :attributes => { :class => 'select-subcategory-link', :id => "select-category-#{cat1.id}-link" }
   end
   should 'render edit template' do
@@ -867,6 +868,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
         {:title => "Plugin2 button", :icon => 'plugin2_icon', :url => 'plugin2_url'}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([TestControlPanelButtons1.to_s, TestControlPanelButtons2.to_s])
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestControlPanelButtons1.new, TestControlPanelButtons2.new])
@@ -882,6 +884,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
         "<input id='field_added_by_plugin' value='value_of_field_added_by_plugin'/>"
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([TestProfileEditPlugin.to_s])
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestProfileEditPlugin.new])
@@ -910,6 +913,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
         lambda {"<strong>Plugin2 text</strong>"}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin2.to_s])
     Environment.default.enable_plugin(Plugin1)
     Environment.default.enable_plugin(Plugin2)
@@ -931,6 +935,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
         lambda {"<strong>Plugin2 text</strong>"}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin2.to_s])
     Environment.default.enable_plugin(Plugin1)
     Environment.default.enable_plugin(Plugin2)
@@ -163,6 +163,7 @@ class SearchControllerTest &lt; ActionController::TestCase
         lambda {"<span id='plugin2'>This is Plugin2 speaking!</span>"}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin2.to_s])
     enterprise = fast_create(Enterprise)
     prod_cat = fast_create(ProductCategory)
@@ -189,6 +190,7 @@ class SearchControllerTest &lt; ActionController::TestCase
         return { :name => _('Property2'), :content => lambda { link_to(product.name, '/plugin2') } }
       end
     end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin2.to_s])
     enterprise = fast_create(Enterprise)
     prod_cat = fast_create(ProductCategory)
     product = fast_create(Product, {:profile_id => enterprise.id, :name => "produto1", :product_category_id => prod_cat.id}, :search => true)
@@ -370,6 +372,14 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_equal [ 'upcoming event 1' ], assigns(:searches)[:events][:results].map(&:name)
   end
+  should 'see the events paginated' do
+    30.times do |i|
+      create_event(person, :name => "Event #{i}",	:start_date => Date.today)
+    end
+    get :events
+    assert_equal 20, assigns(:events).count
+  end
+
   %w[ people enterprises articles events communities products ].each do |asset|
     should "render asset-specific template when searching for #{asset}" do
       get "#{asset}"
@@ -549,9 +559,9 @@ class SearchControllerTest &lt; ActionController::TestCase
     c2 = create(Community, :name => 'Testing community 2')
     c3 = create(Community, :name => 'Testing community 3')
     ActionTracker::Record.delete_all
-    fast_create(ActionTracker::Record, :target_id => c1, :user_type => 'Profile', :user_id => person, :created_at => Time.now)
-    fast_create(ActionTracker::Record, :target_id => c2, :user_type => 'Profile', :user_id => person, :created_at => Time.now)
-    fast_create(ActionTracker::Record, :target_id => c2, :user_type => 'Profile', :user_id => person, :created_at => Time.now)
+    ActionTracker::Record.create!(:target => c1, :user => person, :created_at => Time.now, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:target => c2, :user => person, :created_at => Time.now, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:target => c2, :user => person, :created_at => Time.now, :verb => 'leave_scrap')
     get :communities, :filter => 'more_active'
     assert_equal [c2,c1,c3] , assigns(:searches)[:communities][:results]
   end
@@ -133,4 +133,20 @@ class UsersControllerTest &lt; ActionController::TestCase
     assert_equal 'name;email', @response.body.split("\n")[0]
   end
+  should 'be able to remove a person' do
+    person = fast_create(Person, :environment_id => environment.id)
+    assert_difference Person, :count, -1 do
+      post :destroy_user, :id => person.id
+    end
+  end
+
+  should 'not crash if user does not exist' do
+    person = fast_create(Person)
+
+    assert_no_difference Person, :count do
+      post :destroy_user, :id => 99999
+    end
+    assert_redirected_to :action => 'index'
+  end
+
 end
@@ -183,7 +183,7 @@ class ActiveSupport::TestCase
         if reference.first == value
           reference.shift
         else
-          assert false, "'#{value}' was found before it should be on: #{original.inspect}"
+          assert false, "'#{value.inspect}' was found before it should be on: #{original.inspect}"
         end
       end
     end
@@ -0,0 +1,64 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ActionTrackerExtTest < ActiveSupport::TestCase
+  should 'increase person activities_count on new activity' do
+    person = fast_create(Person)
+    assert_difference person, :activities_count, 1 do
+      ActionTracker::Record.create! :verb => :leave_scrap, :user => person, :target => fast_create(Profile)
+      person.reload
+    end
+  end
+
+  should 'decrease person activities_count on activity removal' do
+    person = fast_create(Person)
+    record = ActionTracker::Record.create! :verb => :leave_scrap, :user => person, :target => fast_create(Profile)
+    person.reload
+    assert_difference person, :activities_count, -1 do
+      record.destroy
+      person.reload
+    end
+  end
+
+  should 'not decrease person activities_count on activity removal after the recent delay' do
+    person = fast_create(Person)
+    record = ActionTracker::Record.create! :verb => :leave_scrap, :user => person, :target => fast_create(Profile)
+    record.created_at = record.created_at - ActionTracker::Record::RECENT_DELAY.days - 1.day
+    record.save!
+    person.reload
+    assert_no_difference person, :activities_count do
+      record.destroy
+      person.reload
+    end
+  end
+
+  should 'increase organization activities_count on new activity' do
+    person = fast_create(Person)
+    organization = fast_create(Organization)
+    assert_difference organization, :activities_count, 1 do
+      ActionTracker::Record.create! :verb => :leave_scrap, :user => person, :target => organization
+      organization.reload
+    end
+  end
+
+  should 'decrease organization activities_count on activity removal' do
+    person = fast_create(Person)
+    organization = fast_create(Organization)
+    record = ActionTracker::Record.create! :verb => :leave_scrap, :user => person, :target => organization
+    organization.reload
+    assert_difference organization, :activities_count, -1 do
+      record.destroy
+      organization.reload
+    end
+  end
+
+  should 'not decrease organization activities_count on activity removal after the recent delay' do
+    person = fast_create(Person)
+    organization = fast_create(Organization)
+    record = ActionTracker::Record.create! :verb => :leave_scrap, :user => person, :target => organization, :created_at => (ActionTracker::Record::RECENT_DELAY + 1).days.ago
+    organization.reload
+    assert_no_difference organization, :activities_count do
+      record.destroy
+      organization.reload
+    end
+  end
+end
@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ActivitiesCounterCacheJobTest < ActiveSupport::TestCase
+
+  should 'correctly update the person activities counter cache' do
+    person = create_user('person').person
+    ActionTracker::Record.create!(:user => person, :verb => 'create_article')
+    ActionTracker::Record.create!(:user => person, :verb => 'create_article')
+    person.reload
+    assert_equal 2, person.activities_count
+
+    person.activities_count = 0
+    person.save!
+    job = ActivitiesCounterCacheJob.new
+    job.perform
+    person.reload
+    assert_equal 2, person.activities_count
+  end
+
+  should 'correctly update the organization activities counter cache' do
+    person = create_user('person').person
+    organization = Organization.create!(:name => 'Organization1', :identifier => 'organization1')
+    ActionTracker::Record.create!(:user => person, :verb => 'create_article', :target => organization)
+    ActionTracker::Record.create!(:user => person, :verb => 'create_article', :target => organization)
+    organization.reload
+    assert_equal 2, organization.activities_count
+
+    organization.activities_count = 0
+    organization.save!
+    job = ActivitiesCounterCacheJob.new
+    job.perform
+    organization.reload
+    assert_equal 2, organization.activities_count
+  end
+
+end
@@ -80,4 +80,38 @@ class ActsAsHavingSettingsTest &lt; ActiveSupport::TestCase
     assert obj.save
   end
+  should 'setting_changed be true if a setting passed as parameter was changed' do
+    obj = TestClass.new
+    obj.flag = true
+    assert obj.setting_changed? 'flag'
+  end
+
+  should 'setting_changed be false if a setting passed as parameter was not changed' do
+    obj = TestClass.new
+    assert !obj.setting_changed?('flag')
+  end
+
+  should 'setting_changed be false if a setting passed as parameter was changed with the same value' do
+    obj = TestClass.new
+    obj.flag = true
+    obj.save
+    obj.flag = true
+    assert !obj.setting_changed?('flag')
+  end
+
+  should 'setting_changed be false if a setting passed as parameter was not changed but another setting is changed' do
+    obj = TestClass.new(:name => 'some name')
+    obj.save
+    obj.name = 'antoher nme'
+    assert !obj.setting_changed?('flag')
+  end
+
+  should 'setting_changed be true for all changed fields' do
+    obj = TestClass.new(:name => 'some name', :flag => false)
+    obj.save
+    obj.name = 'another nme'
+    obj.flag = true
+    assert obj.setting_changed?('flag')
+    assert obj.setting_changed?('name')
+  end
 end
@@ -466,6 +466,22 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase
     assert_match(/Community nick/, page_title)
   end
+  should 'not display environment name if is a profile' do
+    stubs(:environment).returns(Environment.default)
+    @controller = ApplicationController.new
+
+    c = fast_create(Community, :name => 'Community for tests', :nickname => 'Community nick', :identifier => 'test_comm')
+    stubs(:profile).returns(c)
+    assert_equal c.short_name, page_title
+  end
+
+  should 'display only environment if no profile and page' do
+    stubs(:environment).returns(Environment.default)
+    @controller = ApplicationController.new
+
+    assert_equal Environment.default.name, page_title
+  end
+
   should 'gravatar default parameter' do
     profile = mock
     profile.stubs(:theme).returns('some-theme')
@@ -660,6 +676,7 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase
   should 'parse macros' do
     class Plugin1 < Noosfero::Plugin
     end
+    Noosfero::Plugin.stubs(:all).returns(['ApplicationHelperTest::Plugin1'])
     class Plugin1::Macro1 < Noosfero::Plugin::Macro
       def parse(params, inner_html, source)
@@ -1630,10 +1630,10 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'not allow all community members to edit by default' do
     community = fast_create(Community)
-    admin = create_user('community-admin').person
-    member = create_user.person
-
+    admin = fast_create(Person)
+    member = fast_create(Person)
     community.add_admin(admin)
+    community.reload
     community.add_member(member)
     a = Article.new(:profile => community)
@@ -232,4 +232,55 @@ class BlockTest &lt; ActiveSupport::TestCase
     assert_equal "<iframe src='http://myblogtest.com/embed/block/1' frameborder='0' width='1024' height='768' class='embed block block'></iframe>", b.embed_code('http://myblogtest.com/embed/block/1')
   end
+  should 'default value for display_user is all' do
+    block = Block.new
+    assert_equal 'all', block.display_user
+  end
+
+  should 'display block to not logged users for display_user = all' do
+    block = Block.new
+    assert block.display_to_user?(nil)
+  end
+
+  should 'display block to logged users for display_user = all' do
+    block = Block.new
+    assert block.display_to_user?(User.new)
+  end
+
+  should 'display block to logged users for display_user = logged' do
+    block = Block.new
+    block.display_user = 'logged'
+    assert block.display_to_user?(User.new)
+  end
+
+  should 'do not display block to logged users for display_user = not_logged' do
+    block = Block.new
+    block.display_user = 'not_logged'
+    assert !block.display_to_user?(User.new)
+  end
+
+  should 'do not display block to not logged users for display_user = logged' do
+    block = Block.new
+    block.display_user = 'logged'
+    assert !block.display_to_user?(nil)
+  end
+
+  should 'display block to not logged users for display_user = not_logged' do
+    block = Block.new
+    block.display_user = 'not_logged'
+    assert block.display_to_user?(nil)
+  end
+
+  should 'not be visible if display_to_user? is false' do
+    block = Block.new
+    block.expects(:display_to_user?).once.returns(false)
+    assert !block.visible?({})
+  end
+
+  should 'accept user as parameter on cache_key without change its value' do
+    person = fast_create(Person)
+    block = Block.new
+    assert_equal block.cache_key('en'), block.cache_key('en', person)
+  end
+
 end
@@ -33,6 +33,8 @@ class BoxTest &lt; ActiveSupport::TestCase
     assert blocks.include?('categories-block')
     assert blocks.include?('communities-block')
     assert blocks.include?('enterprises-block')
+    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+    #      the Noosfero core soon, see ActionItem3045
     assert blocks.include?('environment-statistics-block')
     assert blocks.include?('fans-block')
     assert blocks.include?('favorite-enterprises-block')
@@ -65,6 +67,8 @@ class BoxTest &lt; ActiveSupport::TestCase
     assert blocks.include?('communities-block')
     assert blocks.include?('disabled-enterprise-message-block')
     assert blocks.include?('enterprises-block')
+    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+    #      the Noosfero core soon, see ActionItem3045
     assert blocks.include?('environment-statistics-block')
     assert blocks.include?('fans-block')
     assert blocks.include?('favorite-enterprises-block')
@@ -54,6 +54,7 @@ class BoxesHelperTest &lt; ActiveSupport::TestCase
     expects(:display_block).with(b, '')
     stubs(:request).returns(request)
     stubs(:block_target).returns('')
+    stubs(:user).returns(nil)
     expects(:locale).returns('en')
     with_box_decorator self do
       display_box_content(box, '')
@@ -73,6 +74,7 @@ class BoxesHelperTest &lt; ActiveSupport::TestCase
     box.save!
     expects(:display_block).with(b, '').never
     stubs(:request).returns(request)
+    stubs(:user).returns(nil)
     stubs(:block_target).returns('')
     expects(:locale).returns('en')
     display_box_content(box, '')
@@ -111,8 +113,9 @@ class BoxesHelperTest &lt; ActiveSupport::TestCase
     request.expects(:path).returns('/')
     request.expects(:params).returns({})
     stubs(:request).returns(request)
+    stubs(:user).returns(nil)
     expects(:locale).returns('en')
-    box_decorator.expects(:select_blocks).with([], {:article => nil, :request_path => '/', :locale => 'en', :params => {}}).returns([])
+    box_decorator.expects(:select_blocks).with([], {:article => nil, :request_path => '/', :locale => 'en', :params => {}, :user => nil}).returns([])
     display_box_content(box, '')
   end
@@ -468,8 +468,8 @@ class CommentTest &lt; ActiveSupport::TestCase
     end
   end
-
   should 'delegate spam detection to plugins' do
+    Noosfero::Plugin.stubs(:all).returns(['CommentTest::EverythingIsSpam'])
     Environment.default.enable_plugin(EverythingIsSpam)
     c1 = create_comment
@@ -495,6 +495,7 @@ class CommentTest &lt; ActiveSupport::TestCase
   end
   should 'notify plugins of comments being marked as spam' do
+    Noosfero::Plugin.stubs(:all).returns(['CommentTest::SpamNotification'])
     Environment.default.enable_plugin(SpamNotification)
     c = create_comment
@@ -506,6 +507,7 @@ class CommentTest &lt; ActiveSupport::TestCase
   end
   should 'notify plugins of comments being marked as ham' do
+    Noosfero::Plugin.stubs(:all).returns(['CommentTest::SpamNotification'])
     Environment.default.enable_plugin(SpamNotification)
     c = create_comment
@@ -213,8 +213,8 @@ class CommunityTest &lt; ActiveSupport::TestCase
     community = fast_create(Community)
     community.closed = true
     community.save
-
     community.add_member(fast_create(Person))
+    community.reload
     assert_difference AddMember, :count do
       community.add_member(person)
@@ -16,7 +16,7 @@ class ContactSenderTest &lt; ActiveSupport::TestCase
     ent.contact_email = 'contact@invalid.com'
     c = build(Contact, :dest => ent)
     response = Contact::Sender.deliver_mail(c)
-    assert_equal Environment.default.contact_email, response.from.to_s
+    assert_equal Environment.default.noreply_email.to_s, response.from.to_s
     assert_equal "[#{ent.name}] #{c.subject}", response.subject
   end
@@ -27,7 +27,7 @@ class ContactSenderTest &lt; ActiveSupport::TestCase
     response = Contact::Sender.deliver_mail(c)
     assert_includes response.to, c.dest.contact_email
   end
- 
+
   should 'deliver mail to admins of enterprise' do
     admin = create_user('admin_test').person
     ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent', :environment => Environment.default)
@@ -44,11 +44,14 @@ class ContactTest &lt; ActiveSupport::TestCase
     assert !c.deliver
   end
-  should 'use sender name and environment contact_email on from' do
+  should 'use sender name and environment noreply_email on from' do
     ent = fast_create(Enterprise, :name => 'my enterprise', :identifier => 'myent')
+    env = ent.environment
+    env.noreply_email = 'noreply@sample.org'
+    env.save!
     c = Contact.new(:name => 'john', :email => 'john@invalid.com', :subject => 'hi', :message => 'hi, all', :dest => ent)
     email = c.deliver
-    assert_equal "#{c.name} <#{ent.environment.contact_email}>", email['from'].to_s
+    assert_equal "#{c.name} <#{ent.environment.noreply_email}>", email['from'].to_s
   end
   should 'add dest name on subject' do
@@ -89,38 +89,6 @@ class ContentViewerHelperTest &lt; ActiveSupport::TestCase
     assert_no_match /feed/, result
   end
-  should 'generate facebook addthis url for article' do
-    Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
-    [TextileArticle, Blog, Folder, Gallery, UploadedFile, Forum, Event, TextArticle, TinyMceArticle].each do |model|
-      a = model.new(:name => 'Some title', :body => 'Some text here.', :profile => profile)
-      assert_equal "http://www.facebook.com/sharer.php?s=100&p[title]=Some+title&p[summary]=Some+text+here.&p[url]=http%3A%2F%2Fnoosfero.org%2Fblog_helper_test%2Fsome-title&p[images][0]=", addthis_facebook_url(a)
-    end
-  end
-
-  should 'generate facebook addthis url without body' do
-    Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
-    a = TinyMceArticle.new(:name => 'Test', :body => nil, :profile => profile)
-    assert_equal "http://www.facebook.com/sharer.php?s=100&p[title]=Test&p[summary]=&p[url]=http%3A%2F%2Fnoosfero.org%2Fblog_helper_test%2Ftest&p[images][0]=", addthis_facebook_url(a)
-  end
-
-  should 'generate facebook addthis url without tags in body' do
-    Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
-    a = TinyMceArticle.new(:name => 'Some title', :body => '<p>This <b class="bold">is</b> a test</p>', :profile => profile)
-    assert_equal "http://www.facebook.com/sharer.php?s=100&p[title]=Some+title&p[summary]=This+is+a+test&p[url]=http%3A%2F%2Fnoosfero.org%2Fblog_helper_test%2Fsome-title&p[images][0]=", addthis_facebook_url(a)
-  end
-
-  should 'generate facebook addthis url with truncated body' do
-    Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
-    a = TinyMceArticle.new(:name => 'Some title', :body => 'test' * 76, :profile => profile)
-    assert_equal "http://www.facebook.com/sharer.php?s=100&p[title]=Some+title&p[summary]=#{'test' * 74}t...&p[url]=http%3A%2F%2Fnoosfero.org%2Fblog_helper_test%2Fsome-title&p[images][0]=", addthis_facebook_url(a)
-  end
-
-  should 'generate facebook addthis url for tinymce article with images' do
-    Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
-    a = TinyMceArticle.new(:name => 'Some title', :body => '<p>This <b class="bold">is</b> a <img src="/images/x.png" />test</p>', :profile => profile)
-    assert_equal "http://www.facebook.com/sharer.php?s=100&p[title]=Some+title&p[summary]=This+is+a+test&p[url]=http%3A%2F%2Fnoosfero.org%2Fblog_helper_test%2Fsome-title&p[images][0]=http%3A%2F%2Fnoosfero.org%2Fimages%2Fx.png", addthis_facebook_url(a)
-  end
-
   should 'theme provides addthis custom icon' do
     stubs(:session).returns({:theme => 'base'})
     File.expects(:exists?).with(anything).returns(true)
@@ -99,6 +99,7 @@ class EnterpriseTest &lt; ActiveSupport::TestCase
     enterprise = fast_create(Enterprise)
     member = fast_create(Person)
     enterprise.add_member(member)
+    enterprise.reload
     person = fast_create(Person)
     enterprise.add_member(person)
@@ -46,7 +46,7 @@ class EnvironmentMailingTest &lt; ActiveSupport::TestCase
   should 'display name and email on generate_from' do
     mailing = EnvironmentMailing.new(:source => environment, :person => person_1)
-    assert_equal "#{environment.name} <#{environment.contact_email}>", mailing.generate_from
+    assert_equal "#{environment.name} <#{environment.noreply_email}>", mailing.generate_from
   end
   should 'deliver mailing to each recipient after create' do
+# TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+#      the Noosfero core soon, see ActionItem3045
+
 require File.dirname(__FILE__) + '/../test_helper'
 class EnvironmentStatisticsBlockTest < ActiveSupport::TestCase
@@ -36,7 +39,7 @@ class EnvironmentStatisticsBlockTest &lt; ActiveSupport::TestCase
     assert_match(/2 users/, content)
     assert_match(/One community/, content)
   end
-  
+
   should 'generate statistics including private profiles' do
     env = create(Environment)
     user1 = create_user('testuser1', :environment_id => env.id)
@@ -1220,6 +1220,27 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'return a Hash on signup redirection options' do
+    assert_kind_of Hash, Environment.signup_redirection_options
+  end
+
+  should 'respond to redirection after signup' do
+    assert_respond_to Environment.new, :redirection_after_signup
+  end
+
+  should 'allow only environment signup redirection options' do
+    environment = fast_create(Environment)
+    environment.redirection_after_signup = 'invalid_option'
+    environment.save
+    assert environment.errors.invalid?(:redirection_after_signup)
+
+    Environment.signup_redirection_options.keys.each do |redirection|
+      environment.redirection_after_signup = redirection
+      environment.save
+      assert !environment.errors.invalid?(:redirection_after_signup)
+    end
+  end
+
   should 'respond to signup_welcome_text' do
     assert_respond_to Environment.new, :signup_welcome_text
   end
@@ -58,4 +58,20 @@ class FilePresenterTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'pass kind_of? to the encapsulated file' do
+    f = FilePresenter.for(UploadedFile.new)
+    assert f.kind_of?(UploadedFile)
+  end
+
+  should 'not crash with uploaded_file short description without content_type' do
+    f = FilePresenter.for(UploadedFile.new)
+    assert_nothing_raised do
+      f.short_description
+    end
+  end
+
+  should 'show unknown type when file doesn\'t have a content_type' do
+    f = FilePresenter.for(UploadedFile.new)
+    assert_match /Unknown/, f.short_description
+  end
 end
@@ -22,6 +22,7 @@ class ForgotPasswordHelperTest &lt; ActionView::TestCase
          {:field => 'f3', :name => 'F3', :model => 'person'}]
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['ForgotPasswordHelperTest::Plugin1', 'ForgotPasswordHelperTest::Plugin2'])
     environment.enable_plugin(Plugin1)
     environment.enable_plugin(Plugin2)
@@ -43,6 +44,7 @@ class ForgotPasswordHelperTest &lt; ActionView::TestCase
          {:field => 'f3', :name => 'F3', :model => 'person'}]
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['ForgotPasswordHelperTest::Plugin1', 'ForgotPasswordHelperTest::Plugin2'])
     environment.enable_plugin(Plugin1)
     environment.enable_plugin(Plugin2)
@@ -64,6 +66,7 @@ class ForgotPasswordHelperTest &lt; ActionView::TestCase
          {:field => 'f3', :name => 'F3', :model => 'user'}]
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['ForgotPasswordHelperTest::Plugin1', 'ForgotPasswordHelperTest::Plugin2'])
     environment.enable_plugin(Plugin1)
     environment.enable_plugin(Plugin2)
@@ -85,6 +88,7 @@ class ForgotPasswordHelperTest &lt; ActionView::TestCase
          {:field => 'f3', :name => 'F3', :model => 'user'}]
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['ForgotPasswordHelperTest::Plugin1', 'ForgotPasswordHelperTest::Plugin2'])
     environment.enable_plugin(Plugin1)
     environment.enable_plugin(Plugin2)
@@ -39,6 +39,32 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
     assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => '/test_profile/address'}
   end
+  should 'replace {portal} with environment portal identifier' do
+    env = Environment.default
+    env.enable('use_portal_community')
+    portal = fast_create(Community, :identifier => 'portal-community', :environment_id => env.id)
+    env.portal_community = portal
+    env.save
+
+    stubs(:environment).returns(env)
+    l = LinkListBlock.new(:links => [{:name => 'categ', :address => '/{portal}/address'}])
+    l.stubs(:owner).returns(env)
+    assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => '/portal-community/address'}
+  end
+
+  should 'not change address if no {portal} there' do
+    env = Environment.default
+    env.enable('use_portal_community')
+    portal = fast_create(Community, :identifier => 'portal-community', :environment_id => env.id)
+    env.portal_community = portal
+    env.save
+
+    stubs(:environment).returns(env)
+    l = LinkListBlock.new(:links => [{:name => 'categ', :address => '/address'}])
+    l.stubs(:owner).returns(env)
+    assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => '/address'}
+  end
+
   should 'display options for icons' do
     l = LinkListBlock.new
     l.icons_options.each do |option|
@@ -28,6 +28,7 @@ class MacrosHelperTest &lt; ActiveSupport::TestCase
   end
   def setup
+    Noosfero::Plugin.stubs(:all).returns(['MacrosHelperTest::Plugin1'])
     @environment = Environment.default
     @environment.enable_plugin(Plugin1)
     @plugins = Noosfero::Plugin::Manager.new(@environment, self)
@@ -129,4 +130,27 @@ class MacrosHelperTest &lt; ActiveSupport::TestCase
     assert_equal 'macro_generator', macro_generator(Plugin1::Macro)
   end
+  should 'get macro default generator' do
+    class Plugin1::Macro < Noosfero::Plugin::Macro
+      def self.configuration
+        { :params => [] }
+      end
+    end
+    assert_nothing_raised NoMethodError do
+      assert macro_generator(Plugin1::Macro)
+    end
+  end
+
+  should 'can use a code reference as macro generator' do
+    class Plugin1::Macro < Noosfero::Plugin::Macro
+      def self.configuration
+        { :params => [], :generator => method(:macro_generator_method) }
+      end
+      def self.macro_generator_method(macro)
+        "macro generator method return"
+      end
+    end
+    assert_equal "macro generator method return", macro_generator(Plugin1::Macro)
+  end
+
 end
@@ -74,7 +74,7 @@ class MailingTest &lt; ActiveSupport::TestCase
   should 'display name and email on generate_from' do
     person = Person['user_one']
     mailing = Mailing.new(:source => environment, :person => person)
-    assert_equal "#{environment.name} <#{environment.contact_email}>", mailing.generate_from
+    assert_equal "#{environment.name} <#{environment.noreply_email}>", mailing.generate_from
   end
   should 'generate subject' do
@@ -35,4 +35,28 @@ class MembersBlockTest &lt; ActiveSupport::TestCase
     assert_same list, block.profiles
   end
+  should 'use logged-in to compose cache key' do
+    person = fast_create(Person)
+    community = fast_create(Community)
+    block = MembersBlock.create
+    block.expects(:owner).returns(community)
+
+    assert_match(/-logged-in/,block.cache_key('en', person))
+  end
+
+  should 'use logged-in and member to compose cache key for members' do
+    person = fast_create(Person)
+    community = fast_create(Community)
+    community.add_member person
+    block = MembersBlock.create
+    block.expects(:owner).returns(community)
+
+    assert_match(/-logged-in-member/,block.cache_key('en', person))
+  end
+
+  should 'not change block cache key if user is nil' do
+    block = MembersBlock.new
+    assert_equal block.cache_key('en'), block.cache_key('en', nil)
+  end
+
 end
@@ -42,7 +42,7 @@ class OrganizationMailingTest &lt; ActiveSupport::TestCase
   should 'display name and email on generate_from' do
     mailing = OrganizationMailing.new(:source => community, :person => person)
-    assert_equal "#{person.name} <#{community.environment.contact_email}>", mailing.generate_from
+    assert_equal "#{person.name} <#{community.environment.noreply_email}>", mailing.generate_from
   end
   should 'generate subject' do
@@ -62,18 +62,21 @@ class OrganizationMailingTest &lt; ActiveSupport::TestCase
   should 'deliver mailing to each member after create' do
     mailing = OrganizationMailing.create(:source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
+    community.reload
     process_delayed_job_queue
     assert_equal 2, ActionMailer::Base.deliveries.count
   end
   should 'deliver mailing when there are many mailings created' do
     50.times { OrganizationMailing.create(:source => community, :subject => 'Hello', :body => 'We have some news', :person => person) }
+    community.reload
     process_delayed_job_queue
     assert_equal 50*community.members_count, ActionMailer::Base.deliveries.count
   end
   should 'create mailing sent to each recipient after delivering mailing' do
     mailing = OrganizationMailing.create(:source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
+    community.reload
     assert_difference MailingSent, :count, 2 do
       process_delayed_job_queue
     end
@@ -302,18 +302,17 @@ class OrganizationTest &lt; ActiveSupport::TestCase
   end
   should 'find more popular organizations' do
-    Organization.delete_all
     o1 = fast_create(Organization)
     o2 = fast_create(Organization)
     p1 = fast_create(Person)
     p2 = fast_create(Person)
     o1.add_member(p1)
-    assert_equal [o1,o2] , Organization.more_popular
+    assert_order [o1,o2] , Organization.more_popular
     o2.add_member(p1)
     o2.add_member(p2)
-    assert_equal [o2,o1] , Organization.more_popular
+    assert_order [o2,o1] , Organization.more_popular
   end
   should 'list organizations that have no members in more popular list' do
@@ -331,6 +330,7 @@ class OrganizationTest &lt; ActiveSupport::TestCase
     person = fast_create(Person)
     organization = fast_create(Organization)
     organization.add_member(person)
+    organization.reload
     assert_equal "one member", organization.more_popular_label
   end
@@ -342,47 +342,30 @@ class OrganizationTest &lt; ActiveSupport::TestCase
     organization.add_member(person1)
     organization.add_member(person2)
+    organization.reload
     assert_equal "2 members", organization.more_popular_label
     person3 = fast_create(Person)
     organization.add_member(person3)
+    organization.reload
     assert_equal "3 members", organization.more_popular_label
   end
   should 'find more active organizations' do
     person = fast_create(Person)
-    Organization.destroy_all
     p1 = fast_create(Organization)
     p2 = fast_create(Organization)
     p3 = fast_create(Organization)
     ActionTracker::Record.destroy_all
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => Time.now, :target_id => p1.id)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => Time.now, :target_id => p2.id)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => Time.now, :target_id => p2.id)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => Time.now, :target_id => p3.id)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => Time.now, :target_id => p3.id)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => Time.now, :target_id => p3.id)
+    ActionTracker::Record.create!(:user => person, :target => p1, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => person, :target => p2, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => person, :target => p2, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => person, :target => p3, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => person, :target => p3, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => person, :target => p3, :verb => 'leave_scrap')
-    assert_equal [p3,p2,p1] , Organization.more_active
-  end
-
-  should 'more active profile take in consideration only actions created only in the recent delay interval' do
-    ActionTracker::Record.destroy_all
-    recent_delay = ActionTracker::Record::RECENT_DELAY.days.ago
-
-    person = fast_create(Person)
-    Organization.destroy_all
-    p1 = fast_create(Organization)
-    p2 = fast_create(Organization)
-
-    ActionTracker::Record.destroy_all
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => recent_delay, :target_id => p1.id)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => recent_delay, :target_id => p1.id)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => recent_delay, :target_id => p2.id)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person, :created_at => recent_delay - 1.day, :target_id => p2.id)
-
-    assert_equal [p1,p2] , Organization.more_active
+    assert_order [p3,p2,p1] , Organization.more_active
   end
   should 'list profiles that have no actions in more active list' do
@@ -422,4 +405,24 @@ class OrganizationTest &lt; ActiveSupport::TestCase
     assert !organization.visible
   end
+  should 'increase members_count on new membership' do
+    member = fast_create(Person)
+    organization = fast_create(Organization)
+    assert_difference organization, :members_count, 1 do
+      organization.add_member(member)
+      organization.reload
+    end
+  end
+
+  should 'decrease members_count on membership removal' do
+    member = fast_create(Person)
+    organization = fast_create(Organization)
+    organization.add_member(member)
+    organization.reload
+    assert_difference organization, :members_count, -1 do
+      organization.remove_member(member)
+      organization.reload
+    end
+  end
+
 end
@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class PersonNotifierHelperTest < ActiveSupport::TestCase
+
+  include PersonNotifierHelper
+  include ActionView::Helpers::TagHelper
+
+  def setup
+    @profile = mock
+    @env = Environment.new
+  end
+  attr_reader :profile, :env
+
+  should 'append top url of environment at image path' do
+    profile.expects(:environment).returns(env).at_least_once
+    assert_match /src="http:\/\/localhost\/image.png"/, image_tag("/image.png")
+  end
+
+  should 'return original path if do not have an environment' do
+    profile.expects(:environment).returns(nil).at_least_once
+    assert_match /src="\/image.png"/, image_tag("/image.png")
+  end
+
+end
@@ -0,0 +1,213 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class PersonNotifierTest < ActiveSupport::TestCase
+  FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
+  CHARSET = "utf-8"
+
+  def setup
+    ActionMailer::Base.delivery_method = :test
+    ActionMailer::Base.perform_deliveries = true
+    ActionMailer::Base.deliveries = []
+    Person.destroy_all
+    @admin = create_user('adminuser').person
+    @member = create_user('member').person
+    @admin.notification_time = 24
+    @member.notification_time = 24
+    @admin.save!
+    @member.save!
+    @community = fast_create(Community)
+    @community.add_member(@admin)
+    @article = fast_create(TextileArticle, :name => 'Article test', :profile_id => @community.id, :notify_comments => false)
+    Delayed::Job.delete_all
+    notify
+    ActionMailer::Base.deliveries = []
+  end
+
+  should 'deliver mail to community members' do
+    @community.add_member(@member)
+    notify
+    sent = ActionMailer::Base.deliveries.first
+    assert_equal [@member.email], sent.to
+  end
+
+  should 'do not send mail if do not have notifications' do
+    @community.add_member(@member)
+    ActionTracker::Record.delete_all
+    notify
+    assert ActionMailer::Base.deliveries.empty?
+  end
+
+  should 'do not send mail to people not joined to community' do
+    Comment.create!(:author => @admin, :title => 'test comment 2', :body => 'body 2!', :source => @article)
+    notify
+    assert ActionMailer::Base.deliveries.blank?
+  end
+
+  should 'display author name in delivered mail' do
+    @community.add_member(@member)
+    Comment.create!(:author => @admin, :title => 'test comment', :body => 'body!', :source => @article)
+    notify
+    sent = ActionMailer::Base.deliveries.first
+    assert_match /#{@admin.name}/, sent.body
+  end
+
+  should 'do not include comment created before last notification' do
+    @community.add_member(@member)
+    ActionTracker::Record.delete_all
+    comment = Comment.create!(:author => @admin, :title => 'test comment', :body => 'body!', :source => @article )
+    @member.last_notification = DateTime.now + 1.day
+    notify
+    assert ActionMailer::Base.deliveries.empty?
+  end
+
+  should 'update last notification date' do
+    Comment.create!(:author => @admin, :title => 'test comment 2', :body => 'body 2!', :source => @article)
+    @community.add_member(@member)
+    initial_notification = @member.last_notification
+    notify
+    assert @member.last_notification > initial_notification
+  end
+
+  should 'reschedule after notification' do
+    Comment.create!(:author => @admin, :title => 'test comment 2', :body => 'body 2!', :source => @article)
+    @community.add_member(@member)
+    assert PersonNotifier::NotifyJob.find(@member.id).blank?
+    notify
+    assert PersonNotifier::NotifyJob.find(@member.id)
+  end
+
+  should 'schedule next mail at notification time' do
+    @member.notification_time = 12
+    @member.notifier.schedule_next_notification_mail
+    assert_equal @member.notification_time, DateTime.now.hour - Delayed::Job.first.run_at.hour
+  end
+
+  should 'do not schedule duplicated notification mail' do
+    @member.notification_time = 12
+    @member.notifier.schedule_next_notification_mail
+    @member.notifier.schedule_next_notification_mail
+    assert_equal 1, Delayed::Job.count
+  end
+
+  should 'do not schedule next mail if notification time is zero' do
+    @member.notification_time = 0
+    @member.notifier.schedule_next_notification_mail
+    assert_equal 0, Delayed::Job.count
+  end
+
+  should 'schedule next notifications for all person with notification time greater than zero' do
+    @member.notification_time = 1
+    @admin.notification_time = 0
+    @admin.save!
+    @member.save!
+    Delayed::Job.delete_all
+    PersonNotifier.schedule_all_next_notification_mail
+    process_delayed_job_queue
+    assert_equal 1, Delayed::Job.count
+  end
+
+  should 'do not create duplicated job' do
+    PersonNotifier.schedule_all_next_notification_mail
+    PersonNotifier.schedule_all_next_notification_mail
+    assert_equal 1, Delayed::Job.count
+  end
+
+  should 'schedule after update and set a valid notification time' do
+    @member.notification_time = 0
+    @member.save!
+    assert_equal 0, Delayed::Job.count
+    @member.notification_time = 12
+    @member.save!
+    assert_equal 1, Delayed::Job.count
+  end
+
+  should 'reschedule with changed notification time' do
+    @member.notification_time = 2
+    @member.save!
+    assert_equal 1, Delayed::Job.count
+    @member.notification_time = 12
+    @member.save!
+    assert_equal 1, Delayed::Job.count
+    assert_equal @member.notification_time, DateTime.now.hour - Delayed::Job.first.run_at.hour
+  end
+
+  should 'display error message if fail to render a notificiation' do
+    @community.add_member(@member)
+    Comment.create!(:author => @admin, :title => 'test comment', :body => 'body!', :source => @article)
+    ActionTracker::Record.any_instance.stubs(:verb).returns("some_invalid_verb")
+    notify
+    sent = ActionMailer::Base.deliveries.first
+    assert_match /cannot render notification for some_invalid_verb/, sent.body
+  end
+
+  ActionTrackerConfig.verb_names.each do |verb|
+    should "render notification for verb #{verb}" do
+      action = mock()
+      action.stubs(:verb).returns(verb)
+      action.stubs(:user).returns(@member)
+      action.stubs(:created_at).returns(DateTime.now)
+      action.stubs(:target).returns(fast_create(Forum))
+      action.stubs(:comments_count).returns(0)
+      action.stubs(:comments).returns([])
+      action.stubs(:params).returns({'name' => 'home', 'url' => '/', 'lead' => ''})
+      action.stubs(:get_url).returns('')
+
+      notifications = []
+      notifications.stubs(:find).returns([action])
+      Person.any_instance.stubs(:tracked_notifications).returns(notifications)
+
+      notify
+      sent = ActionMailer::Base.deliveries.first
+      assert_no_match /cannot render notification for #{verb}/, sent.body
+    end
+  end
+
+  should 'exists? method in NotifyAllJob return false if there is no instance of this class created' do
+    Delayed::Job.enqueue(PersonNotifier::NotifyJob.new)
+    assert !PersonNotifier::NotifyAllJob.exists?
+  end
+
+  should 'exists? method in NotifyAllJob return false if there is no jobs created' do
+    assert !PersonNotifier::NotifyAllJob.exists?
+  end
+
+  should 'exists? method in NotifyAllJob return true if there is at least one instance of this class' do
+    Delayed::Job.enqueue(PersonNotifier::NotifyAllJob.new)
+    assert PersonNotifier::NotifyAllJob.exists?
+  end
+
+  should 'perform create NotifyJob for all users with notification_time' do
+    Delayed::Job.enqueue(PersonNotifier::NotifyAllJob.new)
+    process_delayed_job_queue
+    assert_equal 2, Delayed::Job.count
+  end
+
+  should 'perform create NotifyJob for all users with notification_time defined greater than zero' do
+    @member.notification_time = 1
+    @admin.notification_time = 0
+    @admin.save!
+    @member.save!
+    Delayed::Job.delete_all
+    Delayed::Job.enqueue(PersonNotifier::NotifyAllJob.new)
+    process_delayed_job_queue
+    assert_equal 1, Delayed::Job.count
+  end
+
+  should 'NotifyJob failed jobs create a new NotifyJob on permanent failure' do
+    Delayed::Job.enqueue(PersonNotifier::NotifyJob.new(@member.id))
+
+    PersonNotifier.any_instance.stubs(:notify).raises('error')
+
+    process_delayed_job_queue
+    jobs = Delayed::Job.all
+
+    assert 1, jobs.select{|j| j.failed?}.size
+    assert 1, jobs.select{|j| !j.failed?}.size
+  end
+
+  def notify
+    process_delayed_job_queue
+    @member.notifier.notify
+  end
+
+end
@@ -404,15 +404,14 @@ class PersonTest &lt; ActiveSupport::TestCase
   should 'not allow simple member to view group pending tasks' do
     community = fast_create(Community)
+    admin = fast_create(Person)
+    community.add_member(admin)
     member = fast_create(Person)
+    community.reload
     community.add_member(member)
-
     community.tasks << Task.new
-    person = fast_create(Person)
-    community.add_member(person)
-
-    assert_not_includes Person.with_pending_tasks, person
+    assert_not_includes Person.with_pending_tasks, member
   end
   should 'person has organization pending tasks' do
@@ -642,16 +641,18 @@ class PersonTest &lt; ActiveSupport::TestCase
   end
   should 'find more popular people' do
+    extend CacheCounterHelper
+
     Person.delete_all
     p1 = fast_create(Person)
     p2 = fast_create(Person)
     p3 = fast_create(Person)
-    p1.add_friend(p2)
-    p2.add_friend(p1)
-    p2.add_friend(p3)
-    assert_equal p2, Person.more_popular[0]
-    assert_equal p1, Person.more_popular[1]
+    update_cache_counter(:friends_count, p1, 1)
+    update_cache_counter(:friends_count, p2, 2)
+    update_cache_counter(:friends_count, p3, 3)
+
+    assert_order [p3, p2, p1], Person.more_popular
   end
   should 'list people that have no friends in more popular list' do
@@ -891,6 +892,7 @@ class PersonTest &lt; ActiveSupport::TestCase
     p1 = fast_create(Person)
     p2 = fast_create(Person)
     p3 = fast_create(Person)
+    p4 = fast_create(Person)
     community.add_member(p1)
     assert p1.is_member_of?(community)
@@ -901,14 +903,15 @@ class PersonTest &lt; ActiveSupport::TestCase
     action_tracker = fast_create(ActionTracker::Record, :verb => 'create_article')
     action_tracker.target = community
+    action_tracker.user = p4
     action_tracker.save!
     ActionTrackerNotification.delete_all
-    assert_difference(ActionTrackerNotification, :count, 3) do
+    assert_difference(ActionTrackerNotification, :count, 4) do
       Person.notify_activity(action_tracker)
       process_delayed_job_queue
     end
     ActionTrackerNotification.all.map{|a|a.profile}.map do |profile|
-      assert [community,p1,p3].include?(profile)
+      assert [community,p1,p3,p4].include?(profile)
     end
   end
@@ -1011,9 +1014,9 @@ class PersonTest &lt; ActiveSupport::TestCase
   should 'the community specific notification created when a member joins community could not be propagated to members' do
     ActionTracker::Record.delete_all
-    p1 = create_user('test_user').person
-    p2 = create_user('test_user').person
-    p3 = create_user('test_user').person
+    p1 = create_user('p1').person
+    p2 = create_user('p2').person
+    p3 = create_user('p3').person
     c = fast_create(Community, :name => "Foo")
     c.add_member(p1)
     process_delayed_job_queue
@@ -1133,30 +1136,14 @@ class PersonTest &lt; ActiveSupport::TestCase
     p3 = fast_create(Person)
     ActionTracker::Record.destroy_all
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p1, :created_at => Time.now)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p2, :created_at => Time.now)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p2, :created_at => Time.now)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p3, :created_at => Time.now)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p3, :created_at => Time.now)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p3, :created_at => Time.now)
+    ActionTracker::Record.create!(:user => p1, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => p2, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => p2, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => p3, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => p3, :verb => 'leave_scrap')
+    ActionTracker::Record.create!(:user => p3, :verb => 'leave_scrap')
-    assert_equal [p3,p2,p1] , Person.more_active
-  end
-
-  should 'more active profile take in consideration only actions created only in the recent delay interval' do
-    Person.delete_all
-    ActionTracker::Record.destroy_all
-    recent_delay = ActionTracker::Record::RECENT_DELAY.days.ago
-
-    p1 = fast_create(Person)
-    p2 = fast_create(Person)
-
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p1, :created_at => recent_delay)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p1, :created_at => recent_delay)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p2, :created_at => recent_delay)
-    fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p2, :created_at => recent_delay - 1.day)
-
-    assert_equal [p1,p2], Person.more_active
+    assert_order [p3,p2,p1] , Person.more_active
   end
   should 'list profiles that have no actions in more active list' do
@@ -1268,6 +1255,7 @@ class PersonTest &lt; ActiveSupport::TestCase
         false
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PersonTest::Plugin1', 'PersonTest::Plugin2'])
     e = Environment.default
     e.enable_plugin(Plugin1.name)
@@ -1363,7 +1351,7 @@ class PersonTest &lt; ActiveSupport::TestCase
       u = create_user('user'+i.to_s)
       u.deactivate
     }
-    assert_equal activated, Person.activated
+    assert_equivalent activated, Person.activated
   end
   should 'deactivated named_scope return persons who are deactivated users' do
@@ -1379,7 +1367,7 @@ class PersonTest &lt; ActiveSupport::TestCase
       u = create_user('user'+i.to_s)
       u.activate
     }
-    assert_equal deactivated, Person.deactivated
+    assert_equivalent deactivated, Person.deactivated
   end
   should 'be able to retrieve memberships by role person has' do
@@ -1414,6 +1402,17 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert_equal person.activities, []
   end
+  should 'person notifier be PersonNotifier class' do
+    p =  Person.new
+    assert p.notifier.kind_of?(PersonNotifier)
+  end
+
+  should 'reschedule next notification after update' do
+    p = fast_create(Person, :user_id => fast_create(User).id)
+    PersonNotifier.any_instance.expects(:reschedule_next_notification_mail).once
+    assert p.update_attribute(:name, 'Person name changed')
+  end
+
   should 'merge memberships of plugins to original memberships' do
     class Plugin1 < Noosfero::Plugin
       def person_memberships(person)
@@ -1426,6 +1425,7 @@ class PersonTest &lt; ActiveSupport::TestCase
         Profile.memberships_of(Person.find_by_identifier('person2'))
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PersonTest::Plugin1', 'PersonTest::Plugin2'])
     Environment.default.enable_plugin(Plugin1)
     Environment.default.enable_plugin(Plugin2)
@@ -1446,4 +1446,30 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert 3, original_person.memberships.count
   end
+  should 'increase friends_count on new friendship' do
+    person = create_user('person').person
+    friend = create_user('friend').person
+    assert_difference person, :friends_count, 1 do
+      assert_difference friend, :friends_count, 1 do
+        person.add_friend(friend)
+        friend.reload
+      end
+      person.reload
+    end
+  end
+
+  should 'decrease friends_count on friendship removal' do
+    person = create_user('person').person
+    friend = create_user('friend').person
+    person.add_friend(friend)
+    friend.reload
+    person.reload
+    assert_difference person, :friends_count, -1 do
+      assert_difference friend, :friends_count, -1 do
+        person.remove_friend(friend)
+        friend.reload
+      end
+      person.reload
+    end
+  end
 end
@@ -26,6 +26,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
     class Plugin2 < Noosfero::Plugin; end;
     class Plugin3 < Noosfero::Plugin; end;
     class Plugin4 < Noosfero::Plugin; end;
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2', 'PluginManagerTest::Plugin3', 'PluginManagerTest::Plugin4'])
     environment.stubs(:enabled_plugins).returns([Plugin1.to_s, Plugin2.to_s, Plugin4.to_s])
     Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin3.to_s, Plugin4.to_s])
     results = plugins.enabled_plugins.map { |instance| instance.class.to_s }
@@ -51,6 +52,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         'Plugin 2 action.'
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2'])
     environment.stubs(:enabled_plugins).returns([Plugin1.to_s, Plugin2.to_s])
@@ -83,6 +85,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         'Plugin 3 action.'
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2', 'PluginManagerTest::Plugin3'])
     environment.stubs(:enabled_plugins).returns([Plugin1.to_s, Plugin2.to_s, Plugin3.to_s])
     p1 = Plugin1.new
@@ -107,6 +110,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         'Plugin3'
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2', 'PluginManagerTest::Plugin3'])
     environment.enable_plugin(Plugin1.name)
     environment.enable_plugin(Plugin2.name)
@@ -134,6 +138,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         true
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2', 'PluginManagerTest::Plugin3'])
     environment.enable_plugin(Plugin1.name)
     environment.enable_plugin(Plugin2.name)
@@ -162,6 +167,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         true
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2', 'PluginManagerTest::Plugin3'])
     environment.enable_plugin(Plugin1.name)
     environment.enable_plugin(Plugin2.name)
@@ -178,6 +184,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         [Macro1, Macro2]
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1'])
     class Plugin1::Macro1 < Noosfero::Plugin::Macro
       def convert(macro, source)
@@ -212,6 +219,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         [v1 * v, v2 * v]
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2'])
     environment.enable_plugin(Plugin1)
     environment.enable_plugin(Plugin2)
@@ -231,6 +239,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         value * 5
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2'])
     environment.enable_plugin(Plugin1)
     environment.enable_plugin(Plugin2)
@@ -252,6 +261,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         [v1 * v, v2 * v, 666]
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2'])
     environment.enable_plugin(Plugin1)
     environment.enable_plugin(Plugin2)
@@ -273,6 +283,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
         numbers.reject {|n| n<=5}
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2'])
     environment.enable_plugin(Plugin1)
     environment.enable_plugin(Plugin2)
@@ -9,15 +9,9 @@ class PluginTest &lt; ActiveSupport::TestCase
   include Noosfero::Plugin::HotSpot
-  should 'keep the list of all loaded subclasses' do
-    class Plugin1 < Noosfero::Plugin
-    end
-
-    class Plugin2 < Noosfero::Plugin
-    end
-
-    assert_includes  Noosfero::Plugin.all, Plugin1.to_s
-    assert_includes  Noosfero::Plugin.all, Plugin2.to_s
+  should 'keep the list of all available plugins' do
+    assert File.directory?(File.join(Rails.root, 'plugins', 'foo'))
+    assert_includes  Noosfero::Plugin.all, 'FooPlugin'
   end
   should 'returns url to plugin management if plugin has admin_controller' do
@@ -496,4 +490,29 @@ class PluginTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'comment_actions be nil if the comment is nil' do
+    class SomePlugin < Noosfero::Plugin; end
+    plugin = SomePlugin.new
+    assert_nil plugin.comment_actions(nil)
+  end
+
+  should 'comment_actions be nil by default' do
+    class SomePlugin < Noosfero::Plugin; end
+    plugin = SomePlugin.new
+    assert_nil plugin.comment_actions(Comment.new)
+  end
+
+  should 'check_comment_actions be an empty array if the comment is nil' do
+    class SomePlugin < Noosfero::Plugin; end
+    plugin = SomePlugin.new
+    assert_equal [], plugin.check_comment_actions(nil)
+  end
+
+
+  should 'check_comment_actions be  an empty array by default' do
+    class SomePlugin < Noosfero::Plugin; end
+    plugin = SomePlugin.new
+    assert_equal [], plugin.check_comment_actions(Comment.new)
+  end
+
 end
@@ -1688,6 +1688,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
     person = fast_create(Person)
     community = fast_create(Community)
     community.add_member(person)
+    community.reload
     assert_equal 1, community.members_count
   end
@@ -1811,6 +1812,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
         Person.members_of(Community.find_by_identifier('community2'))
       end
     end
+    Noosfero::Plugin.stubs(:all).returns(['ProfileTest::Plugin1', 'ProfileTest::Plugin2'])
     Environment.default.enable_plugin(Plugin1)
     Environment.default.enable_plugin(Plugin2)
@@ -1823,11 +1825,12 @@ class ProfileTest &lt; ActiveSupport::TestCase
     original_community.add_member(original_member)
     community1.add_member(plugin1_member)
     community2.add_member(plugin2_member)
+    original_community.reload
     assert_includes original_community.members, original_member
     assert_includes original_community.members, plugin1_member
     assert_includes original_community.members, plugin2_member
-    assert 3, original_community.members.count
+    assert 3, original_community.members_count
   end
   private
@@ -1967,6 +1970,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
     end
     environment = Environment.default
+    Noosfero::Plugin.stubs(:all).returns(['ProfileTest::Plugin1'])
     environment.enable_plugin(Plugin1)
     plugins = Noosfero::Plugin::Manager.new(environment, self)
     p = fast_create(Profile)
@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class RoleAssignmentExtTest < ActiveSupport::TestCase
+  should 'increase organization members_count only on the first role_assignment' do
+    role1 = Role.create!(:name => 'role1')
+    role2 = Role.create!(:name => 'role2')
+    member = create_user('person').person
+    organization = Organization.create!(:name => 'Organization', :identifier => 'organization')
+    assert_difference organization, :members_count, 1 do
+      RoleAssignment.create!(:accessor => member, :resource => organization, :role => role1)
+      RoleAssignment.create!(:accessor => member, :resource => organization, :role => role2)
+      organization.reload
+    end
+  end
+
+  should 'decrease organization members_count only on the last role_assignment' do
+    role1 = Role.create!(:name => 'role1')
+    role2 = Role.create!(:name => 'role2')
+    member = create_user('person').person
+    organization = Organization.create!(:name => 'Organization', :identifier => 'organization')
+    RoleAssignment.create!(:accessor => member, :resource => organization, :role => role1)
+    RoleAssignment.create!(:accessor => member, :resource => organization, :role => role2)
+    organization.reload
+    assert_difference organization, :members_count, -1 do
+      organization.role_assignments.destroy_all
+      organization.reload
+    end
+  end
+end
@@ -7,6 +7,7 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
     @profile = create_user('test_user').person
+    Noosfero::Plugin.stubs(:all).returns(['SuggestArticleTest::EverythingIsSpam', 'SuggestArticleTest::SpamNotification'])
   end
   attr_reader :profile
@@ -24,7 +24,7 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
     requestor.expects(:name).returns('my name')
     environment = mock()
-    environment.expects(:contact_email).returns('sender@example.com')
+    environment.expects(:noreply_email).returns('sender@example.com')
     environment.expects(:default_hostname).returns('example.com')
     environment.expects(:name).returns('example').at_least_once
@@ -47,7 +47,7 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
     requestor.expects(:name).returns('my name')
     environment = mock()
-    environment.expects(:contact_email).returns('sender@example.com')
+    environment.expects(:noreply_email).returns('sender@example.com')
     environment.expects(:default_hostname).returns('example.com')
     environment.expects(:name).returns('example').at_least_once
@@ -71,7 +71,7 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
     requestor.expects(:name).returns('my name')
     environment = mock()
-    environment.expects(:contact_email).returns('sender@example.com')
+    environment.expects(:noreply_email).returns('sender@example.com')
     environment.expects(:default_hostname).returns('example.com')
     environment.expects(:name).returns('example').at_least_once
@@ -105,7 +105,7 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
     requestor.stubs(:public_profile_url).returns('requestor_path')
     environment = mock()
-    environment.expects(:contact_email).returns('sender@example.com')
+    environment.expects(:noreply_email).returns('sender@example.com')
     environment.expects(:default_hostname).returns('example.com')
     environment.expects(:name).returns('example').at_least_once
@@ -124,11 +124,11 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
     assert !ActionMailer::Base.deliveries.empty?
   end
-  should 'use environment name and contact email' do
+  should 'use environment name and no-reply email' do
     task = mock
     environment = mock
     environment.expects(:name).returns('My name')
-    environment.expects(:contact_email).returns('email@example.com')
+    environment.expects(:noreply_email).returns('email@example.com')
     task.expects(:environment).returns(environment).at_least_once
@@ -191,4 +191,22 @@ class ThemeTest &lt; ActiveSupport::TestCase
     assert ! Theme.new('test').public
   end
+  should 'not crash with nil or invalid owner_type' do
+    profile = fast_create(Profile)
+    Theme.stubs(:system_themes_dir).returns(TMP_THEMES_DIR)
+
+    t1 = Theme.new('t1').save
+    t1.send(:write_config)
+    t2 = Theme.new('t2', {:owner_type => nil}).save
+    t2.send(:write_config)
+    t3 = Theme.new('t3', {:owner_type => 'InvalidClass'}).save
+    t3.send(:write_config)
+
+    assert_nothing_raised do
+      themes = Theme.approved_themes(profile)
+      assert_not_includes themes, t1
+      assert_not_includes themes, t2
+      assert_not_includes themes, t3
+    end
+  end
 end
@@ -31,6 +31,13 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
     assert_equal 'test.txt', file.name
   end
+  should 'not set filename on name if name is already set' do
+    file = UploadedFile.new
+    file.name = "Some name"
+    file.filename = 'test.txt'
+    assert_equal 'Some name', file.name
+  end
+
   should 'provide file content as data' do
     file = UploadedFile.new
     file.expects(:full_filename).returns('myfilename')
@@ -119,24 +126,13 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
     assert_equal 'my title', UploadedFile.new(:title => 'my title').title
   end
-  should 'limit title to 140 characters' do
-    upload = UploadedFile.new
-
-    upload.title = '+' * 61; upload.valid?
-    assert upload.errors[:title]
-
-    upload.title = '+' * 60; upload.valid?
-    assert !upload.errors[:title]
-
-  end
-
   should 'always provide a display title' do
     upload = UploadedFile.new(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
-    assert_equal 'test.txt',  upload.display_title
+    assert_equal 'test.txt',  upload.title
     upload.title = 'My text file'
-    assert_equal 'My text file', upload.display_title
+    assert_equal 'My text file', upload.title
     upload.title = ''
-    assert_equal 'test.txt', upload.display_title
+    assert_equal 'test.txt', upload.title
   end
   should 'use name as title by default' do
@@ -326,13 +322,15 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
   end
   should 'group trackers activity of image\'s upload' do
+    ActionTracker::Record.delete_all
     gallery = fast_create(Gallery, :profile_id => profile.id)
-
+    count = ActionTracker::Record.find_all_by_verb('upload_image').count
     image1 = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => gallery, :profile => profile)
-    assert_equal 1, ActionTracker::Record.find_all_by_verb('upload_image').count
+    count += 1
+    assert_equal count, ActionTracker::Record.find_all_by_verb('upload_image').count
     image2 = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/other-pic.jpg', 'image/jpg'), :parent => gallery, :profile => profile)
-    assert_equal 1, ActionTracker::Record.find_all_by_verb('upload_image').count
+    assert_equal count, ActionTracker::Record.find_all_by_verb('upload_image').count
   end
   {
 module ActionTracker
   class Record < ActiveRecord::Base
-
     set_table_name 'action_tracker'
     belongs_to :user, :polymorphic => true
@@ -5,8 +5,8 @@ Delayed::Worker.module_eval do
       environment = Environment.default
       recipients NOOSFERO_CONF['exception_recipients']
-      from       environment.contact_email
-      reply_to   environment.contact_email
+      from       environment.noreply_email
+      reply_to   environment.noreply_email
       subject    "[#{environment.name}] DelayedJob ##{job.id}: #{error.message}"
       body       render(:text => "
 Job:
	@@ -45,6 +45,20 @@ class UsersController < AdminController		@@ -45,6 +45,20 @@ class UsersController < AdminController
45	redirect_to :action => :index, :q => params[:q], :filter => params[:filter]	45	redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
46	end	46	end
47		47
		48	+
		49	+ def destroy_user
		50	+ if request.post?
		51	+ person = environment.people.find_by_id(params[:id])
		52	+ if person && person.destroy
		53	+ session[:notice] = _('The profile was deleted.')
		54	+ else
		55	+ session[:notice] = _('Could not remove profile')
		56	+ end
		57	+ end
		58	+ redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
		59	+ end
		60	+
		61	+
48	def download	62	def download
49	respond_to do \|format\|	63	respond_to do \|format\|
50	format.html	64	format.html
	@@ -80,6 +80,22 @@ class BoxOrganizerController < ApplicationController		@@ -80,6 +80,22 @@ class BoxOrganizerController < ApplicationController
80	render :action => 'edit', :layout => false	80	render :action => 'edit', :layout => false
81	end	81	end
82		82
		83	+ def search_autocomplete
		84	+ if request.xhr? and params[:query]
		85	+ search = params[:query]
		86	+ path_list = if boxes_holder.is_a?(Environment) && boxes_holder.enabled?('use_portal_community') && boxes_holder.portal_community
		87	+ boxes_holder.portal_community.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { \|content\| "/{portal}/"+content.path }
		88	+ elsif boxes_holder.is_a?(Profile)
		89	+ boxes_holder.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { \|content\| "/{profile}/"+content.path }
		90	+ else
		91	+ []
		92	+ end
		93	+ render :json => path_list.to_json
		94	+ else
		95	+ redirect_to "/"
		96	+ end
		97	+ end
		98	+
83	def save	99	def save
84	@block = boxes_holder.blocks.find(params[:id])	100	@block = boxes_holder.blocks.find(params[:id])
85	@block.update_attributes(params[:block])	101	@block.update_attributes(params[:block])
	@@ -99,6 +115,12 @@ class BoxOrganizerController < ApplicationController		@@ -99,6 +115,12 @@ class BoxOrganizerController < ApplicationController
99	end	115	end
100	end	116	end
101		117
		118	+ def clone_block
		119	+ block = Block.find(params[:id])
		120	+ block.duplicate
		121	+ redirect_to :action => 'index'
		122	+ end
		123	+
102	protected :boxes_editor?	124	protected :boxes_editor?
103		125
104	end	126	end
	@@ -55,10 +55,4 @@ class ProfileDesignController < BoxOrganizerController		@@ -55,10 +55,4 @@ class ProfileDesignController < BoxOrganizerController
55	blocks	55	blocks
56	end	56	end
57		57
58	- def clone
59	- block = Block.find(params[:id])
60	- block.duplicate
61	- redirect_to :action => 'index'
62	- end
63	-
64	end	58	end
	@@ -111,6 +111,15 @@ class ContentViewerController < ApplicationController		@@ -111,6 +111,15 @@ class ContentViewerController < ApplicationController
111	@comments = @plugins.filter(:unavailable_comments, @comments)	111	@comments = @plugins.filter(:unavailable_comments, @comments)
112	@comments_count = @comments.count	112	@comments_count = @comments.count
113	@comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )	113	@comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
		114	+ @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
		115	+
		116	+ if request.xhr? and params[:comment_order]
		117	+ if @comment_order == 'newest'
		118	+ @comments = @comments.reverse
		119	+ end
		120	+
		121	+ return render :partial => 'comment/comment', :collection => @comments
		122	+ end
114		123
115	if params[:slideshow]	124	if params[:slideshow]
116	render :action => 'slideshow', :layout => 'slideshow'	125	render :action => 'slideshow', :layout => 'slideshow'
	@@ -304,14 +304,6 @@ class ProfileController < PublicController		@@ -304,14 +304,6 @@ class ProfileController < PublicController
304	end	304	end
305	end	305	end
306		306
307	- def profile_info
308	- begin
309	- @block = profile.blocks.find(params[:block_id])
310	- rescue
311	- render :text => _('Profile information could not be loaded')
312	- end
313	- end
314	-
315	def report_abuse	307	def report_abuse
316	@abuse_report = AbuseReport.new	308	@abuse_report = AbuseReport.new
317	render :layout => false	309	render :layout => false
	@@ -12,7 +12,7 @@ class ThemesController < ApplicationController		@@ -12,7 +12,7 @@ class ThemesController < ApplicationController
12		12
13	def index	13	def index
14	@environment = environment	14	@environment = environment
15	- @themes = environment.themes + Theme.approved_themes(target)	15	+ @themes = (environment.themes + Theme.approved_themes(target)).sort_by { \|t\| t.name }
16		16
17	@current_theme = target.theme	17	@current_theme = target.theme
18		18
	@@ -608,49 +608,18 @@ module ApplicationHelper		@@ -608,49 +608,18 @@ module ApplicationHelper
608	end	608	end
609		609
610	attr_reader :environment	610	attr_reader :environment
		611	+
611	def select_categories(object_name, title=nil, title_size=4)	612	def select_categories(object_name, title=nil, title_size=4)
612	return nil if environment.enabled?(:disable_categories)	613	return nil if environment.enabled?(:disable_categories)
613	if title.nil?	614	if title.nil?
614	title = _('Categories')	615	title = _('Categories')
615	end	616	end
616		617
617	- object = instance_variable_get("@#{object_name}")
618	-
619	- result = content_tag 'h'+title_size.to_s(), title
620	- result << javascript_tag( 'function open_close_cat( link ) {
621	- var div = link.parentNode.getElementsByTagName("div")[0];
622	- var end = function(){
623	- if ( div.style.display == "none" ) {
624	- this.link.className="button icon-button icon-down"
625	- } else {
626	- this.link.className="button icon-button icon-up-red"
627	- }
628	- }
629	- Effect.toggle( div, "slide", { link:link, div:div, afterFinish:end } )
630	- }')
631	- environment.top_level_categories.select{\|i\| !i.children.empty?}.each do \|toplevel\|
632	- next unless object.accept_category?(toplevel)
633	- # FIXME
634	- ([toplevel] + toplevel.children_for_menu).each do \|cat\|
635	- if cat.top_level?
636	- result << '<div class="categorie_box">'.html_safe
637	- result << icon_button( :down, _('open'), '#', :onclick => 'open_close_cat(this); return false' )
638	- result << content_tag('h5', toplevel.name)
639	- result << '<div style="display:none"><ul class="categories">'.html_safe
640	- else
641	- checkbox_id = "#{object_name}_#{cat.full_name.downcase.gsub(/\s+\|\//, '_')}"
642	- result << content_tag('li', labelled_check_box(
643	- cat.full_name_without_leading(1, " → "),
644	- "#{object_name}[category_ids][]", cat.id,
645	- object.category_ids.include?(cat.id), :id => checkbox_id,
646	- :onchange => 'this.parentNode.className=(this.checked?"cat_checked":"")' ),
647	- :class => ( object.category_ids.include?(cat.id) ? 'cat_checked' : '' ) ) + "\n"
648	- end
649	- end
650	- result << '</ul></div></div>'.html_safe
651	- end	618	+ @object = instance_variable_get("@#{object_name}")
		619	+ @categories = environment.top_level_categories
652		620
653	- content_tag('div', result)	621	+ @current_categories = environment.top_level_categories.select{\|i\| !i.children.empty?}
		622	+ render :partial => 'shared/select_categories_top', :locals => {:object_name => object_name, :title => title, :title_size => title_size, :multiple => true, :categories_selected => @object.categories }, :layout => false
654	end	623	end
655		624
656	def theme_option(opt = nil)	625	def theme_option(opt = nil)
	@@ -920,12 +889,11 @@ module ApplicationHelper		@@ -920,12 +889,11 @@ module ApplicationHelper
920		889
921	def page_title	890	def page_title
922	(@page ? @page.title + ' - ' : '') +	891	(@page ? @page.title + ' - ' : '') +
923	- (profile ? profile.short_name + ' - ' : '') +
924	(@topic ? @topic.title + ' - ' : '') +	892	(@topic ? @topic.title + ' - ' : '') +
925	(@section ? @section.title + ' - ' : '') +	893	(@section ? @section.title + ' - ' : '') +
926	(@toc ? _('Online Manual') + ' - ' : '') +	894	(@toc ? _('Online Manual') + ' - ' : '') +
927	(@controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +	895	(@controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
928	- environment.name +	896	+ (profile ? profile.short_name : environment.name) +
929	(@category ? " - #{@category.full_name}" : '')	897	(@category ? " - #{@category.full_name}" : '')
930	end	898	end
931		899
	@@ -65,7 +65,7 @@ module BoxesHelper		@@ -65,7 +65,7 @@ module BoxesHelper
65	end	65	end
66		66
67	def display_box_content(box, main_content)	67	def display_box_content(box, main_content)
68	- context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params }	68	+ context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params, :user => user }
69	box_decorator.select_blocks(box.blocks.includes(:box), context).map { \|item\| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)	69	box_decorator.select_blocks(box.blocks.includes(:box), context).map { \|item\| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
70	end	70	end
71		71
	@@ -212,7 +212,7 @@ module BoxesHelper		@@ -212,7 +212,7 @@ module BoxesHelper
212		212
213	if !block.main?	213	if !block.main?
214	buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})	214	buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
215	- buttons << icon_button(:clone, _('Clone'), { :action => 'clone', :id => block.id }, { :method => 'post' })	215	+ buttons << icon_button(:clone, _('Clone'), { :action => 'clone_block', :id => block.id }, { :method => 'post' })
216	end	216	end
217		217
218	if block.respond_to?(:help)	218	if block.respond_to?(:help)
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+module CacheCounterHelper
	2	+ def update_cache_counter(name, object, value)
	3	+ if object.present?
	4	+ object.class.update_counters(object.id, name => value)
	5	+ end
	6	+ end
	7	+end
	@@ -48,4 +48,12 @@ module CategoriesHelper		@@ -48,4 +48,12 @@ module CategoriesHelper
48	labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))	48	labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))
49	end	49	end
50		50
		51	+ #FIXME make this test
		52	+ def selected_category_link(cat)
		53	+ content_tag('div', button_to_function_without_text(:remove, _('Remove'), nil) {\|page\| page["selected-category-#{cat.id}"].remove} +
		54	+ link_to_function(cat.full_name(' → '), nil, :id => "remove-selected-category-#{cat.id}-button", :class => 'select-subcategory-link') {\|page\| page["selected-category-#{cat.id}"].remove},
		55	+ :class => 'selected-category'
		56	+ )
		57	+ end
		58	+
51	end	59	end