Merge branch 'next' into AI2888-context_block

Conflicts: test/unit/article_test.rb

Merge branch 'next' into AI2888-context_block
Conflicts: test/unit/article_test.rb
Victor Costa
2 parents 64e78c09 657be12f
Showing 316 changed files with 55715 additions and 48751 deletions Show diff stats
AUTHORS
COPYRIGHT
HACKING
HACKING.rails235
INSTALL.chat
README
app/controllers/application_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/memberships_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/content_viewer_controller.rb
app/controllers/public/events_controller.rb
app/controllers/public/profile_controller.rb
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/helpers/blog_helper.rb
app/helpers/categories_helper.rb
app/helpers/cms_helper.rb
@@ -111,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>
@@ -189,12 +190,14 @@ 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>
+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
@@ -174,8 +174,6 @@ 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) ||
     fallback_find_by_contents(asset, scope, query, paginate_options, options)
   end
@@ -183,8 +181,9 @@ class ApplicationController &lt; ActionController::Base
   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
@@ -9,9 +9,10 @@ class MembershipsController &lt; MyProfileController
   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, {:environment => environment}.merge(params[:community]))
-      redirect_to :action => 'index'
+      redirect_to @back_to
       return
     end
   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
@@ -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")
 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
   #######################################################
@@ -558,6 +558,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)
@@ -574,16 +577,16 @@ 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')
+                                   (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 = {})
@@ -727,8 +730,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)
@@ -1113,15 +1123,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
@@ -1133,6 +1162,7 @@ module ApplicationHelper
     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') +
     manage_enterprises.to_s +
+    manage_communities.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")) +
     pending_tasks_count +
     link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
@@ -1401,8 +1431,8 @@ module ApplicationHelper
   end
   def filter_html(html, source)
-    if @plugins && source.has_macro?
-      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_safe
+    html = send("display_#{format}_format", FilePresenter.for(article)).html_safe
     article_title(article, :no_comments => no_comments) + html
   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 = [
@@ -33,7 +33,7 @@ module CmsHelper
       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
@@ -21,6 +21,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
@@ -40,12 +41,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
@@ -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
@@ -2,6 +2,8 @@ require &#39;hpricot&#39;
 class Article < ActiveRecord::Base
+  acts_as_having_image
+
   SEARCHABLE_FIELDS = {
     :name => 10,
     :abstract => 3,
@@ -154,8 +156,12 @@ class Article &lt; ActiveRecord::Base
     end
   end
+  def css_class_list
+    [self.class.name.underscore.dasherize]
+  end
+
   def css_class_name
-    self.class.name.underscore.dasherize
+    [css_class_list].flatten.compact.join(' ')
   end
   def pending_categorizations
@@ -188,7 +194,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
@@ -310,6 +316,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 +335,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)
@@ -360,6 +370,16 @@ class Article &lt; ActiveRecord::Base
     false
   end
+  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 download_headers
+    {}
+  end
+
   named_scope :native_translations, :conditions => { :translation_of_id => nil }
   def translatable?
@@ -12,7 +12,7 @@ class ArticleBlock &lt; Block
     block = self
     lambda 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
@@ -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
@@ -142,4 +142,15 @@ class Block &lt; ActiveRecord::Base
     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
@@ -35,4 +35,7 @@ class CategoriesBlock &lt; Block
     end
   end
+  def self.expire_on
+      { :profile => [], :environment => [:category] }
+  end
 end
@@ -7,13 +7,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. 
   named_scope :top_level_for, lambda { |environment|
@@ -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'
-  named_scope :without_spam, :conditions => ['spam IS NULL OR spam = ?', false]
   named_scope :without_reply, :conditions => ['reply_of_id IS NULL']
-  named_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
@@ -108,6 +106,17 @@ class Comment &lt; ActiveRecord::Base
   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?
@@ -205,37 +210,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
@@ -40,12 +40,12 @@ class CreateEnterprise &lt; Task
     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
     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
@@ -10,14 +10,14 @@ 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:
   # * <tt>name</tt> must not start with 'www.'
   def validate
     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
@@ -127,7 +127,9 @@ class Environment &lt; ActiveRecord::Base
       '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
@@ -168,7 +170,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
@@ -783,13 +785,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
     License.create!(:name => 'CC (by)', :url => 'http://creativecommons.org/licenses/by/3.0/legalcode', :environment => self)
@@ -25,12 +25,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
   named_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'
+    }
+  }
+
+  named_scope :next_events_from_month, lambda { |date|
+    date_temp = date.strftime("%Y-%m-%d")
+    { :conditions => ["start_date >= ?","#{date_temp}"],
+      :limit => 10,
+      :order => 'start_date ASC'
+    }
+  }
+
+  named_scope :by_month, lambda { |date|
+    date_temp = date.strftime("%Y-%m")
+    { :conditions => ["EXTRACT(YEAR FROM start_date) = ? AND EXTRACT(MONTH FROM start_date) = ?",date.year,date.month],
+      :limit => 10,
+      :order => 'start_date ASC'
+    }
   }
   include WhiteListFilter
@@ -105,7 +123,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
     }
