Merging AI1826 with master

Conflicts: app/models/article.rb app/models/profile.rb app/models/uploaded_file.rb public/javascripts/application.js public/stylesheets/application.css test/unit/article_test.rb test/unit/category_finder_test.rb test/unit/enterprise_test.rb

Merging AI1826 with master
Conflicts: app/models/article.rb app/models/profile.rb app/models/uploaded_file.rb public/javascripts/application.js public/stylesheets/application.css test/unit/article_test.rb test/unit/category_finder_test.rb test/unit/enterprise_test.rb
Daniela Feitosa
2 parents 91bf3f94 ba6034cc
Showing 86 changed files with 1672 additions and 772 deletions Show diff stats
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/forum_helper.rb
app/models/action_tracker_notification.rb
app/models/article.rb
app/models/comment.rb
app/models/community.rb
app/models/enterprise.rb
app/models/event.rb
app/models/external_feed.rb
app/models/forum.rb
app/models/image.rb
app/models/person.rb
app/models/profile.rb
app/models/scrap.rb
app/models/uploaded_file.rb
app/views/profile/_add_member_in_community.rhtml
app/views/profile/_comment.rhtml
app/views/profile/_create_article.rhtml
app/views/profile/_default_activity.rhtml
@@ -3,17 +3,15 @@ class ProfileController &lt; PublicController
   needs_profile
   before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
   before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse]
-  before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_scraps, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report]
+  before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity]
   helper TagsHelper
   def index
-    @activities = @profile.tracked_actions.paginate(:per_page => 30, :page => params[:page])
-    @wall_items = []
-    @network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page]) : []
+    @network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) : []
     if logged_in? && current_person.follows?(@profile)
-      @network_activities = @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page]) if @network_activities.empty?
-      @wall_items = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page])
+      @network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) if @network_activities.empty?
+      @activities = @profile.activities.paginate(:per_page => 15, :page => params[:page])
     end
     @tags = profile.article_tags
     unless profile.display_info_to?(user)
@@ -180,22 +178,33 @@ class ProfileController &lt; PublicController
     @scrap.receiver= receiver
     @tab_action = params[:tab_action]
     @message = @scrap.save ? _("Message successfully sent.") : _("You can't leave an empty message.")
-    @scraps = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page]) if params[:not_load_scraps].nil?
-    render :partial => 'leave_scrap'
+    activities = @profile.activities.paginate(:per_page => 15, :page => params[:page]) if params[:not_load_scraps].nil?
+    render :partial => 'profile_activities_list', :locals => {:activities => activities}
   end
-  def view_more_scraps
-    @scraps = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page])
-    render :partial => 'profile_scraps', :locals => {:scraps => @scraps}
+  def leave_comment_on_activity
+    @comment = Comment.new(params[:comment])
+    @comment.author = user
+    @activity = ActionTracker::Record.find(params[:source_id])
+    @comment.source_type, @comment.source_id = (@activity.target_type == 'Article' ? ['Article', @activity.target_id] : [@activity.class.to_s, @activity.id])
+    @tab_action = params[:tab_action]
+    @message = @comment.save ? _("Comment successfully added.") : _("You can't leave an empty comment.")
+    if @tab_action == 'wall'
+      activities = @profile.activities.paginate(:per_page => 15, :page => params[:page]) if params[:not_load_scraps].nil?
+      render :partial => 'profile_activities_list', :locals => {:activities => activities}
+    else
+      network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page])
+      render :partial => 'profile_network_activities', :locals => {:network_activities => network_activities}
+    end
   end
   def view_more_activities
-    @activities = @profile.tracked_actions.paginate(:per_page => 30, :page => params[:page])
-    render :partial => 'profile_activities', :locals => {:activities => @activities}
+    @activities = @profile.activities.paginate(:per_page => 10, :page => params[:page])
+    render :partial => 'profile_activities_list', :locals => {:activities => @activities}
   end
   def view_more_network_activities
-    @activities = @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page]) 
+    @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page]) 
     render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}
   end
@@ -213,7 +222,11 @@ class ProfileController &lt; PublicController
     begin
       raise if !can_edit_profile
       activity = ActionTracker::Record.find(params[:activity_id])
-      activity.destroy
+      if params[:only_hide]
+        activity.update_attribute(:visible, false)
+      else
+        activity.destroy
+      end
       render :text => _('Activity successfully removed.')
     rescue
       render :text => _('You could not remove this activity')
@@ -285,6 +298,16 @@ class ProfileController &lt; PublicController
     end
   end
+  def remove_comment
+    #FIXME Check whether these permissions are enough
+    @comment = Comment.find(params[:comment_id])
+    if (user == @comment.author || user == profile || user.has_permission?(:moderate_comments, profile))
+      @comment.destroy
+      session[:notice] = _('Comment successfully deleted')
+    end
+    redirect_to :action => :index
+  end
+
   protected
   def check_access_to_profile
@@ -1218,15 +1218,12 @@ module ApplicationHelper
           else             _('1 minute')
         end
-      when 2..44           then _('%{distance} minutes') % { :distance => distance_in_minutes }
-      when 45..89          then _('about 1 hour')
-      when 90..1439        then _('about %{distance} hours') % { :distance => (distance_in_minutes.to_f / 60.0).round }
-      when 1440..2879      then _('1 day')
-      when 2880..43199     then _('%{distance} days') % { :distance => (distance_in_minutes / 1440).round }
-      when 43200..86399    then _('about 1 month')
-      when 86400..525599   then _('%{distance} months') % { :distance => (distance_in_minutes / 43200).round }
-      when 525600..1051199 then _('about 1 year')
-      else                      _('over %{distance} years') % { :distance => (distance_in_minutes / 525600).round }
+      when 2..44           then _('%{distance} minutes ago') % { :distance => distance_in_minutes }
+      when 45..89          then _('about 1 hour ago')
+      when 90..1439        then _('about %{distance} hours ago') % { :distance => (distance_in_minutes.to_f / 60.0).round }
+      when 1440..2879      then _('1 day ago')
+      when 2880..10079     then _('%{distance} days ago') % { :distance => (distance_in_minutes / 1440).round }
+      else                      show_time(from_time)
     end
   end
@@ -42,9 +42,9 @@ module ForumHelper
   def last_topic_update(article)
     info = article.info_from_last_update
     if info[:author_url]
-      time_ago_as_sentence(info[:date]) + ' ' + _('ago') + ' ' + _('by') + ' ' + link_to(info[:author_name], info[:author_url])
+      time_ago_as_sentence(info[:date]) + ' ' + _('by') + ' ' + link_to(info[:author_name], info[:author_url])
     else
-      time_ago_as_sentence(info[:date]) + ' ' + _('ago') + ' ' + _('by') + ' ' + info[:author_name]
+      time_ago_as_sentence(info[:date]) + ' ' + _('by') + ' ' + info[:author_name]
     end
   end
@@ -3,6 +3,8 @@ class ActionTrackerNotification &lt; ActiveRecord::Base
   belongs_to :profile
   belongs_to :action_tracker, :class_name => 'ActionTracker::Record', :foreign_key => 'action_tracker_id'
+  has_many :comments, :through => :action_tracker, :class_name => 'Comment', :foreign_key => 'source_id'
+
   validates_presence_of :profile_id, :action_tracker_id
   validates_uniqueness_of :action_tracker_id, :scope => :profile_id
@@ -8,9 +8,7 @@ class Article &lt; ActiveRecord::Base
     _('Content')
   end
-  track_actions :create_article, :after_create, :keep_params => [:name, :url], :if => Proc.new { |a| a.is_trackable? && !a.image? }, :custom_target => :action_tracker_target
-  track_actions :update_article, :before_update, :keep_params => [:name, :url], :if => Proc.new { |a| a.is_trackable? && (a.body_changed? || a.name_changed?) }, :custom_target => :action_tracker_target
-  track_actions :remove_article, :before_destroy, :keep_params => [:name], :if => Proc.new { |a| a.is_trackable? }, :custom_target => :action_tracker_target
+  track_actions :create_article, :after_create, :keep_params => [:name, :url, :lead, :first_image], :if => Proc.new { |a| a.is_trackable? && !a.image? }
   # xss_terminate plugin can't sanitize array fields
   before_save :sanitize_tag_list
@@ -23,7 +21,7 @@ class Article &lt; ActiveRecord::Base
   belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
-  has_many :comments, :dependent => :destroy, :order => 'created_at asc'
+  has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
   has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]
   has_many :categories, :through => :article_categorizations
@@ -74,7 +72,7 @@ class Article &lt; ActiveRecord::Base
   validate :translation_must_have_language
   def is_trackable?
-    self.published? && self.notifiable? && self.advertise?
+    self.published? && self.notifiable? && self.advertise? && self.profile.public_profile
   end
   def external_link=(link)
@@ -147,7 +145,7 @@ class Article &lt; ActiveRecord::Base
   before_update do |article|
     article.advertise = true
   end
-  
+
   # retrieves all articles belonging to the given +profile+ that are not
   # sub-articles of any other article.
   named_scope :top_level_for, lambda { |profile|
@@ -597,6 +595,21 @@ class Article &lt; ActiveRecord::Base
     _('Created at: ')
   end
+  def activity
+    ActionTracker::Record.find_by_target_type_and_target_id 'Article', self.id
+  end
+
+  def create_activity
+    if is_trackable? && !image?
+      save_action_for_verb 'create_article', [:name, :url, :lead, :first_image], Proc.new{}, :author
+    end
+  end
+
+  def first_image
+    img = Hpricot(self.lead.to_s).search('img[@src]').first || Hpricot(self.body.to_s).search('img').first
+    img.nil? ? '' : img.attributes['src']
+  end
+
   private
   # FIXME: workaround for development env.
 class Comment < ActiveRecord::Base
-  track_actions :leave_comment, :after_create, :keep_params => ["article.title", "article.url", "title", "url", "body"], :custom_target => :action_tracker_target 
-
   validates_presence_of :body
-  belongs_to :article, :counter_cache => true
+
+  belongs_to :source, :counter_cache => true, :polymorphic => true
+  alias :article :source
+  alias :article= :source=
+
   belongs_to :author, :class_name => 'Person', :foreign_key => 'author_id'
   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'
@@ -70,13 +72,25 @@ class Comment &lt; ActiveRecord::Base
   after_save :notify_article
   after_destroy :notify_article
   def notify_article
-    article.comments_updated
+    article.comments_updated if article.kind_of?(Article)
   end
   after_create do |comment|
-    if comment.article.notify_comments? && !comment.article.profile.notification_emails.empty?
+    if comment.source.kind_of?(Article) && comment.article.notify_comments? && !comment.article.profile.notification_emails.empty?
       Comment::Notifier.deliver_mail(comment)
     end
+
+    if comment.source.kind_of?(Article)
+      comment.article.create_activity if comment.article.activity.nil?
+      if comment.article.activity
+        comment.article.activity.increment!(:comments_count)
+        comment.article.activity.update_attribute(:visible, true)
+      end
+    end
+  end
+
+  after_destroy do |comment|
+    comment.article.activity.decrement!(:comments_count) if comment.source.kind_of?(Article) && comment.article.activity
   end
   def replies
@@ -87,4 +87,8 @@ class Community &lt; Organization
     {:title => __('Community Info and settings'), :icon => 'edit-profile-group'}
   end
+  def activities
+    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.target_id = #{self.id} UNION SELECT at.id, at.updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} at INNER JOIN articles a ON at.target_id = a.id WHERE a.profile_id = #{self.id} AND at.target_type = 'Article' ORDER BY updated_at DESC")
+  end
+
 end
@@ -180,4 +180,8 @@ class Enterprise &lt; Organization
     true
   end
+  def activities
+    Scrap.find_by_sql("SELECT id, updated_at, 'Scrap' AS klass FROM scraps WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, 'ActionTracker::Record' AS klass FROM action_tracker WHERE action_tracker.target_id = #{self.id} UNION SELECT action_tracker.id, action_tracker.updated_at, 'ActionTracker::Record' AS klass FROM action_tracker INNER JOIN articles ON action_tracker.target_id = articles.id WHERE articles.profile_id = #{self.id} AND action_tracker.target_type = 'Article' ORDER BY action_tracker.updated_at DESC")
+  end
+
 end
@@ -124,6 +124,10 @@ class Event &lt; Article
     true
   end
+  def notifiable?
+    true
+  end
+
   include Noosfero::TranslatableContent
   include MaybeAddHttp
@@ -14,6 +14,7 @@ class ExternalFeed &lt; ActiveRecord::Base
     article = TinyMceArticle.new(:name => title, :profile => blog.profile, :body => content, :published_at => date, :source => link, :profile => blog.profile, :parent => blog)
     unless blog.children.exists?(:slug => article.slug)
       article.save!
+      article.delay.create_activity
     end
   end
@@ -28,4 +28,14 @@ class Forum &lt; Folder
   def self.icon_name(article = nil)
     'forum'
   end
+
+  def notifiable?
+    true
+  end
+
+  def first_paragraph
+    return '' if body.blank?
+    paragraphs = Hpricot(body).search('p')
+    paragraphs.empty? ? '' : paragraphs.first.to_html
+  end
 end
@@ -13,7 +13,7 @@ class Image &lt; ActiveRecord::Base
                  :thumbnails => { :big      => '150x150',
                                   :thumb    => '100x100',
                                   :portrait => '64x64',
-                                  :minor    => '50x50',
+                                  :minor    => '50x50>',
                                   :icon     => '20x20!' },
                  :max_size => 5.megabytes # remember to update validate message below
@@ -442,6 +442,10 @@ class Person &lt; Profile
     user.save!
   end
+  def activities
+    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.user_id = #{self.id} ORDER BY updated_at DESC")
+  end
+
   protected
   def followed_by?(profile)
@@ -840,6 +840,11 @@ private :generate_url, :url_options
     name
   end
+  # Override in your subclasses
+  def activities
+    []
+  end
+
   private
   def self.f_categories_label_proc(environment)
     ids = environment.top_level_category_as_facet_ids
@@ -12,6 +12,7 @@ class Scrap &lt; ActiveRecord::Base
   named_scope :not_replies, :conditions => {:scrap_id => nil}
   track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.receiver != s.sender}, :custom_target => :action_tracker_target 
+
   track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.receiver == s.sender}
   after_create do |scrap|
@@ -8,7 +8,7 @@ class UploadedFile &lt; Article
     _('File')
   end
-  track_actions :upload_image, :after_create, :keep_params => ["view_url", "thumbnail_path", "parent.url", "parent.name"], :if => Proc.new { |a| a.published? && a.image? && !a.parent.nil? && a.parent.gallery? }
+  track_actions :upload_image, :after_create, :keep_params => ["view_url", "thumbnail_path", "parent.url", "parent.name"], :if => Proc.new { |a| a.published? && a.image? && !a.parent.nil? && a.parent.gallery? }, :custom_target => :action_tracker_target
   include ShortFilename
@@ -29,7 +29,7 @@ class UploadedFile &lt; Article
   end
   def thumbnail_path
-    self.image? ? self.full_filename(:thumb).gsub(File.join(RAILS_ROOT, 'public'), '') : nil
+    self.image? ? self.full_filename(:display).gsub(File.join(RAILS_ROOT, 'public'), '') : nil
   end
   def display_title
@@ -144,4 +144,9 @@ class UploadedFile &lt; Article
   def uploaded_file?
     true
   end
+
+  def action_tracker_target
+    self
+  end
+
 end
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => { :activity => activity, :tab_action => tab_action } %>
@@ -0,0 +1,67 @@
+<% Comment %>
+<% Profile %>
+<% Person %>
+
+<li class="article-comment" style='border-bottom:none;'>
+  <div class="article-comment-inner">
+
+  <div class="comment-content comment-logged-in">
+
+  <% if comment.author %>
+    <%= link_to image_tag(profile_icon(comment.author, :minor)),
+        Person.find(comment.author_id).url,
+        :class => 'comment-picture',
+        :title => comment.author_name
+    %>
+  <% end %>
+
+  <div class="comment-details">
+    <div class="comment-text">
+      <%= link_to(comment.author_name, comment.author.url) %>
+      <% unless comment.title.blank? %>
+        <span class="comment-title"><%= comment.title %></span><br/>
+      <% end %>
+      <%= txt2html comment.body %>
+    </div>
+    <div class="profile-activity-time">
+      <%= time_ago_as_sentence(comment.created_at) %>
+    </div>
+  </div>
+
+  <% if logged_in? && (user == profile || user == comment.author || user.has_permission?(:moderate_comments, profile)) %>
+    <% button_bar(:style => 'float: right; margin-top: 0px;') do %>
+      <%= icon_button(:delete, _('Remove'), { :action => :remove_comment, :comment_id => comment.id }, :method => :get, :confirm => _('Are you sure you want to remove this comment and all its replies?')) %>
+    <% end %>
+  <% end %>
+  <br style="clear: both;" />
+
+  <div class="comment_reply post_comment_box closed">
+    <% if @comment && @comment.errors.any? && @comment.reply_of_id.to_i == comment.id %>
+      <%= error_messages_for :comment %>
+      <script type="text/javascript">
+        jQuery(function() {
+          document.location.href = '#<%= comment.anchor %>';
+          add_comment_reply_form('#comment-reply-to-<%= comment.id %>', <%= comment.id %>);
+        });
+      </script>
+    <% end %>
+    <%= report_abuse(comment.author, :comment_link, comment) if comment.author %>
+    <%= link_to_function _('Reply'),
+        "var f = add_comment_reply_form(this, %s); f.find('input[name=comment[title]], textarea').val(''); return false" % comment.id,
+        :class => 'comment-footer comment-footer-link comment-footer-hide',
+        :id => 'comment-reply-to-' + comment.id.to_s
+    %>
+  </div>
+
+  </div>
+
+  <% unless comment.replies.blank? %>
+  <ul class="comment-replies">
+    <% comment.replies.each do |reply| %>
+      <%= render :partial => 'comment', :locals => { :comment => reply } %>
+    <% end %>
+  </ul>
+  <% end %>
+
+  </div>
+</li>
@@ -0,0 +1,22 @@
+<div class='profile-activity-image'>
+  <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+</div>
+<div class='profile-activity-description profile-activity-article-<%= activity.target.class.icon_name %>'>
+  <p class='profile-activity-text'>
+    <%= link_to activity.user.short_name(20), activity.user.url %>
+    <%= _("on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url) if activity.target.profile.is_a?(Community) %>
+  </p>
+  <div class='profile-activity-lead'>
+    <div class='article-name'><%= link_to(activity.params['name'], activity.params['url']) %></div>
+    <span title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-new<%= activity.target.class.icon_name %>'></span>
+    <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'], :length => 1000, :ommision => '...')).gsub(/(\xA0|\xC2|\s)+/, ' ').gsub(/^\s+/, '') %> <small><%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %></small>
+  </div>
+  <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>
+  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <div class='profile-wall-actions'>
+    <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
+    <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id, :only_hide => true}, :confirm => _('Are you sure?'), :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+  </div>
+</div>
+
+<%= render :partial => 'profile_comments', :locals => { :activity => activity, :tab_action => tab_action } %>
@@ -0,0 +1,13 @@
+<div class='profile-activity-image'>
+  <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+</div>
+<div class='profile-activity-description'>
+  <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
+  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <div class='profile-wall-actions'>
+    <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
+    <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+  </div>
+</div>
+
+<%= render :partial => 'profile_comments', :locals => { :activity => activity, :tab_action => tab_action } %>
@@ -0,0 +1 @@
+_add_member_in_community.rhtml
 \ No newline at end of file
