Merge branch 'next_colivre' into ActionItem2871

Leandro Nunes dos Santos
2 parents 6e1fdc22 4eb56579
Showing 236 changed files with 5968 additions and 662 deletions Show diff stats
COPYRIGHT
HACKING
HACKING.rails235
INSTALL.chat
README
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/memberships_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/my_profile/spam_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/blog_helper.rb
app/helpers/boxes_helper.rb
app/helpers/categories_helper.rb
app/helpers/cms_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/folder_helper.rb
app/helpers/sweeper_helper.rb
@@ -4,8 +4,9 @@ Copyright (c) 2007-2009,
   Cáritas Brasileira <http://www.caritasbrasileira.org/>
 Copyright (c) 2007-2009,
   Ynternet.org Foundation <http://www.ynternet.org/>
-Copyright (c) 2008-2009,
+Copyright (c) 2008-2013,
   Colivre <http://www.colivre.coop.br/>
+Copyright (c) the Noosfero contributors. See AUTHORS
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -52,3 +52,12 @@ If you write such script for your own OS, *please* share it with us at the
 development mailing list so that we can include it in the official repository.
 This way other people using the same OS will have to put less effort to develop
 Noosfero.
+
+== Submitting your changes back
+
+For now please read:
+
+- Coding conventions
+  http://noosfero.org/Development/CodingConventions
+- Patch guidelines
+  http://noosfero.org/Development/PatchGuidelines
@@ -1,13 +0,0 @@
-This is a draft of how to create a environment to Rails 2.3.5 to Noosfero
-development.
-
-Install dependencies:
-
-gem install rails -v 2.3.5
-gem install i18n
-gem install will_paginate -v 2.3.12
-gem install cucumber
-
-Creating initial environment:
-
-rake db:schema:load
@@ -6,7 +6,7 @@ To configure XMPP/BOSH in Noosfero you need:
 * SystemTimer - http://ph7spot.com/musings/system-timer
 * Pidgin data files - http://www.pidgin.im/
-If you use Debian Wheezy:
+If you use Debian 6.0 (squeeze):
 # apt-get install librestclient-ruby pidgin-data ruby1.8-dev
 # gem install SystemTimer
-noosfero - a web-based social platform
+Noosfero - a web-based social platform
 ======================================