@@ -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
@@ -33,6 +33,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|
@@ -57,7 +63,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
@@ -240,7 +240,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
@@ -193,7 +193,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
@@ -30,4 +30,7 @@ class RecentDocumentsBlock &lt; Block
     end
   end
+  def self.expire_on
+      { :profile => [:article], :environment => [:article] }
+  end
 end
@@ -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
@@ -235,6 +235,8 @@ class Task &lt; ActiveRecord::Base
     end
   end
+  include Spammable
+
   protected
   # This method must be overrided in subclasses, and its implementation must do
@@ -275,6 +277,7 @@ class Task &lt; ActiveRecord::Base
   named_scope :of, lambda { |type| conditions = type ? "type LIKE '#{type}'" : "1=1"; {:conditions =>  [conditions]} }
   named_scope :order_by, lambda { |attribute, ord| {:order => "#{attribute} #{ord}"} }
+
   named_scope :to, lambda { |profile|
     environment_condition = nil
     if profile.person?
@@ -41,7 +41,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
@@ -52,20 +70,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
@@ -86,45 +112,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?
       lambda 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
       lambda 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
@@ -114,7 +114,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)
@@ -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
 <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| %>
+  <% @articles.each do |article| article = FilePresenter.for article %>
     <tr title="<%= article.title%>" >
-      <td>
+      <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>
@@ -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) %>
@@ -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>
+
@@ -46,9 +46,11 @@
   <%= template_options(Community, '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 %>
@@ -0,0 +1,3 @@
+<div class='view-more-comments'>
+  <%= link_to(_('More'), :profile => @profile.identifier, :controller => 'profile', :action => 'more_comments', :activity => activity, :comment_page => (comment_page + 1)) %>
+</div>
@@ -0,0 +1,3 @@
+<div class='view-more-replies'>
+  <%= link_to(_('More'), :profile => @profile.identifier, :controller => 'profile', :action => 'more_replies', :activity => activity, :comment_page => (comment_page + 1)) %>
+</div>
@@ -4,7 +4,7 @@
   </tr>
   <%= display_field(_('Sex:'), profile, :sex) { |gender| { 'male' => _('Male'), 'female' => _('Female') }[gender] } %>
   <%= display_field(_('Date of birth:'), profile, :birth_date) { |date| show_date(date)  }%>
-  <%= display_field(_('Location:'), profile, :location, true) %>
+  <%= display_field _('Location:'), profile, :location %>
   <%= display_field(_('Type:'), profile, :privacy_setting, true) %>
@@ -4,7 +4,7 @@
     <% if activity.kind_of?(ActionTracker::Record) %>
       <%= render :partial => 'profile_activity', :locals => { :activity => activity, :tab_action => 'wall' } if activity.visible? %>
     <% else %>
-      <%= render :partial => 'profile_scrap', :locals => {:scrap => activity } %>
+      <%= render :partial => 'profile_scraps', :locals => { :activity => activity, :scrap => activity } %>
     <% end %>
   <% end %>
 <% end %>
 <hr />
-<% if activity.comments_count > 2 %>
+<ul id="profile-wall-activities-comments-<%= activity.id %>" class="profile-wall-activities-comments"  >
+</ul>
+<% if activity.comments_count > 0 %>
+<div id="profile-wall-activities-comments-more-<%= activity.id %>" class="profile-wall-activities-comments" >
   <div class='view-all-comments icon-chat'>
-    <%= link_to(_("View all %s comments") % activity.comments_count, '#') %>
+     <%= link_to(n_('View comment', "View all %s comments", activity.comments_count) % activity.comments_count, :profile => profile.identifier, :controller => 'profile', :action => 'more_comments', :activity => activity, :comment_page => (1)) %>
   </div>
+</div>
 <% end %>
-
-<ul class="profile-wall-activities-comments" style="<%= 'display:none;' if (activity.comments_count > 2) %>" >
-  <%= render :partial => 'comment', :collection => activity.comments_as_thread %>
-</ul>
-
 <%= render :partial => 'profile_comment_form', :locals => { :activity => activity, :tab_action => tab_action } %>
@@ -16,13 +16,7 @@
     </div>
   </div>
-  <% if scrap.replies.count > 2 %>
-    <div class='view-all-comments icon-chat'>
-      <%= link_to(_("View all %s comments") % scrap.replies.count, '#') %>
-    </div>
-  <% end %>
-
-  <ul class="profile-wall-activities-comments scrap-replies" style="width: auto; <%= 'display:none;' if (scrap.replies.count > 2) %>" >
+  <ul class="profile-wall-activities-comments scrap-replies" style="width: auto;" >
     <% scrap.replies.map do |reply| %>
       <%= render :partial => 'profile_scrap', :locals => {:scrap => reply} %>
     <% end %>
-NÃO DEVE APARECER
+<li class='profile-activity-item' id='profile-activity-item-<%= scrap.id %>'>
+  <div class='profile-activity-image'>
+    <%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %>
+  </div>
+  <div class='profile-activity-description'>
+    <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
+    <p class='profile-activity-text'><%= txt2html scrap.content %></p>
+    <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p>
+    <div class='profile-wall-actions'>
+    <% if logged_in? && current_person.follows?(scrap.sender) %>
+      <span class='profile-activity-send-reply'>
+        <%= link_to_function s_('profile|Comment'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();return false", :class => "profile-send-reply" %>
+      </span>
+    <% end %>
+    <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_scrap, :scrap_id => scrap.id, :view => params[:view]).to_json, _('Are you sure you want to remove this scrap and all its replies?').to_json]) if logged_in? && user.can_control_scrap?(scrap) %>
+    </div>
+  </div>
+
+
+  <ul id="profile-wall-activities-comments-<%= activity.id %>" class="profile-wall-activities-comments scrap-replies" style="width: auto;" >
+  </ul>
+
+  <% if scrap.replies.count > 0 %>
+    <div id="profile-wall-activities-comments-more-<%= activity.id %>" class="profile-wall-activities-comments">
+      <div class='view-all-comments icon-chat'>
+        <%= link_to(n_('View comment', "View all %s comments", scrap.replies.count) % scrap.replies.count, :profile => profile.identifier, :controller => 'profile', :action => 'more_replies', :activity => activity, :comment_page => (1)) %>
+      </div>
+    </div>
+  <% end %>
+  <%= render :partial => 'profile_scrap_reply_form', :locals => { :scrap => scrap } %>
+  <hr />
+</li>
@@ -12,7 +12,9 @@
       <%= _('Members: %s') % group.members_count.to_s %> <br/>
       <%= _('Created at: %s') % show_date(group.created_at) unless group.enterprise? %> <br/>
       <% button_bar do %>