@@ -0,0 +1 @@
+NÃO É PRA APARECER
-<%= @message %>
-<% unless @scraps.nil? %>
-  <%= render :partial => 'profile_scraps', :locals => {:scraps => @scraps} %>
-<% end %>
+<div class='profile-activity-image'>
+  <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+</div>
+<div class='profile-activity-description'>
+  <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
+  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <div class='profile-wall-actions'>
+    <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+  </div>
+</div>
+
+<br/>
@@ -0,0 +1 @@
+_leave_scrap.rhtml
 \ No newline at end of file
@@ -0,0 +1 @@
+_add_member_in_community.rhtml
 \ No newline at end of file
-<tr>
-  <td colspan='2'>
+NÃO DEVE APARECER
-    <% plugins_tabs = @plugins.dispatch(:profile_tabs).
-      map { |tab| {:title => tab[:title], :id => tab[:id], :content => instance_eval(&tab[:content]), :start => tab[:title]} }%>
-
-    <% tabs = plugins_tabs.select { |tab| tab[:start] } %>
-
-    <% if logged_in? && current_person.follows?(@profile) %>
-      <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
-    <% end %>
-
-    <% if @profile.organization? %>
-      <% tabs << {:title => _('What\'s new'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
-      <% tabs << {:title => _('Profile'), :id => 'organization-profile', :content => (render :partial => 'organization_profile')} %>
-    <% elsif @profile.person? %>
-      <% if logged_in? && current_person.follows?(@profile) %>
-        <% tabs << {:title => _('Network'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
-      <% end %>
-
-      <% tabs << {:title => _('Activity'), :id => 'profile-activity', :content => (render :partial => 'profile_activity')} %>
-      <% tabs << {:title => _('Profile'), :id => 'person-profile', :content => (render :partial => 'person_profile')} %>
-    <% end %>
-
-    <% tabs += plugins_tabs.select { |tab| !tab[:start] } %>
-
-    <%= render_tabs(tabs) %>
-
-  </td>
-</tr>
@@ -1,18 +0,0 @@
-<% activities.each do |activity| %>
-  <li class='profile-activity-item <%= activity.verb %>' id='profile-activity-item-<%= activity.id %>'>
-    <div class='profile-activity-image'>
-      <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
-    </div>
-    <div class='profile-activity-description'>
-      <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p>
-      <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-      <%= button_to_remote(:delete, content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if can_edit_profile %>
-    </div>
-    <hr />  
-  </li>
-<% end %>
-<% if activities.current_page < activities.total_pages %>
-  <div id='profile_activities_page_<%= activities.current_page %>'>
-    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_activities', :page => (activities.current_page + 1)}, :update => "profile_activities_page_#{activities.current_page}" %>
-  </div>
-<% end %>
@@ -0,0 +1,16 @@
+<% unless activities.nil? %>
+  <% activities.each do |a| %>
+    <% activity = a.klass.constantize.find(a.id) %>
+    <% 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 } %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<% if activities.current_page < activities.total_pages %>
+  <div id='profile_activities_page_<%= activities.current_page %>'>
+    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_activities', :page => (activities.current_page + 1)}, :update => "profile_activities_page_#{activities.current_page}" %>
+  </div>
+<% end %>
@@ -0,0 +1,2 @@
+NÂO DEVE APARECER!!
+
-<div id='profile-activity'>
-  <h3><%= _("%s's activity") % @profile.name %></h3>
-  <ul>
-    <%= render :partial => 'profile_activities', :locals => {:activities => @activities} %>
-  </ul>
-</div>
+<li class='profile-activity-item <%= activity.verb %>' id='profile-activity-item-<%= activity.id %>'>
+  <%= render :partial => activity.verb, :locals => { :activity => activity, :tab_action => tab_action }%>
+  <hr />
+</li>
@@ -0,0 +1,20 @@
+<div id='profile-wall-reply-<%= activity.id%>'>
+  <div id='profile-wall-reply-form-<%= activity.id%>'>
+    <p class='profile-wall-reply'>
+      <% update_area = tab_action == 'wall' ? 'profile_activities' : 'network-activities' %>
+      <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity', :tab_action => tab_action}, :html => { :class => 'profile-wall-reply-form', 'data-update' => update_area } do %>
+        <%= text_area :comment, :body, {:id => "reply_content_#{activity.id}",
+                                        :cols => 50,
+                                        :rows => 1,
+                                        :class => 'submit-with-keypress',
+                                        :title => _('Leave your comment'),
+                                        :onfocus => ('if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + profile_icon(current_person, :icon, false) + ')"' if logged_in?),
+                                        :onblur => ('if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"' if logged_in?),
+                                        :value => _('Leave your comment'),
+                                        :style => 'color: #ccc' } %>
+        <%= hidden_field_tag :source_id, activity.id, :id => "activity_id_#{activity.id}" %>
+      <% end %>
+    </p>
+  </div>
+  <div id='profile-wall-message-response-<%=activity.id%>' class='profile-wall-message-response'></div>
+</div>
@@ -0,0 +1,13 @@
+<hr />
+
+<% if activity.comments_count > 2 %>
+  <div class='view-all-comments icon-chat'>
+    <%= link_to(_("View all %s comments") % activity.comments_count, '#') %>
+  </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 } %>
 <h3><%= _("%s's network activity") % @profile.name %></h3>
-<ul>
+<ul id='network-activities' class='profile-activities'>
   <%= render :partial => 'profile_network_activities', :locals => {:network_activities => @network_activities} %>
 </ul>
-  <% network_activities.each do |activity| %>
-    <li class='profile-network-item <%= activity.verb %>' id='profile-network-item-<%= activity.id %>'>
-      <div class='profile-network-image'>
-        <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
-        <% if logged_in? && current_person.follows?(activity.user) && current_person != activity.user %>
-          <p class='profile-network-send-message'><%= link_to_function _('Scrap'), "hide_and_show(['#profile-network-message-response-#{activity.id}'],['#profile-network-message-#{activity.id}', '#profile-network-form-#{activity.id}']);$('content_#{activity.id}').value='';return false", :class => "profile-send-message", :title => _("Send a message to %s") % activity.user.name  %></p>
-        <% end %>
-      </div>
-      <div class='profile-network-description'>
-        <p class='profile-network-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p>
-        <p class='profile-network-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-        <%= button_to_remote(:delete, content_tag(:span, _('Remove')), :url =>{:action => 'remove_notification', :activity_id => activity.id}, :update => "profile-network-item-#{activity.id}") if can_edit_profile %>
-        <p class='profile-network-where'><%= _('In community %s') % link_to(activity.target.name, activity.target.url) if !profile.is_a?(Community) && activity.target.is_a?(Community) %></p>
-      </div>
-        <div id='profile-network-message-<%= activity.id%>' style='display:none;'>
-        <div id='profile-network-form-<%= activity.id%>' style='display:none;'>
-        <p class='profile-network-message'>
-          <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :not_load_scraps => true}, :update => "profile-network-message-response-#{activity.id}", :success =>"hide_and_show(['#profile-network-form-#{activity.id}'],['#profile-network-message-response-#{activity.id}'])" do %>
-            <%= limited_text_area :scrap, :content, 420, "content_#{activity.id}", :cols => 50, :rows => 2 %>
-            <%= hidden_field_tag 'receiver_id', activity.user.id %>
-            <%= submit_button :add, _('Leave a message') %>
-            <%= button_to_function :cancel, _('Cancel'), "hide_and_show(['#profile-network-message-#{activity.id}'],[]);return false" %>
-          <% end %>
-        </p>
-        </div>
-        <div id='profile-network-message-response-<%=activity.id%>' class='profile-network-message-response'></div>
-        </div>
-      <hr />  
-    </li>
-  <% end %>
+<% network_activities.each do |activity| %>
+  <%= render :partial => 'profile_activity', :locals => { :activity => activity, :tab_action => 'network' } if activity.visible? %>
+<% end %>
 <% if network_activities.current_page < network_activities.total_pages %>
   <div id='profile_network_activities_page_<%= network_activities.current_page %>'>
     <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_network_activities', :page => (network_activities.current_page + 1)}, :update => "profile_network_activities_page_#{network_activities.current_page}" %>
-<li class='profile-wall-item' id='profile-wall-item-<%= scrap.id %>'>
-  <div class='profile-wall-image'>
+<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) %>
-    <% if logged_in? && current_person.follows?(scrap.sender) && current_person != scrap.sender %>
-      <p class='profile-wall-send-message'><%= link_to_function _('Scrap'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-message-#{scrap.id}', '#profile-wall-form-#{scrap.id}']);$('content_#{scrap.id}').value='';return false", :class => "profile-send-message", :title => _("Send a message to %s") % scrap.sender.name %></p>
-    <% end %>
   </div>
-  <% comment_balloon :class => 'profile-wall-description' do %>
-    <p class='profile-wall-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
-    <p class='profile-wall-time'><%= time_ago_as_sentence(scrap.created_at) + ' ' + _('ago') %></p>
-    <p class='profile-wall-text'><%= txt2html scrap.content %></p>
-    <%= button_to_remote(:delete, content_tag(:span, _('Remove')), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-wall-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %>
-    <% if logged_in? && current_person.follows?(scrap.sender) && scrap.root.nil? %>
-      <p class='profile-wall-send-reply'><%= link_to_function _('Reply'), "hide_and_show(['#profile-wall-reply-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('scrap_id_#{scrap.id}').value='#{scrap.id}';return false", :class => "profile-send-reply icon-reply" %></p>
+  <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_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-activity-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %>
+    </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-scrap-replies">
+
+  <ul class="profile-wall-activities-comments scrap-replies" style="width: auto; <%= 'display:none;' if (scrap.replies.count > 2) %>" >
     <% scrap.replies.map do |reply| %>
       <%= render :partial => 'profile_scrap', :locals => {:scrap => reply} %>
     <% end %>
   </ul>
-  <div id='profile-wall-message-<%= scrap.id%>' style='display:none;'>
-    <div id='profile-wall-form-<%= scrap.id%>' style='display:none;'>
-      <p class='profile-wall-message'>
-        <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :not_load_scraps => true}, :update => "profile-wall-message-response-#{scrap.id}", :success =>"hide_and_show(['#profile-wall-form-#{scrap.id}'],['#profile-wall-message-response-#{scrap.id}'])" do %>
-          <%= limited_text_area :scrap, :content, 420, "content_#{scrap.id}", :cols => 50, :rows => 2 %>
-          <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
-          <%= submit_button :add, _('Leave a scrap') %>
-          <%= button_to_function :cancel, _('Cancel'), "hide_and_show(['#profile-wall-message-#{scrap.id}'],[]);return false" %>
-        <% end %>
-      </p>
-    </div>
-    <div id='profile-wall-message-response-<%=scrap.id%>' class='profile-wall-message-response'></div>
-  </div>
-  <div id='profile-wall-reply-<%= scrap.id%>' style='display:none;'>
-    <div id='profile-wall-reply-form-<%= scrap.id%>' style='display:none;'>
-      <p class='profile-wall-reply'>
-        <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap'}, :update => "profile_scraps", :success =>"hide_and_show(['#profile-wall-reply-form-#{scrap.id}'],['#profile-wall-reply-response-#{scrap.id}'])" do %>
-          <%= limited_text_area :scrap, :content, 420, "reply_content_#{scrap.id}", :cols => 50, :rows => 2 %>
-          <%= hidden_field :scrap, :scrap_id, :id => "scrap_id_#{scrap.id}" %>
-          <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
-          <%= submit_button :add, _('Leave a scrap') %>
-          <%= button_to_function :cancel, _('Cancel'), "hide_and_show(['#profile-wall-reply-#{scrap.id}'],[]);return false" %>
-        <% end %>
-      </p>
-    </div>
-    <div id='profile-wall-message-response-<%=scrap.id%>' class='profile-wall-message-response'></div>
-  </div>
+  <%= render :partial => 'profile_scrap_reply_form', :locals => { :scrap => scrap } %>
   <hr />  
 </li>
@@ -0,0 +1,20 @@
+<div id='profile-wall-reply-<%= scrap.id%>' style='display:none'>
+  <div id='profile-wall-reply-form-<%= scrap.id%>' style='display:none'>
+    <p class='profile-wall-reply'>
+      <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap'}, :update => "profile_activities", :html => { :class => 'profile-wall-reply-form'} do %>
+        <%= text_area :scrap, :content, { :id => "reply_content_#{scrap.id}",
+                                          :cols => 50,
+                                          :rows => 1,
+                                          :class => 'submit-with-keypress',
+                                          :title => _('Leave your comment'),
+                                          :onfocus => ('if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + profile_icon(current_person, :icon, false) + ')"' if logged_in?),
+                                          :onblur => ('if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"' if logged_in?),
+                                        :value => _('Leave your comment')
+                                        } %>
+        <%= hidden_field_tag 'scrap[scrap_id]', scrap.id %>
+        <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
+      <% end %>
+    </p>
+  </div>
+  <div id='profile-wall-message-response-<%=scrap.id%>' class='profile-wall-message-response'></div>
+</div>
-<% scraps.map do |scrap| %>
-  <%= render :partial => 'profile_scrap', :locals => {:scrap => scrap} %>
-<% end %>
-<% if scraps.current_page < scraps.total_pages %>
-  <div id='profile_scraps_page_<%= scraps.current_page %>'>
-    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_scraps', :page => (scraps.current_page + 1)}, :update => "profile_scraps_page_#{scraps.current_page}" %>
-  </div>
-<% end %>
+NÃO DEVE APARECER
 <h3><%= _("%s's wall") % @profile.name %></h3>
 <div id='leave_scrap'>
   <%= flash[:error] %>
-  <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_scraps', :success => "$('leave_scrap_content').value=''" do %>
+  <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''" do %>
     <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2 %>
-    <%= submit_button :scrap, _('Leave a scrap') %>
+    <%= submit_button :new, _('Share') %>
   <% end %>
 </div>
 <div id='leave_scrap_response'></div>
-<ul id='profile_scraps'>
-  <%= render :partial => 'profile_scraps', :locals => {:scraps => @wall_items} %>
+<ul id='profile_activities' class='profile-activities'>
+  <%= render :partial => 'profile_activities_list', :locals => {:activities => @activities} %>
 </ul>
@@ -0,0 +1 @@
+NAO É PRA APARECER
@@ -0,0 +1,20 @@
+<div class="activity-gallery-images-count-<%= activity.get_view_url.size %>">
+  <div class='profile-activity-image'>
+    <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+  </div>
+  <div class='profile-activity-description'>
+    <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
+    <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+    <div class='profile-wall-actions'>
+      <%= link_to(s_('profile|Comment'), '#', { :class => 'focus-on-comment'}) unless activity.get_view_url.size == 1 %>
+      <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+    </div>
+  </div>
+</div>
+<div title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-newgallery'></div>
+
+<% if activity.get_view_url.size == 1 %>
+  <%= render :partial => 'profile_comments', :locals => { :activity => activity, :tab_action => tab_action } %>
+<% end %>
+
+<br/>
@@ -17,6 +17,31 @@
 <% if @profile.public? || (logged_in? && current_person.follows?(@profile)) %>
   <table class='profile'>
-    <%= render :partial => 'profile' %>
+    <tr>
+      <td colspan='2'>
+        <% plugins_tabs = @plugins.dispatch(:profile_tabs).
+          map { |tab| {:title => tab[:title], :id => tab[:id], :content => instance_eval(&tab[:content]), :start => tab[:title]} }%>
+
+        <% tabs = plugins_tabs.select { |tab| tab[:start] } %>
+
+        <% if @profile.organization? %>
+          <% tabs << {:title => _('Profile'), :id => 'organization-profile', :content => (render :partial => 'organization_profile')} %>
+          <% if logged_in? && current_person.follows?(@profile) %>
+            <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
+          <% end %>
+          <% tabs << {:title => _('What\'s new'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
+        <% elsif @profile.person? %>
+          <% tabs << {:title => _('Profile'), :id => 'person-profile', :content => (render :partial => 'person_profile')} %>
+          <% if logged_in? && current_person.follows?(@profile) %>
+            <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
+            <% tabs << {:title => _('Network'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
+          <% end %>
+        <% end %>
+
+        <% tabs += plugins_tabs.select { |tab| !tab[:start] } %>
+
+        <%= render_tabs(tabs) %>
+      </td>
+    </tr>
   </table>
 <% end %>
@@ -2,7 +2,7 @@
 <% task.abuse_reports.each do |abuse_report| %>
   <div>
     <strong style="word-wrap: break-word; display: block; padding-right: 40px">"<%= abuse_report.reason %>"</strong> <br />
-    <i><%= _('Reported by %{reporter} %{time}.') % {:reporter => abuse_report.reporter.name, :time => time_ago_as_sentence(abuse_report.created_at) + ' ' + _('ago')}%></i> <br />
+    <i><%= _('Reported by %{reporter} %{time}.') % {:reporter => abuse_report.reporter.name, :time => time_ago_as_sentence(abuse_report.created_at) }%></i> <br />
     <% if !abuse_report.content.blank? %>
       <button class="display-abuse-report-details" data-report="<%=abuse_report.id%>"><%=_('View details')%></button>
       <div style='display: none' id=<%= 'abuse-report-details-'+abuse_report.id.to_s %> class="abuse-report-details">
@@ -5,18 +5,7 @@ require &#39;noosfero/i18n&#39;
 ActionTrackerConfig.verbs = {
   :create_article => { 
-    :description => lambda { n_('published 1 article: %{title}', 'published %{num} articles: %{title}', get_name.size) % { :num => get_name.size, :title => '{{ta.collect_group_with_index(:name){ |n,i| link_to(truncate(n), ta.get_url[i]) }.to_sentence(:connector => "%s")}}' % _("and") } },
-    :type => :groupable
-  },
-
-  :update_article => { 
-    :description => lambda { n_('updated 1 article: %{title}', 'updated %{num} articles: %{title}', get_name.uniq.size) % { :num => get_name.uniq.size, :title => '{{ta.collect_group_with_index(:name){ |n,i| link_to(truncate(n), ta.get_url[i]) }.uniq.to_sentence(:connector => "%s")}}' % _("and") } },
-    :type => :groupable
-  },
-
-  :remove_article => { 
-    :description => lambda { n_('removed 1 article: %{title}', 'removed %{num} articles: %{title}', get_name.size) % { :num => get_name.size, :title => '{{ta.get_name.collect{ |n| truncate(n) }.to_sentence(:connector => "%s")}}' % _("and") } },
-    :type => :groupable
+    :description => lambda { _('published an article: %{title}') % { :title => '{{link_to(truncate(ta.get_name), ta.get_url)}}' } }
   },
   :new_friendship => { 
@@ -33,24 +22,11 @@ ActionTrackerConfig.verbs = {
     :description => lambda { _('has joined the community.') },
   },
-  :remove_member_in_community => { 
-    :description => lambda { _('has left the community.') },
-  },
-
-  :leave_community => {
-    :description => lambda { n_('has left 1 community:<br />%{name}', 'has left %{num} communities:<br />%{name}', get_resource_name.size) % { :num => get_resource_name.size, :name => '{{ta.collect_group_with_index(:resource_name){ |n,i| link_to(image_tag(ta.get_resource_profile_custom_icon[i] || default_or_themed_icon("/images/icons-app/community-icon.png")), ta.get_resource_url[i], :title => n)}.join}}' } },
-    :type => :groupable
-  },
-
   :upload_image => { 
-    :description => lambda { n_('uploaded 1 image:<br />%{thumbnails}<br />%{details}', 'uploaded %{num} images:<br />%{thumbnails}<br />%{details}', get_view_url.size) % { :num => get_view_url.size, :thumbnails => '{{ta.collect_group_with_index(:thumbnail_path){ |t,i| content_tag(:span, link_to(image_tag(t), ta.get_view_url[i]))}.last(3).join}}', :details => '{{unique_with_count(ta.collect_group_with_index(:parent_name){ |n,i| link_to(n, ta.get_parent_url[i])}, "%s").join("<br />")}}' % _("in the gallery") } },
+    :description => lambda { n_('uploaded 1 image<br />%{thumbnails}<br style="clear: both;" />', 'uploaded %{num} images<br />%{thumbnails}<br style="clear: both;" />', get_view_url.size) % { :num => get_view_url.size, :thumbnails => '{{ta.collect_group_with_index(:thumbnail_path){ |t,i| content_tag(:span, link_to(image_tag(t), ta.get_view_url[i]))}.last(3).join}}' } },
     :type => :groupable
   },
-  :leave_comment => {
-    :description => lambda { _('has left a comment entitled "%{title}" on the article %{article}: <br /> "%{comment}" (%{read})') % { :title => "{{truncate(ta.get_title)}}", :article => "{{link_to(truncate(ta.get_article_title), ta.get_article_url)}}", :comment => "{{truncate(ta.get_body, 50)}}", :read => '{{link_to("%s", ta.get_url)}}' % _("read") } }
-  },
-
   :leave_scrap => {
     :description => lambda { _('sent a message to %{receiver}: <br /> "%{message}"') % { :receiver => "{{link_to(ta.get_receiver_name, ta.get_receiver_url)}}", :message => "{{auto_link_urls(ta.get_content)}}" } }
   },
@@ -0,0 +1,12 @@
+class AddPolymorphismOnComment < ActiveRecord::Migration
+  def self.up
+    rename_column :comments, :article_id, :source_id
+    add_column :comments, :source_type, :string
+    execute("update comments set source_type = 'Article'")
+  end
+
+  def self.down
+    remove_column :comments, :source_type
+    rename_column :comments, :source_id, :article_id
+  end
+end
@@ -0,0 +1,9 @@
+class AddCommentCountToActionTracker < ActiveRecord::Migration
+  def self.up
+    add_column :action_tracker, :comments_count, :integer, :default => 0
+  end
+
+  def self.down
+    remove_column :action_tracker, :comments_count, :integer
+  end
+end
@@ -0,0 +1,17 @@
+class RemoveUselessTrackedActions < ActiveRecord::Migration
+  def self.up
+    select_all("SELECT id FROM action_tracker").each do |tracker|
+      verbs = ['update_article', 'remove_article', 'leave_comment', 'leave_community', 'remove_member_in_community']
+      activity = ActionTracker::Record.find_by_id(tracker['id'])
+      if activity
+        if (activity.updated_at.to_time < Time.now.months_ago(3)) || verbs.include?(activity.verb)
+          activity.destroy
+        end
+      end
+    end
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
@@ -0,0 +1,9 @@
+class AddVisibilityToActionTracker < ActiveRecord::Migration
+  def self.up
+    add_column :action_tracker, :visible, :boolean, :default => true
+  end
+
+  def self.down
+    remove_column :action_tracker, :visible, :boolean
+  end
+end
@@ -0,0 +1,24 @@
+class AdaptCreateArticlesActivity < ActiveRecord::Migration
+
+  # Removing 'create_article' activities that grouped articles.
+  # Creating new activities only to recent articles (not grouping)
+  def self.up
+    select_all("SELECT id FROM action_tracker WHERE verb = 'create_article'").each do |tracker|
+      activity = ActionTracker::Record.find_by_id(tracker['id'])
+      if activity
+        activity.destroy
+      end
+    end
+
+      select_all("SELECT id FROM articles").each do |art|
+      article = Article.find(art['id'])
+      if article && article.created_at >= 8.days.ago && article.author && article.author.kind_of?(Person)
+        article.create_activity
+      end
+    end
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
@@ -29,6 +29,8 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
     t.string   "verb"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "comments_count", :default => 0
+    t.boolean  "visible",        :default => true
   end
   add_index "action_tracker", ["target_id", "target_type"], :name => "index_action_tracker_on_dispatcher_id_and_dispatcher_type"
@@ -200,7 +202,7 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
   create_table "comments", :force => true do |t|
     t.string   "title"
     t.text     "body"
-    t.integer  "article_id"
+    t.integer  "source_id"
     t.integer  "author_id"
     t.string   "name"
     t.string   "email"
@@ -208,6 +210,7 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
     t.integer  "reply_of_id"
     t.string   "ip_address"
     t.boolean  "spam"
+    t.string   "source_type"
   end
   create_table "contact_lists", :force => true do |t|
 class NotifyActivityToProfilesJob < Struct.new(:tracked_action_id)
   NOTIFY_ONLY_COMMUNITY = [
-    'add_member_in_community',
-    'remove_member_in_community',
+    'add_member_in_community'
   ]
   NOT_NOTIFY_COMMUNITY = [
-    'join_community',
-    'leave_community',
+    'join_community'
   ]
   def perform
     return unless ActionTracker::Record.exists?(tracked_action_id)
@@ -17,14 +15,23 @@ class NotifyActivityToProfilesJob &lt; Struct.new(:tracked_action_id)
       return
     end
+    # Notify the user
     ActionTrackerNotification.create(:profile_id => tracked_action.user.id, :action_tracker_id => tracked_action.id)
+    # Notify all friends
     ActionTrackerNotification.connection.execute("insert into action_tracker_notifications(profile_id, action_tracker_id) select f.friend_id, #{tracked_action.id} from friendships as f where person_id=#{tracked_action.user.id} and f.friend_id not in (select atn.profile_id from action_tracker_notifications as atn where atn.action_tracker_id = #{tracked_action.id})")
     if target.is_a?(Community)
-      ActionTrackerNotification.connection.execute("insert into action_tracker_notifications(profile_id, action_tracker_id) select distinct profiles.id, #{tracked_action.id} from role_assignments, profiles where profiles.type = 'Person' and profiles.id = role_assignments.accessor_id and profiles.id != #{tracked_action.user.id} and role_assignments.resource_type = 'Profile' and role_assignments.resource_id = #{target.id}")
-
       ActionTrackerNotification.create(:profile_id => target.id, :action_tracker_id => tracked_action.id) unless NOT_NOTIFY_COMMUNITY.include?(tracked_action.verb)
+
+      ActionTrackerNotification.connection.execute("insert into action_tracker_notifications(profile_id, action_tracker_id) select distinct profiles.id, #{tracked_action.id} from role_assignments, profiles where profiles.type = 'Person' and profiles.id = role_assignments.accessor_id and profiles.id != #{tracked_action.user.id} and profiles.id not in (select atn.profile_id from action_tracker_notifications as atn where atn.action_tracker_id = #{tracked_action.id}) and role_assignments.resource_type = 'Profile' and role_assignments.resource_id = #{target.id}")
+    end
+
+    if target.is_a?(Article) && target.profile.is_a?(Community)
+      ActionTrackerNotification.create(:profile_id => target.profile.id, :action_tracker_id => tracked_action.id) unless NOT_NOTIFY_COMMUNITY.include?(tracked_action.verb)
+
+      ActionTrackerNotification.connection.execute("insert into action_tracker_notifications(profile_id, action_tracker_id) select distinct profiles.id, #{tracked_action.id} from role_assignments, profiles where profiles.type = 'Person' and profiles.id = role_assignments.accessor_id and profiles.id != #{tracked_action.user.id} and profiles.id not in (select atn.profile_id from action_tracker_notifications as atn where atn.action_tracker_id = #{tracked_action.id}) and role_assignments.resource_type = 'Profile' and role_assignments.resource_id = #{target.profile.id}")
     end
+
   end
 end
@@ -91,7 +91,7 @@
 .icon-lock	       { background-image: url(Tango/16x16/actions/lock.png) }
 .icon-chat             { background-image: url(Tango/16x16/apps/internet-group-chat.png); background-repeat: no-repeat }
 .icon-reply            { background-image: url(Tango/16x16/actions/mail-reply-sender.png) }
-.icon-newforum   { background-image: url(Tango/16x16/apps/system-users.png) }
+.icon-newforum   { background-image: url(Tango/16x16/apps/internet-group-chat.png) }
 .icon-forum      { background-image: url(Tango/16x16/apps/system-users.png) }
 .icon-gallery   { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
 .icon-newgallery   { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
@@ -24,3 +24,9 @@
 #profile-wall ul {
   width: 460px;
 }
+#profile-activity ul.comment-replies,
+#profile-network ul.comment-replies,
+#profile-wall ul.comment-replies {
+  width: auto;
+}
+
@@ -23,3 +23,48 @@
 #profile-wall ul {
   width: 620px;
 }
+
+.profile-activity-lead {
+  width: 534px;
+}
+
+#profile-wall textarea {
+  width: 534px;
+}
+
+#profile-wall #leave_scrap textarea {
+  width: 640px;
+}
+
+#profile-wall li textarea {
+  width: 548px;
+}
+
+.profile-activity-article-forum .profile-activity-lead {
+  background: url(/images/forum-activity-bg-onecol.png);
+  width: 489px;
+}
+
+#profile-wall li.profile-activity-item.upload_image span,
+#profile-wall li.profile-activity-item.upload_image span img,
+#profile-wall li.profile-activity-item.upload_image span a,
+#profile-network li.profile-activity-item.upload_image span,
+#profile-network li.profile-activity-item.upload_image span img,
+#profile-network li.profile-activity-item.upload_image span a {
+  width: 178px;
+  height: 144px;
+}
+
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span,
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a img,
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a img,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a {
+  max-width: 540px;
+}
+
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a {
+  background-image: url(/images/gallery-image-activity-border-big-onecol.png);
+}
@@ -23,3 +23,43 @@
 #profile-wall ul {
   width: 620px;
 }
+
+.profile-activity-lead {
+  width: 534px;
+}
+
+#profile-wall textarea {
+  width: 534px;
+}
+
+#profile-wall #leave_scrap textarea {
+  width: 640px;
+}
+
+#profile-wall li textarea {
+  width: 548px;
+}
+
+.profile-activity-article-forum .profile-activity-lead {
+  background: url(/images/forum-activity-bg-onecol.png);
+  width: 489px;
+}
+
+#profile-wall li.profile-activity-item.upload_image span,
+#profile-wall li.profile-activity-item.upload_image span img,
+#profile-wall li.profile-activity-item.upload_image span a,
+#profile-network li.profile-activity-item.upload_image span,
+#profile-network li.profile-activity-item.upload_image span img,
+#profile-network li.profile-activity-item.upload_image span a {
+  width: 178px;
+  height: 144px;
+}
+
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span,
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a img,
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a img,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a {
+  max-width: 540px;
+}
@@ -711,6 +711,41 @@ Array.min = function(array) {
   return Math.min.apply(Math, array);
 };