-:: About the project
+http://www.noosfero.org/
-Homepage: http://www.noosfero.org/
+Documentation
+-------------
-:: Authors and copyright
+The following documentation is available:
-Authors: see file AUTHORS
-Copyright information: see file COPYRIGHT
-Full license text; see file COPYING
+File                  Purpose
+~~~~~~~~~~~~~~~~~~~~  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+INSTALL               install instructions
+INSTALL.awstats       install instructions - access statistics service
+INSTALL.chat          install instructions - chat service
+INSTALL.email         install instructions - email service
+INSTALL.multitenancy  install instructions - multiple sites
+INSTALL.varnish       install instructions - varnish HTTP caching (recommended)
+HACKING               development instruction
+RELEASING             instructions for doing releases
+doc/noosfero/*        user documentation (available through the app itself)
+
+
+Authors and copyright
+---------------------
+
+Authorship and copyright information is available in the files listed below.
+
+File                  Purpose
+~~~~~~~~~~~~~~~~~~~~  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+AUTHORS               list of authors (updated at each release)
+COPYRIGHT             Copyright statement for the project
+COPYING               Full text of the project license
@@ -144,10 +144,15 @@ class CmsController &lt; MyProfileController
   post_only :set_home_page
   def set_home_page
-    @article = profile.articles.find(params[:id])
-    profile.home_page = @article
-    profile.save(false)
-    session[:notice] = _('"%s" configured as home page.') % @article.name
+    article = params[:id].nil? ? nil : profile.articles.find(params[:id])
+    profile.update_attribute(:home_page, article)
+
+    if article.nil?
+      session[:notice] = _('Homepage reseted.')
+    else
+      session[:notice] = _('"%s" configured as homepage.') % article.name
+    end
+
     redirect_to (request.referer || profile.url)
   end
@@ -267,7 +272,10 @@ class CmsController &lt; MyProfileController
     @back_to = params[:back_to] || request.referer || url_for(profile.public_profile_url)
     @task = SuggestArticle.new(params[:task])
     if request.post?
-       @task.target = profile
+      @task.target = profile
+      @task.ip_address = request.remote_ip
+      @task.user_agent = request.user_agent
+      @task.referrer = request.referrer
       if verify_recaptcha(:model => @task, :message => _('Please type the words correctly')) && @task.save
         session[:notice] = _('Thanks for your suggestion. The community administrators were notified.')
         redirect_to @back_to
@@ -9,9 +9,10 @@ class MembershipsController &lt; MyProfileController
   def new_community
     @community = Community.new(params[:community])
     @community.environment = environment
+    @back_to = params[:back_to] || url_for(:action => 'index')
     if request.post? && @community.valid?
       @community = Community.create_after_moderation(user, {:environment => environment}.merge(params[:community]))
-      redirect_to :action => 'index'
+      redirect_to @back_to
       return
     end
   end
@@ -4,7 +4,7 @@ class ProfileEditorController &lt; MyProfileController
   protect 'destroy_profile', :profile, :only => [:destroy_profile]
   def index
-    @pending_tasks = Task.to(profile).pending.select{|i| user.has_permission?(i.permission, profile)}
+    @pending_tasks = Task.to(profile).pending.without_spam.select{|i| user.has_permission?(i.permission, profile)}
   end
   helper :profile
@@ -14,9 +14,15 @@ class SpamController &lt; MyProfileController
         if params[:remove_comment]
           profile.comments_received.find(params[:remove_comment]).destroy
         end
+        if params[:remove_task]
+          Task.to(profile).find_by_id(params[:remove_task]).destroy
+        end
         if params[:mark_comment_as_ham]
           profile.comments_received.find(params[:mark_comment_as_ham]).ham!
         end
+        if params[:mark_task_as_ham] && (t = Task.to(profile).find_by_id(params[:mark_task_as_ham]))
+          t.ham!
+        end
         if request.xhr?
           json_response(true)
         else
@@ -28,7 +34,8 @@ class SpamController &lt; MyProfileController
       return
     end
-    @spam = profile.comments_received.spam.paginate({:page => params[:page]})
+    @comment_spam = profile.comments_received.spam.paginate({:page => params[:comments_page]})
+    @task_spam = Task.to(profile).spam.paginate({:page => params[:tasks_page]})
   end
   protected
@@ -4,12 +4,12 @@ class TasksController &lt; MyProfileController
   def index
     @filter = params[:filter_type].blank? ? nil : params[:filter_type]
-    @tasks = Task.to(profile).pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
+    @tasks = Task.to(profile).without_spam.pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
     @failed = params ? params[:failed] : {}
   end
   def processed
-    @tasks = Task.to(profile).closed.sort_by(&:created_at)
+    @tasks = Task.to(profile).without_spam.closed.sort_by(&:created_at)
   end
   VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]
@@ -57,7 +57,7 @@ class TasksController &lt; MyProfileController
   end
   def list_requested
-    @tasks = Task.find_all_by_requestor_id(profile.id)
+    @tasks = Task.without_spam.find_all_by_requestor_id(profile.id)
   end
   def ticket_details
@@ -53,7 +53,9 @@ class ContentViewerController &lt; ApplicationController
     # At this point the page will be showed
     @page.hit
-    unless @page.mime_type == 'text/html' || (@page.image? && params[:view])
+    @page = FilePresenter.for @page
+
+    unless @page.mime_type == 'text/html' || params[:view]
       headers['Content-Type'] = @page.mime_type
       data = @page.data
@@ -206,10 +206,50 @@ class ProfileController &lt; PublicController
   end
   def view_more_network_activities
-    @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page]) 
+    @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page])
     render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}
   end
+  def more_comments
+    activity = ActionTracker::Record.find(:first, :conditions => {:id => params[:activity], :user_id => @profile})
+    comments_count = activity.comments.count
+    comment_page = (params[:comment_page] || 1).to_i
+    comments_per_page = 5
+    no_more_pages = comments_count <= comment_page * comments_per_page
+
+    render :update do |page|
+      page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity],
+        :partial => 'comment', :collection => activity.comments.paginate(:per_page => comments_per_page, :page => comment_page)
+
+      if no_more_pages
+        page.remove 'profile-wall-activities-comments-more-'+params[:activity]
+      else
+        page.replace_html 'profile-wall-activities-comments-more-'+params[:activity],
+          :partial => 'more_comments', :locals => {:activity => activity, :comment_page => comment_page}
+      end
+    end
+  end
+
+  def more_replies
+    activity = Scrap.find(:first, :conditions => {:id => params[:activity], :receiver_id => @profile, :scrap_id => nil})
+    comments_count = activity.replies.count
+    comment_page = (params[:comment_page] || 1).to_i
+    comments_per_page = 5
+    no_more_pages = comments_count <= comment_page * comments_per_page
+
+    render :update do |page|
+      page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity],
+        :partial => 'profile_scrap', :collection => activity.replies.paginate(:per_page => comments_per_page, :page => comment_page), :as => :scrap
+
+      if no_more_pages
+        page.remove 'profile-wall-activities-comments-more-'+params[:activity]
+      else
+        page.replace_html 'profile-wall-activities-comments-more-'+params[:activity],
+          :partial => 'more_replies', :locals => {:activity => activity, :comment_page => comment_page}
+      end
+    end
+  end
+
   def remove_scrap
     begin
       scrap = current_user.person.scraps(params[:scrap_id])
@@ -343,6 +383,7 @@ class ProfileController &lt; PublicController
     end
   end
+
   protected
   def check_access_to_profile
@@ -393,4 +434,5 @@ class ProfileController &lt; PublicController
   def relations_to_include
     [:image, :domains, :preferred_domain, :environment]
   end
+
 end
@@ -558,6 +558,9 @@ module ApplicationHelper
   # displays a link to the profile homepage with its image (as generated by
   # #profile_image) and its name below it.
   def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )
+    if content = @plugins.dispatch_first(:profile_image_link, profile, size, tag, extra_info)
+      return instance_eval(&content)
+    end
     name = profile.short_name
     if profile.person?
       url = url_for(profile.check_friendship_url)
@@ -574,16 +577,16 @@ module ApplicationHelper
     extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
     links = links_for_balloon(profile)
     content_tag('div', content_tag(tag,
-        (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{links.to_json}); return false", :class => "menu-submenu-trigger #{trigger_class}", :url => url) : "") +
-        link_to(
-            content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
-            content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
-            extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
-            profile.url,
-            :class => 'profile_link url',
-            :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
-            :title => profile.name ),
-        :class => 'vcard'), :class => 'common-profile-list-block')
+                                   (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{links.to_json}); return false", :class => "menu-submenu-trigger #{trigger_class}", :url => url) : "") +
+    link_to(
+      content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
+      content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
+      extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
+      profile.url,
+      :class => 'profile_link url',
+      :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
+      :title => profile.name ),
+      :class => 'vcard'), :class => 'common-profile-list-block')
   end
   def gravatar_url_for(email, options = {})
@@ -1113,15 +1116,34 @@ module ApplicationHelper
     result
   end
-  def manage_enterprises
-    if user && !user.enterprises.empty?
-      enterprises_link = user.enterprises.map do |enterprise|
-        link_to(content_tag('strong', [_('<span>Manage</span> %s') % enterprise.short_name(25)]), @environment.top_url + "/myprofile/#{enterprise.identifier}", :class => "icon-menu-"+enterprise.class.identification.underscore, :title => [_('Manage %s') % enterprise.short_name])
+  def manage_link(list, kind)
+    if list.present?
+      link_to_all = nil
+      if list.count > 5
+        list = list.first(5)
+        link_to_all = link_to(content_tag('strong', _('See all')), :controller => 'memberships', :profile => current_user.login)
+      end
+      link = list.map do |element|
+        link_to(content_tag('strong', [_('<span>Manage</span> %s') % element.short_name(25)]), @environment.top_url + "/myprofile/#{element.identifier}", :class => "icon-menu-"+element.class.identification.underscore, :title => [_('Manage %s') % element.short_name])
       end
-      render :partial => 'shared/manage_enterprises', :locals => {:enterprises_link => enterprises_link}
+      if link_to_all
+        link << link_to_all
+      end
+      render :partial => "shared/manage_link", :locals => {:link => link, :kind => kind.to_s}
     end
   end
+  def manage_enterprises
+    return unless user && user.environment.enabled?(:display_my_enterprises_on_user_menu)
+    manage_link(user.enterprises, :enterprises)
+  end
+
+  def manage_communities
+    return unless user && user.environment.enabled?(:display_my_communities_on_user_menu)
+    administered_communities = user.communities.more_popular.select {|c| c.admins.include? user}
+    manage_link(administered_communities, :communities)
+  end
+
   def usermenu_logged_in
     pending_tasks_count = ''
     count = user ? Task.to(user).pending.count : -1
@@ -1133,6 +1155,7 @@ module ApplicationHelper
     render_environment_features(:usermenu) +
     link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
     manage_enterprises.to_s +
+    manage_communities.to_s +
     link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +
     pending_tasks_count +
     link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
@@ -1401,8 +1424,8 @@ module ApplicationHelper
   end
   def filter_html(html, source)
-    if @plugins
-      html = convert_macro(html, source)
+    if @plugins && source && source.has_macro?
+      html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
       #TODO This parse should be done through the macro infra, but since there
       #     are old things that do not support it we are keeping this hot spot.
       html = @plugins.pipeline(:parse_content, html, source).first
@@ -42,7 +42,7 @@ module BlogHelper
   def display_post(article, format = 'full')
     no_comments = (format == 'full') ? false : true
-    html = send("display_#{format}_format", article).html_safe
+    html = send("display_#{format}_format", FilePresenter.for(article)).html_safe
     article_title(article, :no_comments => no_comments) + html
   end
@@ -100,9 +100,7 @@ module BoxesHelper
       options[:title] = _("This block is invisible. Your visitors will not see it.")
     end
-    if @controller.send(:content_editor?)
-      result = filter_html(result, block)
-    end
+    result = filter_html(result, block)
     box_decorator.block_target(block.box, block) +
       content_tag('div',
@@ -3,10 +3,21 @@ module CategoriesHelper
   COLORS = [
     [ N_('Do not display at the menu'), nil ],
-    [ N_('Orange'), 1 ],
-    [ N_('Green'), 2 ],
-    [ N_('Purple'), 3 ],
-    [ N_('Red'), 4 ],
+    [ N_('Orange'), 1],
+    [ N_('Green'), 2],
+    [ N_('Purple'), 3],
+    [ N_('Red'), 4],
+    [ N_('Dark Green'), 5],
+    [ N_('Blue Oil'), 6],
+    [ N_('Blue'), 7],
+    [ N_('Brown'), 8],
+    [ N_('Light Green'), 9],
+    [ N_('Light Blue'), 10],
+    [ N_('Dark Blue'), 11],
+    [ N_('Blue Pool'), 12],
+    [ N_('Beige'), 13],
+    [ N_('Yellow'), 14],
+    [ N_('Light Brown'), 15]
   ]
   TYPES = [
@@ -33,7 +33,7 @@ module CmsHelper
       link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)
     else
       if article.image?
-         image_tag(icon_for_article(article)) + link_to(article_name, article.url)
+        image_tag(icon_for_article(article)) + link_to(article_name, article.url)
       else
         link_to article_name, article.url, :class => icon_for_article(article)
       end
@@ -17,7 +17,7 @@ module ContentViewerHelper
     title = article.display_title if article.kind_of?(UploadedFile) && article.image?
     title = article.title if title.blank?
     title = content_tag('h1', h(title), :class => 'title')
-    if article.belongs_to_blog?
+    if article.belongs_to_blog? || article.belongs_to_forum?
       unless args[:no_link]
         title = content_tag('h1', link_to(article.name, article.url), :class => 'title')
       end
@@ -21,6 +21,7 @@ module FolderHelper
   end
   def display_article_in_listing(article, recursive = false, level = 0)
+    article = FilePresenter.for article
     article_link = if article.image?
          link_to('&nbsp;' * (level * 4) + image_tag(icon_for_article(article)) + short_filename(article.name), article.url.merge(:view => true))
        else
@@ -40,12 +41,15 @@ module FolderHelper
   end
   def icon_for_article(article)
-    icon = article.class.icon_name(article)
+    article = FilePresenter.for article
+    icon = article.respond_to?(:icon_name) ?
+             article.icon_name :
+             article.class.icon_name(article)
     if (icon =~ /\//)
       icon
     else
-      klasses = 'icon icon-' + icon
-      if article.kind_of?(UploadedFile)
+      klasses = 'icon ' + [icon].flatten.map{|name| 'icon-'+name}.join(' ')
+      if article.kind_of?(UploadedFile) || article.kind_of?(FilePresenter)
         klasses += ' icon-upload-file'
       end
       klasses
@@ -44,4 +44,30 @@ module SweeperHelper
   def expire_profile_index(profile)
     expire_timeout_fragment(profile.relationships_cache_key)
   end
+
+  def expire_blocks_cache(context, causes)
+    if context.kind_of?(Profile)
+      profile = context
+      environment = profile.environment
+    else
+      environment = context
+      profile = nil
+    end
+
+    blocks_to_expire = []
+    if profile
+      profile.blocks.each {|block|
+        conditions = block.class.expire_on
+        blocks_to_expire << block unless (conditions[:profile] & causes).empty?
+      }
+    end
+    environment.blocks.each {|block|
+      conditions = block.class.expire_on
+      blocks_to_expire << block unless (conditions[:environment] & causes).empty?
+    }
+
+    blocks_to_expire.uniq!
+    BlockSweeper.expire_blocks(blocks_to_expire)
+  end
+
 end
@@ -2,6 +2,8 @@ require &#39;hpricot&#39;
 class Article < ActiveRecord::Base
+  acts_as_having_image
+
   SEARCHABLE_FIELDS = {
     :name => 10,
     :abstract => 3,
@@ -154,8 +156,12 @@ class Article &lt; ActiveRecord::Base
     end
   end
+  def css_class_list
+    [self.class.name.underscore.dasherize]
+  end
+
   def css_class_name
-    self.class.name.underscore.dasherize
+    [css_class_list].flatten.compact.join(' ')
   end
   def pending_categorizations
@@ -310,6 +316,10 @@ class Article &lt; ActiveRecord::Base
   def belongs_to_blog?
     self.parent and self.parent.blog?
   end
+  
+  def belongs_to_forum?
+    self.parent and self.parent.forum?
+  end
   def info_from_last_update
     last_comment = comments.last
@@ -325,7 +335,7 @@ class Article &lt; ActiveRecord::Base
   end
   def view_url
-    @view_url ||= image? ? url.merge(:view => true) : url
+    @view_url ||= is_a?(UploadedFile) ? url.merge(:view => true) : url
   end
   def comment_url_structure(comment, action = :edit)
@@ -673,6 +683,10 @@ class Article &lt; ActiveRecord::Base
   delegate :region, :region_id, :environment, :environment_id, :to => :profile, :allow_nil => true
+  def has_macro?
+    true
+  end
+
   private
   def sanitize_tag_list
@@ -12,7 +12,7 @@ class ArticleBlock &lt; Block
     block = self
     lambda do
       block_title(block.title) +
-      (block.article ? article_to_html(block.article,
+      (block.article ? article_to_html(FilePresenter.for(block.article),
           :gallery_view => false,
           :inside_block => block,               # For Blogs and folders
           :format => block.visualization_format # For Articles and contents
@@ -23,7 +23,7 @@ class ArticleBlock &lt; Block
   def article_id
     self.settings[:article_id]
   end
-  
+
   def article_id= value
     self.settings[:article_id] = value.blank? ? nil : value.to_i
   end
@@ -63,4 +63,9 @@ class ArticleBlock &lt; Block
   end
   settings_items :visualization_format, :type => :string, :default => 'short'
+
+  def self.expire_on
+      { :profile => [:article], :environment => [:article] }
+  end
+
 end
@@ -138,4 +138,19 @@ class Block &lt; ActiveRecord::Base
     4.hours
   end
+  def has_macro?
+    false
+  end
+
+  # Override in your subclasses.
+  # Define which events and context should cause the block cache to expire
+  # Possible events are: :article, :profile, :friendship, :category
+  # Possible contexts are: :profile, :environment
+  def self.expire_on
+    {
+      :profile => [],
+      :environment => []
+    }
+  end
+
 end
@@ -45,4 +45,7 @@ class BlogArchivesBlock &lt; Block
     content_tag('div', link_to(_('Subscribe RSS Feed'), owner_blog.feed.url), :class => 'subscribe-feed')
   end
+  def self.expire_on
+      { :profile => [:article], :environment => [:article] }
+  end
 end
@@ -35,4 +35,7 @@ class CategoriesBlock &lt; Block
     end
   end
+  def self.expire_on
+      { :profile => [], :environment => [:category] }
+  end
 end
@@ -12,7 +12,7 @@ class Category &lt; ActiveRecord::Base
   validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('%{fn} is already being used by another category.').fix_i18n
   belongs_to :environment
-  validates_inclusion_of :display_color, :in => [ 1, 2, 3, 4, nil ]
+  validates_inclusion_of :display_color, :in => 1..15, :allow_nil => true
   validates_uniqueness_of :display_color, :scope => :environment_id, :if => (lambda { |cat| ! cat.display_color.nil? }), :message => N_('%{fn} was already assigned to another category.').fix_i18n
   # Finds all top level categories for a given environment. 
@@ -16,9 +16,7 @@ class Comment &lt; ActiveRecord::Base
   has_many :children, :class_name => 'Comment', :foreign_key => 'reply_of_id', :dependent => :destroy
   belongs_to :reply_of, :class_name => 'Comment', :foreign_key => 'reply_of_id'
-  named_scope :without_spam, :conditions => ['spam IS NULL OR spam = ?', false]
   named_scope :without_reply, :conditions => ['reply_of_id IS NULL']
-  named_scope :spam, :conditions => ['spam = ?', true]
   # unauthenticated authors:
   validates_presence_of :name, :if => (lambda { |record| !record.email.blank? })
@@ -108,6 +106,17 @@ class Comment &lt; ActiveRecord::Base
   include Noosfero::Plugin::HotSpot
+  include Spammable
+
+  def after_spam!
+    SpammerLogger.log(ip_address, self)
+    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
+  end
+
+  def after_ham!
+    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_ham))
+  end
+
   def verify_and_notify
     check_for_spam
     unless spam?
@@ -115,10 +124,6 @@ class Comment &lt; ActiveRecord::Base
     end
   end
-  def check_for_spam
-    plugins.dispatch(:check_comment_for_spam, self)
-  end
-
   def notify_by_mail
     if source.kind_of?(Article) && article.notify_comments?
       if !notification_emails.empty?
@@ -205,37 +210,6 @@ class Comment &lt; ActiveRecord::Base
     @rejected = true
   end
-  def spam?
-    !spam.nil? && spam
-  end
-
-  def ham?
-    !spam.nil? && !spam
-  end
-
-  def spam!
-    self.spam = true
-    self.save!
-    SpammerLogger.log(ip_address, self)
-    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
-    self
-  end
-
-  def ham!
-    self.spam = false
-    self.save!
-    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_ham))
-    self
-  end
-
-  def marked_as_spam
-    plugins.dispatch(:comment_marked_as_spam, self)
-  end
-
-  def marked_as_ham
-    plugins.dispatch(:comment_marked_as_ham, self)
-  end
-
   def need_moderation?
     article.moderate_comments? && (author.nil? || article.author != author)
   end
@@ -127,7 +127,9 @@ class Environment &lt; ActiveRecord::Base
       'captcha_for_logged_users' => _('Ask captcha when a logged user comments too'),
       'skip_new_user_email_confirmation' => _('Skip e-mail confirmation for new users'),
       'send_welcome_email_to_new_users' => _('Send welcome e-mail to new users'),
-      'allow_change_of_redirection_after_login' => _('Allow users to set the page to redirect after login')
+      'allow_change_of_redirection_after_login' => _('Allow users to set the page to redirect after login'),
+      'display_my_communities_on_user_menu' => _('Display on menu the list of communities the user can manage'),
+      'display_my_enterprises_on_user_menu' => _('Display on menu the list of enterprises the user can manage')
     }
   end
@@ -33,6 +33,12 @@ class LinkListBlock &lt; Block
     ['chat', N_('Chat')]
   ]
+  TARGET_OPTIONS = [
+    [N_('Same page'), '_self'],
+    [N_('New tab'), '_blank'],
+    [N_('New window'), '_new'],
+  ]
+
   settings_items :links, Array, :default => []
   before_save do |block|
@@ -57,7 +63,7 @@ class LinkListBlock &lt; Block
   def link_html(link)
     klass = 'icon-' + link[:icon] if link[:icon]
     sanitize_link(
-      link_to(link[:name], expand_address(link[:address]), :class => klass)
+      link_to(link[:name], expand_address(link[:address]), :target => link[:target], :class => klass)
     )
   end
@@ -10,4 +10,7 @@ class RawHTMLBlock &lt; Block
     (title.blank? ? '' : block_title(title)).html_safe + html.to_s.html_safe
   end
+  def has_macro?
+    true
+  end
 end
@@ -30,4 +30,7 @@ class RecentDocumentsBlock &lt; Block
     end
   end
+  def self.expire_on
+      { :profile => [:article], :environment => [:article] }
+  end
 end
@@ -6,6 +6,8 @@ class SpammerLogger &lt; Logger
     if object
       if object.kind_of?(Comment)
         @logger << "[#{Time.now.strftime('%F %T %z')}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
+      elsif object.kind_of?(SuggestArticle)
+        @logger << "[#{Time.now.strftime('%F %T %z')}] SuggestArticle-id: #{object.id} IP: #{spammer_ip}\n"
       end
     else
         @logger << "[#{Time.now.strftime('%F %T %z')}] IP: #{spammer_ip}\n"
@@ -11,6 +11,17 @@ class SuggestArticle &lt; Task
   settings_items :source, :type => String
   settings_items :source_name, :type => String
   settings_items :highlighted, :type => :boolean, :default => false
+  settings_items :ip_address, :type => String
+  settings_items :user_agent, :type => String
+  settings_items :referrer, :type => String
+
+  after_create :schedule_spam_checking
+
+  def schedule_spam_checking
+    self.delay.check_for_spam
+  end
+
+  include Noosfero::Plugin::HotSpot
   def sender
     "#{name} (#{email})"
@@ -61,4 +72,12 @@ class SuggestArticle &lt; Task
     _('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }
   end
+  def after_spam!
+    SpammerLogger.log(ip_address, self)
+    self.delay.marked_as_spam
+  end
+
+  def after_ham!
+    self.delay.marked_as_ham
+  end
 end
@@ -59,4 +59,8 @@ class TagsBlock &lt; Block
     15.minutes
   end
+  def self.expire_on
+      { :profile => [:article], :environment => [:article] }
+  end
+
 end
@@ -235,6 +235,8 @@ class Task &lt; ActiveRecord::Base
     end
   end
+  include Spammable
+
   protected
   # This method must be overrided in subclasses, and its implementation must do
@@ -275,6 +277,7 @@ class Task &lt; ActiveRecord::Base
   named_scope :of, lambda { |type| conditions = type ? "type LIKE '#{type}'" : "1=1"; {:conditions =>  [conditions]} }
   named_scope :order_by, lambda { |attribute, ord| {:order => "#{attribute} #{ord}"} }
+
   named_scope :to, lambda { |profile|
     environment_condition = nil
     if profile.person?
@@ -41,7 +41,25 @@ class UploadedFile &lt; Article
   end
   def self.max_size
-    UploadedFile.attachment_options[:max_size]
+    default = 5.megabytes
+
+    multipliers = {
+      :KB => :kilobytes,
+      :MB => :megabytes,
+      :GB => :gigabytes,
+      :TB => :terabytes,
+    }
+    max_upload_size = NOOSFERO_CONF['max_upload_size']
+
+    if max_upload_size =~ /^(\d+(\.\d+)?)\s*(KB|MB|GB|TB)?$/
+      number = $1.to_f
+      unit = $3 || :MB
+      multiplier = multipliers[unit.to_sym]
+
+      number.send(multiplier).to_i
+    else
+      default
+    end
   end
   # FIXME need to define min/max file size
@@ -52,20 +70,28 @@ class UploadedFile &lt; Article
   has_attachment :storage => :file_system,
     :thumbnails => { :icon => [24,24], :thumb => '130x130>', :slideshow => '320x240>', :display => '640X480>' },
     :thumbnail_class => Thumbnail,
-    :max_size => 5.megabytes # remember to update validate message below
+    :max_size => self.max_size
-  validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of 5.0 MB").fix_i18n
+  validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of %{size}").sub('%{size}', self.max_size.to_humanreadable).fix_i18n
   delay_attachment_fu_thumbnails
   postgresql_attachment_fu
+  # Use this method only to get the generic icon for this kind of content.
+  # If you want the specific icon for a file type or the iconified version
+  # of an image, use FilePresenter.for(uploaded_file).icon_name
   def self.icon_name(article = nil)
-    if article
-      article.image? ? article.public_filename(:icon) : (article.mime_type ? article.mime_type.gsub(/[\/+.]/, '-') : 'upload-file')
-    else
-      'upload-file'
+    unless article.nil?
+      warn = ('='*80) + "\n" +
+             'The method `UploadedFile.icon_name(obj)` is deprecated. ' +
+             'You must to encapsulate UploadedFile with `FilePresenter.for()`.' +
+             "\n" + ('='*80)
+      raise NoMethodError, warn if ENV['RAILS_ENV'] == 'test'
+      Rails.logger.warn warn if Rails.logger
+      puts warn if ENV['RAILS_ENV'] == 'development'
     end
+    'upload-file'
   end
   def mime_type
@@ -91,40 +117,27 @@ class UploadedFile &lt; Article
   end
   def to_html(options = {})
+    warn = ('='*80) + "\n" +
+           'The method `UploadedFile#to_html()` is deprecated. ' +
+           'You must to encapsulate UploadedFile with `FilePresenter.for()`.' +
+           "\n" + ('='*80)
+    raise NoMethodError, warn if ENV['RAILS_ENV'] == 'test'
+    Rails.logger.warn warn if Rails.logger
+    puts warn if ENV['RAILS_ENV'] == 'development'
     article = self
     if image?
       lambda do
-        if article.gallery? && options[:gallery_view]
-          images = article.parent.images
-          current_index = images.index(article)
-          total_of_images = images.count
-
-          link_to_previous = if current_index >= 1
-            link_to(_('&laquo; Previous'), images[current_index - 1].view_url, :class => 'left')
-          else
-            content_tag('span', _('&laquo; Previous'), :class => 'left')
-          end
-
-          link_to_next = if current_index < total_of_images - 1
-            link_to(_('Next &raquo;'), images[current_index + 1].view_url, :class => 'right')
-          else
-            content_tag('span', _('Next &raquo;'), :class => 'right')
-          end
-
-          content_tag(
-            'div',
-            link_to_previous + (content_tag('span', _('image %d of %d'), :class => 'total-of-images') % [current_index + 1, total_of_images]).html_safe + link_to_next,
-            :class => 'gallery-navigation'
-          )
-        end.to_s +
-        image_tag(article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') +
-          content_tag('p', article.abstract, :class => 'uploaded-file-description')
-
+        image_tag(article.public_filename(:display),
+                  :class => article.css_class_name,
+                  :style => 'max-width: 100%') +
+        content_tag('div', article.abstract, :class => 'uploaded-file-description')
       end
     else
       lambda do
-        content_tag('ul', content_tag('li', link_to(article.name, article.url, :class => article.css_class_name))) +
-          content_tag('p', article.abstract, :class => 'uploaded-file-description')
+        content_tag('div',
+                    link_to(article.name, article.url),
+                    :class => article.css_class_name) +
+        content_tag('div', article.abstract, :class => 'uploaded-file-description')
       end
     end
   end
@@ -0,0 +1,7 @@
+# Made to encapsulate any UploadedFile
+class FilePresenter::Generic < FilePresenter
+  # if returns low priority, because it is generic.
+  def self.accepts?(f)
+    1 if f.is_a? UploadedFile
+  end
+end
@@ -0,0 +1,14 @@
+class FilePresenter::Image < FilePresenter
+  def self.accepts?(f)
+    return nil unless f.respond_to? :image?
+    f.image? ? 10 : nil
+  end
+
+  def icon_name
+    public_filename :icon
+  end
+
+  def short_description
+    _('Image (%s)') % content_type.split('/')[1].upcase
+  end
+end
@@ -16,15 +16,15 @@ class ArticleSweeper &lt; ActiveRecord::Observer
     end
   end
+
 protected
   def expire_caches(article)
+    expire_blocks_cache(article.profile, [:article])
+
     return if !article.environment
+
     article.hierarchy(true).each { |a| a.touch if a != article }
-    blocks = article.profile.blocks
-    blocks += article.profile.environment.blocks if article.profile.environment
-    blocks = blocks.select{|b|[RecentDocumentsBlock, BlogArchivesBlock].any?{|c| b.kind_of?(c)}}
-    BlockSweeper.expire_blocks(blocks)
     env = article.profile.environment
     if env && (env.portal_community == article.profile)
       article.environment.locales.keys.each do |locale|
@@ -3,7 +3,13 @@ class CategorySweeper &lt; ActiveRecord::Observer
   include SweeperHelper
   def after_save(category)
+    expire_blocks_cache(category.environment, [:category])
+
+    # Needed for environments with application layout
     expire_fragment(category.environment.id.to_s + "_categories_menu")
   end
+  def after_destroy(category)
+    expire_blocks_cache(category.environment, [:category])
+  end
 end
 <strong><%= _('Links') %></strong>
 <div id='edit-link-list-block' style='width:450px'>
 <table id='links' class='noborder'>
-  <tr><th><%= _('Icon') %></th><th><%= _('Name') %></th><th><%= _('Address') %></th></tr>
+  <tr><th><%= _('Icon') %></th><th><%= _('Name') %></th><th><%= _('Address') %></th><th><%= _('Target') %></th></tr>
   <% for link in @block.links do %>
     <tr>
       <td>
@@ -9,6 +9,9 @@
       </td>
       <td><%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %></td>
       <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %></td>
+      <td>
+        <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
+      </td>
     </tr>
   <% end %>
 </table>
@@ -18,7 +21,9 @@
     page.insert_html :bottom, 'links', content_tag('tr',
       content_tag('td', icon_selector('ok')) +
       content_tag('td', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
-      content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'cel-address'))
+      content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'link-address'), :class => 'cel-address') +
+      content_tag('td', select_tag('block[links][][target]',
+options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])))
     ) +
     javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
 end %>
@@ -2,6 +2,18 @@
   <%= _('Content management') %>
 </h1>
+<% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %>
+  <div class="cms-homepage">
+    <%= _('Profile homepage:') %>
+    <% if profile.home_page %>
+      <%= link_to_article(profile.home_page) %>
+      <%= button_without_text(:'home-not', _('Reset homepage'),  { :action => 'set_home_page', :id => nil }, :method => :post) %>
+    <% else %>
+      <span class="cms-homepage-default"><%= _('Profile Information') %></span>
+    <% end %>
+  </div>
+<% end %>
+
 <% button_bar(:style => 'margin-bottom: 1em;') do %>
   <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
@@ -40,20 +52,27 @@
     </tr>
   <% end %>
-  <% @articles.each do |article| %>
+  <% @articles.each do |article| article = FilePresenter.for article %>
     <tr title="<%= article.title%>" >
-      <td>
+      <td class="article-name">
         <%= link_to_article(article) %>
       </td>
-      <td>
-        <%= article.class.short_description %>
+      <% short_description =  article.respond_to?(:short_description) ?
+            article.short_description :
+            article.class.short_description %>
+      <td class="article-mime" title=<%= short_description.to_json %>>
+        <%= short_description %>
       </td>
       <td class="article-controls">
         <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit) %>
         <%= button_without_text :eyes, _('Public view'), article.view_url %>
         <%= display_spread_button(profile, article) unless article.folder? || remove_content_button(:spread)%>
         <% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %>
-          <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
+          <% if profile.home_page != article %>
+            <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
+          <% else %>
+            <%= button_without_text(:'home-not', _('Reset homepage'),  { :action => 'set_home_page', :id => nil }, :method => :post) %>
+          <% end %>
         <% end %>
         <%= display_delete_button(article) if !remove_content_button(:delete) %>
       </td>
@@ -0,0 +1,9 @@
+<span class="download-link">
+  <span>Download</span>
+  <strong><%= link_to generic.filename, generic.public_filename %></strong>
+</span>
+
+<div class="uploaded-file-description <%= 'empty' if generic.abstract.blank? %>">
+  <%= generic.abstract %>
+</div>
+
@@ -0,0 +1,36 @@
+<% if image.gallery? && options[:gallery_view] %>
+<%
+  images = image.parent.images
+  current_index = images.index(image.encapsulated_file)
+  total_of_images = images.count
+  link_to_previous = if current_index >= 1
+   link_to(_('&laquo; Previous'), images[current_index - 1].view_url, :class => 'previous')
+  else
+    content_tag('span', _('&laquo; Previous'), :class => 'previous')
+  end
+
+  link_to_next = if current_index < total_of_images - 1
+    link_to(_('Next &raquo;'), images[current_index + 1].view_url, :class => 'next')
+  else
+    content_tag('span', _('Next &raquo;'), :class => 'next')
+  end
+%>
+
+<div class="gallery-navigation">
+  <%= link_to_previous %>
+  <span class="total-of-images">
+    <%= _('image %d of %d') % [current_index + 1, total_of_images] %>
+  </span>
+  <%= link_to_next %>
+</div>
+
+<% end %>
+
+<%# image_tag(article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') %>
+
+<img src="<%=image.public_filename(:display)%>" class="<%=image.css_class_name%>">
+
+<div class="uploaded-file-description <%= 'empty' if image.abstract.blank? %>">
+  <%= image.abstract %>
+</div>
+
@@ -46,9 +46,11 @@
   <%= template_options(Community, 'community')%>
+  <%= hidden_field_tag('back_to', @back_to) %>
+
   <% button_bar do %>
     <%= submit_button(:save, _('Create')) %>
-    <%= button(:cancel, _('Cancel'), :action => 'index') %>
+    <%= button(:cancel, _('Cancel'), @back_to ) %>
   <% end %>
 <% end %>
@@ -0,0 +1,3 @@
+<div class='view-more-comments'>
+  <%= link_to(_('More'), :profile => @profile.identifier, :controller => 'profile', :action => 'more_comments', :activity => activity, :comment_page => (comment_page + 1)) %>
+</div>
@@ -0,0 +1,3 @@
+<div class='view-more-replies'>
+  <%= link_to(_('More'), :profile => @profile.identifier, :controller => 'profile', :action => 'more_replies', :activity => activity, :comment_page => (comment_page + 1)) %>
+</div>
@@ -4,7 +4,7 @@
     <% if activity.kind_of?(ActionTracker::Record) %>
       <%= render :partial => 'profile_activity', :locals => { :activity => activity, :tab_action => 'wall' } if activity.visible? %>
     <% else %>
-      <%= render :partial => 'profile_scrap', :locals => {:scrap => activity } %>
+      <%= render :partial => 'profile_scraps', :locals => { :activity => activity, :scrap => activity } %>
     <% end %>
   <% end %>
 <% end %>
 <hr />
-<% if activity.comments_count > 2 %>
+<ul id="profile-wall-activities-comments-<%= activity.id %>" class="profile-wall-activities-comments"  >
+</ul>
+<% if activity.comments_count > 0 %>
+<div id="profile-wall-activities-comments-more-<%= activity.id %>" class="profile-wall-activities-comments" >
   <div class='view-all-comments icon-chat'>
-    <%= link_to(_("View all %s comments") % activity.comments_count, '#') %>
+     <%= link_to(n_('View comment', "View all %s comments", activity.comments_count) % activity.comments_count, :profile => profile.identifier, :controller => 'profile', :action => 'more_comments', :activity => activity, :comment_page => (1)) %>
   </div>
+</div>
 <% end %>
-
-<ul class="profile-wall-activities-comments" style="<%= 'display:none;' if (activity.comments_count > 2) %>" >
-  <%= render :partial => 'comment', :collection => activity.comments_as_thread %>
-</ul>
-
 <%= render :partial => 'profile_comment_form', :locals => { :activity => activity, :tab_action => tab_action } %>
@@ -16,13 +16,7 @@
     </div>
   </div>
-  <% if scrap.replies.count > 2 %>
-    <div class='view-all-comments icon-chat'>
-      <%= link_to(_("View all %s comments") % scrap.replies.count, '#') %>
-    </div>
-  <% end %>
-
-  <ul class="profile-wall-activities-comments scrap-replies" style="width: auto; <%= 'display:none;' if (scrap.replies.count > 2) %>" >
+  <ul class="profile-wall-activities-comments scrap-replies" style="width: auto;" >
     <% scrap.replies.map do |reply| %>
       <%= render :partial => 'profile_scrap', :locals => {:scrap => reply} %>
     <% end %>
-NÃO DEVE APARECER
+<li class='profile-activity-item' id='profile-activity-item-<%= scrap.id %>'>
+  <div class='profile-activity-image'>
+    <%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %>
+  </div>
+  <div class='profile-activity-description'>
+    <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
+    <p class='profile-activity-text'><%= txt2html scrap.content %></p>
+    <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p>
+    <div class='profile-wall-actions'>
+    <% if logged_in? && current_person.follows?(scrap.sender) %>
+      <span class='profile-activity-send-reply'>
+        <%= link_to_function s_('profile|Comment'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();return false", :class => "profile-send-reply" %>
+      </span>
+    <% end %>
+    <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_scrap, :scrap_id => scrap.id, :view => params[:view]).to_json, _('Are you sure you want to remove this scrap and all its replies?').to_json]) if logged_in? && user.can_control_scrap?(scrap) %>
+    </div>
+  </div>
+
+
+  <ul id="profile-wall-activities-comments-<%= activity.id %>" class="profile-wall-activities-comments scrap-replies" style="width: auto;" >
+  </ul>
+
+  <% if scrap.replies.count > 0 %>
+    <div id="profile-wall-activities-comments-more-<%= activity.id %>" class="profile-wall-activities-comments">
+      <div class='view-all-comments icon-chat'>
+        <%= link_to(n_('View comment', "View all %s comments", scrap.replies.count) % scrap.replies.count, :profile => profile.identifier, :controller => 'profile', :action => 'more_replies', :activity => activity, :comment_page => (1)) %>
+      </div>
+    </div>
+  <% end %>
+  <%= render :partial => 'profile_scrap_reply_form', :locals => { :scrap => scrap } %>
+  <hr />
+</li>
@@ -1,8 +0,0 @@
-<div id='manage-enterprises'>
-  <a href="#" id='manage-enterprises-link' class='simplemenu-trigger' title='<%= _('Manage enterprises') %>'><i class="icon-menu-enterprise"></i><strong><%= ui_icon('ui-icon-triangle-1-s') + _('My enterprises') %></strong></a>
-  <ul class='simplemenu-submenu'>
-    <% enterprises_link.each do |link| %>
-      <li class='simplemenu-item'><%= link %></li>
-    <% end %>
-  </ul>
-</div>
@@ -0,0 +1,8 @@
+<div id=<%= "manage-#{kind}" %> class="manage-groups">
+  <a href="#" id=<%= "manage-#{kind}-link" %> class="simplemenu-trigger" title="<%= _('Manage %s') % kind %>"><i class=<%= "icon-menu-#{kind.singularize}" %>></i><strong><%= ui_icon('ui-icon-triangle-1-s') + _('My %s') % kind %></strong></a>
+  <ul class="simplemenu-submenu">
+    <% link.each do |link| %>
+      <li class="simplemenu-item"><%= link %></li>
+    <% end %>
+  </ul>
+</div>
@@ -0,0 +1,11 @@
+<%# FIXME should not need to replicate the article structure like this to be able to use the same formatting as the comments listing %>
+<div id='article'>
+  <div class="comments" id="comments_list">
+    <ul class="article-comments-list">
+      <%= render :partial => 'comment/comment', :collection => @comment_spam %>
+    </ul>
+  </div>
+</div>
+
+<%= pagination_links @comment_spam, :param_name => :comments_page %>
+
@@ -0,0 +1,21 @@
+<% render :layout => 'task', :locals => { :task => task } do %>
+  <% content_for :extra_buttons do %>
+    <%= button_to_function('down', _('Show details'), "toggleDetails(this, '#{_('Hide details')}', '#{_('Show details')}')" ) %>
+  <% end %>
+
+  <% content_for :extra_content do %>
+    <ul class="suggest-article-details" style="display: none">
+      <li><strong><%=_('Sent by')%></strong>: <%=task.name%> </li>
+      <li><strong><%=_('Email')%></strong>: <%=task.email%> </li>
+      <li><strong><%=_('Source')%></strong>: <%=task.source_name%> </li>
+      <li><strong><%=_('Source URL')%></strong>: <%=task.source%> </li>
+      <li><strong><%=_('Folder')%></strong>: <%=(a = Article.find_by_id(task.article_parent_id))?a.name : '<em>' + s_('Folder|none') + '</em>'%> </li>
+      <li><strong><%=_('Lead')%></strong>: <%=task.article_abstract.blank? ? '<em>' + s_('Abstract|empty') + '</em>' : task.article_abstract%> </li>
+      <li><strong><%=_('Body')%></strong>:
+      <div class='suggest-article-body'>
+        <%= task.article_body %>
+      </div>
+      </li>
+    </ul>
+  <% end %>
+<% end %>
@@ -0,0 +1,18 @@
+<div class="task_box" id="task-<%= task.id %>">
+  <%= render :partial => 'tasks/task_icon', :locals => {:task => task} %>
+  <%= render :partial => 'tasks/task_title', :locals => {:task => task} %>
+  <div class="task-information">
+    <%= task_information(task) %>
+  </div>
+
+  <%= yield %> <% # ??? %>
+
+  <% button_bar do %>
+    <%= button_to_function('new', _('Mark as NOT SPAM'), 'removeTaskBox(this, %s, "%s", "")' % [url_for(:mark_task_as_ham => task.id).to_json, "task-#{task.id}"]) %>
+    <%= yield :extra_buttons %>
+    <%= button_to_function('delete', _('Remove'), 'removeTaskBox(this, %s, "%s", %s)' % [url_for(:profile => params[:profile], :remove_task => task.id).to_json, "task-#{task.id}", _('Are you sure you want to remove this article suggestion?').to_json]) %>
+
+  <% end %>
+
+  <%= yield :extra_content %>
+</div>
@@ -0,0 +1,4 @@
+<% @task_spam.each do |t| %>
+  <%= render :partial => partial_for_class(t.class), :locals => { :task => t } %>
+<% end %>
+<%= pagination_links @task_spam, :param_name => :tasks_page %>
+<%= stylesheet('tasks') %>
+
 <h1><%= _('Manage SPAM') %></h1>
+<% no_tabs = @comment_spam.blank? && @task_spam.blank? %>
+
+<%= _('There are no spams to review.') if no_tabs %>
+
 <% button_bar do %>
   <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
 <% end %>
 <%# FIXME should not need to replicate the article structure like this to be able to use the same formatting as the comments listing %>
-<div id='article'>
-  <div class="comments" id="comments_list">
-    <ul class="article-comments-list">
-      <%= render :partial => 'comment/comment', :collection => @spam %>
-    </ul>
-  </div>
-</div>
-<%= pagination_links @spam %>
+<% tabs = [] %>
+<% tabs << {:title => _('Comment Spam'), :id => 'comment-spam',
+  :content => (render :partial => 'comment_spam')} if @comment_spam.present? %>
+<% tabs << {:title => _('Task Spam'), :id => 'task-spam',
+  :content => (render :partial => 'task_spam') } if @task_spam.present? %>
+<%= render_tabs(tabs) %>
-<% button_bar do %>
-  <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
+<% unless no_tabs %>
+  <% button_bar do %>
+    <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
+  <% end %>
 <% end %>
+
+<%= javascript_include_tag 'spam' %>
 <div class="task_box" id="task-<%= task.id %>">
-  <div class="task_icon">
-    <%
-        icon_info = task.icon
-        if icon_info[:type] == :profile_image
-          icon = profile_image(icon_info[:profile], :minor)
-        elsif icon_info[:type] == :defined_image
-          icon = "<img src='#{icon_info[:src]}' alt='#{icon_info[:name]}' />"
-        end
-      %>
-    <%=
-        if icon_info[:url]
-          link_to(icon, icon_info[:url])
-        else
-          icon
-        end
-      %>
-
-  </div>
+  <%= render :partial => 'task_icon', :locals => {:task => task} %>
   <div class="task_decisions">
     <%=
@@ -39,9 +22,7 @@
     %>
   </div><!-- class="task_decisions" -->
-  <strong class="task_title">
-    <%= task.title %>
-  </strong>
+  <%= render :partial => 'task_title', :locals => {:task => task} %>
   <div class="task_information">
     <%= task_information(task) %>
@@ -0,0 +1,16 @@
+<%
+  icon_info = task.icon
+  if icon_info[:type] == :profile_image
+    icon = profile_image(icon_info[:profile], :minor)
+  elsif icon_info[:type] == :defined_image
+    icon = "<img src='#{icon_info[:src]}' alt='#{icon_info[:name]}' />"
+  end
+
+  if icon_info[:url]
+    icon = link_to(icon, icon_info[:url])
+  end
+%>
+
+<div class="task_icon">
+  <%= icon %>
+</div>
@@ -0,0 +1,3 @@
+<strong class="task_title">
+  <%= task.title %>
+</strong>
@@ -4,4 +4,5 @@ require &#39;noosfero/plugin/manager&#39;
 require 'noosfero/plugin/active_record'
 require 'noosfero/plugin/mailer_base'
 require 'noosfero/plugin/settings'
+require 'noosfero/plugin/spammable'
 Noosfero::Plugin.init_system if $NOOSFERO_LOAD_PLUGINS
@@ -8,6 +8,7 @@ development:
   gravatar: wavatar
   googlemaps_initial_zoom: 4
   exception_recipients: [admin@example.com]
+  max_upload_size: 5MB
 test:
@@ -0,0 +1,13 @@
+class AddSpamToTask < ActiveRecord::Migration
+  def self.up
+    change_table :tasks do |t|
+      t.boolean :spam, :default => false
+    end
+    Task.update_all ["spam = ?", false]
+    add_index :tasks, [:spam]
+  end
+
+  def self.down
+    remove_column :tasks, :spam
+  end
+end
@@ -0,0 +1,13 @@
+class AddImageToArticle < ActiveRecord::Migration
+
+  def self.up
+    add_column :articles, :image_id, :integer
+    add_column :article_versions, :image_id, :integer
+  end
+
+  def self.down
+    remove_column :articles, :image_id
+    remove_column :article_versions, :image_id
+  end
+
+end
@@ -0,0 +1,13 @@
+class AddPositionToArticle < ActiveRecord::Migration
+
+  def self.up
+    add_column :articles, :position, :integer
+    add_column :article_versions, :position, :integer
+  end
+
+  def self.down
+    remove_column :articles, :position
+    remove_column :article_versions, :position
+  end
+
+end
@@ -0,0 +1,14 @@
+class EnableEnterprisesListOnUserMenu < ActiveRecord::Migration
+  def self.up
+    # The enterprises were always listed on user menu.
+    # As now it is configured by admin, the running environments should not need to enable it
+    select_all("select id from environments").each do |environment|
+      env = Environment.find(environment['id'])
+      env.enable(:display_my_enterprises_on_user_menu)
+    end
+  end
+
+  def self.down
+    #nothing to be done
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20130711213046) do
+ActiveRecord::Schema.define(:version => 20131116165327) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -86,6 +86,8 @@ ActiveRecord::Schema.define(:version =&gt; 20130711213046) do
     t.string   "language"
     t.string   "source_name"
     t.integer  "license_id"
+    t.integer  "image_id"
+    t.integer  "position"
   end
   add_index "article_versions", ["article_id"], :name => "index_article_versions_on_article_id"
@@ -129,6 +131,8 @@ ActiveRecord::Schema.define(:version =&gt; 20130711213046) do
     t.string   "language"
     t.string   "source_name"
     t.integer  "license_id"
+    t.integer  "image_id"
+    t.integer  "position"
   end
   add_index "articles", ["name"], :name => "index_articles_on_name"
@@ -547,8 +551,11 @@ ActiveRecord::Schema.define(:version =&gt; 20130711213046) do
     t.datetime "created_at"
     t.string   "target_type"
     t.integer  "image_id"
+    t.boolean  "spam",                       :default => false
   end
+  add_index "tasks", ["spam"], :name => "index_tasks_on_spam"
+
   create_table "thumbnails", :force => true do |t|
     t.integer "size"
     t.string  "content_type"
@@ -9,7 +9,7 @@ Feature: browse catalogs
     And the following enterprises
       | identifier | owner     | name                               | enabled |
       | artebonito | joaosilva | Associação de Artesanato de Bonito | true    |
-    And feature "disable_products_for_enterprises" is disabled on environment
+    And feature "products_for_enterprises" is enabled on environment
     And the following product_categories
       | name   |
       | categ1 |
@@ -6,7 +6,7 @@ Background:
   Given the following enterprises
     | identifier | name       |
     | shop1      | Shoes Shop |
-  And feature "disable_products_for_enterprises" is disabled on environment
+  And feature "products_for_enterprises" is enabled on environment
   And feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
 Scenario: show all enterprises
@@ -21,6 +21,7 @@ Feature: enterprise homepage
     And the following product
       | name             | category | owner  |
       | Natural Handmade | soap     | mayhem |
+    And feature "products_for_enterprises" is enabled on environment
   Scenario: display profile info
@@ -19,7 +19,7 @@ Feature: manage inputs
     And the following product
       | owner      | category | name       |
       | redemoinho | rock     | Abbey Road |
-    And feature "disable_products_for_enterprises" is disabled on environment
+    And feature "products_for_enterprises" is enabled on environment
     And the following units
       | singular | plural |
       | Meter    | Meters |
@@ -19,7 +19,7 @@ Feature: manage product price details
     And the following product
       | owner      | category | name       | price |
       | redemoinho | rock     | Abbey Road | 80.0  |
-    And feature "disable_products_for_enterprises" is disabled on environment
+    And feature "products_for_enterprises" is enabled on environment
     And the following inputs
       | product    | category  | price_per_unit | amount_used |
       | Abbey Road | Rock      | 10.0           | 2           |
@@ -9,7 +9,7 @@ Feature: manage products
     And the following enterprises
       | identifier | owner | name | enabled |
       | redemoinho | joaosilva | Rede Moinho | true |
-    And feature "disable_products_for_enterprises" is disabled on environment
+   And feature "products_for_enterprises" is enabled on environment
   Scenario: display "create new product" button
     Given I am logged in as "joaosilva"
@@ -20,14 +20,20 @@ end
 class FeedUpdater
   class ExceptionNotification < ActionMailer::Base
-    def mail error
+    def mail container, error
       environment = Environment.default
       recipients NOOSFERO_CONF['exception_recipients']
       from       environment.contact_email
       reply_to   environment.contact_email
       subject    "[#{environment.name}] Feed-updater: #{error.message}"
-      body       render(:text => error.backtrace.join("\n"))
+      body       render(:text => "
+Container:
+#{container.inspect}
+
+Backtrace:
+#{error.backtrace.join("\n")}
+      ")
     end
   end
@@ -88,11 +94,13 @@ class FeedUpdater
         if !running
           break
         end
-        feed_handler.process(container)
+        begin
+          feed_handler.process(container)
+        rescue Exception => e
+          FeedUpdater::ExceptionNotification.deliver_mail container, e if NOOSFERO_CONF['exception_recipients'].present?
+        end
       end
     end
-  rescue Exception => e
-    FeedUpdater::ExceptionNotification.deliver_mail e if NOOSFERO_CONF['exception_recipients'].present?
   end
 end
@@ -0,0 +1,107 @@
+# All file presenters must extends `FilePresenter` not only to ensure the
+# same interface, but also to make `FilePresenter.for(file)` to work.
+class FilePresenter
+
+  # Will return a encapsulated `UploadedFile` or the same object if no
+  # one accepts it. That behave allow to give any model to this class,
+  # like a Article and have no trouble with that.
+  def self.for(f)
+    return f if f.is_a? FilePresenter
+    klass = FilePresenter.subclasses.sort_by {|class_name|
+      class_name.constantize.accepts?(f) || 0
+    }.last.constantize
+    klass.accepts?(f) ? klass.new(f) : f
+  end
+
+  def initialize(f)
+    @file = f
+  end
+
+  # Allows to use the original `UploadedFile` reference.
+  def encapsulated_file
+    @file
+  end
+
+  def id
+    @file.id
+  end
+
+  def reload
+    @file.reload
+    self
+  end
+
+  # This method must be overridden in subclasses.
+  #
+  # If the class accepts the file, return a number that represents the
+  # priority the class should be given to handle that file. Higher numbers
+  # mean higher priority.
+  #
+  # If the class does not accept the file, return false.
+  def self.accepts?(f)
+    nil
+  end
+
+  def short_description
+    _("File (%s)") % content_type.sub(/^application\//, '').sub(/^x-/, '').sub(/^image\//, '')
+  end
+
+  # Define the css classes to style the page fragment with the file related
+  # content. If you want other classes to identify this area to your
+  # customized presenter, so do this:
+  #   def css_class_list
+  #     [super, 'myclass'].flatten
+  #   end
+  def css_class_list
+    [ @file.css_class_list,
+      'file-' + self.class.to_s.split(/:+/).map(&:underscore)[1..-1].join('-'),
+      'content-type_' + self.content_type.split('/')[0],
+      'content-type_' + self.content_type.gsub(/[^a-z0-9]/i,'-')
+    ].flatten
+  end
+
+  # Enable file presenter to customize the css classes on view_page.rhtml
+  # You may not overwrite this method on your customized presenter.
+  def css_class_name
+    [css_class_list].flatten.compact.join(' ')
+  end
+
+  # The generic icon class-name or the specific file path.
+  # You may replace this method on your custom FilePresenter.
+  # See the current used icons class-names in public/designs/icons/tango/style.css
+  def icon_name
+    if mime_type
+      [ mime_type.split('/')[0], mime_type.gsub(/[^a-z0-9]/i, '-') ]
+    else
+      'upload-file'
+    end
+  end
+
+  # Automatic render `file_presenter/<custom>.html.erb` to display your
+  # custom presenter html content.
+  # You may not overwrite this method on your customized presenter.
+  # A variable with the same presenter name will be created to refer
+  # to the file object.
+  # Example:
+  # The `FilePresenter::Image` render `file_presenter/image.html.erb`
+  # inside the `file_presenter/image.html.erb` you can access the
+  # required `FilePresenter::Image` instance in the `image` variable.
+  def to_html(options = {})
+    file = self
+    lambda do
+      render :partial => file.class.to_s.underscore,
+             :locals => { :options => options },
+             :object => file
+    end
+  end
+
+  # That makes the presenter to works like any other `UploadedFile` instance.
+  def method_missing(m, *args)
+    @file.send(m, *args)
+  end
+end
+
+# Preload FilePresenters to allow `FilePresenter.for()` to work
+Dir.glob(File.join('app', 'presenters', '*.rb')) do |file|
+  load file
+end
@@ -155,6 +155,7 @@ class Noosfero::Plugin
   # Here the developer may specify the events to which the plugins can
   # register and must return true or false. The default value must be false.
+  # Must also explicitly define its returning variables.
   # -> If true, noosfero will include plugin_dir/public/style.css into
   # application
@@ -162,10 +163,6 @@ class Noosfero::Plugin
     false
   end
-  # Here the developer should specify the events to which the plugins can
-  # register to. Must be explicitly defined its returning
-  # variables.
-
   # -> Adds buttons to the control panel
   # returns = { :title => title, :icon => icon, :url => url }
   #   title = name that will be displayed.
@@ -175,6 +172,13 @@ class Noosfero::Plugin
     nil
   end
+  # -> Customize profile block design and behavior
+  # (overwrites profile_image_link function)
+  # returns = lambda block that creates html code.
+  def profile_image_link(profile, size, tag, extra_info)
+    nil
+  end
+
   # -> Adds tabs to the profile
   # returns   = { :title => title, :id => id, :content => content, :start => start }
   #   title   = name that will be displayed.
@@ -304,45 +308,16 @@ class Noosfero::Plugin
     scope
   end
-  # This method is called by the CommentHandler background job before sending
-  # the notification email. If the comment is marked as spam (i.e. by calling
-  # <tt>comment.spam!</tt>), then the notification email will *not* be sent.
-  #
-  # example:
-  #
-  #   def check_comment_for_spam(comment)
-  #     if anti_spam_service.is_spam?(comment)
-  #       comment.spam!
-  #     end
-  #   end
-  #
-  def check_comment_for_spam(comment)
+  # -> Allows plugins to check weather object is a spam
+  def check_for_spam(object)
   end
-  # This method is called when the user manually marks a comment as SPAM. A
-  # plugin implementing this method should train its spam detection mechanism
-  # by submitting this comment as a confirmed spam.
-  #
-  # example:
-  #
-  #   def comment_marked_as_spam(comment)
-  #     anti_spam_service.train_with_spam(comment)
-  #   end
-  #
-  def comment_marked_as_spam(comment)
+  # -> Allows plugins to know when an object is marked as a spam
+  def marked_as_spam(object)
   end
-  # This method is called when the user manually marks a comment a NOT SPAM. A
-  # plugin implementing this method should train its spam detection mechanism
-  # by submitting this coimment as a confirmed ham.
-  #
-  # example:
-  #
-  #   def comment_marked_as_ham(comment)
-  #     anti_spam_service.train_with_ham(comment)
-  #   end
-  #
-  def comment_marked_as_ham(comment)
+  # -> Allows plugins to know when an object is marked as a ham
+  def marked_as_ham(object)
   end
   # Adds extra actions for comments
@@ -34,18 +34,20 @@ class Noosfero::Plugin::Manager
   alias :dispatch_scopes :dispatch_without_flatten
   def dispatch_first(event, *args)
-    result = nil
+    default = Noosfero::Plugin.new.send(event, *args)
+    result = default
     each do |plugin|
       result = plugin.send(event, *args)
-      break if result.present?
+      break if result != default
     end
     result
   end
   def fetch_first_plugin(event, *args)
+    default = Noosfero::Plugin.new.send(event, *args)
     result = nil
     each do |plugin|
-      if plugin.send(event, *args)
+      if plugin.send(event, *args) != default
         result = plugin.class
         break
       end
@@ -0,0 +1,13 @@
+Spammable.module_eval do
+  def marked_as_spam
+    plugins.dispatch(:marked_as_spam, self)
+  end
+
+  def marked_as_ham
+    plugins.dispatch(:marked_as_ham, self)
+  end
+
+  def check_for_spam
+    plugins.dispatch(:check_for_spam, self)
+  end
+end
@@ -0,0 +1,51 @@
+module Spammable
+  def self.included(recipient)
+    #TODO This line crashes the migration which includes the spam attribute to
+    #     Task...  =P
+    #     No fail-safe until someone find out how to use this without crashing
+    #     the migration process
+    #raise "This model (#{recipient.to_s}) should have a spam attribute!" if !recipient.new.respond_to?('spam=')
+    recipient.extend(ClassMethods)
+  end
+
+  module ClassMethods
+    def self.extended (base)
+      if base.respond_to?(:named_scope)
+        base.class_eval do
+          named_scope :without_spam, :conditions => ['spam IS NULL OR spam = ?', false]
+          named_scope :spam, :conditions => ['spam = ?', true]
+        end
+      end
+    end
+  end
+
+  def spam?
+    !spam.nil? && spam
+  end
+
+  def ham?
+    !spam.nil? && !spam
+  end
+
+  def spam!
+    before_spam!
+    self.spam = true
+    self.save!
+    after_spam!
+    self
+  end
+
+  def ham!
+    before_ham!
+    self.spam = false
+    self.save!
+    after_ham!
+    self
+  end
+
+  def after_spam!; end
+  def before_spam!; end
+
+  def after_ham!; end
+  def before_ham!; end
+end
@@ -5,38 +5,37 @@ class AntiSpamPlugin &lt; Noosfero::Plugin
   end
   def self.plugin_description
-    _("Checks comments against a spam checking service compatible with the Akismet API")
+    _("Tests comments and suggested articles against a spam checking service compatible with the Akismet API")
   end
   def self.host_default_setting
     'api.antispam.typepad.com'
   end
-  def check_comment_for_spam(comment)
-    if rakismet_call(comment, :spam?)
-      comment.spam = true
-      comment.save!
+  def check_for_spam(object)
+    if rakismet_call AntiSpamPlugin::Wrapper.wrap(object), object.environment, :spam?
+      object.spam = true
+      object.save!
     end
   end
-  def comment_marked_as_spam(comment)
-    rakismet_call(comment, :spam!)
+  def marked_as_spam(object)
+    rakismet_call AntiSpamPlugin::Wrapper.wrap(object), object.environment, :spam!
   end
-  def comment_marked_as_ham(comment)
-    rakismet_call(comment, :ham!)
+  def marked_as_ham(object)
+    rakismet_call AntiSpamPlugin::Wrapper.wrap(object), object.environment, :ham!
   end
   protected
-  def rakismet_call(comment, op)
-    settings = Noosfero::Plugin::Settings.new(comment.environment, self.class)
+  def rakismet_call(submission, environment, op)
+    settings = Noosfero::Plugin::Settings.new(environment, self.class)
     Rakismet.host = settings.host
     Rakismet.key = settings.api_key
-    Rakismet.url = comment.environment.top_url
+    Rakismet.url = environment.top_url
-    submission = AntiSpamPlugin::CommentWrapper.new(comment)
     submission.send(op)
   end
-class AntiSpamPlugin::CommentWrapper < Struct.new(:comment)
-
-  delegate :author_name, :author_email, :title, :body, :ip_address, :user_agent, :referrer, :to => :comment
-
-  include Rakismet::Model
-
-  alias :author :author_name
-  alias :user_ip :ip_address
-  alias :content :body
-
+class AntiSpamPlugin::CommentWrapper < AntiSpamPlugin::Wrapper
+  alias_attribute :author, :author_name
+  alias_attribute :user_ip, :ip_address
+  alias_attribute :content, :body
+
+  def self.wraps?(object)
+    object.kind_of?(Comment)
+  end
 end
@@ -0,0 +1,10 @@
+class AntiSpamPlugin::SuggestArticleWrapper < AntiSpamPlugin::Wrapper
+  alias_attribute :author, :name
+  alias_attribute :author_email, :email
+  alias_attribute :user_ip, :ip_address
+  alias_attribute :content, :article_body
+
+  def self.wraps?(object)
+    object.kind_of?(SuggestArticle)
+  end
+end
@@ -0,0 +1,18 @@
+class AntiSpamPlugin::Wrapper < SimpleDelegator
+  include Rakismet::Model
+
+  @@wrappers = []
+
+  def self.wrap(object)
+    wrapper = @@wrappers.find { |wrapper| wrapper.wraps?(object) }
+    wrapper ? wrapper.new(object) : object
+  end
+
+  def self.wraps?(object)
+    false
+  end
+
+  def self.inherited(child)
+    @@wrappers << child
+  end
+end
 require 'test_helper'
-class AntiSpamPluginCommentWrapperTest < ActiveSupport::TestCase
+class AntiSpamPlugin::CommentWrapperTest < ActiveSupport::TestCase
   def setup
     @comment = Comment.new(
@@ -15,10 +15,6 @@ class AntiSpamPluginCommentWrapperTest &lt; ActiveSupport::TestCase
     @wrapper = AntiSpamPlugin::CommentWrapper.new(@comment)
   end
-  should 'use Rakismet::Model' do
-    assert_includes @wrapper.class.included_modules, Rakismet::Model
-  end
-
   should 'get contents' do
     assert_equal @comment.body, @wrapper.content
   end
@@ -0,0 +1,41 @@
+require 'test_helper'
+
+class AntiSpamPlugin::SuggestArticleWrapperTest < ActiveSupport::TestCase
+
+  def setup
+    @suggest_article = SuggestArticle.new(
+      :article_body => 'comment body',
+      :name => 'author',
+      :email => 'foo@example.com',
+      :ip_address => '1.2.3.4',
+      :user_agent => 'Some Good Browser (I hope)',
+      :referrer => 'http://noosfero.org/'
+    )
+    @wrapper = AntiSpamPlugin::SuggestArticleWrapper.new(@suggest_article)
+  end
+
+  should 'get contents' do
+    assert_equal @suggest_article.article_body, @wrapper.content
+  end
+
+  should 'get author name' do
+    assert_equal @suggest_article.name, @wrapper.author
+  end
+
+  should 'get author email' do
+    assert_equal @suggest_article.email, @wrapper.author_email
+  end
+
+  should 'get IP address' do
+    assert_equal @suggest_article.ip_address, @wrapper.user_ip
+  end
+
+  should 'get User-Agent' do
+    assert_equal @suggest_article.user_agent, @wrapper.user_agent
+  end
+
+  should 'get get Referrer' do
+    assert_equal @suggest_article.referrer, @wrapper.referrer
+  end
+
+end
@@ -0,0 +1,25 @@
+require 'test_helper'
+require 'anti_spam_plugin/wrapper'
+
+class AntiSpamPluginWrapperTest < ActiveSupport::TestCase
+  should 'use Rakismet::Model' do
+    wrapped = AntiSpamPlugin::Wrapper.new(mock)
+    assert_includes wrapped.class.included_modules, Rakismet::Model
+  end
+
+  should 'wrap object according to wraps? method' do
+    class EvenWrapper < AntiSpamPlugin::Wrapper
+      def self.wraps?(object)
+        object % 2 == 0
+      end
+    end
+    class OddWrapper < AntiSpamPlugin::Wrapper
+      def self.wraps?(object)
+        object % 2 != 0
+      end
+    end
+
+    assert AntiSpamPlugin::Wrapper.wrap(5).kind_of?(OddWrapper)
+    assert AntiSpamPlugin::Wrapper.wrap(6).kind_of?(EvenWrapper)
+  end
+end
@@ -2,35 +2,36 @@ require &#39;test_helper&#39;
 class AntiSpamPluginTest < ActiveSupport::TestCase
-  def setup
-    profile = fast_create(Profile)
-    article = fast_create(TextileArticle, :profile_id => profile.id)
-    @comment = fast_create(Comment, :source_id => article.id, :source_type => 'Article')
+  class SpammableContent
+    attr_accessor :spam
+    include Spammable
-    @settings = Noosfero::Plugin::Settings.new(@comment.environment, AntiSpamPlugin)
-    @settings.api_key = 'b8b80ddb8084062d0c9119c945ce3bc3'
-    @settings.save!
+    def save!; end
+    def environment; Environment.default; end
+  end
+  def setup
+    @spammable = SpammableContent.new
     @plugin = AntiSpamPlugin.new
-    @plugin.context = @comment
   end
-  should 'check for spam and mark comment as spam if server says it is spam' do
-    AntiSpamPlugin::CommentWrapper.any_instance.expects(:spam?).returns(true)
-    @comment.expects(:save!)
+  attr_accessor :spammable
-    @plugin.check_comment_for_spam(@comment)
-    assert @comment.spam
-  end
+  should 'check for spam and mark as spam if server says it is spam' do
+    spammable.expects(:spam?).returns(true)
+    spammable.expects(:save!)
-  should 'report spam' do
-    AntiSpamPlugin::CommentWrapper.any_instance.expects(:spam!)
-    @plugin.comment_marked_as_spam(@comment)
+    @plugin.check_for_spam(spammable)
+    assert spammable.spam
   end
-  should 'report ham' do
-    AntiSpamPlugin::CommentWrapper.any_instance.expects(:ham!)
-    @plugin.comment_marked_as_ham(@comment)
+  should 'report comment spam' do
+    spammable.expects(:spam!)
+    @plugin.marked_as_spam(spammable)
   end
+  should 'report comment ham' do
+    spammable.expects(:ham!)
+    @plugin.marked_as_ham(spammable)
+  end
 end
 class CommentGroupPluginProfileController < ProfileController
-  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
   def view_comments
-    article_id = params[:article_id]
-    group_id = params[:group_id]
+    @article_id = params[:article_id]
+    @group_id = params[:group_id]
-    article = profile.articles.find(article_id)
-    comments = article.group_comments.without_spam.in_group(group_id)
-    render :update do |page|
-      page.replace_html "comments_list_group_#{group_id}", :partial => 'comment/comment.rhtml', :collection => comments
-      page.replace_html "comment-count-#{group_id}", comments.count
-    end
+    article = profile.articles.find(@article_id)
+    @group_comment_page = (params[:group_comment_page] || 1).to_i
+
+    @comments = article.comments.without_spam.in_group(@group_id)
+    @comments_count = @comments.count
+    @comments = @comments.without_reply.paginate(:per_page => per_page, :page => @group_comment_page )
+
+    @no_more_pages = @comments_count <= @group_comment_page * per_page
+  end
+
+  def per_page
+    3
   end
 end
@@ -24,6 +24,11 @@ class CommentGroupPlugin &lt; Noosfero::Plugin
     'comment_group_macro.js'
   end
+  def stylesheet?
+    true
+  end
+
+
 end
 require_dependency 'comment_group_plugin/macros/allow_comment'
@@ -11,7 +11,6 @@ class CommentGroupPlugin::AllowComment &lt; Noosfero::Plugin::Macro
       :css_files => 'comment_group.css' }
   end
-  #FIXME Make this test
   def parse(params, inner_html, source)
     group_id = params[:group_id].to_i
     article = source
@@ -2,13 +2,10 @@ require_dependency &#39;article&#39;
 class Article
-  #FIXME make this test
   has_many :group_comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc', :conditions => [ 'group_id IS NOT NULL']
-  #FIXME make this test
   validate :not_empty_group_comments_removed
-  #FIXME make this test
   def not_empty_group_comments_removed
     if body
       groups_with_comments = group_comments.collect {|comment| comment.group_id}.uniq
@@ -0,0 +1,7 @@
+div.article-comments-list-more{
+  width: 100%;
+  height: 30px;
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 5px;
+}
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/../../controllers/profile/comment_group_plugin_profile_controller'
 # Re-raise errors caught by the controller.
@@ -21,18 +21,52 @@ class CommentGroupPluginProfileControllerTest &lt; ActionController::TestCase
   should 'be able to show group comments' do
     comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
     xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
-    assert_template 'comment/_comment.rhtml'
+    assert_template 'comment_group_plugin_profile/view_comments.rjs'
     assert_match /comments_list_group_0/, @response.body
     assert_match /\"comment-count-0\", \"1\"/, @response.body
   end
   should 'do not show global comments' do
-    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'global comment', :body => 'global', :group_id => nil)
-    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    fast_create(Comment, :source_id => article, :author_id => profile, :title => 'global comment', :body => 'global', :group_id => nil)
+    fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
     xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
-    assert_template 'comment/_comment.rhtml'
+    assert_template 'comment_group_plugin_profile/view_comments.rjs'
     assert_match /comments_list_group_0/, @response.body
     assert_match /\"comment-count-0\", \"1\"/, @response.body
   end
+  should 'show first page comments only' do
+    comment1 = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'secondpage', :group_id => 0)
+    comment2 = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'firstpage 1', :group_id => 0)
+    comment3 = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'firstpage 2', :group_id => 0)
+    comment4 = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'firstpage 3', :group_id => 0)
+    xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
+    assert_match /firstpage 1/, @response.body
+    assert_match /firstpage 2/, @response.body
+    assert_match /firstpage 3/, @response.body
+    assert_no_match /secondpage/, @response.body
+  end
+
+  should 'show link to display more comments' do
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'secondpage', :body => 'secondpage', :group_id => 0)
+    xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
+    assert_match /group_comment_page=2/, @response.body
+  end
+
+  should 'do not show link to display more comments if do not have more pages' do
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
+    assert_no_match /group_comment_page/, @response.body
+  end
+
+  should 'do not show link to display more comments if do not have any comments' do
+    xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
+    assert_no_match /group_comment_page/, @response.body
+  end
+
 end
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/../../controllers/public/comment_group_plugin_public_controller'
 # Re-raise errors caught by the controller.
@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ContentViewerController
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+  def rescue_action(e) 
+    raise e 
+  end 
+end
+
+class ContentViewerControllerTest < ActionController::TestCase
+
+  def setup
+    @profile = fast_create(Community)
+    @page = fast_create(Article, :profile_id => @profile.id, :body => "<div class=\"macro\" data-macro-group_id=\"1\" data-macro='comment_group_plugin/allow_comment' ></div>")
+    @environment = Environment.default
+    @environment.enable_plugin(CommentGroupPlugin)
+  end
+
+  attr_reader :page
+
+  should 'parse article body and render comment group view' do
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => page.id)
+    get :view_page, @page.url
+    assert_tag 'div', :attributes => {:class => 'comment_group_1'}
+    assert_tag 'div', :attributes => {:id => 'comments_group_count_1'}
+  end
+
+end
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class AllowCommentTest < ActiveSupport::TestCase
+
+  def setup
+    @macro = CommentGroupPlugin::AllowComment.new
+  end
+
+  attr_reader :macro
+
+  should 'have a configuration' do
+    assert CommentGroupPlugin::AllowComment.configuration
+  end
+
+  should 'parse contents to include comment group view' do
+    profile = fast_create(Community)
+    article = fast_create(Article, :profile_id => profile.id)
+    comment = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    inner_html = 'inner'
+    content = macro.parse({:group_id => comment.group_id}, inner_html, article)
+
+    expects(:render).with({:partial => 'plugins/comment_group/views/comment_group.rhtml', :locals => {:group_id => comment.group_id, :article_id => article.id, :inner_html => inner_html, :count => 1, :profile_identifier => profile.identifier} })
+    instance_eval(&content)
+  end
+
+end
@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ArticleTest < ActiveSupport::TestCase
+
+  def setup
+    profile = fast_create(Community)
+    @article = fast_create(Article, :profile_id => profile.id)
+  end
+
+  attr_reader :article
+
+  should 'return group comments from article' do
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    comment2 = fast_create(Comment, :group_id => nil, :source_id => article.id)
+    assert_equal [comment1], article.group_comments
+  end
+
+  should 'do not allow a exclusion of a group comment macro if this group has comments' do
+    article.update_attribute(:body, "<div class=\"macro\" data-macro-group_id=2></div>")
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    assert !article.save
+    assert_equal 'Not empty group comment cannot be removed', article.errors[:base]
+  end
+
+  should 'allow save if comment group macro is not removed for group with comments' do
+    article.update_attribute(:body, "<div class=\"macro\" data-macro-group_id=1></div>")
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    assert article.save
+  end
+
+end
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 class CommentGroupPluginTest < ActiveSupport::TestCase
-  include Noosfero::Plugin::HotSpot
-
   def setup
     @environment = Environment.default
+    @plugin = CommentGroupPlugin.new
+  end
+
+  attr_reader :environment, :plugin
+
+  should 'have a name' do
+    assert_not_equal Noosfero::Plugin.plugin_name, CommentGroupPlugin::plugin_name
+  end
+
+  should 'describe yourself' do
+    assert_not_equal Noosfero::Plugin.plugin_description, CommentGroupPlugin::plugin_description
+  end
+
+  should 'have a js file' do
+    assert !plugin.js_files.blank?
   end
-  attr_reader :environment
+  should 'have stylesheet' do
+    assert plugin.stylesheet?
+  end
+
+  should 'have extra contents for comment form' do
+    comment = fast_create(Comment, :group_id => 1)
+    content = plugin.comment_form_extra_contents({:comment => comment})
+    expects(:hidden_field_tag).with('comment[group_id]', comment.group_id).once
+    instance_eval(&content)
+  end
+
+  should 'do not have extra contents for comments without group' do
+    comment = fast_create(Comment, :group_id => nil)
+    content = plugin.comment_form_extra_contents({:comment => comment})
+    assert_equal nil, instance_eval(&content)
+  end
+
+  should 'call without_group for scope passed as parameter to unavailable_comments' do
+    article = fast_create(Article)
+    article.expects(:without_group).once
+    plugin.unavailable_comments(article)
+  end
 #FIXME Obsolete test
 #
@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CommentTest < ActiveSupport::TestCase
+
+  def setup
+    profile = fast_create(Community)
+    @article = fast_create(Article, :profile_id => profile.id)
+  end
+
+  attr_reader :article
+
+  should 'return comments that belongs to a specified group' do
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    comment2 = fast_create(Comment, :group_id => nil, :source_id => article.id)
+    comment3 = fast_create(Comment, :group_id => 2, :source_id => article.id)
+    assert_equal [comment1], article.comments.in_group(1)
+  end
+
+  should 'return comments that do not belongs to any group' do
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    comment2 = fast_create(Comment, :group_id => nil, :source_id => article.id)
+    comment3 = fast_create(Comment, :group_id => 2, :source_id => article.id)
+    assert_equal [comment2], article.comments.without_group
+  end
+
+end
@@ -20,7 +20,13 @@
   <div class="comment-group-loading-<%= group_id %>"/>
   <div class="comments_list_toggle_group_<%= group_id %>" style="display:none">
-    <div class="article-comments-list" id="comments_list_group_<%= group_id %>"></div>
-    <div id="page-comment-form-<%= group_id %>" class='post_comment_box closed'><%= render :partial => 'comment/comment_form', :locals => {:comment => Comment.new, :display_link => true, :cancel_triggers_hide => true, :group_id => group_id}%></div>
+    <div class="article-comments-list" id="comments_list_group_<%= group_id %>">
+    </div>
+    <div class ="article-comments-list-more" id="comments_list_group_<%= group_id %>_more">
+    </div>
+    <div id="page-comment-form-<%= group_id %>" class='post_comment_box closed'>
+      <%= render :partial => 'comment/comment_form', :locals => {:comment => Comment.new, :display_link => true, :cancel_triggers_hide => true, :group_id => group_id}%>
+    </div>
+
   </div>
 </div>
@@ -0,0 +1,12 @@
+if @group_comment_page == 1
+  page.replace_html "comments_list_group_#{@group_id}", :partial => 'comment/comment.rhtml', :collection => @comments
+else
+  page.insert_html :bottom, "comments_list_group_#{@group_id}", :partial => 'comment/comment.rhtml', :collection => @comments
+end
+page.replace_html "comment-count-#{@group_id}", @comments_count
+
+if @no_more_pages
+  page.replace_html "comments_list_group_#{@group_id}_more", ""
+else
+  page.replace_html "comments_list_group_#{@group_id}_more", link_to_remote(_('More'), :url => { :profile => profile.identifier, :controller => 'comment_group_plugin_profile', :action => 'view_comments', :group_id => @group_id, :article_id => @article_id, :group_comment_page => @group_comment_page + 1}, :loaded => visual_effect(:highlight, "comments_list_group_#{@group_id}"), :method => :post, :complete => "loadCompleted(#{@group_id})")
+end
@@ -0,0 +1,18 @@
+class CommunityTrackPluginMyprofileController < MyProfileController
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+
+  before_filter :allow_edit_track, :only => :save_order
+
+  def save_order
+    track = profile.articles.find(params[:track])
+    track.reorder_steps(params[:step_ids])
+    redirect_to track.url
+  end
+
+  protected
+
+  def allow_edit_track
+    render_access_denied unless profile.articles.find(params[:track]).allow_edit?(user)
+  end
+
+end
@@ -0,0 +1,47 @@
+class CommunityTrackPluginPublicController < PublicController
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+
+  no_design_blocks
+
+  before_filter :login_required, :only => :select_community
+
+  def view_tracks
+    block = Block.find(params[:id])
+    p = params[:page].to_i
+    per_page = params[:per_page]
+    per_page ||= block.limit
+    per_page = per_page.to_i
+    tracks = block.tracks(p, per_page)
+
+    render :update do |page|
+      page.insert_html :bottom, "track_list_#{block.id}", :partial => "blocks/#{block.track_partial}", :collection => tracks, :locals => {:block => block}
+
+      if block.has_page?(p+1, per_page)
+        page.replace_html "track_list_more_#{block.id}", :partial => 'blocks/track_list_more', :locals => {:block => block, :page => p+1, :force_same_page => params[:force_same_page], :per_page => per_page}
+      else
+        page.replace_html "track_list_more_#{block.id}", ''
+      end
+    end
+  end
+
+  def all_tracks
+    @per_page = 5 #FIXME
+    @block = Block.find(params[:id])
+    @tracks = @block.tracks(1, @per_page)
+    @show_more = @block.has_page?(2, @per_page)
+  end
+
+  def select_community
+    @communities = user.memberships.select{ |community| user.has_permission?('post_content', community) }
+    @back_to = request.url
+    if request.post?
+      community_identifier = params[:community_identifier]
+      if community_identifier.nil?
+        @failed = [_('Select one community to proceed')]
+      else
+        redirect_to :controller => 'cms', :action => 'new', :type => "CommunityTrackPlugin::Track", :profile => community_identifier
+      end
+    end
+  end
+
+end
@@ -0,0 +1,36 @@
+class CommunityTrackPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    'Community Track'
+  end
+
+  def self.plugin_description
+    _("New kind of content for communities.")
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def content_types
+    if context.respond_to?(:params) && context.params
+      types = []
+      parent_id = context.params[:parent_id]
+      types << CommunityTrackPlugin::Track if context.profile.community? && !parent_id
+      parent = parent_id ? context.profile.articles.find(parent_id) : nil
+      types << CommunityTrackPlugin::Step if parent.kind_of?(CommunityTrackPlugin::Track)
+      types
+    else
+       [CommunityTrackPlugin::Track, CommunityTrackPlugin::Step]
+    end
+  end
+
+  def self.extra_blocks
+    { CommunityTrackPlugin::TrackListBlock => {:position => 1}, CommunityTrackPlugin::TrackCardListBlock => {} }
+  end
+
+  def content_remove_new(page)
+    page.kind_of?(CommunityTrackPlugin::Track)
+  end
+
+end
@@ -0,0 +1,105 @@
+class CommunityTrackPlugin::Step < Folder
+
+  settings_items :hidden, :type => :boolean, :default => false
+
+  alias :tools :children
+
+  acts_as_list  :scope => :parent
+
+  def belong_to_track
+    errors.add(:parent, _("Step not allowed at this parent.")) unless parent.kind_of?(CommunityTrackPlugin::Track)
+  end
+
+  validate :belong_to_track
+  validates_presence_of :start_date, :end_date
+  validate :end_date_equal_or_after_start_date
+
+  after_save :schedule_activation
+
+  before_create do |step|
+    step.published = false
+    true
+  end
+
+  before_create :set_hidden_position
+  before_save :set_hidden_position
+
+  def set_hidden_position
+    if hidden
+      decrement_positions_on_lower_items
+      self[:position] = 0
+    elsif position == 0
+      add_to_list_bottom
+    end
+  end
+
+  def end_date_equal_or_after_start_date
+    if end_date && start_date
+      errors.add(:end_date, _('must be equal or after start date.')) unless end_date >= start_date
+    end
+  end
+
+  def self.short_description
+    _("Step")
+  end
+
+  def self.description
+    _('Defines a step.')
+  end
+
+  def accept_comments?
+    false
+  end
+
+  def enabled_tools
+    {TinyMceArticle => {:name => _('Article')}, Forum => {:name => _('Forum')}}
+  end
+
+  def to_html(options = {})
+    step = self
+    lambda do
+      render :file => 'content_viewer/step.rhtml', :locals => {:step => step}
+    end
+  end
+
+  def active?
+    (start_date..end_date).include?(Date.today)
+  end
+
+  def finished?
+    Date.today > end_date
+  end
+
+  def waiting?
+    Date.today < start_date
+  end
+
+  def schedule_activation
+    return if !changes['start_date'] && !changes['end_date'] && !changes['published']
+    today = Date.today
+    if today <= end_date || published
+      schedule_date = !published ? start_date : end_date + 1.day
+      CommunityTrackPlugin::ActivationJob.find(id).destroy_all
+      Delayed::Job.enqueue(CommunityTrackPlugin::ActivationJob.new(self.id), 0, schedule_date)
+    end
+  end
+
+  def publish
+    self[:published] = active? && !hidden
+    save!
+  end
+
+  class CommunityTrackPlugin::ActivationJob < Struct.new(:step_id)
+
+    def self.find(step_id)
+      Delayed::Job.where(:handler => "--- !ruby/struct:CommunityTrackPlugin::ActivationJob \nstep_id: #{step_id}\n")
+    end
+
+    def perform
+      step = CommunityTrackPlugin::Step.find(step_id)
+      step.publish
+    end
+
+  end
+
+end
@@ -0,0 +1,30 @@
+module CommunityTrackPlugin::StepHelper
+
+  def self.status_descriptions
+    [_('Finished'), _('In progress'), _('Waiting')]
+  end
+
+  def self.status_classes
+    ['step_finished', 'step_active', 'step_waiting']
+  end
+
+  def status_description(step)
+    CommunityTrackPlugin::StepHelper.status_descriptions[status_index(step)]
+  end
+
+  def status_class(step)
+    CommunityTrackPlugin::StepHelper.status_classes[status_index(step)]
+  end
+
+  def custom_options_for_article(article)
+    #no options for step?
+    nil
+  end
+
+  protected
+
+  def status_index(step)
+    [step.finished?, step.active?, step.waiting?].find_index(true)
+  end
+
+end
@@ -0,0 +1,70 @@
+class CommunityTrackPlugin::Track < Folder
+
+  settings_items :goals, :type => :string
+  settings_items :expected_results, :type => :string
+
+  def self.icon_name(article = nil)
+    'community-track'
+  end
+
+  def self.short_description
+    _("Track")
+  end
+
+  def self.description
+    _('Defines a track.')
+  end
+
+  def steps
+    #XXX article default order is name (acts_as_filesystem) -> should use reorder (rails3)
+    steps_unsorted.sort_by(&:position).select{|s| !s.hidden}
+  end
+
+  def hidden_steps
+    steps_unsorted.select{|s| s.hidden}
+  end
+
+  def reorder_steps(step_ids)
+    transaction do
+      step_ids.each_with_index do |step_id, i|
+        step = steps_unsorted.find(step_id)
+        step.update_attribute(:position, step.position = i + 1)
+      end
+    end
+  end
+
+  def steps_unsorted
+    children.where(:type => 'CommunityTrackPlugin::Step')
+  end
+
+  def accept_comments?
+    false
+  end
+
+  def comments_count
+    steps_unsorted.joins(:children).sum('childrens_articles.comments_count')
+  end
+
+  def css_class_name
+    "community-track-plugin-track"
+  end
+
+  def first_paragraph
+    return '' if body.blank?
+    paragraphs = Hpricot(body).search('p')
+    paragraphs.empty? ? '' : paragraphs.first.to_html
+  end
+
+  def category_name
+    category = categories.first
+    category ? category.name : ''
+  end
+
+  def to_html(options = {})
+    track = self
+    lambda do
+      render :file => 'content_viewer/track.rhtml', :locals => {:track => track}
+    end
+  end
+
+end
@@ -0,0 +1,15 @@
+class CommunityTrackPlugin::TrackCardListBlock < CommunityTrackPlugin::TrackListBlock
+
+  def self.description
+    _('Track Card List')
+  end
+
+  def help
+    _('This block displays a list of most relevant tracks as cards.')
+  end
+
+  def track_partial
+    'track_card'
+  end
+
+end
@@ -0,0 +1,12 @@
+module CommunityTrackPlugin::TrackHelper
+
+  def category_class(track)
+    'category_' + (track.categories.empty? ? 'not_defined' : track.categories.first.name.to_slug)
+  end
+
+  def track_card_lead(track)
+    lead_stripped = strip_tags(track.lead)
+    excerpt(lead_stripped, lead_stripped.first(3), track.image ? 180 : 300)
+  end
+
+end
@@ -0,0 +1,64 @@
+class CommunityTrackPlugin::TrackListBlock < Block
+
+  include CommunityTrackPlugin::StepHelper
+
+  settings_items :limit, :type => :integer, :default => 3
+  settings_items :more_another_page, :type => :boolean, :default => false
+  settings_items :category_ids, :type => Array, :default => []
+
+  def self.description
+    _('Track List')
+  end
+
+  def help
+    _('This block displays a list of most relevant tracks.')
+  end
+
+  def track_partial
+    'track'
+  end
+
+  def tracks(page=1, per_page=limit)
+    all_tracks.order('hits DESC').paginate(:per_page => per_page, :page => page)
+  end
+
+  def count_tracks
+    all_tracks.count
+  end
+
+  def accept_category?(cat)
+    true #accept all?
+  end
+
+  def category_ids=(ids)
+    settings[:category_ids] = ids.uniq.map{|item| item.to_i unless item.to_i.zero?}.compact
+  end
+
+  def all_tracks
+    tracks = owner.articles.where(:type => 'CommunityTrackPlugin::Track')
+    if !category_ids.empty?
+      tracks = tracks.joins(:article_categorizations).where(:articles_categories => {:category_id => category_ids})
+    end
+    tracks
+  end
+
+  def content(args={})
+    block = self
+    lambda do
+      render :file => 'blocks/track_list.rhtml', :locals => {:block => block}
+    end
+  end
+
+  def has_page?(page, per_page=limit)
+    return (page-1) * per_page < count_tracks
+  end
+
+  def footer
+    block = self
+    return nil if !has_page?(2)
+    lambda do
+      render :partial => 'blocks/track_list_more', :locals => {:block => block, :page => 2, :per_page => block.limit}
+    end
+  end
+
+end
@@ -0,0 +1,201 @@
+.icon-newcommunity-track,
+.icon-community-track {
+  background-image: url(/plugins/community_track/icons/community-track.png)
+}
+
+.step_active, #article .step_active a {
+  background-color: #CCEBD6;
+  color: #338533;
+}
+
+.step_waiting, #article .step_waiting a {
+  background-color: #FFFFD1;
+  color: #D17519;
+}
+
+.step_finished, #article .step_finished a {
+  background-color: #D1FFFF;
+  color: #00297A;
+}
+
+.step_status_description {
+  float: right;
+}
+
+.step {
+  font-weight: bold;
+}
+
+.track_list .item .step {
+  padding: 8px 5px;
+}
+
+#article .step a {
+  text-decoration: none;
+}
+
+.track_list .item .track_content .lead {
+  float: left;
+  width: 50%;
+}
+
+.track_list .item .track_content .steps {
+  float: right;
+  width: 50%;
+}
+
+.track_list .item {
+  border-bottom: 1px solid #DDDDDD;
+}
+
+.track_stats, .track_content {
+  clear: both;
+}
+
+.track_stats .comments {
+  float: left;
+}
+
+.track_stats .hits {
+  float: right;
+}
+
+.track_list .item_card {
+  width: 155px;
+  border: 1px solid #DDDDDD;
+  float: left;
+  padding: 0px 8px;
+  margin-left: 3px;
+  margin-right: 3px;
+  margin-bottom: 8px;
+}
+
+.steps .step {
+  margin-top: 3px;
+  margin-bottom: 3px;
+}
+
+.track_list .item_card .track_stats {
+  border-top: 1px solid #DDDDDD;
+}
+
+.track_list .item_card a, .track_list .item_card a:hover, .track_list .item_card a:visited {
+  text-decoration: none;
+  color: #444;
+}
+
+.track_list .item_card:hover {
+  background: #EEE;
+}
+
+.track_list .title {
+  font-size: 16px;
+  font-weight: bold;
+  border-bottom: 1px solid #DDDDDD;
+  padding: 2px 0px;
+  margin-bottom: 5px;
+  min-height: 10px;
+}
+
+.track_list .image img {
+  max-width: 100%;
+  max-height: 100px;
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.track_list .name {
+  padding-top: 5px;
+}
+
+.track_list .item_card {
+  height: 270px;
+}
+
+.track_list .track_content {
+  height: 250px;
+}
+
+#track .step_list {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+}
+
+#track .position {
+  font-size: 24px;
+  font-weight: bold;
+  float: left;
+  margin: 0 10px;
+}
+
+#track .step .name, #track .step .name a {
+  font-weight: bold;
+  color: #333;
+}
+
+#track .step .name a:hover {
+  color: #555;
+}
+
+#track .step .date {
+  font-size: 12px;
+  color: #AAA;
+}
+
+#track .step .lead {
+  margin: 0px 10px;
+  color: #555;
+}
+
+#track .content {
+  margin: 6px 0px;
+  border-bottom: 1px solid #DDDDDD;
+}
+
+#track .ui-state-default .content {
+  border-bottom: 0px;
+}
+
+.track_list .item .step .position {
+  float: left;
+  padding-right: 5px;
+}
+
+#track .actions .save_button {
+  display: none;
+}
+
+#track .actions, #step .actions {
+  margin-bottom: 20px;
+}
+
+#edit-track-list-block .categorie_box a {
+  float: left;
+}
+
+.all_tracks .more_button {
+  text-align: center;
+}
+
+#step .tools .item .name a, #step .tools .item .name a:hover {
+  border: none;
+  background-color: transparent;
+  color: #666;
+  font-weight: bold;
+}
+
+#step .tools .item .name a:hover {
+  color: #888;
+}
+
+.community-track textarea {
+  width: 100%;
+}
+
+.formfield input#datepicker-from-date,
+.formfield input#datepicker-to-date {
+  width: 115px;
+  background: url(/plugins/community_track/icons/calendar.png) right center no-repeat;
+}
@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class CmsController; def rescue_action(e) raise e end; end
+
+class CmsControllerTest < ActionController::TestCase
+
+  def setup
+    @profile = fast_create(Community)
+    @track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track', :profile => @profile)
+    @step = CommunityTrackPlugin::Step.create!(:name => 'step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
+
+    user = create_user('testinguser')
+    @profile.add_admin(user.person)
+    login_as(user.login)
+  end
+
+  should 'be able to edit track' do
+    get :edit, :id => @track.id, :profile => @profile.identifier
+    assert_tag :tag => 'input', :attributes => { :id => 'article_name' }
+  end
+
+  should 'be able to edit step' do
+    get :edit, :id => @step.id, :profile => @profile.identifier
+    assert_tag :tag => 'input', :attributes => { :id => 'article_name' }
+  end
+
+  should 'be able to save track' do
+    get :edit, :id => @track.id, :profile => @profile.identifier
+    post :edit, :id => @track.id, :profile => @profile.identifier, :article => {:name => 'changed'}
+    @track.reload
+    assert_equal 'changed', @track.name
+  end
+
+  should 'be able to save step' do
+    get :edit, :id => @step.id, :profile => @profile.identifier
+    post :edit, :id => @step.id, :profile => @profile.identifier, :article => {:name => 'changed'}
+    @step.reload
+    assert_equal 'changed', @step.name
+  end
+
+  should 'do not be able to edit visibility of step' do
+    get :edit, :id => @step.id, :profile => @profile.identifier
+    assert_no_tag :tag => 'input', :attributes => { :name => 'article[published]' }
+  end
+
+end
@@ -0,0 +1,147 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ContentViewerController
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+  def rescue_action(e)
+    raise e
+  end
+end
+
+class ContentViewerControllerTest < ActionController::TestCase
+
+  def setup
+    @profile = fast_create(Community)
+    @track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track', :profile => @profile)
+    category = fast_create(Category, :name => "education")
+    @track.add_category(category)
+
+    @step = CommunityTrackPlugin::Step.create!(:name => 'step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
+
+    user = create_user('testinguser')
+    login_as(user.login)
+    @profile.add_admin(user.person)
+  end
+
+  should 'show actions for tracks when user has permission for edit' do
+    get :view_page, @track.url
+    assert_tag :tag => 'div', :attributes => {:id => 'track' }, :descendant => { :tag => 'div', :attributes => { :class => 'actions' } }
+  end
+
+  should 'do not show actions for tracks when user has not permission for edit' do
+    user = create_user('intruder')
+    logout
+    login_as(user.login)
+    get :view_page, @track.url
+    assert_no_tag :tag => 'div', :attributes => {:id => 'track' }, :descendant => { :tag => 'div', :attributes => { :class => 'actions' } }
+  end
+
+  should 'do not show new button at article toolbar for tracks' do
+    user = create_user('intruder')
+    logout
+    login_as(user.login)
+    get :view_page, @track.url
+    assert_no_tag :tag => 'div', :attributes => {:id => 'article-actions'}, :descendant => { :tag => 'div', :attributes => { :id => 'icon-new' } }
+  end
+
+  should 'display steps for tracks' do
+    get :view_page, @track.url
+    assert_tag :tag => 'ul', :attributes => { :id => 'sortable' }, :descendant => {:tag => 'li', :attributes => { :class => 'step' } }
+  end
+
+  should 'display hidden field with step id' do
+    get :view_page, @track.url
+    assert_tag :tag => 'input', :attributes => { :name => 'step_ids[]' }
+  end
+
+  should 'show step' do
+    get :view_page, @step.url
+    assert_tag :tag => 'div', :attributes => { :id => 'step' }
+  end
+
+  should 'show tools for a step' do
+    Article.create!(:profile => @profile, :name => 'article', :parent => @step)
+    get :view_page, @step.url
+    assert_tag :tag => 'div', :attributes => { :class => 'tools' }, :descendant => { :tag => 'div', :attributes => { :class => 'item' } }
+  end
+
+  should 'show actions for steps when user has permission for edit' do
+    get :view_page, @step.url
+    assert_tag :tag => 'div', :attributes => {:id => 'step' }, :descendant => { :tag => 'div', :attributes => { :class => 'actions' } }
+  end
+
+  should 'show actions for enabled tools in step' do
+    get :view_page, @step.url
+    assert_tag 'div', :attributes => {:class => 'actions' }, :descendant => { :tag => 'a', :attributes => { :class => 'button with-text icon-new icon-newforum' } }
+    assert_tag 'div', :attributes => {:class => 'actions' }, :descendant => { :tag => 'a', :attributes => { :class => 'button with-text icon-new icon-newtext-html' } }
+  end
+
+  should 'do not show actions for steps when user has not permission for edit' do
+    user = create_user('intruder')
+    logout
+    login_as(user.login)
+    get :view_page, @step.url
+    assert_no_tag :tag => 'div', :attributes => {:id => 'step' }, :descendant => { :tag => 'div', :attributes => { :class => 'actions' } }
+  end
+
+  should 'render a div with block id for track list block' do
+    box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
+    @block = CommunityTrackPlugin::TrackListBlock.create!(:box => box)
+    @profile.boxes << box
+    get :view_page, @step.url
+    assert_tag :tag => 'div', :attributes => { :class => 'track_list', :id => "track_list_#{@block.id}" }
+  end
+
+  should 'render a div with block id for track card list block' do
+    box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
+    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
+    @profile.boxes << box
+    get :view_page, @step.url
+    assert_tag :tag => 'div', :attributes => { :class => 'track_list', :id => "track_list_#{@block.id}" }
+  end
+
+  should 'render tracks in track list block' do
+    box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
+    @block = CommunityTrackPlugin::TrackListBlock.create!(:box => box)
+    @profile.boxes << box
+    get :view_page, @step.url
+    assert_tag :tag => 'div', :attributes => { :class => 'item category_education' }, :descendant => { :tag => 'div', :attributes => { :class => 'steps' }, :descendant => { :tag => 'div', :attributes => { :class => "step #{@block.status_class(@step)}" } } }
+  end
+
+  should 'render tracks in track card list block' do
+    box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
+    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
+    @profile.boxes << box
+    get :view_page, @step.url
+    assert_tag :tag => 'div', :attributes => { :class => 'item_card category_education' }, :descendant => { :tag => 'div', :attributes => { :class => 'track_content' } }
+    assert_tag :tag => 'div', :attributes => { :class => 'item_card category_education' }, :descendant => { :tag => 'div', :attributes => { :class => 'track_stats' } }
+  end
+
+  should 'render link to display more tracks in track list block' do
+    box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
+    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
+    @profile.boxes << box
+
+    (@block.limit+1).times do |i|
+      CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @profile)
+    end
+
+    get :view_page, @step.url
+    assert_tag :tag => 'div', :attributes => { :id => "track_list_more_#{@block.id}" }, :descendant => { :tag => 'div', :attributes => { :class => 'more' } }
+  end
+
+  should 'render link to show all tracks in track list block' do
+    box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
+    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
+    @profile.boxes << box
+    @block.more_another_page = true
+    @block.save!
+
+    (@block.limit+1).times do |i|
+      CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @profile)
+    end
+
+    get :view_page, @step.url
+    assert_tag :tag => 'div', :attributes => { :id => "track_list_more_#{@block.id}" }, :descendant => { :tag => 'div', :attributes => { :class => 'view_all' } }
+  end
+
+end
@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class EnvironmentDesignController; def rescue_action(e) raise e end; end
+
+class EnvironmentDesignControllerTest < ActionController::TestCase
+
+  def setup
+    Environment.delete_all
+    @environment = Environment.new(:name => 'testenv', :is_default => true)
+    @environment.enabled_plugins = ['CommunityTrackPlugin']
+    @environment.save!
+
+    user = create_user('testinguser')
+    @environment.add_admin(user.person)
+    login_as(user.login)
+
+    box = Box.create!(:owner => @environment)
+    @block = CommunityTrackPlugin::TrackListBlock.create!(:box => box)
+    @block_card = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
+  end
+
+  should 'be able to edit TrackListBlock' do
+    get :edit, :id => @block.id
+    assert_tag :tag => 'input', :attributes => { :id => 'block_title' }
+  end
+
+  should 'be able to save TrackListBlock' do
+    get :edit, :id => @block.id
+    post :save, :id => @block.id, :block => {:title => 'Tracks' }
+    @block.reload
+    assert_equal 'Tracks', @block.title
+  end
+
+  should 'be able to edit TrackCardListBlock' do
+    get :edit, :id => @block_card.id
+    assert_tag :tag => 'input', :attributes => { :id => 'block_title' }
+  end
+
+  should 'be able to save TrackCardListBlock' do
+    get :edit, :id => @block_card.id
+    post :save, :id => @block_card.id, :block => {:title => 'Tracks' }
+    @block_card.reload
+    assert_equal 'Tracks', @block_card.title
+  end
+
+end
@@ -0,0 +1,49 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../../controllers/myprofile/community_track_plugin_myprofile_controller'
+
+# Re-raise errors caught by the controller.
+class CommunityTrackPluginMyprofileController; def rescue_action(e) raise e end; end
+
+class CommunityTrackPluginMyprofileControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = CommunityTrackPluginMyprofileController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @profile = fast_create(Community)
+    @track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track', :profile => @profile)
+
+    @user = create_user('testinguser')
+    login_as(@user.login)
+    @profile.add_admin(@user.person)
+  end
+
+  should 'redirect to track on save order' do
+    get :save_order, :profile => @profile.identifier, :track => @track.id, :step_ids => []
+    assert_redirected_to @track.url
+  end
+
+  should 'save new step positions on save order' do
+    step1 = CommunityTrackPlugin::Step.create!(:name => 'step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
+    step2 = CommunityTrackPlugin::Step.create!(:name => 'step2', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
+    assert_equal [step1, step2], @track.steps
+    get :save_order, :profile => @profile.identifier, :track => @track.id, :step_ids => [step2.id, step1.id]
+    assert_equal [step2, step1], @track.steps
+  end
+
+  should 'do not allow a user without permission to save order' do
+    logout
+    user = create_user('intruder')
+    login_as(user.login)
+    get :save_order, :profile => @profile.identifier, :track => @track.id, :step_ids => []
+    assert_response 403
+  end
+
+  should 'redirect to login page if there is no user logged in' do
+    logout
+    get :save_order, :profile => @profile.identifier, :track => @track.id, :step_ids => []
+    assert_response 302
+  end
+
+end
@@ -0,0 +1,109 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../../controllers/public/community_track_plugin_public_controller'
+
+# Re-raise errors caught by the controller.
+class CommunityTrackPluginPublicController; def rescue_action(e) raise e end; end
+
+class CommunityTrackPluginPublicControllerTest < ActionController::TestCase
+
+  def setup
+    @community = fast_create(Community)
+    @track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track', :profile => @community)
+
+    box = fast_create(Box, :owner_id => @community.id, :owner_type => 'Community')
+    @card_block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
+    @block = CommunityTrackPlugin::TrackListBlock.create!(:box => box)
+  end
+
+  should 'display tracks for card block' do
+    xhr :get, :view_tracks, :id => @card_block.id, :page => 1
+    assert_match /track_list_#{@card_block.id}/, @response.body
+  end
+
+  should 'display tracks for list block' do
+    xhr :get, :view_tracks, :id => @block.id, :page => 1
+    assert_match /track_list_#{@block.id}/, @response.body
+  end
+
+  should 'display tracks with page size' do
+    20.times do |i|
+      track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @community)
+    end
+    xhr :get, :view_tracks, :id => @block.id, :page => 1, :per_page => 10
+    assert_equal 10, @response.body.scan(/item/).size
+  end
+
+  should 'default page size is the block limit' do
+    20.times do |i|
+      track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @community)
+    end
+    xhr :get, :view_tracks, :id => @block.id, :page => 1
+    assert_equal @block.limit, @response.body.scan(/item/).size
+  end
+
+  should 'display page for all tracks' do
+    get :all_tracks, :id => @block.id
+    assert_match /track_list_#{@block.id}/, @response.body
+  end
+
+  should 'show more link in all tracks if there is no more tracks to show' do
+    10.times do |i|
+      CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @community)
+    end
+    get :all_tracks, :id => @block.id
+    assert assigns['show_more']
+    assert_match /track_list_more_#{@block.id}/, @response.body
+  end
+
+  should 'do not show more link in all tracks if there is no more tracks to show' do
+    CommunityTrackPlugin::Track.destroy_all
+    get :all_tracks, :id => @block.id
+    assert !assigns['show_more']
+    assert_no_match /track_list_more_#{@block.id}/, @response.body
+  end
+
+  should 'show select community page if user is logged in' do
+    user = create_user('testinguser')
+    login_as(user.login)
+    get :select_community
+    assert_template 'select_community'
+  end
+
+  should 'redirect to login page if user try to access community selection' do
+    logout
+    get :select_community
+    assert_redirected_to :controller => 'account', :action => 'login'
+  end
+
+  should 'display for selection communities where user has permission to post content' do
+    user = create_user('testinguser')
+    login_as(user.login)
+    @community.add_member(user.person)
+    get :select_community
+    assert_tag :tag => 'li', :attributes => {:class => 'search-profile-item'}
+    assert_tag :tag => 'input', :attributes => {:id => "community_identifier_#{@community.identifier}"}
+  end
+
+  should 'do not display communities where user has not permission to post content' do
+    user = create_user('testinguser')
+    login_as(user.login)
+    get :select_community
+    assert_no_tag :tag => 'input', :attributes => {:id => "community_identifier_#{@community.identifier}"}
+  end
+
+  should 'redirect to new content with track content type' do
+    user = create_user('testinguser')
+    login_as(user.login)
+    post :select_community, :profile => user.person.identifier, :community_identifier => @community.identifier
+    assert_redirected_to :controller => 'cms', :action => 'new', :type => "CommunityTrackPlugin::Track", :profile => @community.identifier
+  end
+
+  should 'return error message if user do not select a community' do
+    user = create_user('testinguser')
+    login_as(user.login)
+    post :select_community, :profile => user.person.identifier, :community_identifier => nil
+    assert_equal 1, assigns(:failed).count
+    assert_tag :tag => 'div', :attributes => {:id => 'errorExplanation'}
+  end
+
+end
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+class StepHelperTest < ActiveSupport::TestCase
+
+  include CommunityTrackPlugin::StepHelper
+
+  def setup
+    @step = CommunityTrackPlugin::Step.new
+    @step.stubs(:active?).returns(false)
+    @step.stubs(:finished?).returns(false)
+    @step.stubs(:waiting?).returns(false)
+  end
+
+  should 'return active class when step is active' do
+    @step.stubs(:active?).returns(true)
+    assert_equal 'step_active', status_class(@step)
+  end
+
+  should 'return finished class when step is finished' do
+    @step.stubs(:finished?).returns(true)
+    assert_equal 'step_finished', status_class(@step)
+  end
+
+  should 'return waiting class when step is active' do
+    @step.stubs(:waiting?).returns(true)
+    assert_equal 'step_waiting', status_class(@step)
+  end
+
+  should 'return a description for status' do
+    @step.stubs(:waiting?).returns(true)
+    assert_equal _('Waiting'), status_description(@step)
+  end
+
+  should 'return nil at custom_options_for_article' do
+    assert !custom_options_for_article(fast_create(Article))
+  end
+
+end
@@ -0,0 +1,265 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+class StepTest < ActiveSupport::TestCase
+
+  def setup
+    @profile = fast_create(Community)
+    @track = CommunityTrackPlugin::Track.create(:profile_id => @profile.id, :name => 'track')
+    @step = CommunityTrackPlugin::Step.new(:name => 'Step', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
+    Delayed::Job.destroy_all
+  end
+
+  should 'describe yourself' do
+    assert CommunityTrackPlugin::Step.description
+  end
+
+  should 'has a short description' do
+    assert CommunityTrackPlugin::Step.short_description
+  end
+
+  should 'set published to false on create' do
+    today = Date.today
+    step = CommunityTrackPlugin::Step.create(:name => 'Step', :body => 'body', :profile => @profile, :parent => @track, :start_date => today, :end_date => today, :published => true)
+    assert !step.published
+  end
+
+  should 'do not allow step creation with a parent that is not a track' do
+    today = Date.today
+    blog = fast_create(Blog)
+    step = CommunityTrackPlugin::Step.new(:name => 'Step', :body => 'body', :profile => @profile, :parent => blog, :start_date => today, :end_date => today, :published => true)
+    assert !step.save
+  end
+
+  should 'do not allow step creation without a parent' do
+    today = Date.today
+    step = CommunityTrackPlugin::Step.new(:name => 'Step', :body => 'body', :profile => @profile, :parent => nil, :start_date => today, :end_date => today, :published => true)
+    assert !step.save
+  end
+
+  should 'create step if end date is equal to start date' do
+    @step.start_date = Date.today
+    @step.end_date = Date.today
+    assert @step.save
+  end
+
+  should 'create step if end date is after start date' do
+    @step.start_date = Date.today
+    @step.end_date = Date.today + 1.day
+    assert @step.save
+  end
+
+  should 'do not create step if end date is before start date' do
+    @step.start_date = Date.today
+    @step.end_date = Date.today - 1.day
+    assert !@step.save
+  end
+
+  should 'do not validate date period if start date is nil' do
+    @step.start_date = nil
+    @step.end_date_equal_or_after_start_date.inspect
+    assert [], @step.errors
+  end
+
+  should 'do not validate date period if end date is nil' do
+    @step.end_date = nil
+    @step.end_date_equal_or_after_start_date.inspect
+    assert [], @step.errors
+  end
+
+  should 'be active if today is between start and end dates' do
+    @step.start_date = Date.today
+    @step.end_date = Date.today + 1.day
+    assert @step.active?
+  end
+
+  should 'be finished if today is after the end date' do
+    @step.start_date = Date.today - 2.day
+    @step.end_date = Date.today - 1.day
+    assert @step.finished?
+  end
+
+  should 'be waiting if today is before the end date' do
+    @step.start_date = Date.today + 1.day
+    @step.end_date = Date.today + 2.day
+    assert @step.waiting?
+  end
+
+  should 'return delayed job created with a specific step_id' do
+    step_id = 0
+    CommunityTrackPlugin::ActivationJob.new(step_id)
+    assert CommunityTrackPlugin::ActivationJob.find(step_id)
+  end
+
+  should 'create delayed job' do
+    @step.start_date = Date.today
+    @step.end_date = Date.today
+    @step.schedule_activation
+    assert_equal 1, Delayed::Job.count
+    assert_equal @step.start_date, Delayed::Job.first.run_at.to_date
+  end
+
+  should 'do not duplicate delayed job' do
+    @step.start_date = Date.today
+    @step.end_date = Date.today
+    @step.schedule_activation
+    @step.schedule_activation
+    assert_equal 1, Delayed::Job.count
+  end
+
+  should 'create delayed job when a step is saved' do
+    @step.start_date = Date.today
+    @step.end_date = Date.today
+    @step.save!
+    assert_equal @step.start_date, Delayed::Job.first.run_at.to_date
+  end
+
+  should 'create delayed job even if start date has passed' do
+    @step.start_date = Date.today - 2.days
+    @step.end_date = Date.today
+    @step.schedule_activation
+    assert_equal @step.start_date, Delayed::Job.first.run_at.to_date
+  end
+
+  should 'do not create delayed job if end date has passed and step is not published' do
+    @step.start_date = Date.today - 5.days
+    @step.end_date = Date.today - 2.days
+    @step.published = false
+    @step.schedule_activation
+    assert_equal 0, Delayed::Job.count
+  end
+
+  should 'create delayed job if end date has passed and step is published' do
+    @step.start_date = Date.today - 5.days
+    @step.end_date = Date.today - 2.days
+    @step.published = true
+    @step.schedule_activation
+    assert_equal @step.end_date + 1.day, Delayed::Job.first.run_at.to_date
+  end
+
+  should 'change publish to true on perform delayed job in a active step' do
+    @step.start_date = Date.today
+    @step.end_date = Date.today + 2.days
+    @step.published = false
+    @step.save!
+    CommunityTrackPlugin::ActivationJob.new(@step.id).perform
+    @step.reload
+    assert @step.published
+  end
+
+  should 'reschedule delayed job after change publish to true' do
+    @step.start_date = Date.today
+    @step.end_date = Date.today + 2.days
+    @step.published = false
+    @step.save!
+    assert_equal @step.start_date, Delayed::Job.first.run_at.to_date
+    process_delayed_job_queue
+    assert_equal @step.end_date + 1.day, Delayed::Job.first.run_at.to_date
+  end
+
+  should 'do not schedule delayed job if save but do not modify date fields and published status' do
+    @step.start_date = Date.today
+    @step.end_date = Date.today
+    @step.published = false
+    @step.save!
+    assert_equal 1, Delayed::Job.count
+    Delayed::Job.destroy_all
+    @step.name = 'changed name'
+    @step.save!
+    assert_equal 0, Delayed::Job.count
+  end
+
+  should 'set position on save' do
+    assert !@step.position
+    @step.save!
+    assert_equal 1, @step.position
+    step2 = CommunityTrackPlugin::Step.new(:name => 'Step2', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
+    step2.save!
+    assert_equal 2, step2.position
+  end
+
+  should 'publish step if it is active' do
+    @step.start_date = Date.today
+    @step.save!
+    assert !@step.published
+    @step.publish
+    @step.reload
+    assert @step.published
+  end
+
+  should 'do not publish step if it is not active' do
+    @step.start_date = Date.today + 2.days
+    @step.end_date = Date.today + 3.days
+    @step.save!
+    assert !@step.published
+    @step.publish
+    @step.reload
+    assert !@step.published
+  end
+
+  should 'unpublish step if it is not active anymore' do
+    @step.start_date = Date.today
+    @step.save!
+    @step.publish
+    @step.reload
+    assert @step.published
+
+    @step.start_date = Date.today - 2.days
+    @step.end_date = Date.today - 1.day
+    @step.save!
+    @step.publish
+    @step.reload
+    assert !@step.published
+  end
+
+  should 'set position to zero if step is hidden' do
+    @step.hidden = true
+    @step.save!
+    assert_equal 0, @step.position
+  end
+
+  should 'change position to zero if step becomes hidden' do
+    @step.save!
+    assert_equal 1, @step.position
+    @step.hidden = true
+    @step.save!
+    assert_equal 0, @step.position
+  end
+
+  should 'change position to botton if a hidden step becomes visible' do
+    step1 = CommunityTrackPlugin::Step.new(:name => 'Step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
+    step1.save!
+    @step.hidden = true
+    @step.save!
+    assert_equal 0, @step.position
+    @step.hidden = false
+    @step.save!
+    assert_equal 2, @step.position
+  end
+
+  should 'decrement lower items positions if a step becomes hidden' do
+    @step.save!
+    step1 = CommunityTrackPlugin::Step.new(:name => 'Step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
+    step1.save!
+    assert_equal 2, step1.position
+    @step.hidden = true
+    @step.save!
+    step1.reload
+    assert_equal 1, step1.position
+  end
+
+  should 'do not publish a hidden step' do
+    @step.start_date = Date.today
+    @step.hidden = true
+    @step.save!
+    assert !@step.published
+    @step.publish
+    @step.reload
+    assert !@step.published
+  end
+
+  should 'return enabled tools for a step' do
+    assert_includes @step.enabled_tools, TinyMceArticle
+    assert_includes @step.enabled_tools, Forum
+  end
+
+end
@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+class TrackCardListBlockTest < ActiveSupport::TestCase
+
+  def setup
+    @community = fast_create(Community)
+    box = fast_create(Box, :owner_id => @community.id, :owner_type => @community.class.name)
+    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
+  end
+
+  should 'describe yourself' do
+    assert CommunityTrackPlugin::TrackCardListBlock.description
+  end
+
+  should 'return track_card as track partial' do
+    assert_equal 'track_card', @block.track_partial
+  end
+
+end
@@ -0,0 +1,55 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+class TrackHelperTest < ActiveSupport::TestCase
+
+  include CommunityTrackPlugin::TrackHelper
+  include NoosferoTestHelper
+  include ActionView::Helpers::TextHelper
+
+  def setup
+    @track = CommunityTrackPlugin::Track.new
+  end
+
+  should 'return css class for track with category' do
+    category = fast_create(Category, :name => 'education')
+    @track.categories << category
+    assert_equal 'category_education', category_class(@track)
+  end
+
+  should 'return default css class for a track without category' do
+    assert_equal 'category_not_defined', category_class(@track)
+  end
+
+  should 'return css class for first category that the class belongs' do
+    category1 = fast_create(Category, :name => 'education')
+    @track.categories << category1
+    category2 = fast_create(Category, :name => 'tech')
+    @track.categories << category2
+    assert_equal 'category_education', category_class(@track)
+  end
+
+  should 'return css class with category name properly formated' do
+    category = fast_create(Category, :name => 'not defined')
+    @track.categories << category
+    assert_equal 'category_not-defined', category_class(@track)
+  end
+
+  should 'return lead for track removing html tags' do
+    @track.abstract = "display <div>pure text</div>"
+    assert_equal "display pure text", track_card_lead(@track)
+  end
+
+  should 'limit lead char length' do
+    @track.abstract = ""
+    400.times { @track.abstract += "a" }
+    assert_equal 306, track_card_lead(@track).length
+  end
+
+  should 'display a shorter lead if track has a image' do
+    @track.abstract = ""
+    @track.image = Image.new
+    400.times { @track.abstract += "a" }
+    assert_equal 186, track_card_lead(@track).length
+  end
+
+end
@@ -0,0 +1,105 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+class TrackListBlockTest < ActiveSupport::TestCase
+
+  def setup
+    @community = fast_create(Community)
+    @track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track', :profile => @community)
+
+    box = fast_create(Box, :owner_id => @community.id, :owner_type => @community.class.name)
+    @block = CommunityTrackPlugin::TrackListBlock.create!(:box => box)
+  end
+
+  should 'describe yourself' do
+    assert CommunityTrackPlugin::TrackListBlock.description
+  end
+
+  should 'return track as track partial' do
+    assert_equal 'track', @block.track_partial
+  end
+
+  should 'load more at another page default to false' do
+    assert !@block.more_another_page
+  end
+
+  should 'list articles only of track type' do
+    article = fast_create(Article, :profile_id => @community.id)
+    assert_includes @community.articles, article
+    assert_equal [@track], @block.tracks
+  end
+
+  should 'list of articles be limited by block configuration' do
+    (@block.limit + 1).times do |i|
+      track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @community)
+    end
+    assert_equal @block.limit, @block.tracks.count
+  end
+
+  should 'return more link if has more tracks to show' do
+    @block.limit.times do |i|
+      track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @community)
+    end
+    assert @block.footer
+  end
+
+  should 'do not return more link if there is no more tracks to show' do
+    (@block.limit-1).times do |i|
+      track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @community)
+    end
+    assert !@block.footer
+  end
+
+  should 'count all tracks' do
+    @block.owner.articles.destroy_all
+    tracks_to_insert = @block.limit + 1
+    tracks_to_insert.times do |i|
+      track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @community)
+    end
+    article = fast_create(Article, :profile_id => @block.owner.id)
+    @block.reload
+    assert_includes @block.owner.articles, article
+    assert_equal tracks_to_insert, @block.count_tracks
+  end
+
+  should 'have a second page if there is more tracks than limit' do
+    @block.owner.articles.destroy_all
+    (@block.limit+1).times do |i|
+      track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @community)
+    end
+    assert @block.has_page?(2)
+    assert !@block.has_page?(3)
+  end
+
+  should 'filter tracks by category' do
+    @block.owner.articles.destroy_all
+    category = fast_create(Category)
+    category2 = fast_create(Category)
+    track1 = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track1', :profile => @community)
+    track2 = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track2', :profile => @community)
+    track3 = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track3', :profile => @community)
+    track1.add_category(category)
+    @block.category_ids = [category.id]
+    assert_equal [track1], @block.all_tracks
+  end
+
+  should 'return all tracks if block does not filter by category' do
+    @block.owner.articles.destroy_all
+    category = fast_create(Category)
+    track1 = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track1', :profile => @community)
+    track2 = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track2', :profile => @community)
+    track1.add_category(category)
+    assert_includes @block.all_tracks, track1
+    assert_includes @block.all_tracks, track2
+  end
+
+  should 'accept any categories' do
+    assert @block.accept_category?(nil)
+    assert @block.accept_category?(fast_create(Category))
+  end
+
+  should 'format category ids array avoiding duplicates and zeros' do
+    @block.category_ids = ["0", "0", "1", "1", "2", nil]
+    assert_equal [1, 2], @block.category_ids
+  end
+
+end
@@ -0,0 +1,127 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+class TrackTest < ActiveSupport::TestCase
+
+  def setup
+    profile = fast_create(Community)
+    @track = CommunityTrackPlugin::Track.create!(:profile => profile, :name => 'track')
+    @step = CommunityTrackPlugin::Step.create!(:parent => @track, :start_date => Date.today, :end_date => Date.today, :name => 'step', :profile => profile)
+    @tool = fast_create(Article, :parent_id => @step.id, :profile_id => profile.id)
+  end
+
+  should 'describe yourself' do
+    assert CommunityTrackPlugin::Track.description
+  end
+
+  should 'has a short descriptionf' do
+    assert CommunityTrackPlugin::Track.short_description
+  end
+
+  should 'has a css class name' do
+    assert_equal 'community-track-plugin-track', @track.css_class_name
+  end
+
+  should 'return comments count of children tools' do
+    assert_equal 0, @track.comments_count
+    owner = create_user('testuser').person
+    article = create(Article, :name => 'article', :parent_id => @step.id, :profile_id => owner.id)
+    comment = create(Comment, :source => article, :author_id => owner.id)
+    assert_equal 1, @track.comments_count
+  end
+
+  should 'return children steps' do
+    assert_equal [@step], @track.steps_unsorted
+  end
+
+  should 'do not return other articles type at steps' do
+    article = fast_create(Article, :parent_id => @track.id, :profile_id => @track.profile.id)
+    assert_includes @track.children, article
+    assert_equal [@step], @track.steps_unsorted
+  end
+
+  should 'return category name' do
+    category = fast_create(Category, :name => 'category')
+    @track.add_category(category, true)
+    assert_equal 'category', @track.category_name
+  end
+
+  should 'return empty for category name if it has no category' do
+    @track.categories.delete_all
+    assert_equal '', @track.category_name
+  end
+
+  should 'return category name of first category' do
+    category = fast_create(Category, :name => 'category')
+    @track.add_category(category, true)
+    category2 = fast_create(Category, :name => 'category2')
+    @track.add_category(category2, true)
+    assert_equal 'category', @track.category_name
+  end
+
+  should 'return steps with insert order' do
+    @track.children.destroy_all
+    step1 = CommunityTrackPlugin::Step.create!(:parent => @track, :start_date => Date.today, :end_date => Date.today, :name => "step1", :profile => @track.profile)
+    step2 = CommunityTrackPlugin::Step.create!(:parent => @track, :start_date => Date.today, :end_date => Date.today, :name => "step2", :profile => @track.profile)
+    step3 = CommunityTrackPlugin::Step.create!(:parent => @track, :start_date => Date.today, :end_date => Date.today, :name => "step3", :profile => @track.profile)
+    assert_equal 1, step1.position
+    assert_equal 2, step2.position
+    assert_equal 3, step3.position
+    assert_equal [step1, step2, step3], @track.steps
+  end
+
+  should 'return steps with order defined by position attribute' do
+    @track.children.destroy_all
+    step1 = CommunityTrackPlugin::Step.create!(:parent => @track, :start_date => Date.today, :end_date => Date.today, :name => "step1", :profile => @track.profile)
+    step2 = CommunityTrackPlugin::Step.create!(:parent => @track, :start_date => Date.today, :end_date => Date.today, :name => "step2", :profile => @track.profile)
+    step3 = CommunityTrackPlugin::Step.create!(:parent => @track, :start_date => Date.today, :end_date => Date.today, :name => "step3", :profile => @track.profile)
+    step1.position = 3
+    step1.save!
+    step2.position = 1
+    step2.save!
+    step3.position = 2
+    step3.save!
+    assert_equal [step2, step3, step1], @track.steps
+  end
+
+  should 'save steps in a new order' do
+    @track.children.destroy_all
+
+    step1 = CommunityTrackPlugin::Step.create!(:parent => @track, :start_date => Date.today, :end_date => Date.today, :name => "step1", :profile => @track.profile)
+    step2 = CommunityTrackPlugin::Step.create!(:parent => @track, :start_date => Date.today, :end_date => Date.today, :name => "step2", :profile => @track.profile)
+    step3 = CommunityTrackPlugin::Step.create!(:parent => @track, :start_date => Date.today, :end_date => Date.today, :name => "step3", :profile => @track.profile)
+
+    assert_equal [step1.id, step2.id, step3.id], @track.steps.map(&:id)
+    @track.reorder_steps([step3.id, step1.id, step2.id])
+    @track.reload
+    assert_equal [step3.id, step1.id, step2.id], @track.steps.map(&:id)
+  end
+
+  should 'do not return hidden steps' do
+    hidden_step = CommunityTrackPlugin::Step.new(:parent => @track, :start_date => Date.today, :end_date => Date.today, :name => 'hidden step', :profile => @track.profile)
+    hidden_step.hidden = true
+    hidden_step.save!
+    assert_equal [@step], @track.steps
+  end
+
+  should 'return hidden steps' do
+    hidden_step = CommunityTrackPlugin::Step.new(:parent => @track, :start_date => Date.today, :end_date => Date.today, :name => 'hidden step', :profile => @track.profile)
+    hidden_step.hidden = true
+    hidden_step.save!
+    assert_equal [hidden_step], @track.hidden_steps
+  end
+
+   should 'get first paragraph' do
+    @track.body = '<p>First</p><p>Second</p>'
+    assert_equal '<p>First</p>', @track.first_paragraph
+  end
+
+  should 'provide first_paragraph even if body was not given' do
+    assert_equal '', @track.first_paragraph
+  end
+
+  should 'provide first_paragraph even if body is nil' do
+    @track.body = nil
+    assert_equal '', @track.first_paragraph
+  end
+
+end
@@ -0,0 +1,78 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CommunityTrackPluginTest < ActiveSupport::TestCase
+
+  def setup
+    @plugin = CommunityTrackPlugin.new
+    @profile = fast_create(Community)
+    @params = {}
+    @plugin.stubs(:context).returns(self)
+  end
+
+  attr_reader :profile, :params
+
+  should 'has name' do
+    assert CommunityTrackPlugin.plugin_name
+  end
+
+  should 'describe yourself' do
+    assert CommunityTrackPlugin.plugin_description
+  end
+
+  should 'has stylesheet' do
+    assert @plugin.stylesheet?
+  end
+
+  should 'return Track as a content type if profile is a community' do
+    assert_includes @plugin.content_types, CommunityTrackPlugin::Track
+  end
+
+  should 'do not return Track as a content type if profile is not a community' do
+    @profile = Organization.new
+    assert_not_includes @plugin.content_types, CommunityTrackPlugin::Track
+  end
+
+  should 'do not return Track as a content type if there is a parent' do
+    parent = fast_create(Blog, :profile_id => @profile.id)
+    @params[:parent_id] = parent.id
+    assert_not_includes @plugin.content_types, CommunityTrackPlugin::Track
+  end
+
+  should 'return Step as a content type if parent is a Track' do
+    parent = fast_create(CommunityTrackPlugin::Track, :profile_id => @profile.id)
+    @params[:parent_id] = parent.id
+    assert_includes @plugin.content_types, CommunityTrackPlugin::Step
+  end
+
+  should 'do not return Step as a content type if parent is not a Track' do
+    parent = fast_create(Blog, :profile_id => @profile.id)
+    @params[:parent_id] = parent.id
+    assert_not_includes @plugin.content_types, CommunityTrackPlugin::Step
+  end
+
+  should 'return Track and Step as a content type if context has no params' do
+    parent = fast_create(Blog, :profile_id => @profile.id)
+    expects(:respond_to?).with(:params).returns(false)
+    assert_equivalent [CommunityTrackPlugin::Step, CommunityTrackPlugin::Track], @plugin.content_types
+  end
+
+  should 'return Track and Step as a content type if params is nil' do
+    parent = fast_create(Blog, :profile_id => @profile.id)
+    @params = nil
+    assert_equivalent [CommunityTrackPlugin::Step, CommunityTrackPlugin::Track], @plugin.content_types
+  end
+
+  should 'return track card as an extra block' do
+    assert_includes CommunityTrackPlugin.extra_blocks, CommunityTrackPlugin::TrackListBlock
+  end
+
+  should 'return true at content_remove_new if page is a track' do
+    assert @plugin.content_remove_new(CommunityTrackPlugin::Track.new)
+  end
+
+  should 'return false at content_remove_new if page is not a track' do
+    assert !@plugin.content_remove_new(CommunityTrackPlugin::Step.new)
+    assert !@plugin.content_remove_new(Article.new)
+  end
+
+end
@@ -0,0 +1,21 @@
+<% extend CommunityTrackPlugin::TrackHelper %>
+<div class="item <%= category_class(track) %>">
+  <div class="track_content">
+    <div class="lead">
+      <h3><%= link_to track.name, track.url %></h3>
+      <div class="content">
+        <%= track.lead %>
+      </div>
+    </div>
+    <div class="steps">
+      <h3><%= _("Steps") %></h3>
+      <% track.steps.each do |step| %>
+        <div class="step <%= block.status_class(step) %>">
+          <div class="position"><%= step.position %></div>
+          <%= link_to step.name, step.url %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>
+<br style="clear: both;"/>
@@ -0,0 +1,27 @@
+<% extend CommunityTrackPlugin::TrackHelper %>
+<div class="item_card <%= category_class(track_card) %>">
+  <a href="<%= url_for track_card.url %>">
+  <div class="track_content">
+    <div class="title">
+      <%= track_card.category_name %>
+    </div>
+    <div class="image">
+      <%= image_tag track_card.image.public_filename if track_card.image %>
+    </div>
+    <div class="name">
+      <%= track_card.name %>
+    </div>
+    <div class="lead">
+      <%= track_card_lead(track_card) %>
+    </div>
+  </div>
+  <div class="track_stats">
+    <div class="comments">
+      <%= "#{track_card.comments_count} comments" %>
+    </div>
+    <div class="hits">
+      <%= "#{track_card.hits} hits" %>
+    </div>
+  </div>
+  </a>
+</div>
@@ -0,0 +1,12 @@
+<% force_same_page ||= false %>
+<div id="track_list_more_<%= block.id %>" class="more_button">
+  <% if block.more_another_page && !force_same_page %>
+    <div class="view_all">
+      <%= link_to _('View All'), :id => block.id, :controller => 'community_track_plugin_public', :action => 'all_tracks' %>
+    </div>
+  <% else %>
+    <div class="more">
+      <%= link_to_remote(_('More'), :url => {:id => block.id, :controller => 'community_track_plugin_public', :action => 'view_tracks', :page => page, :per_page => per_page, :force_same_page => force_same_page}, :loaded => visual_effect(:highlight, "track_card_list_#{block.id}")) %>
+    </div>
+  <% end %>
+</div>
@@ -0,0 +1,6 @@
+<%= block_title(block.title) %>
+
+<div class="track_list" id="track_list_<%= block.id %>">
+  <%= render :partial => "blocks/#{block.track_partial}", :collection => block.tracks, :locals => {:block => block} %>
+</div>
+<br style="clear: both;"/>
@@ -0,0 +1,6 @@
+<div id='edit-track-list-block'>
+  <%= labelled_form_field _('Limit of items'), text_field(:block, :limit, :size => 3) %>
+  <%= labelled_form_field check_box(:block, :more_another_page) + _('Show more at another page'), '' %>
+  <%= select_categories(:block, _('Select Categories')) %>
+<br/>
+</div>
@@ -0,0 +1,19 @@
+<%= required_fields_message %>
+
+<%= render :file => 'shared/tiny_mce' %>
+
+<div>
+  <%= required f.text_field('name', :size => '64', :maxlength => 150) %>
+  <%= labelled_form_field(_('Period'), (
+    date_range_field('article[start_date]', 'article[end_date]', @article.start_date, @article.end_date,
+                     '%Y-%m-%d',
+                     { :change_month => true, :change_year => true,
+                       :date_format => 'yy-mm-dd' },
+                     { :size => 14 })
+  )) %>
+
+</div>
+
+<%= labelled_form_field check_box(:article, :hidden) + _('Hidden Step'), '' %>
+
+<%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :body_label => 'Description:'} %>
@@ -0,0 +1,20 @@
+<div class='community-track'>
+  <%= required_fields_message %>
+
+  <%= render :file => 'shared/tiny_mce' %>
+
+  <div>
+    <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
+  </div>
+
+  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :body_label => 'Description:'} %>
+
+  <div>
+    <% f.fields_for :image_builder, @article.image do |i| %>
+      <%= file_field_or_thumbnail(_('Image:'), @article.image, i) %>
+    <% end %>
+
+    <%= labelled_form_field(_('Goals:'), text_area(:article, :goals, :rows => 3, :cols => 64)) %>
+    <%= labelled_form_field(_('Expected Results:'), text_area(:article, :expected_results, :rows => 3, :cols => 64)) %>
+  </div>
+</div>
@@ -0,0 +1,10 @@
+<h1><%= _('Tracks') %></h1>
+<div class="all_tracks">
+  <div class="track_list track_card_list" id="track_list_<%= @block.id %>">
+    <%= render :partial => "blocks/#{@block.track_partial}", :collection => @tracks, :locals => {:block => @block} %>
+  </div>
+  <br style="clear: both;"/>
+  <% if @show_more %>
+    <%= render :partial => "blocks/track_list_more", :locals => {:block => @block, :force_same_page => true, :page => 2, :per_page => @per_page} %>
+  <% end %>
+</div>
@@ -0,0 +1,41 @@
+<div>
+
+<h1><%= _('Select Community') %></h1>
+
+<% if !@failed.blank? %>
+  <div class="errorExplanation" id="errorExplanation">
+    <div style="color: #c00;">
+    <% @failed.each do |error|%>
+      <strong> <%= error %></strong>
+    <% end %>
+    </div>
+  </div>
+<% end %>
+
+<% button_bar do %>
+  <%= button(:add, __('Create a new community'), :controller => 'memberships', :action => 'new_community', :profile => user.identifier, :back_to => @back_to) %>
+<% end %>
+
+<% form_tag({:controller => 'community_track_plugin_public', :action => 'select_community', :profile => user.identifier}) do %>
+<div class="common-profile-list-block">
+  <ul>
+  <% @communities.each do |community| %>
+    <li class="search-profile-item">
+      <div class="common-profile-list-block">
+        <div class="vcard">
+          <a href="#" onclick="jQuery('<%= "#community_identifier_#{community.identifier}" %>').attr('checked', true);">
+            <span class="profile-image"><%= profile_image(community) %></span>
+            <span class="org"><%= community.name %></span>
+            <span class="select_community"><%= radio_button_tag(:community_identifier, community.identifier) %></span>
+          </a>
+        </div>
+      </div>
+    </li>
+  <% end %>
+  </ul>
+  </div>
+  <div class="clear"></div>
+  <br/>
+  <%= submit_button :save, _('New Track') %>
+<% end %>
+</div>
@@ -0,0 +1,31 @@
+<div id="step">
+  <div class="event-info">
+    <ul class="event-data">
+      <li class="event-dates">
+        <span><%= _('When:') %></span><%= show_period(step.start_date, step.end_date) %>
+      </li>
+    </ul>
+  </div>
+  <div>
+    <%= step.body %>
+  </div>
+  <h3><%= _("Tools") %></h3>
+  <% if step.allow_create?(user) %>
+    <div class="actions">
+      <% step.enabled_tools.each do |klass, attrs| %>
+        <% content_tag('a', :href => url_for({:controller => 'cms', :action => 'new', :type => klass.name, :parent_id => @page}), :class => "button with-text icon-new icon-new#{klass.icon_name}") do %>
+            <%= _("New #{attrs[:name]}") %>
+        <% end %>
+      <% end %>
+    </div>
+  <% end %>
+  <div class="tools">
+    <% step.tools.each do |tool| %>
+      <div class="item">
+        <div class="name">
+          <%= link_to tool.name, tool.url, :class=>"button with-text icon-new icon-new#{tool.class.icon_name}" %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>
@@ -0,0 +1,67 @@
+<% extend CommunityTrackPlugin::StepHelper %>
+
+<% form_tag({:controller => 'community_track_plugin_myprofile', :action => 'save_order', :track => track}) do %>
+<div id="track">
+  <div>
+    <%= track.body %>
+  </div>
+
+  <h3><%= _("Steps") %></h3>
+
+  <% if track.allow_create?(user) %>
+    <div class="actions">
+        <% content_tag('a', :href => url_for({:controller => 'cms', :action => 'new', :type => "CommunityTrackPlugin::Step", :parent_id => track.id}), :class => 'button with-text icon-add') do %>
+          <strong><%= _("New %s") % CommunityTrackPlugin::Step.short_description %></strong>
+        <% end %>
+        <a href="#" class="reorder_button button with-text icon-up" onclick="enableReorder();"><%= _('Reorder Steps') %></a>
+        <%= submit_button :save, _('Save Order'), :class => "save_button" %>
+    </div>
+    <script>
+      function enableReorder() {
+        jQuery(".reorder_button").hide();
+        jQuery(".save_button").show();
+        jQuery("#sortable li").addClass("ui-state-default");
+        jQuery("#sortable").sortable();
+        jQuery("#sortable").disableSelection();
+      }
+    </script>
+    <% end %>
+
+    <ul id="sortable" class="step_list">
+    <% track.steps.each do |step| %>
+      <li class="step">
+        <%= hidden_field_tag "step_ids[]", step.id %>
+        <div class="position"><%= step.position %></div>
+        <div class="content">
+          <div class="date">
+            <%= show_period(step.start_date, step.end_date) %>
+          </div>
+          <div class="name"><%= link_to step.name, step.url %></div>
+          <div class="lead"><%= step.body %></div>
+        </div>
+      </li>
+    <% end %>
+    </ul>
+  <% if track.allow_create?(user) && !track.hidden_steps.empty? %>
+    <div id="hidden_steps">
+      <h3><%= _('Hidden Steps') %></h3>
+      <ul class="step_list">
+      <% track.hidden_steps.each do |step| %>
+        <li class="step">
+          <%= hidden_field_tag "step_ids[]", step.id %>
+          <div class="position"></div>
+          <div class="content">
+            <div class="date">
+              <%= show_period(step.start_date, step.end_date) %>
+            </div>
+            <div class="name"><%= link_to step.name, step.url %></div>
+            <div class="lead"><%= step.body %></div>
+          </div>
+        </li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+</div>
+<% end %>
+</div>
@@ -0,0 +1 @@
+../box_organizer/community_track_plugin
 \ No newline at end of file
@@ -0,0 +1 @@
+../box_organizer/community_track_plugin
 \ No newline at end of file
@@ -140,5 +140,14 @@ class CustomFormsPluginMyprofileControllerTest &lt; ActionController::TestCase
     assert_equal 'Cool form', form.description
     assert_equal 'Source', field.name
   end
+
+  should 'render TinyMce Editor for description' do
+    form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
+
+    get :edit, :profile => profile.identifier, :id => form.id
+
+    assert_tag :tag => 'textarea', :attributes => { :id => 'form_description', :class => 'mceEditor' }
+  end
+
 end
 <% self.extend(CustomFormsPlugin::Helper) %>
+<%= render :file => 'shared/tiny_mce', :locals => {:mode => 'simple'} %>
 <%= error_messages_for :form %>
@@ -15,7 +16,7 @@
   <% if profile.organization? %>
     <%= labelled_form_field _('Triggered on membership'), f.check_box(:on_membership) %>
   <% end %>
-  <%= labelled_form_field _('Description'), f.text_area(:description, :style => 'width: 100%') %>
+  <%= labelled_form_field _('Description'), f.text_area(:description, :style => 'width: 100%', :class => 'mceEditor') %>
   <h2><%= _('Fields') %></h2>
   <table class="action-table" id='fields-table'>
@@ -83,4 +83,8 @@ class DisplayContentBlock &lt; Block
     return parents
   end
+  def self.expire_on
+      { :profile => [:article], :environment => [:article] }
+  end
+
 end
@@ -0,0 +1,10 @@
+class FilePresenter::Video < FilePresenter
+  def self.accepts?(f)
+    return nil if !f.respond_to?(:content_type) || f.content_type.nil?
+    ( f.content_type[0..4] == 'video' ) ? 10 : nil
+  end
+
+  def short_description
+    _('Video (%s)') % content_type.split('/')[1].upcase
+  end
+end
@@ -0,0 +1,13 @@
+class Html5VideoPlugin < Noosfero::Plugin
+
+  FilePresenter::Video
+
+  def self.plugin_name
+    "HTML5 Video"
+  end
+
+  def self.plugin_description
+    _("A plugin to enable the video suport, with auto conversion for the web.")
+  end
+
+end
@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'content_viewer_controller'
+
+class ContentViewerController
+  # Re-raise errors caught by the controller.
+  def rescue_action(e) raise e end
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+end
+
+class ContentViewerControllerTest < ActionController::TestCase
+
+  all_fixtures
+
+  def setup
+    @controller = ContentViewerController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @profile = create_user('testinguser').person
+    @environment = @profile.environment
+  end
+  attr_reader :profile, :environment
+
+  should 'add html5 video tag to the page of file type video' do
+    file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'video/ogg'), :profile => profile)
+    get :view_page, file.url.merge(:view=>:true)
+    assert_select '#article video'
+  end
+
+end
@@ -0,0 +1,8 @@
+<video class="video-js vjs-default-skin" controls poster="video.jpg" preload="auto" data-setup="{}">
+  <source type="video/ogg" src="<%= video.public_filename %>"/>
+</video>
+
+<div class="uploaded-file-description <%= 'empty' if video.abstract.blank? %>">
+  <%= video.abstract %>
+</div>
+
@@ -0,0 +1,57 @@
+README - Video (Video Plugin)
+================================
+
+Video is a plugin that allow users to add a block where you can choose
+any url from youtube, vimeo and url's of the following file formats:
+mp4, ogg, ogv and webm.
+
+The Video block will be available for all layout columns of communities,
+people, enterprises and environments.
+
+INSTALL
+=======
+
+Enable Plugin
+-------------
+
+Also, you need to enable Video Plugin on your Noosfero:
+
+cd <your_noosfero_dir>
+./script/noosfero-plugins enable video
+
+Active Plugin
+-------------
+
+As a Noosfero administrator user, go to administrator panel:
+
+- Click on "Enable/disable plugins" option
+- Click on "Display Content Plugin" check-box
+
+Running Video tests
+--------------------
+
+$ rake test:noosfero_plugins:video
+
+
+Get Involved
+============
+
+If you find any bug and/or want to collaborate, please send an e-mail to leandronunes@gmail.com
+
+LICENSE
+=======
+
+Copyright (c) The Author developers.
+
+See Noosfero license.
+
+
+AUTHORS
+=======
+
+ Leandro Nunes dos Santos (leandronunes at gmail.com)
+
+ACKNOWLEDGMENTS
+===============
+
+The author have been supported by Serpro
@@ -0,0 +1,58 @@
+class VideoBlock < Block
+
+  settings_items :url, :type => :string, :default => ""
+  settings_items :width, :type => :integer, :default => 400
+  settings_items :height, :type => :integer, :default => 315
+
+  def is_youtube?
+    url.match(/.*(youtube.com.*v=[[:alnum:]]+|youtu.be\/[[:alnum:]]+).*/) ? true : false
+  end
+
+  def is_vimeo?
+    url.match(/^(http[s]?:\/\/)?(www.)?(vimeo.com|player.vimeo.com\/video)\/[[:digit:]]+/) ? true : false
+  end
+
+  def is_video_file?
+    url.match(/.*(mp4|ogg|ogv|webm)$/) ? true : false
+  end
+
+  def format_embed_video_url_for_youtube
+    "//www.youtube-nocookie.com/embed/#{extract_youtube_id}?rel=0&wmode=transparent" if is_youtube?
+  end
+
+  def format_embed_video_url_for_vimeo
+    "//player.vimeo.com/video/#{extract_vimeo_id}" if is_vimeo?
+  end
+
+  def self.description
+    _('Display a Video')
+  end
+
+  def help
+    _('This block presents a video from youtube, vimeo and some video formats (mp4, ogg, ogv and webm)')
+  end
+
+  def content(args={})
+    block = self
+
+    lambda do
+      render :file => 'video_block', :locals => { :block => block }
+    end
+  end
+
+  private
+
+  def extract_youtube_id
+    return nil unless is_youtube?
+    youtube_match = url.match('v=([[:alnum:]]*)')
+    youtube_match ||= url.match('youtu.be\/([[:alnum:]]*)')
+    youtube_match[1] unless youtube_match.nil?
+  end
+
+  def extract_vimeo_id
+    return nil unless is_vimeo?
+    vimeo_match = url.match('([[:digit:]]*)$')
+    vimeo_match[1] unless vimeo_match.nil?
+  end
+
+end
@@ -0,0 +1,19 @@
+require_dependency File.dirname(__FILE__) + '/video_block'
+
+class VideoPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Video Block Plugin"
+  end
+
+  def self.plugin_description
+    _("A plugin that adds a block where you can add videos from youtube, vimeo and html5.")
+  end
+
+  def self.extra_blocks
+    {
+      VideoBlock => {}
+    }
+  end
+
+end
@@ -0,0 +1,130 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class EnvironmentDesignController; def rescue_action(e) raise e end; end
+
+class EnvironmentDesignControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = EnvironmentDesignController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    Environment.delete_all
+    User.delete_all
+    @environment = Environment.create!(defaults_for_environment.merge(:is_default => true))
+    user = create_user('testinguser')
+    login_as(user.person.identifier)
+    @environment.add_admin(user.person)
+    @environment.save!
+
+    @environment.enabled_plugins = ['VideoPlugin']
+    @environment.save!
+
+    VideoBlock.delete_all
+
+    @block = VideoBlock.new
+    @block.box = @environment.boxes.first
+    @block.save!
+  end
+
+  attr_accessor :environment, :block
+
+  should 'display video-block-data class in profile block edition' do
+    block.url='youtube.com/?v=XXXXX'
+    block.save!
+    get :index
+
+    assert_tag :div, :attributes => {:class => 'video-block-data'}
+  end
+
+  should "display iframe tag in profile block edition on youtube url's" do
+    block.url='youtube.com/?v=XXXXX'
+    block.save
+    get :index
+
+    assert_tag :tag => 'iframe'
+  end
+
+  should "the width in iframe tag be defined on youtube url's" do
+    block.url='youtube.com/?v=XXXXX'
+    block.save
+    get :index
+
+    assert_tag :tag => 'iframe', :attributes => {:width => '400px'}
+  end
+
+  should "display iframe tag in profile block edition on vimeo url's" do
+    block.url='http://vimeo.com/98979'
+    block.save
+    get :index
+
+    assert_tag :tag => 'iframe'
+  end
+
+  should "the width in iframe tag be defined on vimeo url's" do
+    block.url='http://vimeo.com/98979'
+    block.save
+    get :index
+
+    assert_tag :tag => 'iframe', :attributes => {:width => '400px'}
+  end
+
+  should "display video tag in profile block edition for any video url" do
+    block.url='http://www.vmsd.com/98979.mp4'
+    block.save
+    get :index
+
+    assert_tag :tag => 'video'
+  end
+
+  should "the width in video tag be defined for any video url" do
+    block.url='http://www.vmsd.com/98979.mp4'
+    block.save
+    get :index
+
+    assert_tag :tag => 'video', :attributes => {:width => '400px'}
+  end
+
+  should 'the heigth in iframe tag be defined' do
+    block.url='youtube.com/?v=XXXXX'
+    block.save
+    get :index
+
+    assert_tag :tag => 'iframe', :attributes => {:height => '315px'}
+  end
+
+  should 'display youtube videos' do
+    block.url='youtube.com/?v=XXXXX'
+    block.save
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'video-block-data'}, :descendant => { :tag => 'div', :attributes => {:class => 'youtube'} }
+  end
+
+  should 'display vimeo videos' do
+    block.url='http://vimeo.com/98979'
+    block.save
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'video-block-data'}, :descendant => { :tag => 'div', :attributes => {:class => 'vimeo'} }
+  end
+
+  should 'display other videos' do
+    block.url='http://www.vmsd.com/98979.mp4'
+    block.save
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'video-block-data'}, :descendant => { :tag => 'div', :attributes => {:class => 'video'} }
+  end
+
+  should 'display a message to register a new url' do
+    block.url='http://www.vmsd.com/test.pdf'
+    block.save
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:class => 'video-block-data'}, :descendant => { :tag => 'span', :attributes => {:class => 'alert-block'} }
+  end
+
+
+end
@@ -0,0 +1,132 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class ProfileDesignController; def rescue_action(e) raise e end; end
+
+class ProfileDesignControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = ProfileDesignController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    user = create_user('testinguser')
+    login_as(user.login)
+    @profile = user.person
+    @environment = @profile.environment
+
+    @environment.enabled_plugins = ['VideoPlugin']
+    @environment.save!
+
+    VideoBlock.delete_all
+    @box1 = Box.create!(:owner => @profile)
+    @profile.boxes = [@box1]
+
+    @block = VideoBlock.new
+    @block.box = @box1
+    @block.save!
+
+    @profile.blocks<<@block
+    @profile.save!
+  end
+
+  attr_accessor :profile, :block
+
+  should 'display video-block-data class in profile block edition' do
+    block.url='youtube.com/?v=XXXXX'
+    block.save
+    get :index, :profile => profile.identifier
+
+    assert_tag :div, :attributes => {:class => 'video-block-data'}
+  end
+
+  should "display iframe tag in profile block edition on youtube url's" do
+    block.url='youtube.com/?v=XXXXX'
+    block.save
+    get :index, :profile => profile.identifier
+
+    assert_tag :tag => 'iframe'
+  end
+
+  should "the width in iframe tag be defined on youtube url's" do
+    block.url='youtube.com/?v=XXXXX'
+    block.save
+    get :index, :profile => profile.identifier
+
+    assert_tag :tag => 'iframe', :attributes => {:width => '400px'}
+  end
+
+  should "display iframe tag in profile block edition on vimeo url's" do
+    block.url='http://vimeo.com/98979'
+    block.save
+    get :index, :profile => profile.identifier
+
+    assert_tag :tag => 'iframe'
+  end
+
+  should "the width in iframe tag be defined on vimeo url's" do
+    block.url='http://vimeo.com/98979'
+    block.save
+    get :index, :profile => profile.identifier
+
+    assert_tag :tag => 'iframe', :attributes => {:width => '400px'}
+  end
+
+  should "display video tag in profile block edition for any video url" do
+    block.url='http://www.vmsd.com/98979.mp4'
+    block.save
+    get :index, :profile => profile.identifier
+
+    assert_tag :tag => 'video'
+  end
+
+  should "the width in video tag be defined for any video url" do
+    block.url='http://www.vmsd.com/98979.mp4'
+    block.save
+    get :index, :profile => profile.identifier
+
+    assert_tag :tag => 'video', :attributes => {:width => '400px'}
+  end
+
+  should 'the heigth in iframe tag be defined' do
+    block.url='youtube.com/?v=XXXXX'
+    block.save
+    get :index, :profile => profile.identifier
+
+    assert_tag :tag => 'iframe', :attributes => {:height => '315px'}
+  end
+
+  should 'display youtube videos' do
+    block.url='youtube.com/?v=XXXXX'
+    block.save
+    get :index, :profile => profile.identifier
+
+    assert_tag :tag => 'div', :attributes => {:class => 'video-block-data'}, :descendant => { :tag => 'div', :attributes => {:class => 'youtube'} }
+  end
+
+  should 'display vimeo videos' do
+    block.url='http://vimeo.com/98979'
+    block.save
+    get :index, :profile => profile.identifier
+
+    assert_tag :tag => 'div', :attributes => {:class => 'video-block-data'}, :descendant => { :tag => 'div', :attributes => {:class => 'vimeo'} }
+  end
+
+  should 'display other videos' do
+    block.url='http://www.vmsd.com/98979.mp4'
+    block.save
+    get :index, :profile => profile.identifier
+
+    assert_tag :tag => 'div', :attributes => {:class => 'video-block-data'}, :descendant => { :tag => 'div', :attributes => {:class => 'video'} }
+  end
+
+  should 'display a messagem to register a new url' do
+    block.url='http://www.vmsd.com/test.pdf'
+    block.save
+    get :index, :profile => profile.identifier
+
+    assert_tag :tag => 'div', :attributes => {:class => 'video-block-data'}, :descendant => { :tag => 'span', :attributes => {:class => 'alert-block'} }
+  end
+
+
+end
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,218 @@
+require File.dirname(__FILE__) + '/../test_helper'
+class VideoBlockTest < ActiveSupport::TestCase
+
+  ### Tests for YouTube
+
+  should "is_youtube return true when the url contains http://youtube.com" do
+    block = VideoBlock.new
+    block.url = "http://youtube.com/?v=XXXXX"
+    assert block.is_youtube?
+  end
+
+  should "is_youtube return true when the url contains https://youtube.com" do
+    block = VideoBlock.new
+    block.url = "https://youtube.com/?v=XXXXX"
+    assert block.is_youtube?
+  end
+
+  should "is_youtube return true when the url contains https://www.youtube.com" do
+    block = VideoBlock.new
+    block.url = "https://www.youtube.com/?v=XXXXX"
+    assert block.is_youtube?
+  end
+
+  should "is_youtube return true when the url contains www.youtube.com" do
+    block = VideoBlock.new
+    block.url = "www.youtube.com/?v=XXXXX"
+    assert block.is_youtube?
+  end
+
+  should "is_youtube return true when the url contains youtube.com" do
+    block = VideoBlock.new
+    block.url = "youtube.com/?v=XXXXX"
+    assert block.is_youtube?
+  end
+
+  should "is_youtube return false when the url not contains youtube video ID" do
+    block = VideoBlock.new
+    block.url = "youtube.com/"
+    assert !block.is_youtube?
+  end
+
+  should "is_youtube return false when the url contains empty youtube video ID" do
+    block = VideoBlock.new
+    block.url = "youtube.com/?v="
+    assert !block.is_youtube?
+  end
+
+  should "is_youtube return false when the url contains an invalid youtube link" do
+    block = VideoBlock.new
+    block.url = "http://www.yt.com/?v=XXXXX"
+    assert !block.is_youtube?
+  end
+
+  should "format embed video for youtube videos" do
+    block = VideoBlock.new
+    block.url = "youtube.com/?v=XXXXX"
+    assert_match /\/\/www.youtube-nocookie.com\/embed/, block.format_embed_video_url_for_youtube
+  end
+
+  should "format embed video return nil if is not a youtube url" do
+    block = VideoBlock.new
+    block.url = "http://www.yt.com/?v=XXXXX"
+    assert_nil block.format_embed_video_url_for_youtube
+  end
+
+  should "extract youtube id from youtube video url's if it's a valid youtube full url" do
+    block = VideoBlock.new
+    id = 'oi43jre2d2'
+    block.url = "youtube.com/?v=#{id}"
+    assert_equal id, block.send('extract_youtube_id')
+  end
+
+  should "extract youtube id from youtube video url's if it's a valid youtube short url" do
+    block = VideoBlock.new
+    id = 'oi43jre2d2'
+    block.url = "youtu.be/#{id}"
+    assert_equal id, block.send('extract_youtube_id')
+  end
+
+  should "extract_youtube_id return nil if the url it's not a valid youtube url" do
+    block = VideoBlock.new
+    block.url = "http://www.yt.com/?v=XXXXX"
+    assert_nil block.send('extract_youtube_id')
+  end
+
+  should "extract_youtube_id return nil if youtue url there is no id" do
+    block = VideoBlock.new
+    block.url = "youtube.com/"
+    assert_nil block.send('extract_youtube_id')
+  end
+
+  #### Tests for Vimeo Videos
+
+  should "is_vimeo return true when the url contains http://vimeo.com" do
+    block = VideoBlock.new
+    block.url = "http://vimeo.com/98979"
+    assert block.is_vimeo?
+  end
+
+  should "is_vimeo return true when the url contains https://vimeo.com" do
+    block = VideoBlock.new
+    block.url = "https://vimeo.com/989798"
+    assert block.is_vimeo?
+  end
+
+  should "is_vimeo return true when the url contains https://www.vimeo.com" do
+    block = VideoBlock.new
+    block.url = "https://www.vimeo.com/98987"
+    assert block.is_vimeo?
+  end
+
+  should "is_vimeo return true when the url contains www.vimeo.com" do
+    block = VideoBlock.new
+    block.url = "www.vimeo.com/989798"
+    assert block.is_vimeo?
+  end
+
+  should "is_vimeo return true when the url contains vimeo.com" do
+    block = VideoBlock.new
+    block.url = "vimeo.com/09898"
+    assert block.is_vimeo?
+  end
+
+  should "is_vimeo return false when the url not contains vimeo video ID" do
+    block = VideoBlock.new
+    block.url = "vimeo.com/home"
+    assert !block.is_vimeo?
+  end
+
+  should "is_vimeo return false when the url contains empty vimeo video ID" do
+    block = VideoBlock.new
+    block.url = "vimeo.com/"
+    assert !block.is_vimeo?
+  end
+
+  should "is_vimeo return false when the url contains an invalid vimeo link" do
+    block = VideoBlock.new
+    block.url = "http://www.vmsd.com/98979"
+    assert !block.is_vimeo?
+  end
+
+  should "format embed video for vimeo videos" do
+    block = VideoBlock.new
+    block.url = "vimeo.com/09898"
+    assert_match /\/\/player.vimeo.com\/video\/[[:digit:]]+/, block.format_embed_video_url_for_vimeo
+  end
+
+  should "format embed video return nil if is not a vimeo url" do
+    block = VideoBlock.new
+    block.url = "http://www.yt.com/?v=XXXXX"
+    assert_nil block.format_embed_video_url_for_vimeo
+  end
+
+  should "extract vimeo id from vimeo video url's if it's a valid vimeo url" do
+    block = VideoBlock.new
+    id = '23048239432'
+    block.url = "vimeo.com/#{id}"
+    assert_equal id, block.send('extract_vimeo_id')
+  end
+
+  should "extract_vimeo_id return nil if the url it's not a valid vimeo url" do
+    block = VideoBlock.new
+    block.url = "http://www.yt.com/XXXXX"
+    assert_nil block.send('extract_vimeo_id')
+  end
+
+  should "extract_vimeo_id return nil if vimeo url there is no id" do
+    block = VideoBlock.new
+    block.url = "vimeo.com/"
+    assert_nil block.send('extract_youtube_id')
+  end
+
+  # Other video formats
+  should "is_video return true if url ends with mp4" do
+    block = VideoBlock.new
+    block.url = "http://www.vmsd.com/98979.mp4"
+    assert block.is_video_file?
+  end
+
+  should "is_video return true if url ends with ogg" do
+    block = VideoBlock.new
+    block.url = "http://www.vmsd.com/98979.ogg"
+    assert block.is_video_file?
+  end
+
+  should "is_video return true if url ends with ogv" do
+    block = VideoBlock.new
+    block.url = "http://www.vmsd.com/98979.ogv"
+    assert block.is_video_file?
+  end
+
+  should "is_video return true if url ends with webm" do
+    block = VideoBlock.new
+    block.url = "http://www.vmsd.com/98979.webm"
+    assert block.is_video_file?
+  end
+
+  should "is_video return false if url ends without mp4, ogg, ogv, webm" do
+    block = VideoBlock.new
+    block.url = "http://www.vmsd.com/98979.mp4r"
+    assert !block.is_video_file?
+    block.url = "http://www.vmsd.com/98979.oggr"
+    assert !block.is_video_file?
+    block.url = "http://www.vmsd.com/98979.ogvr"
+    assert !block.is_video_file?
+    block.url = "http://www.vmsd.com/98979.webmr"
+    assert !block.is_video_file?
+  end
+
+  should 'display video block partial' do
+    block = VideoBlock.new
+    self.expects(:render).with(:file => 'video_block', :locals => {
+        :block => block
+    })
+    instance_eval(& block.content)
+  end
+
+end
@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../test_helper'
+class VideoPluginTest < ActiveSupport::TestCase
+
+  should "return VideoBlock in extra_blocks class method" do
+    assert  VideoPlugin.extra_blocks.keys.include?(VideoBlock)
+  end
+
+end
@@ -0,0 +1,3 @@
+<video controls preload="auto" width='<%="#{width}px"%>' height='<%="#{height}px"%>'>
+    <source src=<%= "#{url}" %>>
+</video>
@@ -0,0 +1 @@
+<iframe width='<%="#{width}px"%>' height='<%="#{height}px"%>' src='<%= "#{url}" %>' frameborder="0" allowfullscreen></iframe>
@@ -0,0 +1,11 @@
+<label for="url" class="formlabel"> Video URL: </label>
+
+<div class="formfield type-text">
+  <%= text_field_tag 'block[url]', @block.url, :class => 'video-url', :maxlength => 255 %>
+</div>
+<div class="formfield type-text">
+  <label for="width" class="formlabel"> Width: </label>
+  <%= text_field_tag 'block[width]', @block.width, :size => 7, :class => 'video-width', :maxlength => 5 %>
+  <label for="height" class="formlabel"> Height: </label>
+  <%= text_field_tag 'block[height]', @block.height, :size => 7, :class => 'video-height', :maxlength => 5 %>
+</div>
@@ -0,0 +1 @@
+box_organizer
 \ No newline at end of file
