Merge branch 'master' into rails3

Conflicts: app/controllers/my_profile/memberships_controller.rb app/helpers/application_helper.rb app/helpers/boxes_helper.rb app/models/article.rb app/models/category.rb app/models/change_password.rb app/models/comment.rb app/models/environment.rb app/models/event.rb app/models/profile.rb app/models/recent_documents_block.rb app/models/region.rb app/models/task.rb app/models/uploaded_file.rb app/views/account/forgot_password.html.erb app/views/events/_events_by_day.html.erb app/views/profile/_person_profile.html.erb app/views/shared/_manage_enterprises.html.erb config/environment.rb config/initializers/plugins.rb config/routes.rb db/schema.rb debian/control lib/noosfero/plugin.rb test/unit/article_test.rb test/unit/category_test.rb test/unit/change_password_test.rb test/unit/cms_helper_test.rb test/unit/comment_test.rb test/unit/content_viewer_helper_test.rb test/unit/event_test.rb test/unit/folder_helper_test.rb test/unit/person_test.rb test/unit/price_detail_test.rb test/unit/profile_helper_test.rb test/unit/recent_documents_block_test.rb test/unit/scrap_test.rb test/unit/user_mailer_test.rb vendor/plugins/action_tracker_has_comments/init.rb vendor/plugins/delayed_job/lib/delayed/worker.rb vendor/plugins/noosfero_caching/init.rb

Merge branch 'master' into rails3
Conflicts: app/controllers/my_profile/memberships_controller.rb app/helpers/application_helper.rb app/helpers/boxes_helper.rb app/models/article.rb app/models/category.rb app/models/change_password.rb app/models/comment.rb app/models/environment.rb app/models/event.rb app/models/profile.rb app/models/recent_documents_block.rb app/models/region.rb app/models/task.rb app/models/uploaded_file.rb app/views/account/forgot_password.html.erb app/views/events/_events_by_day.html.erb app/views/profile/_person_profile.html.erb app/views/shared/_manage_enterprises.html.erb config/environment.rb config/initializers/plugins.rb config/routes.rb db/schema.rb debian/control lib/noosfero/plugin.rb test/unit/article_test.rb test/unit/category_test.rb test/unit/change_password_test.rb test/unit/cms_helper_test.rb test/unit/comment_test.rb test/unit/content_viewer_helper_test.rb test/unit/event_test.rb test/unit/folder_helper_test.rb test/unit/person_test.rb test/unit/price_detail_test.rb test/unit/profile_helper_test.rb test/unit/recent_documents_block_test.rb test/unit/scrap_test.rb test/unit/user_mailer_test.rb vendor/plugins/action_tracker_has_comments/init.rb vendor/plugins/delayed_job/lib/delayed/worker.rb vendor/plugins/noosfero_caching/init.rb
Rodrigo Souto
2 parents 46f13390 c9eccb09
Showing 566 changed files with 74620 additions and 59234 deletions Show diff stats
AUTHORS
COPYRIGHT
HACKING
HACKING.rails235
INSTALL.chat
README
app/controllers/admin/features_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/application_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/manage_products_controller.rb
app/controllers/my_profile/memberships_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/my_profile/spam_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/catalog_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/events_controller.rb
@@ -44,6 +44,7 @@ Antonio Terceiro &lt;terceiro@colivre.coop.br&gt;
 Aurelio A. Heckert <aurelio@colivre.coop.br>
 Braulio Bhavamitra <brauliobo@gmail.com>
 Bráulio Bhavamitra <brauliobo@gmail.com>
+Braulio Bhavamitra <braulio@eita.org.br>
 Caio <caio.csalgado@gmail.com>
 Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
 Caio Formiga <caio.formiga@gmail.com>
@@ -110,6 +111,7 @@ Diego Martinez &lt;diegoamc90@gmail.com&gt;
 Diego Martinez <diego@diego-K55A.(none)>
 Diego + Renan <renanteruoc@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)>
 Grazieno Pellegrino <grazieno@gmail.com>
 Isaac Canan <isaac@intelletto.com.br>
@@ -147,6 +149,8 @@ João M. M. Silva + Rafael Manzo &lt;jaodsilv@linux.ime.usp.br&gt;
 João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
 Joenio Costa <joenio@colivre.coop.br>
 Josef Spillner <josef.spillner@tu-dresden.de>
+Junior Silva <juniorsilva1001@gmail.com>
+Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
 Keilla Menezes <keilla@colivre.coop.br>
 Larissa Reis <larissa@colivre.coop.br>
 Larissa Reis <reiss.larissa@gmail.com>
@@ -158,6 +162,7 @@ Lucas Melo &lt;lucaspradomelo@gmail.com&gt;
 Luis David Aguilar Carlos <ludwig9003@gmail.com>
 Martín Olivera <molivera@solar.org.ar>
 Moises Machado <moises@colivre.coop.br>
+Naíla Alves <naila@colivre.coop.br>
 Nanda Lopes <nanda.listas+psl@gmail.com>
 Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
 Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
@@ -187,12 +192,15 @@ 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 <diguliu@gmail.com>
 Rodrigo Souto <rodrigo@colivre.coop.br>
 Ronny Kursawe <kursawe.ronny@googlemail.com>
 root <root@debian.sdr.serpro>
 Samuel R. C. Vale <srcvale@holoscopio.com>
 Valessio Brito <valessio@gmail.com>
 vfcosta <vfcosta@gmail.com>
+Victor Costa <vfcosta@gmail.com>
+Vinicius Cubas Brand <viniciuscb@gmail.com>
 Visita <visita@debian.(none)>
 Yann Lugrin <yann.lugrin@liquid-concept.ch>
@@ -4,8 +4,9 @@ Copyright (c) 2007-2009,
   Cáritas Brasileira <http://www.caritasbrasileira.org/>
 Copyright (c) 2007-2009,
   Ynternet.org Foundation <http://www.ynternet.org/>
-Copyright (c) 2008-2009,
+Copyright (c) 2008-2013,
   Colivre <http://www.colivre.coop.br/>
+Copyright (c) the Noosfero contributors. See AUTHORS
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -52,3 +52,12 @@ If you write such script for your own OS, *please* share it with us at the
 development mailing list so that we can include it in the official repository.
 This way other people using the same OS will have to put less effort to develop
 Noosfero.
+
+== Submitting your changes back
+
+For now please read:
+
+- Coding conventions
+  http://noosfero.org/Development/CodingConventions
+- Patch guidelines
+  http://noosfero.org/Development/PatchGuidelines
@@ -1,13 +0,0 @@
-This is a draft of how to create a environment to Rails 2.3.5 to Noosfero
-development.
-
-Install dependencies:
-
-gem install rails -v 2.3.5
-gem install i18n
-gem install will_paginate -v 2.3.12
-gem install cucumber
-
-Creating initial environment:
-
-rake db:schema:load
@@ -6,7 +6,7 @@ To configure XMPP/BOSH in Noosfero you need:
 * SystemTimer - http://ph7spot.com/musings/system-timer
 * Pidgin data files - http://www.pidgin.im/
-If you use Debian Wheezy:
+If you use Debian 6.0 (squeeze):
 # apt-get install librestclient-ruby pidgin-data ruby1.8-dev
 # gem install SystemTimer
-noosfero - a web-based social platform
+Noosfero - a web-based social platform
 ======================================