+jQuery(function($){
+  $('.submit-with-keypress').live('keydown', function(e) {
+     field = this;
+     if (e.keyCode == 13) {
+       e.preventDefault();
+       var form = $(field).closest("form");
+       $.ajax({
+           url: form.attr("action"),
+           data: form.serialize(),
+           beforeSend: function() {
+             loading_for_button($(field));
+           },
+           success: function(data) {
+             var update = form.attr('data-update');
+             $('#'+update).html(data);
+             $(field).val($(field).attr('title'));
+           }
+       });
+       return false;
+     }
+   });
+
+  $('.view-all-comments').live('click', function(e) {
+     var link = this;
+     $(link).parent().find('.profile-wall-activities-comments').show();
+     $(link).hide();
+     return false;
+  });
+  $('.focus-on-comment').live('click', function(e) {
+     var link = this;
+     $(link).parents('.profile-activity-item').find('textarea').focus();
+     return false;
+  });
+});
+
 /**
 * @author Remy Sharp
 * @url http://remysharp.com/2007/01/25/jquery-tutorial-text-box-hints/
@@ -240,6 +240,13 @@ td.field-name {
   text-align: left;
   vertical-align: top;
 }
+
+table.profile .ui-tabs .ui-tabs-panel {
+  border-left: 0;
+  border-right: 0;
+  border-bottom: 0;
+}
+
 table.profile th {
   border-bottom: 2px solid #eeeeec;
   padding: 10px 0px 0px 0px;
@@ -1034,6 +1041,11 @@ a.comment-picture {
 .comment-logged-out .comment-text {
   color: #888;
 }
+
+.comment-title {
+  font-size: 12px;
+  font-weight: bold;
+}
 .comment-created-at {
   padding-right: 9px;
 }
@@ -1205,7 +1217,9 @@ a.comment-picture {
   -webkit-border-radius: 5px;
   border-radius: 5px;
 }
-.comment-replies .article-comment-inner {
+
+.comment-replies .article-comment-inner,
+.scrap-replies {
   border: 1px solid #fff;
   padding: 0;
   -moz-border-radius: 4px;
@@ -4651,8 +4665,187 @@ h1#agenda-title {
 }
 #profile-activity li, #profile-network li, #profile-wall li {
   display: block;
-  padding: 0;
-  margin-bottom: 8px;
+  padding: 3px;
+  margin-bottom: 3px;
+  background-color: #fff;
+  border-bottom: 1px solid #e8e8e8;
+  position: relative;
+}
+
+#profile-activity li, #profile-network li, #profile-wall li {
+}
+
+.profile-activity-lead img {
+  width: 124px;
+  float: left;
+  margin-right: 5px;
+}
+
+.profile-activity-lead {
+  width: 370px;
+  display: inline-block;
+  text-align: left;
+  margin: 5px 0;
+}
+
+.profile-activity-lead .article-name {
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+
+.profile-activity-article-forum .profile-activity-lead {
+  height: 50px;
+  width: 297px;
+  padding-left: 60px;
+  float: none;
+  overflow: hidden;
+  background: transparent url(/images/forum-activity-bg.png) left center no-repeat;
+}
+
+.profile-activity-article-forum .see-forum {
+  text-align: right;
+}
+
+.profile-activity-article-forum .see-forum a {
+  background: transparent url(/images/forum-activity-icon.png) left center no-repeat;
+  padding-left: 30px;
+  font-weight: bold;
+  color: #dadada !important;
+  text-decoration: none;
+  font-size: 11px;
+}
+
+.profile-activity-article-forum .profile-activity-lead b {
+  font-weight: normal;
+}
+
+#profile-activity li a, #profile-network li a, #profile-wall li a,
+#profile-wall .profile-wall-send-reply {
+  color: #333;
+}
+
+#profile-activity li a, #profile-network li a, #profile-wall li a {
+  font-weight: bold;
+  text-decoration: none;
+}
+
+#profile-activity li a:hover, #profile-network li a:hover, #profile-wall li a:hover {
+  text-decoration: underline;
+}
+
+.profile-activity-text {
+  margin: 0;
+  color: #000;
+}
+
+#profile-wall li.profile-activity-item.upload_image span,
+#profile-wall li.profile-activity-item.upload_image span a,
+#profile-network li.profile-activity-item.upload_image span,
+#profile-network li.profile-activity-item.upload_image span a {
+  width: 110px;
+  height: 100px;
+  display: block;
+  overflow: hidden;
+  position: absolute;
+}
+
+#profile-wall li.profile-activity-item.upload_image span a img,
+#profile-network li.profile-activity-item.upload_image span a img {
+  width: 110px;
+  height: 100px;
+}
+
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span,
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a,
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a img,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a img {
+  width: auto;
+  max-width: 383px;
+  height: auto;
+}
+
+#profile-wall li.profile-activity-item.upload_image span img,
+#profile-network li.profile-activity-item.upload_image span img {
+  display: block;
+}
+
+#profile-wall li.profile-activity-item.upload_image span,
+#profile-network li.profile-activity-item.upload_image span {
+  position: relative;
+  display: inline-block;
+  margin: 5px 0px 0px 5px;
+}
+
+#profile-wall li.profile-activity-item.upload_image .profile-activity-text span,
+#profile-network li.profile-activity-item.upload_image .profile-activity-text span {
+  border: 4px solid #D2D2D2;
+  border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+}
+
+#profile-wall li.profile-activity-item.upload_image span a,
+#profile-network li.profile-activity-item.upload_image span a {
+  text-indent: -5000em;
+}
+
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a {
+  position: relative;
+}
+
+#profile-wall li.profile-activity-item.upload_image .article-comment span,
+#profile-wall li.profile-activity-item.upload_image .profile-wall-actions span,
+#profile-network li.profile-activity-item.upload_image .article-comment span,
+#profile-network li.profile-activity-item.upload_image .profile-wall-actions span {
+  display: inline;
+  position: static;
+  margin: 0;
+  float: none;
+  width: auto;
+  height: auto;
+  font-weight: normal;
+}
+
+#profile-wall li.profile-activity-item ul.profile-wall-activities-comments,
+#profile-network li.profile-activity-item ul.profile-wall-activities-comments {
+  margin-top: 0;
+}
+
+#profile-wall li.profile-activity-item.upload_image .profile-activity-text,
+#profile-network li.profile-activity-item.upload_image .profile-activity-text,
+#profile-network li.profile-activity-item ul.profile-wall-activities-comments {
+  padding-left: 50px;
+}
+
+#profile-wall li.profile-activity-item.join_community .profile-activity-text a img,
+#profile-wall li.profile-activity-item.new_friendship .profile-activity-text a img,
+#profile-network li.profile-activity-item.join_community .profile-activity-text a img,
+#profile-network li.profile-activity-item.new_friendship .profile-activity-text a img {
+  margin: 5px 5px 0 0;
+  padding: 1px;
+  border: 1px solid #ccc;
+}
+
+#profile-wall li.profile-activity-item.create_article,
+#profile-netowrk li.profile-activity-item.create_article {
+  position: relative;
+}
+
+.profile-activity-icon {
+  width: 16px;
+  height: 16px;
+  display: inline-block;
+  position: absolute;
+  top: 0px;
+  right: 0px;
+}
+
+#profile-activity .profile-wall-scrap-replies li,
+#profile-network .profile-wall-scrap-replies li,
+#profile-wall .profile-wall-scrap-replies li {
+  border-bottom: none;
 }
 #profile-activity .profile-activity-image, #profile-network .profile-network-image, #profile-wall .profile-wall-image {
   float: left;
@@ -4664,12 +4857,12 @@ h1#agenda-title {
 }
 #profile-activity .profile-activity-description, #profile-network .profile-network-description, #profile-wall .profile-wall-description {
   float: left;
-  min-height: 60px;
+  Xmin-height: 60px;
   margin: 0;
   padding: 0;
   border: 1px solid #ccc;
   overflow: hidden;
-  background-color: #fff;
+  Xbackground-color: #fff;
   position: relative;
 }
 #profile-wall .profile-wall-description {
@@ -4678,7 +4871,10 @@ h1#agenda-title {
 #profile-activity .profile-activity-description .icon-delete span, #profile-network .profile-network-description .icon-delete span, #profile-wall .profile-wall-description .icon-delete span {
   display: none;
 }
-#profile-activity .profile-activity-description .icon-delete, #profile-network .profile-network-description .icon-delete, #profile-wall .profile-wall-description .icon-delete {
+
+#profile-activity .profile-activity-description .icon-delete,
+#profile-network .profile-activity-description .icon-delete,
+#profile-wall .profile-wall-description .icon-delete {
   position: absolute;
   top: 4px;
   right: 4px;
@@ -4688,21 +4884,55 @@ h1#agenda-title {
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
 }
-#profile-activity .profile-activity-text, #profile-network .profile-network-text, #profile-wall .profile-wall-text {
+
+#profile-activity .profile-activity-text,
+#profile-network .profile-activity-text,
+#profile-wall .profile-wall-text {
   font-size: 13px;
-  margin: 5px;
+  margin: 2px 5px;
 }
 #profile-wall .profile-wall-text {
   padding-top: 0;
 }
-#profile-activity .profile-activity-time, #profile-network .profile-network-time, #profile-wall .profile-wall-time {
+
+.profile-activities .profile-activity-time,
+#profile-network .profile-activity-time,
+#profile-wall .profile-wall-time {
   font-size: 11px;
   margin: 5px;
   color: #babdb6;
+  text-align: right;
+}
+
+#profile-wall .profile-wall-send-reply,
+.profile-activities .profile-activity-time,
+#profile-network .profile-activity-time,
+#profile-wall .profile-wall-time,
+.profile-wall-actions a {
+  display: block;
+  float: right;
+  font-size: 10px;
+  margin: 2px 0 3px 10px;
+  color: #ccc;
+  padding: 0;
+}
+
+#profile-wall li .profile-wall-actions a,
+#profile-activity li .profile-wall-actions a,
+#profile-network li .profile-wall-actions a,
+#profile-wall .profile-wall-send-reply a {
+  text-decoration: none;
+  color: #333;
+  font-weight: normal;
+}
+
+#profile-wall li .profile-wall-actions a:hover,
+#profile-network li .profile-wall-actions a:hover,
+#profile-wall .profile-wall-send-reply a:hover {
+  text-decoration: underline;
 }
 #profile-activity hr, #profile-network hr, #profile-wall hr {
-  clear: both;
-  border: 0;
+  display: none;
 }
 #profile-activity .profile-activity-send-message, #profile-network .profile-network-send-message, #profile-wall .profile-wall-send-message {
   font-size: 10px;
@@ -4762,9 +4992,13 @@ h1#agenda-title {
 }
 .profile-wall-sender, .profile-wall-time, .profile-wall-description, .profile-activity-sender, .profile-activity-time, .profile-activity-description, .profile-network-sender, .profile-network-time, .profile-network-description {
   padding-left: 5px;
+  margin: 5px;
 }
-.profile-network-sender, .profile-wall-sender {
-  margin: 2px 0;
+
+.profile-network-sender,
+.profile-activity-sender,
+.profile-wall-sender {
+  margin: 0;
 }
 #profile-activity .profile-activity-time, #profile-network .profile-network-time, #profile-wall .profile-wall-time {
   margin: 0;
@@ -4775,7 +5009,16 @@ h1#agenda-title {
   padding: 2px;
   overflow: hidden;
 }
-.profile-network-message, .profile-wall-message {
+
+#profile-network li textarea:focus,
+#profile-wall li textarea:focus {
+  background-position: left center;
+  background-repeat: no-repeat;
+  text-indent: 28px;
+}
+
+.profile-network-message,
+.profile-wall-message {
   margin: 0;
 }
 .limited-text-area p {
@@ -4801,19 +5044,24 @@ h1#agenda-title {
   overflow: hidden;
 }
 .profile-send-reply {
-  background-color: #eee;
-  border: 1px solid #aaa;
-  padding: 2px;
-  padding-left: 20px;
-  background-repeat: no-repeat;
-  background-position: 2px center;
+  xbackground-color: #eee;
+  xborder: 1px solid #aaa;
+  xpadding: 2px;
+  xpadding-left: 20px;
+  xbackground-repeat: no-repeat;
+  xbackground-position: 2px center;
   color: #aaa;
-  text-decoration: none;
-  margin-left: 8px;
+  Xtext-decoration: none;
+  Xmargin-left: 8px;
 }
 #content .profile-send-reply:hover {
   text-decoration: none;
 }
+
+#profile-wall .profile-wall-actions {
+  text-align: right;
+}
+
 #profile-wall .profile-wall-scrap-replies .profile-wall-description {
   background: transparent;
 }
@@ -4826,6 +5074,105 @@ h1#agenda-title {
 .limited-text-area div.fieldWithErrors {
   background: transparent;
 }
+
+#profile-wall ul.profile-wall-activities-comments,
+#profile-network ul.profile-wall-activities-comments {
+  margin-top: 35px;
+  padding-left: 50px;
+  width: auto;
+}
+
+#profile-wall ul.profile-wall-activities-comments ul,
+#profile-network ul.profile-wall-activities-comments ul {
+  padding-left: 0px;
+}
+
+#profile-wall .profile-wall-activities-comments li,
+#profile-network .profile-wall-activities-comments li {
+  background: #f0f0f1;
+  border-bottom: 1px solid #d2d2d2 !important;
+  border-top: 1px solid #fff;
+  margin-bottom: 0;
+}
+
+#profile-wall .profile-wall-activities-comments img,
+#profile-network .profile-wall-activities-comments img {
+  max-width: 50px;
+  max-height: 50px;
+}
+
+#profile-wall .profile-wall-activities-comments .comment_reply,
+#profile-wall .profile-wall-activities-comments h4,
+#profile-network .profile-wall-activities-comments .comment_reply,
+#profile-network .profile-wall-activities-comments h4 {
+  display: none;
+}
+
+#profile-wall .profile-wall-activities-comments .comment-picture,
+#profile-network .profile-wall-activities-comments .comment-picture {
+  width: 50px;
+  text-align: center;
+}
+
+#profile-wall .profile-wall-activities-comments .comment-text p,
+#profile-network .profile-wall-activities-comments .comment-text p {
+  margin: 0;
+}
+
+#profile-wall .profile-wall-activities-comments .profile-activity-time,
+#profile-network .profile-wall-activities-comments .profile-activity-time {
+  clear: both;
+}
+
+#profile-wall .profile-wall-activities-comments .comment-details,
+#profile-network .profile-wall-activities-comments .comment-details {
+  padding: 0;
+}
+
+#profile-wall .profile-wall-activities-comments .article-comment .button-bar,
+#profile-network .profile-wall-activities-comments .article-comment .button-bar {
+  float: right;
+  padding: 0;
+  text-align: right;
+  position: static;
+  clear: none;
+  display: none;
+}
+
+#profile-wall .profile-wall-activities-comments .article-comment:hover .button-bar,
+#profile-network .profile-wall-activities-comments .article-comment:hover .button-bar {
+  display: block;
+}
+
+#profile-wall .profile-wall-activities-comments .article-comment .button-bar a.button,
+#profile-network .profile-wall-activities-comments .article-comment .button-bar a.button {
+  background: transparent;
+  border: 0;
+  height: auto;
+  line-height: auto;
+  color: #333;
+  text-decoration: none;
+  font-size: 10px;
+  padding: 0;
+  margin: 0;
+  display: inline;
+  position: static;
+  float: none;
+  font-weight: normal;
+}
+
+#profile-wall .profile-wall-activities-comments .article-comment .button-bar a.button:hover,
+#profile-network .profile-wall-activities-comments .article-comment .button-bar a.button:hover {
+  text-decoration: underline;
+}
+
+#profile-wall .profile-wall-activities-comments .article-comment .button-bar .button span,
+#profile-network .profile-wall-activities-comments .article-comment .button-bar .button span {
+  display: inline;
+  position: static;
+  display: inline;
+}
+
 /* friends online {{{ */
 #chat-online-users {