@@ -0,0 +1 @@
+box_organizer
 \ No newline at end of file
@@ -0,0 +1,21 @@
+<h3 class="block-title">
+  <span><%=block.title%></span>
+</h3>
+<div class="video-block-data">
+  <% if block.is_youtube? %>
+    <div class='youtube'>
+      <%= render :partial => 'box_organizer/iframe_video_block', :locals => { :url => block.format_embed_video_url_for_youtube, :width => block.width, :height => block.height }%>
+    </div>
+  <% elsif block.is_vimeo? %>
+    <div class='vimeo'>
+      <%= render :partial => 'box_organizer/iframe_video_block', :locals => { :url => block.format_embed_video_url_for_vimeo, :width => block.width, :height => block.height }%>
+    </div>
+  <% elsif block.is_video_file? %>
+    <div class='video'>
+      <%= render :partial => 'box_organizer/html5_video_block', :locals => { :url => block.url, :width => block.width, :height => block.height }%>
+    </div>
+  <% else %>
+    <span class='alert-block'><%= _("Register a valid url (Vimeo, Youtube, video files)") %></span>
+  <% end %>
+
+</div>
@@ -1,52 +0,0 @@
-.msie6 .icon-edit      { background-image: url(ie6/Tango/16x16/apps/text-editor.gif) }
-.msie6 .icon-home      { background-image: url(ie6/Tango/16x16/actions/go-home.gif)          }
-.msie6 .icon-new,
-.msie6 .icon-suggest   { background-image: url(ie6/Tango/16x16/actions/filenew.gif)              }
-.msie6 .icon-close     { background-image: url(ie6/Tango/16x16/actions/gtk-cancel.gif)           }
-.msie6 .icon-newfolder { background-image: url(ie6/Tango/16x16/actions/folder-new.gif) }
-.msie6 .icon-save      { background-image: url(ie6/Tango/16x16/actions/filesave.gif)             }
-.msie6 .icon-send      { background-image: url(ie6/Tango/16x16/actions/stock_mail-forward.gif)             }
-.msie6 .icon-cancel    { background-image: url(ie6/Tango/16x16/actions/gtk-cancel.gif)           }
-.msie6 .icon-person    { background-image: url(ie6/Tango/16x16/apps/system-config-users.gif)           }
-.msie6 .icon-product    { background-image: url(ie6/Tango/16x16/mimetypes/package.gif)          }
-.msie6 .icon-delete    { background-image: url(ie6/Tango/16x16/places/user-trash.gif) }
-.msie6 .icon-back      { background-image: url(ie6/Tango/16x16/actions/back.gif)          }
-.msie6 .icon-next      { background-image: url(ie6/Tango/16x16/actions/go-next.gif)  }
-.msie6 .icon-add       { background-image: url(ie6/Tango/16x16/actions/add.gif)              }
-.msie6 .icon-more      { background-image: url(ie6/Tango/16x16/actions/add.gif)              }
-.msie6 .icon-up        { background-image: url(ie6/Tango/16x16/actions/go-up.gif)            }
-.msie6 .icon-down      { background-image: url(ie6/Tango/16x16/actions/go-down.gif)          }
-.msie6 .icon-left      { background-image: url(ie6/Tango/16x16/actions/go-previous.gif)          }
-.msie6 .icon-right     { background-image: url(ie6/Tango/16x16/actions/go-next.gif)         }
-.msie6 .icon-up-disabled        { background-image: url(ie6/Tango/16x16/actions/go-up.gif); opacity: 0.25; filter:alpha(opacity=25); }
-.msie6 .icon-down-disabled      { background-image: url(ie6/Tango/16x16/actions/go-down.gif); opacity: 0.25; filter:alpha(opacity=25);         }
-.msie6 .icon-left-disabled      { background-image: url(ie6/Tango/16x16/actions/go-previous.gif); opacity: 0.25; filter:alpha(opacity=25);          }
-.msie6 .icon-right-disabled     { background-image: url(ie6/Tango/16x16/actions/go-next.gif); opacity: 0.25; filter:alpha(opacity=25);         }
-.msie6 .icon-up-red    { background-image: url(ie6/mod/16x16/actions/go-up-red.gif)        }
-.msie6 .icon-forward   { background-image: url(ie6/Tango/16x16/actions/go-next.gif)       }
-.msie6 .icon-search    { background-image: url(ie6/Tango/16x16/actions/search.gif)           }
-.msie6 .icon-ok        { background-image: url(ie6/Tango/16x16/actions/media-playback-start.gif)               }
-.msie6 .icon-login     { background-image: url(ie6/mod/16x16/actions/log-in.gif)              }
-.msie6 .icon-help      { background-image: url(ie6/Tango/16x16/apps/gnome-help.gif)                }
-.msie6 .icon-firefox   { background-image: url(firefox-24x24.gif)       }
-.msie6 .icon-help32on  { background-image: url(ie6/Tango/32x32/apps/gnome-help.gif)    }
-.msie6 .icon-help32off { background-image: url(ie6/mod/32x32/apps/gnome-help-red.gif)   }
-.msie6 .icon-spread    { background-image: url(ie6/mod/16x16/actions/spread.gif) }
-.msie6 .icon-todo            { background-image: url(ie6/Tango/16x16/actions/stock_paste.gif)          }
-.msie6 .icon-eyes            { background-image: url(ie6/Tango/16x16/actions/gtk-print-preview.gif)          }
-.msie6 .icon-menu-home       { background-image: url(ie6/Tango/16x16/actions/go-home.gif)             }
-.msie6 .icon-menu-product    { background-image: url(ie6/Tango/16x16/mimetypes/package.gif)          }
-.msie6 .icon-menu-enterprise { background-image: url(ie6/Tango/16x16/actions/go-home.gif)       }
-.msie6 .icon-menu-community  { background-image: url(ie6/Tango/16x16/apps/system-config-users.gif)        }
-.msie6 .icon-menu-ctrl-panel { background-image: url(ie6/Tango/16x16/categories/preferences-desktop.gif)          }
-.msie6 .icon-menu-admin      { background-image: url(ie6/Tango/16x16/categories/preferences-system.gif)          }
-.msie6 .icon-menu-my-groups { background-image: url(ie6/Tango/16x16/apps/system-config-users.gif)    }
-.msie6 .icon-menu-login      { background-image: url(ie6/mod/16x16/actions/log-in.gif)            }
-.msie6 .icon-menu-logout     { background-image: url(ie6/Tango/16x16/actions/exit.gif)             }
-.msie6 .icon-menu-search     { background-image: url(ie6/Tango/16x16/actions/search.gif)           }
-.msie6 .icon-menu-events     { background-image: url(ie6/Tango/16x16/mimetypes/stock_calendar.gif)         }
-.msie6 .icon-menu-articles   { background-image: url(ie6/Tango/16x16/apps/text-editor.gif)             }
-.msie6 .icon-menu-people     { background-image: url(ie6/mod/16x16/apps/user.gif)            }
-.msie6 .icon-menu-mail       { background-image: url(ie6/Tango/16x16/apps/email.gif)             }
-.msie6 .icon-upload-file     { background-image: url(ie6/Tango/16x16/actions/filesave.gif)            }
-.msie6 .icon-slideshow       { background-image: url(ie6/Tango/16x16/mimetypes/x-office-presentation.gif)           }
@@ -0,0 +1,1112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   overflow="visible"
+   enable-background="new 0 0 128 129.396"
+   xml:space="preserve"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="go-home-not.svg"
+   version="1.0"
+   inkscape:export-filename="/home/85902810515/projetos/noosfero/public/designs/icons/tango/mod/16x16/actions/go-home-not.png"
+   inkscape:export-xdpi="30.01"
+   inkscape:export-ydpi="30.01"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   style="display:inline;overflow:visible"><metadata
+   id="metadata367"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><cc:license
+         rdf:resource="http://creativecommons.org/licenses/publicdomain/" /><dc:title></dc:title><dc:creator><cc:Agent><dc:title>Jakub Steiner</dc:title></cc:Agent></dc:creator><dc:source>http://jimmac.musichall.cz</dc:source><dc:subject><rdf:Bag><rdf:li>home</rdf:li><rdf:li>return</rdf:li><rdf:li>go</rdf:li><rdf:li>default</rdf:li><rdf:li>user</rdf:li><rdf:li>directory</rdf:li></rdf:Bag></dc:subject><dc:contributor><cc:Agent><dc:title>Tuomas Kuosmanen</dc:title></cc:Agent></dc:contributor></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/licenses/publicdomain/"><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /></cc:License></rdf:RDF></metadata><defs
+   id="defs365"><linearGradient
+     id="linearGradient4711"><stop
+       style="stop-color:#f87171;stop-opacity:1;"
+       offset="0"
+       id="stop4713" /><stop
+       style="stop-color:#fb1f22;stop-opacity:1;"
+       offset="1"
+       id="stop4715" /></linearGradient><linearGradient
+     id="linearGradient4700"><stop
+       style="stop-color:#b20000;stop-opacity:1;"
+       offset="0"
+       id="stop4702" /><stop
+       style="stop-color:#db0000;stop-opacity:1;"
+       offset="1"
+       id="stop4704" /></linearGradient><linearGradient
+     id="linearGradient4694"
+     osb:paint="solid"><stop
+       style="stop-color:#2042e2;stop-opacity:1;"
+       offset="0"
+       id="stop4696" /></linearGradient><inkscape:perspective
+     sodipodi:type="inkscape:persp3d"
+     inkscape:vp_x="0 : 24 : 1"
+     inkscape:vp_y="0 : 1000 : 0"
+     inkscape:vp_z="48 : 24 : 1"
+     inkscape:persp3d-origin="24 : 16 : 1"
+     id="perspective92" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient5031"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><linearGradient
+     inkscape:collect="always"
+     id="linearGradient5060"><stop
+       style="stop-color:black;stop-opacity:1;"
+       offset="0"
+       id="stop5062" /><stop
+       style="stop-color:black;stop-opacity:0;"
+       offset="1"
+       id="stop5064" /></linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient5029"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><linearGradient
+     id="linearGradient5048"><stop
+       style="stop-color:black;stop-opacity:0;"
+       offset="0"
+       id="stop5050" /><stop
+       id="stop5056"
+       offset="0.5"
+       style="stop-color:black;stop-opacity:1;" /><stop
+       style="stop-color:black;stop-opacity:0;"
+       offset="1"
+       id="stop5052" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5048"
+     id="linearGradient5027"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+     x1="302.85715"
+     y1="366.64789"
+     x2="302.85715"
+     y2="609.50507" /><linearGradient
+     id="linearGradient2406"><stop
+       style="stop-color:#7c7e79;stop-opacity:1;"
+       offset="0"
+       id="stop2408" /><stop
+       id="stop2414"
+       offset="0.1724138"
+       style="stop-color:#848681;stop-opacity:1;" /><stop
+       style="stop-color:#898c86;stop-opacity:1;"
+       offset="1"
+       id="stop2410" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2390"><stop
+       style="stop-color:#919191;stop-opacity:1;"
+       offset="0"
+       id="stop2392" /><stop
+       style="stop-color:#919191;stop-opacity:0;"
+       offset="1"
+       id="stop2394" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2378"><stop
+       style="stop-color:#575757;stop-opacity:1;"
+       offset="0"
+       id="stop2380" /><stop
+       style="stop-color:#575757;stop-opacity:0;"
+       offset="1"
+       id="stop2382" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2368"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop2370" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop2372" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2349"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop2351" /><stop
+       style="stop-color:#000000;stop-opacity:0;"
+       offset="1"
+       id="stop2353" /></linearGradient><linearGradient
+     id="linearGradient2341"><stop
+       id="stop2343"
+       offset="0"
+       style="stop-color:#000000;stop-opacity:1;" /><stop
+       id="stop2345"
+       offset="1"
+       style="stop-color:#000000;stop-opacity:0;" /></linearGradient><linearGradient
+     id="linearGradient2329"><stop
+       style="stop-color:#000000;stop-opacity:0.18556701;"
+       offset="0"
+       id="stop2331" /><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="1"
+       id="stop2333" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2319"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop2321" /><stop
+       style="stop-color:#000000;stop-opacity:0;"
+       offset="1"
+       id="stop2323" /></linearGradient><linearGradient
+     id="linearGradient2307"><stop
+       style="stop-color:#edd400;stop-opacity:1;"
+       offset="0"
+       id="stop2309" /><stop
+       style="stop-color:#998800;stop-opacity:1;"
+       offset="1"
+       id="stop2311" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2299"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop2301" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop2303" /></linearGradient><linearGradient
+     id="XMLID_2_"
+     gradientUnits="userSpaceOnUse"
+     x1="80.223602"
+     y1="117.5205"
+     x2="48.046001"
+     y2="59.7995"
+     gradientTransform="matrix(0.314683,0,0,0.314683,4.128264,3.742874)">
+				<stop
+   offset="0"
+   style="stop-color:#CCCCCC"
+   id="stop17" />
+				<stop
+   offset="0.9831"
+   style="stop-color:#FFFFFF"
+   id="stop19" />
+				<midPointStop
+   offset="0"
+   style="stop-color:#CCCCCC"
+   id="midPointStop48" />
+				<midPointStop
+   offset="0.5"
+   style="stop-color:#CCCCCC"
+   id="midPointStop50" />
+				<midPointStop
+   offset="0.9831"
+   style="stop-color:#FFFFFF"
+   id="midPointStop52" />
+			</linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#XMLID_2_"
+     id="linearGradient1514"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.336922,0,0,0.166888,17.98288,15.46151)"
+     x1="52.006104"
+     y1="166.1331"
+     x2="14.049017"
+     y2="-42.218513" /><linearGradient
+     id="XMLID_39_"
+     gradientUnits="userSpaceOnUse"
+     x1="64.387703"
+     y1="65.124001"
+     x2="64.387703"
+     y2="35.569"
+     gradientTransform="matrix(0.354101,0,0,0.354101,1.638679,-0.08364921)">
+						<stop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="stop336" />
+						<stop
+   offset="0.8539"
+   style="stop-color:#FF6200"
+   id="stop338" />
+						<stop
+   offset="1"
+   style="stop-color:#F25D00"
+   id="stop340" />
+						<midPointStop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="midPointStop335" />
+						<midPointStop
+   offset="0.5"
+   style="stop-color:#FFFFFF"
+   id="midPointStop337" />
+						<midPointStop
+   offset="0.8539"
+   style="stop-color:#FF6200"
+   id="midPointStop339" />
+						<midPointStop
+   offset="0.5"
+   style="stop-color:#FF6200"
+   id="midPointStop341" />
+						<midPointStop
+   offset="1"
+   style="stop-color:#F25D00"
+   id="midPointStop343" />
+					</linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2299"
+     id="radialGradient2305"
+     cx="7.5326638"
+     cy="24.202574"
+     fx="7.5326638"
+     fy="24.202574"
+     r="8.2452126"
+     gradientTransform="matrix(4.100086,0,0,4.201322,-25.41506,-78.53967)"
+     gradientUnits="userSpaceOnUse" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2307"
+     id="radialGradient2313"
+     cx="19.985598"
+     cy="36.77816"
+     fx="19.985598"
+     fy="36.77816"
+     r="1.0821035"
+     gradientTransform="matrix(1.125263,0,0,0.982744,-3.428678,0.565787)"
+     gradientUnits="userSpaceOnUse" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2319"
+     id="radialGradient2325"
+     cx="20.443665"
+     cy="37.425831"
+     fx="20.443665"
+     fy="37.425831"
+     r="1.0821035"
+     gradientTransform="matrix(1.125263,0,0,0.982744,-3.428678,0.731106)"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2329"
+     id="linearGradient2335"
+     x1="17.602522"
+     y1="26.057423"
+     x2="17.682528"
+     y2="32.654099"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.898789,0,0,1.071914,0.478025,-2.080838)" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2341"
+     id="radialGradient2339"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(4.100086,0,0,-4.201322,-5.198109,105.3535)"
+     cx="11.68129"
+     cy="19.554111"
+     fx="11.68129"
+     fy="19.554111"
+     r="8.2452126" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2349"
+     id="radialGradient2355"
+     cx="24.023088"
+     cy="40.56913"
+     fx="24.023088"
+     fy="40.56913"
+     r="16.28684"
+     gradientTransform="matrix(1,0,0,0.43125,0,23.07369)"
+     gradientUnits="userSpaceOnUse" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2368"
+     id="radialGradient2374"
+     cx="29.913452"
+     cy="30.442923"
+     fx="29.913452"
+     fy="30.442923"
+     r="4.001883"
+     gradientTransform="matrix(3.751495,0,0,3.147818,-82.00907,-65.70704)"
+     gradientUnits="userSpaceOnUse" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2378"
+     id="radialGradient2384"
+     cx="24.195112"
+     cy="10.577631"
+     fx="24.195112"
+     fy="10.577631"
+     r="15.242914"
+     gradientTransform="matrix(1.125263,-3.585417e-8,4.269819e-8,1.340059,-3.006704,1.355395)"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2390"
+     id="linearGradient2396"
+     x1="30.603519"
+     y1="37.337803"
+     x2="30.603519"
+     y2="36.112415"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.263867,0,0,0.859794,-6.499556,8.390924)" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2406"
+     id="linearGradient2412"
+     x1="17.850183"
+     y1="28.939463"
+     x2="19.040216"
+     y2="41.03223"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.888785,0,0,1.08932,2.41099,-1.524336)" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient9647"
+     id="radialGradient2239"
+     cx="24.30225"
+     cy="33.30225"
+     fx="24.30225"
+     fy="33.30225"
+     r="12.30225"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.693981,0,0,1.693981,-16.86529,-25.11111)" /><linearGradient
+     id="linearGradient9647"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop9649" /><stop
+       style="stop-color:#dbdbdb;stop-opacity:1;"
+       offset="1"
+       id="stop9651" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2256"
+     id="linearGradient2262"
+     x1="21.75"
+     y1="15.80225"
+     x2="24.30225"
+     y2="35.05225"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(0,-2)" /><linearGradient
+     id="linearGradient2256"><stop
+       style="stop-color:#ff0202;stop-opacity:1;"
+       offset="0"
+       id="stop2258" /><stop
+       style="stop-color:#ff9b9b;stop-opacity:1;"
+       offset="1"
+       id="stop2260" /></linearGradient><radialGradient
+     r="12.30225"
+     fy="33.30225"
+     fx="24.30225"
+     cy="33.30225"
+     cx="24.30225"
+     gradientTransform="matrix(1.693981,0,0,1.693981,-5.6354248,-11.964506)"
+     gradientUnits="userSpaceOnUse"
+     id="radialGradient3047"
+     xlink:href="#linearGradient9647"
+     inkscape:collect="always" /><linearGradient
+     y2="35.05225"
+     x2="24.30225"
+     y1="15.80225"
+     x1="21.75"
+     gradientTransform="translate(11.229865,11.146604)"
+     gradientUnits="userSpaceOnUse"
+     id="linearGradient3049"
+     xlink:href="#linearGradient2256"
+     inkscape:collect="always" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient21644"
+     id="radialGradient21650"
+     cx="25.125"
+     cy="36.75"
+     fx="25.125"
+     fy="36.75"
+     r="15.75"
+     gradientTransform="matrix(1,0,0,0.595238,0,14.875)"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     id="linearGradient21644"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop21646" /><stop
+       style="stop-color:#000000;stop-opacity:0;"
+       offset="1"
+       id="stop21648" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4981"
+     id="linearGradient4987"
+     x1="23.995985"
+     y1="20.105337"
+     x2="41.047836"
+     y2="37.959785"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)" /><linearGradient
+     id="linearGradient4981"><stop
+       style="stop-color:#cc0000;stop-opacity:1;"
+       offset="0"
+       id="stop4983" /><stop
+       style="stop-color:#b30000;stop-opacity:1.0000000;"
+       offset="1.0000000"
+       id="stop4985" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient11780"
+     id="linearGradient2057"
+     x1="15.737001"
+     y1="12.5036"
+     x2="53.570126"
+     y2="47.374317"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)" /><linearGradient
+     id="linearGradient11780"><stop
+       style="stop-color:#ff8b8b;stop-opacity:1.0000000;"
+       offset="0.0000000"
+       id="stop11782" /><stop
+       style="stop-color:#ec1b1b;stop-opacity:1.0000000;"
+       offset="1.0000000"
+       id="stop11784" /></linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2248"
+     id="radialGradient2254"
+     cx="16.75"
+     cy="10.666344"
+     fx="16.75"
+     fy="10.666344"
+     r="21.25"
+     gradientTransform="matrix(4.154957,0,0,3.198723,-29.818914,-1.9585976)"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2248"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop2250" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop2252" /></linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient9647-3"
+     id="radialGradient2239-7"
+     cx="24.30225"
+     cy="33.30225"
+     fx="24.30225"
+     fy="33.30225"
+     r="12.30225"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.693981,0,0,1.693981,6.1613255,-3.5604976)" /><linearGradient
+     id="linearGradient9647-3"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop9649-3" /><stop
+       style="stop-color:#dbdbdb;stop-opacity:1;"
+       offset="1"
+       id="stop9651-2" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2256-0"
+     id="linearGradient2262-5"
+     x1="21.75"
+     y1="15.80225"
+     x2="24.30225"
+     y2="35.05225"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)" /><linearGradient
+     id="linearGradient2256-0"><stop
+       style="stop-color:#ff0202;stop-opacity:1;"
+       offset="0"
+       id="stop2258-2" /><stop
+       style="stop-color:#ff9b9b;stop-opacity:1;"
+       offset="1"
+       id="stop2260-8" /></linearGradient><radialGradient
+     r="15.75"
+     fy="36.75"
+     fx="25.125"
+     cy="36.75"
+     cx="25.125"
+     gradientTransform="matrix(1,0,0,0.595238,0,14.875)"
+     gradientUnits="userSpaceOnUse"
+     id="radialGradient3090"
+     xlink:href="#linearGradient21644"
+     inkscape:collect="always" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient21644"
+     id="radialGradient3205"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1,0,0,0.595238,0,14.875)"
+     cx="25.125"
+     cy="36.75"
+     fx="25.125"
+     fy="36.75"
+     r="15.75" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4981"
+     id="linearGradient3207"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="23.995985"
+     y1="20.105337"
+     x2="41.047836"
+     y2="37.959785" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient11780"
+     id="linearGradient3209"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="15.737001"
+     y1="12.5036"
+     x2="53.570126"
+     y2="47.374317" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2248"
+     id="radialGradient3211"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(4.154957,0,0,3.198723,-29.818914,-1.9585976)"
+     cx="16.75"
+     cy="10.666344"
+     fx="16.75"
+     fy="10.666344"
+     r="21.25" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient9647-3"
+     id="radialGradient3213"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.693981,0,0,1.693981,6.1613255,-3.5604976)"
+     cx="24.30225"
+     cy="33.30225"
+     fx="24.30225"
+     fy="33.30225"
+     r="12.30225" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2256-0"
+     id="linearGradient3215"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="21.75"
+     y1="15.80225"
+     x2="24.30225"
+     y2="35.05225" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient21644"
+     id="radialGradient3218"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.173803,0,0,0.3571428,17.76075,50.050612)"
+     cx="25.125"
+     cy="36.75"
+     fx="25.125"
+     fy="36.75"
+     r="15.75" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4981"
+     id="linearGradient3221"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="23.995985"
+     y1="20.105337"
+     x2="41.047836"
+     y2="37.959785" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient11780"
+     id="linearGradient3224"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="15.737001"
+     y1="12.5036"
+     x2="53.570126"
+     y2="47.374317" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2248"
+     id="radialGradient3227"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(4.154957,0,0,3.198723,-29.818914,-1.9585976)"
+     cx="16.75"
+     cy="10.666344"
+     fx="16.75"
+     fy="10.666344"
+     r="21.25" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient9647-3"
+     id="radialGradient3230"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.693981,0,0,1.693981,6.1613255,-3.5604976)"
+     cx="24.30225"
+     cy="33.30225"
+     fx="24.30225"
+     fy="33.30225"
+     r="12.30225" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2256-0"
+     id="linearGradient3232"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="21.75"
+     y1="15.80225"
+     x2="24.30225"
+     y2="35.05225" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient21644-3"
+     id="radialGradient3218-2"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.173803,0,0,0.3571428,17.76075,50.050612)"
+     cx="25.125"
+     cy="36.75"
+     fx="25.125"
+     fy="36.75"
+     r="15.75" /><linearGradient
+     inkscape:collect="always"
+     id="linearGradient21644-3"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop21646-9" /><stop
+       style="stop-color:#000000;stop-opacity:0;"
+       offset="1"
+       id="stop21648-9" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4981-1"
+     id="linearGradient3221-9"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="23.995985"
+     y1="20.105337"
+     x2="41.047836"
+     y2="37.959785" /><linearGradient
+     id="linearGradient4981-1"><stop
+       style="stop-color:#cc0000;stop-opacity:1;"
+       offset="0"
+       id="stop4983-4" /><stop
+       style="stop-color:#b30000;stop-opacity:1.0000000;"
+       offset="1.0000000"
+       id="stop4985-7" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient11780-3"
+     id="linearGradient3224-7"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="15.737001"
+     y1="12.5036"
+     x2="53.570126"
+     y2="47.374317" /><linearGradient
+     id="linearGradient11780-3"><stop
+       style="stop-color:#ff8b8b;stop-opacity:1.0000000;"
+       offset="0.0000000"
+       id="stop11782-9" /><stop
+       style="stop-color:#ec1b1b;stop-opacity:1.0000000;"
+       offset="1.0000000"
+       id="stop11784-6" /></linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2248-9"
+     id="radialGradient3227-6"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(4.154957,0,0,3.198723,-29.818914,-1.9585976)"
+     cx="16.75"
+     cy="10.666344"
+     fx="16.75"
+     fy="10.666344"
+     r="21.25" /><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2248-9"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop2250-3" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop2252-5" /></linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient9647-3-4"
+     id="radialGradient3230-9"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.693981,0,0,1.693981,6.1613255,-3.5604976)"
+     cx="24.30225"
+     cy="33.30225"
+     fx="24.30225"
+     fy="33.30225"
+     r="12.30225" /><linearGradient
+     id="linearGradient9647-3-4"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop9649-3-2" /><stop
+       style="stop-color:#dbdbdb;stop-opacity:1;"
+       offset="1"
+       id="stop9651-2-0" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2256-0-0"
+     id="linearGradient3232-1"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="21.75"
+     y1="15.80225"
+     x2="24.30225"
+     y2="35.05225" /><linearGradient
+     id="linearGradient2256-0-0"><stop
+       style="stop-color:#ff0202;stop-opacity:1;"
+       offset="0"
+       id="stop2258-2-7" /><stop
+       style="stop-color:#ff9b9b;stop-opacity:1;"
+       offset="1"
+       id="stop2260-8-0" /></linearGradient><radialGradient
+     r="12.30225"
+     fy="33.30225"
+     fx="24.30225"
+     cy="33.30225"
+     cx="24.30225"
+     gradientTransform="matrix(1.693981,0,0,1.693981,6.1613255,-3.5604976)"
+     gradientUnits="userSpaceOnUse"
+     id="radialGradient3276"
+     xlink:href="#linearGradient9647-3-4"
+     inkscape:collect="always" /><linearGradient
+     y2="35.05225"
+     x2="24.30225"
+     y1="15.80225"
+     x1="21.75"
+     gradientTransform="translate(23.026616,19.550612)"
+     gradientUnits="userSpaceOnUse"
+     id="linearGradient3278"
+     xlink:href="#linearGradient2256-0-0"
+     inkscape:collect="always" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient21644-3-0"
+     id="radialGradient3218-2-4"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.173803,0,0,0.3571428,17.76075,50.050612)"
+     cx="25.125"
+     cy="36.75"
+     fx="25.125"
+     fy="36.75"
+     r="15.75" /><linearGradient
+     id="linearGradient21644-3-0"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop21646-9-1" /><stop
+       style="stop-color:#000000;stop-opacity:0;"
+       offset="1"
+       id="stop21648-9-8" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4981-1-6"
+     id="linearGradient3221-9-6"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="23.995985"
+     y1="20.105337"
+     x2="41.047836"
+     y2="37.959785" /><linearGradient
+     id="linearGradient4981-1-6"><stop
+       style="stop-color:#cc0000;stop-opacity:1;"
+       offset="0"
+       id="stop4983-4-0" /><stop
+       style="stop-color:#b30000;stop-opacity:1.0000000;"
+       offset="1.0000000"
+       id="stop4985-7-7" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient11780-3-5"
+     id="linearGradient3224-7-4"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="15.737001"
+     y1="12.5036"
+     x2="53.570126"
+     y2="47.374317" /><linearGradient
+     id="linearGradient11780-3-5"><stop
+       style="stop-color:#ff8b8b;stop-opacity:1.0000000;"
+       offset="0.0000000"
+       id="stop11782-9-4" /><stop
+       style="stop-color:#ec1b1b;stop-opacity:1.0000000;"
+       offset="1.0000000"
+       id="stop11784-6-8" /></linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2248-9-9"
+     id="radialGradient3227-6-4"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(4.154957,0,0,3.198723,-29.818914,-1.9585976)"
+     cx="16.75"
+     cy="10.666344"
+     fx="16.75"
+     fy="10.666344"
+     r="21.25" /><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2248-9-9"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop2250-3-5" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop2252-5-3" /></linearGradient><radialGradient
+     r="12.30225"
+     fy="33.30225"
+     fx="24.30225"
+     cy="33.30225"
+     cx="24.30225"
+     gradientTransform="matrix(1.693981,0,0,1.693981,6.1613255,-3.5604976)"
+     gradientUnits="userSpaceOnUse"
+     id="radialGradient3276-7"
+     xlink:href="#linearGradient9647-3-4-6"
+     inkscape:collect="always" /><linearGradient
+     id="linearGradient9647-3-4-6"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop9649-3-2-7" /><stop
+       style="stop-color:#dbdbdb;stop-opacity:1;"
+       offset="1"
+       id="stop9651-2-0-1" /></linearGradient><linearGradient
+     y2="35.05225"
+     x2="24.30225"
+     y1="15.80225"
+     x1="21.75"
+     gradientTransform="translate(23.026616,19.550612)"
+     gradientUnits="userSpaceOnUse"
+     id="linearGradient3278-2"
+     xlink:href="#linearGradient2256-0-0-1"
+     inkscape:collect="always" /><linearGradient
+     id="linearGradient2256-0-0-1"><stop
+       style="stop-color:#ff0202;stop-opacity:1;"
+       offset="0"
+       id="stop2258-2-7-8" /><stop
+       style="stop-color:#ff9b9b;stop-opacity:1;"
+       offset="1"
+       id="stop2260-8-0-4" /></linearGradient><radialGradient
+     r="12.30225"
+     fy="33.30225"
+     fx="24.30225"
+     cy="33.30225"
+     cx="24.30225"
+     gradientTransform="matrix(1.693981,0,0,1.693981,6.1613255,-3.5604976)"
+     gradientUnits="userSpaceOnUse"
+     id="radialGradient3812"
+     xlink:href="#linearGradient9647-3-4-6"
+     inkscape:collect="always" /><linearGradient
+     y2="35.05225"
+     x2="24.30225"
+     y1="15.80225"
+     x1="21.75"
+     gradientTransform="translate(23.026616,19.550612)"
+     gradientUnits="userSpaceOnUse"
+     id="linearGradient3814"
+     xlink:href="#linearGradient2256-0-0-1"
+     inkscape:collect="always" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient9647-3-4-6"
+     id="radialGradient3886"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.85754753,0,0,0.85754753,16.064712,11.20392)"
+     cx="24.30225"
+     cy="33.30225"
+     fx="24.30225"
+     fy="33.30225"
+     r="12.30225" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2256-0-0-1"
+     id="linearGradient3888"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.50623208,0,0,0.50623208,24.602463,22.903505)"
+     x1="21.75"
+     y1="15.80225"
+     x2="24.30225"
+     y2="35.05225" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2248-9-9"
+     id="radialGradient3891"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.1094827,0,0,1.5765366,-2.293898,12.776643)"
+     cx="16.75"
+     cy="10.666344"
+     fx="16.75"
+     fy="10.666344"
+     r="21.25" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient11780-3-5"
+     id="linearGradient3894"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.50623208,0,0,0.50623208,24.602463,22.903505)"
+     x1="15.737001"
+     y1="12.5036"
+     x2="53.570126"
+     y2="47.374317" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4981-1-6"
+     id="linearGradient3897"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.50623208,0,0,0.50623208,24.602463,22.903505)"
+     x1="23.995985"
+     y1="20.105337"
+     x2="41.047836"
+     y2="37.959785" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient21644-3-0"
+     id="radialGradient3900"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.75877044,0,0,0.21650012,17.801926,37.031146)"
+     cx="25.125"
+     cy="36.75"
+     fx="25.125"
+     fy="36.75"
+     r="15.75" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4700"
+     id="linearGradient4706"
+     x1="42"
+     y1="40.46875"
+     x2="30.3125"
+     y2="29.09375"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4711"
+     id="linearGradient4717"
+     x1="29.3125"
+     y1="28.25"
+     x2="44.125"
+     y2="42.5625"
+     gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
+   inkscape:cy="18.229536"
+   inkscape:cx="35.718843"
+   inkscape:zoom="8"
+   inkscape:window-height="827"
+   inkscape:window-width="1440"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   borderopacity="0.21568627"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   inkscape:showpageshadow="false"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:current-layer="layer3"
+   fill="#555753"
+   showgrid="false"
+   stroke="#a40000"
+   showguides="true"
+   inkscape:guide-bbox="true"
+   inkscape:window-maximized="1" />
+	
+<g
+   inkscape:groupmode="layer"
+   id="layer1"
+   inkscape:label="Home"
+   style="display:inline"
+   sodipodi:insensitive="true"><g
+     style="display:inline;overflow:visible"
+     id="g3710"><g
+       transform="matrix(0.02158196,0,0,0.01859457,43.12251,41.63767)"
+       id="g5022"
+       style="display:inline"><rect
+         style="opacity:0.40206185;color:#000000;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         id="rect4173"
+         width="1339.6335"
+         height="478.35718"
+         x="-1559.2523"
+         y="-150.69685" /><path
+         inkscape:connector-curvature="0"
+         style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+         id="path5058"
+         sodipodi:nodetypes="cccc" /><path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc"
+         id="path5018"
+         d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+         style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" /></g><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc"
+       id="rect1512"
+       d="m 21.619576,8.1833733 5.957459,0 c 0.839732,0 13.886475,15.4353277 13.886475,16.3406587 l -0.443521,18.496745 c 0,0.905333 -0.67603,1.634177 -1.515762,1.634177 l -31.4572774,0 c -0.8397329,0 -1.5157625,-0.728844 -1.5157625,-1.634177 l 0.056478,-18.496745 c 0,-0.905331 14.1921789,-16.3406587 15.0319109,-16.3406587 z"
+       style="color:#000000;fill:url(#linearGradient1514);fill-opacity:1;fill-rule:nonzero;stroke:#757575;stroke-width:1.0000006;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" /><path
+       inkscape:connector-curvature="0"
+       d="m 46.963575,45.735573 -45.3248988,0 0,-45.32489746 45.3248988,0 0,45.32489746 z"
+       id="path5"
+       style="fill:none" /><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       clip-rule="evenodd"
+       d="m 23,29 -0.04574,15.090942 -11.842791,0 L 11,29 23,29 z"
+       id="path2327"
+       style="fill:url(#linearGradient2335);fill-opacity:1;fill-rule:evenodd" /><path
+       inkscape:connector-curvature="0"
+       style="opacity:0.3125;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 21.780459,9.405584 5.559097,0 c 0.783582,0 13.000869,14.399588 13.000869,15.244172 l -0.347158,18.212311 c 0,0.459259 -0.143737,0.653465 -0.512375,0.653465 l -31.3872026,0.01428 c -0.3686377,0 -0.5839636,-0.07992 -0.5839636,-0.45355 L 7.7250676,24.649756 c 0,-0.844584 13.2718124,-15.244172 14.0553914,-15.244172 z"
+       id="path2357"
+       sodipodi:nodetypes="ccccccccc" /><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc"
+       style="opacity:0.2;fill:url(#radialGradient2384);fill-opacity:1;fill-rule:evenodd"
+       id="path23"
+       d="M 7.2075295,27.943053 7.1532728,30.538247 25.521437,17.358993 40.807832,28.513421 40.879142,28.201707 24.508686,12.297576 7.2075295,27.943053 z"
+       clip-rule="evenodd" /><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       style="fill:url(#linearGradient2412);fill-opacity:1;fill-rule:evenodd"
+       id="path188"
+       d="m 22,30 0,14.090942 -9.811029,0 L 12,30 22,30 z"
+       clip-rule="evenodd" /><path
+       inkscape:connector-curvature="0"
+       clip-rule="evenodd"
+       d="m 19.576856,36.44767 c 0.67279,0 1.216616,0.474605 1.216616,1.058507 0,0.589811 -0.543826,1.068355 -1.216616,1.068355 -0.672272,0 -1.218686,-0.478544 -1.218686,-1.068355 5.15e-4,-0.583902 0.546414,-1.058507 1.218686,-1.058507 z"
+       id="path2315"
+       style="opacity:0.40909089;fill:url(#radialGradient2325);fill-opacity:1;fill-rule:evenodd" /><path
+       inkscape:connector-curvature="0"
+       style="fill:url(#radialGradient2313);fill-opacity:1;fill-rule:evenodd"
+       id="path217"
+       d="m 19.462314,35.932229 c 0.672789,0 1.216615,0.474605 1.216615,1.058507 0,0.589809 -0.543826,1.068353 -1.216615,1.068353 -0.672273,0 -1.218687,-0.478544 -1.218687,-1.068353 5.15e-4,-0.583902 0.546414,-1.058507 1.218687,-1.058507 z"
+       clip-rule="evenodd" /><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#XMLID_39_)"
+       id="path342"
+       d="m 24.447748,11.559337 18.92706,17.169868 0.494679,0.391991 0.403676,-0.171385 -0.37287,-0.761673 L 43.622679,27.964702 24.447748,12.392396 5.0582327,28.135731 4.8206309,28.279851 4.603921,28.986637 5.0373408,29.115885 5.4218948,28.807462 24.447748,11.559337 z" /><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc"
+       d="M 24.330168,2.2713382 2.4484294,20.372675 1.8237005,27.538603 3.8236367,29.602926 c 0,0 20.4073813,-17.157285 20.6240933,-17.327963 L 44.08027,29.818223 45.978694,27.494226 44.362903,20.382852 24.44773,2.1668788 24.330168,2.2713382 z"
+       id="path362"
+       style="fill:#ef2929;stroke:#a40000" /><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       id="path1536"
+       d="M 2.8413446,20.613129 2.5497894,27.236494 24.369219,8.980075 24.298891,3.0867443 2.8413446,20.613129 z"
+       style="opacity:0.40909089;color:#000000;fill:url(#radialGradient2305);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" /><path
+       inkscape:connector-curvature="0"
+       style="opacity:0.13636367;color:#000000;fill:url(#radialGradient2339);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="M 24.483763,8.7509884 24.583223,2.9098867 43.912186,20.56184 45.403998,27.062652 24.483763,8.7509884 z"
+       id="path2337"
+       sodipodi:nodetypes="ccccc" /><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc"
+       id="rect2361"
+       d="m 27.102228,27.719824 9.039995,0 c 0.770595,0 1.390967,0.62037 1.390967,1.390967 l -0.008,9.079221 c 0,0.770596 -0.596322,1.265969 -1.366918,1.265969 l -9.056083,0 c -0.770597,0 -1.390967,-0.620373 -1.390967,-1.390969 l 0,-8.954221 c 0,-0.770597 0.62037,-1.390967 1.390967,-1.390967 z"
+       style="opacity:0.31818183;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999934;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" /><rect
+       ry="0.38128215"
+       rx="0.38128215"
+       y="28.514256"
+       x="26.507767"
+       height="9.9624557"
+       width="10.001333"
+       id="rect3263"
+       style="color:#000000;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#757575;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" /><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       id="rect2363"
+       d="m 27.107118,34.408261 c 3.617983,0.331177 5.527724,-1.445704 8.868152,-1.55274 L 36,29.00603 27.088388,29 l 0.01873,5.408261 z"
+       style="opacity:0.39772728;color:#000000;fill:url(#radialGradient2374);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999958;marker:none;visibility:visible;display:inline;overflow:visible" /></g></g><g
+   inkscape:groupmode="layer"
+   id="layer3"
+   inkscape:label="Cancel"
+   style="display:inline"
+   sodipodi:insensitive="true"><path
+     inkscape:connector-curvature="0"
+     id="path21642-1"
+     d="m 47.662816,44.987526 c -0.120652,1.646851 -3.213412,2.606775 -5.88153,3.03684 -4.362088,0.658404 -9.413,0.503003 -13.246573,-0.867841 -2.049624,-0.673315 -3.29125,-2.200566 -1.810314,-3.341428 2.178762,-1.659613 6.251742,-2.183438 9.862965,-2.236334 3.69133,-0.006 7.82464,0.471868 10.226986,2.081485 0.520681,0.38489 0.853108,0.849828 0.848466,1.327278 z"
+     style="opacity:0.63068183;color:#000000;fill:url(#radialGradient3900);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" /><rect
+     style="fill:url(#linearGradient4706);fill-opacity:1;fill-rule:nonzero;stroke:#850000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     id="rect4692"
+     width="21.625"
+     height="21.9375"
+     x="25.9375"
+     y="24.0625"
+     rx="0.38128215"
+     ry="0.38128215" /><rect
+     style="fill:none;stroke:url(#linearGradient4717);stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;overflow:visible"
+     id="rect4709"
+     width="20.875"
+     height="21"
+     x="26.3125"
+     y="24.5625"
+     rx="0.38128215"
+     ry="0.38128215" /><path
+     style="fill:#cc2e2e;fill-opacity:0.89138579;stroke:none;display:inline;overflow:visible"
+     d="m 26.4375,24.8125 20.625,0.125 L 47,39.4375 C 41.4375,36.625 39.859375,37.3125 37.195313,37.765625 35.025662,38.134656 32.65625,40.125 26.5,39.625 z"
+     id="rect4720"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccscc" /><path
+     inkscape:connector-curvature="0"
+     id="path2787-5"
+     d="m 33.090545,29.231406 c -0.720061,0.72006 -1.440121,1.44012 -2.160181,2.160181 1.271499,1.271499 2.542997,2.542997 3.814496,3.814497 -1.271499,1.271499 -2.542997,2.542997 -3.814496,3.814496 0.72006,0.720061 1.44012,1.440121 2.160181,2.160182 1.271499,-1.271499 2.542997,-2.542999 3.814496,-3.814498 1.271499,1.271499 2.542998,2.542999 3.814497,3.814498 0.72006,-0.720061 1.440121,-1.440121 2.160181,-2.160182 -1.271499,-1.271499 -2.542998,-2.542997 -3.814497,-3.814496 1.271499,-1.2715 2.542998,-2.542998 3.814497,-3.814497 -0.72006,-0.720061 -1.440121,-1.440121 -2.160181,-2.160181 -1.271499,1.271499 -2.542998,2.542998 -3.814497,3.814497 -1.271499,-1.271499 -2.542997,-2.542998 -3.814496,-3.814497 z"
+     style="fill:url(#radialGradient3886);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3888);stroke-width:0.50623184;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;overflow:visible" /></g></svg>
 \ No newline at end of file
