updating with rails3 branch

Leandro Santos
1 parent ceb06403
Showing 129 changed files with 2121 additions and 1531 deletions Show diff stats
Gemfile
Gemfile.lock
app/controllers/admin/admin_panel_controller.rb
app/controllers/admin/environment_design_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/helpers/application_helper.rb
app/helpers/sweeper_helper.rb
app/models/approve_article.rb
app/models/article.rb
app/models/box.rb
app/models/categories_block.rb
app/models/community.rb
app/models/enterprise.rb
app/models/environment.rb
app/models/friends_block.rb
app/models/members_block.rb
app/models/organization.rb
app/models/people_block.rb
app/models/person.rb
@@ -26,6 +26,7 @@ end
 group :test do
   gem 'rspec'
   gem 'rspec-rails'
+  gem 'mocha', :require => false
 end
 group :cucumber do
@@ -61,7 +61,7 @@ GEM
     database_cleaner (1.2.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    eventmachine (0.12.11)
+    eventmachine (1.0.3)
     fast_gettext (0.6.8)
     ffi (1.0.11)
     gherkin (2.4.21)
@@ -75,7 +75,10 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    metaclass (0.0.4)
     mime-types (1.19)
+    mocha (0.11.3)
+      metaclass (~> 0.0.1)
     multi_json (1.3.6)
     nokogiri (1.5.5)
     pg (0.13.2)
@@ -164,6 +167,7 @@ DEPENDENCIES
   database_cleaner
   fast_gettext
   hpricot
+  mocha
   nokogiri
   pg
   prototype-rails
@@ -7,6 +7,7 @@ class AdminPanelController &lt; AdminController
   end
   def site_info
+    @no_design_blocks = true
     if request.post?
       if params[:environment][:languages]
         params[:environment][:languages] = params[:environment][:languages].map {|lang, value| lang if value=='true'}.compact
@@ -5,7 +5,7 @@ class EnvironmentDesignController &lt; BoxOrganizerController
   def available_blocks
     # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
     #      the Noosfero core soon, see ActionItem3045
-    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
+    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
     @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
   end
@@ -144,6 +144,7 @@ class CmsController &lt; MyProfileController
     @article.profile = profile
     @article.last_changed_by = user
+    @article.created_by = user
     translations if @article.translatable?
@@ -9,14 +9,8 @@ class ProfileDesignController &lt; BoxOrganizerController
     blocks += plugins.dispatch(:extra_blocks)
-    # blocks exclusive for organizations
-    if profile.has_members?
-      blocks << MembersBlock
-    end
-
     # blocks exclusive to people
     if profile.person?
-      blocks << FriendsBlock
       blocks << FavoriteEnterprisesBlock
       blocks << CommunitiesBlock
       blocks << EnterprisesBlock
@@ -1034,7 +1034,7 @@ module ApplicationHelper
     end
     link_to(content_tag(:span, _('Contents'), :class => 'icon-menu-articles'), {:controller => "search", :action => 'contents', :category_path => nil}, :id => 'submenu-contents') +
-    link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
+    link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
   end
   alias :browse_contents_menu :search_contents_menu
@@ -1050,7 +1050,7 @@ module ApplicationHelper
      end
     link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "search", :action => 'people', :category_path => ''}, :id => 'submenu-people') +
-    link_to(content_tag(:span, _('People menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')
+    link_to(content_tag(:span, _('People menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')
   end
   alias :browse_people_menu :search_people_menu
@@ -1066,7 +1066,7 @@ module ApplicationHelper
      end
     link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "search", :action => 'communities'}, :id => 'submenu-communities') +
-    link_to(content_tag(:span, _('Communities menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
+    link_to(content_tag(:span, _('Communities menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
   end
   alias :browse_communities_menu :search_communities_menu
@@ -18,9 +18,7 @@ module SweeperHelper
       expire_timeout_fragment(profile.manage_friends_cache_key(:npage => i.to_s))
     end
-    # friends blocks
-    blocks = profile.blocks.select{|b| b.kind_of?(FriendsBlock)}
-    BlockSweeper.expire_blocks(blocks)
+    expire_blocks_cache(profile, [:profile])
   end
   def expire_communities(profile)
@@ -48,7 +48,7 @@ class ApproveArticle &lt; Task
   end
   def perform
-    article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.author_id)
+    article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.last_changed_by_id, :created_by_id => article.created_by_id)
   end
   def title
@@ -40,12 +40,6 @@ class Article &lt; ActiveRecord::Base
   # xss_terminate plugin can't sanitize array fields
   before_save :sanitize_tag_list
-  before_create do |article|
-    if article.last_changed_by_id
-      article.author_name = Person.find(article.last_changed_by_id).name
-    end
-  end
-
   belongs_to :profile
   validates_presence_of :profile_id, :name
   validates_presence_of :slug, :path, :if => lambda { |article| !article.name.blank? }
@@ -55,6 +49,7 @@ class Article &lt; ActiveRecord::Base
   validates_uniqueness_of :slug, :scope => ['profile_id', 'parent_id'], :message => N_('The title (article name) is already being used by another article, please use another title.'), :if => lambda { |article| !article.slug.blank? }
   belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
+  belongs_to :created_by, :class_name => 'Person', :foreign_key => 'created_by_id'
   has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
@@ -89,6 +84,11 @@ class Article &lt; ActiveRecord::Base
         article.parent = article.profile.blog
       end
     end
+
+    if article.created_by
+      article.author_name = article.created_by.name
+    end
+
   end
   after_destroy :destroy_activity
@@ -205,6 +205,10 @@ class Article &lt; ActiveRecord::Base
   acts_as_versioned
   self.non_versioned_columns << 'setting'
+  def version_condition_met?
+    (['name', 'body', 'abstract', 'filename', 'start_date', 'end_date', 'image_id', 'license_id'] & changed).length > 0
+  end
+
   def comment_data
     comments.map {|item| [item.title, item.body].join(' ') }.join(' ')
   end
@@ -630,17 +634,13 @@ class Article &lt; ActiveRecord::Base
   def author(version_number = nil)
     if version_number
-      version = versions.find_by_version(version_number)
+      version = self.versions.find_by_version(version_number)
       author_id = version.last_changed_by_id if version
-      Person.exists?(author_id) ? Person.find(author_id) : nil
     else
-      if versions.empty?
-        last_changed_by
-      else
-        author_id = versions.first.last_changed_by_id
-        Person.exists?(author_id) ? Person.find(author_id) : nil
-      end
+      author_id = self.created_by_id
     end
+
+    environment.people.find_by_id(author_id)
   end
   def author_name(version_number = nil)
@@ -34,14 +34,11 @@ class Box &lt; ActiveRecord::Base
       FansBlock,
       FavoriteEnterprisesBlock,
       FeedReaderBlock,
-      FriendsBlock,
       HighlightsBlock,
       LinkListBlock,
       LoginBlock,
       MainBlock,
-      MembersBlock,
       MyNetworkBlock,
-      PeopleBlock,
       ProfileImageBlock,
       RawHTMLBlock,
       RecentDocumentsBlock,
@@ -63,14 +60,11 @@ class Box &lt; ActiveRecord::Base
       FavoriteEnterprisesBlock,
       FeaturedProductsBlock,
       FeedReaderBlock,
-      FriendsBlock,
       HighlightsBlock,
       LinkListBlock,
       LocationBlock,
       LoginBlock,
-      MembersBlock,
       MyNetworkBlock,
-      PeopleBlock,
       ProductsBlock,
       ProductCategoriesBlock,
       ProfileImageBlock,
@@ -8,6 +8,8 @@ class CategoriesBlock &lt; Block
   settings_items :category_types, :type => Array, :default => []
+  attr_accessible :category_types
+
   def self.description
     _("Categories Menu")
   end
 class Community < Organization
-  attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type
+  attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type, :address_reference, :district, :tag_list, :language
   after_destroy :check_invite_member_for_destroy
   def self.type_name
@@ -85,10 +85,6 @@ class Community &lt; Organization
     recent_documents(limit, ["articles.type != ? AND articles.highlighted = ?", 'Folder', highlight])
   end
-  def blocks_to_expire_cache
-    [MembersBlock]
-  end
-
   def each_member(offset=0)
     while member = self.members.first(:order => :id, :offset => offset)
       yield member
@@ -2,6 +2,8 @@
 # only enterprises can offer products and services.
 class Enterprise < Organization
+  attr_accessible :business_name, :address_reference, :district, :tag_list, :organization_website, :historic_and_current_context, :activities_short_description, :products_per_catalog_page
+
   SEARCH_DISPLAYS += %w[map full]
   def self.type_name
@@ -3,7 +3,7 @@
 # domains.
 class Environment < ActiveRecord::Base
-  attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound
+  attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound, :noreply_email, :signup_welcome_screen_body
   has_many :users
@@ -182,7 +182,6 @@ class Environment &lt; ActiveRecord::Base
     # "right" area
     env.boxes[2].blocks << CommunitiesBlock.new(:limit => 6)
-    env.boxes[2].blocks << PeopleBlock.new(:limit => 6)
   end
   # One Environment can be reached by many domains
@@ -298,6 +297,12 @@ class Environment &lt; ActiveRecord::Base
   settings_items :access_control_allow_origin, :type => Array, :default => []
   settings_items :access_control_allow_methods, :type => String
+  settings_items :signup_welcome_screen_body, :type => String
+
+  def has_custom_welcome_screen?
+    settings[:signup_welcome_screen_body].present?
+  end
+
   def news_amount_by_folder=(amount)
     settings[:news_amount_by_folder] = amount.to_i
   end
@@ -1,26 +0,0 @@
-class FriendsBlock < ProfileListBlock
-
-  def self.description
-    _('Friends')
-  end
-
-  def default_title
-    n_('{#} friend', '{#} friends', profile_count)
-  end
-
-  def help
-    _('This block displays your friends.')
-  end
-
-  def footer
-    owner_id = owner.identifier
-    proc do
-      link_to s_('friends|View all'), :profile => owner_id, :controller => 'profile', :action => 'friends'
-    end
-  end
-
-  def profiles
-    owner.friends
-  end
-
-end
@@ -1,52 +0,0 @@
-class MembersBlock < ProfileListBlock
-  settings_items :show_join_leave_button, :type => :boolean, :default => false
-
-  attr_accessible :show_join_leave_button
-
-  def self.description
-    _('Members')
-  end
-
-  def default_title
-    _('{#} members')
-  end
-
-  def help
-    _('This block presents the members of a collective.')
-  end
-
-  def footer
-    profile = self.owner
-    s = show_join_leave_button
-
-    proc do
-      render :file => 'blocks/members', :locals => { :profile => profile, :show_join_leave_button => s}
-    end
-  end
-
-  def profiles
-    owner.members
-  end
-
-  def extra_option
-    data = {
-      :human_name => _("Show join leave button"),
-      :name => 'block[show_join_leave_button]',
-      :value => true,
-      :checked => show_join_leave_button,
-      :options => {}
-    }
-  end
-
-  def cache_key(language='en', user=nil)
-    logged = ''
-    if user
-      logged += '-logged-in'
-      if user.is_member_of? self.owner
-        logged += '-member'
-      end
-    end
-    super + logged
-  end
-
-end
@@ -123,7 +123,7 @@ class Organization &lt; Profile
     [
       [MainBlock.new],
       [ProfileImageBlock.new, LinkListBlock.new(:links => links)],
-      [MembersBlock.new, RecentDocumentsBlock.new]
+      [RecentDocumentsBlock.new]
     ]
   end
@@ -1,25 +0,0 @@
-class PeopleBlock < ProfileListBlock
-
-  def default_title
-    _('People')
-  end
-
-  def help
-    _('Clicking a person takes you to his/her homepage')
-  end
-
-  def self.description
-    _('Random people')
-  end
-
-  def profiles
-    owner.people
-  end
-
-  def footer
-    lambda do |context|
-      link_to _('View all'), :controller => 'search', :action => 'people'
-    end
-  end
-
-end
 # A person is the profile of an user holding all relationships with the rest of the system
 class Person < Profile
-  attr_accessible :organization, :contact_information, :sex, :birth_date
+  attr_accessible :organization, :contact_information, :sex, :birth_date, :cell_phone, :comercial_phone, :jabber_id, :personal_website, :nationality, :address_reference, :district, :schooling, :schooling_status, :formation, :custom_formation, :area_of_study, :custom_area_of_study, :professional_activity, :organization_website
   SEARCH_FILTERS += %w[
     more_popular
@@ -269,7 +269,7 @@ class Person &lt; Profile
     [
       [MainBlock.new],
       [ProfileImageBlock.new(:show_name => true), LinkListBlock.new(:links => links), RecentDocumentsBlock.new],
-      [FriendsBlock.new, CommunitiesBlock.new]
+      [CommunitiesBlock.new]
     ]
   end
@@ -18,9 +18,9 @@ class ProfileListBlock &lt; Block
     result = nil
     visible_profiles = profiles.visible.includes([:image,:domains,:preferred_domain,:environment])
     if !prioritize_profiles_with_image
-      result = visible_profiles.all(:limit => limit, :order => 'updated_at DESC').sort_by{ rand }
+      result = visible_profiles.all(:limit => limit, :order => 'profiles.updated_at DESC').sort_by{ rand }
     elsif profiles.visible.with_image.count >= limit
-      result = visible_profiles.with_image.all(:limit => limit * 5, :order => 'updated_at DESC').sort_by{ rand }
+      result = visible_profiles.with_image.all(:limit => limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
     else
       result = visible_profiles.with_image.sort_by{ rand } + visible_profiles.without_image.all(:limit => limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
     end
@@ -34,8 +34,7 @@ protected
       expire_timeout_fragment(profile.manage_friends_cache_key(:npage => i.to_s))
     end
-    blocks = profile.blocks.select{|b| b.kind_of?(FriendsBlock)}
-    BlockSweeper.expire_blocks(blocks)
+    expire_blocks_cache(profile, [:profile])
   end
 end
 <% if @register_pending %>
-<div id='thanks-for-signing'>
-  <h1><%= _("Welcome to %s!") % environment.name %></h1>
-  <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
-  <p><%= _("Firstly, some tips for getting started:") %></p>
-  <h4><%= _("Confirm your account!") %></h4>
-  <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p>
-  <p><%= _("You won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
-  <h4><%= _("What to do next?") %></h4>
-  <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
-  <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
-  <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
-  <p><%= _("Start exploring and have fun!") %></p>
-</div>
+  <div id='thanks-for-signing'>
+    <% if environment.has_custom_welcome_screen? %>
+      <%= environment.settings[:signup_welcome_screen_body].html_safe %>
+    <% else %>
+        <h1><%= _("Welcome to %s!") % environment.name %></h1>
+        <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
+        <p><%= _("Firstly, some tips for getting started:") %></p>
+        <h4><%= _("Confirm your account!") %></h4>
+        <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p>
+        <p><%= _("You won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
+        <h4><%= _("What to do next?") %></h4>
+        <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
+        <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
+        <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
+        <p><%= _("Start exploring and have fun!") %></p>
+    <% end %>
+  </div>
 <% else %>
   <h1><%= _('Sign up for %s!') % environment.name %></h1>
   <%= render :partial => 'signup_form' %>
@@ -0,0 +1,5 @@
+<div class='description'>
+  <%= _('This text will be showed as a welcome message to users after signup') %><br/><br/>
+</div>
+
+<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
@@ -12,6 +12,8 @@
     :content => (render :partial => 'terms_of_use', :locals => {:f => f})} %>
   <% tabs << {:title => _('Signup welcome text'), :id => 'signup-welcome-text',
     :content => (render :partial => 'signup_welcome_text', :locals => {:f => f})} %>
+  <% tabs << {:title => _('Signup welcome message'), :id => 'signup-welcome-message',
+    :content => (render :partial => 'signup_welcome_screen', :locals => {:f => f}) }%>
   <%= render_tabs(tabs) %>
   <% button_bar do %>
     <%= submit_button(:save, _('Save'), :cancel => {:action => 'index'}) %>
@@ -1,5 +0,0 @@
-<%= link_to _('View all'), :profile => profile.identifier, :controller => 'profile', :action => 'members' %>
-
-<% if show_join_leave_button %>
-  <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
-<% end %>
@@ -10,7 +10,7 @@
     <% if @page != profile.home_page && !@page.has_posts?  && @page.allow_delete?(user) && !remove_content_button(:delete)%>
       <% content = content_tag( 'span', _('Delete') ) %>
-      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page}) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page.id}) %>
       <% options = {:method => :post, :confirm => delete_article_message(@page)} %>
       <%= expirable_button @page, :delete, content, url, options %>
     <% end %>
@@ -19,9 +19,9 @@
       <% content = content_tag( 'span', _('Spread this') ) %>
       <% url = nil %>
       <% if profile.kind_of?(Person) %>
-        <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }) %>
+        <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %>
       <% elsif profile.kind_of?(Community) && environment.portal_community %>
-        <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }) %>
+        <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page.id }) %>
       <% end %>
       <%= expirable_button @page, :spread, content, url if url %>
     <% end %>