@@ -4948,15 +5295,36 @@ h1#agenda-title {
   margin-left: 0;
 }
 #profile-wall .comment-balloon-content {
-  padding: 3px 0 3px 15px;
+  padding: 3px 0px;
 }
 .profile-wall-reply {
   margin: 0;
 }
+
+.profile-wall-reply-form {
+  display: block;
+  background: #f0f0f1;
+  border-bottom: 1px solid #d2d2d2;
+  border-top: 1px solid #fff;
+  margin-left: 50px;
+  padding: 0 5px;
+}
+
+.scrap-replies .profile-wall-reply-form {
+  margin-left: 0px;
+}
+
 .profile-wall-scrap-replies {
   float: right;
   margin-right: 2px;
 }
+
+.view-all-comments {
+  clear: both;
+  margin-left: 50px;
+  padding-left: 20px;
+}
+
 /* Profile activity relative dimensions */
 #leave_scrap {
@@ -4965,15 +5333,37 @@ h1#agenda-title {
 #leave_scrap textarea {
   width: 98%;
 }
-#profile-activity .profile-activity-image, #profile-network .profile-network-image, #profile-wall .profile-wall-image {
-  width: 19%;
+
+.profile-activities .profile-activity-image,
+#profile-network .profile-activity-image,
+#profile-wall .profile-wall-image {
+  width: 50px;
+  margin: 5px;
+  float: left;
 }
-#profile-activity .profile-activity-description, #profile-network .profile-network-description, #profile-wall .profile-wall-description {
-  width: 80%;
+
+#profile-activity .profile-activity-description,
+#profile-network .profile-activity-description,
+#profile-wall .profile-wall-description {
   word-wrap: break-word;
 }