-@import url(ie6.css);
-
 /******************SMALL ICONS********************/
 .icon-edit      { background-image: url(Tango/16x16/apps/text-editor.png) }
 .icon-home      { background-image: url(Tango/16x16/actions/go-home.png)          }
+.icon-home-not  { background-image: url(mod/16x16/actions/go-home-not.png)          }
 .icon-new,
-.icon-suggest   { background-image: url(Tango/16x16/actions/filenew.png)              }
-.icon-close     { background-image: url(Tango/16x16/actions/gtk-cancel.png)           }
+.icon-suggest   { background-image: url(Tango/16x16/actions/filenew.png) }
+.icon-close     { background-image: url(Tango/16x16/actions/gtk-cancel.png) }
 .icon-newfolder { background-image: url(Tango/16x16/actions/folder-new.png) }
 .icon-folder    { background-image: url(Tango/16x16/places/folder.png) }
-.icon-parent-folder    { background-image: url(Tango/16x16/places/folder_home.png) }
+.icon-parent-folder { background-image: url(Tango/16x16/places/folder_home.png) }
 .icon-newblog   { background-image: url(mod/16x16/apps/text-editor.png) }
 .icon-blog      { background-image: url(mod/16x16/apps/text-editor.png) }
-/*.icon-open      { background-image: url(folder-open.gif)         } UNUSED*/
-/*.icon-cms       { background-image: url(abiword_48.png)          } UNUSED*/
-.icon-save      { background-image: url(Tango/16x16/actions/filesave.png)             }
-.icon-send      { background-image: url(Tango/16x16/actions/stock_mail-forward.png)             }
-.icon-cancel    { background-image: url(Tango/16x16/actions/gtk-cancel.png)           }
-.icon-person    { background-image: url(Tango/16x16/apps/system-config-users.png)           }
-.icon-product    { background-image: url(Tango/16x16/mimetypes/package.png)          }
+/*.icon-open    { background-image: url(folder-open.gif) } UNUSED*/
+/*.icon-cms     { background-image: url(abiword_48.png) } UNUSED*/
+.icon-save      { background-image: url(Tango/16x16/actions/filesave.png) }
+.icon-send      { background-image: url(Tango/16x16/actions/stock_mail-forward.png) }
+.icon-cancel    { background-image: url(Tango/16x16/actions/gtk-cancel.png) }
+.icon-person    { background-image: url(Tango/16x16/apps/system-config-users.png) }
+.icon-product   { background-image: url(Tango/16x16/mimetypes/package.png) }
 .icon-delete    { background-image: url(Tango/16x16/places/user-trash.png) }