@@ -83,5 +83,10 @@
     <%= noosfero_layout_features %>
     <%= theme_javascript_ng %>
     <%= addthis_javascript %>
+    <%=
+      @plugins.dispatch(:body_ending).map do |content|
+        if content.respond_to?(:call) then instance_exec(&content).html_safe else content.html_safe end
+      end.join("\n")
+    %>
   </body>
 </html>
@@ -17,9 +17,9 @@
           <%= button_without_text :edit, _('Edit'), :action => 'change_role', :id => m %>
           <%= button_to_remote_without_text(:remove, _('Remove'),
                 :update => 'members-list',
-                :loading => j('$("members-list").addClassName("loading")'),
-                :success => j("$('tr-#{m.identifier}').show()"),
-                :complete => j('$("members-list").removeClassName("loading")'),
+                :loading => "$('members-list').addClassName('loading')",
+                :success => "$('tr-#{m.identifier}').show()",
+                :complete => "$('members-list').removeClassName('loading')",
                 :url => { :id => m }.merge(remove_action)) if m != user %>
         </div>
       </td>
   <%= i.file_field( :uploaded_data, { :onchange => 'updateImg(this.value)' } ) %>
-  <%= link_to_function(_('Cancel'), nil, :id => 'cancel-change-image-link', :class => 'button icon-cancel with-text', :style => 'display: none') do |page|
-    page['change-image-link'].show
-    page['change-image'].replace_html ''
-  end %>
+  <%= link_to_function(_('Cancel'), "jQuery('#change-image-link').show(); jQuery('#change-image').html('')", :id => 'cancel-change-image-link', :class => 'button icon-cancel with-text', :style => 'display: none') %>
@@ -2,10 +2,15 @@
   <br/>
-  <%= link_to_function(_('Change image'), nil, :id => 'change-image-link', :class => 'button icon-photos with-text') do |page|
-    page['change-image'].replace_html :partial => 'shared/change_image', :locals => { :i => i, :image => image }
-    page['change-image-link'].hide
-    page['cancel-change-image-link'].show
-  end %>
+  <%= link_to_function(_('Change image'), 'display_change_image()', :id => 'change-image-link', :class => 'button icon-photos with-text') %>
+
+  <script>
+    function display_change_image() {
+      var content = "<%= j(render :partial => 'shared/change_image', :locals => { :i => i, :image => image }) %>";
+      jQuery('#change-image').html(content);
+      jQuery('#change-image-link').hide();
+      jQuery('#cancel-change-image-link').show();
+    }
+  </script>
   <div id='change-image'> </div> <br/>
 <%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
-<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection) }) %>
+<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection, :join => @join) }) %>
 <%= _("Greetings,") %>
@@ -20,7 +20,7 @@ module Noosfero
     require 'noosfero/plugin'
     # Adds custom attributes to the Set of allowed html attributes for the #sanitize helper
-    config.action_view.sanitized_allowed_attributes = 'align', 'border', 'alt', 'vspace', 'hspace', 'width', 'heigth', 'value', 'type', 'data', 'style', 'target', 'codebase', 'archive', 'classid', 'code', 'flashvars', 'scrolling', 'frameborder', 'controls', 'autoplay'
+    config.action_view.sanitized_allowed_attributes = 'align', 'border', 'alt', 'vspace', 'hspace', 'width', 'heigth', 'value', 'type', 'data', 'style', 'target', 'codebase', 'archive', 'classid', 'code', 'flashvars', 'scrolling', 'frameborder', 'controls', 'autoplay', 'colspan', 'rowspan'
     # Adds custom tags to the Set of allowed html tags for the #sanitize helper
     config.action_view.sanitized_allowed_tags = 'object', 'embed', 'param', 'table', 'tr', 'th', 'td', 'applet', 'comment', 'iframe', 'audio', 'video', 'source'
@@ -0,0 +1 @@
+../../plugins/people_block
 \ No newline at end of file
@@ -0,0 +1,17 @@
+class AddCreatedByToArticle < ActiveRecord::Migration
+  def self.up
+    add_column :articles, :created_by_id, :integer
+    add_column :article_versions, :created_by_id, :integer
+
+    execute("UPDATE article_versions SET created_by_id = last_changed_by_id")
+
+    execute("UPDATE articles SET created_by_id = article_versions.created_by_id
+FROM article_versions WHERE article_versions.article_id = articles.id AND
+article_versions.version = 1")
+  end
+
+  def self.down
+    remove_column :articles, :created_by_id
+    remove_column :article_versions, :created_by_id
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20140408172149) do
+ActiveRecord::Schema.define(:version => 20140415125414) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -95,6 +95,7 @@ ActiveRecord::Schema.define(:version =&gt; 20140408172149) do
     t.integer  "license_id"
     t.integer  "image_id"
     t.integer  "position"
+    t.integer  "created_by_id"
   end
   add_index "article_versions", ["article_id"], :name => "index_article_versions_on_article_id"
@@ -140,6 +141,7 @@ ActiveRecord::Schema.define(:version =&gt; 20140408172149) do
     t.integer  "license_id"
     t.integer  "image_id"
     t.integer  "position"
+    t.integer  "created_by_id"
   end
   add_index "articles", ["comments_count"], :name => "index_articles_on_comments_count"
@@ -28,7 +28,8 @@ Feature: categories_block
   @selenium
   Scenario: List just product categories
-    Given I follow "Edit" within ".categories-block"
+    Given display ".button-bar"
+    And I follow "Edit" within ".categories-block"
     And I check "Product"
     When I press "Save"
     Then I should see "Food"
@@ -39,7 +40,8 @@ Feature: categories_block
   @selenium
   Scenario: Show submenu if it exists
-    Given I follow "Edit" within ".categories-block"
+    Given display ".button-bar"
+    And I follow "Edit" within ".categories-block"
     And I check "Product"
     And I press "Save"
     Then I should see "Food"
@@ -56,7 +58,8 @@ Feature: categories_block
   @selenium
   Scenario: Show only one submenu per time
-    Given I follow "Edit" within ".categories-block"
+    Given display ".button-bar"
+    And I follow "Edit" within ".categories-block"
     And I check "Product"
     And I press "Save"
     Then I should see "Book"
@@ -66,14 +69,16 @@ Feature: categories_block
   @selenium
   Scenario: List just general categories
-    Given I follow "Edit" within ".categories-block"
+    Given display ".button-bar"
+    And I follow "Edit" within ".categories-block"
     And I check "Generic category"
     When I press "Save"
     Then I should see "Wood"
   @selenium
   Scenario: List just regions
-    Given I follow "Edit" within ".categories-block"
+    Given display ".button-bar"
+    And I follow "Edit" within ".categories-block"
     And I check "Region"
     When I press "Save"
     Then I should see "Bahia"
@@ -12,7 +12,7 @@ Feature: edit profile
       | birth_date |
     When I go to joao's control panel
     And I follow "Edit Profile"
-    And I select "1980-11-15" from "profile_data_birth_date"
+    And I fill in "Birth date" with "1980-11-15"
     And I press "Save"
     Then I should not see "Birth date is invalid"
     And I should not see "Birth date is mandatory"
@@ -23,7 +23,7 @@ Feature: edit profile
       | birth_date |
     When I go to joao's control panel
     And I follow "Edit Profile"
-    And I select "1980-11-15" from "profile_data_birth_date"
+    And I fill in "Birth date" with "1980-11-15"
     And I press "Save"
     Then I should not see "Birth date is invalid"
     And I should not see "Birth date is mandatory"
@@ -9,9 +9,11 @@ Feature: my_network_block
     And the following blocks
       | owner     | type           |
       | joaosilva | MyNetworkBlock |
+      | joaosilva | FriendsBlock   |
     And the following communities
       | identifier       | name              | public_profile |
       | public-community | Public Community  | true           |
+    And plugin FriendsBlock is enabled on environment
   @selenium
   Scenario: display how many public/private communities I am member
@@ -46,6 +48,10 @@ Feature: my_network_block
       | login      | name        | public_profile |
       | mariasilva | Maria Silva | true           |
       | josesilva  | Jose Silva  | false          |
+    And the following blocks
+      | owner      | type         |
+      | mariasilva | FriendsBlock |
+      | josesilva  | FriendsBlock |
     And "joaosilva" is friend of "mariasilva"
     And I am logged in as "joaosilva"
     And I am on joaosilva's homepage
@@ -59,6 +65,10 @@ Feature: my_network_block
       | login      | name        |
       | mariasilva | Maria Silva |
       | josesilva  | Jose Silva  |
+    And the following blocks
+      | owner      | type         |
+      | mariasilva | FriendsBlock |
+      | josesilva  | FriendsBlock |
     And "josesilva" is invisible
     And "joaosilva" is friend of "mariasilva"
     And I am logged in as "joaosilva"
@@ -9,11 +9,11 @@ Feature: domain for profile
       | joaosilva | Joao Silva |
     And the following communities
       | identifier       | name             | domain    |
-      | sample-community | Sample Community | localhost |
+      | sample-community | Sample Community | 127.0.0.1 |
     And the following blocks
       | owner            | type              |
       | joaosilva        | ProfileInfoBlock  |
-    And the environment domain is "127.0.0.1"
+    And the environment domain is "localhost"
     And "Joao Silva" is environment admin
     And "Joao Silva" is admin of "Sample Community"
@@ -29,8 +29,7 @@ Feature: domain for profile
   @selenium
   Scenario: access user control panel
     Given I am logged in as "joaosilva"
-    When I go to the homepage
-    And I follow "joaosilva"
+    When I follow "joaosilva"
     And I go to sample-community's homepage
     And I follow "Login"
     And I fill in "joaosilva" for "Username"
@@ -39,18 +38,13 @@ Feature: domain for profile
     And I follow "Control panel" within "div#user"
     Then I should see "Joao Silva" within "span.control-panel-title"
-  # Looking for page title is problematic on selenium since it considers the
-  # title to be invibible. Checkout some information about this:
-  #   * https://github.com/jnicklas/capybara/issues/863
-  #   * https://github.com/jnicklas/capybara/pull/953
   @selenium
   Scenario: access user page
     Given I am logged in as "joaosilva"
-    When I go to the homepage
-    And I follow "joaosilva"
+    When I follow "joaosilva"
     Then I should be on joaosilva's profile
     And I should see "Joao Silva" within any "h1"
-    #And the page title should be "Joao Silva"
+    And the page title should be "Joao Silva"
   Scenario: access community by domain
     Given I go to the search communities page
@@ -64,7 +58,7 @@ Feature: domain for profile
     Given I am on sample-community's homepage
     When I go to /something-that-does-not-exist
     And I follow "Go to the home page"
-    Then the page title should be "Sample Community - Colivre.net"
+    Then the page title should be "Sample Community"
   Scenario: Go to environment homepage after clicking on home button on not found page
     Given I am on the homepage
@@ -72,8 +66,3 @@ Feature: domain for profile
     And I follow "Go to the home page"
     Then I should be on the homepage
     And the page title should be "Colivre.net"
-
-  @selenium
-  Scenario: Compose link to administration with environment domain
-    Given I am logged in as "joaosilva"
-    Then I should see "Administration" linking to "http://127.0.0.1.*/admin"
@@ -56,6 +56,7 @@ Feature: publish article
     And I am on mariasilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
+    And I should see "Text article with Textile markup language"
     And I follow "Text article with Textile markup language"
     And I fill in the following:
       | Title | Sample Article |