-#profile-wall .profile-wall-scrap-replies textarea, #profile-network textarea, #profile-wall textarea {
-  width: 99%;
+
+#profile-wall textarea {
+  width: 375px;
+}
+
+#profile-wall li textarea {
+  width: 388px;
+}
+
+#profile-wall .profile-wall-scrap-replies textarea,
+#profile-network textarea, #profile-wall textarea,
+#profile-wall li .profile-wall-reply-form textarea {
+  width: 98%;
+}
+
+#profile-wall #leave_scrap textarea {
+  width: 442px;
 }
 .profile-wall-scrap-replies {
   width: 100%;
@@ -374,7 +374,7 @@ module Noosfero::Factory
   ###############################################
   def defaults_for_scrap(params = {})
-    { :content => 'soment content ', :sender_id => 1, :receiver_id => 1, :created_at => DateTime.now }.merge(params)
+    { :content => 'some content ', :sender_id => 1, :receiver_id => 1, :created_at => DateTime.now }.merge(params)
   end
   ###############################################
@@ -442,7 +442,7 @@ module Noosfero::Factory
   def defaults_for_comment(params = {})
     name = "comment_#{rand(1000)}"
-    { :title => name, :body => "my own comment", :article_id => 1 }.merge(params)
+    { :title => name, :body => "my own comment", :source_id => 1 }.merge(params)
   end
   ###############################################
@@ -714,25 +714,23 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_no_tag :tag => 'p', :content => 'A scrap'
   end
-  should 'see all activities of the current profile' do
-    p1= Person.first
+  should 'not display activities of the current profile when he is not followed by the viewer' do
+    p1= fast_create(Person)
     p2= fast_create(Person)
-    assert !p1.is_a_friend?(p2)
-    p3= fast_create(Person)
-    assert !p1.is_a_friend?(p3)
-    ActionTracker::Record.destroy_all
-    Scrap.create!(defaults_for_scrap(:sender => p1, :receiver => p1))
-    a1 = ActionTracker::Record.last
+
+    UserStampSweeper.any_instance.stubs(:current_user).returns(p1)
+    scrap1 = Scrap.create!(defaults_for_scrap(:sender => p1, :receiver => p2))
+
     UserStampSweeper.any_instance.stubs(:current_user).returns(p2)
-    Scrap.create!(defaults_for_scrap(:sender => p2, :receiver => p3))
-    a2 = ActionTracker::Record.last
-    UserStampSweeper.any_instance.stubs(:current_user).returns(p3)
-    Scrap.create!(defaults_for_scrap(:sender => p3, :receiver => p1))
-    a3 = ActionTracker::Record.last
+    scrap2 = Scrap.create!(defaults_for_scrap(:sender => p2, :receiver => p1))
+
+    UserStampSweeper.any_instance.stubs(:current_user).returns(p1)
+    TinyMceArticle.create!(:profile => p1, :name => 'An article about free software')
+    a1 = ActionTracker::Record.last
+
     login_as(profile.identifier)
     get :index, :profile => p1.identifier
-    assert_not_nil assigns(:activities)
-    assert_equal [a1], assigns(:activities)
+    assert_nil assigns(:activities)
   end
   should 'see the activities_items paginated' do
@@ -744,26 +742,27 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_equal 30, assigns(:activities).count
   end
-  should 'see not see the friends activities in the current profile activity' do
-    p1= Person.first
+  should 'not see the friends activities in the current profile' do
     p2= fast_create(Person)
-    assert !p1.is_a_friend?(p2)
+    assert !profile.is_a_friend?(p2)
     p3= fast_create(Person)
-    p1.add_friend(p3)
-    assert p1.is_a_friend?(p3)
+    p3.add_friend(profile)
+    assert p3.is_a_friend?(profile)
     ActionTracker::Record.destroy_all
-    Scrap.create!(defaults_for_scrap(:sender => p1, :receiver => p1))
-    a1 = ActionTracker::Record.last
-    UserStampSweeper.any_instance.stubs(:current_user).returns(p2)
-    Scrap.create!(defaults_for_scrap(:sender => p2, :receiver => p3))
-    a2 = ActionTracker::Record.last
+
+    scrap1 = Scrap.create!(defaults_for_scrap(:sender => p2, :receiver => p3))
+    scrap2 = Scrap.create!(defaults_for_scrap(:sender => p2, :receiver => profile))
+
     UserStampSweeper.any_instance.stubs(:current_user).returns(p3)
-    Scrap.create!(defaults_for_scrap(:sender => p3, :receiver => p1))
-    a3 = ActionTracker::Record.last
+    article1 = TinyMceArticle.create!(:profile => p3, :name => 'An article about free software')
+
+    UserStampSweeper.any_instance.stubs(:current_user).returns(p2)
+    article2 = TinyMceArticle.create!(:profile => p2, :name => 'Another article about free software')
+
     login_as(profile.identifier)
-    get :index, :profile => p1.identifier
+    get :index, :profile => p3.identifier
     assert_not_nil assigns(:activities)
-    assert_equal [a1], assigns(:activities)
+    assert_equivalent [scrap1, article1.activity], assigns(:activities).map { |a| a.klass.constantize.find(a.id) }
   end
   should 'see all the activities in the current profile network' do
@@ -931,13 +930,29 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_template 'index'
   end
-  should 'have wall_itens defined' do
-    p1= ActionTracker::Record.current_user_from_model
+  should 'not have activities defined if not logged in' do
+    p1= fast_create(Person)
+    get :index, :profile => p1.identifier
+    assert_nil assigns(:actvities)
+  end
+
+  should 'not have activities defined if logged in but is not following profile' do
+    login_as(profile.identifier)
+    p1= fast_create(Person)
     get :index, :profile => p1.identifier
-    assert_equal [], assigns(:wall_items)
+    assert_nil assigns(:activities)
   end
-  should 'the wall_itens be the received scraps in people profile' do
+  should 'have activities defined if logged in and is following profile' do
+    login_as(profile.identifier)
+    p1= fast_create(Person)
+    p1.add_friend(profile)
+    ActionTracker::Record.destroy_all
+    get :index, :profile => p1.identifier
+    assert_equal [], assigns(:activities)
+  end
+
+  should 'the activities be the received scraps in people profile' do
     p1 = ActionTracker::Record.current_user_from_model
     p2 = fast_create(Person)
     p3 = fast_create(Person)
@@ -952,10 +967,10 @@ class ProfileControllerTest &lt; ActionController::TestCase
     @controller.stubs(:current_user).returns(user)
     Person.any_instance.stubs(:follows?).returns(true)
     get :index, :profile => p1.identifier
-    assert_equal [s2,s3], assigns(:wall_items)
+    assert_equal [s2,s3], assigns(:activities)
   end
-  should 'the wall_itens be the received scraps in community profile' do
+  should 'the activities be the received scraps in community profile' do
     c = fast_create(Community)
     p1 = fast_create(Person)
     p2 = fast_create(Person)
@@ -971,12 +986,12 @@ class ProfileControllerTest &lt; ActionController::TestCase
     @controller.stubs(:current_user).returns(user)
     Person.any_instance.stubs(:follows?).returns(true)
     get :index, :profile => c.identifier
-    assert_equal [s2,s3], assigns(:wall_items)
+    assert_equal [s2,s3], assigns(:activities)
   end
-  should 'the wall_itens be paginated in people profiles' do
+  should 'the activities be paginated in people profiles' do
     p1 = Person.first
-    40.times{fast_create(Scrap, :sender_id => p1.id)}
+    40.times{fast_create(Scrap, :sender_id => p1.id, :created_at => Time.now)}
     @controller.stubs(:logged_in?).returns(true)
     user = mock()
@@ -986,10 +1001,10 @@ class ProfileControllerTest &lt; ActionController::TestCase
     Person.any_instance.stubs(:follows?).returns(true)
     assert_equal 40, p1.scraps_received.not_replies.count
     get :index, :profile => p1.identifier
-    assert_equal 30, assigns(:wall_items).count
+    assert_equal 30, assigns(:activities).count
   end
-  should 'the wall_itens be paginated in community profiles' do
+  should 'the activities be paginated in community profiles' do
     p1 = Person.first
     c = fast_create(Community)
     40.times{fast_create(Scrap, :receiver_id => c.id)}
@@ -1002,7 +1017,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     Person.any_instance.stubs(:follows?).returns(true)
     assert_equal 40, c.scraps_received.not_replies.count
     get :index, :profile => c.identifier
-    assert_equal 30, assigns(:wall_items).count
+    assert_equal 30, assigns(:activities).count
   end
   should "the owner of activity could remove it" do
@@ -1072,17 +1087,17 @@ class ProfileControllerTest &lt; ActionController::TestCase
     end
   end
-  should "not show the scrap button on network activity if the user don't follow the user" do
+  should "not show the network activity if the viewer don't follow the profile" do
     login_as(profile.identifier)
     person = fast_create(Person)
     at = fast_create(ActionTracker::Record, :user_id => person.id)
     atn = fast_create(ActionTrackerNotification, :profile_id => profile.id, :action_tracker_id => at.id) 
-    get :index, :profile => profile.identifier
-    assert_no_tag :tag => 'p', :attributes => {:class => 'profile-network-send-message'}
+    get :index, :profile => person.identifier
+    assert_no_tag :tag => 'div', :attributes => {:id => 'profile-network'}
     person.add_friend(profile)
-    get :index, :profile => profile.identifier
-    assert_tag :tag => 'p', :attributes => {:class => 'profile-network-send-message'}
+    get :index, :profile => person.identifier
+    assert_tag :tag => 'div', :attributes => {:id => 'profile-network'}
   end
   should "not show the scrap button on network activity if the user is himself" do
@@ -1093,16 +1108,16 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_no_tag :tag => 'p', :attributes => {:class => 'profile-network-send-message'}
   end
-  should "not show the scrap button on wall activity if the user don't follow the user" do
+  should "not show the scrap area on wall if the user don't follow the user" do
     login_as(profile.identifier)
     person = fast_create(Person)
     scrap = fast_create(Scrap, :sender_id => person.id, :receiver_id => profile.id)
-    get :index, :profile => profile.identifier
-    assert_no_tag :tag => 'p', :attributes => {:class => 'profile-wall-send-message'}
+    get :index, :profile => person.identifier
+    assert_no_tag :tag => 'div', :attributes => {:id => 'leave_scrap'}, :descendant => { :tag => 'input', :attributes => {:value => 'Share'} }
     person.add_friend(profile)
-    get :index, :profile => profile.identifier
-    assert_tag :tag => 'p', :attributes => {:class => 'profile-wall-send-message'}
+    get :index, :profile => person.identifier
+    assert_tag :tag => 'div', :attributes => {:id => 'leave_scrap'}, :descendant => { :tag => 'input', :attributes => {:value => 'Share'} }
   end
   should "not show the scrap button on wall activity if the user is himself" do
@@ -1158,7 +1173,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_equal 40, profile.tracked_actions.count
     get :view_more_activities, :profile => profile.identifier, :page => 2
     assert_response :success
-    assert_template '_profile_activities'
+    assert_template '_profile_activities_list'
     assert_equal 10, assigns(:activities).count
   end
@@ -1247,4 +1262,70 @@ class ProfileControllerTest &lt; ActionController::TestCase
       post :register_report, :profile => reported.identifier, :abuse_report => {:reason => 'some reason'}
     end
   end
+
+  should 'display activities and scraps together' do
+    another_person = fast_create(Person)
+    Scrap.create!(defaults_for_scrap(:sender => another_person, :receiver => profile, :content => 'A scrap'))
+
+    UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
+    ActionTracker::Record.destroy_all
+    TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
+
+    login_as(profile.identifier)
+    get :index, :profile => profile.identifier
+
+    assert_tag :tag => 'p', :content => 'A scrap', :attributes => { :class => 'profile-activity-text'} 
+    assert_tag :tag => 'div', :attributes => { :class => 'profile-activity-lead' }, :descendant => { :tag => 'a', :content => 'An article about free software' }
+  end
+
+  should 'have scraps and activities on activities' do
+    another_person = fast_create(Person)
+    scrap = Scrap.create!(defaults_for_scrap(:sender => another_person, :receiver => profile, :content => 'A scrap'))
+
+    UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
+    ActionTracker::Record.destroy_all
+    TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
+    activity = ActionTracker::Record.last
+
+    login_as(profile.identifier)
+    get :index, :profile => profile.identifier
+
+    assert_equivalent [scrap,activity], assigns(:activities).map {|a| a.klass.constantize.find(a.id)}
+  end
+
+  should "be logged in to leave comment on an activity" do
+    article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
+    activity = ActionTracker::Record.last
+    count = activity.comments.count
+
+    post :leave_comment_on_activity, :profile => profile.identifier, :comment => {:body => 'something', :source_id => activity.id}
+    assert_equal count, activity.comments.count
+    assert_redirected_to :controller => 'account', :action => 'login'
+  end
+
+  should "leave a comment in own activity" do
+    login_as(profile.identifier)
+    TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
+    activity = ActionTracker::Record.last
+    count = activity.comments.count
+
+    assert_equal 0, count
+    post :leave_comment_on_activity, :profile => profile.identifier, :comment => {:body => 'something'}, :source_id => activity.id
+    assert_equal count + 1, ActionTracker::Record.find(activity.id).comments_count
+    assert_response :success
+    assert_equal "Comment successfully added.", assigns(:message)
+  end
+
+  should "leave a comment on another profile's activity" do
+    login_as(profile.identifier)
+    another_person = fast_create(Person)
+    TinyMceArticle.create!(:profile => another_person, :name => 'An article about free software')
+    activity = ActionTracker::Record.last
+    count = activity.comments.count
+    assert_equal 0, count
+    post :leave_comment_on_activity, :profile => another_person.identifier, :comment => {:body => 'something'}, :source_id => activity.id
+    assert_equal count + 1, ActionTracker::Record.find(activity.id).comments_count
+    assert_response :success
+    assert_equal "Comment successfully added.", assigns(:message)
+  end
 end
@@ -76,4 +76,28 @@ class ActionTrackerNotificationTest &lt; ActiveSupport::TestCase
     assert_equal [last_notification], at.action_tracker_notifications
   end
+  should "have comments through action_tracker" do
+    person = fast_create(Person)
+    community = fast_create(Community)
+    community.add_member(person)
+    activity = ActionTracker::Record.last
+    process_delayed_job_queue
+    notification = ActionTrackerNotification.last
+
+    comment = create(Comment, :source => activity, :author => person)
+
+    assert_equal activity.comments, notification.comments
+  end
+
+  should "have comments through article action_tracker" do
+    person = fast_create(Person)
+    article = create(TextileArticle, :profile_id => person.id)
+    process_delayed_job_queue
+    notification = ActionTrackerNotification.last
+
+    comment = create(Comment, :source => article, :author => person)
+
+    assert_equal article.activity.comments, notification.comments
+  end
+
 end
@@ -251,7 +251,7 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
     assert_equal 1, ActionTracker::Record.count
   end
-  should 'notify with different trackers activity create with different targets' do
+  should 'not group trackers activity of article\'s creation' do
     ActionTracker::Record.delete_all
     article = fast_create(TextileArticle)
@@ -261,28 +261,15 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
     article = fast_create(TextileArticle)
     a = ApproveArticle.create!(:name => 'another bar', :article => article, :target => community, :requestor => profile)
     a.finish
-    assert_equal 1, ActionTracker::Record.count
     article = fast_create(TextileArticle)
     other_community = fast_create(Community)
     a = ApproveArticle.create!(:name => 'another bar', :article => article, :target => other_community, :requestor => profile)
     a.finish
-    assert_equal 2, ActionTracker::Record.count
-  end
-
-  should 'notify activity on update' do
-    ActionTracker::Record.delete_all
-    a = ApproveArticle.create!(:name => 'bar', :article => article, :target => community, :requestor => profile)
-    a.finish
-    assert_equal 1, ActionTracker::Record.count
-
-    published = article.class.last
-    published.name = 'foo'
-    published.save!
-    assert_equal 2, ActionTracker::Record.count
+    assert_equal 3, ActionTracker::Record.count
   end
-  should 'notify with different trackers activity update with different targets' do
+  should 'not create trackers activity when updating articles' do
     ActionTracker::Record.delete_all
     article1 = fast_create(TextileArticle)
     a = ApproveArticle.create!(:name => 'bar', :article => article1, :target => community, :requestor => profile)
@@ -294,16 +281,16 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
     a.finish
     assert_equal 2, ActionTracker::Record.count
-    published = article1.class.last
-    published.name = 'foo';published.save!
-    assert_equal 3, ActionTracker::Record.count
-
-    published = article2.class.last
-    published.name = 'another foo';published.save!
-    assert_equal 4, ActionTracker::Record.count
+    assert_no_difference ActionTracker::Record, :count do
+      published = article1.class.last
+      published.name = 'foo';published.save!
+  
+      published = article2.class.last
+      published.name = 'another foo';published.save!
+    end
   end
-  should "the tracker action target be defined as Community by custom_target method on articles'creation in communities" do
+  should "the tracker action target be defined as the article on articles'creation in communities" do
     ActionTracker::Record.delete_all
     person = fast_create(Person)
     community.add_member(person)
@@ -311,17 +298,21 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
     a = ApproveArticle.create!(:article => article, :target => community, :requestor => profile)
     a.finish
-    assert_equal Community, ActionTracker::Record.last.target.class
+    approved_article = community.articles.find_by_name(article.name)
+
+    assert_equal approved_article, ActionTracker::Record.last.target
   end
-  should "the tracker action target be defined as person by custom_target method on articles'creation in profile" do
+  should "the tracker action target be defined as the article on articles'creation in profile" do
     ActionTracker::Record.delete_all
     person = fast_create(Person)
     a = ApproveArticle.create!(:article => article, :target => person, :requestor => profile)
     a.finish
-    assert_equal Person, ActionTracker::Record.last.target.class
+    approved_article = person.articles.find_by_name(article.name)
+
+    assert_equal approved_article, ActionTracker::Record.last.target
   end
   should "have the same is_trackable method as original article" do
@@ -322,15 +322,16 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'list most commented articles' do
     Article.delete_all
+    (1..4).each do |n|
+      create(TextileArticle, :name => "art #{n}", :profile_id => profile.id)
+    end
+    first_article = profile.articles.first
+    2.times { Comment.create(:title => 'test', :body => 'asdsad', :author => profile, :source => first_article).save! }
-    person = create_user('testuser').person
-    articles = (1..4).map {|n| a = person.articles.build(:name => "art #{n}"); a.save!; a }
-
-    2.times { articles[0].comments.build(:title => 'test', :body => 'asdsad', :author => person).save! }
-    4.times { articles[1].comments.build(:title => 'test', :body => 'asdsad', :author => person).save! }
-
+    last_article = profile.articles.last
+    4.times { Comment.create(:title => 'test', :body => 'asdsad', :author => profile, :source => last_article).save! }
     # should respect the order (more commented comes first)
-    assert_equal [articles[1], articles[0]], person.articles.most_commented(2)
+    assert_equal [last_article, first_article], profile.articles.most_commented(2)
   end
   should 'identify itself as a non-folder' do
@@ -365,8 +366,8 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'index comments title together with article' do
     TestSolr.enable
     owner = create_user('testuser').person
-    art = owner.articles.build(:name => 'ytest'); art.save!
-    c1 = art.comments.build(:title => 'a nice comment', :body => 'anything', :author => owner); c1.save!
+    art = fast_create(TinyMceArticle, :profile_id => owner.id, :name => 'ytest')
+    c1 = Comment.create(:title => 'a nice comment', :body => 'anything', :author => owner, :source => art ); c1.save!
     assert_includes Article.find_by_contents('nice')[:results], art
   end
@@ -374,8 +375,8 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'index comments body together with article' do
     TestSolr.enable
     owner = create_user('testuser').person
-    art = owner.articles.build(:name => 'ytest'); art.save!
-    c1 = art.comments.build(:title => 'test comment', :body => 'anything', :author => owner); c1.save!
+    art = fast_create(TinyMceArticle, :profile_id => owner.id, :name => 'ytest')
+    c1 = Comment.create(:title => 'test comment', :body => 'anything', :author => owner, :source => art); c1.save!
     assert_includes Article.find_by_contents('anything')[:results], art
   end
@@ -953,79 +954,34 @@ class ArticleTest &lt; ActiveSupport::TestCase
   end
   should 'track action when a published article is created outside a community' do
-    article = TinyMceArticle.create! :name => 'Tracked Article', :profile_id => profile.id
-    assert article.published?
-    assert_kind_of Person, article.profile
-    ta = ActionTracker::Record.last
-    assert_equal 'Tracked Article', ta.get_name.last
-    assert_equal article.url, ta.get_url.last
-    assert_kind_of Person, ta.user
-    ta.created_at = Time.now.ago(26.hours); ta.save!
-    article = TinyMceArticle.create! :name => 'Another Tracked Article', :profile_id => profile.id
-    ta = ActionTracker::Record.last
-    assert_equal ['Another Tracked Article'], ta.get_name
-    assert_equal [article.url], ta.get_url
+    article = create(TinyMceArticle, :profile_id => profile.id)
+    ta = article.activity
+    assert_equal article.name, ta.get_name
+    assert_equal article.url, ta.get_url
   end
   should 'track action when a published article is created in a community' do
     community = fast_create(Community)
-    p1 = ActionTracker::Record.current_user_from_model
+    p1 = fast_create(Person)
     p2 = fast_create(Person)
     p3 = fast_create(Person)
     community.add_member(p1)
     community.add_member(p2)
-    assert p1.is_member_of?(community)
-    assert p2.is_member_of?(community)
-    assert !p3.is_member_of?(community)
-    Article.destroy_all
-    ActionTracker::Record.destroy_all
-    article = TinyMceArticle.create! :name => 'Tracked Article', :profile_id => community.id
-    assert article.published?
-    assert_kind_of Community, article.profile
-    ta = ActionTracker::Record.last
-    assert_equal 'Tracked Article', ta.get_name.last
-    assert_equal article.url, ta.get_url.last
-    assert_kind_of Person, ta.user
+    UserStampSweeper.any_instance.expects(:current_user).returns(p1).at_least_once
+
+    article = create(TinyMceArticle, :profile_id => community.id)
+    activity = article.activity
+
     process_delayed_job_queue
-    assert_equal 3, ActionTrackerNotification.count
-    ActionTrackerNotification.all.map{|a|a.profile}.map do |profile|
-      assert [p1,p2,community].include?(profile)
-    end
+    assert_equal 3, ActionTrackerNotification.find_all_by_action_tracker_id(activity.id).count
+    assert_equivalent [p1,p2,community], ActionTrackerNotification.find_all_by_action_tracker_id(activity.id).map(&:profile)
   end
-  should 'track action when a published article is updated' do
-    a = TinyMceArticle.create! :name => 'a', :profile_id => profile.id
-    a.update_attributes! :name => 'b'
-    ta = ActionTracker::Record.last
-    assert_equal ['b'], ta.get_name
-    assert_equal [a.reload.url], ta.get_url
-    a.update_attributes! :name => 'c'
-    ta = ActionTracker::Record.last
-    assert_equal ['b','c'], ta.get_name
-    assert_equal [a.url,a.reload.url], ta.get_url
-    a.update_attributes! :body => 'test'
-    ta = ActionTracker::Record.last
-    assert_equal ['b','c','c'], ta.get_name
-    assert_equal [a.url,a.reload.url,a.reload.url], ta.get_url
-    a.update_attributes! :hits => 50
-    ta = ActionTracker::Record.last
-    assert_equal ['b','c','c'], ta.get_name
-    assert_equal [a.url,a.reload.url,a.reload.url], ta.get_url
-  end
-
-  should 'track action when a published article is removed' do
-    a = TinyMceArticle.create! :name => 'a', :profile_id => profile.id
-    a.destroy
-    ta = ActionTracker::Record.last
-    assert_equal ['a'], ta.get_name
-    a = TinyMceArticle.create! :name => 'b', :profile_id => profile.id
-    a.destroy
-    ta = ActionTracker::Record.last
-    assert_equal ['a','b'], ta.get_name
-    a = TinyMceArticle.create! :name => 'c', :profile_id => profile.id, :published => false
-    a.destroy
-    ta = ActionTracker::Record.last
-    assert_equal ['a','b'], ta.get_name
+  should 'not track action when a published article is removed' do
+    a = create(TinyMceArticle, :profile_id => profile.id)
+    assert_no_difference ActionTracker::Record, :count do
+      a.destroy
+    end
   end
   should 'notifiable is false by default' do
@@ -1054,6 +1010,15 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal 0, ActionTracker::Record.count
   end
+  should 'create activity' do
+    a = TextileArticle.create! :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
+    a.activity.destroy
+    assert_nil a.activity
+
+    a.create_activity
+    assert_not_nil a.activity
+  end
+
   should "the action_tracker_target method be defined" do
     assert Article.method_defined?(:action_tracker_target)
   end
@@ -1090,141 +1055,64 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal false, a.is_trackable?
   end
-  should 'not create more than one notification track action to community when update more than one artile' do
-    community = fast_create(Community)
-    p1 = Person.first || fast_create(Person)
-    community.add_member(p1)
-    assert p1.is_member_of?(community)
-    Article.destroy_all
-    ActionTracker::Record.destroy_all
-    article = TinyMceArticle.create! :name => 'Tracked Article 1', :profile_id => community.id
-    assert article.published?
-    assert_kind_of Community, article.profile
-    assert_equal 1, ActionTracker::Record.count
-    ta = ActionTracker::Record.last
-    assert_equal 'Tracked Article 1', ta.get_name.last
-    assert_equal article.url, ta.get_url.last
-    assert p1, ta.user
-    assert community, ta.target
-    process_delayed_job_queue
-    assert_equal 2, ActionTrackerNotification.count
-
-    article = TinyMceArticle.create! :name => 'Tracked Article 2', :profile_id => community.id
-    assert article.published?
-    assert_kind_of Community, article.profile
-    assert_equal 1, ActionTracker::Record.count
-    ta = ActionTracker::Record.last
-    assert_equal 'Tracked Article 2', ta.get_name.last
-    assert_equal article.url, ta.get_url.last
-    assert_equal p1, ta.user
-    assert_equal community, ta.target
-    process_delayed_job_queue
-    assert_equal 2, ActionTrackerNotification.count
+  should "not be trackable if article is inside a private community" do
+    private_community = fast_create(Community, :public_profile => false)
+    a =  fast_create(TinyMceArticle, :profile_id => private_community.id)
+    assert_equal false, a.is_trackable?
   end
-  should 'create the notification to the member when one member has the notification and the other no' do
+  should 'create the notification to organization and all organization members' do
     community = fast_create(Community)
-    p1 = Person.first || fast_create(Person)
-    community.add_member(p1)
-    assert p1.is_member_of?(community)
-    Article.destroy_all
-    ActionTracker::Record.destroy_all
+    member_1 = Person.first
+    community.add_member(member_1)
+
     article = TinyMceArticle.create! :name => 'Tracked Article 1', :profile_id => community.id
-    assert article.published?
-    assert_kind_of Community, article.profile
-    assert_equal 1, ActionTracker::Record.count
-    ta = ActionTracker::Record.first
-    assert_equal 'Tracked Article 1', ta.get_name.last
-    assert_equal article.url, ta.get_url.last
-    assert p1, ta.user
-    assert community, ta.target
-    process_delayed_job_queue
-    assert_equal 2, ActionTrackerNotification.count
+    first_activity = article.activity
+    assert_equal [first_activity], ActionTracker::Record.find_all_by_verb('create_article')
-    p2 = fast_create(Person)
-    community.add_member(p2)
     process_delayed_job_queue
-    assert_equal 5, ActionTrackerNotification.count
-
-    article = TinyMceArticle.create! :name => 'Tracked Article 2', :profile_id => community.id
-    assert article.published?
-    assert_kind_of Community, article.profile
-    assert_equal 3, ActionTracker::Record.count
-    ta = ActionTracker::Record.first
-    assert_equal 'Tracked Article 2', ta.get_name.last
-    assert_equal article.url, ta.get_url.last
-    assert_equal p1, ta.user
-    assert_equal community, ta.target
+    assert_equal 2, ActionTrackerNotification.find_all_by_action_tracker_id(first_activity.id).count
+
+    member_2 = fast_create(Person)
+    community.add_member(member_2)
+
+    article2 = TinyMceArticle.create! :name => 'Tracked Article 2', :profile_id => community.id
+    second_activity = article2.activity
+    assert_equivalent [first_activity, second_activity], ActionTracker::Record.find_all_by_verb('create_article')
+
     process_delayed_job_queue
-    assert_equal 6, ActionTrackerNotification.count
+    assert_equal 3, ActionTrackerNotification.find_all_by_action_tracker_id(second_activity.id).count
   end
-  should 'not create more than one notification track action to friends when update more than one artile' do
-    p1 = Person.first || fast_create(Person)
+  should 'create notifications to friends when creating an article' do
     friend = fast_create(Person)
-    p1.add_friend(friend)
+    profile.add_friend(friend)
     Article.destroy_all
     ActionTracker::Record.destroy_all
     ActionTrackerNotification.destroy_all
-    article = TinyMceArticle.create! :name => 'Tracked Article 1', :profile_id => p1.id
-    assert article.published?
-    assert_kind_of Person, article.profile
-    assert_equal 1, ActionTracker::Record.count
-    ta = ActionTracker::Record.last
-    assert_equal 'Tracked Article 1', ta.get_name.last
-    assert_equal article.url, ta.get_url.last
-    assert p1, ta.user
-    assert p1, ta.target
-    process_delayed_job_queue
-    assert_equal 2, ActionTrackerNotification.count
-
-    article = TinyMceArticle.create! :name => 'Tracked Article 2', :profile_id => p1.id
-    assert article.published?
-    assert_kind_of Person, article.profile
-    assert_equal 1, ActionTracker::Record.count
-    ta = ActionTracker::Record.last
-    assert_equal 'Tracked Article 2', ta.get_name.last
-    assert_equal article.url, ta.get_url.last
-    assert_equal p1, ta.user
-    assert_equal p1, ta.target
+    UserStampSweeper.any_instance.expects(:current_user).returns(profile).at_least_once
+    article = create(TinyMceArticle, :profile_id => profile.id)
+
     process_delayed_job_queue
-    assert_equal 2, ActionTrackerNotification.count
+    assert_equal friend, ActionTrackerNotification.last.profile
   end
   should 'create the notification to the friend when one friend has the notification and the other no' do
-    p1 = Person.first || fast_create(Person)
     f1 = fast_create(Person)
-    p1.add_friend(f1)
-    Article.destroy_all
-    ActionTracker::Record.destroy_all
-    ActionTrackerNotification.destroy_all
-    article = TinyMceArticle.create! :name => 'Tracked Article 1', :profile_id => p1.id
-    assert article.published?
-    assert_kind_of Person, article.profile
-    assert_equal 1, ActionTracker::Record.count
-    ta = ActionTracker::Record.first
-    assert_equal 'Tracked Article 1', ta.get_name.last
-    assert_equal article.url, ta.get_url.last
-    assert p1, ta.user
-    assert p1, ta.target
+    profile.add_friend(f1)
+
+    UserStampSweeper.any_instance.expects(:current_user).returns(profile).at_least_once
+    article = TinyMceArticle.create! :name => 'Tracked Article 1', :profile_id => profile.id
+    assert_equal 1, ActionTracker::Record.find_all_by_verb('create_article').count
     process_delayed_job_queue
-    assert_equal 2, ActionTrackerNotification.count
+    assert_equal 2, ActionTrackerNotification.find_all_by_action_tracker_id(article.activity.id).count
     f2 = fast_create(Person)
-    p1.add_friend(f2)
-    process_delayed_job_queue
-    assert_equal 5, ActionTrackerNotification.count
-    article = TinyMceArticle.create! :name => 'Tracked Article 2', :profile_id => p1.id
-    assert article.published?
-    assert_kind_of Person, article.profile
-    assert_equal 2, ActionTracker::Record.count
-    ta = ActionTracker::Record.first
-    assert_equal 'Tracked Article 2', ta.get_name.last
-    assert_equal article.url, ta.get_url.last
-    assert_equal p1, ta.user
-    assert_equal p1, ta.target
+    profile.add_friend(f2)
+    article2 = TinyMceArticle.create! :name => 'Tracked Article 2', :profile_id => profile.id
+    assert_equal 2, ActionTracker::Record.find_all_by_verb('create_article').count
     process_delayed_job_queue
-    assert_equal 6, ActionTrackerNotification.count
+    assert_equal 3, ActionTrackerNotification.find_all_by_action_tracker_id(article2.activity.id).count
   end
   should 'found articles with published date between a range' do
@@ -1582,7 +1470,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     domain = Environment.default.domains.first || Domain.new(:name => 'localhost')
     article = Article.new(:body => "An article with invalid src in img tag <img src='path with spaces.png' />", :profile => @profile)
     assert_nothing_raised URI::InvalidURIError do
-      assert_equal ["http://#{domain.name}/path%20with%20spaces.png"], article.body_images_paths
+      assert_equal ["http://#{profile.environment.default_hostname}/path%20with%20spaces.png"], article.body_images_paths
     end
   end
@@ -1814,4 +1702,24 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert !a.allow_edit?(nil)
   end
+  should 'get first image from lead' do
+    a = fast_create(Article, :body => '<p>Foo</p><p><img src="bar.png" />Bar<img src="foo.png" /></p>',
+                             :abstract => '<p>Lead</p><p><img src="leadbar.png" />Bar<img src="leadfoo.png" /></p>')
+    assert_equal 'leadbar.png', a.first_image
+  end
+
+  should 'get first image from body' do
+    a = fast_create(Article, :body => '<p>Foo</p><p><img src="bar.png" />Bar<img src="foo.png" /></p>')
+    assert_equal 'bar.png', a.first_image
+  end
+
+  should 'not get first image from anywhere' do
+    a = fast_create(Article, :body => '<p>Foo</p><p>Bar</p>')
+    assert_equal '', a.first_image
+  end
+
+  should 'store first image in tracked action' do
+    a = TinyMceArticle.create! :name => 'Tracked Article', :body => '<p>Foo<img src="foo.png" />Bar</p>', :profile_id => profile.id
+    assert_equal 'foo.png', ActionTracker::Record.last.get_first_image
+  end
 end
@@ -311,10 +311,10 @@ class CategoryTest &lt; ActiveSupport::TestCase
     a2 = person.articles.build(:name => 'art2', :category_ids => [c.id]); a2.save!
     a3 = person.articles.build(:name => 'art3', :category_ids => [c.id]); a3.save!
-    a1.comments.build(:title => 'test', :body => 'asdsa', :author => person).save!
-    5.times { a2.comments.build(:title => 'test', :body => 'asdsa', :author => person).save! }
+    Comment.create(:title => 'test', :body => 'asdsa', :author => person, :source => a1)
+    5.times { Comment.create(:title => 'test', :body => 'asdsa', :author => person, :source => a2) }
-    10.times { a3.comments.build(:title => 'test', :body => 'kajsdsa', :author => person).save! }
+    10.times { Comment.create(:title => 'test', :body => 'kajsdsa', :author => person, :source => a3) }
     assert_equal [a3, a2], c.most_commented_articles(2)
   end
@@ -12,26 +12,26 @@ class CommentNotifierTest &lt; ActiveSupport::TestCase
     @article = fast_create(Article, :name => 'Article test', :profile_id => @profile.id, :notify_comments => true)
   end
-  should 'deliver mail after make aarticle commment' do
+  should 'deliver mail after make an article comment' do
     assert_difference ActionMailer::Base.deliveries, :size do
-      @article.comments << Comment.new(:author => @profile, :title => 'test comment', :body => 'you suck!')
+      Comment.create(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article )
     end
   end
   should 'deliver mail to owner of article' do
-    @article.comments << Comment.new(:author => @profile, :title => 'test comment', :body => 'you suck!')
+    Comment.create(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article )
     sent = ActionMailer::Base.deliveries.first
     assert_equal [@profile.email], sent.to
   end
   should 'display author name in delivered mail' do
-    @article.comments << Comment.new(:author => @profile, :title => 'test comment', :body => 'you suck!')
+    Comment.create(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article)
     sent = ActionMailer::Base.deliveries.first
     assert_match /user_comment_test/, sent.body
   end
   should 'display unauthenticated author name and email in delivered mail' do
-    @article.comments << Comment.new(:name => 'flatline', :email => 'flatline@invalid.com', :title => 'test comment', :body => 'you suck!')
+    Comment.create(:name => 'flatline', :email => 'flatline@invalid.com', :title => 'test comment', :body => 'you suck!', :source => @article )
     sent = ActionMailer::Base.deliveries.first
     assert_match /flatline/, sent.body
     assert_match /flatline@invalid.com/, sent.body
@@ -45,13 +45,13 @@ class CommentNotifierTest &lt; ActiveSupport::TestCase
   end
   should 'include comment title in the e-mail' do
-    @article.comments << Comment.new(:author => @profile, :title => 'comment title', :body => 'comment title')
+    Comment.create(:author => @profile, :title => 'comment title', :body => 'comment body', :source => @article)
     sent = ActionMailer::Base.deliveries.first
     assert_match /comment title/, sent.body
   end
   should 'include comment text in the e-mail' do
-    @article.comments << Comment.new(:author => @profile, :title => 'comment title', :body => 'comment body')
+    Comment.create(:author => @profile, :title => 'comment title', :body => 'comment body', :source => @article)
     sent = ActionMailer::Base.deliveries.first
     assert_match /comment body/, sent.body
   end
@@ -13,13 +13,13 @@ class CommentTest &lt; ActiveSupport::TestCase
     assert_mandatory(Comment.new, :body)
   end
-  should 'belong to an article' do
+  should 'have a polymorphic relationship with source' do
     c = Comment.new
-    assert_raise ActiveRecord::AssociationTypeMismatch do
-      c.article = 1
+    assert_nothing_raised do
+      c.source = Article.new
     end
     assert_nothing_raised do
-      c.article = Article.new
+      c.source = ActionTracker::Record.new
     end
   end
@@ -65,12 +65,33 @@ class CommentTest &lt; ActiveSupport::TestCase
   should 'update counter cache in article' do
     owner = create_user('testuser').person
-    art = owner.articles.build(:name => 'ytest'); art.save!
-
+    art = create(TextileArticle, :profile_id => owner.id)
     cc = art.comments_count
-    art.comments.build(:title => 'test comment', :body => 'anything', :author => owner).save!
-    art.reload
-    assert_equal cc + 1, art.comments_count
+
+    comment = create(Comment, :source => art, :author_id => owner.id)
+    assert_equal cc + 1, Article.find(art.id).comments_count
+  end
+
+  should 'update counter cache in article activity' do
+    owner = create_user('testuser').person
+    article = create(TextileArticle, :profile_id => owner.id)
+
+    action = article.activity
+    cc = action.comments_count
+    comment = create(Comment, :source => action, :author_id => owner.id)
+    assert_equal cc + 1, ActionTracker::Record.find(action.id).comments_count
+  end
+
+  should 'update counter cache in general activity when add a comment' do
+    person = fast_create(Person)
+    community = fast_create(Community)
+
+    activity = ActionTracker::Record.create :user => person, :target => community, :verb => 'add_member_in_community'
+
+    cc = activity.comments_count
+
+    comment = create(Comment, :source => activity, :author_id => person.id)
+    assert_equal cc + 1, ActionTracker::Record.find(activity.id).comments_count
   end
   should 'provide author name for authenticated authors' do
@@ -217,30 +238,10 @@ class CommentTest &lt; ActiveSupport::TestCase
     assert File.exists?(File.join(Rails.root, 'public', image)), "#{image} does not exist."
   end
-  should 'track action when comment is created' do
-    owner = create_user('testuser').person
-    article = owner.articles.create!(:name => 'test', :body => '...')
-    comment = article.comments.create!(:article => article, :name => 'foo', :title => 'bar', :body => 'my comment', :email => 'cracker@test.org')
-    ta = ActionTracker::Record.last
-    assert_equal 'bar', ta.get_title
-    assert_equal 'my comment', ta.get_body
-    assert_equal 'test', ta.get_article_title
-    assert_equal article.url, ta.get_article_url
-    assert_equal comment.url, ta.get_url
-  end
-
   should 'have the action_tracker_target defined' do
     assert Comment.method_defined?(:action_tracker_target)
   end
-  should "have the action_tracker_target be the articles's profile" do
-    owner = create_user('testuser').person
-    article = owner.articles.create!(:name => 'test', :body => '...')
-    comment = article.comments.create!(:article => article, :name => 'foo', :title => 'bar', :body => 'my comment', :email => 'cracker@test.org')
-    ta = ActionTracker::Record.last
-    assert_equal owner, ta.target
-  end
-
   should "get children of a comment" do
     c = fast_create(Comment)
     c1 = fast_create(Comment, :reply_of_id => c.id)
@@ -307,11 +308,11 @@ class CommentTest &lt; ActiveSupport::TestCase
   should "return comments as a thread" do
     a = fast_create(Article)
-    c0 = fast_create(Comment, :article_id => a.id)
-    c1 = fast_create(Comment, :reply_of_id => c0.id, :article_id => a.id)
-    c2 = fast_create(Comment, :reply_of_id => c1.id, :article_id => a.id)
-    c3 = fast_create(Comment, :reply_of_id => c0.id, :article_id => a.id)
-    c4 = fast_create(Comment, :article_id => a.id)
+    c0 = fast_create(Comment, :source_id => a.id)
+    c1 = fast_create(Comment, :reply_of_id => c0.id, :source_id => a.id)
+    c2 = fast_create(Comment, :reply_of_id => c1.id, :source_id => a.id)
+    c3 = fast_create(Comment, :reply_of_id => c0.id, :source_id => a.id)
+    c4 = fast_create(Comment, :source_id => a.id)
     result = a.comments.as_thread
     assert_equal c0.id, result[0].id
     assert_equal [c1.id, c3.id], result[0].replies.map(&:id)
@@ -320,6 +321,22 @@ class CommentTest &lt; ActiveSupport::TestCase
     assert result[1].replies.empty?
   end
+  should "return activities comments as a thread" do
+    person = fast_create(Person)
+    a = TextileArticle.create!(:profile => person, :name => 'My article', :body => 'Article body')
+    c0 = Comment.create!(:source => a, :body => 'My comment', :author => person)
+    c1 = Comment.create!(:reply_of_id => c0.id, :source => a, :body => 'bla', :author => person)
+    c2 = Comment.create!(:reply_of_id => c1.id, :source => a, :body => 'bla', :author => person)
+    c3 = Comment.create!(:reply_of_id => c0.id, :source => a, :body => 'bla', :author => person)
+    c4 = Comment.create!(:source => a, :body => 'My comment', :author => person)
+    result = a.activity.comments_as_thread
+    assert_equal c0, result[0]
+    assert_equal [c1, c3], result[0].replies
+    assert_equal [c2], result[0].replies[0].replies
+    assert_equal c4, result[1]
+    assert result[1].replies.empty?
+  end
+
   should 'provide author url for authenticated user' do
     author = Person.new
     author.expects(:url).returns('http://blabla.net/author')
@@ -338,4 +355,27 @@ class CommentTest &lt; ActiveSupport::TestCase
     assert c.rejected?
   end
+  should 'update article activity when add a comment' do
+    profile = create_user('testuser').person
+    article = create(TinyMceArticle, :profile => profile)
+    action = article.activity
+    time = action.updated_at
+
+    Time.stubs(:now).returns(time + 1.day)
+
+    comment = create(Comment, :source => article, :author => profile)
+    assert_equal time + 1.day, article.activity.updated_at
+  end
+
+  should 'create a new activity when add a comment and the activity was removed' do
+    profile = create_user('testuser').person
+    article = create(TinyMceArticle, :profile => profile)
+    article.activity.destroy
+
+    assert_nil article.activity
+
+    comment = create(Comment, :source => article, :author => profile)
+    assert_not_nil article.activity
+  end
+
 end
@@ -274,22 +274,19 @@ class CommunityTest &lt; ActiveSupport::TestCase
     end
   end
-  should "be created an tracked action to the community when an community's article is commented" do
+  should "update the action of article creation when an community's article is commented" do
     ActionTrackerNotification.delete_all
     p1 = Person.first
     community = fast_create(Community)
     p2 = fast_create(Person)
     p3 = fast_create(Person)
     community.add_member(p3)
-    article = fast_create(Article, :profile_id => community.id)
-    ActionTracker::Record.destroy_all
-    assert_difference(ActionTrackerNotification, :count, 3) do
-      Comment.create!(:article_id => article.id, :title => 'some', :body => 'some', :author_id => p2.id)
-      process_delayed_job_queue
-    end
-    ActionTrackerNotification.all.map{|a|a.profile}.map do |profile|
-      assert [community,p1,p3].include?(profile)
-    end
+    article = create(TextileArticle, :profile_id => community.id)
+    time = article.activity.updated_at
+    Time.stubs(:now).returns(time + 1.day)
+    Comment.create!(:source_id => article.id, :title => 'some', :body => 'some', :author_id => p2.id)
+    process_delayed_job_queue
+    assert_equal time, article.activity.updated_at
   end
   should "see get all received scraps" do
@@ -341,4 +338,35 @@ class CommunityTest &lt; ActiveSupport::TestCase
     assert_equal false, community.receives_scrap_notification?
   end
+  should 'return scraps as activities' do
+    person = fast_create(Person)
+    community = fast_create(Community)
+
+    scrap = Scrap.create!(defaults_for_scrap(:sender => person, :receiver => community, :content => 'A scrap'))
+    activity = ActionTracker::Record.last
+
+    assert_equal [activity,scrap], community.activities.map { |a| a.klass.constantize.find(a.id) }
+  end
+
+  should 'return tracked_actions of community as activities' do
+    person = fast_create(Person)
+    community = fast_create(Community)
+
+    UserStampSweeper.any_instance.expects(:current_user).returns(person).at_least_once
+    article = create(TinyMceArticle, :profile => community, :name => 'An article about free software')
+
+    assert_equal [article.activity], community.activities.map { |a| a.klass.constantize.find(a.id) }
+  end
+
+  should 'not return tracked_actions of other community as activities' do
+    person = fast_create(Person)
+    community = fast_create(Community)
+    community2 = fast_create(Community)
+
+    UserStampSweeper.any_instance.expects(:current_user).returns(person).at_least_once
+    article = create(TinyMceArticle, :profile => community2, :name => 'Another article about free software')
+
+    assert_not_includes community.activities.map { |a| a.klass.constantize.find(a.id) }, article.activity
+  end
+
 end
@@ -470,4 +470,36 @@ class EnterpriseTest &lt; ActiveSupport::TestCase
     ent.save!
   end
+  should 'return scraps as activities' do
+    person = fast_create(Person)
+    enterprise = fast_create(Enterprise)
+
+
+    activity = ActionTracker::Record.last
+    scrap = Scrap.create!(defaults_for_scrap(:sender => person, :receiver => enterprise, :content => 'A scrap'))
+
+    assert_equal [scrap], enterprise.activities.map { |a| a.klass.constantize.find(a.id) }
+  end
+
+  should 'return tracked_actions of community as activities' do
+    person = fast_create(Person)
+    enterprise = fast_create(Enterprise)
+
+    UserStampSweeper.any_instance.expects(:current_user).returns(person).at_least_once
+    article = create(TinyMceArticle, :profile => enterprise, :name => 'An article about free software')
+
+    assert_equal [article.activity], enterprise.activities.map { |a| a.klass.constantize.find(a.id) }
+  end
+
+  should 'not return tracked_actions of other community as activities' do
+    person = fast_create(Person)
+    enterprise = fast_create(Enterprise)
+    enterprise2 = fast_create(Enterprise)
+
+    UserStampSweeper.any_instance.expects(:current_user).returns(person).at_least_once
+    article = create(TinyMceArticle, :profile => enterprise2, :name => 'Another article about free software')
+
+    assert_not_includes enterprise.activities.map { |a| a.klass.constantize.find(a.id) }, article.activity
+  end
+
 end
@@ -276,4 +276,7 @@ class EventTest &lt; ActiveSupport::TestCase
     assert Event.new.tiny_mce?
   end
+  should 'be notifiable' do
+    assert Event.new.notifiable?
+  end
 end
@@ -65,7 +65,7 @@ class ForumHelperTest &lt; ActiveSupport::TestCase
     some_post.comments << Comment.new(:name => 'John', :email => 'lenon@example.com', :title => 'test', :body => 'test')
     c = Comment.last
     out = last_topic_update(some_post)
-    assert_match "#{c.created_at.to_s} ago by John", out
+    assert_match "#{c.created_at.to_s} by John", out
     assert_match 'John', out
     assert_match(/#{Regexp.escape(c.created_at.to_s)} ago by John/m, last_topic_update(some_post))
@@ -28,21 +28,21 @@ class ForumTest &lt; ActiveSupport::TestCase
   should 'create rss feed automatically' do
     p = create_user('testuser').person
-    b = create(Forum, :profile_id => p.id, :name => 'forum_feed_test')
+    b = create(Forum, :profile_id => p.id, :name => 'forum_feed_test', :body => 'Forum')
     assert_kind_of RssFeed, b.feed
   end
   should 'save feed options' do
     p = create_user('testuser').person
-    p.articles << Forum.new(:profile => p, :name => 'forum_feed_test')
+    p.articles << forum = Forum.new(:profile => p, :name => 'forum_feed_test', :body => 'Forum test')
     p.forum.feed = { :limit => 7 }
-    assert_equal 7, p.forum.feed.limit
+    assert_equal 7, Forum.find(forum.id).feed.limit
   end
   should 'save feed options after create forum' do
     p = create_user('testuser').person
-    p.articles << Forum.new(:profile => p, :name => 'forum_feed_test', :feed => { :limit => 7 })
-    assert_equal 7, p.forum.feed.limit
+    p.articles << forum = Forum.new(:profile => p, :name => 'forum_feed_test', :body => 'Forum test', :feed => { :limit => 7 })
+    assert_equal 7, Forum.find(forum.id).feed.limit
   end
   should 'list 5 posts per page by default' do
@@ -52,16 +52,15 @@ class ForumTest &lt; ActiveSupport::TestCase
   should 'update posts per page setting' do
     p = create_user('testuser').person
-    p.articles << Forum.new(:profile => p, :name => 'Forum test')
-    forum = p.forum
+    p.articles << forum = Forum.new(:profile => p, :name => 'Forum test', :body => 'Forum test')
     forum.posts_per_page = 7
     assert forum.save!
-    assert_equal 7, p.forum.posts_per_page
+    assert_equal 7, Forum.find(forum.id).posts_per_page
   end
   should 'has posts' do
     p = create_user('testuser').person
-    forum = fast_create(Forum, :profile_id => p.id, :name => 'Forum test')
+    p.articles << forum = Forum.new(:profile => p, :name => 'Forum test', :body => 'Forum test')
     post = fast_create(TextileArticle, :name => 'First post', :profile_id => p.id, :parent_id => forum.id)
     forum.children << post
     assert_includes forum.posts, post
@@ -69,7 +68,7 @@ class ForumTest &lt; ActiveSupport::TestCase
   should 'not includes rss feed in posts' do
     p = create_user('testuser').person
-    forum = create(Forum, :profile_id => p.id, :name => 'Forum test')
+    forum = create(Forum, :profile_id => p.id, :name => 'Forum test', :body => 'Forum')
     assert_includes forum.children, forum.feed
     assert_not_includes forum.posts, forum.feed
   end
@@ -89,13 +88,13 @@ class ForumTest &lt; ActiveSupport::TestCase
     p = create_user('testuser').person
     fast_create(Forum, :name => 'Forum test', :profile_id => p.id)
     assert_nothing_raised ActiveRecord::RecordInvalid do
-      Forum.create!(:name => 'Another Forum', :profile => p)
+      Forum.create!(:name => 'Another Forum', :profile => p, :body => 'Forum test')
     end
   end
   should 'not update slug from name for existing forum' do
     p = create_user('testuser').person
-    forum = Forum.create!(:name => 'Forum test', :profile => p)
+    forum = Forum.create(:name => 'Forum test', :profile_id => p.id, :body => 'Forum')
     assert_equal 'forum-test', forum.slug
     forum.name = 'Changed name'
     assert_not_equal 'changed-name', forum.slug
@@ -110,4 +109,28 @@ class ForumTest &lt; ActiveSupport::TestCase
     assert !folder.accept_uploads?
   end
+  should 'be notifiable' do
+    assert Forum.new.notifiable?
+  end
+
+  should 'get first paragraph' do
+    f = fast_create(Forum, :body => '<p>First</p><p>Second</p>')
+    assert_equal '<p>First</p>', f.first_paragraph
+  end
+
+  should 'not get first paragraph' do
+    f = fast_create(Forum, :body => 'Nothing to do here')
+    assert_equal '', f.first_paragraph
+  end
+
+  should 'provide first_paragraph even if body was not given' do
+    f = fast_create(Forum)
+    assert_equal '', f.first_paragraph
+  end
+
+  should 'provide first_paragraph even if body is nil' do
+    f = fast_create(Forum, :body => nil)
+    assert_equal '', f.first_paragraph
+  end
+
 end
@@ -24,28 +24,6 @@ class NotifyActivityToProfilesJobTest &lt; ActiveSupport::TestCase
     end
   end
-  should 'notify just the community in tracker with remove_member_in_community verb' do
-    person = fast_create(Person)
-    community  = fast_create(Community)
-    action_tracker = fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person.id, :target_type => 'Profile', :target_id => community.id, :verb => 'remove_member_in_community')
-    assert NotifyActivityToProfilesJob::NOTIFY_ONLY_COMMUNITY.include?(action_tracker.verb)
-    p1, p2, m1, m2 = fast_create(Person), fast_create(Person), fast_create(Person), fast_create(Person)
-    fast_create(Friendship, :person_id => person.id, :friend_id => p1.id)
-    fast_create(Friendship, :person_id => person.id, :friend_id => p2.id)
-    fast_create(RoleAssignment, :accessor_id => m1.id, :role_id => 3, :resource_id => community.id)
-    fast_create(RoleAssignment, :accessor_id => m2.id, :role_id => 3, :resource_id => community.id)
-    ActionTrackerNotification.delete_all
-    job = NotifyActivityToProfilesJob.new(action_tracker.id)
-    job.perform
-    process_delayed_job_queue
-
-    assert_equal 1, ActionTrackerNotification.count
-    [community].each do |profile|
-      notification = ActionTrackerNotification.find_by_profile_id profile.id
-      assert_equal action_tracker, notification.action_tracker
-    end
-  end
-
   should 'notify just the users and his friends tracking user actions' do
     person = fast_create(Person)
     community  = fast_create(Community)
@@ -132,36 +110,14 @@ class NotifyActivityToProfilesJobTest &lt; ActiveSupport::TestCase
     end
   end
-  should 'not notify the community tracking leave_community verb' do
-    person = fast_create(Person)
-    community  = fast_create(Community)
-    action_tracker = fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person.id, :target_type => 'Profile', :target_id => community.id, :verb => 'leave_community')
-    assert !NotifyActivityToProfilesJob::NOTIFY_ONLY_COMMUNITY.include?(action_tracker.verb)
-    p1, p2, m1, m2 = fast_create(Person), fast_create(Person), fast_create(Person), fast_create(Person)
-    fast_create(Friendship, :person_id => person.id, :friend_id => p1.id)
-    fast_create(Friendship, :person_id => person.id, :friend_id => p2.id)
-    fast_create(RoleAssignment, :accessor_id => m1.id, :role_id => 3, :resource_id => community.id)
-    fast_create(RoleAssignment, :accessor_id => m2.id, :role_id => 3, :resource_id => community.id)
-    ActionTrackerNotification.delete_all
-    job = NotifyActivityToProfilesJob.new(action_tracker.id)
-    job.perform
-    process_delayed_job_queue
-
-    assert_equal 5, ActionTrackerNotification.count
-    [person, p1, p2, m1, m2].each do |profile|
-      notification = ActionTrackerNotification.find_by_profile_id profile.id
-      assert_equal action_tracker, notification.action_tracker
-    end
-  end
-
   should "the NOTIFY_ONLY_COMMUNITY constant has all the verbs tested" do