-/*.icon-find      { background-image: url(noosfero-find.png)       } UNUSED*/
-.icon-back      { background-image: url(Tango/16x16/actions/back.png)          }
-.icon-next      { background-image: url(Tango/16x16/actions/go-next.png)  }
-.icon-add       { background-image: url(Tango/16x16/actions/add.png)              }
-.icon-remove    { background-image: url(Tango/16x16/actions/gtk-remove.png)              }
-.icon-more      { background-image: url(Tango/16x16/actions/add.png)              }
-.icon-up        { background-image: url(Tango/16x16/actions/go-up.png)            }
-.icon-down      { background-image: url(Tango/16x16/actions/go-down.png)          }
-.icon-left      { background-image: url(Tango/16x16/actions/go-previous.png)          }
-.icon-right     { background-image: url(Tango/16x16/actions/go-next.png)         }
-.icon-up-disabled        { background-image: url(Tango/16x16/actions/go-up.png); opacity: 0.25; filter:alpha(opacity=25); }
-.icon-down-disabled      { background-image: url(Tango/16x16/actions/go-down.png); opacity: 0.25; filter:alpha(opacity=25);         }
-.icon-left-disabled      { background-image: url(Tango/16x16/actions/go-previous.png); opacity: 0.25; filter:alpha(opacity=25);          }
-.icon-right-disabled     { background-image: url(Tango/16x16/actions/go-next.png); opacity: 0.25; filter:alpha(opacity=25);         }
-.icon-up-red    { background-image: url(mod/16x16/actions/go-up-red.png)        }
-.icon-forward   { background-image: url(Tango/16x16/actions/go-next.png)       }
-.icon-search    { background-image: url(Tango/16x16/actions/search.png)           }
-.icon-ok        { background-image: url(Tango/16x16/actions/media-playback-start.png)               }
-.icon-login     { background-image: url(mod/16x16/actions/log-in.png)              }
-.icon-help      { background-image: url(Tango/16x16/apps/gnome-help.png)                }
-.icon-firefox   { background-image: url(firefox-24x24.gif)       }
-.icon-help32on  { background-image: url(Tango/32x32/apps/gnome-help.png)    }
-.icon-help32off { background-image: url(mod/32x32/apps/gnome-help-red.png)   }
+/*.icon-find    { background-image: url(noosfero-find.png) } UNUSED*/
+.icon-back      { background-image: url(Tango/16x16/actions/back.png) }
+.icon-next      { background-image: url(Tango/16x16/actions/go-next.png) }
+.icon-add       { background-image: url(Tango/16x16/actions/add.png) }
+.icon-remove    { background-image: url(Tango/16x16/actions/gtk-remove.png) }
+.icon-more      { background-image: url(Tango/16x16/actions/add.png) }
+.icon-up        { background-image: url(Tango/16x16/actions/go-up.png) }
+.icon-down      { background-image: url(Tango/16x16/actions/go-down.png) }
+.icon-left      { background-image: url(Tango/16x16/actions/go-previous.png) }
+.icon-right     { background-image: url(Tango/16x16/actions/go-next.png) }
+.icon-up-disabled    { background-image: url(Tango/16x16/actions/go-up.png); opacity: 0.25; filter:alpha(opacity=25); }
+.icon-down-disabled  { background-image: url(Tango/16x16/actions/go-down.png); opacity: 0.25; filter:alpha(opacity=25); }
+.icon-left-disabled  { background-image: url(Tango/16x16/actions/go-previous.png); opacity: 0.25; filter:alpha(opacity=25); }
+.icon-right-disabled { background-image: url(Tango/16x16/actions/go-next.png); opacity: 0.25; filter:alpha(opacity=25); }
+.icon-up-red    { background-image: url(mod/16x16/actions/go-up-red.png) }
+.icon-forward   { background-image: url(Tango/16x16/actions/go-next.png) }
+.icon-search    { background-image: url(Tango/16x16/actions/search.png) }
+.icon-ok        { background-image: url(Tango/16x16/actions/media-playback-start.png) }
+.icon-login     { background-image: url(mod/16x16/actions/log-in.png) }
+.icon-help      { background-image: url(Tango/16x16/apps/gnome-help.png) }
+.icon-firefox   { background-image: url(firefox-24x24.gif) }
+.icon-help32on  { background-image: url(Tango/32x32/apps/gnome-help.png) }
+.icon-help32off { background-image: url(mod/32x32/apps/gnome-help-red.png) }
 .icon-spread    { background-image: url(mod/16x16/actions/spread.png) }