@@ -118,9 +118,9 @@ end
 Then /^(?:|I )should see "([^"]*)" within any "([^"]*)"?$/ do |text, selector|
   if page.respond_to? :should
-    page.should have_css(selector, :content => text)
+    page.should have_css(selector, :text => text)
   else
-    assert page.has_css?(selector, :content => text)
+    assert page.has_css?(selector, :text => text)
   end
 end
@@ -277,6 +277,12 @@ class Noosfero::Plugin
     nil
   end
+  # -> Adds content to the ending of the page
+  # returns = lambda block that creates html code or raw rhtml/html.erb
+  def body_ending
+    nil
+  end
+
   # -> Adds content to the ending of the page head
   # returns = lambda block that creates html code or raw rhtml/html.erb
   def head_ending
@@ -1,639 +0,0 @@
-require 'noosfero'
-
-class Noosfero::Plugin
-
-  attr_accessor :context
-
-  def initialize(context=nil)
-    self.context = context
-  end
-
-  class << self
-
-    attr_writer :should_load
-
-    def should_load
-      @should_load.nil? && true || @boot
-    end
-
-<<<<<<< HEAD
-    def initialize!
-      return if !should_load
-      enabled.each do |plugin_dir|
-        plugin_name = File.basename(plugin_dir)
-        plugin = load_plugin(plugin_name)
-        load_plugin_extensions(plugin_dir)
-        load_plugin_filters(plugin)
-      end
-    end
-
-    def setup(config)
-      return if !should_load
-      enabled.each do |dir|
-        setup_plugin(dir, config)
-=======
-    def init_system
-      available_plugins.each do |dir|
-        load_plugin dir
->>>>>>> rails235
-      end
-    end
-
-    def setup_plugin(dir, config)
-      plugin_name = File.basename(dir)
-
-      plugin_dependencies_ok = true
-      plugin_dependencies_file = File.join(dir, 'dependencies.rb')
-      if File.exists?(plugin_dependencies_file)
-        begin
-          require plugin_dependencies_file
-        rescue LoadError => ex
-          plugin_dependencies_ok = false
-          $stderr.puts "W: Noosfero plugin #{plugin_name} failed to load (#{ex})"
-        end
-      end
-
-      if plugin_dependencies_ok
-        %w[
-            controllers
-            controllers/public
-            controllers/profile
-            controllers/myprofile
-            controllers/admin
-        ].each do |folder|
-          config.autoload_paths << File.join(dir, folder)
-        end
-        [ config.autoload_paths, $:].each do |path|
-          path << File.join(dir, 'models')
-          path << File.join(dir, 'lib')
-          # load vendor/plugins
-          Dir.glob(File.join(dir, '/vendor/plugins/*')).each do |vendor_plugin|
-            path << "#{vendor_plugin}/lib" 
-            init = "#{vendor_plugin}/init.rb"
-            require init.gsub(/.rb$/, '') if File.file? init
-         end
-        end
-
-        # add view path
-        ActionController::Base.view_paths.unshift(File.join(dir, 'views'))
-      end
-    end
-
-    def load_plugin(plugin_name)
-      (plugin_name.to_s.camelize + 'Plugin').constantize
-    end
-
-    # This is a generic method that initialize any possible filter defined by a
-    # plugin to a specific controller
-    def load_plugin_filters(plugin)
-      plugin_methods = plugin.instance_methods.select {|m| m.to_s.end_with?('_filters')}
-      plugin_methods.each do |plugin_method|
-        controller_class = plugin_method.to_s.gsub('_filters', '').camelize.constantize
-        filters = plugin.new.send(plugin_method)
-        filters = [filters] if !filters.kind_of?(Array)
-
-        filters.each do |plugin_filter|
-          filter_method = (plugin.name.underscore.gsub('/','_') + '_' + plugin_filter[:method_name]).to_sym
-          controller_class.send(plugin_filter[:type], filter_method, (plugin_filter[:options] || {}))
-          controller_class.send(:define_method, filter_method) do
-            instance_eval(&plugin_filter[:block]) if environment.plugin_enabled?(plugin)
-          end
-        end
-      end
-    end
-
-    def load_plugin_extensions(dir)
-      Rails.configuration.to_prepare do
-        Dir[File.join(dir, 'lib', 'ext', '*.rb')].each {|file| require_dependency file }
-      end
-    end
-
-    def enabled
-      @enabled ||=
-        begin
-          plugins = Dir.glob(Rails.root.join('config', 'plugins', '*'))
-          if Rails.env.test? && !plugins.include?(Rails.root.join('config', 'plugins', 'foo'))
-            plugins << Rails.root.join('plugins', 'foo')
-          end
-          plugins.select do |entry|
-            File.directory?(entry)
-          end
-        end
-    end
-
-<<<<<<< HEAD
-
-    def all
-      @all ||= []
-=======
-    def available_plugins
-      unless @available_plugins
-        path = File.join(Rails.root, 'config', 'plugins', '*')
-        @available_plugins = Dir.glob(path).select{ |i| File.directory?(i) }
-        if Rails.env.test? && !@available_plugins.include?(File.join(Rails.root, 'config', 'plugins', 'foo'))
-          @available_plugins << File.join(Rails.root, 'plugins', 'foo')
-        end
-      end
-      @available_plugins
->>>>>>> rails235
-    end
-
-    def all
-      @all ||= available_plugins.map{ |dir| (File.basename(dir) + "_plugin").camelize }
-    end
-
-    def public_name
-      self.name.underscore.gsub('_plugin','')
-    end
-
-    def public_path(file = '')
-      File.join('/plugins', public_name, file)
-    end
-
-    def root_path
-      Rails.root.join('plugins', public_name)
-    end
-
-    def view_path
-      File.join(root_path,'views')
-    end
-
-    # Here the developer should specify the meta-informations that the plugin can
-    # inform.
-    def plugin_name
-      self.name.underscore.humanize
-    end
-    def plugin_description
-      _("No description informed.")
-    end
-
-    def admin_url
-      {:controller => "#{name.underscore}_admin", :action => 'index'}
-    end
-
-    def has_admin_url?
-      File.exists?(File.join(root_path, 'controllers', "#{name.underscore}_admin_controller.rb"))
-    end
-  end
-
-  def expanded_template(file_path, locals = {})
-    views_path = Rails.root.join('plugins', "#{self.class.public_name}", 'views')
-    ERB.new(File.read("#{views_path}/#{file_path}")).result(binding)
-  end
-
-  def extra_blocks(params = {})
-    return [] if self.class.extra_blocks.nil?
-    blocks = self.class.extra_blocks.map do |block, options|
-      type = options[:type]
-      type = type.is_a?(Array) ? type : [type].compact
-      type = type.map do |x|
-        x.is_a?(String) ? x.capitalize.constantize : x
-      end
-      raise "This is not a valid type" if !type.empty? && ![Person, Community, Enterprise, Environment].detect{|m| type.include?(m)}
-
-      position = options[:position]
-      position = position.is_a?(Array) ? position : [position].compact
-      position = position.map{|p| p.to_i}
-      raise "This is not a valid position" if !position.empty? && ![1,2,3].detect{|m| position.include?(m)}
-
-      if !type.empty? && (params[:type] != :all)
-        block = type.include?(params[:type]) ? block : nil
-      end
-
-      if !position.empty? && !params[:position].nil?
-        block = position.detect{ |p| [params[:position]].flatten.include?(p)} ? block : nil
-      end
-
-      block
-    end
-    blocks.compact!
-    blocks || []
-  end
-
-  def macros
-    self.class.constants.map do |constant_name|
-      self.class.const_get(constant_name)
-    end.select {|const| const.is_a?(Class) && const < Noosfero::Plugin::Macro}
-  end
-
-  # 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
-  def stylesheet?
-    false
-  end
-
-  # -> Adds buttons to the control panel
-  # returns = { :title => title, :icon => icon, :url => url }
-  #   title = name that will be displayed.
-  #   icon  = css class name (for customized icons include them in a css file).
-  #   url   = url or route to which the button will redirect.
-  def control_panel_buttons
-    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.
-  #   id      = div id.
-  #   content = lambda block that creates html code.
-  #   start   = boolean that specifies if the tab must come before noosfero tabs (optional).
-  def profile_tabs
-    nil
-  end
-
-  # -> Adds plugin-specific content types to CMS
-  # returns  = [ContentClass1, ContentClass2, ...]
-  def content_types
-    nil
-  end
-
-  # -> Adds content to calalog item
-  # returns = lambda block that creates html code
-  def catalog_item_extras(item)
-    nil
-  end
-
-  # -> Adds content to profile editor info and settings
-  # returns = lambda block that creates html code or raw rhtml/html.erb
-  def profile_editor_extras
-    nil
-  end
-
-  # -> Adds content to calalog list item
-  # returns = lambda block that creates html code
-  def catalog_list_item_extras(item)
-    nil
-  end
-
-  # -> Adds content to products info
-  # returns = lambda block that creates html code
-  def product_info_extras(product)
-    nil
-  end
-
-  # -> Adds content to products on asset list
-  # returns = lambda block that creates html code
-  def asset_product_extras(product)
-    nil
-  end
-
-  # -> Adds a property to the product on asset products
-  # returns = {:name => name, :content => content}
-  #   name = Name of the property
-  #   content = lambda block that creates an html
-  def asset_product_properties(product)
-    nil
-  end
-
-  # -> Adds content to the beginning of the page
-  # returns = lambda block that creates html code or raw rhtml/html.erb
-  def body_beginning
-    nil
-  end
-
-  # -> Adds content to the ending of the page head
-  # returns = lambda block that creates html code or raw rhtml/html.erb
-  def head_ending
-    nil
-  end
-
-  # -> Adds plugins' javascript files to application
-  # returns = ['example1.js', 'javascripts/example2.js', 'example3.js']
-  def js_files
-    []
-  end
-
-  # -> Adds stuff in user data hash
-  # returns = { :some_data => some_value, :another_data => another_value }
-  def user_data_extras
-    {}
-  end
-
-  # -> Parse and possibly make changes of content (article, block, etc) during HTML rendering
-  # returns = content as string after parser and changes
-  def parse_content(html, source)
-    [html, source]
-  end
-
-  # -> Adds links to the admin panel
-  # returns = {:title => title, :url => url}
-  #   title = name that will be displayed in the link
-  #   url   = url or route to which the link will redirect to.
-  def admin_panel_links
-    nil
-  end
-
-  # -> Adds buttons to manage members page
-  # returns = { :title => title, :icon => icon, :url => url }
-  #   title = name that will be displayed.
-  #   icon  = css class name (for customized icons include them in a css file).
-  #   url   = url or route to which the button will redirect.
-  def manage_members_extra_buttons
-    nil
-  end
-
-  # This method will be called just before a comment is saved to the database.
-  #
-  # It can modify the comment in several ways. In special, a plugin can call
-  # reject! on the comment and that will cause the comment to not be saved.
-  #
-  # example:
-  #
-  #   def filter_comment(comment)
-  #     if user_not_logged_in
-  #       comment.reject!
-  #     end
-  #   end
-  #
-  def filter_comment(comment)
-  end
-
-  # Define custom logic to filter loaded comments.
-  #
-  # Example:
-  #
-  #   def unavailable_comments(scope)
-  #     scope.without_spams
-  #   end
-  #
-  def unavailable_comments(scope)
-    scope
-  end
-
-  # -> Allows plugins to check weather object is a spam
-  def check_for_spam(object)
-  end
-
-  # -> Allows plugins to know when an object is marked as a spam
-  def marked_as_spam(object)
-  end
-
-  # -> Allows plugins to know when an object is marked as a ham
-  def marked_as_ham(object)
-  end
-
-  # Adds extra actions for comments
-  # returns = list of hashes or lambda block that creates a list of hashes
-  # example:
-  #
-  #   def comment_actions(comment)
-  #     [{:link => link_to_function(...)}]
-  #   end
-  #
-  def comment_actions(comment)
-    nil
-  end
-
-  # This method is called when the user click on comment actions menu.
-  # returns = list or lambda block that return ids of enabled menu items for comments
-  # example:
-  #
-  #   def check_comment_actions(comment)
-  #     ['#action1', '#action2']
-  #   end
-  #
-  def check_comment_actions(comment)
-    []
-  end
-
-  # -> Adds adicional content to article
-  # returns = lambda block that creates html code
-  def article_extra_contents(article)
-    nil
-  end
-
-  # -> Adds fields to the signup form
-  # returns = lambda block that creates html code
-  def signup_extra_contents
-    nil
-  end
-
-  # -> Adds adicional content to profile info
-  # returns = lambda block that creates html code
-  def profile_info_extra_contents
-    nil
-  end
-
-  # -> Removes the invite friend button from the friends controller
-  # returns = boolean
-  def remove_invite_friends_button
-    nil
-  end
-
-  # -> Extends organization list of members
-  # returns = An instance of ActiveRecord::NamedScope::Scope retrieved through
-  # Person.members_of method.
-  def organization_members(organization)
-    nil
-  end
-
-  # -> Extends person memberships list
-  # returns = An instance of ActiveRecord::NamedScope::Scope retrived through
-  # Person.memberships_of method.
-  def person_memberships(person)
-    nil
-  end
-
-  # -> Extends person permission access
-  # returns = boolean
-  def has_permission?(person, permission, target)
-    nil
-  end
-
-  # -> Adds hidden_fields to the new community view
-  # returns = {key => value}
-  def new_community_hidden_fields
-    nil
-  end
-
-  # -> Adds hidden_fields to the enterprise registration view
-  # returns = {key => value}
-  def enterprise_registration_hidden_fields
-    nil
-  end
-
-  # -> Add an alternative authentication method.
-  # Your plugin have to make the access control and return the logged user.
-  # returns = User
-  def alternative_authentication
-    nil
-  end
-
-  # -> Adds adicional link to make the user authentication
-  # returns = lambda block that creates html code
-  def alternative_authentication_link
-    nil
-  end
-
-  # -> Allow or not user registration
-  # returns = boolean
-  def allow_user_registration
-    true
-  end
-
-  # -> Allow or not password recovery by users
-  # returns = boolean
-  def allow_password_recovery
-    true
-  end
-
-  # -> Adds fields to the login form
-  # returns = lambda block that creates html code
-  def login_extra_contents
-    nil
-  end
-
-  # -> Adds adicional content to comment form
-  # returns = lambda block that creates html code
-  def comment_form_extra_contents(args)
-    nil
-  end
-
-  # -> Adds adicional content to article header
-  # returns = lambda block that creates html code
-  def article_header_extra_contents(article)
-    nil
-  end
-
-  # -> Adds adittional content to comment visualization
-  # returns = lambda block that creates html code
-  def comment_extra_contents(args)
-    nil
-  end
-
-  # This method is called when the user clicks to send a comment.
-  # A plugin can add new content to comment form and this method can process the params sent to avoid creating field on core tables.
-  # returns = params after processed by plugins
-  # example:
-  #
-  #   def process_extra_comment_params(params)
-  #     params.delete(:extra_field)
-  #   end
-  #
-  def process_extra_comment_params(params)
-    params
-  end
-
-  # -> Finds objects by their contents
-  # returns = {:results => [a, b, c, ...], ...}
-  # P.S.: The plugin might add other informations on the return hash for its
-  # own use in specific views
-  def find_by_contents(asset, scope, query, paginate_options={}, options={})
-  end
-
-  # -> Adds aditional fields for change_password
-  # returns = [{:field => 'field1', :name => 'field 1 name', :model => 'person'}, {...}]
-  def change_password_fields
-    nil
-  end
-
-  # -> Adds additional blocks to profiles and environments.
-  # Your plugin must implements a class method called 'extra_blocks'
-  # that returns a hash with the following syntax.
-  #    {
-  #      'block_name' =>
-  #        {
-  #          :type => 'for which holder the block will be available',
-  #          :position => 'where the block could be displayed'
-  #        }
-  #    }
-  #
-  # Where:
-  #
-  #   - block_name: Name of the new block added to the blocks list
-  #   - type: Might have some of the values
-  #      - 'environment' or Environment: If the block is available only for Environment models
-  #      - 'community' or Community: If the block is available only for Community models
-  #      - 'enterprise' or Enterprise: If the block is available only for Enterprise models
-  #      - 'person' or Person: If the block is available only for Person models
-  #      - nil: If no type parameter is passed the block will be available for all types
-  #   - position: Is the layout position of the block. It should be:
-  #      - '1' or 1: Area 1 of layout
-  #      - '2' or 2: Area 2 of layout
-  #      - '3' or 3: Area 3 of layout
-  #      - nil: If no position parameter is passed the block will be available for all positions
-  #
-  #      OBS: Area 1 is where stay the main content of layout. Areas 2 and 3 are the sides of layout.
-  #
-  # examples:
-  #
-  #   def self.extra_blocks(params)
-  #     {
-  #       #Display 'CustomBlock1' only for 'Person' on position '1'
-  #       CustomBlock1 => {:type => 'person', :position => '1' },
-  #
-  #       #Display 'CustomBlock2' only for 'Community' on position '2'
-  #       CustomBlock2 => {:type => Community, :position => '2' },
-  #
-  #       #Display 'CustomBlock3' only for 'Enterprise' on position '3'
-  #       CustomBlock3 => {:type => 'enterprise', :position => 3 },
-  #
-  #       #Display 'CustomBlock2' for 'Environment' and 'Person' on positions '1' and '3'
-  #       CustomBlock4 => {:type => ['environment', Person], :position => ['1','3'] },
-  #
-  #       #Display 'CustomBlock5' for all types and all positions
-  #       CustomBlock5 => {},
-  #     }
-  #   end
-  #
-  #   OBS: The default value is a empty hash.
-  def self.extra_blocks
-    {}
-  end
-
-  def method_missing(method, *args, &block)
-    # This is a generic hotspot for all controllers on Noosfero.
-    # If any plugin wants to define filters to run on any controller, the name of
-    # the hotspot must be in the following form: <underscored_controller_name>_filters.
-    # Example: for ProfileController the hotspot is profile_controller_filters
-    #
-    # -> Adds a filter to a controller
-    # returns = { :type => type,
-    #             :method_name => method_name,
-    #             :options => {:opt1 => opt1, :opt2 => opt2},
-    #             :block => Proc or lambda block}
-    #   type = 'before_filter' or 'after_filter'
-    #   method_name = The name of the filter
-    #   option = Filter options, like :only or :except
-    #   block = Block that the filter will call
-    if method.to_s =~ /^(.+)_controller_filters$/
-      []
-    # -> Removes the action button from the content
-    # returns = boolean
-    elsif method.to_s =~ /^content_remove_(#{content_actions.join('|')})$/
-      nil
-    # -> Expire the action button from the content
-    # returns = string with reason of expiration
-    elsif method.to_s =~ /^content_expire_(#{content_actions.join('|')})$/
-      nil
-    else
-      super
-    end
-  end
-
-  private
-
-  def content_actions
-    #FIXME 'new' and 'upload' only works for content_remove. It should work for
-    #content_expire too.
-    %w[edit delete spread locale suggest home new upload]
-  end
-
-end
-
-require 'noosfero/plugin/hot_spot'
-require 'noosfero/plugin/manager'
-require 'noosfero/plugin/active_record'
-require 'noosfero/plugin/mailer_base'
-require 'noosfero/plugin/settings'
@@ -16,6 +16,9 @@ class CommentGroupPlugin::AllowComment &lt; Noosfero::Plugin::Macro
     article = source
     count = article.group_comments.without_spam.in_group(group_id).count
-    proc {render :partial => 'comment_group_plugin_profile/comment_group', :locals => {:group_id => group_id, :article_id => article.id, :inner_html => inner_html, :count => count, :profile_identifier => article.profile.identifier }}
+    proc {
+      render :partial => 'comment_group_plugin_profile/comment_group',
+             :locals => {:group_id => group_id, :article_id => article.id, :inner_html => inner_html, :count => count, :profile_identifier => article.profile.identifier }
+    }
   end
 end
@@ -3,7 +3,6 @@
     <div style="float: left">
     <%= link_to_remote(image_tag("/plugins/comment_group/images/comments.gif"),
         :url => { :profile => profile_identifier, :controller => 'comment_group_plugin_profile', :action => 'view_comments', :group_id => group_id, :article_id => article_id},
-        :loaded => j(visual_effect(:highlight, "comments_list_group_#{group_id}")),
         :method => :post,
         :condition => "!toggleGroup(#{group_id})",
         :complete => "loadCompleted(#{group_id})")%>
@@ -0,0 +1,31 @@
+# encoding: UTF-8
+class UpdateDisplayContentSectionsArray < ActiveRecord::Migration
+
+  def self.up
+    translator = {'Publish date' => 'publish_date', 'Title' => 'title', 'Abstract' => 'abstract', 'Body' => 'body', 'Image' => 'image', 'Tags' => 'tags',
+                  'Data de publicação' => 'publish_date', 'Título' => 'title', 'Resumo' => 'abstract', 'Corpo' => 'body', 'Imagem' => 'image'}
+
+    DisplayContentBlock.find_each do |block|
+      new_sections = []
+
+      block.sections.each do |section|
+        new_value = translator[section["name"]]
+        new_section = new_value.blank? ? section :  {:value => new_value, :checked => !section["checked"].blank? }
+
+        new_section_to_update = new_sections.select {|s| s[:value] == new_value}.first
+        if new_section_to_update.blank?
+          new_sections << new_section
+        else
+          new_section_to_update[:checked] = new_section[:checked]
+        end
+      end
+      block.sections = new_sections
+      block.update_attribute(:settings, block.settings)
+    end
+  end
+
+  def self.down
+    raise "this migration can't be reverted"
+  end
+
+end
@@ -15,16 +15,16 @@ class DisplayContentBlock &lt; Block
     N_('December')
   ]
+  AVAILABLE_SECTIONS = ['publish_date', 'title', 'abstract', 'body', 'image' ,'tags']
+
   settings_items :nodes, :type => Array, :default => []
   settings_items :sections,
                  :type => Array,
-                 :default => [{:name => _('Publish date'), :checked => true},
-                              {:name => _('Title'), :checked => true},
-                              {:name => _('Abstract'), :checked => true},
-                              {:name => _('Body'), :checked => false},
-                              {:name => _('Image'), :checked => false},
-                              {:name => _('Tags'), :checked => false}]
+                 :default => [{:value => 'publish_date', :checked => true},
+                              {:value => 'title', :checked => true},
+                              {:value => 'abstract', :checked => true}]
   settings_items :display_folder_children, :type => :boolean, :default => true
+  settings_items :types, :type => Array, :default => ['TextileArticle', 'TinyMceArticle', 'RawHTMLArticle']
   attr_accessible :sections, :checked_nodes, :display_folder_children
@@ -36,6 +36,50 @@ class DisplayContentBlock &lt; Block
     _('This block displays articles chosen by you. You can edit the block to select which of your articles is going to be displayed in the block.')
   end
+  def section_name(section)
+    {
+      'publish_date' => _('Publish date'),
+      'title' => _('Title'),
+      'abstract' => _('Abstract'),
+      'body' => _('Body'),
+      'image' => _('Image'),
+      'tags' => _('Tags')
+    }[section] || section
+  end
+
+  alias :orig_sections :sections
+  def sections
+    available_sections = AVAILABLE_SECTIONS
+    available_sections = available_sections - orig_sections.map{|e|e[:value]}
+    sections = available_sections.map do |section|
+      {:value => section, :checked => false}
+    end
+    sections + orig_sections
+  end
+
+  def available_content_types
+    @available_content_types ||= [TinyMceArticle, RawHTMLArticle, TextileArticle, UploadedFile, Event, Folder, Blog, Forum, Gallery, RssFeed] + plugins.dispatch(:content_types)
+    checked_types = types.map {|t| t.constantize}
+    checked_types + (@available_content_types - checked_types)
+  end
+
+  #FIXME make this test copy of Context Content
+  def first_content_types
+    available_content_types.first(first_types_count)
+  end
+
+  def more_content_types
+    available_content_types.drop(first_types_count)
+  end
+
+  def first_types_count
+    [2, types.length].max
+  end
+
+  def types=(new_types)
+    settings[:types] = new_types.reject(&:blank?)
+  end
+
   def checked_nodes= params
     self.nodes = params.keys
   end
@@ -45,7 +89,7 @@ class DisplayContentBlock &lt; Block
   def expand_nodes
     return self.nodes if self.holder.nil?
-    articles = self.holder.articles.find(nodes)
+    articles = self.holder.articles.where(:id => nodes)
     children = articles.map { |article| article.children }.compact.flatten
     if display_folder_children
@@ -58,7 +102,7 @@ class DisplayContentBlock &lt; Block
   end
   def parent_nodes
-    @parent_nodes ||= self.holder.articles.find(nodes).map { |article| get_parent(article) }.compact.flatten
+    @parent_nodes ||= self.holder.articles.where(:id => nodes).map { |article| get_parent(article) }.compact.flatten
   end
   VALID_CONTENT = ['RawHTMLArticle', 'TextArticle', 'TextileArticle', 'TinyMceArticle', 'Folder', 'Blog', 'Forum']
@@ -73,9 +117,10 @@ class DisplayContentBlock &lt; Block
   def content(args={})
     block = self
-    extra_condition = display_folder_children ? 'OR articles.parent_id IN(:nodes)':''
-    docs = nodes.blank? ? [] : owner.articles.find(:all, :conditions => ["(articles.id IN(:nodes) #{extra_condition}) AND articles.type IN(:types)", {:nodes => self.nodes, :types => VALID_CONTENT}])
+    nodes_conditions = nodes.blank? ? '' : " AND articles.id IN(:nodes) "
+    nodes_conditions += ' OR articles.parent_id IN(:nodes) ' if !nodes.blank? && display_folder_children
+    docs = owner.articles.find(:all, :conditions => ["articles.type IN(:types) #{nodes.blank? ? '' : nodes_conditions}", {:nodes => self.nodes, :types => self.types}], :include => :profile)
     proc do
       block.block_title(block.title) +
         content_tag('ul', docs.map {|item|
@@ -85,24 +130,24 @@ class DisplayContentBlock &lt; Block
           tags_section = ''
           block.sections.select { |section|
-            case section[:name]
-            when 'Publish date'
-              content_sections += (block.display_section?(section) ? (content_tag('div', block.show_date(item.published_at, false), :class => 'published-at') ) : '')
-            when 'Title'
+            case section[:value]
+            when 'publish_date'
+              content_sections += (block.display_section?(section) ? (content_tag('div', show_date(item.published_at, false), :class => 'published-at') ) : '')
+            when 'title'
               content_sections += (block.display_section?(section) ? (content_tag('div', link_to(h(item.title), item.url), :class => 'title') ) : '')
-            when 'Abstract'
+            when 'abstract'
               content_sections += (block.display_section?(section) ? (content_tag('div', item.abstract , :class => 'lead')) : '' )
               if block.display_section?(section)
                 read_more_section = content_tag('div', link_to(_('Read more'), item.url), :class => 'read_more')
               end
-            when 'Body'
+            when 'body'
               content_sections += (block.display_section?(section) ? (content_tag('div', item.body ,:class => 'body')) : '' )
-            when 'Image'
+            when 'image'
               image_section = image_tag item.image.public_filename if item.image
               if !image_section.blank?
                 content_sections += (block.display_section?(section) ? (content_tag('div', link_to( image_section, item.url ) ,:class => 'image')) : '' )
               end
-            when 'Tags'
+            when 'tags'
               if !item.tags.empty?
                 tags_section = item.tags.map { |t| content_tag('span', t.name) }.join("")
                 content_sections += (block.display_section?(section) ? (content_tag('div', tags_section, :class => 'tags')) : '')
@@ -111,7 +156,7 @@ class DisplayContentBlock &lt; Block
           }
           content_sections += read_more_section if !read_more_section.blank?
-
+#raise sections.inspect
           content_tag('li', content_sections)
         end
       }.join(" "))
@@ -370,7 +370,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :abstract => 'abstract article 2')
     block = DisplayContentBlock.new
-    block.sections = [{:name => 'Abstract', :checked => true}]
+    block.sections = [{:value => 'abstract', :checked => true}]
     block.nodes = [a1.id, a2.id]
     box = mock()
     block.stubs(:box).returns(box)
@@ -425,7 +425,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block = DisplayContentBlock.new
     block.nodes = [a.id]
-    block.sections = [{:name => 'Title', :checked => true}]
+    block.sections = [{:value => 'title', :checked => true}]
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(profile)
@@ -439,7 +439,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block = DisplayContentBlock.new
     block.nodes = [a.id]
-    block.sections = [{:name => 'Abstract', :checked => true}]
+    block.sections = [{:value => 'abstract', :checked => true}]
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(profile)
@@ -453,7 +453,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block = DisplayContentBlock.new
     block.nodes = [a.id]
-    block.sections = [{:name => 'Body', :checked => true}]
+    block.sections = [{:value => 'body', :checked => true}]
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(profile)
@@ -466,7 +466,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block = DisplayContentBlock.new
-    assert block.display_section?({:name => 'Title', :checked => true})
+    assert block.display_section?({:value => 'title', :checked => true})
   end
   should 'display_attribute be true if the attribute was chosen' do
@@ -474,8 +474,8 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block = DisplayContentBlock.new
-    block.sections = [{:name => 'Body', :checked => true}]
-    section = block.sections.first
+    section = {:value => 'body', :checked => true}
+    block.sections = [section]
     assert block.display_section?(section)
   end
@@ -485,7 +485,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block = DisplayContentBlock.new
-    assert block.display_section?({:name => 'Publish date', :checked => true})
+    assert block.display_section?({:value => 'publish_date', :checked => true})
   end
   should 'show publishd date if defined by user' do
@@ -494,7 +494,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block = DisplayContentBlock.new
     block.nodes = [a.id]
-    block.sections = [{:name => 'Publish date', :checked => true}]
+    block.sections = [{:value => 'publish_date', :checked => true}]
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(profile)
@@ -547,17 +547,104 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     profile = create_user('testuser').person
     Article.delete_all
     a1 = fast_create(PluginArticle, :name => 'test article 1', :profile_id => profile.id)
-
     Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
     env = fast_create(Environment)
-    env.enable_plugin(Plugin1)
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([Plugin1.new])
     block = DisplayContentBlock.new
     box = mock()
     box.stubs(:owner).returns(profile)
+    Noosfero::Plugin.stubs(:all).returns(['DisplayContentBlockTest::Plugin1'])
     box.stubs(:environment).returns(env)
     block.stubs(:box).returns(box)
     assert_equal [a1], block.articles_of_parent
   end
+  should "the section display all available sections" do
+    block = DisplayContentBlock.new
+    assert_equivalent ['publish_date', 'abstract', 'body', 'image' ,'tags', 'title'], block.sections.map{|e|e[:value]}
+  end
+
+  should "the section display all available sections if the section value has only one key" do
+    block = DisplayContentBlock.new
+    block.sections = [{:value => 'abstract', :checked => true}]
+    assert_equivalent ['publish_date', 'abstract', 'body', 'image' ,'tags', 'title'], block.sections.map{|e|e[:value]}
+  end
+
+  should 'return available content types with checked types first' do
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
+    block = DisplayContentBlock.create!
+    block.types = ['TinyMceArticle']
+
+    block.types = ['TinyMceArticle', 'Folder']
+    assert_equal [TinyMceArticle, Folder, UploadedFile, Event, TextileArticle, RawHTMLArticle, Blog, Forum, Gallery, RssFeed], block.available_content_types
+  end
+
+  should 'return available content types' do
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
+    block = DisplayContentBlock.create!
+    block.types = ['TinyMceArticle']
+    block.types = []
+    assert_equal [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed], block.available_content_types
+  end
+
+  should 'return first 2 content types' do
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
+    block = DisplayContentBlock.create!
+    block.types = ['TinyMceArticle']
+    assert_equal 2, block.first_content_types.length
+  end
+
+  should 'return all but first 2 content types' do
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
+    block = DisplayContentBlock.create!
+    block.types = ['TinyMceArticle']
+    assert_equal block.available_content_types.length - 2, block.more_content_types.length
+  end
+
+  should 'return 2 as default value for first_types_count' do
+    block = DisplayContentBlock.create!
+    block.types = ['TinyMceArticle']
+    assert_equal 2, block.first_types_count
+  end
+
+  should 'return types length if it has more than 2 selected types' do
+    block = DisplayContentBlock.create!
+    block.types = ['UploadedFile', 'Event', 'Folder']
+    assert_equal 3, block.first_types_count
+  end
+
+  should 'return selected types at first_content_types' do
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
+    block = DisplayContentBlock.create!
+    block.types = ['UploadedFile', 'Event', 'Folder']
+    assert_equal [UploadedFile, Event, Folder], block.first_content_types
+    assert_equal block.available_content_types - [UploadedFile, Event, Folder], block.more_content_types
+  end
+
+  should 'include plugin content at available content types' do
+    block = DisplayContentBlock.create!
+    class SomePluginContent;end
+    class SomePlugin; def content_types; SomePluginContent end end
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])
+
+    block.types = []
+    assert_equal [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed, SomePluginContent], block.available_content_types
+  end
+
+  should 'do not fail if a selected article was removed' do
+    profile = create_user('testuser').person
+    Article.delete_all
+    f1 = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
+    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id)
+
+    checked_articles= {a1.id => true}
+
+    block = DisplayContentBlock.new
+    block.stubs(:holder).returns(profile)
+    block.checked_nodes= checked_articles
+    a1.destroy
+    assert_equal [], block.parent_nodes
+  end
+
 end