-        <%= button 'menu-ctrl-panel', _('Control panel of this group'), group.admin_url %>
+        <% if user.has_permission?(:edit_profile, group) %>
+          <%= button 'menu-ctrl-panel', _('Control panel of this group'), group.admin_url %>
+        <% end %>
         <%= button 'menu-logout', _('Leave community'), group.leave_url(true), :class => 'leave-community' %>
         <% if (group.community? && user.has_permission?(:destroy_profile, group)) %>
           <%= button 'delete', _('Remove'), { :controller => 'profile_editor', :action => 'destroy_profile', :profile => group.identifier } %>
@@ -1,8 +0,0 @@
-<div id='manage-enterprises'>
-  <a href="#" id='manage-enterprises-link' class='simplemenu-trigger' title='<%= _('Manage enterprises') %>'><i class="icon-menu-enterprise"></i><strong><%= ui_icon('ui-icon-triangle-1-s') + _('My enterprises') %></strong></a>
-  <ul class='simplemenu-submenu'>
-    <% enterprises_link.each do |link| %>
-      <li class='simplemenu-item'><%= link %></li>
-    <% end %>
-  </ul>
-</div>
@@ -0,0 +1,8 @@
+<div id=<%= "manage-#{kind}" %> class="manage-groups">
+  <a href="#" id=<%= "manage-#{kind}-link" %> class="simplemenu-trigger" title="<%= _('Manage %s') % kind %>"><i class=<%= "icon-menu-#{kind.singularize}" %>></i><strong><%= ui_icon('ui-icon-triangle-1-s') + _('My %s') % kind %></strong></a>
+  <ul class="simplemenu-submenu">
+    <% link.each do |link| %>
+      <li class="simplemenu-item"><%= link %></li>
+    <% end %>
+  </ul>
+</div>
@@ -0,0 +1,11 @@
+<%# FIXME should not need to replicate the article structure like this to be able to use the same formatting as the comments listing %>
+<div id='article'>
+  <div class="comments" id="comments_list">
+    <ul class="article-comments-list">
+      <%= render :partial => 'comment/comment', :collection => @comment_spam %>
+    </ul>
+  </div>
+</div>
+
+<%= pagination_links @comment_spam, :param_name => :comments_page %>
+
@@ -0,0 +1,21 @@
+<% render :layout => 'task', :locals => { :task => task } do %>
+  <% content_for :extra_buttons do %>
+    <%= button_to_function('down', _('Show details'), "toggleDetails(this, '#{_('Hide details')}', '#{_('Show details')}')" ) %>
+  <% end %>
+
+  <% content_for :extra_content do %>
+    <ul class="suggest-article-details" style="display: none">
+      <li><strong><%=_('Sent by')%></strong>: <%=task.name%> </li>
+      <li><strong><%=_('Email')%></strong>: <%=task.email%> </li>
+      <li><strong><%=_('Source')%></strong>: <%=task.source_name%> </li>
+      <li><strong><%=_('Source URL')%></strong>: <%=task.source%> </li>
+      <li><strong><%=_('Folder')%></strong>: <%=(a = Article.find_by_id(task.article_parent_id))?a.name : '<em>' + s_('Folder|none') + '</em>'%> </li>
+      <li><strong><%=_('Lead')%></strong>: <%=task.article_abstract.blank? ? '<em>' + s_('Abstract|empty') + '</em>' : task.article_abstract%> </li>
+      <li><strong><%=_('Body')%></strong>:
+      <div class='suggest-article-body'>
+        <%= task.article_body %>
+      </div>
+      </li>
+    </ul>
+  <% end %>
+<% end %>
@@ -0,0 +1,18 @@
+<div class="task_box" id="task-<%= task.id %>">
+  <%= render :partial => 'tasks/task_icon', :locals => {:task => task} %>
+  <%= render :partial => 'tasks/task_title', :locals => {:task => task} %>
+  <div class="task-information">
+    <%= task_information(task) %>
+  </div>
+
+  <%= yield %> <% # ??? %>
+
+  <% button_bar do %>
+    <%= button_to_function('new', _('Mark as NOT SPAM'), 'removeTaskBox(this, %s, "%s", "")' % [url_for(:mark_task_as_ham => task.id).to_json, "task-#{task.id}"]) %>
+    <%= yield :extra_buttons %>
+    <%= button_to_function('delete', _('Remove'), 'removeTaskBox(this, %s, "%s", %s)' % [url_for(:profile => params[:profile], :remove_task => task.id).to_json, "task-#{task.id}", _('Are you sure you want to remove this article suggestion?').to_json]) %>
+
+  <% end %>
+
+  <%= yield :extra_content %>
+</div>
@@ -0,0 +1,4 @@
+<% @task_spam.each do |t| %>
+  <%= render :partial => partial_for_class(t.class), :locals => { :task => t } %>
+<% end %>
+<%= pagination_links @task_spam, :param_name => :tasks_page %>
+<%= stylesheet('tasks') %>
+
 <h1><%= _('Manage SPAM') %></h1>