-.icon-todo            { background-image: url(Tango/16x16/actions/stock_paste.png)          }
-.icon-eyes            { background-image: url(Tango/16x16/actions/gtk-print-preview.png)          }
-/*.icon-menu-           { background-image: url(menu-without-ico-HC.gif) }*/
-.icon-menu-home       { background-image: url(Tango/16x16/actions/go-home.png)             }
-/*.icon-menu-blog       { background-image: url(blog-HC.gif)             } UNUSED*/
-/*.icon-menu-album      { background-image: url(album-HC.gif)            } UNUSED*/
-.icon-menu-product    { background-image: url(Tango/16x16/mimetypes/package.png)          }
-.icon-menu-enterprise { background-image: url(Tango/16x16/actions/go-home.png)       }
-.icon-menu-community  { background-image: url(Tango/16x16/apps/system-config-users.png)        }
-/*.icon-menu-edit       { background-image: url(edit-HC.gif)             } UNUSED */
-.icon-menu-ctrl-panel { background-image: url(Tango/16x16/categories/preferences-desktop.png)          }
-.icon-menu-admin      { background-image: url(Tango/16x16/categories/preferences-system.png)          }
-.icon-menu-my-groups { background-image: url(Tango/16x16/apps/system-config-users.png)    }
-.icon-menu-login      { background-image: url(mod/16x16/actions/log-in.png)            }
-.icon-menu-logout     { background-image: url(mod/16x16/actions/log-out.png)             }
-.icon-menu-search     { background-image: url(Tango/16x16/actions/search.png)           }
-/*.icon-menu-ed-design  { background-image: url(edit-design-HC.gif)      } UNUSED */
-.icon-menu-events     { background-image: url(Tango/16x16/mimetypes/stock_calendar.png)         }
-.icon-event     { background-image: url(Tango/16x16/mimetypes/stock_calendar.png)         }
-.icon-newevent     { background-image: url(Tango/16x16/mimetypes/stock_calendar.png)         }
-.icon-menu-articles   { background-image: url(Tango/16x16/apps/text-editor.png)             }
-/*.icon-menu-comments   { background-image: url(blog-HC.gif)             } UNUSED */
-.icon-menu-people     { background-image: url(mod/16x16/apps/user.png)            }
-.icon-menu-mail       { background-image: url(Tango/16x16/apps/email.png)             }
-.icon-upload-file     { background-image: url(Tango/16x16/actions/filesave.png)            }
-.icon-newupload-file     { background-image: url(Tango/16x16/actions/filesave.png)            }
-.icon-slideshow       { background-image: url(Tango/16x16/mimetypes/x-office-presentation.png)           }
+.icon-todo            { background-image: url(Tango/16x16/actions/stock_paste.png) }
+.icon-eyes            { background-image: url(Tango/16x16/actions/find.png) }
+/*.icon-menu-         { background-image: url(menu-without-ico-HC.gif) }*/
+.icon-menu-home       { background-image: url(Tango/16x16/actions/go-home.png) }
+/*.icon-menu-blog     { background-image: url(blog-HC.gif) } UNUSED*/
+/*.icon-menu-album    { background-image: url(album-HC.gif) } UNUSED*/
+.icon-menu-product    { background-image: url(Tango/16x16/mimetypes/package.png) }
+.icon-menu-enterprise { background-image: url(Tango/16x16/actions/go-home.png) }
+.icon-menu-community  { background-image: url(Tango/16x16/apps/system-config-users.png) }
+/*.icon-menu-edit     { background-image: url(edit-HC.gif) } UNUSED */
+.icon-menu-ctrl-panel { background-image: url(Tango/16x16/categories/preferences-desktop.png) }
+.icon-menu-admin      { background-image: url(Tango/16x16/categories/preferences-system.png) }
+.icon-menu-my-groups  { background-image: url(Tango/16x16/apps/system-config-users.png) }
+.icon-menu-login      { background-image: url(mod/16x16/actions/log-in.png) }
+.icon-menu-logout     { background-image: url(mod/16x16/actions/log-out.png) }
+.icon-menu-search     { background-image: url(Tango/16x16/actions/search.png) }
+/*.icon-menu-ed-design { background-image: url(edit-design-HC.gif) } UNUSED */
+.icon-menu-events     { background-image: url(Tango/16x16/mimetypes/stock_calendar.png) }
+.icon-event           { background-image: url(Tango/16x16/mimetypes/stock_calendar.png) }
+.icon-newevent        { background-image: url(Tango/16x16/mimetypes/stock_calendar.png) }
+.icon-menu-articles   { background-image: url(Tango/16x16/apps/text-editor.png) }
+/*.icon-menu-comments { background-image: url(blog-HC.gif) } UNUSED */
+.icon-menu-people     { background-image: url(mod/16x16/apps/user.png) }
+.icon-menu-mail       { background-image: url(Tango/16x16/apps/email.png) }
+.icon-upload-file     { background-image: url(Tango/16x16/actions/filesave.png) }
+.icon-newupload-file  { background-image: url(Tango/16x16/actions/filesave.png) }
+.icon-slideshow       { background-image: url(Tango/16x16/mimetypes/x-office-presentation.png) }
 .icon-photos          { background-image: url(Tango/16x16/devices/camera-photo.png) }