@@ -0,0 +1,15 @@
+<%= label :block, :types, _('Display content types:'), :class => 'formlabel' %>
+<div class="content_types">
+  <% @block.first_content_types.each do |type| %>
+    <%= labelled_form_field check_box(:block, 'types', {:multiple => true}, type.name, nil) + _(type.short_description), '' %>
+  <% end %>
+  <% if !@block.more_content_types.empty? %>
+    <a href="#" onclick="jQuery('.content_types .more').toggle(); return false;"><%= _('more') %></a>
+  <% end %>
+  <div class="more" style="display: none">
+    <% @block.more_content_types.each do |type| %>
+      <%= labelled_form_field check_box(:block, 'types', {:multiple => true}, type.name, nil) + _(type.short_description), '' %>
+    <% end %>
+  </div>
+</div>
+
@@ -0,0 +1,30 @@
+<div id="display_content">
+</div>
+
+<div class="display_folder_children">
+  <%= labelled_form_field check_box(:block, :display_folder_children) + _('Dinamically load children of selected folders'), '' %>
+</div>
+
+<script type="text/javascript" >
+
+jQuery_1_8_3("#display_content").jstree({
+   plugins : ["themes","json_data", "checkbox"],
+   checkbox : {
+     real_checkboxes : true,
+     real_checkboxes_names : function (n) { return [("block[checked_nodes[" + n.attr('node_id') + "]]"), 1]; }
+   },
+   themes : {"theme" : "classic", "icons" : true, "url": "/plugins/display_content/javascripts/jstree/themes/classic/style.css"},
+   json_data : {
+     ajax : {
+         url : '<%= url_for @block.url_params %>',
+         async: true,
+         data : function (m) {
+           return m.attr ? {"id" : m.attr("node_id")} : {};
+         }
+       }
+   }
+});
+
+jQuery( "#sortable" ).sortable();
+
+</script>
 <div id="display_content_plugin">