+<% no_tabs = @comment_spam.blank? && @task_spam.blank? %>
+
+<%= _('There are no spams to review.') if no_tabs %>
+
 <% button_bar do %>
   <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
 <% end %>
 <%# FIXME should not need to replicate the article structure like this to be able to use the same formatting as the comments listing %>
-<div id='article'>
-  <div class="comments" id="comments_list">
-    <ul class="article-comments-list">
-      <%= render :partial => 'comment/comment', :collection => @spam %>
-    </ul>
-  </div>
-</div>
-<%= pagination_links @spam %>
+<% tabs = [] %>
+<% tabs << {:title => _('Comment Spam'), :id => 'comment-spam',
+  :content => (render :partial => 'comment_spam')} if @comment_spam.present? %>
+<% tabs << {:title => _('Task Spam'), :id => 'task-spam',
+  :content => (render :partial => 'task_spam') } if @task_spam.present? %>
+<%= render_tabs(tabs) %>
-<% button_bar do %>
-  <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
+<% unless no_tabs %>
+  <% button_bar do %>
+    <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
+  <% end %>
 <% end %>
+
+<%= javascript_include_tag 'spam' %>
 <div class="task_box" id="task-<%= task.id %>">
-  <div class="task_icon">
-    <%
-        icon_info = task.icon
-        if icon_info[:type] == :profile_image
-          icon = profile_image(icon_info[:profile], :minor)
-        elsif icon_info[:type] == :defined_image
-          icon = "<img src='#{icon_info[:src]}' alt='#{icon_info[:name]}' />"
-        end
-      %>
-    <%=
-        if icon_info[:url]
-          link_to(icon, icon_info[:url])
-        else
-          icon
-        end
-      %>
-
-  </div>
+  <%= render :partial => 'task_icon', :locals => {:task => task} %>
   <div class="task_decisions">
     <%=
@@ -39,9 +22,7 @@
     %>
   </div><!-- class="task_decisions" -->
-  <strong class="task_title">
-    <%= task.title %>
-  </strong>
+  <%= render :partial => 'task_title', :locals => {:task => task} %>
   <div class="task_information">
     <%= task_information(task) %>
@@ -0,0 +1,16 @@
+<%
+  icon_info = task.icon
+  if icon_info[:type] == :profile_image
+    icon = profile_image(icon_info[:profile], :minor)
+  elsif icon_info[:type] == :defined_image
+    icon = "<img src='#{icon_info[:src]}' alt='#{icon_info[:name]}' />"
+  end
+
+  if icon_info[:url]
+    icon = link_to(icon, icon_info[:url])
+  end
+%>
+
+<div class="task_icon">
+  <%= icon %>
+</div>
@@ -0,0 +1,3 @@
+<strong class="task_title">
+  <%= task.title %>
+</strong>
@@ -12,6 +12,7 @@ development:
   adapter: postgresql
   encoding: unicode
   database: noosfero_development
+  template: template0
   username: noosfero
   password:
@@ -37,6 +38,7 @@ test: &amp;TEST
   adapter: postgresql
   encoding: unicode
   database: noosfero_test
+  template: template0
   username: noosfero
   password:
@@ -44,6 +46,7 @@ production:
   adapter: postgresql
   encoding: unicode
   database: noosfero_production
+  template: template0
   username: noosfero
   password:
@@ -4,4 +4,5 @@ require &#39;noosfero/plugin/manager&#39;
 require 'noosfero/plugin/active_record'
 require 'noosfero/plugin/mailer_base'
 require 'noosfero/plugin/settings'
+require 'noosfero/plugin/spammable'
 Noosfero::Plugin.init_system if $NOOSFERO_LOAD_PLUGINS
@@ -8,6 +8,7 @@ development:
   gravatar: wavatar
   googlemaps_initial_zoom: 4
   exception_recipients: [admin@example.com]
+  max_upload_size: 5MB
 test:
@@ -55,6 +55,7 @@ ActionController::Routing::Routes.draw do |map|
   # events
   map.events 'profile/:profile/events_by_day', :controller => 'events', :action => 'events_by_day', :profile => /#{Noosfero.identifier_format}/