-.icon-text-html          { background-image: url(Tango/16x16/mimetypes/text-html.png) }
+.icon-text-html       { background-image: url(Tango/16x16/mimetypes/text-html.png) }
 .icon-text-plain      { background-image: url(Tango/16x16/mimetypes/text-x-generic.png) }
-.icon-image-svg-xml      { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
+.icon-image-svg-xml   { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
 .icon-application-octet-stream { background-image: url(Tango/16x16/mimetypes/binary.png) }
-.icon-application-x-gzip { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-x-gzip.png) }
-.icon-application-postscript { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-postscript.png) }
-.icon-application-pdf   { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-pdf.png) }
-.icon-application-ogg   { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-ogg.png) }
-.icon-video-mpeg   { background-image: url(Tango/16x16/mimetypes/video-x-generic.png) }
-.icon-application-vnd-oasis-opendocument-text  { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png) }
+.icon-application-x-gzip       { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-x-gzip.png) }
+.icon-application-postscript   { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-postscript.png) }
+.icon-application-pdf          { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-pdf.png) }
+.icon-application-ogg          { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-ogg.png) }
+.icon-video, .icon-video-mpeg  { background-image: url(Tango/16x16/mimetypes/video-x-generic.png) }
+.icon-application-vnd-oasis-opendocument-text         { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png) }
 .icon-application-vnd-oasis-opendocument-spreadsheet  { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png) }
-.icon-application-vnd-oasis-opendocument-presentation  { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png) }
+.icon-application-vnd-oasis-opendocument-presentation { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png) }
-.icon-media-pause      { background-image: url(Tango/16x16/actions/media-playback-pause.png) }
-.icon-media-play       { background-image: url(Tango/16x16/actions/media-playback-start.png) }
-.icon-media-prev       { background-image: url(Tango/16x16/actions/media-skip-backward.png) }
-.icon-media-next       { background-image: url(Tango/16x16/actions/media-skip-forward.png) }
+.icon-media-pause  { background-image: url(Tango/16x16/actions/media-playback-pause.png) }
+.icon-media-play   { background-image: url(Tango/16x16/actions/media-playback-start.png) }
+.icon-media-prev   { background-image: url(Tango/16x16/actions/media-skip-backward.png) }
+.icon-media-next   { background-image: url(Tango/16x16/actions/media-skip-forward.png) }
 .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/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-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/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) }
-.icon-locale           { background-image: url(Tango/16x16/apps/preferences-desktop-locale.png) }
-.icon-user-removed           { background-image: url(Tango/16x16/actions/gtk-cancel.png) }
-.icon-user-unknown           { background-image: url(Tango/16x16/status/dialog-error.png) }
-.icon-alert           { background-image: url(Tango/16x16/status/dialog-warning.png) }
+.icon-locale       { background-image: url(Tango/16x16/apps/preferences-desktop-locale.png) }
+.icon-user-removed { background-image: url(Tango/16x16/actions/gtk-cancel.png) }
+.icon-user-unknown { background-image: url(Tango/16x16/status/dialog-error.png) }
+.icon-alert        { background-image: url(Tango/16x16/status/dialog-warning.png) }
 /******************LARGE ICONS********************/
-.image-gallery-item .folder { background-image: url(mod/96x96/places/folder.png) }
-.image-gallery-item .gallery   { background-image: url(mod/96x96/mimetypes/image-x-generic.png) }
+.image-gallery-item .folder  { background-image: url(mod/96x96/places/folder.png) }
+.image-gallery-item .gallery { background-image: url(mod/96x96/mimetypes/image-x-generic.png) }
@@ -89,7 +89,7 @@ body, th, td, input {
   color: #555753;
 }
-#controlpanel, #logout, #openchat, #manage-enterprises {
+#controlpanel, #logout, #openchat, .manage-groups {
   margin-left: 25px;
 }
@@ -822,12 +822,6 @@ div#notice {
   margin-bottom: 0px;
 }
-X.sep {
-  background: url(imgs/blog-sep.png) 50% 50% repeat-x;
-  padding: 10px 20px;
-  margin: 10px -19px;
-}
-
 /* ==> search-results.css <== */
@@ -1019,6 +1013,46 @@ hr.pre-posts, hr.sep-posts {
   background: transparent;
 }
+/************* uploaded file *****************/
+
+#article .gallery-navigation {
+  padding: 10px 0;
+}
+
+#article .gallery-navigation .previous {
+  margin-right: 10px;
+}
+
+#article .gallery-navigation .next {
+  margin-left: 10px;
+}
+
+#article .gallery-navigation .total-of-images {
+  font-weight: bold;
+}
+
+#article .uploaded-file-description {
+  background: #f6f6f6;
+  border-top: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
+  padding: 1em;
+}
+#article .uploaded-file-description.empty {
+  display: none;
+}
+
+#article.file-generic .download-link {
+  display: block;
+  margin-bottom: 10px;
+}
+#article.file-generic .download-link span {
+  font-size: 150%;
+  padding-right: 5px;
+}
+#article.file-generic .download-link a {
+  font-size: 180%;
+  text-decoration: none;
+}
 /**************************** Comments *******************************/
@@ -709,7 +709,7 @@ jQuery(function($) {
       document.location.href = this.href;
     })
   }
-  $('#manage-enterprises-link').live('click', function() {
+  $('.manage-groups > a').live('click', function() {
     toggleMenu(this);
     return false;
   });
@@ -853,6 +853,12 @@ Array.min = function(array) {
   return Math.min.apply(Math, array);
 };
+function hideAndGetUrl(link) {
+  link.hide();
+  url = jQuery(link).attr('href');
+  jQuery.get(url);
+}
+
 jQuery(function($){
   $('.submit-with-keypress').live('keydown', function(e) {
      field = this;
@@ -875,12 +881,21 @@ jQuery(function($){
      }
    });
-  $('.view-all-comments').live('click', function(e) {
-     var link = this;
-     $(link).parent().find('.profile-wall-activities-comments').show();
-     $(link).hide();
+  $('#content').delegate( '.view-all-comments a', 'click', function(e) {
+     hideAndGetUrl(this);
      return false;
+   });
+
+  $('#content').delegate('.view-more-replies a', 'click', function(e) {
+    hideAndGetUrl(this);
+    return false;
   });
+
+  $('#content').delegate('.view-more-comments a', 'click', function(e) {
+    hideAndGetUrl(this);
+    return false;
+  });
+
   $('.focus-on-comment').live('click', function(e) {
      var link = this;
      $(link).parents('.profile-activity-item').find('textarea').focus();
@@ -0,0 +1,28 @@
+function removeTaskBox(button, url, task_box_id, msg) {
+  var $ = jQuery;
+  if (msg && !confirm(msg)) {
+    return;
+  }
+  button = $(button);
+  button.addClass('task-button-loading');
+  $.post(url, function (data) {
+    if (data.ok) {
+      $('#' + task_box_id).slideUp();
+    } else {
+      button.removeClass('task-button-loading');
+      button.addClass('task-button-failure');
+    }
+  });
+}
+
+function toggleDetails(link, msg_hide, msg_show) {
+  var $ = jQuery;
+  $(link).toggleClass('icon-up icon-down');
+  details = $(link).closest('.task_box').find('.suggest-article-details');
+  if (details.css('display') == 'none') {
+    link.innerHTML = msg_hide;
+  } else {
+    link.innerHTML = msg_show;
+  }
+  details.slideToggle();
+}
@@ -882,6 +882,40 @@ code input {
 .webkit #manage-enterprises .simplemenu-submenu {
   top: 20px;
 }
+#manage-communities {
+  display: inline-block;
+  margin-right: 5px;
+  position: relative;
+}
+#manage-communities .ui-icon {
+  position: absolute;
+  top: 0;
+  right: -20px;
+}
+#manage-communities .simplemenu-submenu {
+  text-align: left;
+  left: -20px;
+  width: 200px;
+}
+#manage-communities .simplemenu-item {
+  padding: 5px 0;
+}
+#manage-communities .simplemenu-item a {
+  background-repeat: no-repeat;
+  padding-left: 20px;
+}
+#manage-communities .simplemenu-item a span {
+  display: none;
+}
+.msie8 #manage-communities-link { /* IE8 hack */
+  border: 0px solid;
+}
+.msie8 #manage-communities .simplemenu-submenu {
+  top: 16px;
+}
+.webkit #manage-communities .simplemenu-submenu {
+  top: 20px;
+}
 #article {
   position: relative;
   text-align: justify;
@@ -1552,6 +1586,7 @@ a.button.disabled, input.disabled {
 .map {
   clear: both;
 }
+
 /***********************************************************
  * style for blocks 
  ***********************************************************/
@@ -3102,7 +3137,7 @@ table.cms-articles a.icon {
   text-overflow: ellipsis;
 }
-table.cms-articles a.icon, table.cms-articles a.icon-parent-folder {
+table.cms-articles a.icon, table.cms-articles a.icon-parent-folder, .cms-homepage a.icon {
   padding: 0px 0px 3px 20px;
   background-repeat: no-repeat;
 }
@@ -3121,6 +3156,14 @@ table.cms-articles .icon:hover {
   border-right: 1px solid #ccc;
 }
+.cms-homepage a.icon {
+  border: none;
+}
+
+.cms-homepage a:hover {
+  background-color: transparent;
+}
+
 .select-article-type {
   padding: 5px 20px;
   width: 455px;
@@ -3176,6 +3219,14 @@ table.cms-articles .icon:hover {
   background: #eeeeec;
   border: 1px solid #d3d7cf;
 }
+
+.controller-cms .article-mime {
+  max-width: 90px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .controller-cms .article-controls {
   white-space: nowrap;
 }
@@ -3446,26 +3497,7 @@ div#article-parent {
 .article-body-uploaded-file {
   text-align: center;
 }
-/************* uploaded file *****************/
-#article .gallery-navigation {
-  padding: 10px 0;
-}
-#article .gallery-navigation .left {
-  margin-right: 10px;
-}
-#article .gallery-navigation .right {
-  margin-left: 10px;
-}
-#article .gallery-navigation .total-of-images {
-  font-weight: bold;
-}
-#article .uploaded-file-description {
-  background: #f6f6f6;
-  border-top: 1px solid #ccc;
-  border-bottom: 1px solid #ccc;
-  padding: 1em;
-}
 /* ==> public/stylesheets/controller_events.css <== */
 #agenda {
   position: relative;
@@ -5681,6 +5713,10 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   padding-left: 20px;
 }
+.view-more-comments, .view-more-replies {
+  text-align: center;
+}
+
 /* Profile activity relative dimensions */
 #leave_scrap {
 #!/bin/sh
+set -e
+
 export RAILS_ENV=development
 stop() {
@@ -9,6 +11,7 @@ stop() {
 }
 start() {
+  rake db:abort_if_pending_migrations
   ./script/feed-updater start
   ./script/delayed_job start
   trap stop INT TERM
@@ -67,10 +67,25 @@ else
 fi
 # create the database with sample data
-run cp config/database.yml.pgsql config/database.yml
-sudo -u postgres createuser $USER --no-superuser --createdb --no-createrole
-sed -ri "s/username: noosfero/username: $USER/" config/database.yml
-sudo -u postgres createdb noosfero_development -O $USER
+if test -e config/database.yml; then
+  say 'Not updating existent database.yml.'
+  say 'If you wish to automatic reconfigure your database connection, you can delete config/database.yml and run this script again.'
+else
+  say 'Configuring Noosfero to use PostgreSQL, with your user.'
+  run cp config/database.yml.pgsql config/database.yml
+  sed -ri "s/username: noosfero/username: $USER/" config/database.yml
+  sudo -u postgres createuser $USER --no-superuser --createdb --no-createrole
+fi
+DB_USER="$(
+  grep username: config/database.yml | head -n1 | sed -r 's/.*:\s*([^ ]+).*/\1/'
+)"
+if test -n "$DB_USER"; then
+  say "DB user: $DB_USER"
+else
+  say 'It looks like your database.yml have no user defined'
+  DB_USER=$USER
+fi
+sudo -u postgres createdb noosfero_development -O $DB_USER
 run rake db:schema:load
 run rake db:data:minimal
 run rake db:test:prepare
@@ -109,6 +109,18 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_no_tag :tag => 'a', :content => 'Use as homepage', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/set_home_page/#{folder.id}" }
   end
+  should 'display the profile homepage if can change homepage' do
+    env = Environment.default; env.disable('cant_change_homepage')
+    get :index, :profile => profile.identifier
+    assert_tag :tag => 'div', :content => /Profile homepage/, :attributes => { :class => "cms-homepage"}
+  end
+
+  should 'not display the profile homepage if cannot change homepage' do
+    env = Environment.default; env.enable('cant_change_homepage')
+    get :index, :profile => profile.identifier
+    assert_no_tag :tag => 'div', :content => /Profile homepage/, :attributes => { :class => "cms-homepage"}
+  end
+
   should 'be able to set home page' do
     a = profile.articles.build(:name => 'my new home page')
     a.save!
@@ -119,6 +131,7 @@ class CmsControllerTest &lt; ActionController::TestCase
     profile.reload
     assert_equal a, profile.home_page
+    assert_match /configured/, session[:notice]
   end
   should 'be able to set home page even when profile description is invalid' do
@@ -154,6 +167,37 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_redirected_to profile.url
   end
+  should 'be able to reset home page' do
+    a = profile.articles.build(:name => 'my new home page')
+    a.save!
+
+    profile.home_page = a
+    profile.save!
+
+    post :set_home_page, :profile => profile.identifier, :id => nil
+
+    profile.reload
+    assert_equal nil, profile.home_page
+    assert_match /reseted/, session[:notice]
+  end
+
+  should 'display default home page' do
+    profile.home_page = nil
+    profile.save!
+    get :index, :profile => profile.identifier
+    assert_tag :tag => 'div', :attributes => { :class => "cms-homepage" }, :descendant => { :tag => "span", :content => /Profile Information/ }
+  end
+
+  should 'display article as home page' do
+    a = profile.articles.build(:name => 'my new home page')
+    a.save!
+    profile.home_page = a
+    profile.save!
+    Article.stubs(:short_description).returns('short description')
+    get :index, :profile => profile.identifier
+    assert_tag :tag => 'div', :attributes => { :class => "cms-homepage" }, :descendant => { :tag => "a", :content => /my new home page/ }
+  end
+
   should 'set last_changed_by when creating article' do
     login_as(profile.identifier)
@@ -940,8 +984,8 @@ class CmsControllerTest &lt; ActionController::TestCase
                :article => {:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')}
     process_delayed_job_queue
-    file = profile.articles.find_by_name('rails.png')
-    assert File.exists?(file.class.icon_name(file))
+    file = FilePresenter.for profile.articles.find_by_name('rails.png')
+    assert File.exists?(file.icon_name)
     file.destroy
   end
@@ -951,8 +995,8 @@ class CmsControllerTest &lt; ActionController::TestCase
                :article => {:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')}
     process_delayed_job_queue
-    file = profile.articles.find_by_name('rails.png')
-    assert File.exists?(file.class.icon_name(file))
+    file = FilePresenter.for profile.articles.find_by_name('rails.png')
+    assert File.exists?(file.icon_name)
     file.destroy
   end
@@ -1271,4 +1271,12 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'strong', :content => /bold/
   end
+  should 'display link to download of non-recognized file types on its page' do
+    file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'bin/unknown'), :profile => profile)
+    get :view_page, file.url.merge(:view=>:true)
+    assert_tag :tag => 'a',
+               :content => file.filename,
+               :attributes => { :href => file.public_filename }
+  end
+
 end
@@ -245,4 +245,17 @@ class MembershipsControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'input', :attributes => {:id => 'community_plugin2', :type => 'hidden', :value => 'Plugin 2'}
   end
+  should 'redirect to back_to parameter when create a new community' do
+    back_to = '/'
+    post :new_community, :profile => profile.identifier, :community => { :name => 'My shiny new community', :description => 'This is a community devoted to anything interesting we find in the internet '}, :back_to => back_to
+    assert_response :redirect
+    assert_redirected_to back_to
+  end
+
+  should 'cancel button redirect to back_to parameter' do
+    back_to = '/'
+    get :new_community, :profile => profile.identifier, :back_to => back_to
+    assert_tag :tag => 'a', :attributes => { :class => 'button icon-cancel with-text', :href => back_to }
+  end
+
 end
@@ -17,11 +17,11 @@ class ProfileControllerTest &lt; ActionController::TestCase
   def test_local_files_reference
     assert_local_files_reference
   end
-  
+
   def test_valid_xhtml
     assert_valid_xhtml
   end
-  
+
   noosfero_test :profile => 'testuser'
   should 'list friends' do
@@ -68,7 +68,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_template 'members'
     assert_kind_of Array, assigns(:members)
   end
-  
+
   should 'list favorite enterprises' do
     get :favorite_enterprises
@@ -96,7 +96,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
   should 'not show enterprises link to enterprise' do
-    ent = fast_create(Enterprise, :identifier => 'test_enterprise1', :name => 'Test enteprise1')
+    ent = fast_create(Enterprise, :identifier => 'test_enterprise1', :name => 'Test enterprise1')
     get :index, :profile => ent.identifier
     assert_no_tag :tag => 'a', :content => 'Enterprises', :attributes => { :href => /profile\/#{ent.identifier}\/enterprises$/ }
   end
@@ -318,7 +318,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     get :profile_info, :profile => 'my-test-enterprise', :block_id => block.id
     assert_no_match /\/contact\/my-test-enterprise\/new/, @response.body
   end
-  
+
   should 'display contact button only if friends' do
     friend = create_user_full('friend_user').person
     friend.user.activate
@@ -560,7 +560,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_response 403
   end
-  should 'allow environment admin to unblock enteprises' do
+  should 'allow environment admin to unblock enterprises' do
     login_as(profile.identifier)
     enterprise = fast_create(Enterprise)
     enterprise.environment.add_admin(profile)
@@ -734,7 +734,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
   should 'see the activities_items paginated' do
-    p1= Person.first
+    p1 = create_user('some').person
     ActionTracker::Record.destroy_all
     40.times{Scrap.create!(defaults_for_scrap(:sender => p1, :receiver => p1))}
     login_as(p1.identifier)
@@ -881,7 +881,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_template 'index'
   end
-  should 'the network activity be visible to uses not logged in on communities and enteprises' do
+  should 'the network activity be visible to uses not logged in on communities and enterprises' do
     p1= Person.first
     community = fast_create(Community)
     p2= fast_create(Person)
@@ -1091,7 +1091,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     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) 
+    atn = fast_create(ActionTrackerNotification, :profile_id => profile.id, :action_tracker_id => at.id)
     get :index, :profile => person.identifier
     assert_no_tag :tag => 'div', :attributes => {:id => 'profile-network'}
@@ -1103,7 +1103,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   should "not show the scrap button on network activity if the user is himself" do
     login_as(profile.identifier)
     at = fast_create(ActionTracker::Record, :user_id => profile.id)
-    atn = fast_create(ActionTrackerNotification, :profile_id => profile.id, :action_tracker_id => at.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'}
   end
@@ -1131,7 +1131,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     at = fast_create(ActionTracker::Record, :user_id => profile.id)
     profile.public_profile=false
     profile.save
-    atn = fast_create(ActionTrackerNotification, :profile_id => profile.id, :action_tracker_id => at.id) 
+    atn = fast_create(ActionTrackerNotification, :profile_id => profile.id, :action_tracker_id => at.id)
     get :index, :profile => profile.identifier
     assert_equal [at], profile.tracked_actions
     assert_no_tag :tag => 'li', :attributes => {:id => "profile-activity-item-#{atn.id}"}
@@ -1170,6 +1170,58 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_redirected_to :controller => 'account', :action => 'login'
   end
+  should "not index display activities comments" do
+    login_as(profile.identifier)
+    article = TinyMceArticle.create!(:profile => profile, :name => 'An Article about Free Software')
+    ActionTracker::Record.destroy_all
+    activity = ActionTracker::Record.create!(:user_id => profile.id, :user_type => 'Profile', :verb => 'create_article', :target_id => article.id, :target_type => 'Article', :params => {'name' => article.name, 'url' => article.url, 'lead' => article.lead, 'first_image' => article.first_image})
+    20.times {comment = fast_create(Comment, :source_id => article, :title => 'a comment', :body => 'lalala', :created_at => Time.now)}
+    article.reload
+    get :index, :profile => profile.identifier
+    assert_tag 'ul', :attributes => {:class => 'profile-wall-activities-comments'}, :children => {:count => 0 } 
+  end
+
+  should "view more comments paginated" do
+    login_as(profile.identifier)
+    article = TinyMceArticle.create!(:profile => profile, :name => 'An Article about Free Software')
+    ActionTracker::Record.destroy_all
+    activity = ActionTracker::Record.create!(:user_id => profile.id, :user_type => 'Profile', :verb => 'create_article', :target_id => article.id, :target_type => 'Article', :params => {'name' => article.name, 'url' => article.url, 'lead' => article.lead, 'first_image' => article.first_image})
+    20.times {comment = fast_create(Comment, :source_id => article, :title => 'a comment', :body => 'lalala', :created_at => Time.now)}
+    article.reload
+    assert_equal 20, article.comments.count
+    get :more_comments, :activity => activity.id, :comment_page => 2
+    assert_response :success
+    assert_template '_comment'
+    assert_select_rjs :insert_html do
+      assert_select 'li', 5 # 5 comments per page
+    end
+  end
+
+  should "not index display scraps replies" do
+    login_as(profile.identifier)
+    Scrap.destroy_all
+    scrap = fast_create(Scrap, :sender_id => profile.id, :receiver_id => profile.id)
+    20.times {fast_create(Scrap, :sender_id => profile.id, :receiver_id => profile.id, :scrap_id => scrap.id)}
+    profile.reload
+    get :index, :profile => profile.identifier
+    assert_tag 'ul', :attributes => {:class => 'profile-wall-activities-comments scrap-replies'}, :children => {:count => 0 } 
+  end
+
+  should "view more replies paginated" do
+    login_as(profile.identifier)
+    Scrap.destroy_all
+    scrap = fast_create(Scrap, :sender_id => profile.id, :receiver_id => profile.id)
+    20.times {fast_create(Scrap, :sender_id => profile.id, :receiver_id => profile.id, :scrap_id => scrap.id)}
+    profile.reload
+    assert_equal 20, scrap.replies.count
+    get :more_replies, :activity => scrap.id, :comment_page => 2
+    assert_response :success
+    assert_template '_profile_scrap'
+    assert_select_rjs :insert_html do
+      assert_select 'li', 5 # 5 replies per page
+    end
+  end
+
   should 'render empty response for not logged in users in check_membership' do
     get :check_membership
     assert_equal '', @response.body
@@ -1276,7 +1328,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(profile.identifier)
     get :index, :profile => profile.identifier
-    assert_tag :tag => 'p', :content => 'A scrap', :attributes => { :class => 'profile-activity-text'} 
+    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
@@ -1331,30 +1383,6 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_equal "Comment successfully added.", assigns(:message)
   end
-  should 'display comment in wall if user was removed' do
-    UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
-    article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
-    to_be_removed = create_user('removed_user').person
-    comment = Comment.create!(:author => to_be_removed, :title => 'Test Comment', :body => 'My author does not exist =(', :source_id => article.id, :source_type => 'Article')
-    to_be_removed.destroy
-
-    login_as(profile.identifier)
-    get :index, :profile => profile.identifier
-
-    assert_tag :tag => 'span', :content => '(removed user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-removed'}
-  end
-
-  should 'display comment in wall from non logged users' do
-    UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
-    article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
-    comment = Comment.create!(:name => 'outside user', :email => 'outside@localhost.localdomain', :title => 'Test Comment', :body => 'My author does not exist =(', :source_id => article.id, :source_type => 'Article')
-
-    login_as(profile.identifier)
-    get :index, :profile => profile.identifier
-
-    assert_tag :tag => 'span', :content => '(unauthenticated user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-unknown'}
-  end
-
   should 'add locale on mailing' do
     community = fast_create(Community)
     create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
@@ -1549,6 +1577,109 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'td', :content => 'e-Mail:'
   end
+  should 'not display list of communities to manage on menu by default' do
+    user = create_user('community_admin').person
+    community = fast_create(Community)
+    community.add_admin(user)
+
+    login_as(user.identifier)
+    get :index
+    assert_no_tag :tag => 'div', :attributes => {:id => 'manage-communities'}
+  end
+
+  should 'display list of communities to manage on menu if enabled' do
+    user = create_user('community_admin').person
+    env = user.environment
+    community = fast_create(Community)
+    community.add_admin(user)
+
+    Environment.any_instance.stubs(:enabled?).returns(false)
+    Environment.any_instance.stubs(:enabled?).with(:display_my_communities_on_user_menu).returns(true)
+
+    login_as(user.identifier)
+    get :index
+    assert_tag :tag => 'div', :attributes => {:id => 'manage-communities'}
+
+  end
+
+  should 'build menu to the community panel of communities the user can manage if enabled' do
+    u = create_user('other_other_ze').person
+    u2 = create_user('guy_that_will_be_admin_of_all').person # because the first member of each community is an admin
+
+    Environment.any_instance.stubs(:enabled?).returns(false)
+    Environment.any_instance.stubs(:enabled?).with(:display_my_communities_on_user_menu).returns(true)
+
+    Environment.any_instance.stubs(:required_person_fields).returns([])
+    u.data = { :email => 'test@test.com', :fields_privacy => { } }
+    u.save!
+    c1 = fast_create(Community, :name => 'community_1')
+    c2 = fast_create(Community, :name => 'community_2')
+    c3 = fast_create(Community, :name => 'community_3')
+    c4 = fast_create(Community, :name => 'community_4')
+
+    c1.add_admin(u2)
+    c2.add_admin(u2)
+    c3.add_admin(u2)
+
+    c1.add_member(u)
+    c2.add_member(u)
+    c3.add_member(u)
+    c1.add_admin(u)
+    c2.add_admin(u)
+
+    login_as(u.identifier)
+
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:id => 'manage-communities'}
+    assert_select '#manage-communities li > a' do |links|
+      assert_equal 2, links.length
+      assert_match /community_1/, links.to_s
+      assert_match /community_2/, links.to_s
+      assert_no_match /community_3/, links.to_s
+      assert_no_match /community_4/, links.to_s
+    end
+  end
+
+  should 'build menu to the enterprise panel if enabled' do
+    u = create_user('other_other_ze').person
+
+    Environment.any_instance.stubs(:enabled?).returns(false)
+    Environment.any_instance.stubs(:enabled?).with(:display_my_enterprises_on_user_menu).returns(true)
+
+    Environment.any_instance.stubs(:required_person_fields).returns([])
+    u.data = { :email => 'test@test.com', :fields_privacy => { } }
+    u.save!
+    e1 = fast_create(Enterprise, :identifier => 'test_enterprise1', :name => 'Test enterprise1')
+    e2 = fast_create(Enterprise, :identifier => 'test_enterprise2', :name => 'Test enterprise2')
+
+    e1.add_member(u)
+
+    login_as(u.identifier)
+
+    get :index
+
+    assert_tag :tag => 'div', :attributes => {:id => 'manage-enterprises'}
+    assert_select '#manage-enterprises li > a' do |links|
+      assert_equal 1, links.length
+      assert_match /Test enterprise1/, links.to_s
+      assert_no_match /Test enterprise_2/, links.to_s
+    end
+  end
+
+  should 'not build menu to the enterprise panel if not enabled' do
+    user = create_user('enterprise_admin').person
+    enterprise = fast_create(Enterprise)
+    enterprise.add_admin(user)
+
+    Environment.any_instance.stubs(:enabled?).returns(false)
+    Environment.any_instance.stubs(:enabled?).with(:display_my_enterprises_on_user_menu).returns(false)
+
+    login_as(user.identifier)
+    get :index
+    assert_no_tag :tag => 'div', :attributes => {:id => 'manage-enterprises'}
+  end
+
   should 'show enterprises field if enterprises are enabled on environment' do
     person = fast_create(Person)
     environment = person.environment
@@ -4,37 +4,55 @@ class SpamControllerTest &lt; ActionController::TestCase
   def setup
     @profile = create_user.person
-    @article = fast_create(TextileArticle, :profile_id => @profile.id)
-    @spam = fast_create(Comment, :source_id => @article.id, :spam => true, :name => 'foo', :email => 'foo@example.com')
+    @community = fast_create(Community, :name => 'testcommunity')
+    @community.add_admin(@profile)
+    @article = fast_create(TextileArticle, :profile_id => @community.id)
+    @spam_comment = fast_create(Comment, :source_id => @article.id, :spam => true, :name => 'foo', :email => 'foo@example.com')
+
+    @spam_suggest_article = SuggestArticle.create!(:name => 'spammer', :article_name => 'Spam article', :email => 'spammer@shady.place', :article_body => "Something you don't need", :target => @community, :spam => true)
     login_as @profile.identifier
   end
-  test "should only list spammy comments" do
+  test "should only list spammy comments and spammy suggest articles" do
     ham = fast_create(Comment, :source_id => @article.id)
-    get :index, :profile => @profile.identifier
+    get :index, :profile => @community.identifier
-    assert_equivalent [@spam], assigns(:spam)
+    assert_equivalent [@spam_comment], assigns(:comment_spam)
+    assert_equivalent [@spam_suggest_article], assigns(:task_spam)
   end
   test "should mark comments as ham" do
-    post :index, :profile => @profile.identifier, :mark_comment_as_ham => @spam.id
+    post :index, :profile => @community.identifier, :mark_comment_as_ham => @spam_comment.id
+
+    @spam_comment.reload
+    assert @spam_comment.ham?
+  end
+
+  test "should mark suggest article as ham" do
+    post :index, :profile => @community.identifier, :mark_task_as_ham => @spam_suggest_article.id
-    @spam.reload
-    assert @spam.ham?
+    @spam_suggest_article.reload
+    assert @spam_suggest_article.ham?
   end
   test "should remove comments" do