+<%= javascript_tag 'render_all_jquery_ui_widgets()' %>
+
 <h3> <%= _('Choose which attributes should be displayed and drag to reorder them:') %> </h3>
 <table class="sections">
   <tbody id="sortable">
   <% for section in @block.sections do %>
   <tr>
-    <td><%= hidden_field_tag 'block[sections][][name]', section[:name] %> <%= check_box_tag 'block[sections][][checked]', section[:name], section[:checked] %></td>
-    <td><%= section[:name]%></td>
+    <td>
+      <%= hidden_field_tag 'block[sections][][value]', section[:value] %> 
+      <%= check_box_tag 'block[sections][][checked]', section[:value], section[:checked] %>
+    </td>
+    <td><%= @block.section_name(section[:value]) %></td>
   </tr>
   <% end %>
   </tbody>
 </table>
 <h3> <%= _('Choose which content should be displayed:') %> </h3>
-<div id="display_content">
-</div>
-
-<div class="display_folder_children">
-  <%= labelled_form_field check_box(:block, :display_folder_children) + _('Dinamically load children of selected folders'), '' %>
-</div>
+<% tabs = [] %>
+<% tabs << {:title => _('Choose directly'), :id => 'choose-directly', :content => (render :partial => 'choose_directly')} %>
+<% tabs << {:title => _('Choose by Content Type'), :id => 'choose_by_content_type', :content => (render :partial => 'choose_by_content_type')} %>
-<script type="text/javascript" >
+<%= render_tabs(tabs) %>
-jQuery_1_8_3("#display_content").jstree({
-   plugins : ["themes","json_data", "checkbox"],
-   checkbox : {
-     real_checkboxes : true,
-     real_checkboxes_names : function (n) { return [("block[checked_nodes[" + n.attr('node_id') + "]]"), 1]; }
-   },
-   themes : {"theme" : "classic", "icons" : true, "url": "/plugins/display_content/javascripts/jstree/themes/classic/style.css"},
-   json_data : {
-     ajax : {
-         url : '<%= url_for @block.url_params %>',
-         async: true,
-         data : function (m) {
-           return m.attr ? {"id" : m.attr("node_id")} : {};
-         }
-       }
-   }
-});
-
-jQuery( "#sortable" ).sortable();
-
-</script>
 </div>