+  map.events 'profile/:profile/events_by_month', :controller => 'events', :action => 'events_by_month', :profile => /#{Noosfero.identifier_format}/
   map.events 'profile/:profile/events/:year/:month/:day', :controller => 'events', :action => 'events', :year => /\d*/, :month => /\d*/, :day => /\d*/, :profile => /#{Noosfero.identifier_format}/
   map.events 'profile/:profile/events/:year/:month', :controller => 'events', :action => 'events', :year => /\d*/, :month => /\d*/, :profile => /#{Noosfero.identifier_format}/
   map.events 'profile/:profile/events', :controller => 'events', :action => 'events', :profile => /#{Noosfero.identifier_format}/
@@ -0,0 +1,13 @@
+class AddSpamToTask < ActiveRecord::Migration
+  def self.up
+    change_table :tasks do |t|
+      t.boolean :spam, :default => false
+    end
+    Task.update_all ["spam = ?", false]
+    add_index :tasks, [:spam]
+  end
+
+  def self.down
+    remove_column :tasks, :spam
+  end
+end
@@ -0,0 +1,13 @@
+class AddImageToArticle < ActiveRecord::Migration
+
+  def self.up
+    add_column :articles, :image_id, :integer
+    add_column :article_versions, :image_id, :integer
+  end
+
+  def self.down
+    remove_column :articles, :image_id
+    remove_column :article_versions, :image_id
+  end
+
+end
@@ -0,0 +1,13 @@
+class AddPositionToArticle < ActiveRecord::Migration
+
+  def self.up
+    add_column :articles, :position, :integer
+    add_column :article_versions, :position, :integer
+  end
+
+  def self.down
+    remove_column :articles, :position
+    remove_column :article_versions, :position
+  end
+
+end
@@ -0,0 +1,14 @@
+class EnableEnterprisesListOnUserMenu < ActiveRecord::Migration
+  def self.up
+    # The enterprises were always listed on user menu.
+    # As now it is configured by admin, the running environments should not need to enable it
+    select_all("select id from environments").each do |environment|
+      env = Environment.find(environment['id'])
+      env.enable(:display_my_enterprises_on_user_menu)
+    end
+  end
+
+  def self.down
+    #nothing to be done
+  end
+end
@@ -0,0 +1,10 @@
+class RemoveOrphanProfiles < ActiveRecord::Migration
+  def self.up
+    profiles = Profile.joins('LEFT JOIN environments ON profiles.environment_id=environments.id').where('environments.id IS NULL')
+    profiles.map(&:destroy)
+  end
+
+  def self.down
+    say 'This migration can not be reverted.'
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20130711213046) do
+ActiveRecord::Schema.define(:version => 20131116165327) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -86,6 +86,8 @@ ActiveRecord::Schema.define(:version =&gt; 20130711213046) do
     t.string   "language"
     t.string   "source_name"
     t.integer  "license_id"
+    t.integer  "image_id"
+    t.integer  "position"
   end
   add_index "article_versions", ["article_id"], :name => "index_article_versions_on_article_id"
@@ -129,6 +131,8 @@ ActiveRecord::Schema.define(:version =&gt; 20130711213046) do
     t.string   "language"
     t.string   "source_name"
     t.integer  "license_id"
+    t.integer  "image_id"
+    t.integer  "position"
   end
   add_index "articles", ["name"], :name => "index_articles_on_name"
@@ -547,8 +551,11 @@ ActiveRecord::Schema.define(:version =&gt; 20130711213046) do
     t.datetime "created_at"
     t.string   "target_type"
     t.integer  "image_id"
+    t.boolean  "spam",                       :default => false
   end
+  add_index "tasks", ["spam"], :name => "index_tasks_on_spam"
+
   create_table "thumbnails", :force => true do |t|
     t.integer "size"
     t.string  "content_type"
+noosfero (0.45.0) unstable; urgency=low
+
+  * New features release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Tue, 10 Dec 2013 16:04:33 -0300
+
+noosfero (0.45.0~rc20131202153818) squeeze-test; urgency=low
+
+  * 0.45.0 RC2
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Mon, 02 Dec 2013 15:38:28 -0300
+
+noosfero (0.44.6) unstable; urgency=low
+
+  * 0.44.5 Addendum
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Wed, 27 Nov 2013 16:45:02 -0300
+
+noosfero (0.44.5) unstable; urgency=low
+
+  * Bugfix release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Tue, 26 Nov 2013 17:39:39 -0300
+
 noosfero (0.44.4) unstable; urgency=low
   * Bugfix release
@@ -31,13 +31,11 @@ Depends:
  libgettext-rails-ruby1.8,
  libsqlite3-ruby,
  libpgsql-ruby,
- libmysql-ruby,
  librmagick-ruby,
  libredcloth-ruby,
  libwill-paginate-ruby (>= 2.3.12-1~),
  iso-codes,
  libfeedparser-ruby,
- openjdk-6-jre,
  libdaemons-ruby,
  rcov,
  thin,
@@ -15,6 +15,7 @@ Feature: blog
     And I follow "Create blog"
     Then I should see "My Blog"
     When I fill in "Title" with "My Blog"