-    post :index, :profile => @profile.identifier, :remove_comment => @spam.id
+    post :index, :profile => @community.identifier, :remove_comment => @spam_comment.id
+
+    assert !Comment.exists?(@spam_comment.id)
+  end
+
+  test "should remove suggest articles" do
+    post :index, :profile => @community.identifier, :remove_task => @spam_suggest_article.id
-    assert !Comment.exists?(@spam.id)
+    assert !SuggestArticle.exists?(@spam_suggest_article.id)
   end
   should 'properly render spam that have replies' do
-    reply_spam = fast_create(Comment, :source_id => @article_id, :reply_of_id => @spam.id)
+    reply_spam = fast_create(Comment, :source_id => @article_id, :reply_of_id => @spam_comment.id)
-    get :index, :profile => @profile.identifier
+    get :index, :profile => @community.identifier
     assert_response :success
   end
@@ -38,6 +38,17 @@ class TasksControllerTest &lt; ActionController::TestCase
     assert_kind_of Array, assigns(:tasks)
   end
+  should 'list pending tasks without spam' do
+    requestor = fast_create(Person)
+    task_spam = Task.create!(:requestor => requestor, :target => profile, :spam => true)
+    task_ham = Task.create!(:requestor => requestor, :target => profile, :spam => false)
+
+    get :index
+    assert_response :success
+    assert_includes assigns(:tasks), task_ham
+    assert_not_includes assigns(:tasks), task_spam
+  end
+
   should 'list processed tasks' do
     get :processed
@@ -46,6 +57,17 @@ class TasksControllerTest &lt; ActionController::TestCase
     assert_kind_of Array, assigns(:tasks)
   end
+  should 'list processed tasks without spam' do
+    requestor = fast_create(Person)
+    task_spam = Task.create!(:status => Task::Status::FINISHED, :requestor => requestor, :target => profile, :spam => true)
+    task_ham = Task.create!(:status => Task::Status::FINISHED, :requestor => requestor, :target => profile, :spam => false)
+
+    get :processed
+    assert_response :success
+    assert_includes assigns(:tasks), task_ham
+    assert_not_includes assigns(:tasks), task_spam
+  end
+
   should 'be able to finish a task' do
     t = profile.tasks.build; t.save!
@@ -140,6 +162,15 @@ class TasksControllerTest &lt; ActionController::TestCase
     assert_includes assigns(:tasks), task
   end
+  should 'list tasks that this profile created without spam' do
+    task_spam = Ticket.create!(:name => 'test', :requestor => profile, :spam => true)
+    task_ham = Ticket.create!(:name => 'test', :requestor => profile, :spam => false)
+    get :list_requested, :profile => profile.identifier
+
+    assert_includes assigns(:tasks), task_ham
+    assert_not_includes assigns(:tasks), task_spam
+  end
+
   should 'set target of ticket when creating it' do
      f = create_user('friend').person
      profile.add_friend f
@@ -591,8 +591,8 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase
   end
   should 'include item in usermenu for environment enabled features' do
-    env = Environment.new
-    env.enable('xmpp_chat')
+    env = fast_create(Environment)
+    env.enable('xmpp_chat', false)
     stubs(:environment).returns(env)
     @controller = ApplicationController.new
@@ -791,6 +791,55 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase
                  '<br style=\'clear: left;\' /></div>', result
   end
+  should 'not filter html if source does not have macros' do
+    class Plugin1 < Noosfero::Plugin
+    end
+
+    class Plugin1::Macro1 < Noosfero::Plugin::Macro
+      def parse(params, inner_html, source)
+        'Test1'
+      end
+    end
+
+    environment = Environment.default
+    environment.enable_plugin(Plugin1)
+    @plugins = Noosfero::Plugin::Manager.new(environment, self)
+    macro1_name = Plugin1::Macro1.identifier
+    source = mock
+    source.stubs(:has_macro?).returns(false)
+
+    html = "<div class='macro nonEdit' data-macro='#{macro1_name}' data-macro-param='123'></div>"
+    parsed_html = filter_html(html, source)
+
+    assert_no_match /Test1/, parsed_html
+  end
+
+  should 'not convert macro if source is nil' do
+    profile = create_user('testuser').person
+    article = fast_create(Article,  :profile_id => profile.id)
+    class Plugin1 < Noosfero::Plugin; end
+
+    environment = Environment.default
+    environment.enable_plugin(Plugin1)
+    @plugins = Noosfero::Plugin::Manager.new(environment, self)
+
+    expects(:convert_macro).never
+    filter_html(article.body, nil)
+  end
+
+  should 'not convert macro if there is no macro plugin active' do
+    profile = create_user('testuser').person
+    article = fast_create(Article,  :profile_id => profile.id)
+    class Plugin1 < Noosfero::Plugin; end
+
+    environment = Environment.default
+    environment.enable_plugin(Plugin1)
+    @plugins = Noosfero::Plugin::Manager.new(environment, self)
+
+    expects(:convert_macro).never
+    filter_html(article.body, article)
+  end
+
   protected
   include NoosferoTestHelper
@@ -110,9 +110,12 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     block.article = image
     block.save!
-    expects(:image_tag).with(image.public_filename(:display), :class => image.css_class_name, :style => 'max-width: 100%').returns('image')
-
-    assert_match(/image/, instance_eval(&block.content))
+    assert_tag_in_string instance_eval(&block.content),
+        :tag => 'img',
+        :attributes => {
+            :src => image.public_filename(:display),
+            :class => /file-image/
+        }
   end
   should 'not display gallery pages navigation in content' do
@@ -123,8 +126,6 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
     block.article = image
     block.save!
-    expects(:image_tag).with(image.public_filename(:display), :class => image.css_class_name, :style => 'max-width: 100%').returns('image')
-
     assert_no_match(/Previous/, instance_eval(&block.content))
   end
@@ -1744,4 +1744,33 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_nil article.author_id
   end
+  should 'identify if belongs to forum' do
+    p = create_user('user_forum_test').person
+    forum = fast_create(Forum, :name => 'Forum test', :profile_id => p.id)
+    post = fast_create(TextileArticle, :name => 'First post', :profile_id => p.id, :parent_id => forum.id)
+    assert post.belongs_to_forum?
+  end
+
+  should 'not belongs to forum' do
+    p = create_user('user_forum_test').person
+    blog = fast_create(Blog, :name => 'Not Forum', :profile_id => p.id)
+    a = fast_create(TextileArticle, :name => 'Not forum post', :profile_id => p.id, :parent_id => blog.id)
+    assert !a.belongs_to_forum?
+  end
+
+  should 'not belongs to forum if do not have a parent' do
+    p = create_user('user_forum_test').person
+    a = fast_create(TextileArticle, :name => 'Orphan post', :profile_id => p.id)
+    assert !a.belongs_to_forum?
+  end
+
+  should 'save image on create article' do
+    assert_difference Article, :count do
+      p = Article.create!(:name => 'test', :image_builder => {
+        :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')
+      }, :profile_id => @profile.id)
+      assert_equal p.image(true).filename, 'rails.png'
+    end
+  end
+
 end
@@ -156,4 +156,13 @@ class BlockTest &lt; ActiveSupport::TestCase
     assert_equal box.environment, block.environment
   end
+  should 'inform conditions for expiration on profile context' do
+    conditions = Block.expire_on
+    assert conditions[:profile].kind_of?(Array)
+  end
+
+  should 'inform conditions for expiration on environment context' do
+    conditions = Block.expire_on
+    assert conditions[:environment].kind_of?(Array)
+  end
 end
@@ -94,10 +94,10 @@ class BlogHelperTest &lt; ActiveSupport::TestCase
   should 'display link to file if post is an uploaded_file' do
     file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'), :profile => profile, :published => true, :parent => blog)
-    expects(:article_to_html).with(file).returns('TO HTML')
-
     result = display_post(file)
-    assert_tag_in_string result, :content => /TO HTML/
+    assert_tag_in_string result, :tag => 'a',
+                                 :attributes => { :href => file.public_filename },
+                                 :content => file.filename
   end
   should 'display image if post is an image' do
@@ -168,11 +168,11 @@ class CategoryTest &lt; ActiveSupport::TestCase
   should "limit the possibile display colors" do
     c = Category.new(:name => 'test category', :environment_id => @env.id)
-    c.display_color = 10
+    c.display_color = 16
     c.valid?
     assert c.errors.invalid?(:display_color)
-    valid = %w[ 1 2 3 4 ].map { |item| item.to_i }
+    valid = (1..15).map { |item| item.to_i }
     valid.each do |item|
       c.display_color = item
       c.valid?
@@ -41,6 +41,7 @@ class CmsHelperTest &lt; ActiveSupport::TestCase
   should 'display image and link if article is an image' do
     profile = fast_create(Profile)
     file = UploadedFile.create!(:profile => profile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
+    file = FilePresenter.for file
     icon = icon_for_article(file)
     expects(:image_tag).with(icon).returns('icon')
@@ -285,22 +285,6 @@ class CommentTest &lt; ActiveSupport::TestCase
     assert_equal [c1,c3], c.reload.children
   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')
@@ -447,7 +431,7 @@ class CommentTest &lt; ActiveSupport::TestCase
   end
   class EverythingIsSpam < Noosfero::Plugin
-    def check_comment_for_spam(comment)
+    def check_for_spam(comment)
       comment.spam!
     end
   end
@@ -469,11 +453,11 @@ class CommentTest &lt; ActiveSupport::TestCase
       attr_accessor :marked_as_ham
     end
-    def comment_marked_as_spam(c)
+    def marked_as_spam(c)
       self.class.marked_as_spam = c
     end
-    def comment_marked_as_ham(c)
+    def marked_as_ham(c)
       self.class.marked_as_ham = c
     end
   end
@@ -523,7 +507,6 @@ class CommentTest &lt; ActiveSupport::TestCase
     comment.spam!
     log = File.open('log/test_spammers.log')
     assert_match "Comment-id: #{comment.id} IP: 192.168.0.1", log.read
-    SpammerLogger.clean_log
   end
   should 'not need moderation if article is not moderated' do
@@ -18,8 +18,15 @@ class ContentViewerHelperTest &lt; ActiveSupport::TestCase
     result = article_title(post)
     assert_tag_in_string result, :tag => 'span', :content => show_date(post.published_at)
   end
+  
+  should 'display published-at for forum posts' do
+    forum = fast_create(Forum, :name => 'Forum test', :profile_id => profile.id)
+    post = TextileArticle.create!(:name => 'post test', :profile => profile, :parent => forum)
+    result = article_title(post)
+    assert_tag_in_string result, :tag => 'span', :content => show_date(post.published_at)
+  end
-  should 'not display published-at for non-blog posts' do
+  should 'not display published-at for non-blog and non-forum posts' do
     article = TextileArticle.create!(:name => 'article for test', :profile => profile)
     result = article_title(article)
     assert_no_match /<span class="date">#{show_date(article.published_at)}<\/span><span class="author">, by .*#{profile.identifier}/, result
@@ -84,8 +84,8 @@ class EnvironmentStatisticsBlockTest &lt; ActiveSupport::TestCase
   end
   should 'not display enterprises if disabled' do
-    env = Environment.new
-    env.enable('disable_asset_enterprises')
+    env = fast_create(Environment)
+    env.enable('disable_asset_enterprises', false)
     block = EnvironmentStatisticsBlock.new
     block.stubs(:owner).returns(env)
@@ -34,22 +34,22 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
   end
   def test_features
-    v = Environment.new
-    v.enable('feature1')
+    v = fast_create(Environment)
+    v.enable('feature1', false)
     assert v.enabled?('feature1')
-    v.disable('feature1')
+    v.disable('feature1', false)
     assert !v.enabled?('feature1')
   end
   def test_enabled_features
-    v = Environment.new
-    v.enabled_features = [ 'feature1', 'feature2' ]
+    v = fast_create(Environment)
+    v.enable('feature1', false)
+    v.enable('feature2', false)
     assert v.enabled?('feature1') && v.enabled?('feature2') && !v.enabled?('feature3')
   end
   def test_enabled_features_no_features_enabled
-    v = Environment.new
-    v.enabled_features = nil
+    v = fast_create(Environment)
     assert !v.enabled?('feature1') && !v.enabled?('feature2') && !v.enabled?('feature3')
   end
@@ -1074,10 +1074,10 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
   end
   should 'get enabled features' do
-    env = Environment.new
-    env.enable('feature1')
-    env.enable('feature2')
-    env.disable('feature3')
+    env = fast_create(Environment)
+    env.enable('feature1', false)
+    env.enable('feature2', false)
+    env.disable('feature3', false)
     assert_includes env.enabled_features.keys, 'feature1'
     assert_includes env.enabled_features.keys, 'feature2'
@@ -0,0 +1,61 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class FilePresenterTest < ActiveSupport::TestCase
+
+  should 'notify about deprecated method UploadedFile.icon_name' do
+    profile = fast_create(Profile)
+    file = UploadedFile.create!(
+             :profile => profile,
+             :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')
+           )
+    assert_raise NoMethodError do
+      UploadedFile.icon_name file
+    end
+    ENV.stubs('[]').with('RAILS_ENV').returns('other')
+    Rails.logger.expects(:warn) # must warn on any other RAILS_ENV
+    stubs(:puts)
+    UploadedFile.icon_name file
+  end
+
+  should 'notify about deprecated method UploadedFile#to_html' do
+    profile = fast_create(Profile)
+    file = UploadedFile.create!(
+             :profile => profile,
+             :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')
+           )
+    assert_raise NoMethodError do
+      file.to_html
+    end
+    ENV.stubs('[]').with('RAILS_ENV').returns('other')
+    Rails.logger.expects(:warn) # must warn on any other RAILS_ENV
+    stubs(:puts)
+    file.to_html
+  end
+
+  should 'return a thumbnail as icon for images ' do
+    f = UploadedFile.new
+    f.stubs(:image?).returns(true)
+    p = FilePresenter.for f
+    p.expects(:public_filename).with(:icon).returns('/path/to/file.xyz')
+    assert_equal '/path/to/file.xyz', p.icon_name
+  end
+
+  should 'not crach when accepts? method receives a pure article' do
+    assert_nothing_raised do
+      FilePresenter.for Article.new
+    end
+  end
+
+  should 'not crach when accepts? method receives a non-sense object' do
+    assert_nothing_raised do
+      FilePresenter.for nil
+    end
+    assert_nothing_raised do
+      FilePresenter.for({:key => 'value'})
+    end
+    assert_nothing_raised do
+      FilePresenter.for 'a string'
+    end
+  end
+
+end
@@ -26,6 +26,7 @@ class FolderHelperTest &lt; ActiveSupport::TestCase
   should 'display icon for images' do
     profile = fast_create(Profile)
     file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => profile)
+    file = FilePresenter.for file
     process_delayed_job_queue
     assert_match /rails_icon\.png/, icon_for_article(file.reload)
@@ -23,7 +23,6 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
   should 'list links' do
     l = LinkListBlock.new(:links => [{:name => 'products', :address => '/cat/products'}])
-    l.expects(:links).returns([{:name => 'products', :address => '/cat/products'}])
     assert_match /products/, l.content
   end
@@ -83,4 +82,8 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
     assert_equal 'always', block.display
   end
+  should 'have options for links target' do
+    assert_equivalent LinkListBlock::TARGET_OPTIONS.map {|t|t[1]}, ['_self', '_blank', '_new']
+  end
+
 end
@@ -61,6 +61,10 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
   end
   should 'dispatch_first method returns the first plugin response if there is many plugins to responde the event' do
+    class Noosfero::Plugin
+      def random_event
+      end
+    end
     class Plugin1 < Noosfero::Plugin
       def random_event
@@ -2,6 +2,8 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class ProfileListBlockTest < ActiveSupport::TestCase
+  include ActionView::Helpers::TagHelper
+
   should 'describe itself' do
     assert_not_equal Block.description, ProfileListBlock.description
   end
@@ -32,6 +34,7 @@ class ProfileListBlockTest &lt; ActiveSupport::TestCase
     self.expects(:profile_image_link).with(person2, :minor).once
     self.expects(:profile_image_link).with(person3, :minor).once
+    self.stubs(:tag).returns('<div></div>')
     self.expects(:content_tag).returns('<div></div>').at_least_once
     self.expects(:block_title).returns('block title').at_least_once
 require File.dirname(__FILE__) + '/../test_helper'
 class SpammerLoggerTest < ActiveSupport::TestCase
-
-  def setup
-    SpammerLogger.reload_log
-  end
-
-  def teardown
-    SpammerLogger.clean_log
-  end
-
   should 'log the spammer ip' do
     SpammerLogger.log('192.168.0.1')
     log = File.open('log/test_spammers.log')
@@ -22,5 +13,4 @@ class SpammerLoggerTest &lt; ActiveSupport::TestCase
     log = File.open('log/test_spammers.log')
     assert_match "Comment-id: #{comment.id} IP: 192.168.0.1", log.read
   end
-
 end
@@ -150,5 +150,78 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
     assert_match(/#{task.name}.*suggested the publication of the article: #{task.subject}/, email.subject)
   end
+  class EverythingIsSpam < Noosfero::Plugin
+    def check_for_spam(object)
+      object.spam!
+    end
+  end
+
+  should 'delegate spam detection to plugins' do
+    Environment.default.enable_plugin(EverythingIsSpam)
+
+    t1 = build(SuggestArticle, :target => @profile, :article_name => 'suggested article', :name => 'johndoe', :email => 'johndoe@example.com')
+
+    EverythingIsSpam.any_instance.expects(:check_for_spam)
+
+    t1.check_for_spam
+  end
+
+  class SpamNotification < Noosfero::Plugin
+    class << self
+      attr_accessor :marked_as_spam
+      attr_accessor :marked_as_ham
+    end
+
+    def check_for_spam(c)
+      # do nothing
+    end
+
+    def marked_as_spam(c)
+      self.class.marked_as_spam = c
+    end
+
+    def marked_as_ham(c)
+      self.class.marked_as_ham = c
+    end
+  end
+
+  should 'notify plugins of suggest_articles being marked as spam' do
+    Environment.default.enable_plugin(SpamNotification)
+
+    t = SuggestArticle.create!(:target => @profile, :article_name => 'suggested article', :name => 'johndoe', :article_body => 'wanna feel my body? my body baaaby', :email => 'johndoe@example.com')
+
+    t.spam!
+    process_delayed_job_queue
+
+    assert_equal t, SpamNotification.marked_as_spam
+  end
+
+  should 'notify plugins of suggest_articles being marked as ham' do
+    Environment.default.enable_plugin(SpamNotification)
+
+    t = SuggestArticle.create!(:target => @profile, :article_name => 'suggested article', :name => 'johndoe', :article_body => 'wanna feel my body? my body baaaby', :email => 'johndoe@example.com')
+
+    t.ham!
+    process_delayed_job_queue
+
+    assert_equal t, SpamNotification.marked_as_ham
+  end
+
+  should 'store User-Agent' do
+    t = SuggestArticle.new(:user_agent => 'foo')
+    assert_equal 'foo', t.user_agent
+  end
+
+  should 'store referrer' do
+    t = SuggestArticle.new(:referrer => 'bar')
+    assert_equal 'bar', t.referrer
+  end
+
+  should 'log spammer ip after marking comment as spam' do
+    t = SuggestArticle.create!(:target => @profile, :article_name => 'suggested article', :name => 'johndoe', :article_body => 'wanna feel my body? my body baaaby', :email => 'johndoe@example.com', :ip_address => '192.168.0.1')
+    t.spam!
+    log = File.open('log/test_spammers.log')
+    assert_match "SuggestArticle-id: #{t.id} IP: 192.168.0.1", log.read
+  end
 end
@@ -372,6 +372,55 @@ class TaskTest &lt; ActiveSupport::TestCase
     assert_includes Task.closed, canceled
   end
+  should 'be ham by default' do # ham means not spam
+    assert_equal false, Task.create.spam
+  end
+
+  should 'be able to mark tasks as spam/ham/unknown' do
+    t = Task.new
+    t.spam = true
+    assert t.spam?
+    assert !t.ham?
+
+    t.spam = false
+    assert t.ham?
+    assert !t.spam?
+
+    t.spam = nil
+    assert !t.spam?
+    assert !t.ham?
+  end
+
+  should 'be able to select non-spam tasks' do
+    t1 = fast_create(Task)
+    t2 = fast_create(Task, :spam => false)
+    t3 = fast_create(Task, :spam => true)
+
+    assert_equivalent [t1,t2], Task.without_spam
+  end
+
+  should 'be able to select spam tasks' do
+    t1 = fast_create(Task)
+    t2 = fast_create(Task, :spam => false)
+    t3 = fast_create(Task, :spam => true)
+
+    assert_equivalent [t3], Task.spam
+  end
+
+  should 'be able to mark as spam' do
+    t1 = fast_create(Task)
+    t1.spam!
+    t1.reload
+    assert t1.spam?
+  end
+
+  should 'be able to mark as ham' do
+    t1 = fast_create(Task)
+    t1.ham!
+    t1.reload
+    assert t1.ham?
+  end
+
   protected
   def sample_user
@@ -7,13 +7,6 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
   end
   attr_reader :profile
-  should 'return a thumbnail as icon for images ' do
-    f = UploadedFile.new
-    f.expects(:image?).returns(true)
-    f.expects(:public_filename).with(:icon).returns('/path/to/file.xyz')
-    assert_equal '/path/to/file.xyz', UploadedFile.icon_name(f)
-  end
-
   should 'return a default icon for uploaded files' do
     assert_equal 'upload-file', UploadedFile.icon_name
   end
@@ -113,8 +106,11 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
     p = create_user('test_user').person
     file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'), :profile => p)
+    ENV.stubs('[]').with('RAILS_ENV').returns('other')
+    Rails.logger.expects(:warn) # warn about deprecatede usage of UploadedFile#to_html
+    stubs(:puts)
     stubs(:content_tag).returns('link')
-    expects(:link_to).with(file.name, file.url, :class => file.css_class_name)
+    expects(:link_to).with(file.name, file.url)
     instance_eval(&file.to_html)
   end
@@ -206,13 +202,6 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
     file.destroy
   end
-  should 'return the default thumbnail image as icon for images ' do
-    f = UploadedFile.new
-    f.expects(:image?).returns(true)
-    f.expects(:public_filename).with(:icon).returns('/path/to/file.xyz')
-    assert_equal '/path/to/file.xyz', UploadedFile.icon_name(f)
-  end
-
   should 'store width and height after processing' do
     file = UploadedFile.create!(:profile => @profile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
     file.create_thumbnails
@@ -287,12 +276,6 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
     assert_equal '', f.lead
   end
-  should 'survive when try to get icon_name from a file with mime_type nil' do
-    f = UploadedFile.new
-    f.expects(:mime_type).returns(nil)
-    assert_equal 'upload-file', UploadedFile.icon_name(f)
-  end
-
   should 'upload to a folder with same name as the schema if database is postgresql' do
     uses_postgresql 'image_schema_one'
     file1 = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => @profile)
@@ -352,4 +335,26 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
     assert_equal 1, ActionTracker::Record.find_all_by_verb('upload_image').count
   end
+  {
+    nil       => 5.megabytes,   # default
+    '1KB'     => 1.kilobytes,
+    '2MB'     => 2.megabyte,
+    '3GB'     => 3.gigabytes,
+    '4TB'     => 4.terabytes,
+    '6 MB'    => 6.megabytes,   # allow whitespace between number and unit
+    '0.5 GB'  => 512.megabytes, # allow floating point numbers
+    '2'       => 2.megabytes,   # assume MB as unit by default
+    'INVALID' => 5.megabytes,   # use default for invalid input
+    '1ZYX'    => 5.megabytes,   # use default for invalid input
+  }.each do |input,output|
+    test 'maximum upload size: convert %s into %s' % [input, output] do
+      NOOSFERO_CONF.expects(:[]).with('max_upload_size').returns(input)
+      assert_equal output, UploadedFile.max_size
+    end
+  end
+  test 'max_size should always return an integer' do
+    NOOSFERO_CONF.expects(:[]).with('max_upload_size').returns("0.5 GB")
+    assert_instance_of Fixnum, UploadedFile.max_size
+  end
+
 end
 # monkey patch to add comments on action_tracker
-ActionTracker::Record.module_eval do
+Rails.configuration.to_prepare do
+  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}'
+    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 COUNT(*) 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
+    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}' AND reply_of_id IS NULL"
     end
-    root
-  end
+  end
 end
 Delayed::Worker.module_eval do
   # based on https://groups.google.com/forum/#!topic/delayed_job/ZGMUFFppNgs
   class Delayed::Worker::ExceptionNotification < ActionMailer::Base
-    def mail error
+    def mail job, error
       environment = Environment.default
       recipients NOOSFERO_CONF['exception_recipients']
       from       environment.contact_email
       reply_to   environment.contact_email
-      subject    "[#{environment.name}] DelayedJob: #{error.message}"
-      body       render(:text => error.backtrace.join("\n"))
+      subject    "[#{environment.name}] DelayedJob ##{job.id}: #{error.message}"
+      body       render(:text => "
+Job:
+#{job.inspect}
+
+Handler:
+#{job.handler}
+
+Backtrace:
+#{error.backtrace.join("\n")}
+      ")
     end
   end
   def handle_failed_job_with_notification(job, error)
-    Delayed::Worker::ExceptionNotification.deliver_mail error if NOOSFERO_CONF['exception_recipients'].present?
+    Delayed::Worker::ExceptionNotification.deliver_mail job, error if NOOSFERO_CONF['exception_recipients'].present?
     handle_failed_job_without_notification job, error
   end
   alias_method_chain :handle_failed_job, :notification
	@@ -52,3 +52,12 @@ If you write such script for your own OS, please share it with us at the		@@ -52,3 +52,12 @@ If you write such script for your own OS, please share it with us at the
52	development mailing list so that we can include it in the official repository.	52	development mailing list so that we can include it in the official repository.
53	This way other people using the same OS will have to put less effort to develop	53	This way other people using the same OS will have to put less effort to develop
54	Noosfero.	54	Noosfero.
		55	+
		56	+== Submitting your changes back
		57	+
		58	+For now please read:
		59	+
		60	+- Coding conventions
		61	+ http://noosfero.org/Development/CodingConventions
		62	+- Patch guidelines
		63	+ http://noosfero.org/Development/PatchGuidelines
	@@ -1,13 +0,0 @@	@@ -1,13 +0,0 @@
1	-This is a draft of how to create a environment to Rails 2.3.5 to Noosfero
2	-development.
3	-
4	-Install dependencies:
5	-
6	-gem install rails -v 2.3.5
7	-gem install i18n
8	-gem install will_paginate -v 2.3.12
9	-gem install cucumber
10	-
11	-Creating initial environment:
12	-
13	-rake db:schema:load
	@@ -6,7 +6,7 @@ To configure XMPP/BOSH in Noosfero you need:		@@ -6,7 +6,7 @@ To configure XMPP/BOSH in Noosfero you need:
6	* SystemTimer - http://ph7spot.com/musings/system-timer	6	* SystemTimer - http://ph7spot.com/musings/system-timer
7	* Pidgin data files - http://www.pidgin.im/	7	* Pidgin data files - http://www.pidgin.im/
8		8
9	-If you use Debian Wheezy:	9	+If you use Debian 6.0 (squeeze):
10		10
11	# apt-get install librestclient-ruby pidgin-data ruby1.8-dev	11	# apt-get install librestclient-ruby pidgin-data ruby1.8-dev
12	# gem install SystemTimer	12	# gem install SystemTimer
1	-noosfero - a web-based social platform	1	+Noosfero - a web-based social platform
2	======================================	2	======================================
3		3
4	-:: About the project	4	+http://www.noosfero.org/
5		5
6	-Homepage: http://www.noosfero.org/	6	+Documentation
		7	+-------------
7		8
8	-:: Authors and copyright	9	+The following documentation is available:
9		10
10	-Authors: see file AUTHORS
11	-Copyright information: see file COPYRIGHT
12	-Full license text; see file COPYING	11	+File Purpose
		12	+~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
		13	+INSTALL install instructions
		14	+INSTALL.awstats install instructions - access statistics service
		15	+INSTALL.chat install instructions - chat service
		16	+INSTALL.email install instructions - email service
		17	+INSTALL.multitenancy install instructions - multiple sites
		18	+INSTALL.varnish install instructions - varnish HTTP caching (recommended)
		19	+HACKING development instruction
		20	+RELEASING instructions for doing releases
		21	+doc/noosfero/* user documentation (available through the app itself)
		22	+
		23	+
		24	+Authors and copyright
		25	+---------------------
		26	+
		27	+Authorship and copyright information is available in the files listed below.
		28	+
		29	+File Purpose
		30	+~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
		31	+AUTHORS list of authors (updated at each release)
		32	+COPYRIGHT Copyright statement for the project
		33	+COPYING Full text of the project license
	@@ -4,7 +4,7 @@ class ProfileEditorController < MyProfileController		@@ -4,7 +4,7 @@ class ProfileEditorController < MyProfileController
4	protect 'destroy_profile', :profile, :only => [:destroy_profile]	4	protect 'destroy_profile', :profile, :only => [:destroy_profile]
5		5
6	def index	6	def index
7	- @pending_tasks = Task.to(profile).pending.select{\|i\| user.has_permission?(i.permission, profile)}	7	+ @pending_tasks = Task.to(profile).pending.without_spam.select{\|i\| user.has_permission?(i.permission, profile)}
8	end	8	end
9		9
10	helper :profile	10	helper :profile
	@@ -4,12 +4,12 @@ class TasksController < MyProfileController		@@ -4,12 +4,12 @@ class TasksController < MyProfileController
4		4
5	def index	5	def index
6	@filter = params[:filter_type].blank? ? nil : params[:filter_type]	6	@filter = params[:filter_type].blank? ? nil : params[:filter_type]
7	- @tasks = Task.to(profile).pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])	7	+ @tasks = Task.to(profile).without_spam.pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
8	@failed = params ? params[:failed] : {}	8	@failed = params ? params[:failed] : {}
9	end	9	end
10		10
11	def processed	11	def processed
12	- @tasks = Task.to(profile).closed.sort_by(&:created_at)	12	+ @tasks = Task.to(profile).without_spam.closed.sort_by(&:created_at)
13	end	13	end
14		14
15	VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]	15	VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]
	@@ -57,7 +57,7 @@ class TasksController < MyProfileController		@@ -57,7 +57,7 @@ class TasksController < MyProfileController
57	end	57	end
58		58
59	def list_requested	59	def list_requested
60	- @tasks = Task.find_all_by_requestor_id(profile.id)	60	+ @tasks = Task.without_spam.find_all_by_requestor_id(profile.id)
61	end	61	end
62		62
63	def ticket_details	63	def ticket_details
	@@ -206,10 +206,50 @@ class ProfileController < PublicController		@@ -206,10 +206,50 @@ class ProfileController < PublicController
206	end	206	end
207		207
208	def view_more_network_activities	208	def view_more_network_activities
209	- @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page])	209	+ @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page])
210	render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}	210	render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}
211	end	211	end
212		212
		213	+ def more_comments
		214	+ activity = ActionTracker::Record.find(:first, :conditions => {:id => params[:activity], :user_id => @profile})
		215	+ comments_count = activity.comments.count
		216	+ comment_page = (params[:comment_page] \|\| 1).to_i
		217	+ comments_per_page = 5
		218	+ no_more_pages = comments_count <= comment_page * comments_per_page
		219	+
		220	+ render :update do \|page\|
		221	+ page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity],
		222	+ :partial => 'comment', :collection => activity.comments.paginate(:per_page => comments_per_page, :page => comment_page)
		223	+
		224	+ if no_more_pages
		225	+ page.remove 'profile-wall-activities-comments-more-'+params[:activity]
		226	+ else
		227	+ page.replace_html 'profile-wall-activities-comments-more-'+params[:activity],
		228	+ :partial => 'more_comments', :locals => {:activity => activity, :comment_page => comment_page}
		229	+ end
		230	+ end
		231	+ end
		232	+
		233	+ def more_replies
		234	+ activity = Scrap.find(:first, :conditions => {:id => params[:activity], :receiver_id => @profile, :scrap_id => nil})
		235	+ comments_count = activity.replies.count
		236	+ comment_page = (params[:comment_page] \|\| 1).to_i
		237	+ comments_per_page = 5
		238	+ no_more_pages = comments_count <= comment_page * comments_per_page
		239	+
		240	+ render :update do \|page\|
		241	+ page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity],
		242	+ :partial => 'profile_scrap', :collection => activity.replies.paginate(:per_page => comments_per_page, :page => comment_page), :as => :scrap
		243	+
		244	+ if no_more_pages
		245	+ page.remove 'profile-wall-activities-comments-more-'+params[:activity]
		246	+ else
		247	+ page.replace_html 'profile-wall-activities-comments-more-'+params[:activity],
		248	+ :partial => 'more_replies', :locals => {:activity => activity, :comment_page => comment_page}
		249	+ end
		250	+ end
		251	+ end
		252	+
213	def remove_scrap	253	def remove_scrap
214	begin	254	begin
215	scrap = current_user.person.scraps(params[:scrap_id])	255	scrap = current_user.person.scraps(params[:scrap_id])
	@@ -343,6 +383,7 @@ class ProfileController < PublicController		@@ -343,6 +383,7 @@ class ProfileController < PublicController
343	end	383	end
344	end	384	end
345		385
		386	+
346	protected	387	protected
347		388
348	def check_access_to_profile	389	def check_access_to_profile
	@@ -393,4 +434,5 @@ class ProfileController < PublicController		@@ -393,4 +434,5 @@ class ProfileController < PublicController
393	def relations_to_include	434	def relations_to_include
394	[:image, :domains, :preferred_domain, :environment]	435	[:image, :domains, :preferred_domain, :environment]
395	end	436	end
		437	+
396	end	438	end
	@@ -42,7 +42,7 @@ module BlogHelper		@@ -42,7 +42,7 @@ module BlogHelper
42		42
43	def display_post(article, format = 'full')	43	def display_post(article, format = 'full')
44	no_comments = (format == 'full') ? false : true	44	no_comments = (format == 'full') ? false : true
45	- html = send("display_#{format}_format", article).html_safe	45	+ html = send("display_#{format}_format", FilePresenter.for(article)).html_safe
46		46
47	article_title(article, :no_comments => no_comments) + html	47	article_title(article, :no_comments => no_comments) + html
48	end	48	end
	@@ -3,10 +3,21 @@ module CategoriesHelper		@@ -3,10 +3,21 @@ module CategoriesHelper
3		3
4	COLORS = [	4	COLORS = [
5	[ N_('Do not display at the menu'), nil ],	5	[ N_('Do not display at the menu'), nil ],
6	- [ N_('Orange'), 1 ],
7	- [ N_('Green'), 2 ],
8	- [ N_('Purple'), 3 ],
9	- [ N_('Red'), 4 ],	6	+ [ N_('Orange'), 1],
		7	+ [ N_('Green'), 2],
		8	+ [ N_('Purple'), 3],
		9	+ [ N_('Red'), 4],
		10	+ [ N_('Dark Green'), 5],
		11	+ [ N_('Blue Oil'), 6],
		12	+ [ N_('Blue'), 7],
		13	+ [ N_('Brown'), 8],
		14	+ [ N_('Light Green'), 9],
		15	+ [ N_('Light Blue'), 10],
		16	+ [ N_('Dark Blue'), 11],
		17	+ [ N_('Blue Pool'), 12],
		18	+ [ N_('Beige'), 13],
		19	+ [ N_('Yellow'), 14],
		20	+ [ N_('Light Brown'), 15]
10	]	21	]
11		22
12	TYPES = [	23	TYPES = [
	@@ -33,7 +33,7 @@ module CmsHelper		@@ -33,7 +33,7 @@ module CmsHelper
33	link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)	33	link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)
34	else	34	else
35	if article.image?	35	if article.image?
36	- image_tag(icon_for_article(article)) + link_to(article_name, article.url)	36	+ image_tag(icon_for_article(article)) + link_to(article_name, article.url)
37	else	37	else
38	link_to article_name, article.url, :class => icon_for_article(article)	38	link_to article_name, article.url, :class => icon_for_article(article)
39	end	39	end