+
@@ -0,0 +1,2 @@
+raise "\nPeopleBlockPlugin shouldn't be enabled/disabled by hand, Noosfero" +
+      "\ninstallation already comes with it enabled by default!\n"
@@ -0,0 +1,19 @@
+class PeopleBlockPluginProfileController < ProfileController
+
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  def members
+    if is_cache_expired?(profile.members_cache_key(params))
+      if(params[:role_key])
+        role = Role.find_by_key_and_environment_id(params[:role_key], profile.environment)
+        @members = profile.members.with_role(role.id).includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
+        @members_title = role.name
+      else
+        @members = profile.members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
+        @members_title = 'members'
+      end
+    end
+    render "profile/members"
+  end
+
+end
@@ -0,0 +1,16 @@
+class EnablePeopleBlockPlugin < ActiveRecord::Migration
+  def up
+    Environment.all.each do |env|
+      env.enabled_plugins << 'PeopleBlockPlugin'
+      env.enabled_plugins.uniq!
+      env.save!
+    end
+  end
+
+  def down
+    Environment.all.each do |env|
+      env.enabled_plugins.delete_if {|i| i== 'PeopleBlockPlugin'}
+      env.save!
+    end
+  end
+end
@@ -0,0 +1,9 @@
+require_dependency 'person'
+
+class Person
+
+  scope :with_role, lambda { |role_id|
+    { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ["role_assignments.role_id = #{role_id}"] }
+  }
+
+end
@@ -0,0 +1,30 @@
+class FriendsBlock < PeopleBlockBase
+
+  def self.description
+    _('Friends')
+  end
+
+  def help
+    _('Clicking a friend takes you to his/her homepage')
+  end
+
+  def default_title
+    n_('{#} friend', '{#} friends', profile_count)
+  end
+
+  def profiles
+    owner.friends
+  end
+
+  def footer
+    profile = self.owner
+    proc do
+      render :file => 'blocks/friends', :locals => { :profile => profile }
+    end
+  end
+
+  def self.expire_on
+    { :profile => [:profile] }
+  end
+
+end
@@ -0,0 +1,50 @@
+class MembersBlock < PeopleBlockBase
+  settings_items :show_join_leave_button, :type => :boolean, :default => false
+  settings_items :visible_role, :type => :string, :default => nil
+  attr_accessible :show_join_leave_button, :visible_role
+
+  def self.description
+    _('Members')
+  end
+
+  def help
+    _('Clicking a member takes you to his/her homepage')
+  end
+
+  def default_title
+    title = role ? role.name : n_('members')
+    _('{#} %s') % title
+  end
+
+  def profiles
+    role ? owner.members.with_role(role.id) : owner.members
+  end
+
+  def footer
+    profile = self.owner
+    role_key = visible_role
+    s = show_join_leave_button
+    proc do
+      render :file => 'blocks/members', :locals => { :profile => profile, :show_join_leave_button => s, :role_key => role_key}
+    end
+  end
+
+  def role
+    visible_role && !visible_role.empty? ? Role.find_by_key_and_environment_id(visible_role, owner.environment) : nil
+  end
+
+  def roles
+    Profile::Roles.organization_member_roles(owner.environment)
+  end
+
+  def extra_option
+    data = {
+      :human_name => _("Show join leave button"),
+      :name => 'block[show_join_leave_button]',
+      :value => true,
+      :checked => show_join_leave_button,
+      :options => {}
+    }
+  end
+
+end
@@ -0,0 +1,25 @@
+class PeopleBlock < PeopleBlockBase
+
+  def self.description
+    _('People')
+  end
+
+  def help
+    _('Clicking a person takes you to his/her homepage')
+  end
+
+  def default_title
+    _('{#} People')
+  end
+
+  def profiles
+    owner.people
+  end
+
+  def footer
+    proc do
+      render :file => 'blocks/people'
+    end
+  end
+
+end
@@ -0,0 +1,100 @@
+class PeopleBlockBase < Block
+  settings_items :prioritize_profiles_with_image, :type => :boolean, :default => true
+  settings_items :limit, :type => :integer, :default => 6
+  settings_items :name, :type => String, :default => ""
+  settings_items :address, :type => String, :default => ""
+  attr_accessible :name, :address, :prioritize_profiles_with_image
+
+  def self.description
+    _('Random people')
+  end
+
+  def help
+    _('Clicking on the people or groups will take you to their home page.')
+  end
+
+  def default_title
+    _('{#} People')
+  end
+
+  def view_title
+    title.gsub('{#}', profile_count.to_s)
+  end
+
+  def profiles
+    owner.profiles
+  end
+
+  def profile_list
+    result = nil
+    visible_profiles = profiles.visible.includes([:image,:domains,:preferred_domain,:environment])
+    if !prioritize_profiles_with_image
+      result = visible_profiles.all(:limit => limit, :order => 'updated_at DESC').sort_by{ rand }
+    elsif visible_profiles.with_image.count >= limit
+      result = visible_profiles.with_image.all(:limit => limit * 5, :order => 'updated_at DESC').sort_by{ rand }
+    else
+      result = visible_profiles.with_image.sort_by{ rand } + visible_profiles.without_image.all(:limit => limit * 5, :order => 'updated_at DESC').sort_by{ rand }
+    end
+    result.slice(0..limit-1)
+  end
+
+  def profile_count
+    profiles.visible.count
+  end
+
+  def content(args={})
+    profiles = self.profile_list
+    title = self.view_title
+
+    if !self.name.blank? && !self.address.blank?
+      name = self.name
+      expanded_address = expand_address(self.address)
+    end
+
+    proc do
+      count = 0
+      list = profiles.map {|item|
+               count += 1
+               send(:profile_image_link, item, :minor )
+             }.join("\n")
+      if list.empty?
+        list = content_tag 'div', _('None'), :class => 'common-profile-list-block-none'
+      else
+        if !name.blank? && !expanded_address.blank?
+          list << content_tag(
+                    'div',
+                    content_tag(
+                      'li',
+                      content_tag(
+                        'div',
+                        link_to(
+                          content_tag('span', name, :class => 'banner-span' ),
+                          expanded_address,
+                          :title => name
+                        ),
+                        :class => 'banner-div'
+                      ),
+                      :class => 'vcard'
+                    ),
+                    :class => 'common-profile-list-block'
+                  )
+        end
+        list = content_tag 'ul', list
+      end
+      block_title(title) + content_tag('div', list + tag('br', :style => 'clear:both'))
+    end
+  end
+
+  def expand_address(address)
+    if address !~ /^[a-z]+:\/\// && address !~ /^\//
+      'http://' + address
+    else
+      address
+    end
+  end
+
+  def extra_option
+    { }
+  end
+
+end
@@ -0,0 +1,27 @@
+class PeopleBlockPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "People Block Plugin"
+  end
+
+  def self.plugin_description
+    _("A plugin that adds a people block")
+  end
+
+  def self.extra_blocks
+    {
+      PeopleBlock => {:type => Environment},
+      MembersBlock => {:type => Community},
+      FriendsBlock => {:type => Person}
+    }
+  end
+
+  def self.has_admin_url?
+    false
+  end
+
+  def stylesheet?
+    true
+  end
+
+end
@@ -0,0 +1,104 @@
+/*******************************************************************
+ *                           COMMON                                *
+ *******************************************************************/
+.people-block .block-footer-content a {
+  position: absolute;
+  top: 2px;
+  right: 0px;
+  font-size: 11px;
+  color: #000;
+  text-decoration: none;
+  padding-right: 15px;
+}
+
+.people-block .banner-span {
+  color: #000;
+  font-size: 14pt;
+  font-weight: bold;
+  background-color: #EEE;
+}
+
+
+/*******************************************************************
+ *                           MAIN BOX - 1                          *
+ *******************************************************************/
+.box-1 .people-block .banner-div {
+  line-height: 112px;
+}
+
+.box-1 .people-block .banner-span {
+  width: 204px;
+}
+
+
+/*******************************************************************
+ *                        LEFT/RIGHT BOXES                         *
+ *******************************************************************/
+.box-2 .people-block .banner-div,
+.box-3 .people-block .banner-div {
+  line-height: 78px;
+}
+
+.box-2 .people-block .banner-div a,
+.box-3 .people-block .banner-div a {
+  height: 78px;
+}
+
+.box-2 .people-block .banner-span,
+.box-3 .people-block .banner-span {
+  width: 116px;
+}
+
+.box-2 .people-block ul,
+.box-3 .people-block ul {
+  min-width: 196px;
+  width: 192px;
+  margin: 0px 0px 0px -3px;
+  padding: 0px;
+}
+
+/*******************************************************************
+ *                        BLOCKs                                   *
+ *******************************************************************/
+#content .friends-block ul,
+#content .members-block ul {
+  min-width: 196px;
+  width: 192px;
+  margin: 0px 0px 0px -3px;
+  padding: 0px;
+}
+#content .box-1 .people-block ul,
+#content .box-1 .friends-block ul,
+#content .box-1 .members-block ul {
+  width: auto;
+  display: block;
+}
+#content .people-block .block-footer-content a,
+#content .friends-block .block-footer-content a,
+#content .members-block .block-footer-content a {
+  position: absolute;
+  top: 2px;
+  right: 0px;
+  font-size: 11px;
+  color: #000;
+  text-decoration: none;
+  padding-right: 15px;
+}
+#content .members-block .block-footer-content .join-leave-button a {
+  position: relative;
+  background-color: #EEE;
+  border: 1px solid #CCC;
+  color: #555;
+  padding-right: inherit;
+}
+#content .members-block .block-footer-content .join-leave-button a:hover {
+  color: #FFF;
+  background-color: #555;
+  border: 1px solid #2e3436;
+  text-decoration: none;
+}
+#content .people-block .block-footer-content a.view-all,
+#content .friends-block .block-footer-content a.view-all,
+#content .members-block .block-footer-content a.view-all {
+  background: url(/designs/themes/base/imgs/arrow-right-p.png) 100% 50% no-repeat;
+}
@@ -0,0 +1,25 @@
+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
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([PeopleBlockPlugin.new])
+  end
+
+  should 'be able to edit PeopleBlock' do
+    login_as(create_admin_user(Environment.default))
+    b = PeopleBlock.create!
+    e = Environment.default
+    e.boxes.create!
+    e.boxes.first.blocks << b
+    get :edit, :id => b.id
+    assert_tag :tag => 'input', :attributes => { :id => 'block_limit' }
+  end
+
+end
@@ -0,0 +1,76 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../../controllers/people_block_plugin_profile_controller'
+
+
+# Re-raise errors caught by the controller.
+class PeopleBlockPluginProfileController; def rescue_action(e) raise e end; end
+
+class PeopleBlockPluginProfileControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = PeopleBlockPluginProfileController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @profile = fast_create(Community)
+
+    @environment = @profile.environment
+    @environment.enabled_plugins = ['PeopleBlockPlugin']
+    @environment.save!
+
+    MembersBlock.delete_all
+    @block = MembersBlock.new
+    @block.box = @profile.boxes.first
+    @block.save!
+
+    @admin = create_user('adminprofile').person
+    @member = create_user('memberprofile').person
+    @moderator = create_user('moderatorprofile').person
+    @profile.add_moderator(@moderator)
+    @profile.add_member(@member)
+    @profile.add_admin(@admin)
+  end
+
+  attr_accessor :profile, :block, :admin, :member, :moderator
+
+  should 'list members without role_key' do
+    get :members, :profile => profile.identifier
+    assert_response :success
+    assert_template 'members'
+    assert_equivalent [@admin, @member, @moderator], assigns(:members)
+    assert_match /adminprofile/, @response.body
+    assert_match /memberprofile/, @response.body
+    assert_match /moderatorprofile/, @response.body
+  end
+
+  should 'list members with role_key=nil' do
+    get :members, :profile => profile.identifier, :role_key => nil
+    assert_response :success
+    assert_template 'members'
+    assert_equivalent [@admin, @member, @moderator], assigns(:members)
+    assert_match /adminprofile/, @response.body
+    assert_match /memberprofile/, @response.body
+    assert_match /moderatorprofile/, @response.body
+  end
+
+  should 'list members only' do
+    get :members, :profile => profile.identifier, :role_key => Profile::Roles.member(profile.environment.id).key
+    assert_response :success
+    assert_template 'members'
+    assert_equal [@member], assigns(:members)
+    assert_no_match /adminprofile/, @response.body
+    assert_match /memberprofile/, @response.body
+    assert_no_match /moderatorprofile/, @response.body
+  end
+
+  should 'list moderators only' do
+    get :members, :profile => profile.identifier, :role_key => Profile::Roles.moderator(profile.environment.id).key
+    assert_response :success
+    assert_template 'members'
+    assert_equal [@moderator], assigns(:members)
+    assert_no_match /adminprofile/, @response.body
+    assert_no_match /memberprofile/, @response.body
+    assert_match /moderatorprofile/, @response.body
+  end
+
+end
@@ -0,0 +1,70 @@
+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
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([PeopleBlockPlugin.new])
+  end
+
+  should 'display *block people-block* class at design blocks page' do
+    user = create_user('testinguser')
+    login_as(user.login)
+
+    @profile = user.person
+    @environment = @profile.environment
+    @environment.save!
+
+    FriendsBlock.delete_all
+    @box1 = Box.create!(:owner => @profile)
+    @profile.boxes = [@box1]
+
+    @block = FriendsBlock.new
+    @block.box = @box1
+    @block.save!
+
+    @profile.blocks<<@block
+    @profile.save!
+
+    get :index, :profile => @profile.identifier
+    assert_tag :div, :attributes => {:class => 'block friends-block'}
+  end
+
+  should 'the people block is available for person profile' do
+    profile = mock
+    profile.stubs(:has_members?).returns(false)
+    profile.stubs(:person?).returns(true)
+    profile.stubs(:community?).returns(false)
+    profile.stubs(:enterprise?).returns(false)
+    profile.stubs(:has_blog?).returns(false)
+    profile.stubs(:is_admin?).with(anything).returns(false)
+    environment = mock
+    profile.stubs(:environment).returns(environment)
+    environment.stubs(:enabled?).returns(false)
+    @controller.stubs(:profile).returns(profile)
+    @controller.stubs(:user).returns(profile)
+    assert_includes @controller.available_blocks, FriendsBlock
+  end
+
+  should 'the people block is available for community profile' do
+    profile = mock
+    profile.stubs(:has_members?).returns(true)
+    profile.stubs(:person?).returns(false)
+    profile.stubs(:community?).returns(true)
+    profile.stubs(:enterprise?).returns(false)
+    profile.stubs(:has_blog?).returns(false)
+    profile.stubs(:is_admin?).with(anything).returns(false)
+    environment = mock
+    profile.stubs(:environment).returns(environment)
+    environment.stubs(:enabled?).returns(false)
+    @controller.stubs(:profile).returns(profile)
+    @controller.stubs(:user).returns(profile)
+    assert_includes @controller.available_blocks, MembersBlock
+  end
+
+end
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,156 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class FriendsBlockTest < ActiveSupport::TestCase
+
+  should 'inherit from Block' do
+    assert_kind_of Block, FriendsBlock.new
+  end
+
+
+  should 'declare its default title' do
+    assert_not_equal Block.new.default_title, FriendsBlock.new.default_title
+  end
+
+
+  should 'describe itself' do
+    assert_not_equal Block.description, FriendsBlock.description
+  end
+
+
+  should 'is editable' do
+    block = FriendsBlock.new
+    assert block.editable?
+  end
+
+
+  should 'have field limit' do
+    block = FriendsBlock.new
+    assert_respond_to block, :limit
+  end
+
+
+  should 'default value of limit' do
+    block = FriendsBlock.new
+    assert_equal 6, block.limit
+  end
+
+
+  should 'have field name' do
+    block = FriendsBlock.new
+    assert_respond_to block, :name
+  end
+
+
+  should 'default value of name' do
+    block = FriendsBlock.new
+    assert_equal "", block.name
+  end
+
+
+  should 'have field address' do
+    block = FriendsBlock.new
+    assert_respond_to block, :address
+  end
+
+
+  should 'default value of address' do
+    block = FriendsBlock.new
+    assert_equal "", block.address
+  end
+
+
+  should 'prioritize profiles with image by default' do
+    assert FriendsBlock.new.prioritize_people_with_image
+  end
+
+
+  should 'accept a limit of people to be displayed' do
+    block = FriendsBlock.new
+    block.limit = 20
+    assert_equal 20, block.limit
+  end
+
+
+  should 'list friends from person' do
+    owner = fast_create(Person)
+    friend1 = fast_create(Person)
+    friend2 = fast_create(Person)
+    owner.add_friend(friend1)
+    owner.add_friend(friend2)
+
+    block = FriendsBlock.new
+
+    block.expects(:owner).returns(owner).at_least_once
+    expects(:profile_image_link).with(friend1, :minor).returns(friend1.name)
+    expects(:profile_image_link).with(friend2, :minor).returns(friend2.name)
+    expects(:block_title).with(anything).returns('')
+
+    content = instance_eval(&block.content)
+
+    assert_match(/#{friend1.name}/, content)
+    assert_match(/#{friend2.name}/, content)
+  end
+
+
+  should 'link to "all friends"' do
+    person1 = create_user('mytestperson').person
+
+    block = FriendsBlock.new
+    block.expects(:owner).returns(person1).at_least_once
+
+    expects(:_).with('View all').returns('View all')
+    expects(:link_to).with('View all', :profile => 'mytestperson', :controller => 'profile', :action => 'friends').returns('link-to-friends')
+
+    assert_equal 'link-to-friends', instance_eval(&block.footer)
+  end
+
+
+  should 'count number of owner friends' do
+    owner = fast_create(Person)
+    friend1 = fast_create(Person)
+    friend2 = fast_create(Person)
+    friend3 = fast_create(Person)
+    owner.add_friend(friend1)
+    owner.add_friend(friend2)
+    owner.add_friend(friend3)
+
+    block = FriendsBlock.new
+    block.expects(:owner).returns(owner).at_least_once
+
+    assert_equal 3, block.profile_count
+  end
+
+
+  should 'count number of public and private friends' do
+    owner = fast_create(Person)
+    private_p = fast_create(Person, {:public_profile => false})
+    public_p = fast_create(Person, {:public_profile => true})
+
+    owner.add_friend(private_p)
+    owner.add_friend(public_p)
+
+    block = FriendsBlock.new
+    block.expects(:owner).returns(owner).at_least_once
+
+    assert_equal 2, block.profile_count
+  end
+
+
+  should 'not count number of invisible friends' do
+    owner = fast_create(Person)
+    private_p = fast_create(Person, {:visible => false})
+    public_p = fast_create(Person, {:visible => true})
+
+    owner.add_friend(private_p)
+    owner.add_friend(public_p)
+
+    block = FriendsBlock.new
+    block.expects(:owner).returns(owner).at_least_once
+
+    assert_equal 1, block.profile_count
+  end
+
+  protected
+  include NoosferoTestHelper
+
+end
@@ -0,0 +1,252 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class MembersBlockTest < ActiveSupport::TestCase
+
+  should 'inherit from Block' do
+    assert_kind_of Block, MembersBlock.new
+  end
+
+
+  should 'declare its default title' do
+    assert_not_equal Block.new.default_title, MembersBlock.new.default_title
+  end
+
+
+  should 'describe itself' do
+    assert_not_equal Block.description, MembersBlock.description
+  end
+
+
+  should 'is editable' do
+    block = MembersBlock.new
+    assert block.editable?
+  end
+
+
+  should 'have field limit' do
+    block = MembersBlock.new
+    assert_respond_to block, :limit
+  end
+
+
+  should 'default value of limit' do
+    block = MembersBlock.new
+    assert_equal 6, block.limit
+  end
+
+
+  should 'have field name' do
+    block = MembersBlock.new
+    assert_respond_to block, :name
+  end
+
+
+  should 'default value of name' do
+    block = MembersBlock.new
+    assert_equal "", block.name
+  end
+
+
+  should 'have field address' do
+    block = MembersBlock.new
+    assert_respond_to block, :address
+  end
+
+
+  should 'default value of address' do
+    block = MembersBlock.new
+    assert_equal "", block.address
+  end
+
+
+  should 'prioritize profiles with image by default' do
+    assert MembersBlock.new.prioritize_people_with_image
+  end
+
+
+  should 'respect limit when listing members' do
+    community = fast_create(Community)
+    p1 = fast_create(Person)
+    p2 = fast_create(Person)
+    p3 = fast_create(Person)
+    p4 = fast_create(Person)
+
+    community.add_member(p1)
+    community.add_member(p2)
+    community.add_member(p3)
+    community.add_member(p4)
+
+    block = MembersBlock.new(:limit => 3)
+    block.stubs(:owner).returns(community)
+
+    assert_equal 3, block.profile_list.size
+  end
+
+
+  should 'accept a limit of members to be displayed' do
+    block = MembersBlock.new
+    block.limit = 20
+    assert_equal 20, block.limit
+  end
+
+
+  should 'list members from community' do
+    owner = fast_create(Community)
+    person1 = fast_create(Person)
+    person2 = fast_create(Person)
+    owner.add_member(person1)
+    owner.add_member(person2)
+
+    block = MembersBlock.new
+
+    block.expects(:owner).returns(owner).at_least_once
+    expects(:profile_image_link).with(person1, :minor).returns(person1.name)
+    expects(:profile_image_link).with(person2, :minor).returns(person2.name)
+    expects(:block_title).with(anything).returns('')
+
+    content = instance_eval(&block.content)
+
+    assert_match(/#{person1.name}/, content)
+    assert_match(/#{person2.name}/, content)
+  end
+
+  should 'count number of public and private members' do
+    owner = fast_create(Community)
+    private_p = fast_create(Person, {:public_profile => false})
+    public_p = fast_create(Person, {:public_profile => true})
+
+    owner.add_member(private_p)
+    owner.add_member(public_p)
+
+    block = MembersBlock.new
+    block.expects(:owner).returns(owner).at_least_once
+
+    assert_equal 2, block.profile_count
+  end
+
+
+  should 'not count number of invisible members' do
+    owner = fast_create(Community)
+    private_p = fast_create(Person, {:visible => false})
+    public_p = fast_create(Person, {:visible => true})
+
+    owner.add_member(private_p)
+    owner.add_member(public_p)
+
+    block = MembersBlock.new
+    block.expects(:owner).returns(owner).at_least_once
+
+    assert_equal 1, block.profile_count
+  end
+
+  should 'provide link to members page without a visible_role selected' do
+    profile = create_user('mytestuser').person
+    block = MembersBlock.new
+    block.box = profile.boxes.first
+    block.save!
+
+    expects(:_).with('View all').returns('View all')
+    expects(:link_to).with('View all' , :profile => 'mytestuser', :controller => 'people_block_plugin_profile', :action => 'members', :role_key => block.visible_role).returns('link-to-members')
+
+    assert_equal 'link-to-members', instance_eval(&block.footer)
+  end
+
+  should 'provide link to members page with a selected role' do
+    profile = create_user('mytestuser').person
+    block = MembersBlock.new
+    block.box = profile.boxes.first
+    block.visible_role = 'profile_member'
+    block.save!
+
+    expects(:_).with('View all').returns('View all')
+    expects(:link_to).with('View all' , :profile => 'mytestuser', :controller => 'people_block_plugin_profile', :action => 'members', :role_key => block.visible_role).returns('link-to-members')
+
+    assert_equal 'link-to-members', instance_eval(&block.footer)
+  end
+
+  should 'provide a role to be displayed (and default to nil)' do
+    env = fast_create(Environment)
+    env.boxes << Box.new
+    block = MembersBlock.new
+    assert_equal nil, block.visible_role
+    env.boxes.first.blocks << block
+    block.visible_role = 'profile_member'
+    block.save!
+    assert_equal 'profile_member', block.visible_role
+  end
+
+  should 'list all members' do
+    env = fast_create(Environment)
+    env.boxes << Box.new
+    profile1 = fast_create(Person, :environment_id => env.id)
+    profile2 = fast_create(Person, :environment_id => env.id)
+
+    block = MembersBlock.new
+    owner = fast_create(Community)
+    block.stubs(:owner).returns(owner)
+    env.boxes.first.blocks << block
+    block.save!
+
+    owner.add_member profile1
+    owner.add_member profile2
+    profiles = block.profiles
+
+    assert_includes profiles, profile1
+    assert_includes profiles, profile2
+  end
+
+  should 'list only profiles with moderator role' do
+    env = fast_create(Environment)
+    env.boxes << Box.new
+    profile1 = fast_create(Person, :environment_id => env.id)
+    profile2 = fast_create(Person, :environment_id => env.id)
+
+    block = MembersBlock.new
+    owner = fast_create(Community)
+    block.visible_role = Profile::Roles.moderator(owner.environment.id).key
+    block.stubs(:owner).returns(owner)
+    env.boxes.first.blocks << block
+    block.save!
+
+    owner.add_member profile2
+    owner.add_moderator profile1
+    profiles = block.profiles
+
+    assert_includes profiles, profile1
+    assert_not_includes profiles, profile2
+  end
+
+  should 'list only profiles with member role' do
+    env = fast_create(Environment)
+    env.boxes << Box.new
+    profile1 = fast_create(Person, :environment_id => env.id)
+    profile2 = fast_create(Person, :environment_id => env.id)
+
+    block = MembersBlock.new
+    owner = fast_create(Community)
+    block.visible_role = Profile::Roles.member(owner.environment.id).key
+    block.stubs(:owner).returns(owner)
+    env.boxes.first.blocks << block
+    block.save!
+
+    owner.add_member profile2
+    owner.add_moderator profile1
+    profiles = block.profiles
+
+    assert_not_includes profiles, profile1
+    assert_includes profiles, profile2
+  end
+
+  should 'list available roles' do
+    block = MembersBlock.new
+    owner = fast_create(Community)
+    block.stubs(:owner).returns(owner)
+    assert_includes block.roles, Profile::Roles.member(owner.environment.id)
+    assert_includes block.roles, Profile::Roles.admin(owner.environment.id)
+    assert_includes block.roles, Profile::Roles.moderator(owner.environment.id)
+  end
+
+  protected
+  include NoosferoTestHelper
+
+end
@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class PeopleBlockPluginTest < ActiveSupport::TestCase
+
+  should "return PeopleBlock in extra_blocks class method" do
+    assert PeopleBlockPlugin.extra_blocks.keys.include?(PeopleBlock)
+  end
+
+  should "return MembersBlock in extra_blocks class method" do
+    assert PeopleBlockPlugin.extra_blocks.keys.include?(MembersBlock)
+  end
+
+  should "return FriendsBlock in extra_blocks class method" do
+    assert PeopleBlockPlugin.extra_blocks.keys.include?(FriendsBlock)
+  end
+
+  should "return false for class method has_admin_url?" do
+    assert !PeopleBlockPlugin.has_admin_url?
+  end
+
+  should "return false for class method stylesheet?" do
+    assert PeopleBlockPlugin.new.stylesheet?
+  end
+
+end
@@ -0,0 +1,146 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class PeopleBlockTest < ActiveSupport::TestCase
+
+  should 'inherit from Block' do
+    assert_kind_of Block, PeopleBlock.new
+  end
+
+
+  should 'declare its default title' do
+    assert_not_equal Block.new.default_title, PeopleBlock.new.default_title
+  end
+
+
+  should 'describe itself' do
+    assert_not_equal Block.description, PeopleBlock.description
+  end
+
+
+  should 'is editable' do
+    block = PeopleBlock.new
+    assert block.editable?
+  end
+
+
+  should 'have field limit' do
+    block = PeopleBlock.new
+    assert_respond_to block, :limit
+  end
+
+
+  should 'default value of limit' do
+    block = PeopleBlock.new
+    assert_equal 6, block.limit
+  end
+
+
+  should 'have field name' do
+    block = PeopleBlock.new
+    assert_respond_to block, :name
+  end
+
+
+  should 'default value of name' do
+    block = PeopleBlock.new
+    assert_equal "", block.name
+  end
+
+
+  should 'have field address' do
+    block = PeopleBlock.new
+    assert_respond_to block, :address
+  end
+
+
+  should 'default value of address' do
+    block = PeopleBlock.new
+    assert_equal "", block.address
+  end
+
+
+  should 'prioritize profiles with image by default' do
+    assert PeopleBlock.new.prioritize_profiles_with_image
+  end
+
+
+  should 'respect limit when listing people' do
+    env = fast_create(Environment)
+    p1 = fast_create(Person, :environment_id => env.id)
+    p2 = fast_create(Person, :environment_id => env.id)
+    p3 = fast_create(Person, :environment_id => env.id)
+    p4 = fast_create(Person, :environment_id => env.id)
+
+    block = PeopleBlock.new(:limit => 3)
+    block.stubs(:owner).returns(env)
+
+    assert_equal 3, block.profile_list.size
+  end
+
+
+  should 'accept a limit of people to be displayed' do
+    block = PeopleBlock.new
+    block.limit = 20
+    assert_equal 20, block.limit
+  end
+
+
+  should 'list people from environment' do
+    owner = fast_create(Environment)
+    person1 = fast_create(Person, :environment_id => owner.id)
+    person2 = fast_create(Person, :environment_id => owner.id)
+
+    block = PeopleBlock.new
+
+    block.expects(:owner).returns(owner).at_least_once
+    expects(:profile_image_link).with(person1, :minor).returns(person1.name)
+    expects(:profile_image_link).with(person2, :minor).returns(person2.name)
+    expects(:block_title).with(anything).returns('')
+
+    content = instance_exec(&block.content)
+
+    assert_match(/#{person1.name}/, content)
+    assert_match(/#{person2.name}/, content)
+  end
+
+
+  should 'link to "all people"' do
+    env = fast_create(Environment)
+
+    block = PeopleBlock.new
+
+    stubs(:_).with('View all').returns('View all')
+    stubs(:link_to).returns('link-to-people')
+    stubs(:url_for).returns('  ')
+
+    assert_equal 'link-to-people', instance_exec(&block.footer)
+  end
+
+
+  should 'count number of public and private people' do
+    owner = fast_create(Environment)
+    private_p = fast_create(Person, :public_profile => false, :environment_id => owner.id)
+    public_p = fast_create(Person, :public_profile => true, :environment_id => owner.id)
+
+    block = PeopleBlock.new
+    block.expects(:owner).returns(owner).at_least_once
+
+    assert_equal 2, block.profile_count
+  end
+
+
+  should 'not count number of invisible people' do
+    owner = fast_create(Environment)
+    private_p = fast_create(Person, :visible => false, :environment_id => owner.id)
+    public_p = fast_create(Person, :visible => true, :environment_id => owner.id)
+
+    block = PeopleBlock.new
+    block.expects(:owner).returns(owner).at_least_once
+
+    assert_equal 1, block.profile_count
+  end
+
+  protected
+  include NoosferoTestHelper
+
+end
@@ -0,0 +1 @@
+<%= link_to s_('friends|View all'), {:profile => profile.identifier, :controller => 'profile', :action => 'friends'}, :class => 'view-all' %>
@@ -0,0 +1,5 @@
+<%= link_to _('View all'), {:profile => profile.identifier, :controller => 'people_block_plugin_profile', :action => 'members', :role_key => role_key}, :class => 'view-all' %>
+
+<% if show_join_leave_button %>
+  <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
+<% end %>
@@ -0,0 +1 @@
+<%= link_to _('View all'), {:controller => 'search', :action => 'people'}, :class => 'view-all' %>
@@ -0,0 +1,10 @@
+<%= labelled_form_field _('Name:'), text_field(:block, :name) %>
+
+<%= labelled_form_field _('Address:'), text_field(:block, :address) %>
+
+<% if @block.kind_of?(MembersBlock) %>
+  <%= labelled_form_field _('Filter by role:'), '' %>
+  <%= select_tag 'block[visible_role]', options_for_select(@block.roles.map{|r| [r.name, r.key]}.insert(0,''), @block.visible_role) %>
+<% end %>
+
+<%= render :partial => 'profile_list_block' %>
@@ -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,16 @@
+class PiwikPluginAdminController < AdminController
+
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  def index
+    if request.post?
+      if @environment.update_attributes(params[:environment])
+        session[:notice] = _('Piwik plugin settings updated successfully.')
+      else
+        session[:notice] = _('Piwik plugin settings could not be saved.')
+      end
+      redirect_to :controller => 'plugins', :action => 'index'
+    end
+  end
+
+end
@@ -0,0 +1,7 @@
+require_dependency 'environment'
+
+class Environment
+  settings_items :piwik_domain
+  settings_items :piwik_site_id
+  attr_accessible :piwik_domain, :piwik_site_id
+end
@@ -0,0 +1,24 @@
+class PiwikPlugin < Noosfero::Plugin
+
+  include ActionView::Helpers::JavaScriptHelper
+  include ActionView::Helpers::FormHelper
+  include ActionView::Helpers::UrlHelper
+  include ActionView::Helpers::TagHelper
+
+  def self.plugin_name
+    "Piwik"
+  end
+
+  def self.plugin_description
+    _("Tracking and web analytics to your Noosfero's environment")
+  end
+
+  def body_ending
+    domain = context.environment.piwik_domain
+    site_id = context.environment.piwik_site_id
+    unless domain.blank? || site_id.blank?
+      expanded_template('tracking-code.rhtml',{:domain => domain, :site_id => site_id})
+    end
+  end
+
+end
@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../controllers/piwik_plugin_admin_controller'
+
+# Re-raise errors caught by the controller.
+class PiwikPluginAdminController; def rescue_action(e) raise e end; end
+
+class PiwikPluginAdminControllerTest < ActionController::TestCase
+
+  def setup
+    @environment = Environment.default
+    user_login = create_admin_user(@environment)
+    login_as(user_login)
+    @environment.enabled_plugins = ['PiwikPlugin']
+    @environment.save!
+  end
+
+  should 'access index action' do
+    get :index
+    assert_template 'index'
+    assert_response :success
+  end
+
+  should 'update piwik plugin settings' do
+    assert_nil @environment.reload.piwik_domain
+    assert_nil @environment.reload.piwik_site_id
+    post :index, :environment => { :piwik_domain => 'http://something', :piwik_site_id => 10 }
+    assert_not_nil @environment.reload.piwik_domain
+    assert_not_nil @environment.reload.piwik_site_id
+  end
+
+end
@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class PiwikPluginTest < ActiveSupport::TestCase
+
+  def setup
+    @plugin = PiwikPlugin.new
+    @context = mock()
+    @plugin.context = @context
+    @environment = Environment.new
+    @context.stubs(:environment).returns(@environment)
+  end
+
+  should 'add content at the body ending unless domain and site_id are blank' do
+    @environment.piwik_domain = 'piwik.domain.example.com'
+    @environment.piwik_site_id = 5
+    @plugin.stubs(:expanded_template).returns('content')
+    assert_equal 'content', @plugin.body_ending
+  end
+
+  should 'not add any content at the body ending if domain is blank' do
+    @environment.piwik_domain = nil
+    @environment.piwik_site_id = 5
+    @plugin.stubs(:expanded_template).returns('content')
+    assert_equal nil, @plugin.body_ending
+  end
+
+  should 'not add any content at the body ending if site_id is blank' do
+    @environment.piwik_domain = 'piwik.domain.example.com'
+    @environment.piwik_site_id = nil
+    @plugin.stubs(:expanded_template).returns('content')
+    assert_equal nil, @plugin.body_ending
+  end
+
+  should 'extends Environment with attr piwik_domain' do
+    assert_respond_to Environment.new, :piwik_domain
+  end
+
+  should 'extends Environment with attr piwik_site_id' do
+    assert_respond_to Environment.new, :piwik_site_id
+  end
+
+end
@@ -0,0 +1,13 @@
+<h1><%= _("Piwik plugin settings") %></h1>
+
+<%= form_for(:environment) do |f| %>
+
+  <%= labelled_form_field _('Piwik domain'), f.text_field(:piwik_domain) %>
+
+  <%= labelled_form_field _('Piwik site id'), f.text_field(:piwik_site_id) %>
+
+  <% button_bar do %>
+    <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
+  <% end %>
+
+<% end %>
@@ -0,0 +1,15 @@
+<!-- Piwik -->
+<script type="text/javascript">
+  var _paq = _paq || [];
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://<%= escape_javascript locals[:domain] %>/piwik/";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', <%= escape_javascript locals[:site_id] %>]);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
+    g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<noscript><p><img src="http://<%= escape_javascript locals[:domain] %>/piwik/piwik.php?idsite=<%= escape_javascript locals[:site_id] %>" style="border:0;" alt="" /></p></noscript>
+<!-- End Piwik Code -->
@@ -2,4 +2,5 @@ require_dependency &#39;profile&#39;
 class Profile
   settings_items :allow_unauthenticated_comments, :type => :boolean
+  attr_accessible :allow_unauthenticated_comments
 end
 class VideoBlock < Block
+  attr_accessible :url, :width, :height
+  
   settings_items :url, :type => :string, :default => ""
   settings_items :width, :type => :integer, :default => 400
   settings_items :height, :type => :integer, :default => 315
+  YOUTUBE_ID_FORMAT = '\w-'
+
   def is_youtube?
-    url.match(/.*(youtube.com.*v=[[:alnum:]]+|youtu.be\/[[:alnum:]]+).*/) ? true : false
+    url.match(/.*(youtube.com.*v=[#{YOUTUBE_ID_FORMAT}]+|youtu.be\/[#{YOUTUBE_ID_FORMAT}]+).*/) ? true : false
   end
   def is_vimeo?
@@ -44,8 +48,8 @@ class VideoBlock &lt; Block
   def extract_youtube_id
     return nil unless is_youtube?
-    youtube_match = url.match('v=([[:alnum:]]*)')
-    youtube_match ||= url.match('youtu.be\/([[:alnum:]]*)')
+    youtube_match = url.match("v=([#{YOUTUBE_ID_FORMAT}]*)")
+    youtube_match ||= url.match("youtu.be\/([#{YOUTUBE_ID_FORMAT}]*)")
     youtube_match[1] unless youtube_match.nil?
   end
@@ -70,6 +70,13 @@ class VideoBlockTest &lt; ActiveSupport::TestCase
     assert_equal id, block.send('extract_youtube_id')
   end
+  should "extract youtube id from youtube video url's if it has underline and hyphen" do
+    block = VideoBlock.new
+    id = 'oi43_re-d2'
+    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'
@@ -478,12 +478,9 @@ div#notice {
 /************************** Profile List *****************************/
-#content .people-block ul,
 #content .profile-list-block ul,
 #content .enterprises-block ul,
-#content .members-block ul,
 #content .communities-block ul,
-#content .friends-block ul,
 #content .fans-block ul {
   min-width: 196px;
   width: 192px;
@@ -491,24 +488,18 @@ div#notice {
   padding: 0px;
 }
-#content .box-1 .people-block ul,
 #content .box-1 .profile-list-block ul,
 #content .box-1 .enterprises-block ul,
-#content .box-1 .members-block ul,
 #content .box-1 .communities-block ul,
-#content .box-1 .friends-block ul,
 #content .box-1 .fans-block ul {
   width: auto;
   display: block;
 }
 #content .tags-block .block-footer-content a,
-#content .people-block .block-footer-content a,
 #content .profile-list-block .block-footer-content a,
 #content .enterprises-block .block-footer-content a,
-#content .members-block .block-footer-content a,
-#content .communities-block .block-footer-content a,
-#content .friends-block .block-footer-content a {
+#content .communities-block .block-footer-content a {
   position: absolute;
   top: 2px;
   right: 0px;
@@ -518,29 +509,12 @@ div#notice {
   padding-right: 15px;
 }
 #content .tags-block .block-footer-content a,
-#content .people-block .block-footer-content a,
 #content .profile-list-block .block-footer-content a,
 #content .enterprises-block .block-footer-content a,
-#content .communities-block .block-footer-content a,
-#content .friends-block .block-footer-content a {
+#content .communities-block .block-footer-content a {
   background: url(imgs/arrow-right-p.png) 100% 50% no-repeat;
 }
-#content .members-block .block-footer-content .join-leave-button a {
-  position: relative;
-  background-color: #EEE;
-  border: 1px solid #CCC;
-  color: #555;
-  padding-right: inherit;
-}
-
-#content .members-block .block-footer-content .join-leave-button a:hover {
-  color: #FFF;
-  background-color: #555;
-  border: 1px solid #2e3436;
-  text-decoration: none;
-}
-
 #content .profile-list-block .block-title {
   text-align: left;
 }
@@ -0,0 +1 @@
+../../plugins/people_block/public
 \ No newline at end of file
@@ -76,7 +76,8 @@ run(){
 _enable(){
   plugin="$1"
-  source="$available_plugins_dir/$plugin"
+  cd $enabled_plugins_dir
+  source="../../plugins/$plugin"
   target="$enabled_plugins_dir/$plugin"
   run "$source/before_enable.rb"
   if [ -h "$target" ]; then
@@ -98,11 +99,13 @@ _enable(){
       fi
     fi
     if [ "$installation_ok" = true ] && [ "$dependencies_ok" = true ]; then
-      ln -s "$source" "$target"
+      ln -s "$source" "$plugin"
       plugins_public_dir="$NOOSFERO_DIR/public/plugins"
       plugins_features_dir="$NOOSFERO_DIR/features/plugins"
-      test -d "$target/public/" && ln -s "$target/public" "$plugins_public_dir/$plugin"
-      test -d "$NOOSFERO_DIR/features" && test -d "$target/features" && ln -s "$target/features" "$plugins_features_dir/$plugin"
+      cd $plugins_public_dir
+      test -d "$source/public" && ln -s "$source/public" "$plugin"
+      cd $plugins_features_dir
+      test -d "$NOOSFERO_DIR/features" && test -d "$source/features" && ln -s "$source/features" "$plugin"
       _say "$plugin enabled"
       run "$source/after_enable.rb"
       needs_migrate=true
@@ -122,15 +125,19 @@ _disable(){
   target="$enabled_plugins_dir/$plugin"
   plugins_public_dir="$NOOSFERO_DIR/public/plugins"
   plugins_features_dir="$NOOSFERO_DIR/features/plugins"
-  run "$source/before_disable.rb"
-  if [ -h "$target" ]; then
-    rm "$target"
-    test -h "$plugins_public_dir/$plugin" && rm "$plugins_public_dir/$plugin"
-    test -h "$plugins_features_dir/$plugin" && rm "$plugins_features_dir/$plugin"
-    _say "$plugin disabled"
-    run "$source/after_disable.rb"
+  if ! run "$source/before_disable.rb"; then
+    echo "W: failed to disabling $plugin"
+    echo
   else
-    _say "$plugin already disabled"
+    if [ -h "$target" ]; then
+      rm "$target"
+      test -h "$plugins_public_dir/$plugin" && rm "$plugins_public_dir/$plugin"
+      test -h "$plugins_features_dir/$plugin" && rm "$plugins_features_dir/$plugin"
+      _say "$plugin disabled"
+      run "$source/after_disable.rb"
+    else
+      _say "$plugin already disabled"
+    fi
   fi
 }
@@ -21,14 +21,6 @@ class AccountControllerTest &lt; ActionController::TestCase
     disable_signup_bot_check
   end
-  def test_local_files_reference
-    assert_local_files_reference
-  end
-
-  def test_valid_xhtml
-    assert_valid_xhtml
-  end
-
   def test_should_login_and_redirect
     post :login, :user => {:login => 'johndoe', :password => 'test'}
     assert session[:user]
@@ -14,14 +14,6 @@ class AdminPanelControllerTest &lt; ActionController::TestCase
     login_as(create_admin_user(Environment.default))
   end
-  def test_local_files_reference
-    assert_local_files_reference
-  end
-  
-  def test_valid_xhtml
-    assert_valid_xhtml
-  end
-
   should 'manage the correct environment' do
     current = fast_create(Environment, :name => 'test environment', :is_default => false)
     current.domains.create!(:name => 'example.com')
@@ -73,6 +65,7 @@ class AdminPanelControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'textarea', :attributes => { :name => 'environment[terms_of_use]'}
     assert_tag :tag => 'input', :attributes => { :name => 'environment[signup_welcome_text_subject]'}
     assert_tag :tag => 'textarea', :attributes => { :name => 'environment[signup_welcome_text_body]'}
+    assert_tag :tag => 'textarea', :attributes => { :name => 'environment[signup_welcome_screen_body]'}
   end
   should 'display form for editing message for disabled enterprise' do
@@ -381,4 +374,13 @@ class AdminPanelControllerTest &lt; ActionController::TestCase
     assert_not_includes environment.languages, 'en'
   end
+  should 'save body of signup welcome screen' do
+    body = "This is my welcome body"
+    post :site_info, :environment => { :signup_welcome_screen_body => body }
+    assert_redirected_to :action => 'index'
+
+    assert_equal body, Environment.default.signup_welcome_screen_body
+    assert !Environment.default.signup_welcome_screen_body.blank?
+  end
+
 end
@@ -60,14 +60,6 @@ class ApplicationControllerTest &lt; ActionController::TestCase
   end
-  def test_local_files_reference
-    assert_local_files_reference
-  end
-
-  def test_valid_xhtml
-    assert_valid_xhtml
-  end
-
   def test_exist_environment_variable_to_helper_environment_identification
     get :index
     assert_not_nil assigns(:environment)
@@ -16,14 +16,6 @@ class CatalogControllerTest &lt; ActionController::TestCase
   end
   attr_accessor :enterprise
-  def test_local_files_reference
-    assert_local_files_reference :get, :index, :profile => @enterprise.identifier
-  end
-
-  def test_valid_xhtml
-    assert_valid_xhtml
-  end
-
   should 'not display for non-enterprises' do
     u = create_user('testinguser').person
     get :index, :profile => 'testinguser'
@@ -20,14 +20,6 @@ class CategoriesControllerTest &lt; ActionController::TestCase
   attr_reader :env, :cat1, :cat2
-  def test_local_files_reference
-    assert_local_files_reference
-  end
-  
-  def test_valid_xhtml
-    assert_valid_xhtml
-  end
-  
   def test_index
     login_as(create_admin_user(Environment.default))
     get :index
@@ -18,14 +18,6 @@ class CmsControllerTest &lt; ActionController::TestCase
   attr_reader :profile
-  def test_local_files_reference
-    assert_local_files_reference :get, :index, :profile => profile.identifier
-  end
-
-  def test_valid_xhtml
-    assert_valid_xhtml
-  end
-
   should 'list top level documents on index' do
     get :index, :profile => profile.identifier
@@ -1228,7 +1220,7 @@ class CmsControllerTest &lt; ActionController::TestCase
   should 'allow user edit article if he is owner and has publish permission' do
     c = Community.create!(:name => 'test_comm', :identifier => 'test_comm')
     u = create_user_with_permission('test_user', 'publish_content', c)
-    a = create(Article, :profile => c, :name => 'test_article', :last_changed_by => u)
+    a = create(Article, :profile => c, :name => 'test_article', :created_by => u)
     login_as :test_user
     @controller.stubs(:user).returns(u)
@@ -1774,6 +1766,31 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_equal 'first version', Article.find(article.id).name
   end
+  should 'set created_by when creating article' do
+    login_as(profile.identifier)
+
+    post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'changed by me', :body => 'content ...' }
+
+    a = profile.articles.find_by_path('changed-by-me')
+    assert_not_nil a
+    assert_equal profile, a.created_by
+  end
+
+  should 'not change created_by when updating article' do
+    other_person = create_user('otherperson').person
+
+    a = profile.articles.build(:name => 'my article')
+    a.created_by = other_person
+    a.save!
+
+    login_as(profile.identifier)
+    post :edit, :profile => profile.identifier, :id => a.id, :article => { :body => 'new content for this article' }
+
+    a.reload
+
+    assert_equal other_person, a.created_by
+  end
+
   protected
   # FIXME this is to avoid adding an extra dependency for a proper JSON parser.
@@ -18,16 +18,6 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   end
   attr_reader :profile, :environment
-  def test_local_files_reference
-    page = profile.articles.build(:name => 'test')
-    page.save!
-    assert_local_files_reference :get, :view_page, :profile => profile.identifier, :page => [ 'test' ]
-  end
-
-  def test_valid_xhtml
-    assert_valid_xhtml
-  end
-
   def test_should_display_page
     page = profile.articles.build(:name => 'test')
     page.save!
@@ -743,7 +733,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     c = Community.create!(:name => 'test_com')
     u = create_user_with_permission('test_user', 'publish_content', c)
     login_as u.identifier
-    a = create(Article, :profile => c, :name => 'test-article', :last_changed_by => u, :published => false)
+    a = create(Article, :profile => c, :name => 'test-article', :created_by => u, :published => false)
     get :view_page, :profile => c.identifier, :page => a.path
@@ -15,14 +15,6 @@ class EditTemplateControllerTest &lt; ActionController::TestCase
     login_as 'ze'
   end
-  def test_local_files_reference
-    assert_local_files_reference
-  end
-  
-  def test_valid_xhtml
-    assert_valid_xhtml
-  end
-  
   def test_redirect_to_design_editor_when_index_action_is_called
     give_permission('ze', 'edit_environment_design', Environment.default)
     get :index
@@ -17,14 +17,6 @@ class EnterpriseRegistrationControllerTest &lt; ActionController::TestCase
     login_as 'ze'
   end
-  def test_local_files_reference
-    assert_local_files_reference
-  end
-  
-  def test_valid_xhtml
-    assert_valid_xhtml
-  end
-  
   should 'go to the first step on index' do
     get :index
     assert_response :success
@@ -19,18 +19,6 @@ class EnterpriseValidationControllerTest &lt; ActionController::TestCase
     Profile.expects(:find_by_identifier).with('myorg').returns(@org).at_least_once
   end
-  def test_local_files_reference
-    assert_local_files_reference :get, :index, :profile => 'myorg'
-  end
-  
-  def test_valid_xhtml
-
-    # FIXME remove this after enable assert_valid_xhtml
-    Profile.find_by_identifier('myorg')
-
-    assert_valid_xhtml :get, :index, :profile => 'myorg'
-  end
-  
   should 'list pending validations on index' do
     empty = []
     @org.expects(:pending_validations).returns(empty)
@@ -8,7 +8,7 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
   # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
   #      the Noosfero core soon, see ActionItem3045
-  ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
+  ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
   def setup
     @controller = EnvironmentDesignController.new
@@ -17,14 +17,6 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
   end
-  def test_local_files_reference
-    assert_local_files_reference
-  end
-
-  def test_valid_xhtml
-    assert_valid_xhtml
-  end
-
   should 'indicate only actual blocks as such' do
     assert(@controller.available_blocks.all? {|item| item.new.is_a? Block})
   end
@@ -107,16 +99,6 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'input', :attributes => { :id => 'block_limit' }
   end
-  should 'be able to edit PeopleBlock' do
-    login_as(create_admin_user(Environment.default))
-    b = PeopleBlock.create!
-    e = Environment.default
-    e.boxes.create!
-    e.boxes.first.blocks << b
-    get :edit, :id => b.id
-    assert_tag :tag => 'input', :attributes => { :id => 'block_limit' }
-  end
-
   should 'be able to edit SlideshowBlock' do
     login_as(create_admin_user(Environment.default))
     b = SlideshowBlock.create!
	@@ -26,6 +26,7 @@ end		@@ -26,6 +26,7 @@ end
26	group :test do	26	group :test do
27	gem 'rspec'	27	gem 'rspec'
28	gem 'rspec-rails'	28	gem 'rspec-rails'
		29	+ gem 'mocha', :require => false
29	end	30	end
30		31
31	group :cucumber do	32	group :cucumber do
	@@ -61,7 +61,7 @@ GEM		@@ -61,7 +61,7 @@ GEM
61	database_cleaner (1.2.0)	61	database_cleaner (1.2.0)
62	diff-lcs (1.1.3)	62	diff-lcs (1.1.3)
63	erubis (2.7.0)	63	erubis (2.7.0)
64	- eventmachine (0.12.11)	64	+ eventmachine (1.0.3)
65	fast_gettext (0.6.8)	65	fast_gettext (0.6.8)
66	ffi (1.0.11)	66	ffi (1.0.11)
67	gherkin (2.4.21)	67	gherkin (2.4.21)
	@@ -75,7 +75,10 @@ GEM		@@ -75,7 +75,10 @@ GEM
75	i18n (>= 0.4.0)	75	i18n (>= 0.4.0)
76	mime-types (~> 1.16)	76	mime-types (~> 1.16)
77	treetop (~> 1.4.8)	77	treetop (~> 1.4.8)
		78	+ metaclass (0.0.4)
78	mime-types (1.19)	79	mime-types (1.19)
		80	+ mocha (0.11.3)
		81	+ metaclass (~> 0.0.1)
79	multi_json (1.3.6)	82	multi_json (1.3.6)
80	nokogiri (1.5.5)	83	nokogiri (1.5.5)
81	pg (0.13.2)	84	pg (0.13.2)
	@@ -164,6 +167,7 @@ DEPENDENCIES		@@ -164,6 +167,7 @@ DEPENDENCIES
164	database_cleaner	167	database_cleaner
165	fast_gettext	168	fast_gettext
166	hpricot	169	hpricot
		170	+ mocha
167	nokogiri	171	nokogiri
168	pg	172	pg
169	prototype-rails	173	prototype-rails
	@@ -7,6 +7,7 @@ class AdminPanelController < AdminController		@@ -7,6 +7,7 @@ class AdminPanelController < AdminController
7	end	7	end
8		8
9	def site_info	9	def site_info
		10	+ @no_design_blocks = true
10	if request.post?	11	if request.post?
11	if params[:environment][:languages]	12	if params[:environment][:languages]
12	params[:environment][:languages] = params[:environment][:languages].map {\|lang, value\| lang if value=='true'}.compact	13	params[:environment][:languages] = params[:environment][:languages].map {\|lang, value\| lang if value=='true'}.compact
	@@ -5,7 +5,7 @@ class EnvironmentDesignController < BoxOrganizerController		@@ -5,7 +5,7 @@ class EnvironmentDesignController < BoxOrganizerController
5	def available_blocks	5	def available_blocks
6	# TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from	6	# TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
7	# the Noosfero core soon, see ActionItem3045	7	# the Noosfero core soon, see ActionItem3045
8	- @available_blocks \|\|= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]	8	+ @available_blocks \|\|= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
9	@available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)	9	@available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
10	end	10	end
11		11
	@@ -144,6 +144,7 @@ class CmsController < MyProfileController		@@ -144,6 +144,7 @@ class CmsController < MyProfileController
144		144
145	@article.profile = profile	145	@article.profile = profile
146	@article.last_changed_by = user	146	@article.last_changed_by = user
		147	+ @article.created_by = user
147		148
148	translations if @article.translatable?	149	translations if @article.translatable?
149		150
	@@ -1034,7 +1034,7 @@ module ApplicationHelper		@@ -1034,7 +1034,7 @@ module ApplicationHelper
1034	end	1034	end
1035		1035
1036	link_to(content_tag(:span, _('Contents'), :class => 'icon-menu-articles'), {:controller => "search", :action => 'contents', :category_path => nil}, :id => 'submenu-contents') +	1036	link_to(content_tag(:span, _('Contents'), :class => 'icon-menu-articles'), {:controller => "search", :action => 'contents', :category_path => nil}, :id => 'submenu-contents') +
1037	- link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')	1037	+ link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
1038	end	1038	end
1039	alias :browse_contents_menu :search_contents_menu	1039	alias :browse_contents_menu :search_contents_menu
1040		1040
	@@ -1050,7 +1050,7 @@ module ApplicationHelper		@@ -1050,7 +1050,7 @@ module ApplicationHelper
1050	end	1050	end
1051		1051
1052	link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "search", :action => 'people', :category_path => ''}, :id => 'submenu-people') +	1052	link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "search", :action => 'people', :category_path => ''}, :id => 'submenu-people') +
1053	- link_to(content_tag(:span, _('People menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')	1053	+ link_to(content_tag(:span, _('People menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')
1054	end	1054	end
1055	alias :browse_people_menu :search_people_menu	1055	alias :browse_people_menu :search_people_menu
1056		1056
	@@ -1066,7 +1066,7 @@ module ApplicationHelper		@@ -1066,7 +1066,7 @@ module ApplicationHelper
1066	end	1066	end
1067		1067
1068	link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "search", :action => 'communities'}, :id => 'submenu-communities') +	1068	link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "search", :action => 'communities'}, :id => 'submenu-communities') +
1069	- link_to(content_tag(:span, _('Communities menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')	1069	+ link_to(content_tag(:span, _('Communities menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
1070	end	1070	end
1071	alias :browse_communities_menu :search_communities_menu	1071	alias :browse_communities_menu :search_communities_menu
1072		1072
	@@ -48,7 +48,7 @@ class ApproveArticle < Task		@@ -48,7 +48,7 @@ class ApproveArticle < Task
48	end	48	end
49		49
50	def perform	50	def perform
51	- article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.author_id)	51	+ article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.last_changed_by_id, :created_by_id => article.created_by_id)
52	end	52	end
53		53
54	def title	54	def title
	@@ -8,6 +8,8 @@ class CategoriesBlock < Block		@@ -8,6 +8,8 @@ class CategoriesBlock < Block
8		8
9	settings_items :category_types, :type => Array, :default => []	9	settings_items :category_types, :type => Array, :default => []
10		10
		11	+ attr_accessible :category_types
		12	+
11	def self.description	13	def self.description
12	_("Categories Menu")	14	_("Categories Menu")
13	end	15	end
	@@ -2,6 +2,8 @@		@@ -2,6 +2,8 @@
2	# only enterprises can offer products and services.	2	# only enterprises can offer products and services.
3	class Enterprise < Organization	3	class Enterprise < Organization
4		4
		5	+ attr_accessible :business_name, :address_reference, :district, :tag_list, :organization_website, :historic_and_current_context, :activities_short_description, :products_per_catalog_page
		6	+
5	SEARCH_DISPLAYS += %w[map full]	7	SEARCH_DISPLAYS += %w[map full]
6		8
7	def self.type_name	9	def self.type_name
	@@ -1,26 +0,0 @@	@@ -1,26 +0,0 @@
1	-class FriendsBlock < ProfileListBlock
2	-
3	- def self.description
4	- _('Friends')
5	- end
6	-
7	- def default_title
8	- n_('{#} friend', '{#} friends', profile_count)
9	- end
10	-
11	- def help
12	- _('This block displays your friends.')
13	- end
14	-
15	- def footer
16	- owner_id = owner.identifier
17	- proc do
18	- link_to s_('friends\|View all'), :profile => owner_id, :controller => 'profile', :action => 'friends'
19	- end
20	- end
21	-
22	- def profiles
23	- owner.friends
24	- end
25	-
26	-end