-    notify_community_verbs = ['add_member_in_community', 'remove_member_in_community']
+    notify_community_verbs = ['add_member_in_community']
     assert_equal [], notify_community_verbs - NotifyActivityToProfilesJob::NOTIFY_ONLY_COMMUNITY
     assert_equal [], NotifyActivityToProfilesJob::NOTIFY_ONLY_COMMUNITY - notify_community_verbs
   end
   should "the NOT_NOTIFY_COMMUNITY constant has all the verbs tested" do
-    not_notify_community_verbs = ['join_community', 'leave_community']
+    not_notify_community_verbs = ['join_community']
     assert_equal [], not_notify_community_verbs - NotifyActivityToProfilesJob::NOT_NOTIFY_COMMUNITY
     assert_equal [], NotifyActivityToProfilesJob::NOT_NOTIFY_COMMUNITY - not_notify_community_verbs
   end
@@ -1013,65 +1013,14 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert has_add_member_notification
   end
-  should 'track only one action when a person leaves a community' do
+  should 'not track when a person leaves a community' do
     p = create_user('test_user').person
     c = fast_create(Community, :name => "Foo")
     c.add_member(p)
     c.add_moderator(p)
     ActionTracker::Record.delete_all
     c.remove_member(p)
-    assert_equal ["Foo"], ActionTracker::Record.last(:conditions => {:verb => 'leave_community'}).get_resource_name
-  end
-
-  should 'the tracker target be Community when a person leaves a community' do
-    ActionTracker::Record.delete_all
-    p = create_user('test_user').person
-    c = fast_create(Community, :name => "Foo")
-    c.add_member(p)
-    c.add_moderator(p)
-    ActionTracker::Record.delete_all
-    c.remove_member(p)
-    assert_kind_of Community, ActionTracker::Record.last(:conditions => {:verb => 'leave_community'}).target
-  end
-
-  should 'the community be notified specifically when a person leaves a community' do
-    ActionTracker::Record.delete_all
-    p = create_user('test_user').person
-    c = fast_create(Community, :name => "Foo")
-    c.add_member(p)
-    c.add_moderator(p)
-    ActionTracker::Record.delete_all
-    c.remove_member(p)
-    assert_not_nil ActionTracker::Record.last(:conditions => {:verb => 'remove_member_in_community'})
-  end
-
-  should 'the community specific notification created when a member leaves community could not be propagated to members' do
-    ActionTracker::Record.delete_all
-    p1 = Person.first
-    p2 = create_user('test_user').person
-    p3 = create_user('test_user').person
-    c = fast_create(Community, :name => "Foo")
-    process_delayed_job_queue
-    Delayed::Job.delete_all
-    c.add_member(p1)
-    c.add_member(p3)
-    c.add_moderator(p1)
-    c.add_moderator(p3)
-    ActionTracker::Record.delete_all
-    c.remove_member(p1)
-    process_delayed_job_queue
-    c.remove_member(p3)
-    process_delayed_job_queue
-    assert_equal 4, ActionTracker::Record.count
-    assert_equal 5, ActionTrackerNotification.count
-    has_remove_member_notification = false
-    ActionTrackerNotification.all.map do |notification|
-      if notification.action_tracker.verb == 'remove_member_in_community'
-        has_remove_member_notification = true
-        assert_equal c, notification.profile
-      end
-    end
-    assert has_remove_member_notification
+    assert_equal [], ActionTracker::Record.all
   end
   should 'get all friends online' do