+    And I fill in "Address" with "my-blog"
     And I press "Save"
     And I go to joaosilva's control panel
     Then I should see "Configure blog"
@@ -24,6 +25,7 @@ Feature: blog
     And I follow "Create blog"
     Then I should see "My Blog"
     When I fill in "Title" with "My Blog"
+    And I fill in "Address" with "my-blog"
     And I press "Save"
     Then I should be on /joaosilva/my-blog
@@ -33,6 +35,7 @@ Feature: blog
     And I follow "New content"
     When I follow "Blog"
     And I fill in "Title" with "Blog from cms"
+    And I fill in "Address" with "blog-from-cms"
     And I press "Save"
     Then I should be on /joaosilva/blog-from-cms
@@ -42,12 +45,14 @@ Feature: blog
     And I follow "New content"
     And I follow "Blog"
     And I fill in "Title" with "Blog One"
+    And I fill in "Address" with "blog-one"
     And I press "Save"
     Then I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     And I follow "Blog"
     And I fill in "Title" with "Blog Two"
+    And I fill in "Address" with "blog-two"
     And I press "Save"
     Then I should not see "error"
     And I should be on /joaosilva/blog-two
@@ -109,3 +114,24 @@ Feature: blog
     And I follow "New content"
     When I follow "Blog"
     Then I should see "Tag list"
+
+  Scenario: do not display the "clear cover image" when there is no uploaded image
+    Given the following blogs
+      | owner     | name    |
+      | joaosilva | My Blog |
+    And I go to joaosilva's control panel
+    And I follow "Configure blog"
+    Then I should not see "Delete cover image"
+
+  # the step for attaching a file on the input only works with capybara 1.1.2, but it requires rails 1.9.3
+  @selenium-fixme
+  Scenario: display cover image after uploading an image as the blog cover
+    Given the following blogs
+      | owner     | name    |
+      | joaosilva | My Blog |
+    And I go to joaosilva's control panel
+    And I follow "Configure blog"
+    And I attach the file "public/images/rails.png" to "Uploaded data"
+    And I press "Save"
+    When I am on /joaosilva/my-blog
+    Then there should be a div with class "blog-cover"
@@ -9,7 +9,7 @@ Feature: browse catalogs
     And the following enterprises
       | identifier | owner     | name                               | enabled |
       | artebonito | joaosilva | Associação de Artesanato de Bonito | true    |
-    And feature "disable_products_for_enterprises" is disabled on environment
+    And feature "products_for_enterprises" is enabled on environment
     And the following product_categories
       | name   |
       | categ1 |
@@ -6,7 +6,7 @@ Background:
   Given the following enterprises
     | identifier | name       |
     | shop1      | Shoes Shop |
-  And feature "disable_products_for_enterprises" is disabled on environment
+  And feature "products_for_enterprises" is enabled on environment
   And feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
 Scenario: show all enterprises
@@ -21,6 +21,7 @@ Feature: enterprise homepage
     And the following product
       | name             | category | owner  |
       | Natural Handmade | soap     | mayhem |
+    And feature "products_for_enterprises" is enabled on environment
   Scenario: display profile info
@@ -12,43 +12,38 @@ Feature: events
   Scenario: go to next month
     Given I am on /profile/josesilva/events/2009/10
-    When I follow "next »"
+    When I follow "November"
     Then I should see "November 2009" within ".current-month"
   Scenario: go to next month in global agenda
     Given I am on /assets/events?year=2009&month=11
-    When I follow "next »"
+    When I follow "December"
     Then I should see "December 2009" within ".current-month"
   Scenario: go to previous month
     Given I am on /profile/josesilva/events/2009/10
-    When I follow "« previous"
+    When I follow "September"
     Then I should see "September 2009" within ".current-month"
   Scenario: go to previous month in global agenda
     Given I am on /assets/events?year=2009&month=11
-    When I follow "« previous"
+    When I follow "October"
     Then I should see "October 2009" within ".current-month"
   Scenario: go to next month by clicking in month name
     Given I am on /profile/josesilva/events/2009/10
-    When I follow "November 2009"
+    When I follow "November"
     Then I should see "November 2009" within ".current-month"
   Scenario: go to previous month by clicking in month name
     Given I am on /profile/josesilva/events/2009/10
-    When I follow "September 2009"
+    When I follow "September"
     Then I should see "September 2009" within ".current-month"
-  Scenario: go to specific day
-    Given I am on the homepage
-    When I am on /profile/josesilva/events/2009/01/20
-    Then I should see "Events for January 20, 2009"
-
   Scenario: go to specific day in global agenda
     Given I am on the homepage
     When I am on /assets/events?year=2009&month=11&day=12
-    Then I should see "Events for November 12, 2009"
+    Then I should see "Events for November, 2009"
   Scenario: list events for specific day
     Given I am on /profile/josesilva/events/2009/10
@@ -64,7 +59,7 @@ Feature: events
       | owner     | name         | start_date |
       | josesilva | WikiSym 2009 | 2009-10-25 |
     When I am on /profile/josesilva/events/2009/10/20
-    Then I should not see "WikiSym 2009"
+    Then I should see "WikiSym 2009"
   Scenario: list event between a range
     Given I am on /profile/josesilva/events/2009/10