-:: About the project
+http://www.noosfero.org/
-Homepage: http://www.noosfero.org/
+Documentation
+-------------
-:: Authors and copyright
+The following documentation is available:
-Authors: see file AUTHORS
-Copyright information: see file COPYRIGHT
-Full license text; see file COPYING
+File                  Purpose
+~~~~~~~~~~~~~~~~~~~~  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+INSTALL               install instructions
+INSTALL.awstats       install instructions - access statistics service
+INSTALL.chat          install instructions - chat service
+INSTALL.email         install instructions - email service
+INSTALL.multitenancy  install instructions - multiple sites
+INSTALL.varnish       install instructions - varnish HTTP caching (recommended)
+HACKING               development instruction
+RELEASING             instructions for doing releases
+doc/noosfero/*        user documentation (available through the app itself)
+
+
+Authors and copyright
+---------------------
+
+Authorship and copyright information is available in the files listed below.
+
+File                  Purpose
+~~~~~~~~~~~~~~~~~~~~  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+AUTHORS               list of authors (updated at each release)
+COPYRIGHT             Copyright statement for the project
+COPYING               Full text of the project license
@@ -2,7 +2,7 @@ class FeaturesController &lt; AdminController
   protect 'edit_environment_features', :environment
   def index
-    @features = Environment.available_features
+    @features = Environment.available_features.sort_by{|k,v|v}
   end
   post_only :update
@@ -4,12 +4,52 @@ class UsersController &lt; AdminController
   protect 'manage_environment_users', :environment
+  include UsersHelper
+
   def index
+    @filter = params[:filter]
+    scope = environment.people.no_templates
+    if @filter == 'admin_users'
+      scope = scope.admins
+    elsif @filter == 'activated_users'
+      scope = scope.activated
+    elsif @filter == 'deactivated_users'
+      scope = scope.deactivated
+    end
+    @q = params[:q]
+    @collection = find_by_contents(:people, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
+  end
+
+  def set_admin_role
+    person = environment.people.find(params[:id])
+    environment.add_admin(person)
+    redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
+  end
+
+  def reset_admin_role
+    person = environment.people.find(params[:id])
+    environment.remove_admin(person)
+    redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
+  end
+
+  def activate
+    person = environment.people.find(params[:id])
+    person.user.activate
+    redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
+  end
+
+  def deactivate
+    person = environment.people.find(params[:id])
+    person.user.deactivate
+    redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
+  end
+
+  def download
     respond_to do |format|
       format.html
       format.xml do
-        @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
-        send_data @users.to_xml(
+        users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
+        send_data users.to_xml(
             :skip_types => true,
             :only => %w[email login created_at updated_at],
             :include => { :person => {:only => %w[name updated_at created_at address birth_date contact_phone identifier lat lng] } }),
@@ -45,4 +85,10 @@ class UsersController &lt; AdminController
     end
   end
+  private
+
+  def per_page
+    10
+  end
+
 end
@@ -5,7 +5,7 @@ class ApplicationController &lt; ActionController::Base
   before_filter :setup_multitenancy
   before_filter :detect_stuff_by_domain
-  before_filter :init_noosfero_plugins
+  before_filter :init_noosfero_plugins_controller_filters
   before_filter :allow_cross_domain_access
   def allow_cross_domain_access
@@ -24,8 +24,12 @@ class ApplicationController &lt; ActionController::Base
   include ApplicationHelper
   layout :get_layout
   def get_layout
-    prepend_view_path('public/' + theme_path)
-    theme_option(:layout) || 'application'
+    theme_layout = theme_option(:layout)
+    if theme_layout
+      theme_view_file('layouts/'+theme_layout) || theme_layout
+    else
+     'application'
+    end
   end
   def log_processing
@@ -128,22 +132,21 @@ class ApplicationController &lt; ActionController::Base
   include Noosfero::Plugin::HotSpot
-  def init_noosfero_plugins
-    plugins.each do |plugin|
-      prepend_view_path(plugin.class.view_path)
-    end
-    init_noosfero_plugins_controller_filters
-  end
-
   # This is a generic method that initialize any possible filter defined by a
   # plugin to the current controller being initialized.
   def init_noosfero_plugins_controller_filters
     plugins.each do |plugin|
       filters = plugin.send(self.class.name.underscore + '_filters')
       filters = [filters] if !filters.kind_of?(Array)
+      controller_filters = self.class.filter_chain.map {|c| c.method }
       filters.each do |plugin_filter|
-        self.class.send(plugin_filter[:type], plugin.class.name.underscore + '_' + plugin_filter[:method_name], (plugin_filter[:options] || {}))
-        self.class.send(:define_method, plugin.class.name.underscore + '_' + plugin_filter[:method_name], plugin_filter[:block])
+        filter_method = plugin.class.name.underscore.gsub('/','_') + '_' + plugin_filter[:method_name]
+        unless controller_filters.include?(filter_method)
+          self.class.send(plugin_filter[:type], filter_method, (plugin_filter[:options] || {}))
+          self.class.send(:define_method, filter_method) do
+            instance_eval(&plugin_filter[:block]) if environment.plugin_enabled?(plugin.class)
+          end
+        end
       end
     end
   end
@@ -173,17 +176,16 @@ class ApplicationController &lt; ActionController::Base
   end
   def find_by_contents(asset, scope, query, paginate_options={:page => 1}, options={})
-    scope = scope.send(options[:filter]) if options[:filter]
-
-    @plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options) ||
+    plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options) ||
     fallback_find_by_contents(asset, scope, query, paginate_options, options)
   end
   private
   def fallback_find_by_contents(asset, scope, query, paginate_options, options)
-    return {:results => scope.paginate(paginate_options)} if query.blank?
-    {:results => scope.like_search(query).paginate(paginate_options)}
+    scope = scope.like_search(query) unless query.blank?
+    scope = scope.send(options[:filter]) unless options[:filter].blank?
+    {:results => scope.paginate(paginate_options)}
   end
 end
@@ -73,6 +73,7 @@ class CmsController &lt; MyProfileController
     refuse_blocks
     record_coming
     if request.post?
+      @article.image = nil if params[:remove_image] == 'true'
       @article.last_changed_by = user
       if @article.update_attributes(params[:article])
         if !continue
@@ -144,10 +145,15 @@ class CmsController &lt; MyProfileController
   post_only :set_home_page
   def set_home_page
-    @article = profile.articles.find(params[:id])
-    profile.home_page = @article
-    profile.save(false)
-    session[:notice] = _('"%s" configured as home page.') % @article.name
+    article = params[:id].nil? ? nil : profile.articles.find(params[:id])
+    profile.update_attribute(:home_page, article)
+
+    if article.nil?
+      session[:notice] = _('Homepage reseted.')
+    else
+      session[:notice] = _('"%s" configured as homepage.') % article.name
+    end
+
     redirect_to (request.referer || profile.url)
   end
@@ -267,7 +273,10 @@ class CmsController &lt; MyProfileController
     @back_to = params[:back_to] || request.referer || url_for(profile.public_profile_url)
     @task = SuggestArticle.new(params[:task])
     if request.post?
-       @task.target = profile
+      @task.target = profile
+      @task.ip_address = request.remote_ip
+      @task.user_agent = request.user_agent
+      @task.referrer = request.referrer
       if verify_recaptcha(:model => @task, :message => _('Please type the words correctly')) && @task.save
         session[:notice] = _('Thanks for your suggestion. The community administrators were notified.')
         redirect_to @back_to
@@ -6,10 +6,10 @@ class ManageProductsController &lt; ApplicationController
   before_filter :login_required, :except => [:show]
   before_filter :create_product?, :only => [:new]
-  protected  
+  protected
   def check_environment_feature
-    if profile.environment.enabled?('disable_products_for_enterprises')
+    unless profile.environment.enabled?('products_for_enterprises')
       render_not_found
       return
     end
 class MembershipsController < MyProfileController
   protect 'manage_memberships', :profile
-  
+
   def index
-    @memberships = profile.memberships
+    @roles = environment.roles.select do |role|
+      ra = profile.role_assignments.find_by_role_id(role.id)
+      ra.present? && ra.resource_type == 'Profile'
+    end
+    @filter = params[:filter_type].blank? ? nil : params[:filter_type]
+    begin
+      @memberships = @filter.nil? ? profile.memberships : profile.memberships_by_role(environment.roles.find(@filter))
+    rescue ActiveRecord::RecordNotFound
+      @memberships = []
+    end
   end
   def new_community
     @community = Community.new(params[:community])
     @community.environment = environment
+    @back_to = params[:back_to] || url_for(:action => 'index')
     if request.post? && @community.valid?
       @community = Community.create_after_moderation(user, params[:community].merge({:environment => environment}))
-      redirect_to :action => 'index'
+      redirect_to @back_to
       return
     end
   end
@@ -38,7 +38,7 @@ class ProfileDesignController &lt; BoxOrganizerController
     end
     # product block exclusive for enterprises in environments that permits it
-    if profile.enterprise? && !profile.environment.enabled?('disable_products_for_enterprises')
+    if profile.enterprise? && profile.environment.enabled?('products_for_enterprises')
       blocks << ProductsBlock
     end
@@ -4,7 +4,7 @@ class ProfileEditorController &lt; MyProfileController
   protect 'destroy_profile', :profile, :only => [:destroy_profile]
   def index
-    @pending_tasks = Task.to(profile).pending.select{|i| user.has_permission?(i.permission, profile)}
+    @pending_tasks = Task.to(profile).pending.without_spam.select{|i| user.has_permission?(i.permission, profile)}
   end
   helper :profile
@@ -14,9 +14,15 @@ class SpamController &lt; MyProfileController
         if params[:remove_comment]
           profile.comments_received.find(params[:remove_comment]).destroy
         end
+        if params[:remove_task]
+          Task.to(profile).find_by_id(params[:remove_task]).destroy
+        end
         if params[:mark_comment_as_ham]
           profile.comments_received.find(params[:mark_comment_as_ham]).ham!
         end
+        if params[:mark_task_as_ham] && (t = Task.to(profile).find_by_id(params[:mark_task_as_ham]))
+          t.ham!
+        end
         if request.xhr?
           json_response(true)
         else
@@ -28,7 +34,8 @@ class SpamController &lt; MyProfileController
       return
     end
-    @spam = profile.comments_received.spam.paginate({:page => params[:page]})
+    @comment_spam = profile.comments_received.spam.paginate({:page => params[:comments_page]})
+    @task_spam = Task.to(profile).spam.paginate({:page => params[:tasks_page]})
   end
   protected
@@ -4,12 +4,12 @@ class TasksController &lt; MyProfileController
   def index
     @filter = params[:filter_type].blank? ? nil : params[:filter_type]
-    @tasks = Task.to(profile).pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
+    @tasks = Task.to(profile).without_spam.pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
     @failed = params ? params[:failed] : {}
   end
   def processed
-    @tasks = Task.to(profile).closed.sort_by(&:created_at)
+    @tasks = Task.to(profile).without_spam.closed.sort_by(&:created_at)
   end
   VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]
@@ -57,7 +57,7 @@ class TasksController &lt; MyProfileController
   end
   def list_requested
-    @tasks = Task.find_all_by_requestor_id(profile.id)
+    @tasks = Task.without_spam.find_all_by_requestor_id(profile.id)
   end
   def ticket_details
@@ -141,22 +141,34 @@ class AccountController &lt; ApplicationController
     end
   end
-  # The user requests a password change. She forgot her old password.
-  #
-  # Posts back.
+  include ForgotPasswordHelper
+  helper :forgot_password
+
   def forgot_password
     if @plugins.dispatch(:allow_password_recovery).include?(false)
       redirect_back_or_default(:controller => 'home')
       session[:notice] = _("This environment doesn't allow password recovery.")
     end
-    @change_password = ChangePassword.new(params[:change_password])
+
+    @change_password = ChangePassword.new
     if request.post?
       begin
-        @change_password.save!
+        requestors = fetch_requestors(params[:value])
+        raise ActiveRecord::RecordNotFound if requestors.blank? || params[:value].blank?
+
+        requestors.each do |requestor|
+          ChangePassword.create!(:requestor => requestor)
+        end
         render :action => 'password_recovery_sent'
-      rescue ActiveRecord::RecordInvalid => e
-        nil # just pass and render at the end of the action
+      rescue ActiveRecord::RecordNotFound
+        if params[:value].blank?
+          @change_password.errors.add_to_base(_('Can not recover user password with blank value.'))
+        else
+          @change_password.errors.add_to_base(_('Could not find any user with %s equal to "%s".') % [fields_label, params[:value]])
+        end
+      rescue ActiveRecord::RecordInvald
+        @change_password.errors.add_to_base(_('Could not perform password recovery for the user.'))
       end
     end
   end
@@ -262,7 +274,7 @@ class AccountController &lt; ApplicationController
   def user_data
     user_data =
       if logged_in?
-        current_user.data_hash
+        current_user.data_hash(gravatar_default)
       else
         { }
       end
@@ -12,7 +12,7 @@ class CatalogController &lt; PublicController
   protected
   def check_enterprise_and_environment
-    unless profile.kind_of?(Enterprise) && !profile.environment.enabled?('disable_products_for_enterprises')
+    unless profile.kind_of?(Enterprise) && @profile.environment.enabled?('products_for_enterprises')
       redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
     end
   end
@@ -53,8 +53,11 @@ class ContentViewerController &lt; ApplicationController
     # At this point the page will be showed
     @page.hit
-    unless @page.mime_type == 'text/html' || (@page.image? && params[:view])
+    @page = FilePresenter.for @page
+
+    if @page.download? params[:view]
       headers['Content-Type'] = @page.mime_type
+      headers.merge! @page.download_headers
       data = @page.data
       # TODO test the condition
@@ -70,7 +73,7 @@ class ContentViewerController &lt; ApplicationController
     #FIXME see a better way to do this. It's not need to pass this variable anymore
     @comment = Comment.new
-    
+
     if @page.has_posts?
       posts = if params[:year] and params[:month]
         filter_date = DateTime.parse("#{params[:year]}-#{params[:month]}-01")
@@ -79,15 +82,21 @@ class ContentViewerController &lt; ApplicationController
         @page.posts
       end
-      if @page.blog? && @page.display_posts_in_current_language?
-        posts = posts.native_translations.all(Article.display_filter(user, profile)).map{ |p| p.get_translation_to(FastGettext.locale) }.compact
-      end
+      #FIXME Need to run this before the pagination because this version of
+      #      will_paginate returns a will_paginate collection instead of a
+      #      relation.
+      blog_with_translation = @page.blog? && @page.display_posts_in_current_language?
+      posts = posts.native_translations if blog_with_translation
       @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile)))
+
+      if blog_with_translation
+        @posts.replace @posts.map{ |p| p.get_translation_to(FastGettext.locale) }.compact
+      end
     end
     if @page.folder? && @page.gallery?
-      @images = @page.images
+      @images = @page.images.select{ |a| a.display_to? user }
       @images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]
     end
@@ -100,9 +109,9 @@ class ContentViewerController &lt; ApplicationController
     end
     @comments = @page.comments.without_spam
+    @comments = @plugins.filter(:unavailable_comments, @comments)
     @comments_count = @comments.count
-    @comments = @plugins.filter(:unavailable_comments, @comments.without_reply)
-    @comments = @comments.paginate(:per_page => per_page, :page => params[:comment_page] )
+    @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
     if params[:slideshow]
       render :action => 'slideshow', :layout => 'slideshow'
 class EventsController < PublicController
   needs_profile
-  no_design_blocks
   def events
-    @selected_day = nil
-    @events_of_the_day = []
-    date = build_date(params[:year], params[:month], params[:day])
+    @events = []
+    @date = build_date(params[:year], params[:month], params[:day])
-    if params[:day] || !params[:year] && !params[:month]
-      @selected_day = date
-      @events_of_the_day = profile.events.by_day(@selected_day)
+    if !params[:year] && !params[:month] && !params[:day]
+      @events = profile.events.next_events_from_month(@date)
     end
-    events = profile.events.by_range((date - 1.month).at_beginning_of_month..(date + 1.month).at_end_of_month)
+    if params[:year] || params[:month]
+      @events = profile.events.by_month(@date)
+    end
+
+    events_in_range = profile.events.by_range((@date - 1.month).at_beginning_of_month .. (@date + 1.month).at_end_of_month)
-    @calendar = populate_calendar(date, events)
-    @previous_calendar = populate_calendar(date - 1.month, events)
-    @next_calendar = populate_calendar(date + 1.month, events)
+    @calendar = populate_calendar(@date, events_in_range)
   end
   def events_by_day
-    @selected_day = build_date(params[:year], params[:month], params[:day])
-    @events_of_the_day = profile.events.by_day(@selected_day)
-    render :partial => 'events_by_day'
+    @date = build_date(params[:year], params[:month], params[:day])
+    @events = profile.events.by_day(@date)
+    render :partial => 'events'
   end
   protected
@@ -206,10 +206,50 @@ class ProfileController &lt; PublicController
   end
   def view_more_network_activities
-    @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page]) 
+    @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page])
     render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}
   end
+  def more_comments
+    activity = ActionTracker::Record.find(:first, :conditions => {:id => params[:activity], :user_id => @profile})
+    comments_count = activity.comments.count
+    comment_page = (params[:comment_page] || 1).to_i
+    comments_per_page = 5
+    no_more_pages = comments_count <= comment_page * comments_per_page
+
+    render :update do |page|
+      page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity],
+        :partial => 'comment', :collection => activity.comments.paginate(:per_page => comments_per_page, :page => comment_page)
+
+      if no_more_pages
+        page.remove 'profile-wall-activities-comments-more-'+params[:activity]
+      else
+        page.replace_html 'profile-wall-activities-comments-more-'+params[:activity],
+          :partial => 'more_comments', :locals => {:activity => activity, :comment_page => comment_page}
+      end
+    end
+  end
+
+  def more_replies
+    activity = Scrap.find(:first, :conditions => {:id => params[:activity], :receiver_id => @profile, :scrap_id => nil})
+    comments_count = activity.replies.count
+    comment_page = (params[:comment_page] || 1).to_i
+    comments_per_page = 5
+    no_more_pages = comments_count <= comment_page * comments_per_page
+
+    render :update do |page|
+      page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity],
+        :partial => 'profile_scrap', :collection => activity.replies.paginate(:per_page => comments_per_page, :page => comment_page), :as => :scrap
+
+      if no_more_pages
+        page.remove 'profile-wall-activities-comments-more-'+params[:activity]
+      else
+        page.replace_html 'profile-wall-activities-comments-more-'+params[:activity],
+          :partial => 'more_replies', :locals => {:activity => activity, :comment_page => comment_page}
+      end
+    end
+  end
+
   def remove_scrap
     begin
       scrap = current_user.person.scraps(params[:scrap_id])
@@ -343,6 +383,7 @@ class ProfileController &lt; PublicController
     end
   end
+
   protected
   def check_access_to_profile
@@ -393,4 +434,5 @@ class ProfileController &lt; PublicController
   def relations_to_include
     [:image, :domains, :preferred_domain, :environment]
   end
+
 end
@@ -93,25 +93,27 @@ class SearchController &lt; PublicController
     year = (params[:year] ? params[:year].to_i : Date.today.year)
     month = (params[:month] ? params[:month].to_i : Date.today.month)
     day = (params[:day] ? params[:day].to_i : Date.today.day)
-    date = build_date(params[:year], params[:month], params[:day])
-    date_range = (date - 1.month).at_beginning_of_month..(date + 1.month).at_end_of_month
+    @date = build_date(year, month, day)
+    date_range = (@date - 1.month).at_beginning_of_month..(@date + 1.month).at_end_of_month
-    @selected_day = nil
-    @events_of_the_day = []
+    @events = []
     if params[:day] || !params[:year] && !params[:month]
-      @selected_day = date
-      @events_of_the_day = @category ?
-        environment.events.by_day(@selected_day).in_category(Category.find(@category_id)) :
-        environment.events.by_day(@selected_day)
+      @events = @category ?
+        environment.events.by_day(@date).in_category(Category.find(@category_id)) :
+        environment.events.by_day(@date)
+    end
+
+    if params[:year] || params[:month]
+      @events = @category ?
+        environment.events.by_month(@date).in_category(Category.find(@category_id)) :
+        environment.events.by_month(@date)
     end
     @scope = date_range && params[:action] == 'events' ? environment.events.by_range(date_range) : environment.events
     full_text_search
     events = @searches[@asset][:results]
-    @calendar = populate_calendar(date, events)
-    @previous_calendar = populate_calendar(date - 1.month, events)
-    @next_calendar = populate_calendar(date + 1.month, events)
+    @calendar = populate_calendar(@date, events)
   end
   # keep old URLs workings
@@ -136,9 +138,9 @@ class SearchController &lt; PublicController
   end
   def events_by_day
-    @selected_day = build_date(params[:year], params[:month], params[:day])
-    @events_of_the_day = environment.events.by_day(@selected_day)
-    render :partial => 'events/events_by_day'
+    @date = build_date(params[:year], params[:month], params[:day])
+    @events = environment.events.by_day(@date)
+    render :partial => 'events/events'
   end
   #######################################################
@@ -40,6 +40,8 @@ module ApplicationHelper
   include LayoutHelper
+  include Noosfero::Gravatar
+
   VIEW_EXTENSIONS = ['.rhtml', '.html.erb']
   def locale
@@ -367,7 +369,7 @@ module ApplicationHelper
   def current_theme
     @current_theme ||=
       begin
-        if (session[:theme])
+        if session[:theme]
           session[:theme]
         else
           # utility for developers: set the theme to 'random' in development mode and
@@ -376,7 +378,7 @@ module ApplicationHelper
           if Rails.env.development? && environment.theme == 'random'
             @random_theme ||= Dir.glob('public/designs/themes/*').map { |f| File.basename(f) }.rand
             @random_theme
-          elsif Rails.env.development? && params[:theme] && File.exists?(Rails.root.join('public/designs/themes', params[:theme]))
+          elsif Rails.env.development? && respond_to?(:params) && params[:theme] && File.exists?(Rails.root.join('public/designs/themes', params[:theme]))
             params[:theme]
           else
             if profile && !profile.theme.nil?
@@ -398,18 +400,25 @@ module ApplicationHelper
       end
   end
-  def theme_include(template)
-    # XXX Since we cannot control what people are doing in external themes, we
+  def theme_view_file(template)
+    # Since we cannot control what people are doing in external themes, we
     # will keep looking for the deprecated .rhtml extension here.
     VIEW_EXTENSIONS.each do |ext|
       file = Rails.root.join('public', theme_path[1..-1], template + ext)
-      if File.exists?(file)
-        return render :file => file, :use_full_path => false
-      end
+      return file if File.exists?(file)
     end
     nil
   end
+  def theme_include(template)
+    file = theme_view_file(template)
+    if file
+      render :file => file, :use_full_path => false
+    else
+      nil
+    end
+  end
+
   def theme_favicon
     return '/designs/themes/' + current_theme + '/favicon.ico' if profile.nil? || profile.theme.nil?
     if File.exists?(Rails.root.join('public', theme_path, 'favicon.ico'))
@@ -561,6 +570,9 @@ module ApplicationHelper
   # displays a link to the profile homepage with its image (as generated by
   # #profile_image) and its name below it.
   def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )
+    if content = @plugins.dispatch_first(:profile_image_link, profile, size, tag, extra_info)
+      return instance_eval(&content)
+    end
     name = profile.short_name
     if profile.person?
       url = url_for(profile.check_friendship_url)
@@ -577,45 +589,20 @@ module ApplicationHelper
     extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
     links = links_for_balloon(profile)
     content_tag('div', content_tag(tag,
-        (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{links.to_json}); return false", :class => "menu-submenu-trigger #{trigger_class}", :url => url) : "") +
-        link_to(
-            content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
-            content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
-            extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
-            profile.url,
-            :class => 'profile_link url',
-            :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
-            :title => profile.name ),
-        :class => 'vcard'), :class => 'common-profile-list-block')
-  end
-
-  def gravatar_url_for(email, options = {})
-    # Ta dando erro de roteamento
-    default = theme_option['gravatar'] || NOOSFERO_CONF['gravatar'] || nil
-    url_for( { :gravatar_id => Digest::MD5.hexdigest(email.to_s),
-               :host => 'www.gravatar.com',
-               :protocol => 'http://',
-               :only_path => false,
-               :controller => 'avatar.php',
-               :d => default
-             }.merge(options) )
-  end
-
-  def str_gravatar_url_for(email, options = {})
-    default = theme_option['gravatar'] || NOOSFERO_CONF['gravatar'] || nil
-    url = 'http://www.gravatar.com/avatar.php?gravatar_id=' +
-           Digest::MD5.hexdigest(email.to_s)
-    {
-      :only_path => false,
-      :d => default
-    }.merge(options).each { |k,v|
-      url += ( '&%s=%s' % [ k,v ] )
-    }
-    url
-  end
-
-  def gravatar_profile_url(email)
-    'http://www.gravatar.com/'+ Digest::MD5.hexdigest(email.to_s)
+                                   (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{links.to_json}); return false", :class => "menu-submenu-trigger #{trigger_class}", :url => url) : "") +
+    link_to(
+      content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
+      content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
+      extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
+      profile.url,
+      :class => 'profile_link url',
+      :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
+      :title => profile.name ),
+      :class => 'vcard'), :class => 'common-profile-list-block')
+  end
+
+  def gravatar_default
+    (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) || NOOSFERO_CONF['gravatar']
   end
   attr_reader :environment
@@ -730,8 +717,15 @@ module ApplicationHelper
   end
   def rolename_for(profile, resource)
-    role = profile.role_assignments.find_by_resource_id(resource.id).role
-    content_tag('span', role.name, :style => "color: #{role_color(role, resource.environment.id)}")
+    roles = profile.role_assignments.
+      where(:resource_id => resource.id).
+      sort_by{ |role_assignment| role_assignment.role_id }.
+      map(&:role)
+    names = []
+    roles.each do |role|
+      names << content_tag('span', role.name, :style => "color: #{role_color(role, resource.environment.id)}")
+    end
+    names.join(', ')
   end
   def role_color(role, env_id)
@@ -945,7 +939,7 @@ module ApplicationHelper
     (@category ? " - #{@category.full_name}" : '')
   end
-  # DEPRECATED. Do not use this·
+  # DEPRECATED. Do not use this.
   def import_controller_stylesheets(options = {})
     stylesheet_import( "controller_"+ controller.controller_name(), options )
   end
@@ -1128,15 +1122,34 @@ module ApplicationHelper
     result
   end
-  def manage_enterprises
-    if user && !user.enterprises.empty?
-      enterprises_link = user.enterprises.map do |enterprise|
-        link_to(content_tag('strong', [_('<span>Manage</span> %s') % enterprise.short_name(25)]), @environment.top_url + "/myprofile/#{enterprise.identifier}", :class => "icon-menu-"+enterprise.class.identification.underscore, :title => [_('Manage %s') % enterprise.short_name])
+  def manage_link(list, kind)
+    if list.present?
+      link_to_all = nil
+      if list.count > 5
+        list = list.first(5)
+        link_to_all = link_to(content_tag('strong', _('See all')), :controller => 'memberships', :profile => current_user.login)
+      end
+      link = list.map do |element|
+        link_to(content_tag('strong', [_('<span>Manage</span> %s') % element.short_name(25)]), @environment.top_url + "/myprofile/#{element.identifier}", :class => "icon-menu-"+element.class.identification.underscore, :title => [_('Manage %s') % element.short_name])
+      end
+      if link_to_all
+        link << link_to_all
       end
-      render :partial => 'shared/manage_enterprises', :locals => {:enterprises_link => enterprises_link}
+      render :partial => "shared/manage_link", :locals => {:link => link, :kind => kind.to_s}
     end
   end
+  def manage_enterprises
+    return unless user && user.environment.enabled?(:display_my_enterprises_on_user_menu)
+    manage_link(user.enterprises, :enterprises)
+  end
+
+  def manage_communities
+    return unless user && user.environment.enabled?(:display_my_communities_on_user_menu)
+    administered_communities = user.communities.more_popular.select {|c| c.admins.include? user}
+    manage_link(administered_communities, :communities)
+  end
+
   def usermenu_logged_in
     pending_tasks_count = ''
     count = user ? Task.to(user).pending.count : -1
@@ -1144,11 +1157,12 @@ module ApplicationHelper
       pending_tasks_count = link_to(count.to_s, @environment.top_url + '/myprofile/{login}/tasks', :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
     end
-    (_("<span class='welcome'>Welcome,</span> %s") % link_to('<i></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
+    (_("<span class='welcome'>Welcome,</span> %s") % link_to('<i style="background-image:url({avatar})"></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
     render_environment_features(:usermenu) +
-    link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
+    link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
     manage_enterprises.to_s +
-    link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +
+    manage_communities.to_s +
+    link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :class => 'ctrl-panel', :title => _("Configure your personal account and content")) +
     pending_tasks_count +
     link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
   end
@@ -1325,8 +1339,8 @@ module ApplicationHelper
     @plugins.dispatch("content_remove_#{action.to_s}", @page).include?(true)
   end
-  def template_options(klass, field_name)
-    templates = klass.templates(environment)
+  def template_options(kind, field_name)
+    templates = environment.send(kind).templates
     return '' if templates.count == 0
     return hidden_field_tag("#{field_name}[template_id]", templates.first.id) if templates.count == 1
@@ -1440,8 +1454,8 @@ module ApplicationHelper
   end
   def filter_html(html, source)
-    if @plugins
-      html = convert_macro(html, source)
+    if @plugins && source && source.has_macro?
+      html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
       #TODO This parse should be done through the macro infra, but since there
       #     are old things that do not support it we are keeping this hot spot.
       html = @plugins.pipeline(:parse_content, html, source).first
@@ -42,7 +42,7 @@ module BlogHelper
   def display_post(article, format = 'full')
     no_comments = (format == 'full') ? false : true
-    html = send("display_#{format}_format", article)
+    html = send("display_#{format}_format", FilePresenter.for(article)).html_safe
     article_title(article, :no_comments => no_comments) + html
   end
@@ -99,17 +99,19 @@ module BoxesHelper
     unless block.visible?
       options[:title] = _("This block is invisible. Your visitors will not see it.")
     end
-    if controller.send(:content_editor?)
-      result = filter_html(result, block)
-    end
-    box_decorator.block_target(block.box, block) +
-      content_tag('div',
-       content_tag('div',
+
+    result = filter_html(result, block)
+
+    content_tag('div',
+      box_decorator.block_target(block.box, block) +
+        content_tag('div',
          content_tag('div',
-           result + footer_content + box_decorator.block_edit_buttons(block),
-           :class => 'block-inner-2'),
-         :class => 'block-inner-1'),
-       options) +
+           content_tag('div',
+             result + footer_content + box_decorator.block_edit_buttons(block),
+             :class => 'block-inner-2'),
+           :class => 'block-inner-1'),
+       options),
+    :class => 'block-outer') +
     box_decorator.block_handle(block)
   end
@@ -225,15 +227,11 @@ module BoxesHelper
   # DEPRECATED. Do not use this.
   def import_blocks_stylesheets(options = {})
-    @blocks_css_files ||= current_blocks.map{|b|'blocks/' + block_css_class_name(b)}.uniq
+    @blocks_css_files ||= current_blocks.map{|b|'blocks/' + block.class.name.to_css_class}.uniq
     stylesheet_import(@blocks_css_files, options)
   end
-
-  def block_css_class_name(block)
-    block.class.name.underscore.gsub('_', '-')
-  end
   def block_css_classes(block)
-    classes = block_css_class_name(block)
+    classes = block.class.name.to_css_class
     classes += ' invisible-block' if block.display == 'never'
     classes
   end
@@ -3,10 +3,21 @@ module CategoriesHelper
   COLORS = [
     [ N_('Do not display at the menu'), nil ],
-    [ N_('Orange'), 1 ],
-    [ N_('Green'), 2 ],
-    [ N_('Purple'), 3 ],
-    [ N_('Red'), 4 ],
+    [ N_('Orange'), 1],
+    [ N_('Green'), 2],
+    [ N_('Purple'), 3],
+    [ N_('Red'), 4],
+    [ N_('Dark Green'), 5],
+    [ N_('Blue Oil'), 6],
+    [ N_('Blue'), 7],
+    [ N_('Brown'), 8],
+    [ N_('Light Green'), 9],
+    [ N_('Light Blue'), 10],
+    [ N_('Dark Blue'), 11],
+    [ N_('Blue Pool'), 12],
+    [ N_('Beige'), 13],
+    [ N_('Yellow'), 14],
+    [ N_('Light Brown'), 15]
   ]
   TYPES = [
@@ -28,12 +28,12 @@ module CmsHelper
   end
   def link_to_article(article)
-    article_name = short_filename(article.title, 30)
+    article_name = article.title
     if article.folder?
       link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)
     else
       if article.image?
-         image_tag(icon_for_article(article)) + link_to(article_name, article.url)
+        image_tag(icon_for_article(article)) + link_to(article_name, article.url)
       else
         link_to article_name, article.url, :class => icon_for_article(article)
       end
@@ -17,7 +17,7 @@ module ContentViewerHelper
     title = article.display_title if article.kind_of?(UploadedFile) && article.image?
     title = article.title if title.blank?
     title = content_tag('h1', h(title), :class => 'title')
-    if article.belongs_to_blog?
+    if article.belongs_to_blog? || article.belongs_to_forum?
       unless args[:no_link]
         title = content_tag('h1', link_to(article.name, article.url), :class => 'title')
       end
@@ -35,6 +35,18 @@ module DatesHelper
     end
   end
+  def show_date_month(date, use_numbers = false, year=true)
+    if date && use_numbers
+      date_format = year ? _('%{month}/%{year}') : _('%{month}/%{day}')
+      date_format % { :month => date.month, :year => date.year }
+    elsif date
+      date_format = year ? _('%{month_name}, %{year}') : _('%{month_name}')
+      date_format % { :month_name => month_name(date.month), :year => date.year }
+    else
+      ''
+    end
+  end
+
   # formats a datetime for displaying. 
   def show_time(time)
     if time
@@ -98,7 +110,11 @@ module DatesHelper
     elsif opts[:previous]
       date = date << 1
     end
-    _('%{month} %{year}') % { :year => date.year, :month => month_name(date.month.to_i) }
+    if opts[:only_month]
+      _('%{month}') % {:month => month_name(date.month.to_i) }
+    else
+      _('%{month} %{year}') % { :year => date.year, :month => month_name(date.month.to_i) }
+    end
   end
   def build_date(year, month, day = 1)
@@ -123,7 +139,7 @@ module DatesHelper
     previous_month_date = date - 1.month
     label ||= show_month(previous_month_date.year, previous_month_date.month)
-    link_to label, :year => previous_month_date.year, :month => previous_month_date.month
+    button(:back, label,  {:year => previous_month_date.year, :month => previous_month_date.month})
   end
   def link_to_next_month(year, month, label = nil)
@@ -131,7 +147,7 @@ module DatesHelper
     next_month_date = date + 1.month
     label ||= show_month(next_month_date.year, next_month_date.month)
-    link_to label, :year => next_month_date.year, :month => next_month_date.month
+    button(:next, label, {:year => next_month_date.year, :month => next_month_date.month})
   end
   def pick_date(object, method, options = {}, html_options = {})
 module EventsHelper
   def list_events(date, events)
-    return content_tag('em', _("Select a day on the left to display it's events here"), :class => 'select-a-day') unless date
-    title = _('Events for %s') % show_date(date)
+    title = _('Events for %s') % show_date_month(date)
     content_tag('h2', title) +
     content_tag('div',
       (events.any? ?
         content_tag('table', events.select { |item| item.display_to?(user) }.map {|item| display_event_in_listing(item)}.join('')) :
-        content_tag('em', _('No events for this date'), :class => 'no-events')
+        content_tag('em', _('No events for this month'), :class => 'no-events')
       ), :id => 'agenda-items'
     )
   end
   def display_event_in_listing(article)
-    content_tag(
-      'tr',
-      content_tag('td', link_to(article.name, article.url, :class => icon_for_article(article))),
-      :class => 'agenda-item'
+
+    content_tag( 'tr',
+      content_tag('td',
+        content_tag('div', show_date(article.start_date) + ( article.end_date.nil? ?  '' : (_(" to ") + show_date(article.end_date))),:class => 'event-date' ) +
+        content_tag('div',link_to(article.name,article.url),:class => 'event-title') +
+        content_tag('div',(article.address.nil? or article.address == '')  ? '' : (_('Place: ') + article.address),:class => 'event-place')
+      )
     )
   end
@@ -23,6 +23,7 @@ module FolderHelper
   end
   def display_article_in_listing(article, recursive = false, level = 0)
+    article = FilePresenter.for article
     article_link = if article.image?
          link_to('&nbsp;' * (level * 4) + image_tag(icon_for_article(article)) + short_filename(article.name), article.url.merge(:view => true))
        else
@@ -42,12 +43,15 @@ module FolderHelper
   end
   def icon_for_article(article)
-    icon = article.class.icon_name(article)
+    article = FilePresenter.for article
+    icon = article.respond_to?(:icon_name) ?
+             article.icon_name :
+             article.class.icon_name(article)
     if (icon =~ /\//)
       icon
     else
-      klasses = 'icon icon-' + icon
-      if article.kind_of?(UploadedFile)
+      klasses = 'icon ' + [icon].flatten.map{|name| 'icon-'+name}.join(' ')
+      if article.kind_of?(UploadedFile) || article.kind_of?(FilePresenter)
         klasses += ' icon-upload-file'
       end
       klasses
@@ -0,0 +1,43 @@
+module ForgotPasswordHelper
+  def plugins_options
+    @plugins.dispatch(:change_password_fields)
+  end
+
+  def user_fields
+    %w[login email] + plugins_options.select {|options| options[:model].to_sym == :user }.map { |options| options[:field].to_s }
+  end
+
+  def person_fields
+    %w[] + plugins_options.select {|options| options[:model].to_sym == :person }.map { |options| options[:field].to_s }
+  end
+
+  def fields
+    user_fields + person_fields
+  end
+
+  def fields_label
+    labels = [
+      _('Username'),
+      _('Email'),
+    ] + plugins_options.map { |options| options[:name] }
+
+    last = labels.pop
+    label = labels.join(', ')
+    "#{label} #{_('or')} #{last}"
+  end
+
+  def build_query(fields, value)
+    fields.map {|field| "#{field} = '#{value}'"}.join(' OR ')
+  end
+
+  def fetch_requestors(value)
+    requestors = []
+    person_query = build_query(person_fields, value)
+    user_query = build_query(user_fields, value)
+
+    requestors += Person.where(person_query).where(:environment_id => environment.id) if person_fields.present?
+    requestors += User.where(user_query).where(:environment_id => environment.id).map(&:person) if user_fields.present?
+    requestors
+  end
+
+end
@@ -136,7 +136,7 @@ module ProfileEditorHelper
     concat(
       content_tag(
         'div',
-        capture(&block) + content_tag('br', '', :style => 'clear: left'),
+        capture(&block) + tag('br', :style => 'clear: left'),
         :class => 'control-panel')
     )
   end
 module ProfileHelper
   def display_field(title, profile, field, force = false)
-    if (!force && !profile.active_fields.include?(field.to_s)) ||
-       (profile.active_fields.include?(field.to_s) && !profile.public_fields.include?(field.to_s) && (!user || (user != profile && !user.is_a_friend?(profile))))
+    unless force || profile.may_display_field_to?(field, user)
       return ''
     end
     value = profile.send(field)
@@ -44,4 +44,30 @@ module SweeperHelper
   def expire_profile_index(profile)
     expire_timeout_fragment(profile.relationships_cache_key)
   end
+
+  def expire_blocks_cache(context, causes)
+    if context.kind_of?(Profile)
+      profile = context
+      environment = profile.environment
+    else
+      environment = context
+      profile = nil
+    end
+
+    blocks_to_expire = []
+    if profile
+      profile.blocks.each {|block|
+        conditions = block.class.expire_on
+        blocks_to_expire << block unless (conditions[:profile] & causes).empty?
+      }
+    end
+    environment.blocks.each {|block|
+      conditions = block.class.expire_on
+      blocks_to_expire << block unless (conditions[:environment] & causes).empty?
+    }
+
+    blocks_to_expire.uniq!
+    BlockSweeper.expire_blocks(blocks_to_expire)
+  end
+
 end
@@ -0,0 +1,25 @@
+module UsersHelper
+
+  FILTER_TRANSLATION = {
+      'all_users' => _('All users'),
+      'admin_users' => _('Admin users'),
+      'activated_users' => _('Activated users'),
+      'deactivated_users' => _('Deativated users'),
+  }
+
+  def filter_selector(filter, float = 'right')
+    options = options_for_select(FILTER_TRANSLATION.map {|key, name| [name, key]}, :selected => filter)
+    url_params = url_for(params.merge(:filter => 'FILTER'))
+    onchange = "document.location.href = '#{url_params}'.replace('FILTER', this.value)"
+    select_field = select_tag(:filter, options, :onchange => onchange)
+    content_tag('div',
+      content_tag('strong', _('Filter')) + ': ' + select_field,
+      :class => "environment-users-customize-search"
+    )
+  end
+
+  def filter_title(filter)
+    FILTER_TRANSLATION[filter]
+  end
+
+end
@@ -3,7 +3,7 @@ class ActionTrackerNotification &lt; ActiveRecord::Base
   belongs_to :profile
   belongs_to :action_tracker, :class_name => 'ActionTracker::Record', :foreign_key => 'action_tracker_id'
-  has_many :comments, :through => :action_tracker, :class_name => 'Comment', :foreign_key => 'source_id'
+  delegate :comments, :to => :action_tracker, :allow_nil => true
   validates_presence_of :profile_id, :action_tracker_id
   validates_uniqueness_of :action_tracker_id, :scope => :profile_id
@@ -6,7 +6,7 @@ class ApproveComment &lt; Task
   validates_presence_of :comment_attributes
   def comment
-    @comment ||= Comment.new(JSON.parse(self.comment_attributes)) unless self.comment_attributes.nil?
+    @comment ||= Comment.new(ActiveSupport::JSON.decode(self.comment_attributes)) unless self.comment_attributes.nil?
   end
   def requestor_name
@@ -42,9 +42,9 @@ class ApproveComment &lt; Task
   def information
     if article
       if requestor
-        {:message => _('%{requestor} commented on the the article: %{linked_subject}.')}
+        {:message => _('%{requestor} commented on the article: %{linked_subject}.')}
       else
-        { :message => _('%{requestor} commented on the the article: %{linked_subject}.'),
+        { :message => _('%{requestor} commented on the article: %{linked_subject}.'),
           :variables => {:requestor => requestor_name} }
       end
     else
@@ -4,6 +4,8 @@ class Article &lt; ActiveRecord::Base
   attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent
+  acts_as_having_image
+
   SEARCHABLE_FIELDS = {
     :name => 10,
     :abstract => 3,
@@ -59,7 +61,7 @@ class Article &lt; ActiveRecord::Base
   has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]
   has_many :categories, :through => :article_categorizations
-  has_many :article_categorizations_including_virtual, :class_name => 'ArticleCategorization', :dependent => :destroy
+  has_many :article_categorizations_including_virtual, :class_name => 'ArticleCategorization'
   has_many :categories_including_virtual, :through => :article_categorizations_including_virtual, :source => :category
   acts_as_having_settings :field => :setting
@@ -156,8 +158,12 @@ class Article &lt; ActiveRecord::Base
     end
   end
+  def css_class_list
+    [self.class.name.to_css_class]
+  end
+
   def css_class_name
-    self.class.name.underscore.dasherize
+    [css_class_list].flatten.compact.join(' ')
   end
   def pending_categorizations
@@ -190,7 +196,7 @@ class Article &lt; ActiveRecord::Base
     pending_categorizations.clear
   end
-  acts_as_taggable  
+  acts_as_taggable
   N_('Tag list')
   acts_as_filesystem
@@ -268,7 +274,7 @@ class Article &lt; ActiveRecord::Base
   end
   # returns the data of the article. Must be overriden in each subclass to
-  # provide the correct content for the article. 
+  # provide the correct content for the article.
   def data
     body
   end
@@ -282,6 +288,11 @@ class Article &lt; ActiveRecord::Base
     'text-html'
   end
+  # TODO Migrate the class method icon_name to instance methods.
+  def icon_name
+    self.class.icon_name(self)
+  end
+
   def mime_type
     'text/html'
   end
@@ -310,6 +321,10 @@ class Article &lt; ActiveRecord::Base
   def belongs_to_blog?
     self.parent and self.parent.blog?
   end
+  
+  def belongs_to_forum?
+    self.parent and self.parent.forum?
+  end
   def info_from_last_update
     last_comment = comments.last
@@ -325,7 +340,7 @@ class Article &lt; ActiveRecord::Base
   end
   def view_url
-    @view_url ||= image? ? url.merge(:view => true) : url
+    @view_url ||= is_a?(UploadedFile) ? url.merge(:view => true) : url
   end
   def comment_url_structure(comment, action = :edit)
@@ -340,24 +355,18 @@ class Article &lt; ActiveRecord::Base
     true
   end
-  def folder?
-    false
-  end
-
-  def blog?
-    false
-  end
-
-  def forum?
+  def has_posts?
     false
   end
-  def uploaded_file?
-    false
+  def download? view = nil
+    (self.uploaded_file? and not self.image?) or
+      (self.image? and view.blank?) or
+      (not self.uploaded_file? and self.mime_type != 'text/html')
   end
-  def has_posts?
-    false
+  def download_headers
+    {}
   end
   scope :native_translations, :conditions => { :translation_of_id => nil }
@@ -444,6 +453,7 @@ class Article &lt; ActiveRecord::Base
   scope :galleries, :conditions => { :type => 'Gallery' }
   scope :images, :conditions => { :is_image => true }
   scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
+  scope :with_types, lambda { |types| { :conditions => [ 'articles.type IN (?)', types ] } }
   scope :more_popular, :order => 'hits DESC'
   scope :more_comments, :order => "comments_count DESC"
@@ -586,6 +596,22 @@ class Article &lt; ActiveRecord::Base
     false
   end
+  def folder?
+    false
+  end
+
+  def blog?
+    false
+  end
+
+  def forum?
+    false
+  end
+
+  def uploaded_file?
+    false
+  end
+
   def author
     if versions.empty?
       last_changed_by
@@ -725,6 +751,10 @@ class Article &lt; ActiveRecord::Base
   delegate :region, :region_id, :environment, :environment_id, :to => :profile, :allow_nil => true
+  def has_macro?
+    true
+  end
+
   private
   def sanitize_tag_list
@@ -12,7 +12,7 @@ class ArticleBlock &lt; Block
     block = self
     proc do
       block_title(block.title) +
-      (block.article ? article_to_html(block.article,
+      (block.article ? article_to_html(FilePresenter.for(block.article),
           :gallery_view => false,
           :inside_block => block,               # For Blogs and folders
           :format => block.visualization_format # For Articles and contents
@@ -23,7 +23,7 @@ class ArticleBlock &lt; Block
   def article_id
     self.settings[:article_id]
   end
-  
+
   def article_id= value
     self.settings[:article_id] = value.blank? ? nil : value.to_i
   end
@@ -49,8 +49,8 @@ class ArticleBlock &lt; Block
   end
   def available_articles
-    return [] if self.box.nil? or self.box.owner.nil?
-    self.box.owner.kind_of?(Environment) ? self.box.owner.portal_community.articles : self.box.owner.articles
+    return [] if self.owner.nil?
+    self.owner.kind_of?(Environment) ? self.owner.portal_community.articles : self.owner.articles
   end
   def posts_per_page
@@ -63,4 +63,9 @@ class ArticleBlock &lt; Block
   end
   settings_items :visualization_format, :type => :string, :default => 'short'
+
+  def self.expire_on
+      { :profile => [:article], :environment => [:article] }
+  end
+
 end
@@ -140,4 +140,19 @@ class Block &lt; ActiveRecord::Base
     4.hours
   end
+  def has_macro?
+    false
+  end
+
+  # Override in your subclasses.
+  # Define which events and context should cause the block cache to expire
+  # Possible events are: :article, :profile, :friendship, :category
+  # Possible contexts are: :profile, :environment
+  def self.expire_on
+    {
+      :profile => [],
+      :environment => []
+    }
+  end
+
 end
@@ -45,4 +45,7 @@ class BlogArchivesBlock &lt; Block
     content_tag('div', link_to(_('Subscribe RSS Feed'), owner_blog.feed.url), :class => 'subscribe-feed')
   end
+  def self.expire_on
+      { :profile => [:article], :environment => [:article] }
+  end
 end
@@ -3,12 +3,15 @@ class Box &lt; ActiveRecord::Base
   acts_as_list :scope => 'owner_id = #{owner_id} and owner_type = \'#{owner_type}\''
   has_many :blocks, :dependent => :destroy, :order => 'position'
+  include Noosfero::Plugin::HotSpot
+
   def environment
     owner ? (owner.kind_of?(Environment) ? owner : owner.environment) : nil
   end
   def acceptable_blocks
-    to_css_class_name central?  ? Box.acceptable_center_blocks : Box.acceptable_side_blocks
+    blocks_classes = central?  ? Box.acceptable_center_blocks + plugins.dispatch(:extra_blocks, :position => 1) : Box.acceptable_side_blocks + plugins.dispatch(:extra_blocks, :position => [2, 3])
+    to_css_class_name(blocks_classes)
   end
   def central?
@@ -74,8 +77,8 @@ class Box &lt; ActiveRecord::Base
   private
-  def to_css_class_name(blocks)
-    blocks.map{ |block| block.to_s.underscore.tr('_', '-') }
+  def to_css_class_name(blocks_classes)
+    blocks_classes.map{ |block_class| block_class.name.to_css_class }
   end
 end
@@ -35,4 +35,7 @@ class CategoriesBlock &lt; Block
     end
   end
+  def self.expire_on
+      { :profile => [], :environment => [:category] }
+  end
 end
@@ -9,13 +9,13 @@ class Category &lt; ActiveRecord::Base
     :slug => 1,
   }
-  validates_exclusion_of :slug, :in => [ 'index' ], :message => N_('%{fn} cannot be like that.').fix_i18n
+  validates_exclusion_of :slug, :in => [ 'index' ], :message => N_('{fn} cannot be like that.').fix_i18n
   validates_presence_of :name, :environment_id
-  validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('%{fn} is already being used by another category.').fix_i18n
+  validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('{fn} is already being used by another category.').fix_i18n
   belongs_to :environment
-  validates_inclusion_of :display_color, :in => [ 1, 2, 3, 4, nil ]
-  validates_uniqueness_of :display_color, :scope => :environment_id, :if => (lambda { |cat| ! cat.display_color.nil? }), :message => N_('%{fn} was already assigned to another category.').fix_i18n
+  validates_inclusion_of :display_color, :in => 1..15, :allow_nil => true
+  validates_uniqueness_of :display_color, :scope => :environment_id, :if => (lambda { |cat| ! cat.display_color.nil? }), :message => N_('{fn} was already assigned to another category.').fix_i18n
   # Finds all top level categories for a given environment. 
   scope :top_level_for, lambda { |environment|
@@ -24,23 +24,15 @@ class Category &lt; ActiveRecord::Base
   scope :on_level, lambda { |parent| {:conditions => {:parent_id => parent}} }
-  scope :sub_categories, lambda { |category|
-    {:conditions => ['categories.path LIKE ? AND categories.id != ?', "%#{category.slug}%", category.id]}
-  }
-
-  scope :sub_tree, lambda { |category|
-    {:conditions => ['categories.path LIKE ?', "%#{category.slug}%"]}
-  }
-
   acts_as_filesystem
-  has_many :article_categorizations, :dependent => :destroy
+  has_many :article_categorizations
   has_many :articles, :through => :article_categorizations
   has_many :comments, :through => :articles
   has_many :events, :through => :article_categorizations, :class_name => 'Event', :source => :article
-  has_many :profile_categorizations, :dependent => :destroy
+  has_many :profile_categorizations
   has_many :profiles, :through => :profile_categorizations, :source => :profile
   has_many :enterprises, :through => :profile_categorizations, :source => :profile, :class_name => 'Enterprise'
   has_many :people, :through => :profile_categorizations, :source => :profile, :class_name => 'Person'
 class ChangePassword < Task
-  attr_accessor :login, :email, :password, :password_confirmation, :environment_id
+  attr_accessor :password, :password_confirmation
   def self.human_attribute_name(attrib)
     case attrib.to_sym
-    when :login
-      _('Username')
-    when :email
-      _('e-mail')
     when :password
       _('Password')
     when :password_confirmation
@@ -17,29 +13,7 @@ class ChangePassword &lt; Task
     end
   end
-  ###################################################
-  # validations for creating a ChangePassword task 
-  
-  validates_presence_of :login, :email, :environment_id, :on => :create, :message => _('must be filled in')
-
-  validates_format_of :email, :on => :create, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |obj| !obj.email.blank? })
-
-  validates_each :login, :on => :create do |data,attr,value|
-    unless data.login.blank? || data.email.blank?
-      user = User.find_by_login_and_environment_id(data.login, data.environment_id)
-      if user.nil? 
-        data.errors.add(:login, _('is invalid or user does not exists.'))
-      else
-        if user.email != data.email
-          data.errors.add(:email, _('does not match the username you filled in'))
-        end
-      end
-    end
-  end
-
-  before_validation(:on => :create) do |change_password|
-    change_password.requestor = Person.find_by_identifier_and_environment_id(change_password.login, change_password.environment_id)
-  end
+  validates_presence_of :requestor
   ###################################################
   # validations for updating a ChangePassword task 
@@ -49,6 +23,10 @@ class ChangePassword &lt; Task
   validates_presence_of :password_confirmation, :on => :update, :if => lambda { |change| change.status != Task::Status::CANCELLED }
   validates_confirmation_of :password, :if => lambda { |change| change.status != Task::Status::CANCELLED }
+  def environment
+    requestor.environment unless requestor.nil?
+  end
+
   def title
     _("Change password")
   end
@@ -87,12 +65,8 @@ class ChangePassword &lt; Task
     url = url_for(:host => hostname, :controller => 'account', :action => 'new_password', :code => code)
     proc do
-      _("In order to change your password, please visit the following address:\n\n%s") % url 
+      _("In order to change your password, please visit the following address:\n\n%s\n\nIf you did not required any change to your password just desconsider this email.") % url
     end
   end
-  def environment
-    self.requestor.environment
-  end
-
 end
@@ -16,9 +16,7 @@ class Comment &lt; ActiveRecord::Base
   has_many :children, :class_name => 'Comment', :foreign_key => 'reply_of_id', :dependent => :destroy
   belongs_to :reply_of, :class_name => 'Comment', :foreign_key => 'reply_of_id'
-  scope :without_spam, :conditions => ['spam IS NULL OR spam = ?', false]
   scope :without_reply, :conditions => ['reply_of_id IS NULL']
-  scope :spam, :conditions => ['spam = ?', true]
   # unauthenticated authors:
   validates_presence_of :name, :if => (lambda { |record| !record.email.blank? })
@@ -29,7 +27,7 @@ class Comment &lt; ActiveRecord::Base
   validates_presence_of :author_id, :if => (lambda { |rec| rec.name.blank? && rec.email.blank? })
   validates_each :name do |rec,attribute,value|
     if rec.author_id && (!rec.name.blank? || !rec.email.blank?)
-      rec.errors.add(:name, _('%{fn} can only be informed for unauthenticated authors').fix_i18n)
+      rec.errors.add(:name, _('{fn} can only be informed for unauthenticated authors').fix_i18n)
     end
   end
@@ -104,10 +102,21 @@ class Comment &lt; ActiveRecord::Base
   end
   delegate :environment, :to => :profile
-  delegate :profile, :to => :source
+  delegate :profile, :to => :source, :allow_nil => true
   include Noosfero::Plugin::HotSpot
+  include Spammable
+
+  def after_spam!
+    SpammerLogger.log(ip_address, self)
+    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
+  end
+
+  def after_ham!
+    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_ham))
+  end
+
   def verify_and_notify
     check_for_spam
     unless spam?
@@ -115,10 +124,6 @@ class Comment &lt; ActiveRecord::Base
     end
   end
-  def check_for_spam
-    plugins.dispatch(:check_comment_for_spam, self)
-  end
-
   def notify_by_mail
     if source.kind_of?(Article) && article.notify_comments?
       if !notification_emails.empty?
@@ -171,37 +176,6 @@ class Comment &lt; ActiveRecord::Base
     @rejected = true
   end
-  def spam?
-    !spam.nil? && spam
-  end
-
-  def ham?
-    !spam.nil? && !spam
-  end
-
-  def spam!
-    self.spam = true
-    self.save!
-    SpammerLogger.log(ip_address, self)
-    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
-    self
-  end
-
-  def ham!
-    self.spam = false
-    self.save!
-    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_ham))
-    self
-  end
-
-  def marked_as_spam
-    plugins.dispatch(:comment_marked_as_spam, self)
-  end
-
-  def marked_as_ham
-    plugins.dispatch(:comment_marked_as_ham, self)
-  end
-
   def need_moderation?
     article.moderate_comments? && (author.nil? || article.author != author)
   end
@@ -42,14 +42,14 @@ class CreateEnterprise &lt; Task
   def validator_correct_region
     if self.region && self.target
       unless self.region.validators.include?(self.target) || self.target_type == "Environment"
-        self.errors.add(:target, _('%{fn} is not a validator for the chosen region').fix_i18n)
+        self.errors.add(:target, _('{fn} is not a validator for the chosen region').fix_i18n)
       end
     end
   end
   def not_used_identifier
     if self.status != Task::Status::CANCELLED && self.identifier && Profile.exists?(:identifier => self.identifier)
-      self.errors.add(:identifier, _('%{fn} is already being as identifier by another enterprise, organization or person.').fix_i18n)
+      self.errors.add(:identifier, _('{fn} is already being as identifier by another enterprise, organization or person.').fix_i18n)
     end
   end
@@ -14,7 +14,7 @@ class Domain &lt; ActiveRecord::Base
   # <tt>name</tt> must be sequences of alphanumeric characters (a to z,
   # 0 to 9), plus '_' or '-', separated by dots. Letters must be lowercase.
-  validates_format_of :name, :with => /^([a-z0-9_-]+\.)+[a-z0-9_-]+$/, :message => N_('%{fn} must be composed of sequences of lowercase letters (a to z), numbers (0 to 9), "_" and "-", separated by dots.').fix_i18n
+  validates_format_of :name, :with => /^([a-z0-9_-]+\.)+[a-z0-9_-]+$/, :message => N_('{fn} must be composed of sequences of lowercase letters (a to z), numbers (0 to 9), "_" and "-", separated by dots.').fix_i18n
   # checks validations that could not be expressed using Rails' predefined
   # validations. In particular:
@@ -23,7 +23,7 @@ class Domain &lt; ActiveRecord::Base
   def no_www
     if self.name =~ /^www\./
-      self.errors.add(:name, _('%{fn} must not start with www.').fix_i18n)
+      self.errors.add(:name, _('{fn} must not start with www.').fix_i18n)
     end
   end
@@ -135,7 +135,7 @@ class Enterprise &lt; Organization
       [ProfileImageBlock.new, LinkListBlock.new(:links => links)],
       []
     ]
-    if !environment.enabled?('disable_products_for_enterprises')
+    if environment.enabled?('products_for_enterprises')
       blocks[2].unshift ProductsBlock.new
     end
     blocks
@@ -97,7 +97,6 @@ class Environment &lt; ActiveRecord::Base
       'disable_asset_communities' => _('Disable search for communities'),
       'disable_asset_products' => _('Disable search for products'),
       'disable_asset_events' => _('Disable search for events'),
-      'disable_products_for_enterprises' => _('Disable products for enterprises'),
       'disable_categories' => _('Disable categories'),
       'disable_header_and_footer' => _('Disable header/footer editing by users'),
       'disable_gender_icon' => _('Disable gender icon'),
@@ -105,9 +104,13 @@ class Environment &lt; ActiveRecord::Base
       'disable_select_city_for_contact' => _('Disable state/city select for contact form'),
       'disable_contact_person' => _('Disable contact for people'),
       'disable_contact_community' => _('Disable contact for groups/communities'),
-      'enterprise_registration' => _('Enterprise registration'),
-      'enterprise_activation' => _('Enable activation of enterprises'),
+      'products_for_enterprises' => __('Enable products for enterprises'),
+      'enterprise_registration' => __('Enterprise registration'),
+      'enterprise_activation' => __('Enable activation of enterprises'),
+      'enterprises_are_disabled_when_created' => __('Enterprises are disabled when created'),
+      'enterprises_are_validated_when_created' => __('Enterprises are validated when created'),
+
       'media_panel' => _('Media panel in WYSIWYG editor'),
       'select_preferred_domain' => _('Select preferred domains per profile'),
       'use_portal_community' => _('Use the portal as news source for front page'),
@@ -120,15 +123,15 @@ class Environment &lt; ActiveRecord::Base
       'organizations_are_moderated_by_default' => _("Organizations have moderated publication by default"),
       'enable_organization_url_change' => _("Allow organizations to change their URL"),
       'admin_must_approve_new_communities' => _("Admin must approve creation of communities"),
-      'enterprises_are_disabled_when_created' => _('Enterprises are disabled when created'),
-      'enterprises_are_validated_when_created' => _('Enterprises are validated when created'),
       'show_balloon_with_profile_links_when_clicked' => _('Show a balloon with profile links when a profile image is clicked'),
       'xmpp_chat' => _('XMPP/Jabber based chat'),
       'show_zoom_button_on_article_images' => _('Show a zoom link on all article images'),
       'captcha_for_logged_users' => _('Ask captcha when a logged user comments too'),
       'skip_new_user_email_confirmation' => _('Skip e-mail confirmation for new users'),
       'send_welcome_email_to_new_users' => _('Send welcome e-mail to new users'),
-      'allow_change_of_redirection_after_login' => _('Allow users to set the page to redirect after login')
+      'allow_change_of_redirection_after_login' => _('Allow users to set the page to redirect after login'),
+      'display_my_communities_on_user_menu' => _('Display on menu the list of communities the user can manage'),
+      'display_my_enterprises_on_user_menu' => _('Display on menu the list of enterprises the user can manage')
     }
   end
@@ -169,7 +172,7 @@ class Environment &lt; ActiveRecord::Base
   # One Environment can be reached by many domains
   has_many :domains, :as => :owner
-  has_many :profiles
+  has_many :profiles, :dependent => :destroy
   has_many :organizations
   has_many :enterprises
@@ -277,7 +280,7 @@ class Environment &lt; ActiveRecord::Base
   settings_items :restrict_to_access_control_origins, :default => false
   # Set this according to http://www.w3.org/TR/cors/. Headers are set at every response
   # For multiple domains acts as suggested in http://stackoverflow.com/questions/1653308/access-control-allow-origin-multiple-origin-domains
-  settings_items :access_control_allow_origin, :type => Array
+  settings_items :access_control_allow_origin, :type => Array, :default => []
   settings_items :access_control_allow_methods, :type => String
   def news_amount_by_folder=(amount)
@@ -285,8 +288,9 @@ class Environment &lt; ActiveRecord::Base
   end
   # Enables a feature identified by its name
-  def enable(feature)
+  def enable(feature, must_save=true)
     self.settings["#{feature}_enabled".to_sym] = true
+    self.save! if must_save
   end
   def enable_plugin(plugin)
@@ -296,8 +300,9 @@ class Environment &lt; ActiveRecord::Base
   end
   # Disables a feature identified by its name
-  def disable(feature)
+  def disable(feature, must_save=true)
     self.settings["#{feature}_enabled".to_sym] = false
+    self.save! if must_save
   end
   def disable_plugin(plugin)
@@ -341,7 +346,7 @@ class Environment &lt; ActiveRecord::Base
     %w(
       disable_asset_products
       disable_gender_icon
-      disable_products_for_enterprises
+      products_for_enterprises
       disable_select_city_for_contact
       enterprise_registration
       media_panel
@@ -349,7 +354,7 @@ class Environment &lt; ActiveRecord::Base
       show_balloon_with_profile_links_when_clicked
       use_portal_community
     ).each do |feature|
-      enable(feature)
+      enable(feature, false)
     end
   end
@@ -802,13 +807,6 @@ class Environment &lt; ActiveRecord::Base
     self.save!
   end
-  after_destroy :destroy_templates
-  def destroy_templates
-    [enterprise_template, inactive_enterprise_template, community_template, person_template].compact.each do |template|
-      template.destroy
-    end
-  end
-
   after_create :create_default_licenses
   def create_default_licenses
     [
@@ -30,12 +30,30 @@ class Event &lt; Article
   validates_each :start_date do |event,field,value|
     if event.end_date && event.start_date && event.start_date > event.end_date
-      event.errors.add(:start_date, _('%{fn} cannot come before end date.').fix_i18n)
+      event.errors.add(:start_date, _('{fn} cannot come before end date.').fix_i18n)
     end
   end
   scope :by_day, lambda { |date|
-    {:conditions => ['start_date = :date AND end_date IS NULL OR (start_date <= :date AND end_date >= :date)', {:date => date}]}
+    { :conditions => ['start_date = :date AND end_date IS NULL OR (start_date <= :date AND end_date >= :date)', {:date => date}],
+      :order => 'start_date ASC'
+    }
+  }
+
+  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'
+    }
+  }
+
+  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'
+    }
   }
   include WhiteListFilter
@@ -112,7 +130,7 @@ class Event &lt; Article
       # TODO: some good soul, please clean this ugly hack:
       if self.body
-        html.div('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', :class => 'event-description') 
+        html.div('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', :class => 'event-description')
       end
     }
@@ -7,8 +7,9 @@ class FeaturedProductsBlock &lt; Block
   before_save do |block|
     if block.owner.kind_of?(Environment) && block.product_ids.blank?
-      seed = block.owner.products.count
-      block.product_ids = block.owner.highlighted_products_with_image(:offset => (rand(seed) % (seed - block.groups_of * 3)), :limit => block.groups_of * 3).map(&:id)
+      total = block.owner.products.count
+      offset = rand([(total - block.groups_of * 3) + 1, 1].max)
+      block.product_ids = block.owner.highlighted_products_with_image(:offset => offset, :limit => block.groups_of * 3).map(&:id)
     end
     block.groups_of = block.groups_of.to_i
   end
@@ -17,7 +17,7 @@ class Image &lt; ActiveRecord::Base
                                   :icon     => '20x20!' },
                  :max_size => 5.megabytes # remember to update validate message below
-  validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of 5.0 MB").fix_i18n
+  validates_attachment :size => N_("{fn} of uploaded file was larger than the maximum size of 5.0 MB").fix_i18n
   delay_attachment_fu_thumbnails
@@ -35,6 +35,12 @@ class LinkListBlock &lt; Block
     ['chat', N_('Chat')]
   ]
+  TARGET_OPTIONS = [
+    [N_('Same page'), '_self'],
+    [N_('New tab'), '_blank'],
+    [N_('New window'), '_new'],
+  ]
+
   settings_items :links, Array, :default => []
   before_save do |block|
@@ -59,7 +65,7 @@ class LinkListBlock &lt; Block
   def link_html(link)
     klass = 'icon-' + link[:icon] if link[:icon]
     sanitize_link(
-      link_to(link[:name], expand_address(link[:address]), :class => klass)
+      link_to(link[:name], expand_address(link[:address]), :target => link[:target], :class => klass)
     )
   end
@@ -32,6 +32,10 @@ class Person &lt; Profile
     Profile.memberships_of(self)
   end
+   def memberships_by_role(role)
+     memberships.where('role_assignments.role_id = ?', role.id)
+   end
+
   has_many :friendships, :dependent => :destroy
   has_many :friends, :class_name => 'Person', :through => :friendships
@@ -61,6 +65,10 @@ class Person &lt; Profile
   scope :abusers, :joins => :abuse_complaints, :conditions => ['tasks.status = 3'], :select => 'DISTINCT profiles.*'
   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.*"
+  scope :admins, :joins => [:role_assignments => :role], :conditions => ['roles.key = ?', 'environment_administrator' ]
+  scope :activated, :joins => :user, :conditions => ['users.activation_code IS NULL AND users.activated_at IS NOT NULL']
+  scope :deactivated, :joins => :user, :conditions => ['NOT (users.activation_code IS NULL AND users.activated_at IS NOT NULL)']
+
   after_destroy do |person|
     Friendship.find(:all, :conditions => { :friend_id => person.id}).each { |friendship| friendship.destroy }
   end
@@ -230,7 +238,7 @@ class Person &lt; Profile
   validates_each :email, :on => :update do |record,attr,value|
     if User.find(:first, :conditions => ['email = ? and id != ? and environment_id = ?', value, record.user.id, record.environment.id])
-      record.errors.add(attr, _('%{fn} is already used by other user').fix_i18n)
+      record.errors.add(attr, _('{fn} is already used by other user').fix_i18n)
     end
   end
@@ -458,11 +466,19 @@ class Person &lt; Profile
   end
   def activities
-    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.user_id = #{self.id} and action_tracker.verb != 'leave_scrap_to_self' and action_tracker.verb != 'add_member_in_community' ORDER BY updated_at DESC")
+    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.user_id = #{self.id} and action_tracker.verb != 'leave_scrap_to_self' and action_tracker.verb != 'add_member_in_community' and action_tracker.verb != 'reply_scrap_on_self' ORDER BY updated_at DESC")
   end
+  # by default, all fields are private
   def public_fields
-    self.fields_privacy.nil? ? self.active_fields : self.fields_privacy.reject{ |k, v| v != 'public' }.keys.map(&:to_s)
+    self.fields_privacy.nil? ? [] : self.fields_privacy.reject{ |k, v| v != 'public' }.keys.map(&:to_s)
+  end
+
+  include Noosfero::Gravatar
+
+  def profile_custom_icon(gravatar_default=nil)
+    (self.image.present? && self.image.public_filename(:icon)) ||
+    gravatar_profile_image_url(self.email, :size=>20, :d => gravatar_default)
   end
   protected
@@ -6,11 +6,11 @@ class PriceDetail &lt; ActiveRecord::Base
   validates_presence_of :product_id
   belongs_to :production_cost
-  validates_presence_of :production_cost
+  # Do not validates_presence_of production_cost. We may have undefined other costs.
   validates_uniqueness_of :production_cost_id, :scope => :product_id
   def name
-    production_cost.name
+    production_cost.nil? ? _('Other costs') : production_cost.name
   end
   def price
@@ -205,11 +205,13 @@ class Product &lt; ActiveRecord::Base
     (price - total_production_cost.to_f).zero?
   end
-  def update_price_details(price_details)
-    self.price_details.destroy_all
-    price_details.each do |price_detail|
-      self.price_details.create(price_detail)
+  def update_price_details(new_price_details)
+    price_details.destroy_all
+    new_price_details.each do |detail|
+      price_details.create(detail)
     end
+    reload # to remove temporary duplicated price_details
+    price_details
   end
   def price_description_percentage
@@ -86,7 +86,8 @@ class Profile &lt; ActiveRecord::Base
   #FIXME: these will work only if the subclass is already loaded
   scope :enterprises, lambda { {:conditions => (Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
   scope :communities, lambda { {:conditions => (Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
-  scope :templates, lambda { |environment| { :conditions => {:is_template => true, :environment_id => environment.id} } }
+  scope :templates, {:conditions => {:is_template => true}}
+  scope :no_templates, {:conditions => {:is_template => false}}
   def members
     scopes = plugins.dispatch_scopes(:organization_members, self)
@@ -98,6 +99,14 @@ class Profile &lt; ActiveRecord::Base
     members.count
   end
+  class << self
+    def count_with_distinct(*args)
+      options = args.last || {}
+      count_without_distinct(:id, {:distinct => true}.merge(options))
+    end
+    alias_method_chain :count, :distinct
+  end
+
   def members_by_role(role)
     Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', role.id])
   end
@@ -111,6 +120,7 @@ class Profile &lt; ActiveRecord::Base
   end
   scope :visible, :conditions => { :visible => true }
+  scope :public, :conditions => { :visible => true, :public_profile => true }
   # Subclasses must override these methods
   scope :more_popular
   scope :more_active
@@ -187,7 +197,7 @@ class Profile &lt; ActiveRecord::Base
   has_many :tasks, :dependent => :destroy, :as => 'target'
-  has_many :events, :source => 'articles', :class_name => 'Event', :order => 'name'
+  has_many :events, :source => 'articles', :class_name => 'Event', :order => 'start_date'
   def find_in_all_tasks(task_id)
     begin
@@ -220,12 +230,14 @@ class Profile &lt; ActiveRecord::Base
   belongs_to :region
+  LOCATION_FIELDS = %w[address district city state country_name zip_code]
+
   def location(separator = ' - ')
     myregion = self.region
     if myregion
       myregion.hierarchy.reverse.first(2).map(&:name).join(separator)
     else
-      %w[address district city state country_name zip_code ].map {|item| (self.respond_to?(item) && !self.send(item).blank?) ? self.send(item) : nil }.compact.join(separator)
+      LOCATION_FIELDS.map {|item| (self.respond_to?(item) && !self.send(item).blank?) ? self.send(item) : nil }.compact.join(separator)
     end
   end
@@ -292,7 +304,7 @@ class Profile &lt; ActiveRecord::Base
   validate :valid_template
   def valid_template
-    if template_id.present? and !template.is_template
+    if template_id.present? && template && !template.is_template
       errors.add(:template, _('is not a template.'))
     end
   end
@@ -843,8 +855,10 @@ private :generate_url, :url_options
     }[amount] || _("%s members") % amount
   end
-  def profile_custom_icon
-    self.image.public_filename(:icon) unless self.image.blank?
+  include Noosfero::Gravatar
+
+  def profile_custom_icon(gravatar_default=nil)
+    image.public_filename(:icon) if image.present?
   end
   def jid(options = {})
@@ -883,6 +897,21 @@ private :generate_url, :url_options
     []
   end
+  def may_display_field_to? field, user = nil
+    if not self.active_fields.include? field.to_s
+      self.send "may_display_#{field}_to?", user rescue true
+    else
+      not (!self.public_fields.include? field.to_s and (!user or (user != self and !user.is_a_friend?(self))))
+    end
+  end
+
+  def may_display_location_to? user = nil
+    LOCATION_FIELDS.each do |field|
+      return false if !self.may_display_field_to? field, user
+    end
+    return true
+  end
+
   # field => privacy (e.g.: "address" => "public")
   def fields_privacy
     self.data[:fields_privacy]
@@ -56,7 +56,7 @@ class ProfileListBlock &lt; Block
         list = content_tag 'ul', nl +'  '+ list + nl
       end
       block_title(title) + nl +
-      content_tag('div', nl + list + nl + content_tag('br', '', :style => 'clear:both'))
+      content_tag('div', nl + list + nl + tag('br', :style => 'clear:both'))
     end
   end
@@ -12,4 +12,7 @@ class RawHTMLBlock &lt; Block
     (title.blank? ? '' : block_title(title)).html_safe + html.to_s.html_safe
   end
+  def has_macro?
+    true
+  end
 end
@@ -32,8 +32,7 @@ class RecentDocumentsBlock &lt; Block
     end
   end
-  def docs
-    self.limit.nil? ? owner.recent_documents(nil, {}, false) : owner.recent_documents(self.limit, {}, false)
+  def self.expire_on
+      { :profile => [:article], :environment => [:article] }
   end
-
 end
@@ -11,9 +11,9 @@ class Region &lt; Category
     validators.count > 0
   end
-  scope :with_validators, :group => 'id',
+  scope :with_validators, :select => 'DISTINCT ON (categories.id) *',
     :joins => 'INNER JOIN region_validators on (region_validators.region_id = categories.id)'
-  
+
 end
 require_dependency 'city'
@@ -17,9 +17,11 @@ class Scrap &lt; ActiveRecord::Base
   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.receiver != s.sender}, :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.receiver == s.sender}
+  track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender == s.receiver}
+
+  track_actions :reply_scrap_on_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender != s.receiver && s.sender == s.top_root.receiver}
   after_create do |scrap|
     scrap.root.update_attribute('updated_at', DateTime.now) unless scrap.root.nil?
@@ -28,6 +30,12 @@ class Scrap &lt; ActiveRecord::Base
   before_validation :strip_all_html_tags
+  def top_root
+    scrap = self
+    scrap = Scrap.find(scrap.scrap_id) while scrap.scrap_id
+    scrap
+  end
+
   def strip_all_html_tags
     sanitizer = HTML::WhiteListSanitizer.new
     self.content = sanitizer.sanitize(self.content, :tags => [])
@@ -6,6 +6,8 @@ class SpammerLogger &lt; Logger
     if object
       if object.kind_of?(Comment)
         @logger << "[#{Time.now.strftime('%F %T %z')}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
+      elsif object.kind_of?(SuggestArticle)
+        @logger << "[#{Time.now.strftime('%F %T %z')}] SuggestArticle-id: #{object.id} IP: #{spammer_ip}\n"
       end
     else
         @logger << "[#{Time.now.strftime('%F %T %z')}] IP: #{spammer_ip}\n"
@@ -11,6 +11,17 @@ class SuggestArticle &lt; Task
   settings_items :source, :type => String
   settings_items :source_name, :type => String
   settings_items :highlighted, :type => :boolean, :default => false
+  settings_items :ip_address, :type => String
+  settings_items :user_agent, :type => String
+  settings_items :referrer, :type => String
+
+  after_create :schedule_spam_checking
+
+  def schedule_spam_checking
+    self.delay.check_for_spam
+  end
+
+  include Noosfero::Plugin::HotSpot
   def sender
     "#{name} (#{email})"
@@ -61,4 +72,12 @@ class SuggestArticle &lt; Task
     _('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }
   end
+  def after_spam!
+    SpammerLogger.log(ip_address, self)
+    self.delay.marked_as_spam
+  end
+
+  def after_ham!
+    self.delay.marked_as_ham
+  end
 end
@@ -59,4 +59,8 @@ class TagsBlock &lt; Block
     15.minutes
   end
+  def self.expire_on
+      { :profile => [:article], :environment => [:article] }
+  end
+
 end
@@ -258,6 +258,8 @@ class Task &lt; ActiveRecord::Base
     status == Task::Status::ACTIVE || status == Task::Status::HIDDEN
   end
+  include Spammable
+
   protected
   # This method must be overrided in subclasses, and its implementation must do
@@ -45,7 +45,25 @@ class UploadedFile &lt; Article
   end
   def self.max_size
-    UploadedFile.attachment_options[:max_size]
+    default = 5.megabytes
+
+    multipliers = {
+      :KB => :kilobytes,
+      :MB => :megabytes,
+      :GB => :gigabytes,
+      :TB => :terabytes,
+    }
+    max_upload_size = NOOSFERO_CONF['max_upload_size']
+
+    if max_upload_size =~ /^(\d+(\.\d+)?)\s*(KB|MB|GB|TB)?$/
+      number = $1.to_f
+      unit = $3 || :MB
+      multiplier = multipliers[unit.to_sym]
+
+      number.send(multiplier).to_i
+    else
+      default
+    end
   end
   # FIXME need to define min/max file size
@@ -56,20 +74,28 @@ class UploadedFile &lt; Article
   has_attachment :storage => :file_system,
     :thumbnails => { :icon => [24,24], :thumb => '130x130>', :slideshow => '320x240>', :display => '640X480>' },
     :thumbnail_class => Thumbnail,
-    :max_size => 5.megabytes # remember to update validate message below
+    :max_size => self.max_size
-  validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of 5.0 MB").fix_i18n
+  validates_attachment :size => N_("{fn} of uploaded file was larger than the maximum size of %{size}").sub('%{size}', self.max_size.to_humanreadable).fix_i18n
   delay_attachment_fu_thumbnails
   postgresql_attachment_fu
+  # Use this method only to get the generic icon for this kind of content.
+  # If you want the specific icon for a file type or the iconified version
+  # of an image, use FilePresenter.for(uploaded_file).icon_name
   def self.icon_name(article = nil)
-    if article
-      article.image? ? article.public_filename(:icon) : (article.mime_type ? article.mime_type.gsub(/[\/+.]/, '-') : 'upload-file')
-    else
-      'upload-file'
+    unless article.nil?
+      warn = ('='*80) + "\n" +
+             'The method `UploadedFile.icon_name(obj)` is deprecated. ' +
+             'You must to encapsulate UploadedFile with `FilePresenter.for()`.' +
+             "\n" + ('='*80)
+      raise NoMethodError, warn if ENV['RAILS_ENV'] == 'test'
+      Rails.logger.warn warn if Rails.logger
+      puts warn if ENV['RAILS_ENV'] == 'development'
     end
+    'upload-file'
   end
   def mime_type
@@ -90,45 +116,38 @@ class UploadedFile &lt; Article
     self.name = self.filename
   end
+  def download_headers
+    {
+      'Content-Disposition' => "attachment; filename=\"#{self.filename}\"",
+    }
+  end
+
   def data
     File.read(self.full_filename)
   end
   def to_html(options = {})
+    warn = ('='*80) + "\n" +
+           'The method `UploadedFile#to_html()` is deprecated. ' +
+           'You must to encapsulate UploadedFile with `FilePresenter.for()`.' +
+           "\n" + ('='*80)
+    raise NoMethodError, warn if ENV['RAILS_ENV'] == 'test'
+    Rails.logger.warn warn if Rails.logger
+    puts warn if ENV['RAILS_ENV'] == 'development'
     article = self
     if image?
       proc do
-        if article.gallery? && options[:gallery_view]
-          images = article.parent.images
-          current_index = images.index(article)
-          total_of_images = images.count
-
-          link_to_previous = if current_index >= 1
-            link_to(_('&laquo; Previous'), images[current_index - 1].view_url, :class => 'left')
-          else
-            content_tag('span', _('&laquo; Previous'), :class => 'left')
-          end
-
-          link_to_next = if current_index < total_of_images - 1
-            link_to(_('Next &raquo;'), images[current_index + 1].view_url, :class => 'right')
-          else
-            content_tag('span', _('Next &raquo;'), :class => 'right')
-          end
-
-          content_tag(
-            'div',
-            link_to_previous + (content_tag('span', _('image %d of %d'), :class => 'total-of-images') % [current_index + 1, total_of_images]).html_safe + link_to_next,
-            :class => 'gallery-navigation'
-          )
-        end.to_s +
-        image_tag(article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') +
-          content_tag('p', article.abstract, :class => 'uploaded-file-description')
-
+        image_tag(article.public_filename(:display),
+                  :class => article.css_class_name,
+                  :style => 'max-width: 100%') +
+        content_tag('div', article.abstract, :class => 'uploaded-file-description')
       end
     else
       proc do
-        content_tag('ul', content_tag('li', link_to(article.name, article.url, :class => article.css_class_name))) +
-          content_tag('p', article.abstract, :class => 'uploaded-file-description')
+        content_tag('div',
+                    link_to(article.name, article.url),
+                    :class => article.css_class_name) +
+        content_tag('div', article.abstract, :class => 'uploaded-file-description')
       end
     end
   end
@@ -89,7 +89,7 @@ class User &lt; ActiveRecord::Base
   before_save :encrypt_password
   validates_format_of :email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {|user| !user.email.blank?})
-  validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('%{fn} must be checked in order to signup.').fix_i18n
+  validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('{fn} must be checked in order to signup.').fix_i18n
   # Authenticates a user by their login name or email and unencrypted password.  Returns the user or nil.
   def self.authenticate(login, password, environment = nil)
@@ -118,6 +118,21 @@ class User &lt; ActiveRecord::Base
     end
   end
+  # Deactivates the user in the database.
+  def deactivate
+    return false unless self.person
+    self.activated_at = nil
+    self.person.visible = false
+    begin
+      self.person.save! && self.save!
+    rescue Exception => exception
+      logger.error(exception.to_s)
+      false
+    else
+      true
+    end
+  end
+
   def activated?
     self.activation_code.nil? && !self.activated_at.nil?
   end
@@ -250,19 +265,21 @@ class User &lt; ActiveRecord::Base
     end
   end
-  def data_hash
+  def data_hash(gravatar_default = nil)
     friends_list = {}
     enterprises = person.enterprises.map { |e| { 'name' => e.short_name, 'identifier' => e.identifier } }
     self.person.friends.online.map do |person|
       friends_list[person.identifier] = {
-        'avatar' => person.profile_custom_icon,
+        'avatar' => person.profile_custom_icon(gravatar_default),
         'name' => person.short_name,
         'jid' => person.full_jid,
         'status' => person.user.chat_status,
       }
     end
+
     {
       'login' => self.login,
+      'avatar' => self.person.profile_custom_icon(gravatar_default),
       'is_admin' => self.person.is_admin?,
       'since_month' => self.person.created_at.month,
       'since_year' => self.person.created_at.year,
@@ -0,0 +1,7 @@
+# Made to encapsulate any UploadedFile
+class FilePresenter::Generic < FilePresenter
+  # if returns low priority, because it is generic.
+  def self.accepts?(f)
+    1 if f.is_a? UploadedFile
+  end
+end
@@ -0,0 +1,14 @@
+class FilePresenter::Image < FilePresenter
+  def self.accepts?(f)
+    return nil unless f.respond_to? :image?
+    f.image? ? 10 : nil
+  end
+
+  def icon_name
+    public_filename :icon
+  end
+
+  def short_description
+    _('Image (%s)') % content_type.split('/')[1].upcase
+  end
+end
@@ -16,15 +16,15 @@ class ArticleSweeper &lt; ActiveRecord::Observer
     end
   end
+
 protected
   def expire_caches(article)
+    expire_blocks_cache(article.profile, [:article])
+
     return if !article.environment
+
     article.hierarchy(true).each { |a| a.touch if a != article }
-    blocks = article.profile.blocks
-    blocks += article.profile.environment.blocks if article.profile.environment
-    blocks = blocks.select{|b|[RecentDocumentsBlock, BlogArchivesBlock].any?{|c| b.kind_of?(c)}}
-    BlockSweeper.expire_blocks(blocks)
     env = article.profile.environment
     if env && (env.portal_community == article.profile)
       article.environment.locales.keys.each do |locale|
@@ -3,7 +3,13 @@ class CategorySweeper &lt; ActiveRecord::Observer
   include SweeperHelper
   def after_save(category)
+    expire_blocks_cache(category.environment, [:category])
+
+    # Needed for environments with application layout
     expire_fragment(category.environment.id.to_s + "_categories_menu")
   end
+  def after_destroy(category)
+    expire_blocks_cache(category.environment, [:category])
+  end
 end
@@ -4,7 +4,7 @@ class ProfileSweeper # &lt; ActiveRecord::Observer
   include SweeperHelper
   def after_update(profile)
-    expire_caches(profile)
+    self.delay.expire_caches profile
   end
   def after_create(profile)
@@ -101,7 +101,7 @@
   <%= @plugins.dispatch(:signup_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
-  <%= template_options(Person, 'profile_data') %>
+  <%= template_options(:people, 'profile_data') %>
   <% unless @terms_of_use.blank? %>
     <div id='terms-of-use-box' class='formfieldline'>
@@ -2,21 +2,13 @@
 <%= error_messages_for :change_password, :header_message => _('Instructions to password recovery could not be sent'), :message => nil %>
-<%= labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %>
-
-  <%= f.text_field :login,
-                   :onchange => 'this.value = convToValidUsername( this.value )' %>
-
-  <%= f.text_field :email %>
-
-  <%= f.hidden_field :environment_id, :value => environment.id %>
-
-<div>
-  <% button_bar do %>
-    <%= submit_button('send', _('Send instructions')) %>
-  <% end %>
-</div>
-<%= content_tag(:small,_('After clicking the button above, you will receive an email with a link to a page where you will be able to create a new password.')) %>
-
+<% form_tag do %>
+  <%= labelled_form_field fields_label, text_field_tag(:value) %>
+
+  <div>
+    <% button_bar do %>
+      <%= submit_button('send', _('Send instructions')) %>
+    <% end %>
+  </div>
+  <%= content_tag(:small,_('After clicking the button above, you will receive an email with a link to a page where you will be able to create a new password.')) %>
 <% end %>
-
 <% if profile.lat %>
   <%= block_title block.title %>
   <div class='the-localization-map'>
-    <img src="http://maps.google.com/maps/api/staticmap?center=<%=profile.lat%>,<%=profile.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=profile.lat%>,<%=profile.lng%>&sensor=false"/>
+    <img src="https://maps.google.com/maps/api/staticmap?center=<%=profile.lat%>,<%=profile.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=profile.lat%>,<%=profile.lng%>&sensor=false"/>
   </div>
 </div>
 <% else %>
@@ -17,7 +17,7 @@
 <ul class="profile-info-data" id="profile-info-data-<%= block.id %>">
   <li><%= link_to _('Homepage'), block.owner.url, :class => 'url' %></li>
   <li><%= link_to _('View profile'), block.owner.public_profile_url %></li>
-  <% if block.owner.enterprise? && !block.owner.environment.enabled?('disable_products_for_enterprises') %>
+  <% if block.owner.enterprise? && block.owner.environment.enabled?('products_for_enterprises') %>
     <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
   <% end %>
   <li id="profile-admin-url-<%= block.id %>"></li>
 <div class="article-block-edition">
-<% if @block.box.owner.kind_of?(Environment) and @block.box.owner.portal_community.nil? %>
+<% if @block.owner.kind_of?(Environment) and @block.owner.portal_community.nil? %>
   <p id="no_portal_community">
   <%= _("You don't have an community defined as the portal community. Define it before use this block properly.") %>
   </p>
 <strong><%= _('Links') %></strong>
 <div id='edit-link-list-block' style='width:450px'>
 <table id='links' class='noborder'>
-  <tr><th><%= _('Icon') %></th><th><%= _('Name') %></th><th><%= _('Address') %></th></tr>
+  <tr><th><%= _('Icon') %></th><th><%= _('Name') %></th><th><%= _('Address') %></th><th><%= _('Target') %></th></tr>
   <% for link in @block.links do %>
     <tr>
       <td>
@@ -9,6 +9,9 @@
       </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>
+        <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
+      </td>
     </tr>
   <% end %>
 </table>
@@ -18,7 +21,9 @@
     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 => 'cel-address'))
+      content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'link-address'), :class => 'cel-address') +
+      content_tag('td', select_tag('block[links][][target]',
+options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])))
     ) +
     javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
 end %>
@@ -92,7 +92,7 @@
                 <% end %>
                 <% product.price_details.each do |i| %>
                   <div class="search-product-input-dots-to-price">
-                    <div class="search-product-input-name"><%= i.production_cost.name %></div>
+                    <div class="search-product-input-name"><%= i.name %></div>
                     <%= price_span i.price, :class => 'search-product-input-price' %>
                   </div>
                 <% end %>
@@ -54,6 +54,15 @@
 <%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 10)) %>
+<% f.fields_for :image_builder, @article.image do |i| %>
+  <%= file_field_or_thumbnail(_('Cover image:'), @article.image, i)%>
+  <%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
+<% end %>
+
+<% unless @article.image.nil? %>
+  <%= labelled_check_box(_('Remove cover image'),'remove_image',true,false)%>
+<% end %>
+
 <%= labelled_form_field(_('How to display posts:'), f.select(:visualization_format, [ [ _('Full post'), 'full'], [ _('First paragraph'), 'short'] ])) %>
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, Blog.posts_per_page_options)) %>
@@ -2,6 +2,18 @@
   <%= _('Content management') %>
 </h1>
+<% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %>
+  <div class="cms-homepage">
+    <%= _('Profile homepage:') %>
+    <% if profile.home_page %>
+      <%= link_to_article(profile.home_page) %>
+      <%= button_without_text(:'home-not', _('Reset homepage'),  { :action => 'set_home_page', :id => nil }, :method => :post) %>
+    <% else %>
+      <span class="cms-homepage-default"><%= _('Profile Information') %></span>
+    <% end %>
+  </div>
+<% end %>
+
 <% button_bar(:style => 'margin-bottom: 1em;') do %>
   <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
@@ -40,20 +52,27 @@
     </tr>
   <% end %>
-  <% @articles.each do |article| %>
-    <tr>
-      <td>
+  <% @articles.each do |article| article = FilePresenter.for article %>
+    <tr title="<%= article.title%>" >
+      <td class="article-name">
         <%= link_to_article(article) %>
       </td>
-      <td>
-        <%= article.class.short_description %>
+      <% short_description =  article.respond_to?(:short_description) ?
+            article.short_description :
+            article.class.short_description %>
+      <td class="article-mime" title=<%= short_description.to_json %>>
+        <%= short_description %>
       </td>
       <td class="article-controls">
         <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit) %>
         <%= button_without_text :eyes, _('Public view'), article.view_url %>
         <%= display_spread_button(profile, article) unless article.folder? || remove_content_button(:spread)%>
         <% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %>
-          <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
+          <% if profile.home_page != article %>
+            <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
+          <% else %>
+            <%= button_without_text(:'home-not', _('Reset homepage'),  { :action => 'set_home_page', :id => nil }, :method => :post) %>
+          <% end %>
         <% end %>
         <%= display_delete_button(article) if !remove_content_button(:delete) %>
       </td>
@@ -13,11 +13,11 @@
   <% else %>
     <% url_image, status_class = comment.author_id ?
        [comment.removed_user_image, 'icon-user-removed'] :
-       [str_gravatar_url_for( comment.email, :size => 50, :d=>404 ), 'icon-user-unknown'] %>
+       [gravatar_profile_image_url( comment.email, :size => 50, :d=>404 ), 'icon-user-unknown'] %>
     <%= link_to(
           image_tag(url_image, :onerror=>'gravatarCommentFailback(this)',
-                   'data-gravatar'=>str_gravatar_url_for(comment.email, :size=>50)) +
+                   'data-gravatar'=>gravatar_profile_image_url(comment.email, :size=>50)) +
           content_tag('span', comment.author_name, :class => 'comment-info') +
           content_tag('span', comment.message,
                              :class => 'comment-user-status ' + status_class),
@@ -52,6 +52,9 @@
   </div>
   <div id="article-header">
+    <% if @page.blog? and !@page.image.nil? %>
+      <div class="blog-cover"><%= image_tag(@page.image.public_filename())%></div>
+    <% end %>
     <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
     <%= article_title(@page, :no_link => true) %>
     <%= article_translations(@page) %>
 <%= display_profile_info enterprise_homepage.profile %>
 <div><%= enterprise_homepage.body %></div>
-<%= render :file => 'catalog/index' unless enterprise_homepage.profile.environment.enabled?('disable_products_for_enterprises') %>
+<%= render :file => 'catalog/index' if enterprise_homepage.profile.environment.enabled?('products_for_enterprises') %>
@@ -14,6 +14,12 @@
     window.NO_COMMENT_YET = "<%= _('No comments yet') %>";
 </script>
+<% if @page.parent && !@page.parent.path.blank? %>
+<div id="article-parent">
+  <%= button(:back, _('Go back to %s') % @page.parent.short_title, @page.parent.url) %>
+</div>
+<% end %>
+
 <div id="article-toolbar"></div>
 <script type="text/javascript">
@@ -43,11 +49,6 @@
   </div>
 <% end %>
-<% if @page.parent && !@page.parent.path.blank? %>
-<div id="article-parent">
-  <%= button(:back, _('Go back to %s') % @page.parent.short_title, @page.parent.url) %>
-</div>
-<% end %>
 <%= render :partial => 'shared/disabled_enterprise' %>
@@ -34,7 +34,7 @@
       <% end %>
     <% end %>
-    <%= template_options(Enterprise, 'create_enterprise')%>
+    <%= template_options(:enterprises, 'create_enterprise')%>
     <% button_bar do %>
       <%= submit_button('next', _('Next'), :cancel => {:profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile"}) %>
@@ -3,22 +3,14 @@
     <table class='noborder current-month'>
       <caption>
         <h2><%= show_month(params[:year], params[:month]) %></h2>
-        <%= link_to_previous_month(params[:year], params[:month], '&laquo; %s' % _('previous')) %>
-        <%= link_to_next_month(params[:year], params[:month], '%s &raquo;' % _('next')) %>
+        <%= link_to_previous_month(params[:year], params[:month], show_month(params[:year], params[:month], :previous => true, :only_month => true)) %>
+        <%= link_to_next_month(params[:year], params[:month], show_month(params[:year], params[:month], :next => true, :only_month => true)) %> 
       </caption>
       <%= render :partial => 'events/month', :locals => {:calendar => @calendar, :abbreviated => true} %>
     </table>
-    <table class='noborder previous-month'>
-      <caption><h3><%= link_to_previous_month(params[:year], params[:month], show_month(params[:year], params[:month], :previous => true)) %></h3></caption>
-      <%= render :partial => 'events/month', :locals => {:calendar => @previous_calendar, :abbreviated => true} %>
-    </table>
-    <table class='noborder next-month'>
-      <caption><h3><%= link_to_next_month(params[:year], params[:month], show_month(params[:year], params[:month], :next => true)) %></h3></caption>
-      <%= render :partial => 'events/month', :locals => {:calendar => @next_calendar, :abbreviated => true} %>
-    </table>
     <br clear='both'/>
   </div>
   <div id='events-of-the-day'>
-    <%= render :partial => 'events/events_by_day' %>
+    <%= render :partial => 'events/events' %>
   </div>
 </div>
@@ -0,0 +1 @@
+<%= list_events(@date, @events) %>
 \ No newline at end of file
@@ -1 +0,0 @@
-<%= list_events(@selected_day, @events_of_the_day) %>
@@ -0,0 +1,9 @@
+<span class="download-link">
+  <span>Download</span>
+  <strong><%= link_to generic.filename, generic.public_filename %></strong>
+</span>
+
+<div class="uploaded-file-description <%= 'empty' if generic.abstract.blank? %>">
+  <%= generic.abstract %>
+</div>
+
@@ -0,0 +1,36 @@
+<% if image.gallery? && options[:gallery_view] %>
+<%
+  images = image.parent.images
+  current_index = images.index(image.encapsulated_file)
+  total_of_images = images.count
+  link_to_previous = if current_index >= 1
+   link_to(_('&laquo; Previous'), images[current_index - 1].view_url, :class => 'previous')
+  else
+    content_tag('span', _('&laquo; Previous'), :class => 'previous')
+  end
+
+  link_to_next = if current_index < total_of_images - 1
+    link_to(_('Next &raquo;'), images[current_index + 1].view_url, :class => 'next')
+  else
+    content_tag('span', _('Next &raquo;'), :class => 'next')
+  end
+%>
+
+<div class="gallery-navigation">
+  <%= link_to_previous %>
+  <span class="total-of-images">
+    <%= _('image %d of %d') % [current_index + 1, total_of_images] %>
+  </span>
+  <%= link_to_next %>
+</div>
+
+<% end %>
+
+<%# image_tag(article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') %>
+
+<img src="<%=image.public_filename(:display)%>" class="<%=image.css_class_name%>">
+
+<div class="uploaded-file-description <%= 'empty' if image.abstract.blank? %>">
+  <%= image.abstract %>
+</div>
+
@@ -10,7 +10,7 @@
     </li>
     <% @product.price_details.each do |price_detail| %>
       <li>
-        <div class='price-detail-name'><%= "%s:" % price_detail.production_cost.name %></div>
+        <div class='price-detail-name'><%= "%s:" % price_detail.name %></div>
         <div class='price-detail-price'><%= float_to_currency(price_detail.price) %></div>
       </li>
     <% end %>
 <% price_details.each do |price_detail| %>
   <tr id='<%= "price-detail-#{price_detail.id}" %>'>
     <td><%= select_production_cost(@product, price_detail.production_cost_id) %></td>
-    <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', price_detail.formatted_value(:price), :class => 'numbers-only price-details-price')) %></td>
+    <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', price_detail.formatted_value(:price), :class => 'numbers-only price-details-price', :size => 6)) %></td>
     <td>
       <%= link_to_remote(_('Remove'),
                          :update => "price-detail-#{price_detail.id}",
@@ -34,7 +34,7 @@
   <table id='new-cost-fields'>
     <tr>
       <td><%= select_production_cost(@product) %></td>
-      <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', nil, :class => 'numbers-only price-details-price')) %></td>
+      <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', nil, :class => 'numbers-only price-details-price', :size => 6)) %></td>
       <td><%= link_to(_('Cancel'), '#', {:class => 'cancel-new-cost'}) %></td>
     </tr>
   </table>
@@ -29,5 +29,5 @@
 <% end %>
-<%= content_tag('script', '', :src => "http://maps.googleapis.com/maps/api/js?sensor=false", :type => 'text/javascript') %>
+<%= content_tag('script', '', :src => "https://maps.googleapis.com/maps/api/js?sensor=false", :type => 'text/javascript') %>
 <%= content_tag('script', '', :src => url_for(:controller => :maps, :action => :google_map), :type => 'text/javascript') %>
@@ -8,6 +8,19 @@
   <%= button :back, _('Go back'), :controller => 'profile_editor' %>
 <% end %>
-<%= render :partial => 'shared/list_groups', :locals => {:groups => @memberships} %>
+<% type_collection = [[nil, _('All')]] %>
+<% type_collection += @roles.sort_by {|role| role.id}.map{|r| ["#{r.id}", r.name]} %>
+
+<p>
+  <%= labelled_select(_('Filter')+': ', :filter_type, :first, :last, @filter,  type_collection, :onchange => 'document.location.href = "?filter_type="+this.value')%>
+</p>
+
+<% if @memberships.empty? %>
+  <p>
+    <em><%= _('No groups to list') %></em>
+  </p>
+<% else %>
+  <%= render :partial => 'shared/list_groups', :locals => {:groups => @memberships} %>
+<% end %>
 </div>
@@ -44,11 +44,13 @@
     </div>
   </div>
-  <%= template_options(Community, 'community')%>
+  <%= template_options(:communities, 'community')%>
+
+  <%= hidden_field_tag('back_to', @back_to) %>
   <% button_bar do %>
     <%= submit_button(:save, _('Create')) %>
-    <%= button(:cancel, _('Cancel'), :action => 'index') %>
+    <%= button(:cancel, _('Cancel'), @back_to ) %>
   <% end %>
 <% end %>
	@@ -52,3 +52,12 @@ If you write such script for your own OS, please share it with us at the		@@ -52,3 +52,12 @@ If you write such script for your own OS, please share it with us at the
52	development mailing list so that we can include it in the official repository.	52	development mailing list so that we can include it in the official repository.
53	This way other people using the same OS will have to put less effort to develop	53	This way other people using the same OS will have to put less effort to develop
54	Noosfero.	54	Noosfero.
		55	+
		56	+== Submitting your changes back
		57	+
		58	+For now please read:
		59	+
		60	+- Coding conventions
		61	+ http://noosfero.org/Development/CodingConventions
		62	+- Patch guidelines
		63	+ http://noosfero.org/Development/PatchGuidelines
	@@ -1,13 +0,0 @@	@@ -1,13 +0,0 @@
1	-This is a draft of how to create a environment to Rails 2.3.5 to Noosfero
2	-development.
3	-
4	-Install dependencies:
5	-
6	-gem install rails -v 2.3.5
7	-gem install i18n
8	-gem install will_paginate -v 2.3.12
9	-gem install cucumber
10	-
11	-Creating initial environment:
12	-
13	-rake db:schema:load
	@@ -6,7 +6,7 @@ To configure XMPP/BOSH in Noosfero you need:		@@ -6,7 +6,7 @@ To configure XMPP/BOSH in Noosfero you need:
6	* SystemTimer - http://ph7spot.com/musings/system-timer	6	* SystemTimer - http://ph7spot.com/musings/system-timer
7	* Pidgin data files - http://www.pidgin.im/	7	* Pidgin data files - http://www.pidgin.im/
8		8
9	-If you use Debian Wheezy:	9	+If you use Debian 6.0 (squeeze):
10		10
11	# apt-get install librestclient-ruby pidgin-data ruby1.8-dev	11	# apt-get install librestclient-ruby pidgin-data ruby1.8-dev
12	# gem install SystemTimer	12	# gem install SystemTimer
1	-noosfero - a web-based social platform	1	+Noosfero - a web-based social platform
2	======================================	2	======================================
3		3
4	-:: About the project	4	+http://www.noosfero.org/
5		5
6	-Homepage: http://www.noosfero.org/	6	+Documentation
		7	+-------------
7		8
8	-:: Authors and copyright	9	+The following documentation is available:
9		10
10	-Authors: see file AUTHORS
11	-Copyright information: see file COPYRIGHT
12	-Full license text; see file COPYING	11	+File Purpose
		12	+~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
		13	+INSTALL install instructions
		14	+INSTALL.awstats install instructions - access statistics service
		15	+INSTALL.chat install instructions - chat service
		16	+INSTALL.email install instructions - email service
		17	+INSTALL.multitenancy install instructions - multiple sites
		18	+INSTALL.varnish install instructions - varnish HTTP caching (recommended)
		19	+HACKING development instruction
		20	+RELEASING instructions for doing releases
		21	+doc/noosfero/* user documentation (available through the app itself)
		22	+
		23	+
		24	+Authors and copyright
		25	+---------------------
		26	+
		27	+Authorship and copyright information is available in the files listed below.
		28	+
		29	+File Purpose
		30	+~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
		31	+AUTHORS list of authors (updated at each release)
		32	+COPYRIGHT Copyright statement for the project
		33	+COPYING Full text of the project license
	@@ -2,7 +2,7 @@ class FeaturesController < AdminController		@@ -2,7 +2,7 @@ class FeaturesController < AdminController
2	protect 'edit_environment_features', :environment	2	protect 'edit_environment_features', :environment
3		3
4	def index	4	def index
5	- @features = Environment.available_features	5	+ @features = Environment.available_features.sort_by{\|k,v\|v}
6	end	6	end
7		7
8	post_only :update	8	post_only :update
	@@ -4,12 +4,52 @@ class UsersController < AdminController		@@ -4,12 +4,52 @@ class UsersController < AdminController
4		4
5	protect 'manage_environment_users', :environment	5	protect 'manage_environment_users', :environment
6		6
		7	+ include UsersHelper
		8	+
7	def index	9	def index
		10	+ @filter = params[:filter]
		11	+ scope = environment.people.no_templates
		12	+ if @filter == 'admin_users'
		13	+ scope = scope.admins
		14	+ elsif @filter == 'activated_users'
		15	+ scope = scope.activated
		16	+ elsif @filter == 'deactivated_users'
		17	+ scope = scope.deactivated
		18	+ end
		19	+ @q = params[:q]
		20	+ @collection = find_by_contents(:people, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
		21	+ end
		22	+
		23	+ def set_admin_role
		24	+ person = environment.people.find(params[:id])
		25	+ environment.add_admin(person)
		26	+ redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
		27	+ end
		28	+
		29	+ def reset_admin_role
		30	+ person = environment.people.find(params[:id])
		31	+ environment.remove_admin(person)
		32	+ redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
		33	+ end
		34	+
		35	+ def activate
		36	+ person = environment.people.find(params[:id])
		37	+ person.user.activate
		38	+ redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
		39	+ end
		40	+
		41	+ def deactivate
		42	+ person = environment.people.find(params[:id])
		43	+ person.user.deactivate
		44	+ redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
		45	+ end
		46	+
		47	+ def download
8	respond_to do \|format\|	48	respond_to do \|format\|
9	format.html	49	format.html
10	format.xml do	50	format.xml do
11	- @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
12	- send_data @users.to_xml(	51	+ users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
		52	+ send_data users.to_xml(
13	:skip_types => true,	53	:skip_types => true,
14	:only => %w[email login created_at updated_at],	54	:only => %w[email login created_at updated_at],
15	:include => { :person => {:only => %w[name updated_at created_at address birth_date contact_phone identifier lat lng] } }),	55	:include => { :person => {:only => %w[name updated_at created_at address birth_date contact_phone identifier lat lng] } }),
	@@ -45,4 +85,10 @@ class UsersController < AdminController		@@ -45,4 +85,10 @@ class UsersController < AdminController
45	end	85	end
46	end	86	end
47		87
		88	+ private
		89	+
		90	+ def per_page
		91	+ 10
		92	+ end
		93	+
48	end	94	end
	@@ -6,10 +6,10 @@ class ManageProductsController < ApplicationController		@@ -6,10 +6,10 @@ class ManageProductsController < ApplicationController
6	before_filter :login_required, :except => [:show]	6	before_filter :login_required, :except => [:show]
7	before_filter :create_product?, :only => [:new]	7	before_filter :create_product?, :only => [:new]
8		8
9	- protected	9	+ protected
10		10
11	def check_environment_feature	11	def check_environment_feature
12	- if profile.environment.enabled?('disable_products_for_enterprises')	12	+ unless profile.environment.enabled?('products_for_enterprises')
13	render_not_found	13	render_not_found
14	return	14	return
15	end	15	end
	@@ -38,7 +38,7 @@ class ProfileDesignController < BoxOrganizerController		@@ -38,7 +38,7 @@ class ProfileDesignController < BoxOrganizerController
38	end	38	end
39		39
40	# product block exclusive for enterprises in environments that permits it	40	# product block exclusive for enterprises in environments that permits it
41	- if profile.enterprise? && !profile.environment.enabled?('disable_products_for_enterprises')	41	+ if profile.enterprise? && profile.environment.enabled?('products_for_enterprises')
42	blocks << ProductsBlock	42	blocks << ProductsBlock
43	end	43	end
44		44
	@@ -4,7 +4,7 @@ class ProfileEditorController < MyProfileController		@@ -4,7 +4,7 @@ class ProfileEditorController < MyProfileController
4	protect 'destroy_profile', :profile, :only => [:destroy_profile]	4	protect 'destroy_profile', :profile, :only => [:destroy_profile]
5		5
6	def index	6	def index
7	- @pending_tasks = Task.to(profile).pending.select{\|i\| user.has_permission?(i.permission, profile)}	7	+ @pending_tasks = Task.to(profile).pending.without_spam.select{\|i\| user.has_permission?(i.permission, profile)}
8	end	8	end
9		9
10	helper :profile	10	helper :profile
	@@ -4,12 +4,12 @@ class TasksController < MyProfileController		@@ -4,12 +4,12 @@ class TasksController < MyProfileController
4		4
5	def index	5	def index
6	@filter = params[:filter_type].blank? ? nil : params[:filter_type]	6	@filter = params[:filter_type].blank? ? nil : params[:filter_type]
7	- @tasks = Task.to(profile).pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])	7	+ @tasks = Task.to(profile).without_spam.pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
8	@failed = params ? params[:failed] : {}	8	@failed = params ? params[:failed] : {}
9	end	9	end
10		10
11	def processed	11	def processed
12	- @tasks = Task.to(profile).closed.sort_by(&:created_at)	12	+ @tasks = Task.to(profile).without_spam.closed.sort_by(&:created_at)
13	end	13	end
14		14
15	VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]	15	VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]
	@@ -57,7 +57,7 @@ class TasksController < MyProfileController		@@ -57,7 +57,7 @@ class TasksController < MyProfileController
57	end	57	end
58		58
59	def list_requested	59	def list_requested
60	- @tasks = Task.find_all_by_requestor_id(profile.id)	60	+ @tasks = Task.without_spam.find_all_by_requestor_id(profile.id)
61	end	61	end
62		62
63	def ticket_details	63	def ticket_details