@@ -1243,4 +1192,32 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert !person.visible
     assert_not_equal password, person.user.password
   end
+
+  should 'return tracked_actions and scraps as activities' do
+    person = fast_create(Person)
+    another_person = fast_create(Person)
+
+    scrap = Scrap.create!(defaults_for_scrap(:sender => another_person, :receiver => person, :content => 'A scrap'))
+    UserStampSweeper.any_instance.expects(:current_user).returns(person).at_least_once
+    article = TinyMceArticle.create!(:profile => person, :name => 'An article about free software')
+
+    assert_equivalent [scrap,article.activity], person.activities.map { |a| a.klass.constantize.find(a.id) }
+  end
+
+  should 'not return tracked_actions and scraps from others as activities' do
+    person = fast_create(Person)
+    another_person = fast_create(Person)
+
+    person_scrap = Scrap.create!(defaults_for_scrap(:sender => person, :receiver => person, :content => 'A scrap from person'))
+    another_person_scrap = Scrap.create!(defaults_for_scrap(:sender => another_person, :receiver => another_person, :content => 'A scrap from another person'))
+
+    TinyMceArticle.create!(:profile => another_person, :name => 'An article about free software from another person')
+    another_person_activity = ActionTracker::Record.last
+
+    UserStampSweeper.any_instance.stubs(:current_user).returns(person)
+    TinyMceArticle.create!(:profile => person, :name => 'An article about free software')
+    person_activity = ActionTracker::Record.last
+
+    assert_equivalent [person_scrap,person_activity], person.activities.map { |a| a.klass.constantize.find(a.id) }
+  end
 end
@@ -1648,7 +1648,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
   should 'have forum' do
     p = fast_create(Profile)
-    p.articles << Forum.new(:profile => p, :name => 'forum_feed_test')
+    p.articles << Forum.new(:profile => p, :name => 'forum_feed_test', :body => 'Forum test')
     assert p.has_forum?
   end
@@ -1664,9 +1664,9 @@ class ProfileTest &lt; ActiveSupport::TestCase
   should 'get first forum when has multiple forums' do
     p = fast_create(Profile)
-    p.forums << Forum.new(:profile => p, :name => 'Forum one')
-    p.forums << Forum.new(:profile => p, :name => 'Forum two')
-    p.forums << Forum.new(:profile => p, :name => 'Forum three')
+    p.forums << Forum.new(:profile => p, :name => 'Forum one', :body => 'Forum test')
+    p.forums << Forum.new(:profile => p, :name => 'Forum two', :body => 'Forum test')
+    p.forums << Forum.new(:profile => p, :name => 'Forum three', :body => 'Forum test')
     assert_equal 'Forum one', p.forum.name
     assert_equal 3, p.forums.count
   end
@@ -1731,6 +1731,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert profile.is_on_homepage?("/#{profile.identifier}/#{homepage.slug}", homepage)
   end
+  
   should 'find profiles with image' do
     env = fast_create(Environment)
     2.times do |n|
@@ -1791,6 +1792,11 @@ class ProfileTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'return empty array as activities' do
+    profile = Profile.new
+    assert_equal [], profile.activities
+  end
+
   private
   def assert_invalid_identifier(id)
@@ -38,80 +38,72 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
     assert_equal 1, ActionTracker::Record.count
   end
-  should 'notify with different trackers activity create with different targets' do
+  should 'not group trackers activity of article\'s creation' do
     ActionTracker::Record.delete_all
     profile = fast_create(Profile)
     TextileArticle.create! :name => 'bar', :profile_id => profile.id, :published => true
     TextileArticle.create! :name => 'another bar', :profile_id => profile.id, :published => true
-    assert_equal 1, ActionTracker::Record.count
     TextileArticle.create! :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
-    assert_equal 2, ActionTracker::Record.count
+    assert_equal 3, ActionTracker::Record.count
   end
-  should 'notify activity on update' do
+  should 'not update activity on update of an article' do
     ActionTracker::Record.delete_all
-    a = TextileArticle.create! :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
-    assert_equal 1, ActionTracker::Record.count
-    a.name = 'foo'
-    a.save!
-    assert_equal 2, ActionTracker::Record.count
+    profile = fast_create(Profile)
+    article = create(TextileArticle, :profile_id => profile.id)
+    time = article.activity.updated_at
+    Time.stubs(:now).returns(time + 1.day)
+    assert_no_difference ActionTracker::Record, :count do
+      article.name = 'foo'
+      article.save!
+    end
+    assert_equal time, article.activity.updated_at
   end
-  should 'notify with different trackers activity update with different targets' do
+  should 'not create trackers activity when updating articles' do
     ActionTracker::Record.delete_all
     a1 = TextileArticle.create! :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
     a2 = TextileArticle.create! :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
-    assert_equal 2, ActionTracker::Record.count
-    a1.name = 'foo'
-    a1.save!
-    assert_equal 3, ActionTracker::Record.count
-    a2.name = 'another foo'
-    a2.save!
-    assert_equal 4, ActionTracker::Record.count
+    assert_no_difference ActionTracker::Record, :count do
+      a1.name = 'foo';a1.save!
+      a2.name = 'another foo';a2.save!
+    end
   end
-  should 'notify activity on destroy' do
+  should 'not notify activity on destroy' do
     ActionTracker::Record.delete_all
     a = TextileArticle.create! :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
-    assert_equal 1, ActionTracker::Record.count
-    a.destroy
-    assert_equal 2, ActionTracker::Record.count
+    assert_no_difference ActionTracker::Record, :count do
+      a.destroy
+    end
   end
-  should 'notify different activities when destroy articles with diferrents targets' do
+  should 'not notify when an article is destroyed' do
     ActionTracker::Record.delete_all
     a1 = TextileArticle.create! :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
     a2 = TextileArticle.create! :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
     assert_equal 2, ActionTracker::Record.count
-    a1.destroy
-    assert_equal 3, ActionTracker::Record.count
-    a2.destroy
-    assert_equal 4, ActionTracker::Record.count
+    assert_no_difference ActionTracker::Record, :count do
+      a1.destroy
+      a2.destroy
+    end
   end
-  should "the tracker action target be defined as Community by custom_target method on articles'creation in communities" do
+  should "the tracker action target be defined as the article on articles'creation in communities" do
     ActionTracker::Record.delete_all
     community = fast_create(Community)
     p1 = Person.first
     community.add_member(p1)
     assert p1.is_member_of?(community)
     article = TextileArticle.create! :name => 'test', :profile_id => community.id
-    assert_equal true, article.published?
-    assert_equal true, article.notifiable?
-    assert_equal false, article.image?
-    assert_equal Community, article.profile.class
-    assert_equal Community, ActionTracker::Record.last.target.class
+    assert_equal article, ActionTracker::Record.last.target
   end
-  should "the tracker action target be defined as person by custom_target method on articles'creation in profile" do
+  should "the tracker action target be defined as the article on articles'creation in profile" do
     ActionTracker::Record.delete_all
     person = Person.first
     article = TextileArticle.create! :name => 'test', :profile_id => person.id