@@ -96,20 +91,11 @@ Feature: events
     Then I should see "Another Conference"
     And I should see "Manuel Birthday"
-  Scenario: ask for a day when no inform complete date
-    When I am on /profile/josesilva/events/2009/5
-    Then I should see "Select a day on the left to display it's events here"
-
-  Scenario: ask for a day when no inform complete date in global agenda
-    When I am on /assets/events?year=2009&month=5
-    Then I should see "Select a day on the left to display it's events here"
-
+  @selenium
   Scenario: provide links to days with events
     Given I am on /profile/josesilva/events/2009/10
     Then I should see "24" link
-    When I follow "next »"
-    Then I should see "24" link
-    When I follow "next »"
+    When I follow "November"
     Then I should not see "24" link
   Scenario: provide links to all days between start and end date
@@ -128,7 +114,7 @@ Feature: events
   @selenium
   Scenario: show events when i follow a specific day
     Given I am on /profile/josesilva/events/2009/10
-    And I should not see "Another Conference"
+    And I should see "Another Conference"
     When I follow "24"
     Then I should see "Another Conference"
@@ -138,7 +124,7 @@ Feature: events
       | owner     | name              | start_date | end_date   |
       | josesilva | YAPC::Brasil 2010 | 2010-10-30 | 2010-11-01 |
     And I am on /profile/josesilva/events/2010/10
-    And I should not see "YAPC::Brasil 2010"
+    And I should see "YAPC::Brasil 2010"
     When I follow "31"
     Then I should see "YAPC::Brasil 2010"
@@ -150,10 +136,6 @@ Feature: events
     When I follow "Back to josesilva"
     Then I should be on josesilva's homepage
-  Scenario: warn when there is no events
-    When I am on /profile/josesilva/events/2020/12/1
-    Then I should see "No events for this date"
-
   Scenario: provide button to create new event
     Given I am logged in as "josesilva"
     When I am on /profile/josesilva/events/2020/12/1
@@ -230,3 +212,35 @@ Feature: events
     Then I should see "Leaded event"
     And I should see "This is the abstract."
     And I should not see "This is the real text."
+
+  Scenario: show range date of event
+    Given I am on /profile/josesilva/events/2009/10
+    And the following events
+      | owner     | name         | start_date | end_date   |
+      | josesilva | WikiSym 2009 | 2009-10-25 | 2009-10-27 |
+    When I am on /profile/josesilva/events/2009/10/26
+    Then I should see "October 25, 2009 to October 27, 2009"
+
+  Scenario: show place of the event
+    Given I am on /profile/josesilva/events/2009/10
+    And the following events
+      | owner     | name         | start_date | end_date   |  address      |
+      | josesilva | WikiSym 2009 | 2009-10-25 | 2009-10-27 |  Earth Planet |
+    When I am on /profile/josesilva/events/2009/10/26
+    Then I should see "Place: Earth Planet"
+
+  Scenario: show event name as link
+    Given the following events
+      | owner     | name               | start_date |
+      | josesilva | Unpublished event  | 2009-10-25 |
+    And I am logged in as "josesilva"
+    When I am on /profile/josesilva/events/2009/10/25
+    Then I should see "Unpublished event" link
+
+  Scenario: go to event page
+    Given the following events
+      | owner     | name               | start_date |
+      | josesilva | Oktoberfest  | 2009-10-25 |
+    Given I am on /profile/josesilva/events/2009/10
+    When I follow "Oktoberfest"
+    Then I should see "Oktoberfest"
@@ -19,7 +19,7 @@ Feature: manage inputs
     And the following product
       | owner      | category | name       |
       | redemoinho | rock     | Abbey Road |
-    And feature "disable_products_for_enterprises" is disabled on environment
+    And feature "products_for_enterprises" is enabled on environment
     And the following units
       | singular | plural |
       | Meter    | Meters |
@@ -19,7 +19,7 @@ Feature: manage product price details
     And the following product
       | owner      | category | name       | price |
       | redemoinho | rock     | Abbey Road | 80.0  |
-    And feature "disable_products_for_enterprises" is disabled on environment
+    And feature "products_for_enterprises" is enabled on environment
     And the following inputs
       | product    | category  | price_per_unit | amount_used |
       | Abbey Road | Rock      | 10.0           | 2           |
@@ -9,7 +9,7 @@ Feature: manage products
     And the following enterprises
       | identifier | owner | name | enabled |
       | redemoinho | joaosilva | Rede Moinho | true |
-    And feature "disable_products_for_enterprises" is disabled on environment
+    And feature "products_for_enterprises" is enabled on environment
   Scenario: display "create new product" button
     Given I am logged in as "joaosilva"
	@@ -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
	@@ -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
	@@ -206,10 +206,50 @@ class ProfileController < PublicController		@@ -206,10 +206,50 @@ class ProfileController < PublicController