-    assert_equal true, article.published?
-    assert_equal true, article.notifiable?
-    assert_equal false, article.image?
-    assert_equal Person, article.profile.class
-    assert_equal person, ActionTracker::Record.last.target
+    assert_equal article, ActionTracker::Record.last.target
   end
   should 'not notify activity if the article is not advertise' do
@@ -129,7 +121,7 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
   end
   should "the common trackable conditions return the correct value" do
-    a =  TextileArticle.new
+    a =  TextileArticle.new(:profile => profile)
     a.published = a.advertise = true
     assert_equal true, a.published?
     assert_equal true, a.notifiable?
@@ -135,80 +135,64 @@ class TinyMceArticleTest &lt; ActiveSupport::TestCase
     assert_equal 1, ActionTracker::Record.count
   end
-  should 'notify with different trackers activity create with different targets' do
+  should 'not group trackers activity of article\'s creation' do
     ActionTracker::Record.delete_all
     profile = fast_create(Profile)
     TinyMceArticle.create! :name => 'bar', :profile_id => profile.id, :published => true
     TinyMceArticle.create! :name => 'another bar', :profile_id => profile.id, :published => true
-    assert_equal 1, ActionTracker::Record.count
-    TinyMceArticle.create! :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
     assert_equal 2, ActionTracker::Record.count
+    TinyMceArticle.create! :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
+    assert_equal 3, ActionTracker::Record.count
   end
-  should 'notify activity on update' do
+  should 'not update activity on update of an article' do
     ActionTracker::Record.delete_all
-    a = TinyMceArticle.create! :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
-    assert_equal 1, ActionTracker::Record.count
-    a.name = 'foo'
-    a.save!
-    assert_equal 2, ActionTracker::Record.count
+    profile = fast_create(Profile)
+    article = create(TinyMceArticle, :profile_id => profile.id)
+    time = article.activity.updated_at
+    Time.stubs(:now).returns(time + 1.day)
+    assert_no_difference ActionTracker::Record, :count do
+      article.name = 'foo'
+      article.save!
+    end
+    assert_equal time, article.activity.updated_at
   end
-  should 'notify with different trackers activity update with different targets' do
+  should 'not create trackers activity when updating articles' do
     ActionTracker::Record.delete_all
     a1 = TinyMceArticle.create! :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
     a2 = TinyMceArticle.create! :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
-    assert_equal 2, ActionTracker::Record.count
-    a1.name = 'foo'
-    a1.save!
-    assert_equal 3, ActionTracker::Record.count
-    a2.name = 'another foo'
-    a2.save!
-    assert_equal 4, ActionTracker::Record.count
+    assert_no_difference ActionTracker::Record, :count do
+      a1.name = 'foo';a1.save!
+      a2.name = 'another foo';a2.save!
+    end
   end
-  should 'notify activity on destroy' do
-    ActionTracker::Record.delete_all
-    a = TinyMceArticle.create! :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
-    assert_equal 1, ActionTracker::Record.count
-    a.destroy
-    assert_equal 2, ActionTracker::Record.count
-  end
-
-  should 'notify different activities when destroy articles with diferrents targets' do
+  should 'not notify when an article is destroyed' do
     ActionTracker::Record.delete_all
     a1 = TinyMceArticle.create! :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
     a2 = TinyMceArticle.create! :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
-    assert_equal 2, ActionTracker::Record.count
-    a1.destroy
-    assert_equal 3, ActionTracker::Record.count
-    a2.destroy
-    assert_equal 4, ActionTracker::Record.count
+    assert_no_difference ActionTracker::Record, :count do
+      a1.destroy
+      a2.destroy
+end
   end
-  should "the tracker action target be defined as Community by custom_target method on articles'creation in communities" do
+  should "the tracker action target be defined as the article on articles'creation in communities" do
     ActionTracker::Record.delete_all
     community = fast_create(Community)
     p1 = Person.first
     community.add_member(p1)
     assert p1.is_member_of?(community)
     article = TinyMceArticle.create! :name => 'test', :profile_id => community.id
-    assert_equal true, article.published?
-    assert_equal true, article.notifiable?
-    assert_equal false, article.image?
-    assert_equal Community, article.profile.class
-    assert_equal Community, ActionTracker::Record.last.target.class
+    assert_equal article, ActionTracker::Record.last.target
   end
-  should "the tracker action target be defined as person by custom_target method on articles'creation in profile" do
+  should "the tracker action target be defined as the article on articles'creation in profile" do
     ActionTracker::Record.delete_all
     person = Person.first
     article = TinyMceArticle.create! :name => 'test', :profile_id => person.id
-    assert_equal true, article.published?
-    assert_equal true, article.notifiable?
-    assert_equal false, article.image?
-    assert_equal Person, article.profile.class
-    assert_equal person, ActionTracker::Record.last.target
+    assert_equal article, ActionTracker::Record.last.target
   end
   should 'not notify activity if the article is not advertise' do
@@ -226,7 +210,7 @@ class TinyMceArticleTest &lt; ActiveSupport::TestCase
   end
   should "the common trackable conditions return the correct value" do
-    a =  TinyMceArticle.new
+    a =  TinyMceArticle.new(:profile => profile)
     a.published = a.advertise = true
     assert_equal true, a.published?
     assert_equal true, a.notifiable?
@@ -231,10 +231,10 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
   should 'return a thumbnail for images' do
     f = UploadedFile.new
     f.expects(:image?).returns(true)
-    f.expects(:full_filename).with(:thumb).returns(File.join(RAILS_ROOT, 'public', 'images', '0000', '0005', 'x.png'))
+    f.expects(:full_filename).with(:display).returns(File.join(RAILS_ROOT, 'public', 'images', '0000', '0005', 'x.png'))
     assert_equal '/images/0000/0005/x.png', f.thumbnail_path
     f = UploadedFile.new
-    f.stubs(:full_filename).with(:thumb).returns(File.join(RAILS_ROOT, 'public', 'images', '0000', '0005', 'x.png'))
+    f.stubs(:full_filename).with(:display).returns(File.join(RAILS_ROOT, 'public', 'images', '0000', '0005', 'x.png'))
     f.expects(:image?).returns(false)
     assert_nil f.thumbnail_path
   end
@@ -330,4 +330,11 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
     assert_equal 'hello_world.php.txt', file.filename
   end
+  should 'use itself as target for action tracker' do
+    p = fast_create(Gallery, :profile_id => @profile.id)
+    f = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => p, :profile => @profile)
+    ta = f.activity
+    assert_equal f, ta.target
+  end
+
 end
@@ -9,10 +9,6 @@ class RoleAssignment &lt; ActiveRecord::Base
   track_actions :add_member_in_community, :after_create, :if => Proc.new { |x| x.resource.is_a?(Community) && x.accessor.role_assignments.count(:conditions => { :resource_id => x.resource.id, :resource_type => 'Profile' }) == 1 }, :custom_user => :accessor, :custom_target => :resource
-  track_actions :leave_community, :before_destroy, :keep_params => ["resource.name", "resource.url", "resource.profile_custom_icon"], :if => Proc.new { |x| x.resource.is_a?(Community) && x.accessor.role_assignments.count(:conditions => { :resource_id => x.resource.id, :resource_type => 'Profile' }) == 1 }, :custom_user => :accessor, :custom_target => :resource
-  
-  track_actions :remove_member_in_community, :before_destroy, :if => Proc.new { |x| x.resource.is_a?(Community) && x.accessor.role_assignments.count(:conditions => { :resource_id => x.resource.id, :resource_type => 'Profile' }) == 1 }, :custom_target => :resource, :custom_user => :accessor
-
   def has_permission?(perm, res)
     return false unless role.has_permission?(perm.to_s) && (resource || is_global)
     return true if is_global
@@ -24,6 +24,7 @@ module ActionTracker
     RECENT_DELAY = 30
     named_scope :recent, :conditions => ['created_at >= ?', RECENT_DELAY.days.ago]
+    named_scope :visible, :conditions => { :visible => true }
     def self.current_user_from_model
       u = new
@@ -0,0 +1,23 @@
+# monkey patch to add comments on action_tracker
+
+ActionTracker::Record.module_eval do
+
+  has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :finder_sql => 'SELECT * FROM comments WHERE #{conditions_for_comments} ORDER BY created_at ASC', :counter_sql => 'SELECT * FROM comments WHERE #{conditions_for_comments}'
+
+  def conditions_for_comments
+    type, id = (self.target_type == 'Article' ? ['Article', self.target_id] : [self.class.to_s, self.id])
+    "source_type = '#{type}' AND source_id = '#{id}'"
+  end
+
+  def comments_as_thread
+    result = {}
+    root = []
+    self.comments.each do |c|
+      c.replies = []
+      result[c.id] ||= c
+      c.reply_of_id.nil? ? root << c : result[c.reply_of_id].replies << c
+    end
+    root
+  end
+
+end
@@ -0,0 +1,36 @@
+# monkey patch to fix ActiveRecord bug
+#
+# https://rails.lighthouseapp.com/projects/8994/tickets/2452-counter_cache-not-updated-when-an-item-updates-its-polymorphic-owner
+
+#ActiveRecord::Associations.module_eval do
+#
+#  def replace(record)
+#
+#        counter_cache_name = @reflection.counter_cache_column
+#
+#        if record.nil?
+#          if counter_cache_name && !@owner.new_record?
+#            record.class.base_class.decrement_counter(counter_cache_name, @owner[@reflection.primary_key_name]) if @owner[@reflection.primary_key_name]
+#          end
+#
+#          @target = @owner[@reflection.primary_key_name] = @owner[@reflection.options[:foreign_type]] = nil
+#        else
+#          @target = (AssociationProxy === record ? record.target : record)
+#
+#          if counter_cache_name && !@owner.new_record?
+#            record.class.base_class.increment_counter(counter_cache_name, record.id)
+#            record.class.base_class.decrement_counter(counter_cache_name, @owner[@reflection.primary_key_name]) if @owner[@reflection.primary_key_name]
+#          end
+#
+#          @owner[@reflection.primary_key_name] = record.id
+#          @owner[@reflection.options[:foreign_type]] = record.class.base_class.name.to_s
+#
+#
+#      @updated = true
+#    end
+#
+#    loaded
+#    record
+#  end
+#
+#end
	@@ -42,9 +42,9 @@ module ForumHelper		@@ -42,9 +42,9 @@ module ForumHelper
42	def last_topic_update(article)	42	def last_topic_update(article)
43	info = article.info_from_last_update	43	info = article.info_from_last_update
44	if info[:author_url]	44	if info[:author_url]
45	- time_ago_as_sentence(info[:date]) + ' ' + _('ago') + ' ' + _('by') + ' ' + link_to(info[:author_name], info[:author_url])	45	+ time_ago_as_sentence(info[:date]) + ' ' + _('by') + ' ' + link_to(info[:author_name], info[:author_url])
46	else	46	else
47	- time_ago_as_sentence(info[:date]) + ' ' + _('ago') + ' ' + _('by') + ' ' + info[:author_name]	47	+ time_ago_as_sentence(info[:date]) + ' ' + _('by') + ' ' + info[:author_name]
48	end	48	end
49	end	49	end
50		50
	@@ -3,6 +3,8 @@ class ActionTrackerNotification < ActiveRecord::Base		@@ -3,6 +3,8 @@ class ActionTrackerNotification < ActiveRecord::Base
3	belongs_to :profile	3	belongs_to :profile
4	belongs_to :action_tracker, :class_name => 'ActionTracker::Record', :foreign_key => 'action_tracker_id'	4	belongs_to :action_tracker, :class_name => 'ActionTracker::Record', :foreign_key => 'action_tracker_id'
5		5
		6	+ has_many :comments, :through => :action_tracker, :class_name => 'Comment', :foreign_key => 'source_id'
		7	+
6	validates_presence_of :profile_id, :action_tracker_id	8	validates_presence_of :profile_id, :action_tracker_id
7	validates_uniqueness_of :action_tracker_id, :scope => :profile_id	9	validates_uniqueness_of :action_tracker_id, :scope => :profile_id
8		10
	@@ -87,4 +87,8 @@ class Community < Organization		@@ -87,4 +87,8 @@ class Community < Organization
87	{:title => __('Community Info and settings'), :icon => 'edit-profile-group'}	87	{:title => __('Community Info and settings'), :icon => 'edit-profile-group'}
88	end	88	end
89		89
		90	+ def activities
		91	+ Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.target_id = #{self.id} UNION SELECT at.id, at.updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} at INNER JOIN articles a ON at.target_id = a.id WHERE a.profile_id = #{self.id} AND at.target_type = 'Article' ORDER BY updated_at DESC")
		92	+ end
		93	+
90	end	94	end
	@@ -180,4 +180,8 @@ class Enterprise < Organization		@@ -180,4 +180,8 @@ class Enterprise < Organization
180	true	180	true
181	end	181	end
182		182
		183	+ def activities
		184	+ Scrap.find_by_sql("SELECT id, updated_at, 'Scrap' AS klass FROM scraps WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, 'ActionTracker::Record' AS klass FROM action_tracker WHERE action_tracker.target_id = #{self.id} UNION SELECT action_tracker.id, action_tracker.updated_at, 'ActionTracker::Record' AS klass FROM action_tracker INNER JOIN articles ON action_tracker.target_id = articles.id WHERE articles.profile_id = #{self.id} AND action_tracker.target_type = 'Article' ORDER BY action_tracker.updated_at DESC")
		185	+ end
		186	+
183	end	187	end
	@@ -14,6 +14,7 @@ class ExternalFeed < ActiveRecord::Base		@@ -14,6 +14,7 @@ class ExternalFeed < ActiveRecord::Base
14	article = TinyMceArticle.new(:name => title, :profile => blog.profile, :body => content, :published_at => date, :source => link, :profile => blog.profile, :parent => blog)	14	article = TinyMceArticle.new(:name => title, :profile => blog.profile, :body => content, :published_at => date, :source => link, :profile => blog.profile, :parent => blog)
15	unless blog.children.exists?(:slug => article.slug)	15	unless blog.children.exists?(:slug => article.slug)
16	article.save!	16	article.save!
		17	+ article.delay.create_activity
17	end	18	end
18	end	19	end
19		20
	@@ -28,4 +28,14 @@ class Forum < Folder		@@ -28,4 +28,14 @@ class Forum < Folder
28	def self.icon_name(article = nil)	28	def self.icon_name(article = nil)
29	'forum'	29	'forum'
30	end	30	end
		31	+
		32	+ def notifiable?
		33	+ true
		34	+ end
		35	+
		36	+ def first_paragraph
		37	+ return '' if body.blank?
		38	+ paragraphs = Hpricot(body).search('p')
		39	+ paragraphs.empty? ? '' : paragraphs.first.to_html
		40	+ end
31	end	41	end
	@@ -13,7 +13,7 @@ class Image < ActiveRecord::Base		@@ -13,7 +13,7 @@ class Image < ActiveRecord::Base
13	:thumbnails => { :big => '150x150',	13	:thumbnails => { :big => '150x150',
14	:thumb => '100x100',	14	:thumb => '100x100',
15	:portrait => '64x64',	15	:portrait => '64x64',
16	- :minor => '50x50',	16	+ :minor => '50x50>',
17	:icon => '20x20!' },	17	:icon => '20x20!' },
18	:max_size => 5.megabytes # remember to update validate message below	18	:max_size => 5.megabytes # remember to update validate message below
19		19
	@@ -12,6 +12,7 @@ class Scrap < ActiveRecord::Base		@@ -12,6 +12,7 @@ class Scrap < ActiveRecord::Base
12	named_scope :not_replies, :conditions => {:scrap_id => nil}	12	named_scope :not_replies, :conditions => {:scrap_id => nil}
13		13
14	track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{\|s\| s.receiver != s.sender}, :custom_target => :action_tracker_target	14	track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{\|s\| s.receiver != s.sender}, :custom_target => :action_tracker_target
		15	+
15	track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{\|s\| s.receiver == s.sender}	16	track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{\|s\| s.receiver == s.sender}
16		17
17	after_create do \|scrap\|	18	after_create do \|scrap\|
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+<%= render :partial => 'default_activity', :locals => { :activity => activity, :tab_action => tab_action } %>
@@ -0,0 +1,67 @@		@@ -0,0 +1,67 @@
	1	+<% Comment %>
	2	+<% Profile %>
	3	+<% Person %>
	4	+
	5	+<li class="article-comment" style='border-bottom:none;'>
	6	+ <div class="article-comment-inner">
	7	+
	8	+ <div class="comment-content comment-logged-in">
	9	+
	10	+ <% if comment.author %>
	11	+ <%= link_to image_tag(profile_icon(comment.author, :minor)),
	12	+ Person.find(comment.author_id).url,
	13	+ :class => 'comment-picture',
	14	+ :title => comment.author_name
	15	+ %>
	16	+ <% end %>
	17	+
	18	+ <div class="comment-details">
	19	+ <div class="comment-text">
	20	+ <%= link_to(comment.author_name, comment.author.url) %>
	21	+ <% unless comment.title.blank? %>
	22	+ <span class="comment-title"><%= comment.title %></span><br/>
	23	+ <% end %>
	24	+ <%= txt2html comment.body %>
	25	+ </div>
	26	+ <div class="profile-activity-time">
	27	+ <%= time_ago_as_sentence(comment.created_at) %>
	28	+ </div>
	29	+ </div>
	30	+
	31	+ <% if logged_in? && (user == profile \|\| user == comment.author \|\| user.has_permission?(:moderate_comments, profile)) %>
	32	+ <% button_bar(:style => 'float: right; margin-top: 0px;') do %>
	33	+ <%= icon_button(:delete, _('Remove'), { :action => :remove_comment, :comment_id => comment.id }, :method => :get, :confirm => _('Are you sure you want to remove this comment and all its replies?')) %>
	34	+ <% end %>
	35	+ <% end %>
	36	+ <br style="clear: both;" />
	37	+
	38	+ <div class="comment_reply post_comment_box closed">
	39	+ <% if @comment && @comment.errors.any? && @comment.reply_of_id.to_i == comment.id %>
	40	+ <%= error_messages_for :comment %>
	41	+ <script type="text/javascript">
	42	+ jQuery(function() {
	43	+ document.location.href = '#<%= comment.anchor %>';
	44	+ add_comment_reply_form('#comment-reply-to-<%= comment.id %>', <%= comment.id %>);
	45	+ });
	46	+ </script>
	47	+ <% end %>
	48	+ <%= report_abuse(comment.author, :comment_link, comment) if comment.author %>
	49	+ <%= link_to_function _('Reply'),
	50	+ "var f = add_comment_reply_form(this, %s); f.find('input[name=comment[title]], textarea').val(''); return false" % comment.id,
	51	+ :class => 'comment-footer comment-footer-link comment-footer-hide',
	52	+ :id => 'comment-reply-to-' + comment.id.to_s
	53	+ %>
	54	+ </div>
	55	+
	56	+ </div>
	57	+
	58	+ <% unless comment.replies.blank? %>
	59	+ <ul class="comment-replies">
	60	+ <% comment.replies.each do \|reply\| %>
	61	+ <%= render :partial => 'comment', :locals => { :comment => reply } %>
	62	+ <% end %>
	63	+ </ul>
	64	+ <% end %>
	65	+
	66	+ </div>
	67	+</li>