206	end	206	end
207		207
208	def view_more_network_activities	208	def view_more_network_activities
209	- @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page])	209	+ @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page])
210	render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}	210	render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}
211	end	211	end
212		212
		213	+ def more_comments
		214	+ activity = ActionTracker::Record.find(:first, :conditions => {:id => params[:activity], :user_id => @profile})
		215	+ comments_count = activity.comments.count
		216	+ comment_page = (params[:comment_page] \|\| 1).to_i
		217	+ comments_per_page = 5
		218	+ no_more_pages = comments_count <= comment_page * comments_per_page
		219	+
		220	+ render :update do \|page\|
		221	+ page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity],
		222	+ :partial => 'comment', :collection => activity.comments.paginate(:per_page => comments_per_page, :page => comment_page)
		223	+
		224	+ if no_more_pages
		225	+ page.remove 'profile-wall-activities-comments-more-'+params[:activity]
		226	+ else
		227	+ page.replace_html 'profile-wall-activities-comments-more-'+params[:activity],
		228	+ :partial => 'more_comments', :locals => {:activity => activity, :comment_page => comment_page}
		229	+ end
		230	+ end
		231	+ end
		232	+
		233	+ def more_replies
		234	+ activity = Scrap.find(:first, :conditions => {:id => params[:activity], :receiver_id => @profile, :scrap_id => nil})
		235	+ comments_count = activity.replies.count
		236	+ comment_page = (params[:comment_page] \|\| 1).to_i
		237	+ comments_per_page = 5
		238	+ no_more_pages = comments_count <= comment_page * comments_per_page
		239	+
		240	+ render :update do \|page\|
		241	+ page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity],
		242	+ :partial => 'profile_scrap', :collection => activity.replies.paginate(:per_page => comments_per_page, :page => comment_page), :as => :scrap
		243	+
		244	+ if no_more_pages
		245	+ page.remove 'profile-wall-activities-comments-more-'+params[:activity]
		246	+ else
		247	+ page.replace_html 'profile-wall-activities-comments-more-'+params[:activity],
		248	+ :partial => 'more_replies', :locals => {:activity => activity, :comment_page => comment_page}
		249	+ end
		250	+ end
		251	+ end
		252	+
213	def remove_scrap	253	def remove_scrap
214	begin	254	begin
215	scrap = current_user.person.scraps(params[:scrap_id])	255	scrap = current_user.person.scraps(params[:scrap_id])
	@@ -343,6 +383,7 @@ class ProfileController < PublicController		@@ -343,6 +383,7 @@ class ProfileController < PublicController
343	end	383	end
344	end	384	end
345		385
		386	+
346	protected	387	protected
347		388
348	def check_access_to_profile	389	def check_access_to_profile
	@@ -393,4 +434,5 @@ class ProfileController < PublicController		@@ -393,4 +434,5 @@ class ProfileController < PublicController
393	def relations_to_include	434	def relations_to_include
394	[:image, :domains, :preferred_domain, :environment]	435	[:image, :domains, :preferred_domain, :environment]
395	end	436	end
		437	+
396	end	438	end
	@@ -42,7 +42,7 @@ module BlogHelper		@@ -42,7 +42,7 @@ module BlogHelper
42		42
43	def display_post(article, format = 'full')	43	def display_post(article, format = 'full')
44	no_comments = (format == 'full') ? false : true	44	no_comments = (format == 'full') ? false : true
45	- html = send("display_#{format}_format", article).html_safe	45	+ html = send("display_#{format}_format", FilePresenter.for(article)).html_safe
46		46
47	article_title(article, :no_comments => no_comments) + html	47	article_title(article, :no_comments => no_comments) + html
48	end	48	end
	@@ -3,10 +3,21 @@ module CategoriesHelper		@@ -3,10 +3,21 @@ module CategoriesHelper
3		3
4	COLORS = [	4	COLORS = [
5	[ N_('Do not display at the menu'), nil ],	5	[ N_('Do not display at the menu'), nil ],
6	- [ N_('Orange'), 1 ],
7	- [ N_('Green'), 2 ],
8	- [ N_('Purple'), 3 ],
9	- [ N_('Red'), 4 ],	6	+ [ N_('Orange'), 1],
		7	+ [ N_('Green'), 2],
		8	+ [ N_('Purple'), 3],
		9	+ [ N_('Red'), 4],
		10	+ [ N_('Dark Green'), 5],
		11	+ [ N_('Blue Oil'), 6],
		12	+ [ N_('Blue'), 7],
		13	+ [ N_('Brown'), 8],
		14	+ [ N_('Light Green'), 9],
		15	+ [ N_('Light Blue'), 10],
		16	+ [ N_('Dark Blue'), 11],
		17	+ [ N_('Blue Pool'), 12],
		18	+ [ N_('Beige'), 13],
		19	+ [ N_('Yellow'), 14],
		20	+ [ N_('Light Brown'), 15]
10	]	21	]
11		22
12	TYPES = [	23	TYPES = [
	@@ -33,7 +33,7 @@ module CmsHelper		@@ -33,7 +33,7 @@ module CmsHelper
33	link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)	33	link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)
34	else	34	else
35	if article.image?	35	if article.image?
36	- image_tag(icon_for_article(article)) + link_to(article_name, article.url)	36	+ image_tag(icon_for_article(article)) + link_to(article_name, article.url)
37	else	37	else
38	link_to article_name, article.url, :class => icon_for_article(article)	38	link_to article_name, article.url, :class => icon_for_article(article)
39	end	39	end