Merge branch 'stoa' into 'master'

Stoa Network Features This merge-request groups 6 features developed majorly by me, @danielafeitosa and @larissa funded by Stoa Network. These features were finished during the freezing time and only now we were able to update it to the current master. I'm sorry that we'll merge them all together in a single request, but we had to group them on a single branch do improve the efficiency of our work. Here are the features grouped here: - Media gallery complete refactoring - Welcome page improvements - Better interaction with other networks - Friends and communities suggestions - Invitation improvements - Search improvements All 6 features were reviewed by at least one of us and since we are committers, I'm merging this right away. This merge-request was made more for information sake. See merge request !451

Merge branch 'stoa' into 'master'
Stoa Network Features This merge-request groups 6 features developed majorly by me, @danielafeitosa and @larissa funded by Stoa Network. These features were finished during the freezing time and only now we were able to update it to the current master. I'm sorry that we'll merge them all together in a single request, but we had to group them on a single branch do improve the efficiency of our work. Here are the features grouped here: - Media gallery complete refactoring - Welcome page improvements - Better interaction with other networks - Friends and communities suggestions - Invitation improvements - Search improvements All 6 features were reviewed by at least one of us and since we are committers, I'm merging this right away. This merge-request was made more for information sake. See merge request !451
Rodrigo Souto
2 parents ef453b43 d2029dc6
Showing 354 changed files with 15890 additions and 880 deletions Show diff stats
Gemfile
app/controllers/admin/region_validators_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/application_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/friends_controller.rb
app/controllers/my_profile/memberships_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/home_controller.rb
app/controllers/public/invite_controller.rb
app/controllers/public/profile_search_controller.rb
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/helpers/cms_helper.rb
app/helpers/forms_helper.rb
app/helpers/layout_helper.rb
app/helpers/search_helper.rb
app/helpers/search_term_helper.rb
app/helpers/token_helper.rb
@@ -21,6 +21,8 @@ gem &#39;exception_notification&#39;,   &#39;~&gt; 4.0.1&#39;
 gem 'gettext',                  '~> 2.2.1', :require => false, :group => :development
 gem 'locale',                   '~> 2.0.5'
  
+gem 'whenever', :require => false
+
 # FIXME list here all actual dependencies (i.e. the ones in debian/control),
 # with their GEM names (not the Debian package names)
  
@@ -33,7 +33,7 @@ class RegionValidatorsController &lt; AdminController
   def load_region_and_search
     @region = environment.regions.find(params[:id])
     if params[:search]
-      @search = find_by_contents(:organizations, Organization, params[:search])[:results].reject {|item| @region.validator_ids.include?(item.id) }
+      @search = find_by_contents(:organizations, environment, Organization, params[:search])[:results].reject {|item| @region.validator_ids.include?(item.id) }
     end
   end
  
@@ -18,7 +18,7 @@ class UsersController &lt; AdminController
     end
     scope = scope.order('name ASC')
     @q = params[:q]
-    @collection = find_by_contents(:people, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
+    @collection = find_by_contents(:people, environment, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
   end
  
   def set_admin_role
@@ -183,21 +183,19 @@ class ApplicationController &lt; ActionController::Base
     end
   end
  
-  def find_by_contents(asset, scope, query, paginate_options={:page => 1}, options={})
-    plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options) ||
-    fallback_find_by_contents(asset, scope, query, paginate_options, options)
-  end
+  include SearchTermHelper
  
-  private
+  def find_by_contents(asset, context, scope, query, paginate_options={:page => 1}, options={})
+    search = plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options)
+    register_search_term(query, scope.count, search[:results].count, context, asset)
+    search
+  end
  
-  def fallback_find_by_contents(asset, scope, query, paginate_options, options)
-    scope = scope.like_search(query) unless query.blank?
-    scope = scope.send(options[:filter]) unless options[:filter].blank?
-    {:results => scope.paginate(paginate_options)}
+  def find_suggestions(query, context, asset, options={})
+    plugins.dispatch_first(:find_suggestions, query, context, asset, options)
   end
  
   def private_environment?
     @environment.enabled?(:restrict_to_members)
   end
-
 end
@@ -23,6 +23,9 @@ class CmsController &lt; MyProfileController
   end
  
   before_filter :login_required, :except => [:suggest_an_article]
+  before_filter :load_recent_files, :only => [:new, :edit]
+
+  helper_method :file_types
  
   protect_if :only => :upload_files do |c, user, profile|
     article_id = c.params[:parent_id]
@@ -30,7 +33,7 @@ class CmsController &lt; MyProfileController
     (user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile)))
   end
  
-  protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish, :upload_files, :new] do |c, user, profile|
+  protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish, :publish_on_portal_community, :publish_on_communities, :search_communities_to_publish, :upload_files, :new] do |c, user, profile|
     user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile))
   end
  
@@ -40,7 +43,7 @@ class CmsController &lt; MyProfileController
     (user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile)))
   end
  
-  protect_if :only => [:destroy, :publish] do |c, user, profile|
+  protect_if :only => :destroy do |c, user, profile|
     profile.articles.find(c.params[:id]).allow_post_content?(user)
   end
  
@@ -117,7 +120,7 @@ class CmsController &lt; MyProfileController
     @success_back_to = params[:success_back_to]
     # user must choose an article type first
  
-    @parent = profile.articles.find(params[:parent_id]) if params && params[:parent_id]
+    @parent = profile.articles.find(params[:parent_id]) if params && params[:parent_id].present?
     record_coming
     @type = params[:type]
     if @type.blank?
@@ -163,7 +166,10 @@ class CmsController &lt; MyProfileController
         if continue
           redirect_to :action => 'edit', :id => @article
         else
-          success_redirect
+          respond_to do |format|
+            format.html { success_redirect }
+            format.json { render :text => {:id => @article.id, :full_name => profile.identifier + '/' + @article.full_name}.to_json }
+          end
         end
         return
       end
@@ -256,28 +262,53 @@ class CmsController &lt; MyProfileController
     render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'article' }
   end
  
+  def search_communities_to_publish
+    render :text => find_by_contents(:profiles, environment, user.memberships, params['q'], {:page => 1}, {:fields => ['name']})[:results].map {|community| {:id => community.id, :name => community.name} }.to_json
+  end
+
   def publish
     @article = profile.articles.find(params[:id])
     record_coming
-    @groups = profile.memberships - [profile]
-    @marked_groups = []
-    groups_ids = profile.memberships.map{|m|m.id.to_s}
-    @marked_groups = params[:marked_groups].map do |key, item|
-      if groups_ids.include?(item[:group_id])
-        item.merge :group => Profile.find(item.delete(:group_id))
+    @failed = {}
+    if request.post?
+      article_name = params[:name]
+      task = ApproveArticle.create!(:article => @article, :name => article_name, :target => user, :requestor => user)
+      begin
+        task.finish
+      rescue Exception => ex
+         @failed[ex.message] ? @failed[ex.message] << @article.name : @failed[ex.message] = [@article.name]
+         task.cancel
+      end
+      if @failed.blank?
+        session[:notice] = _("Your publish request was sent successfully")
+        if @back_to
+          redirect_to @back_to
+        else
+          redirect_to @article.view_url
+        end
       end
-    end.compact unless params[:marked_groups].nil?
+    end
+  end
+
+  def publish_on_communities
     if request.post?
+      @back_to = params[:back_to]
+      @article = profile.articles.find(params[:id])
       @failed = {}
+      article_name = params[:name]
+      params_marked = (params['q'] || '').split(',').select { |marked| user.memberships.map(&:id).include? marked.to_i }
+      @marked_groups = Profile.find(params_marked)
       if @marked_groups.empty?
+        redirect_to @back_to
         return session[:notice] = _("Select some group to publish your article")
       end
       @marked_groups.each do |item|
-        task = ApproveArticle.create!(:article => @article, :name => item[:name], :target => item[:group], :requestor => profile)
+        task = ApproveArticle.create!(:article => @article, :name => article_name, :target => item, :requestor => user)
         begin
-          task.finish unless item[:group].moderated_articles?
+          task.finish unless item.moderated_articles?
         rescue Exception => ex
-          @failed[ex.message] ? @failed[ex.message] << item[:group].name : @failed[ex.message] = [item[:group].name]
+           @failed[ex.message] ? @failed[ex.message] << item.name : @failed[ex.message] = [item.name]
+           task.cancel
         end
       end
       if @failed.blank?
@@ -287,23 +318,27 @@ class CmsController &lt; MyProfileController
         else
           redirect_to @article.view_url
         end
+      else
+        session[:notice] = _("Some of your publish requests couldn't be sent.")
+        render :action => 'publish'
       end
     end
   end
  
   def publish_on_portal_community
-    @article = profile.articles.find(params[:id])
     if request.post?
-      if environment.portal_community
+      @article = profile.articles.find(params[:id])
+      if environment.portal_enabled
         task = ApproveArticle.create!(:article => @article, :name => params[:name], :target => environment.portal_community, :requestor => user)
         begin
           task.finish unless environment.portal_community.moderated_articles?
-          flash[:notice] = _("Your publish request was sent successfully")
+          session[:notice] = _("Your publish request was sent successfully")
         rescue
-          flash[:error] = _("Your publish request couldn't be sent.")
+          session[:notice] = _("Your publish request couldn't be sent.")
+          task.cancel
         end
       else
-        flash[:notice] = _("There is no portal community to publish your article.")
+        session[:notice] = _("There is no portal community to publish your article.")
       end
  
       if @back_to
@@ -331,7 +366,7 @@ class CmsController &lt; MyProfileController
  
   def search
     query = params[:q]
-    results = find_by_contents(:uploaded_files, profile.files.published, query)[:results]
+    results = find_by_contents(:uploaded_files, profile, profile.files.published, query)[:results]
     render :text => article_list_to_json(results), :content_type => 'application/json'
   end
  
@@ -342,15 +377,26 @@ class CmsController &lt; MyProfileController
   end
  
   def media_upload
-    files_uploaded = []
     parent = check_parent(params[:parent_id])
-    files = [:file1,:file2, :file3].map { |f| params[f] }.compact
     if request.post?
-      files.each do |file|
-        files_uploaded << UploadedFile.create(:uploaded_data => file, :profile => profile, :parent => parent) unless file == ''
+      begin
+        @file = UploadedFile.create!(:uploaded_data => params[:file], :profile => profile, :parent => parent) unless params[:file] == ''
+        @file = FilePresenter.for(@file)
+      rescue Exception => exception
+        render :text => exception.to_s, :status => :bad_request
       end
     end
-    render :text => article_list_to_json(files_uploaded), :content_type => 'text/plain'
+  end
+
+  def published_media_items
+    load_recent_files(params[:parent_id], params[:q])
+    render :partial => 'published_media_items'
+  end
+
+  def view_all_media
+    paginate_options = {:page => params[:page].blank? ? 1 : params[:page] }
+    @key = params[:key].to_sym
+    load_recent_files(params[:parent_id], params[:q], paginate_options)
   end
  
   protected
@@ -445,4 +491,36 @@ class CmsController &lt; MyProfileController
     end
   end
  
+  def file_types
+    {:images => _('Images'), :generics => _('Files')}
+  end
+
+  def load_recent_files(parent_id = nil, q = nil, paginate_options = {:page => 1, :per_page => 6})
+    #TODO Since we only have special support for images, I'm limiting myself to
+    #     consider generic files as non-images. In the future, with more supported
+    #     file types we'll need to have a smart way to fetch from the database
+    #     scopes of each supported type as well as the non-supported types as a
+    #     whole.
+    @recent_files = {}
+
+    parent = parent_id.present? ? profile.articles.find(parent_id) : nil
+    if parent.present?
+      files = parent.children.files
+    else
+      files = profile.files
+    end
+
+    files = files.reorder('created_at DESC')
+    images = files.images
+    generics = files.no_images
+
+    if q.present?
+      @recent_files[:images] = find_by_contents(:images, profile, images, q, paginate_options)[:results]
+      @recent_files[:generics] = find_by_contents(:generics, profile, generics, q, paginate_options)[:results]
+    else
+      @recent_files[:images] = images.paginate(paginate_options)
+      @recent_files[:generics] = generics.paginate(paginate_options)
+    end
+  end
+
 end
@@ -3,6 +3,7 @@ class FriendsController &lt; MyProfileController
   protect 'manage_friends', :profile
  
   def index
+    @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)
     if is_cache_expired?(profile.manage_friends_cache_key(params))
       @friends = profile.friends.paginate(:per_page => per_page, :page => params[:npage])
     end
@@ -16,6 +17,30 @@ class FriendsController &lt; MyProfileController
     end
   end
  
+  def suggest
+    @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)
+  end
+
+  def remove_suggestion
+    @person = profile.suggested_people.find_by_identifier(params[:id])
+    redirect_to :action => 'suggest' unless @person
+    if @person && request.post?
+      profile.remove_suggestion(@person)
+      @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)
+      render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :friends_suggestions, :per_page => params[:per_page] || per_page }
+    end
+  end
+
+  def connections
+    @suggestion = profile.profile_suggestions.of_person.enabled.find_by_suggestion_id(params[:id])
+    if @suggestion
+      @tags = @suggestion.tag_connections
+      @profiles = @suggestion.profile_connections
+    else
+      redirect_to :action => 'suggest'
+    end
+  end
+
   protected
  
   class << self
@@ -20,12 +20,54 @@ class MembershipsController &lt; MyProfileController
     @community.environment = environment
     @back_to = params[:back_to] || url_for(:action => 'index')
     if request.post? && @community.valid?
-      @community = Community.create_after_moderation(user, params[:community].merge({:environment => environment}))
-      if @community.new_record?
+      begin
+        # Community was created
+        @community = Community.create_after_moderation(user, params[:community].merge({:environment => environment}))
+        @community.reload
+        redirect_to :action => 'welcome', :community_id => @community.id, :back_to => @back_to
+      rescue ActiveRecord::RecordNotFound
+        # Community pending approval
         session[:notice] = _('Your new community creation request will be evaluated by an administrator. You will be notified.')
+        redirect_to @back_to
       end
-      redirect_to @back_to
       return
     end
   end
+
+  def welcome
+    @community = Community.find(params[:community_id])
+    @back_to = params[:back_to]
+  end
+
+  def suggest
+    @suggestions = profile.profile_suggestions.of_community.enabled.includes(:suggestion).limit(per_page)
+  end
+
+  def remove_suggestion
+    @community = profile.suggested_communities.find_by_identifier(params[:id])
+    custom_per_page = params[:per_page] || per_page
+    redirect_to :action => 'suggest' unless @community
+    if @community && request.post?
+      profile.remove_suggestion(@community)
+      @suggestions = profile.profile_suggestions.of_community.enabled.includes(:suggestion).limit(custom_per_page)
+      render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :communities_suggestions, :per_page => custom_per_page}
+    end
+  end
+
+  def connections
+    @suggestion = profile.profile_suggestions.of_community.enabled.find_by_suggestion_id(params[:id])
+    if @suggestion
+      @tags = @suggestion.tag_connections
+      @profiles = @suggestion.profile_connections
+    else
+      redirect_to :action => 'suggest'
+    end
+  end
+
+  protected
+
+  def per_page
+    12
+  end
+
 end
@@ -3,6 +3,10 @@ class ProfileEditorController &lt; MyProfileController
   protect 'edit_profile', :profile, :except => [:destroy_profile]
   protect 'destroy_profile', :profile, :only => [:destroy_profile]
  
+  before_filter :access_welcome_page, :only => [:welcome_page]
+  before_filter :back_to
+  helper_method :has_welcome_page
+
   def index
     @pending_tasks = Task.to(profile).pending.without_spam.select{|i| user.has_permission?(i.permission, profile)}
   end
@@ -85,6 +89,21 @@ class ProfileEditorController &lt; MyProfileController
     end
   end
  
+  def welcome_page
+    @welcome_page = profile.welcome_page || TinyMceArticle.new(:name => 'Welcome Page', :profile => profile, :published => false)
+    if request.post?
+      begin
+        @welcome_page.update_attributes!(params[:welcome_page])
+        profile.welcome_page = @welcome_page
+        profile.save!
+        session[:notice] = _('Welcome page saved successfully.')
+        redirect_to :action => 'index'
+      rescue Exception => exception
+        session[:notice] = _('Welcome page could not be saved.')
+      end
+    end
+  end
+
   def deactivate_profile
     if environment.admins.include?(current_person)
       profile = environment.profiles.find(params[:id])
@@ -116,9 +135,24 @@ class ProfileEditorController &lt; MyProfileController
   protected
  
   def redirect_to_previous_location
-    back = request.referer
-    back = "/" if back.nil?
+    redirect_to @back_to
+  end
  
-    redirect_to back
+  #TODO Consider using this as a general controller feature to be available on every action.
+  def back_to
+    @back_to = params[:back_to] || request.referer || "/"
   end
+
+  private
+
+  def has_welcome_page
+    profile.is_template
+  end
+
+  def access_welcome_page
+    unless has_welcome_page
+      render_access_denied
+    end
+  end
+
 end
@@ -82,10 +82,12 @@ class AccountController &lt; ApplicationController
     if @plugins.dispatch(:allow_user_registration).include?(false)
       redirect_back_or_default(:controller => 'home')
       session[:notice] = _("This environment doesn't allow user registration.")
+      return
     end
  
     store_location(request.referer) unless params[:return_to] or session[:return_to]
  
+    # Tranforming to boolean
     @block_bot = !!session[:may_be_a_bot]
     @invitation_code = params[:invitation_code]
     begin
@@ -129,8 +131,8 @@ class AccountController &lt; ApplicationController
             check_join_in_community(@user)
             go_to_signup_initial_page
           else
+            redirect_to :controller => :home, :action => :welcome, :template_id => (@user.person.template && @user.person.template.id)
             session[:notice] = _('Thanks for registering!')
-            @register_pending = true
           end
         end
       end
@@ -461,6 +463,8 @@ class AccountController &lt; ApplicationController
         redirect_to user.url
       when 'user_control_panel'
         redirect_to user.admin_url
+      when 'welcome_page'
+        redirect_to :controller => :home, :action => :welcome, :template_id => (user.template && user.template.id)
     else
       redirect_back_or_default(default)
     end
@@ -18,4 +18,10 @@ class HomeController &lt; PublicController
     @no_design_blocks = true
   end
  
+  def welcome
+    @no_design_blocks = true
+    @display_confirmation_tips = !user.present? && !environment.enabled?(:skip_new_user_email_confirmation)
+    @person_template = user && user.template || params[:template_id] && Person.find(params[:template_id])
+  end
+
 end
@@ -4,8 +4,15 @@ class InviteController &lt; PublicController
   before_filter :login_required
   before_filter :check_permissions_to_invite
  
-  def select_address_book
+  def invite_friends
     @import_from = params[:import_from] || "manual"
+    @mail_template = params[:mail_template] || environment.invitation_mail_template(profile)
+
+    labels = Profile::SEARCHABLE_FIELDS.except(:nickname).merge(User::SEARCHABLE_FIELDS).map { |name,info| info[:label].downcase }
+    last = labels.pop
+    label = labels.join(', ')
+    @search_fields = "#{label} #{_('or')} #{last}"
+
     if request.post?
       contact_list = ContactList.create
       Delayed::Job.enqueue GetEmailContactsJob.new(@import_from, params[:login], params[:password], contact_list.id) if @import_from != 'manual'
@@ -22,7 +29,7 @@ class InviteController &lt; PublicController
       webmail_import_addresses = params[:webmail_import_addresses]
       contacts_to_invite = Invitation.join_contacts(manual_import_addresses, webmail_import_addresses)
       if !contacts_to_invite.empty?
-        Delayed::Job.enqueue InvitationJob.new(current_user.person.id, contacts_to_invite, params[:mail_template], profile.id, @contact_list.id, locale)
+        Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, params[:mail_template], profile.id, @contact_list.id, locale)
         session[:notice] = _('Your invitations are being sent.')
         if profile.person?
           redirect_to :controller => 'profile', :action => 'friends'
@@ -52,16 +59,36 @@ class InviteController &lt; PublicController
   def cancel_fetching_emails
     contact_list = ContactList.find(params[:contact_list])
     contact_list.destroy
-    redirect_to :action => 'select_address_book'
+    redirect_to :action => 'invite_friends'
+  end
+
+  def invite_registered_friend
+    contacts_to_invite = params['q'].split(',')
+    if !contacts_to_invite.empty? && request.post?
+      Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, '', profile.id, nil, locale)
+      session[:notice] = _('Your invitations are being sent.')
+      if profile.person?
+        redirect_to :controller => 'profile', :action => 'friends'
+      else
+        redirect_to :controller => 'profile', :action => 'members'
+      end
+    else
+      redirect_to :action => 'invite_friends'
+      session[:notice] = _('Please enter a valid profile.')
+    end
+  end
+
+  def search
+    scope = profile.invite_friends_only ? user.friends : environment.people
+    scope = scope.not_members_of(profile) if profile.organization?
+    scope = scope.not_friends_of(profile) if profile.person?
+    results = find_by_contents(:people, environment, scope, params['q'], {:page => 1}, {:joins => :user})[:results]
+    render :text => prepare_to_token_input(results).to_json
   end
  
   protected
  
   def check_permissions_to_invite
-    if profile.person? and !current_user.person.has_permission?(:manage_friends, profile) or
-      profile.community? and !current_user.person.has_permission?(:invite_members, profile)
-      render_access_denied
-    end
+    render_access_denied if !profile.allow_invitation_from?(user)
   end
-
 end
@@ -9,9 +9,12 @@ class ProfileSearchController &lt; PublicController
     @q = params[:q]
     unless @q.blank?
       if params[:where] == 'environment'
-        redirect_to :controller => 'search', :query => @q
+        # user is using global search, redirects to the search controller with
+        # the query
+        search_path = url_for(:controller => 'search', :query => @q)
+        request.xhr? ? render(:js => "window.location.href = #{search_path.to_json}") : redirect_to(search_path)
       else
-        @results = find_by_contents(:articles, profile.articles.published, @q, {:per_page => 10, :page => params[:page]})[:results]
+        @results = find_by_contents(:articles, profile, profile.articles.published, @q, {:per_page => 10, :page => params[:page]})[:results]
       end
     end
   end
@@ -4,11 +4,11 @@ class SearchController &lt; PublicController
   include SearchHelper
   include ActionView::Helpers::NumberHelper
  
-  before_filter :redirect_asset_param, :except => :assets
-  before_filter :load_category
-  before_filter :load_search_assets
-  before_filter :load_query
-  before_filter :load_filter
+  before_filter :redirect_asset_param, :except => [:assets, :suggestions]
+  before_filter :load_category, :except => :suggestions
+  before_filter :load_search_assets, :except => :suggestions
+  before_filter :load_query, :except => :suggestions
+  before_filter :load_order, :except => :suggestions
  
   # Backwards compatibility with old URLs
   def redirect_asset_param
@@ -20,7 +20,7 @@ class SearchController &lt; PublicController
  
   def index
     @searches = {}
-    @order = []
+    @assets = []
     @names = {}
     @results_only = true
  
@@ -28,7 +28,7 @@ class SearchController &lt; PublicController
       load_query
       @asset = key
       send(key)
-      @order << key
+      @assets << key
       @names[key] = _(description)
     end
     @asset = nil
@@ -42,7 +42,7 @@ class SearchController &lt; PublicController
   # view the summary of one category
   def category_index
     @searches = {}
-    @order = []
+    @assets = []
     @names = {}
     limit = MULTIPLE_SEARCH_LIMIT
     [
@@ -53,7 +53,7 @@ class SearchController &lt; PublicController
       [ :communities, _('Communities'), :recent_communities ],
       [ :articles, _('Contents'), :recent_articles ]
     ].each do |asset, name, filter|
-      @order << asset
+      @assets << asset
       @searches[asset]= {:results => @category.send(filter, limit)}
       raise "No total_entries for: #{asset}" unless @searches[asset][:results].respond_to?(:total_entries)
       @names[asset] = name
@@ -147,12 +147,16 @@ class SearchController &lt; PublicController
     render :partial => 'events/events'
   end
  
+  def suggestions
+    render :text => find_suggestions(normalize_term(params[:term]), environment, params[:asset]).to_json
+  end
+
   #######################################################
   protected
  
   def load_query
     @asset = (params[:asset] || params[:action]).to_sym
-    @order ||= [@asset]
+    @assets ||= [@asset]
     @searches ||= {}
  
     @query = params[:query] || ''
@@ -173,13 +177,22 @@ class SearchController &lt; PublicController
     end
   end
  
+  AVAILABLE_SEARCHES = ActiveSupport::OrderedHash[
+    :articles, _('Contents'),
+    :people, _('People'),
+    :communities, _('Communities'),
+    :enterprises, _('Enterprises'),
+    :products, _('Products and Services'),
+    :events, _('Events'),
+  ]
+
   def load_search_assets
-    if SEARCHES.keys.include?(params[:action].to_sym) && environment.enabled?("disable_asset_#{params[:action]}")
+    if AVAILABLE_SEARCHES.keys.include?(params[:action].to_sym) && environment.enabled?("disable_asset_#{params[:action]}")
       render_not_found
       return
     end
  
-    @enabled_searches = SEARCHES.select {|key, name| environment.disabled?("disable_asset_#{key}") }
+    @enabled_searches = AVAILABLE_SEARCHES.select {|key, name| environment.disabled?("disable_asset_#{key}") }
     @searching = {}
     @titles = {}
     @enabled_searches.each do |key, name|
@@ -189,11 +202,11 @@ class SearchController &lt; PublicController
     @names = @titles if @names.nil?
   end
  
-  def load_filter
-    @filter = 'more_recent'
-    if SEARCHES.keys.include?(@asset.to_sym)
-      available_filters = asset_class(@asset)::SEARCH_FILTERS
-      @filter = params[:filter] if available_filters.include?(params[:filter])
+  def load_order
+    @order = 'more_recent'
+    if AVAILABLE_SEARCHES.keys.include?(@asset.to_sym)
+      available_orders = asset_class(@asset)::SEARCH_FILTERS[:order]
+      @order = params[:order] if available_orders.include?(params[:order])
     end
   end
  
@@ -217,7 +230,7 @@ class SearchController &lt; PublicController
   end
  
   def full_text_search
-    @searches[@asset] = find_by_contents(@asset, @scope, @query, paginate_options, {:category => @category, :filter => @filter})
+    @searches[@asset] = find_by_contents(@asset, environment, @scope, @query, paginate_options, {:category => @category, :filter => @order})
   end
  
   private
@@ -232,4 +245,14 @@ class SearchController &lt; PublicController
     20
   end
  
+  def available_assets
+    assets = ActiveSupport::OrderedHash[
+      :articles, _('Contents'),
+      :enterprises, _('Enterprises'),
+      :people, _('People'),
+      :communities, _('Communities'),
+      :products, _('Products and Services'),
+    ]
+  end
+
 end
@@ -1307,8 +1307,19 @@ module ApplicationHelper
     end
   end
  
-  def remove_content_button(action)
-    @plugins.dispatch("content_remove_#{action.to_s}", @page).include?(true)
+  def content_remove_spread(content)
+    !content.public? || content.folder? || (profile == user && user.communities.blank? && !environment.portal_enabled)
+  end
+
+  def remove_content_button(action, content)
+    method_name = "content_remove_#{action.to_s}"
+    plugin_condition = @plugins.dispatch(method_name, content).include?(true)
+    begin
+      core_condition = self.send(method_name, content)
+    rescue NoMethodError
+      core_condition = false
+    end
+    core_condition || plugin_condition
   end
  
   def template_options(kind, field_name)
@@ -1411,6 +1422,43 @@ module ApplicationHelper
     content_tag('ul', article.versions.map {|v| link_to("r#{v.version}", @page.url.merge(:version => v.version))})
   end
  
+  def search_input_with_suggestions(name, asset, default, options = {})
+    text_field_tag name, default, options.merge({:class => 'search-input-with-suggestions', 'data-asset' => asset})
+  end
+
+  def profile_suggestion_profile_connections(suggestion)
+    profiles = suggestion.profile_connections.first(4).map do |profile|
+      link_to(profile_image(profile, :icon, :title => profile.name), profile.url, :class => 'profile-suggestion-connection-icon')
+    end
+
+    controller_target = suggestion.suggestion_type == 'Person' ? :friends : :memberships
+    profiles << link_to("<big> +#{suggestion.profile_connections.count - 4}</big>", :controller => controller_target, :action => :connections, :id => suggestion.suggestion_id) if suggestion.profile_connections.count > 4
+
+    if profiles.present?
+      content_tag(:div, profiles.join , :class => 'profile-connections')
+    else
+      ''
+    end
+  end
+
+  def profile_suggestion_tag_connections(suggestion)
+    tags = suggestion.tag_connections.first(4).map do |tag|
+      tag.name + ', '
+    end
+    last_tag = tags.pop
+    tags << last_tag.strip.chop if last_tag.present?
+    title = tags.join
+
+    controller_target = suggestion.suggestion_type == 'Person' ? :friends : :memberships
+    tags << ' ' + link_to('...', {:controller => controller_target, :action => :connections, :id => suggestion.suggestion_id}, :class => 'more-tag-connections', :title => _('See all connections')) if suggestion.tag_connections.count > 4
+
+    if tags.present?
+      content_tag(:div, tags.join, :class => 'tag-connections', :title => title)
+    else
+      ''
+    end
+  end
+
   def labelled_colorpicker_field(human_name, object_name, method, options = {})
     options[:id] ||= 'text-field-' + FormsHelper.next_id_number
     content_tag('label', human_name, :for => options[:id], :class => 'formlabel') +
@@ -40,12 +40,8 @@ module CmsHelper
     end
   end
  
-  def display_spread_button(profile, article)
-    if profile.person?
-      expirable_button article, :spread, _('Spread this'), :action => 'publish', :id => article.id
-    elsif profile.community? && environment.portal_community
-      expirable_button article, :spread, _('Spread this'), :action => 'publish_on_portal_community', :id => article.id
-    end
+  def display_spread_button(article)
+    expirable_button article, :spread, _('Spread this'), {:action => 'publish', :id => article.id}, {:class => 'colorbox'}
   end
  
   def display_delete_button(article)
@@ -265,7 +265,7 @@ module FormsHelper
     )
   end
  
-  def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {}, find_options = {})
+  def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {}, find_options = {}, extra_options = {})
     if find_options.empty?
       folders = profile.folders
     else
@@ -276,7 +276,7 @@ module FormsHelper
       select_tag(
         field_id,
         options_for_select(
-          [[profile.identifier, '']] +
+          [[(extra_options[:root_label] || profile.identifier), '']] +
           folders.collect {|f| [ profile.identifier + '/' +  f.full_name, f.id.to_s ] },
           default_value.to_s
         ),
@@ -48,6 +48,7 @@ module LayoutHelper
       'thickbox',
       'lightbox',
       'colorbox',
+      'selectordie',
       'inputosaurus',
       pngfix_stylesheet_path,
     ] + tokeninput_stylesheets
@@ -5,20 +5,23 @@ module SearchHelper
   BLOCKS_SEARCH_LIMIT = 24
   MULTIPLE_SEARCH_LIMIT = 8
  
-  SEARCHES = ActiveSupport::OrderedHash[
-    :articles, _('Contents'),
-    :enterprises, _('Enterprises'),
-    :people, _('People'),
-    :communities, _('Communities'),
-    :products, _('Products and Services'),
-    :events, _('Events'),
-  ]
+  FILTERS_TRANSLATIONS = {
+    :order => _('Order'),
+    :display => _('Display')
+  }
  
-  FILTER_TRANSLATION = {
-    'more_popular' => _('More popular'),
-    'more_active' => _('More active'),
-    'more_recent' => _('More recent'),
-    'more_comments' => _('More comments')
+  FILTERS_OPTIONS_TRANSLATION = {
+    :order => {
+      'more_popular' => _('More popular'),
+      'more_active' => _('More active'),
+      'more_recent' => _('More recent'),
+      'more_comments' => _('More comments')
+    },
+    :display => {
+      'map' => _('Map'),
+      'full' => _('Full'),
+      'compact' => _('Compact')
+    }
   }
  
   COMMON_PROFILE_LIST_BLOCK = [
@@ -56,7 +59,7 @@ module SearchHelper
   end
  
   def display?(asset, mode)
-    defined?(asset_class(asset)::SEARCH_DISPLAYS) && asset_class(asset)::SEARCH_DISPLAYS.include?(mode.to_s)
+    defined?(asset_class(asset)::SEARCH_FILTERS[:display]) && asset_class(asset)::SEARCH_FILTERS[:display].include?(mode.to_s)
   end
  
   def display_results(searches=nil, asset=nil)
@@ -93,6 +96,16 @@ module SearchHelper
     end
   end
  
+  def select_filter(name, options, default = nil)
+    if options.size <= 1
+      return
+    else
+      options = options.map {|option| [FILTERS_OPTIONS_TRANSLATION[name][option], option]}
+      options = options_for_select(options, :selected => (params[name] || default))
+      select_tag(name, options)
+    end
+  end
+
   def display_selector(asset, display, float = 'right')
     display = nil if display.blank?
     display ||= asset_class(asset).default_search_display
@@ -107,36 +120,32 @@ module SearchHelper
     end
   end
  
-  def filter_selector(asset, filter, float = 'right')
+  def filters(asset)
+    return if !asset
     klass = asset_class(asset)
-    if klass::SEARCH_FILTERS.count > 1
-      options = options_for_select(klass::SEARCH_FILTERS.map {|f| [FILTER_TRANSLATION[f], f]}, filter)
-      url_params = url_for(params.merge(:filter => 'FILTER'))
-      onchange = "document.location.href = '#{url_params}'.replace('FILTER', this.value)"
-      select_field = select_tag(:filter, options, :onchange => onchange)
-      content_tag('div',
-        content_tag('strong', _('Filter')) + ': ' + select_field,
-        :class => "search-customize-options"
-      )
-    end
+    content_tag('div', klass::SEARCH_FILTERS.map do |name, options|
+      default = klass.respond_to?("default_search_#{name}") ? klass.send("default_search_#{name}".to_s) : nil
+      select_filter(name, options, default)
+    end.join("\n"), :id => 'search-filters')
+  end
+
+  def assets_menu(selected)
+    assets = @enabled_searches.keys
+    #     Events is a search asset but do not have a good interface for
+    #TODO searching. When this is solved we may add it back again to the assets
+    #     menu.
+    assets.delete(:events)
+    content_tag('ul',
+      assets.map do |asset|
+        options = {}
+        options.merge!(:class => 'selected') if selected.to_s == asset.to_s
+        content_tag('li', asset_link(asset), options)
+      end.join("\n"),
+    :id => 'assets-menu')
   end
  
-  def filter_title(asset, filter)
-    {
-      'articles_more_recent' => _('More recent contents from network'),
-      'articles_more_popular' => _('More viewed contents from network'),
-      'articles_more_comments' => _('Most commented contents from network'),
-      'people_more_recent' => _('More recent people from network'),
-      'people_more_active' => _('More active people from network'),
-      'people_more_popular' => _('More popular people from network'),
-      'communities_more_recent' => _('More recent communities from network'),
-      'communities_more_active' => _('More active communities from network'),
-      'communities_more_popular' => _('More popular communities from network'),
-      'enterprises_more_recent' => _('More recent enterprises from network'),
-      'enterprises_more_active' => _('More active enterprises from network'),
-      'enterprises_more_popular' => _('More popular enterprises from network'),
-      'products_more_recent' => _('Highlights'),
-    }[asset.to_s + '_' + filter].to_s
+  def asset_link(asset)
+    link_to(@enabled_searches[asset], "/search/#{asset}")
   end
  
 end
@@ -0,0 +1,18 @@
+module SearchTermHelper
+  def register_search_term(term, total, indexed, context, asset='all')
+    normalized_term = normalize_term(term)
+    if normalized_term.present?
+      search_term = SearchTerm.find_or_create(normalized_term, context, asset)
+      SearchTermOccurrence.create!(:search_term => search_term, :total => total, :indexed => indexed)
+    end
+  end
+
+  #FIXME For some reason the job is created but nothing is ran.
+  #handle_asynchronously :register_search_term
+
+  #TODO Think smarter criteria to normalize search terms properly
+  def normalize_term(search_term)
+    search_term ||= ''
+    search_term.downcase
+  end
+end
@@ -12,6 +12,7 @@ module TokenHelper
     options[:search_delay] ||= 1000
     options[:prevent_duplicates] ||=  true
     options[:backspace_delete_item] ||= false
+    options[:zindex] ||= 999
     options[:focus] ||= false
     options[:avoid_enter] ||= true
     options[:on_result] ||= 'null'
@@ -31,6 +32,7 @@ module TokenHelper
         searchDelay: #{options[:search_delay].to_json},
         preventDuplicates: #{options[:prevent_duplicates].to_json},
         backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
+        zindex: #{options[:zindex].to_json},
         queryParam: #{options[:query_param].to_json},
         tokenLimit: #{options[:token_limit].to_json},
         onResult: #{options[:on_result]},
@@ -41,6 +41,23 @@ class UserMailer &lt; ActionMailer::Base
     )
   end
  
+  def profiles_suggestions_email(user)
+    @recipient = user.name
+    @environment = user.environment.name
+    @url = user.environment.top_url
+    @people_suggestions_url = user.people_suggestions_url
+    @people_suggestions = user.suggested_people.sample(3)
+    @communities_suggestions_url = user.communities_suggestions_url
+    @communities_suggestions = user.suggested_communities.sample(3)
+
+    mail(
+      content_type: 'text/html',
+      to: user.email,
+      from: "#{user.environment.name} <#{user.environment.contact_email}>",
+      subject: _("[%s] What about grow up your network?") % user.environment.name
+    )
+  end
+
   class Job < Struct.new(:user, :method)
     def perform
       UserMailer.send(method, user).deliver
@@ -14,6 +14,11 @@ class AddFriend &lt; Task
   alias :friend :target
   alias :friend= :target=
  
+  after_create do |task|
+    TaskMailer.invitation_notification(task).deliver unless task.friend
+    remove_from_suggestion_list(task)
+  end
+
   def perform
     target.add_friend(requestor, group_for_friend)
     requestor.add_friend(target, group_for_person)
@@ -48,4 +53,8 @@ class AddFriend &lt; Task
     {:type => :profile_image, :profile => requestor, :url => requestor.url}
   end
  
+  def remove_from_suggestion_list(task)
+    suggestion = task.requestor.profile_suggestions.find_by_suggestion_id task.target.id
+    suggestion.disable if suggestion
+  end
 end
@@ -10,6 +10,10 @@ class AddMember &lt; Task
  
   settings_items :roles
  
+  after_create do |task|
+    remove_from_suggestion_list(task)
+  end
+
   def perform
     if !self.roles or (self.roles.uniq.compact.length == 1 and self.roles.uniq.compact.first.to_i.zero?)
       self.roles = [Profile::Roles.member(organization.environment.id).id]
@@ -46,4 +50,9 @@ class AddMember &lt; Task
     _('You will need login to %{system} in order to accept or reject %{requestor} as a member of %{organization}.') % { :system => target.environment.name, :requestor => requestor.name, :organization => organization.name }
   end
  
+  def remove_from_suggestion_list(task)
+    suggestion = task.requestor.profile_suggestions.find_by_suggestion_id task.target.id
+    suggestion.disable if suggestion
+  end
+
 end
@@ -14,20 +14,17 @@ class Article &lt; ActiveRecord::Base
   acts_as_having_image
  
   SEARCHABLE_FIELDS = {
-    :name => 10,
-    :abstract => 3,
-    :body => 2,
-    :slug => 1,
-    :filename => 1,
+    :name => {:label => _('Name'), :weight => 10},
+    :abstract => {:label => _('Abstract'), :weight => 3},
+    :body => {:label => _('Content'), :weight => 2},
+    :slug => {:label => _('Slug'), :weight => 1},
+    :filename => {:label => _('Filename'), :weight => 1},
   }
  
-  SEARCH_FILTERS = %w[
-    more_recent
-    more_popular
-    more_comments
-  ]
-
-  SEARCH_DISPLAYS = %w[full]
+  SEARCH_FILTERS = {
+    :order => %w[more_recent more_popular more_comments],
+    :display => %w[full]
+  }
  
   def self.default_search_display
     'full'
@@ -477,7 +474,9 @@ class Article &lt; ActiveRecord::Base
   scope :no_folders, lambda {|profile|{:conditions => ['articles.type NOT IN (?)', profile.folder_types]}}
   scope :galleries, :conditions => [ "articles.type IN ('Gallery')" ]
   scope :images, :conditions => { :is_image => true }
+  scope :no_images, :conditions => { :is_image => false }
   scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
+  scope :files, :conditions => { :type => 'UploadedFile' }
   scope :with_types, lambda { |types| { :conditions => [ 'articles.type IN (?)', types ] } }
  
   scope :more_popular, :order => 'hits DESC'
@@ -528,7 +527,10 @@ class Article &lt; ActiveRecord::Base
   end
  
   alias :allow_delete?  :allow_post_content?
-  alias :allow_spread?  :allow_post_content?
+
+  def allow_spread?(user = nil)
+    user && public?
+  end
  
   def allow_create?(user)
     allow_post_content?(user) || allow_publish_content?(user)
@@ -3,10 +3,10 @@ class Category &lt; ActiveRecord::Base
   attr_accessible :name, :parent_id, :display_color, :display_in_menu, :image_builder, :environment, :parent
  
   SEARCHABLE_FIELDS = {
-    :name => 10,
-    :acronym => 5,
-    :abbreviation => 5,
-    :slug => 1,
+    :name => {:label => _('Name'), :weight => 10},
+    :acronym => {:label => _('Acronym'), :weight => 5},
+    :abbreviation => {:label => _('Abbreviation'), :weight => 5},
+    :slug => {:label => _('Slug'), :weight => 1},
   }
  
   validates_exclusion_of :slug, :in => [ 'index' ], :message => N_('{fn} cannot be like that.').fix_i18n
@@ -3,9 +3,9 @@ class Certifier &lt; ActiveRecord::Base
   attr_accessible :name, :environment
  
   SEARCHABLE_FIELDS = {
-    :name => 10,
-    :description => 3,
-    :link => 1,
+    :name => {:label => _('Name'), :weight => 10},
+    :description => {:label => _('Description'), :weight => 3},
+    :link => {:label => _('Link'), :weight => 1},
   }
  
   belongs_to :environment
 class Comment < ActiveRecord::Base
  
   SEARCHABLE_FIELDS = {
-    :title => 10,
-    :name => 4,
-    :body => 2,
+    :title => {:label => _('Title'), :weight => 10},
+    :name => {:label => _('Name'), :weight => 4},
+    :body => {:label => _('Content'), :weight => 2},
   }
  
   attr_accessible :body, :author, :name, :email, :title, :reply_of_id, :source
@@ -14,19 +14,17 @@ class CommunitiesBlock &lt; ProfileListBlock
     _('This block displays the communities in which the user is a member.')
   end
  
+  def suggestions
+    return nil unless owner.kind_of?(Profile)
+    owner.profile_suggestions.of_community.enabled.limit(3).includes(:suggestion)
+  end
+
   def footer
     owner = self.owner
-    case owner
-    when Profile
-      lambda do |context|
-        link_to s_('communities|View all'), :profile => owner.identifier, :controller => 'profile', :action => 'communities'
-      end
-    when Environment
-      lambda do |context|
-        link_to s_('communities|View all'), :controller => 'search', :action => 'communities'
-      end
-    else
-      ''
+    suggestions = self.suggestions
+    return '' unless owner.kind_of?(Profile) || owner.kind_of?(Environment)
+    proc do
+      render :file => 'blocks/communities', :locals => { :owner => owner, :suggestions => suggestions }
     end
   end
  
@@ -73,7 +73,13 @@ class CreateEnterprise &lt; Task
  
   # sets the associated region for the enterprise creation
   def region=(value)
-    raise ArgumentError.new("Region expected, but got #{value.class}") unless value.kind_of?(Region)
+    unless value.kind_of?(Region)
+      begin
+        value = Region.find(value)
+      rescue
+        raise ArgumentError.new("Could not find any region with the id #{value}")
+      end
+    end
  
     @region = value
     self.region_id = value.id
@@ -4,7 +4,10 @@ class Enterprise &lt; 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]
+  SEARCH_FILTERS = {
+    :order => %w[more_recent more_popular more_active],
+    :display => %w[compact full map]
+  }
  
   def self.type_name
     _('Enterprise')
@@ -10,6 +10,7 @@ class Environment &lt; ActiveRecord::Base
   self.partial_updates = false
  
   has_many :tasks, :dependent => :destroy, :as => 'target'
+  has_many :search_terms, :as => :context
  
   IDENTIFY_SCRIPTS = /(php[0-9s]?|[sp]htm[l]?|pl|py|cgi|rb)/
  
@@ -85,7 +86,9 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def admins
-    Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', Environment::Roles.admin(self).id])
+    admin_role = Environment::Roles.admin(self)
+    return [] if admin_role.blank?
+    Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', admin_role.id])
   end
  
   # returns the available features for a Environment, in the form of a
@@ -155,7 +158,8 @@ class Environment &lt; ActiveRecord::Base
       'site_homepage' => _('Redirects the user to the environment homepage.'),
       'user_profile_page' => _('Redirects the user to his profile page.'),
       'user_homepage' => _('Redirects the user to his homepage.'),
-      'user_control_panel' => _('Redirects the user to his control panel.')
+      'user_control_panel' => _('Redirects the user to his control panel.'),
+      'welcome_page' => _('Redirects the user to the environment welcome page.')
     }
   end
   validates_inclusion_of :redirection_after_signup, :in => Environment.signup_redirection_options.keys, :allow_nil => true
@@ -824,6 +828,10 @@ class Environment &lt; ActiveRecord::Base
     "home-page-news/#{cache_key}-#{language}"
   end
  
+  def portal_enabled
+    portal_community && enabled?('use_portal_community')
+  end
+
   def notification_emails
     [contact_email].select(&:present?) + admins.map(&:email)
   end
@@ -51,7 +51,10 @@ class Invitation &lt; Task
       next if contact_to_invite == _("Firstname Lastname <friend@email.com>")
  
       contact_to_invite.strip!
-      if match = contact_to_invite.match(/(.*)<(.*)>/) and match[2].match(Noosfero::Constants::EMAIL_FORMAT)
+      find_by_profile_id = false
+      if contact_to_invite.match(/^\d*$/)
+        find_by_profile_id = true
+      elsif match = contact_to_invite.match(/(.*)<(.*)>/) and match[2].match(Noosfero::Constants::EMAIL_FORMAT)
         friend_name = match[1].strip
         friend_email = match[2]
       elsif match = contact_to_invite.strip.match(Noosfero::Constants::EMAIL_FORMAT)
@@ -61,11 +64,15 @@ class Invitation &lt; Task
         next
       end
  
-      user = User.find_by_email(friend_email)
+      begin
+        user = find_by_profile_id ? Person.find_by_id(contact_to_invite).user : User.find_by_email(friend_email)
+      rescue
+        user = nil
+      end
  
-      task_args = if user.nil?
+      task_args = if user.nil? && !find_by_profile_id
         {:person => person, :friend_name => friend_name, :friend_email => friend_email, :message => message}
-      else
+      elsif user.present? && !(user.person.is_a_friend?(person) && profile.person?)
         {:person => person, :target => user.person}
       end
  
 class InviteFriend < Invitation
  
   settings_items :group_for_person, :group_for_friend
+  before_create :check_for_invitation_existence
  
   def perform
     person.add_friend(friend, group_for_person)
@@ -41,4 +42,11 @@ class InviteFriend &lt; Invitation
     ].join("\n\n")
   end
  
+  private
+  def check_for_invitation_existence
+    if friend
+      friend.tasks.pending.of("InviteFriend").find(:all, :conditions => {:requestor_id => person.id, :target_id => friend.id}).blank?
+    end
+  end
+
 end
@@ -2,6 +2,7 @@ class InviteMember &lt; Invitation
  
   settings_items :community_id, :type => :integer
   validates_presence_of :community_id
+  before_create :check_for_invitation_existence
  
   def community
     Community.find(community_id)
@@ -39,6 +40,14 @@ class InviteMember &lt; Invitation
     _('%{requestor} invited you to join %{community}.') % {:requestor => requestor.name, :community => community.name}
   end
  
+  def target_notification_message
+    if friend
+      _('%{requestor} is inviting you to join "%{community}" on %{system}.') % { :system => target.environment.name, :requestor => requestor.name, :community => community.name }
+    else
+      super
+    end
+  end
+
   def expanded_message
     super.gsub /<community>/, community.name
   end
@@ -53,4 +62,11 @@ class InviteMember &lt; Invitation
     ].join("\n\n")
   end
  
+  private
+  def check_for_invitation_existence
+    if friend
+      friend.tasks.pending.of("InviteMember").find(:all, :conditions => {:requestor_id => person.id}).select { |t| t.data[:community_id] == community_id }.blank?
+    end
+  end
+
 end
@@ -3,8 +3,8 @@ class License &lt; ActiveRecord::Base
   attr_accessible :name, :url
  
   SEARCHABLE_FIELDS = {
-    :name => 10,
-    :url => 5,
+    :name => {:label => _('Name'), :weight => 10},
+    :url => {:label => _('URL'), :weight => 5},
   }
  
   belongs_to :environment
 class NationalRegion < ActiveRecord::Base
  
   SEARCHABLE_FIELDS = {
-    :name => 1,
-    :national_region_code => 1,
+    :name => {:label => _('Name'), :weight => 1},
+    :national_region_code => {:label => _('Region Code'), :weight => 1},
   }
  
   def self.search_city(city_name, like = false, state = nil)
@@ -3,10 +3,11 @@ class Organization &lt; Profile
  
   attr_accessible :moderated_articles, :foundation_year, :contact_person, :acronym, :legal_form, :economic_activity, :management_information, :cnpj, :display_name, :enable_contact_us
  
-  SEARCH_FILTERS += %w[
-    more_popular
-    more_active
-  ]
+  SEARCH_FILTERS = {
+    :order => %w[more_recent more_popular more_active],
+    :display => %w[compact]
+  }
+
  
   settings_items :closed, :type => :boolean, :default => false
   def closed?
@@ -176,4 +177,8 @@ class Organization &lt; Profile
     self.visible = false
     save!
   end
+
+  def allow_invitation_from?(person)
+    (followed_by?(person) && self.allow_members_to_invite) || person.has_permission?('invite-members', self)
+  end
 end
@@ -3,10 +3,11 @@ class Person &lt; Profile
  
   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
-    more_active
-  ]
+  SEARCH_FILTERS = {
+    :order => %w[more_recent more_popular more_active],
+    :display => %w[compact]
+  }
+
  
   def self.type_name
     _('Person')
@@ -21,16 +22,34 @@ class Person &lt; Profile
     { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => [conditions] }
   }
  
+  scope :not_members_of, lambda { |resources|
+    resources = [resources] if !resources.kind_of?(Array)
+    conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
+    { :select => 'DISTINCT profiles.*', :conditions => ['"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "role_assignments" ON "role_assignments"."accessor_id" = "profiles"."id" AND "role_assignments"."accessor_type" = (\'Profile\') WHERE "profiles"."type" IN (\'Person\') AND (%s))' % conditions]
+  }
+
   scope :by_role, lambda { |roles|
     roles = [roles] unless roles.kind_of?(Array)
     { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.role_id IN (?)',
 roles] }
   }
  
-  def has_permission_with_plugins?(permission, profile)
-    permissions = [has_permission_without_plugins?(permission, profile)]
+  scope :not_friends_of, lambda { |resources|
+    resources = Array(resources)
+    { :select => 'DISTINCT profiles.*', :conditions => ['"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "friendships" ON "friendships"."person_id" = "profiles"."id" WHERE "friendships"."friend_id" IN (%s))' % resources.map(&:id)] }
+  }
+
+  def has_permission_with_admin?(permission, resource)
+    return true if resource.blank? || resource.admins.include?(self)
+    return true if resource.kind_of?(Profile) && resource.environment.admins.include?(self)
+    has_permission_without_admin?(permission, resource)
+  end
+  alias_method_chain :has_permission?, :admin
+
+  def has_permission_with_plugins?(permission, resource)
+    permissions = [has_permission_without_plugins?(permission, resource)]
     permissions += plugins.map do |plugin|
-      plugin.has_permission?(self, permission, profile)
+      plugin.has_permission?(self, permission, resource)
     end
     permissions.include?(true)
   end
@@ -65,6 +84,10 @@ roles] }
   has_and_belongs_to_many :acepted_forums, :class_name => 'Forum', :join_table => 'terms_forum_people'
   has_and_belongs_to_many :articles_with_access, :class_name => 'Article', :join_table => 'article_privacy_exceptions'
  
+  has_many :profile_suggestions, :foreign_key => :person_id, :order => 'score DESC', :dependent => :destroy
+  has_many :suggested_people, :through => :profile_suggestions, :source => :suggestion, :conditions => ['profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Person', true]
+  has_many :suggested_communities, :through => :profile_suggestions, :source => :suggestion, :conditions => ['profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Community', true]
+
   scope :more_popular, :order => 'friends_count DESC'
  
   scope :abusers, :joins => :abuse_complaints, :conditions => ['tasks.status = 3'], :select => 'DISTINCT profiles.*'
@@ -497,6 +520,15 @@ roles] }
     person.notifier.reschedule_next_notification_mail
   end
  
+  def remove_suggestion(profile)
+    suggestion = profile_suggestions.find_by_suggestion_id profile.id
+    suggestion.disable if suggestion
+  end
+
+  def allow_invitation_from?(person)
+    person.has_permission?(:manage_friends, self)
+  end
+
   protected
  
   def followed_by?(profile)
 class Product < ActiveRecord::Base
  
   SEARCHABLE_FIELDS = {
-    :name => 10,
-    :description => 1,
+    :name => {:label => _('Name'), :weight => 10},
+    :description => {:label => _('Description'), :weight => 1},
   }
  
-  SEARCH_FILTERS = %w[
-    more_recent
-  ]
-
-  SEARCH_DISPLAYS = %w[map full]
+  SEARCH_FILTERS = {
+    :order => %w[more_recent],
+    :display => %w[full map]
+  }
  
   attr_accessible :name, :product_category, :highlighted, :price, :enterprise, :image_builder, :description, :available, :qualifiers, :unit_id, :discount, :inputs, :qualifiers_list
  
@@ -3,7 +3,7 @@
 # which by default is the one returned by Environment:default.
 class Profile < ActiveRecord::Base
  
-  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time, :redirection_after_login
+  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time, :redirection_after_login, :email_suggestions, :allow_members_to_invite, :invite_friends_only
  
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
@@ -12,16 +12,15 @@ class Profile &lt; ActiveRecord::Base
   end
  
   SEARCHABLE_FIELDS = {
-    :name => 10,
-    :identifier => 5,
-    :nickname => 2,
+    :name => {:label => _('Name'), :weight => 10},
+    :identifier => {:label => _('Username'), :weight => 5},
+    :nickname => {:label => _('Nickname'), :weight => 2},
   }
  
-  SEARCH_FILTERS = %w[
-    more_recent
-  ]
-
-  SEARCH_DISPLAYS = %w[compact]
+  SEARCH_FILTERS = {
+    :order => %w[more_recent],
+    :display => %w[compact]
+  }
  
   def self.default_search_display
     'compact'
@@ -140,6 +139,17 @@ class Profile &lt; ActiveRecord::Base
  
   has_many :comments_received, :class_name => 'Comment', :through => :articles, :source => :comments
  
+  # Although this should be a has_one relation, there are no non-silly names for
+  # a foreign key on article to reference the template to which it is
+  # welcome_page... =P
+  belongs_to :welcome_page, :class_name => 'Article', :dependent => :destroy
+
+  def welcome_page_content
+    welcome_page && welcome_page.published ? welcome_page.body : nil
+  end
+
+  has_many :search_terms, :as => :context
+
   def scraps(scrap=nil)
     scrap = scrap.is_a?(Scrap) ? scrap.id : scrap
     scrap.nil? ? Scrap.all_scraps(self) : Scrap.all_scraps(self).find(scrap)
@@ -155,6 +165,7 @@ class Profile &lt; ActiveRecord::Base
   settings_items :public_content, :type => :boolean, :default => true
   settings_items :description
   settings_items :fields_privacy, :type => :hash, :default => {}
+  settings_items :email_suggestions, :type => :boolean, :default => false
  
   validates_length_of :description, :maximum => 550, :allow_nil => true
  
@@ -219,6 +230,8 @@ class Profile &lt; ActiveRecord::Base
  
   has_many :abuse_complaints, :foreign_key => 'requestor_id', :dependent => :destroy
  
+  has_many :profile_suggestions, :foreign_key => :suggestion_id, :dependent => :destroy
+
   def top_level_categorization
     ret = {}
     self.profile_categorizations.each do |c|
@@ -514,6 +527,14 @@ class Profile &lt; ActiveRecord::Base
     generate_url(:profile => identifier, :controller => 'profile', :action => 'index')
   end
  
+  def people_suggestions_url
+    generate_url(:profile => identifier, :controller => 'friends', :action => 'suggest')
+  end
+
+  def communities_suggestions_url
+    generate_url(:profile => identifier, :controller => 'memberships', :action => 'suggest')
+  end
+
   def generate_url(options)
     url_options.merge(options)
   end
@@ -603,7 +624,7 @@ private :generate_url, :url_options
   end
  
   def copy_article_tree(article, parent=nil)
-    return if article.is_a?(RssFeed)
+    return if !copy_article?(article)
     original_article = self.articles.find_by_name(article.name)
     if original_article
       num = 2
@@ -623,6 +644,11 @@ private :generate_url, :url_options
     end
   end
  
+  def copy_article?(article)
+    !article.is_a?(RssFeed) &&
+    !(is_template && article.slug=='welcome-page')
+  end
+
   # Adds a person as member of this Profile.
   def add_member(person)
     if self.has_members?
@@ -632,6 +658,8 @@ private :generate_url, :url_options
         self.affiliate(person, Profile::Roles.admin(environment.id)) if members.count == 0
         self.affiliate(person, Profile::Roles.member(environment.id))
       end
+      person.tasks.pending.of("InviteMember").select { |t| t.data[:community_id] == self.id }.each { |invite| invite.cancel }
+      remove_from_suggestion_list person
     else
       raise _("%s can't have members") % self.class.name
     end
@@ -769,7 +797,10 @@ private :generate_url, :url_options
   end
  
   def admins
-    self.members_by_role(Profile::Roles.admin(environment.id))
+    return [] if environment.blank?
+    admin_role = Profile::Roles.admin(environment.id)
+    return [] if admin_role.blank?
+    self.members_by_role(admin_role)
   end
  
   def enable_contact?
@@ -967,4 +998,14 @@ private :generate_url, :url_options
   def preferred_login_redirection
     redirection_after_login.blank? ? environment.redirection_after_login : redirection_after_login
   end
+
+  def remove_from_suggestion_list(person)
+    suggestion = person.profile_suggestions.find_by_suggestion_id self.id
+    suggestion.disable if suggestion
+  end
+
+  def allow_invitation_from(person)
+    false
+  end
+
 end
@@ -0,0 +1,290 @@
+class ProfileSuggestion < ActiveRecord::Base
+  belongs_to :person
+  belongs_to :suggestion, :class_name => 'Profile', :foreign_key => :suggestion_id
+
+  attr_accessible :person, :suggestion, :suggestion_type, :categories, :enabled
+
+  has_many :suggestion_connections, :foreign_key => 'suggestion_id'
+  has_many :profile_connections, :through => :suggestion_connections, :source => :connection, :source_type => 'Profile'
+  has_many :tag_connections, :through => :suggestion_connections, :source => :connection, :source_type => 'ActsAsTaggableOn::Tag'
+
+  before_create do |profile_suggestion|
+    profile_suggestion.suggestion_type = self.suggestion.class.to_s
+  end
+
+  after_destroy do |profile_suggestion|
+    self.class.generate_profile_suggestions(profile_suggestion.person)
+  end
+
+  acts_as_having_settings :field => :categories
+
+  validate :must_be_a_valid_category, :on => :create
+  def must_be_a_valid_category
+    if categories.keys.map { |cat| self.respond_to?(cat)}.include?(false)
+      errors.add(:categories, 'Category must be valid')
+    end
+  end
+
+  validates_uniqueness_of :suggestion_id, :scope => [ :person_id ]
+  scope :of_person, :conditions => { :suggestion_type => 'Person' }
+  scope :of_community, :conditions => { :suggestion_type => 'Community' }
+  scope :enabled, :conditions => { :enabled => true }
+
+  # {:category_type => ['category-icon', 'category-label']}
+  CATEGORIES = {
+    :people_with_common_friends => ['menu-people', _('Friends in common')],
+    :people_with_common_communities => ['menu-community',_('Communities in common')],
+    :people_with_common_tags => ['edit', _('Tags in common')],
+    :communities_with_common_friends => ['menu-people', _('Friends in common')],
+    :communities_with_common_tags => ['edit', _('Tags in common')]
+  }
+
+  def category_icon(category)
+    'icon-' + ProfileSuggestion::CATEGORIES[category][0]
+  end
+
+  def category_label(category)
+    ProfileSuggestion::CATEGORIES[category][1]
+  end
+
+  RULES = {
+    :people_with_common_communities => {
+      :threshold => 2, :weight => 1, :connection => 'Profile'
+    },
+    :people_with_common_friends => {
+      :threshold => 2, :weight => 1, :connection => 'Profile'
+    },
+    :people_with_common_tags => {
+      :threshold => 2, :weight => 1, :connection => 'ActsAsTaggableOn::Tag'
+    },
+    :communities_with_common_friends => {
+      :threshold => 2, :weight => 1, :connection => 'Profile'
+    },
+    :communities_with_common_tags => {
+      :threshold => 2, :weight => 1, :connection => 'ActsAsTaggableOn::Tag'
+    }
+  }
+
+  RULES.keys.each do |rule|
+    settings_items rule
+    attr_accessible rule
+  end
+
+  # Number of suggestions by rule
+  N_SUGGESTIONS = 30
+
+  # Minimum number of suggestions
+  MIN_LIMIT = 10
+
+  def self.profile_id(rule)
+    "#{rule}_profile_id"
+  end
+
+  def self.connections(rule)
+    "#{rule}_connections"
+  end
+
+  def self.counter(rule)
+    "#{rule}_count"
+  end
+
+  # If you are about to rewrite the following sql queries, think twice. After
+  # that make sure that whatever you are writing to replace it should be faster
+  # than how it is now. Yes, sqls are ugly but are fast! And fast is what we
+  # need here.
+  #
+  # The logic behind this code is to produce a table somewhat like this:
+  # profile_id | rule1_count | rule1_connections | rule2_count | rule2_connections | ... | score |
+  #     12     |      2      |      {32,54}      |      3      |     {8,22,27}     | ... |   13  |
+  #     13     |      4      |   {3,12,32,54}    |      2      |      {11,24}      | ... |   15  |
+  #     14     |             |                   |      2      |      {44,56}      | ... |   17  |
+  #                                        ...
+  #                                        ...
+  #
+  # This table has the suggested profile id and the count and connections of
+  # each rule that made this profile be suggested. Each suggestion has a score
+  # associated based on the rules' counts and rules' weights.
+  #
+  # From this table, we can sort suggestions by the score and save a small
+  # amount of them in the database. At this moment we also register the
+  # connections of each suggestion.
+
+  def self.calculate_suggestions(person)
+    suggested_profiles = all_suggestions(person)
+    return if suggested_profiles.nil?
+
+    already_suggested_profiles = person.profile_suggestions.map(&:suggestion_id).join(',')
+    suggested_profiles = suggested_profiles.where("profiles.id NOT IN (#{already_suggested_profiles})") if already_suggested_profiles.present?
+    #TODO suggested_profiles = suggested_profiles.order('score DESC')
+    suggested_profiles = suggested_profiles.limit(N_SUGGESTIONS)
+    return if suggested_profiles.blank?
+
+    suggested_profiles.each do |suggested_profile|
+      suggestion = person.profile_suggestions.find_or_initialize_by_suggestion_id(suggested_profile.id)
+      RULES.each do |rule, options|
+        begin
+          value = suggested_profile.send("#{rule}_count").to_i
+        rescue NoMethodError
+          next
+        end
+        connections = suggested_profile.send("#{rule}_connections")
+        if connections.present?
+          connections = connections[1..-2].split(',')
+        else
+          connections = []
+        end
+        suggestion.send("#{rule}=", value)
+        connections.each do |connection_id|
+          next if SuggestionConnection.where(:suggestion_id => suggestion.id, :connection_id => connection_id, :connection_type => options[:connection]).present?
+           SuggestionConnection.create!(:suggestion => suggestion, :connection_id => connection_id, :connection_type => options[:connection])
+        end
+        suggestion.score += value * options[:weight]
+      end
+      suggestion.save!
+    end
+  end
+
+  def self.people_with_common_friends(person)
+    person_friends = person.friends.map(&:id)
+    rule = "people_with_common_friends"
+    return if person_friends.blank?
+    "SELECT person_id as #{profile_id(rule)},
+            array_agg(friend_id) as #{connections(rule)},
+            count(person_id) as #{counter(rule)}
+     FROM friendships WHERE friend_id IN (#{person_friends.join(',')})
+     AND person_id NOT IN (#{(person_friends << person.id).join(',')})
+     GROUP BY person_id"
+  end
+
+  def self.people_with_common_communities(person)
+    person_communities = person.communities.map(&:id)
+    rule = "people_with_common_communities"
+    return if person_communities.blank?
+    "SELECT common_members.accessor_id as #{profile_id(rule)},
+            array_agg(common_members.resource_id) as #{connections(rule)},
+            count(common_members.accessor_id) as #{counter(rule)}
+     FROM
+       (SELECT DISTINCT accessor_id, resource_id FROM
+       role_assignments WHERE role_assignments.resource_id IN (#{person_communities.join(',')}) AND
+       role_assignments.accessor_id != #{person.id} AND role_assignments.resource_type = 'Profile' AND
+       role_assignments.accessor_type = 'Profile') AS common_members
+     GROUP BY common_members.accessor_id"
+  end
+
+  def self.people_with_common_tags(person)
+    profile_tags = person.articles.select('tags.id').joins(:tags).map(&:id)
+    rule = "people_with_common_tags"
+    return if profile_tags.blank?
+    "SELECT results.profiles_id as #{profile_id(rule)},
+            array_agg(results.tags_id) as #{connections(rule)},
+            count(results.profiles_id) as #{counter(rule)}
+     FROM (
+       SELECT DISTINCT tags.id as tags_id, profiles.id as profiles_id FROM profiles
+       INNER JOIN articles ON articles.profile_id = profiles.id
+       INNER JOIN taggings ON taggings.taggable_id = articles.id AND taggings.context = ('tags') AND taggings.taggable_type = 'Article'
+       INNER JOIN tags ON tags.id = taggings.tag_id
+       WHERE (tags.id in (#{profile_tags.join(',')}) AND profiles.id != #{person.id})) AS results
+     GROUP BY results.profiles_id"
+  end
+
+  def self.communities_with_common_friends(person)
+    person_friends = person.friends.map(&:id)
+    rule = "communities_with_common_friends"
+    return if person_friends.blank?
+    "SELECT common_communities.resource_id as #{profile_id(rule)},
+            array_agg(common_communities.accessor_id) as #{connections(rule)},
+            count(common_communities.resource_id) as #{counter(rule)}
+     FROM
+       (SELECT DISTINCT accessor_id, resource_id FROM
+       role_assignments WHERE role_assignments.accessor_id IN (#{person_friends.join(',')}) AND
+       role_assignments.accessor_id != #{person.id} AND role_assignments.resource_type = 'Profile' AND
+       role_assignments.accessor_type = 'Profile') AS common_communities
+     GROUP BY common_communities.resource_id"
+  end
+
+  def self.communities_with_common_tags(person)
+    profile_tags = person.articles.select('tags.id').joins(:tags).map(&:id)
+    rule = "communities_with_common_tags"
+    return if profile_tags.blank?
+    "SELECT results.profiles_id as #{profile_id(rule)},
+            array_agg(results.tags_id) as #{connections(rule)},
+            count(results.profiles_id) as #{counter(rule)}
+     FROM
+       (SELECT DISTINCT tags.id as tags_id, profiles.id AS profiles_id FROM profiles
+       INNER JOIN articles ON articles.profile_id = profiles.id
+       INNER JOIN taggings ON taggings.taggable_id = articles.id AND taggings.context = ('tags') AND taggings.taggable_type = 'Article'
+       INNER JOIN tags ON tags.id = taggings.tag_id
+       WHERE (tags.id IN (#{profile_tags.join(',')}) AND profiles.id != #{person.id})) AS results
+     GROUP BY results.profiles_id"
+  end
+
+  def self.all_suggestions(person)
+    select_string = ["profiles.*"]
+    suggestions_join = []
+    where_string = []
+    valid_rules = []
+    previous_rule = nil
+    join_column = nil
+    RULES.each do |rule, options|
+      rule_select = self.send(rule, person)
+      next if !rule_select.present?
+
+      valid_rules << rule
+      select_string << "suggestions.#{counter(rule)} as #{counter(rule)}, suggestions.#{connections(rule)} as #{connections(rule)}"
+      where_string << "#{counter(rule)} >= #{options[:threshold]}"
+      rule_select = "
+        (SELECT profiles.id as #{profile_id(rule)},
+                #{rule}_sub.#{counter(rule)} as #{counter(rule)},
+                #{rule}_sub.#{connections(rule)} as #{connections(rule)}
+        FROM profiles
+        LEFT OUTER JOIN (#{rule_select}) as #{rule}_sub
+        ON profiles.id = #{rule}_sub.#{profile_id(rule)}) AS #{rule}"
+
+      if previous_rule.nil?
+        result = rule_select
+      else
+        result = "INNER JOIN #{rule_select}
+         ON #{previous_rule}.#{profile_id(previous_rule)} = #{rule}.#{profile_id(rule)}"
+      end
+      previous_rule = rule
+      suggestions_join << result
+    end
+
+    return if valid_rules.blank?
+
+    select_string = select_string.compact.join(',')
+    join_string = "INNER JOIN (SELECT * FROM #{suggestions_join.compact.join(' ')}) AS suggestions ON profiles.id = suggestions.#{profile_id(valid_rules.first)}"
+    where_string = where_string.compact.join(' OR ')
+
+    person.environment.profiles.
+      select(select_string).
+      joins(join_string).
+      where(where_string)
+  end
+
+  def disable
+    self.enabled = false
+    self.save!
+    self.class.generate_profile_suggestions(self.person)
+  end
+
+  def self.generate_all_profile_suggestions
+    Delayed::Job.enqueue(ProfileSuggestion::GenerateAllJob.new) unless ProfileSuggestion::GenerateAllJob.exists?
+  end
+
+  def self.generate_profile_suggestions(person, force = false)
+    return if person.profile_suggestions.enabled.count >= MIN_LIMIT && !force
+    Delayed::Job.enqueue ProfileSuggestionsJob.new(person.id) unless ProfileSuggestionsJob.exists?(person.id)
+  end
+
+  class GenerateAllJob
+    def self.exists?
+      Delayed::Job.by_handler("--- !ruby/object:ProfileSuggestion::GenerateAllJob {}\n").count > 0
+    end
+
+    def perform
+      Person.find_each {|person| ProfileSuggestion.generate_profile_suggestions(person) }
+    end
+  end
+
+end
@@ -3,7 +3,7 @@ class Qualifier &lt; ActiveRecord::Base
   attr_accessible :name, :environment
  
   SEARCHABLE_FIELDS = {
-    :name => 1,
+    :name => {:label => _('Name'), :weight => 1},
   }
  
   belongs_to :environment
@@ -3,7 +3,7 @@ class Scrap &lt; ActiveRecord::Base
   attr_accessible :content, :sender_id, :receiver_id, :scrap_id
  
   SEARCHABLE_FIELDS = {
-    :content => 1,
+    :content => {:label => _('Content'), :weight => 1},
   }
   validates_presence_of :content
   validates_presence_of :sender_id, :receiver_id
@@ -0,0 +1,63 @@
+class SearchTerm < ActiveRecord::Base
+  validates_presence_of :term, :context
+  validates_uniqueness_of :term, :scope => [:context_id, :context_type, :asset]
+
+  belongs_to :context, :polymorphic => true
+  has_many :occurrences, :class_name => 'SearchTermOccurrence'
+
+  attr_accessible :term, :context, :asset
+
+  def self.calculate_scores
+    os = occurrences_scores
+    find_each { |search_term| search_term.calculate_score(os) }
+  end
+
+  def self.find_or_create(term, context, asset='all')
+    context.search_terms.where(:term => term, :asset => asset).first || context.search_terms.create!(:term => term, :asset=> asset)
+  end
+
+  # Fast way of getting the occurrences score for each search_term. Ugly but fast!
+  #
+  # Each occurrence of a search_term has a score that is smaller the older the
+  # occurrence happened. We subtract the amount of time between now and the
+  # moment it happened from the total time any occurrence is valid to happen. E.g.:
+  # The expiration time is 100 days and an occurrence happened 3 days ago.
+  # Therefore the score is 97. Them we sum every score to get the total score
+  # for a search term.
+  def self.occurrences_scores
+    ActiveSupport::OrderedHash[*ActiveRecord::Base.connection.execute(
+      joins(:occurrences).
+      select("search_terms.id, sum(#{SearchTermOccurrence::EXPIRATION_TIME.to_i} - extract(epoch from (now() - search_term_occurrences.created_at))) as value").
+      where("search_term_occurrences.created_at > ?", DateTime.now - SearchTermOccurrence::EXPIRATION_TIME).
+      group("search_terms.id").
+      order('value DESC').
+      to_sql
+    ).map {|result| [result['id'].to_i, result['value'].to_i]}.flatten]
+  end
+
+  def calculate_occurrence(occurrences_scores)
+    max_score = occurrences_scores.first[1]
+    (occurrences_scores[id]/max_score.to_f)*100
+  end
+
+  def calculate_relevance(valid_occurrences)
+    indexed = valid_occurrences.last.indexed.to_f
+    return 0 if indexed == 0
+    total = valid_occurrences.last.total.to_f
+    (1 - indexed/total)*100
+  end
+
+  def calculate_score(occurrences_scores)
+    valid_occurrences = occurrences.valid
+    if valid_occurrences.present?
+      # These scores vary from 1~100
+      self.occurrence_score = calculate_occurrence(occurrences_scores)
+      self.relevance_score = calculate_relevance(valid_occurrences)
+    else
+      self.occurrence_score = 0
+      self.relevance_score = 0
+    end
+    self.score = (occurrence_score * relevance_score)/100.0
+    self.save!
+  end
+end
@@ -0,0 +1,9 @@
+class SearchTermOccurrence < ActiveRecord::Base
+  belongs_to :search_term
+  validates_presence_of :search_term
+  attr_accessible :search_term, :created_at, :total, :indexed
+
+  EXPIRATION_TIME = 1.year
+
+  scope :valid, :conditions => ["search_term_occurrences.created_at > ?", DateTime.now - EXPIRATION_TIME]
+end
@@ -0,0 +1,6 @@
+class SuggestionConnection < ActiveRecord::Base
+  attr_accessible :suggestion, :connection_type, :connection_id
+
+  belongs_to :suggestion, :class_name => 'ProfileSuggestion', :foreign_key => 'suggestion_id'
+  belongs_to :connection, :polymorphic => true
+end
@@ -11,6 +11,10 @@ class User &lt; ActiveRecord::Base
   N_('Password confirmation')
   N_('Terms accepted')
  
+  SEARCHABLE_FIELDS = {
+    :email => {:label => _('Email'), :weight => 5},
+  }
+
   def self.[](login)
     self.find_by_login(login)
   end
-<% if @register_pending %>
-  <div id='thanks-for-signing'>
-    <% if environment.has_custom_welcome_screen? %>
-      <%= environment.settings[:signup_welcome_screen_body].html_safe %>
-    <% elsif environment.enabled?('admin_must_approve_new_users')%>
-      <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>
-      <% unless environment.enabled?('skip_new_user_email_confirmation') %>
-        <h4><%= _("Confirm your account and wait for admin approvement!") %></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 and approved.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
-      <% else %>
-        <h4><%= _("Wait for admin approvement!") %></h4>
-        <p><%= _("The administrators will evaluate your signup request for approvement.") %></p>
-        <p><%= _("You won't appear as %s until your account is approved.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
-      <% end %> 
-      <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>
-    <% 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' %>
-<% end %>
+<h1><%= _('Sign up for %s!') % environment.name %></h1>
+<%= render :partial => 'signup_form' %>
 <div class='description'>
-  <%= _('This text will be showed as a welcome message to users after signup') %><br/><br/>
+  <%= _('If you enable this feature on the "Features" section of the Administration Panel, this text will be shown as a welcome message to users after signup.') %>
 </div>
-
 <%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
+
+<div class='description'>
+  <%= _('If this content is left blank, the following page will be displayed to the user:') %>
+</div>
+
+<%= render :file => 'home/welcome', :locals => {:default_message => true} %>
@@ -10,9 +10,12 @@
     :content => (render :partial => 'site_info', :locals => {:f => f})} %>
   <% tabs << {:title => _('Terms of use'), :id => 'terms-of-use',
     :content => (render :partial => 'terms_of_use', :locals => {:f => f})} %>
-  <% tabs << {:title => _('Signup welcome text'), :id => 'signup-welcome-text',
+  <% #TODO I renamed the labels of signup-welcome-text and signup-welcome-page
+     # so texts more meaningful but I'm not rewriting every variable or reference to
+     # this. I leave this task to whoever thinks this is too annoying.%>
+  <% tabs << {:title => _('Signup welcome email'), :id => 'signup-welcome-text',
     :content => (render :partial => 'signup_welcome_text', :locals => {:f => f})} %>
-  <% tabs << {:title => _('Signup welcome message'), :id => 'signup-welcome-message',
+  <% tabs << {:title => _('Signup welcome page'), :id => 'signup-welcome-message',
     :content => (render :partial => 'signup_welcome_screen', :locals => {:f => f}) }%>
   <%= render_tabs(tabs) %>
   <% button_bar do %>
@@ -0,0 +1,17 @@
+<% if owner.kind_of?(Profile) %>
+  <%= link_to s_('communities|View all'), {:profile => owner.identifier, :controller => 'profile', :action => 'communities'}, :class => 'view-all' %>
+<% elsif owner.kind_of?(Environment) %>
+  <%= link_to s_('communities|View all'), {:controller => 'search', :action => 'communities'}, :class => 'view-all' %>
+<% end %>
+
+<% if user && user == profile && suggestions && !suggestions.empty? %>
+  <div class='suggestions-block common-profile-list-block'>
+    <h4 class='block-subtitle'><%= _('Some suggestions for you') %></h4>
+    <div class='profiles-suggestions'>
+      <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => suggestions, :collection => :communities_suggestions, :per_page => 3 } %>
+    </div>
+    <div class='more-suggestions'>
+      <%= link_to _('See all suggestions'), profile.communities_suggestions_url %>
+    </div>
+  </div>
+<% end %>
 <p>
 <em>
   <%= _('Drag images to add them to the text.') %>
-  <%= _('Drag file names to the text to add links.') %>
+  <%= _('Click on file names to add links to the text.') %>
 </em>
 </p>
@@ -0,0 +1,15 @@
+<%= form_tag({:action => 'new', :profile => profile.identifier}, :id => 'new-folder-dialog', :title => _('Create new folder'), :style => 'display: none;') do %>
+  <%= select_profile_folder(
+    _('Choose parent folder:'),
+    :parent_id, profile, default_folder, {}, {},
+    "type='Folder' or type='Gallery'")
+  %>
+
+  <%= labelled_radio_button _('Gallery'), :folder_type, 'Gallery', true %>
+  <%= labelled_radio_button _('Folder'), :folder_type, 'Folder', false %>
+
+  <%= labelled_form_field _('Name:'), text_field_tag(:new_folder, nil, 'data-url' => url_for({:action => 'new', :profile => profile.identifier})) %>
+  <% button_bar do %>
+    <%= submit_button(:newfolder, _('Create')) %>
+  <% end %>
+<% end %>
@@ -0,0 +1,12 @@
+<% file_types.each do |key, header| %>
+  <% display = @recent_files[key].present? ? '' : 'none' %>
+  <div class='<%= key.to_s %>' style='display: <%= display%>;'>
+    <div class='section-title'>
+      <h3><%= header %></h3>
+      <% if @recent_files[key].total_pages > 1 %>
+        <%= link_to(_('View all'), {:controller => 'cms', :action => 'view_all_media', :profile => profile.identifier, :key => key}, :class => 'view-all colorbox', 'data-key' => key) %>
+      <% end %>
+    </div>
+    <%= render :partial => "cms/media_panel/list_published_media_items", :locals => { key: key, show_pagination_links: false } %>
+  </div>
+<% end %>
+<% default_folder = content_id_to_str default_folder_for_image_upload(profile) %>
+
 <div class='text-editor-sidebar'>
   <span class='button-add' data-value='<%= _('Add to the text') %>'></span>
   <span class='button-zoom' data-value='<%= _('Zoom in') %>'></span>
   <span class='button-close' data-value='<%= _('Close') %>'></span>
  
+  <div class='header'><strong><%= _('Insert media') %></strong><%= button('vertical-toggle', _('Show/Hide'), '#') %></div>
+
   <%= render(:partial => 'textile_quick_reference') if @article.is_a?(TextileArticle) %>
   <div class='text-editor-sidebar-box' id='media-upload-box'>
-    <div class='header'><strong><%= _('Insert media') %></strong></div>
     <div id='media-upload-form'>
       <%= form_tag({ :action => 'media_upload' }, :multipart => true) do %>
         <div class='formfield'>
-          <% default_folder = content_id_to_str default_folder_for_image_upload(profile) %>
           <%= select_profile_folder(
                 _('Choose folder to upload files:'),
                 :parent_id, profile, default_folder, {}, {},
                 "type='Folder' or type='Gallery'"
           ) %>
         </div>
-        <p><%= file_field_tag('file1') %></p>
-        <p><%= file_field_tag('file2') %></p>
-        <p><%= file_field_tag('file3') %></p>
-        <% button_bar do %>
-          <%= submit_button(:save, _('Upload')) %>
-        <% end %>
+        <%= button(:newfolder, _('New folder'), '#', :id => 'new-folder-button') %>
+        <p><%= file_field_tag('file', :multiple => true) %></p>
       <% end %>
     </div>
-    <div id='media-upload-results' style='display: none'>
-      <%= render :partial => 'drag_and_drop_note' %>
-      <div class='items'>
-      </div>
-      <p><%= link_to(_('Upload more files ...'), '#', :id => 'media-upload-more-files')%></p>
+    <div class='hide-and-show-uploads'>
+      <%= link_to(_('Hide all uploads'), nil, :id => 'hide-uploads', :style => 'display: none;', 'data-bootstraped' => false) %>
+      <%= link_to(_('Show all uploads'), nil, :id => 'show-uploads', :style => 'display: none;') %>
     </div>
   </div>
-  <div id='media-search-box' class='text-editor-sidebar-box'>
-    <div class='header'><strong><%= _('Media search') %></strong></div>
-    <p>
-    <%= form_tag({ :action => 'search' }) do %>
-      <span class='formfield'>
-        <input name='q' type='text' id='media-search-query' style='width: 250px;'/>
-      </span>
-      <%= submit_button :search, _('Search'), :id => 'media-search-button' %>
-    <% end %>
-    </p>
-    <div id='media-search-results' style='display: none'>
-      <%= render :partial => 'drag_and_drop_note' %>
-      <div class='items'>
-      </div>
+
+  <div id='published-media' class='text-editor-sidebar-box' data-url='<%= url_for({:controller => 'cms', :action => 'published_media_items', :profile => profile.identifier}) %>'>
+    <%= select_profile_folder(nil, :parent_id, profile, 'recent-media', {}, {},
+        "type='Folder' or type='Gallery'", {:root_label => _('Recent media')}) %>
+    <%= labelled_form_field _('Search'), text_field_tag('q') %>
+    <%= render :partial => 'drag_and_drop_note' %>
+    <div class='items'>
+      <%= render :partial => 'published_media_items' %>
     </div>
   </div>
 </div>
  
+<script id="template-upload" type="text/x-tmpl">
+  <div id="file-{%= o.id %}" class="upload" title="{%= o.name %}">
+    <div class="file-name">{%=o.name%}</div>
+    <div class="percentage"></div>
+    <div class="progress"><div class="bar" style="width: 0%;"></div></div>
+  </div>
+</script>
  
+<%= render :partial => 'media_new_folder', :locals => {:default_folder => default_folder} %>
+<%= javascript_include_tag 'jquery.fileupload.js', 'tmpl.js', 'media-panel.js' %>
@@ -15,6 +15,7 @@
     <pre># <%= _('first item') %>
 # <%= _('second item') %></pre>
     <p><%= h(_('For code, use HTML tags <pre> and <code>, and indent the code inside them:')) %>
+    </p>
     <pre>
 &lt;pre&gt;
 &lt;code&gt;
 <%= error_messages_for 'article' %>
  
-<div class='<%= (environment.enabled?('media_panel') ? 'with_media_panel' : 'no_media_panel') %>'>
+<% show_media_panel = environment.enabled?('media_panel') && [TinyMceArticle, TextileArticle, Event, EnterpriseHomepage].any?{|klass| @article.kind_of?(klass)} %>
+
+<div class='<%= (show_media_panel ? 'with_media_panel' : 'no_media_panel') %>'>
 <%= labelled_form_for 'article', :html => { :multipart => true, :class => @type } do |f| %>
  
   <%= hidden_field_tag("type", @type) if @type %>
@@ -66,7 +68,7 @@
 <% end %>
 </div>
  
-<% if environment.enabled?('media_panel') && [TinyMceArticle, TextileArticle, Event, EnterpriseHomepage].any?{|klass| @article.kind_of?(klass)} %>
+<% if show_media_panel %>
   <%= render :partial => 'text_editor_sidebar' %>
 <% end %>
  
@@ -0,0 +1,5 @@
+<div class="item file <%= icon_for_article(@file) %>" data-item="div">
+  <div>
+    <a class="add-to-text" href="<%= url_for(@file.url) %>" title="<%= @file.title %>"><%= @file.title %></a>
+  </div>
+</div>
@@ -0,0 +1,9 @@
+<div class="item image" data-item="span" title="<%= @file.name %>">
+  <span>
+    <img src="<%= @file.public_filename(:uploaded) %>"/>
+  </span>
+  <div class="controls image-controls">
+    <a class="button icon-add add-to-text" href="#"><span><%= _('Add to the text') %></span></a>
+    <a class="button icon-zoom zoom" href="#" title="<%= _('Zoom in') %>"><span><%= _('Zoom in') %></span></a>
+  </div>
+</div>
@@ -0,0 +1,5 @@
+<% @recent_files[key].each do |file| %>
+  <% @file = file %>
+  <%= render :partial => "cms/media_panel/#{key.to_s.singularize}" %>
+<% end %>
+<%= pagination_links @recent_files[key] if show_pagination_links %>
@@ -0,0 +1 @@
+loadPublishedMedia();
-<h1><%= _('Select the groups where you want to publish your article') %></h1>
+<div class="select-publish-target">
+
+<h2><%= _('Where do you want to publish this article?') %></h2>
  
 <% if !@failed.blank? %>
   <div class="errorExplanation" id="errorExplanation">
@@ -14,15 +16,54 @@
   </div>
 <% end %>
  
-<%= form_tag do%>
-  <%= hidden_field_tag :back_to, @back_to %>
-  <% @groups.each do |group| %>
-    <%= labelled_check_box group.name, "marked_groups[#{group.id}][group_id]", group.id, @marked_groups.include?(group) %><br />
-    <%= labelled_text_field _('Title') + ': ', "marked_groups[#{group.id}][name]", @article.name, :style => 'width: 100%' %>
-    <hr />
+<ul class='publish-targets'>
+  <% if profile != user %>
+    <li onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
+      <strong><%= _("Publish this article on your profile") %></strong>
+      <div class='description'><%= _('You can publish this article on your profile where your friends and followers will see.') %></div>
+      <%= form_tag do %>
+        <%= hidden_field_tag :back_to, @back_to %>
+        <%= labelled_form_field _('Title'), text_field_tag('name', @article.name) %>
+
+        <% button_bar do %>
+          <%= submit_button 'spread', _('Spread this') %>
+        <% end %>
+      <% end %>
+    </li>
   <% end %>
  
-  <% button_bar do %>
-    <%= submit_button 'spread', _('Spread this'), :cancel => @back_to %>
+  <% if user.communities.present? %>
+    <li onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
+      <strong><%= _("Publish this article on communities you are part of") %></strong>
+      <div class='description'><%= _('You can submit this article to one or more communities you are a member of, just search for the community below.') %></div>
+      <%= form_tag :action => 'publish_on_communities', :id => @article.id do %>
+        <%= hidden_field_tag :back_to, @back_to %>
+        <% search_action = url_for(:action => 'search_communities_to_publish') %>
+        <%= token_input_field_tag(:q, 'search-communities-to-publish', search_action, { :hint_text => _('Type in a search for your community'), :zindex => 10000, :focus => false }) %>
+        <%= labelled_form_field _('Title'), text_field_tag('name', @article.name) %>
+        <% button_bar do %>
+          <%= submit_button 'spread', _('Spread this') %>
+        <% end %>
+      <% end %>
+    </li>
   <% end %>
-<% end %>
+
+
+  <% if environment.portal_enabled %>
+    <li onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
+      <strong><%= _("Publish your article on portal community") %></strong>
+      <div class='description'><%= _('You can suggest this article to the portal community, where it can show up on the homepage.') %></div>
+
+      <%= form_tag :action => 'publish_on_portal_community', :id => @article.id do %>
+        <%= hidden_field_tag :back_to, @back_to %>
+        <%= labelled_form_field _('Title'), text_field_tag('name', @article.name) %>
+
+        <% button_bar do %>
+          <%= submit_button 'spread', _('Spread this') %>
+        <% end %>
+      <% end %>
+    </li>
+  <% end %>
+</ul>
+
+</div>
@@ -2,7 +2,7 @@
   <%= _('Content management') %>
 </h1>
  
-<% if user.can_change_homepage? && !remove_content_button(:home) %>
+<% if user.can_change_homepage? && !remove_content_button(:home, profile.home_page) %>
   <div class="cms-homepage">
     <%= _('Profile homepage:') %>
     <% if profile.home_page %>
@@ -66,17 +66,17 @@
         <%= short_description %>
       </td>
       <td class="article-controls">
-        <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit) %>
+        <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit, article) %>
         <%= button_without_text :eyes, _('Public view'), article.view_url %>
-        <%= display_spread_button(profile, article) unless article.folder? || remove_content_button(:spread)%>
-        <% if user.can_change_homepage? && !remove_content_button(:home) %>
+        <%= display_spread_button(article) unless remove_content_button(:spread, article) %>
+        <% if user.can_change_homepage? && !remove_content_button(:home, article) %>
           <% if profile.home_page != article %>
             <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
           <% else %>
             <%= button_without_text(:'home-not', _('Reset homepage'),  { :action => 'set_home_page', :id => nil }, :method => :post) %>
           <% end %>
         <% end %>
-        <%= display_delete_button(article) if !remove_content_button(:delete) %>
+        <%= display_delete_button(article) if !remove_content_button(:delete, article) %>
       </td>
     </tr>
   <% end %>
@@ -0,0 +1,7 @@
+<h1><%= file_types[@key] %></h1>
+
+<div class='view-all-media view-all-<%= @key %>'>
+  <%= render :partial => "cms/media_panel/list_published_media_items", :locals => { key: @key, show_pagination_links: true } %>
+</div>
+
+<%= javascript_include_tag 'media-panel.js' %>
@@ -0,0 +1 @@
+jQuery('.view-all-media').html('<%= escape_javascript(render :partial => "cms/media_panel/list_published_media_items", :locals => { key: @key, show_pagination_links: true }) %>');
@@ -2,46 +2,40 @@
   <div id="article-actions">
  
  
-    <% if @page.allow_edit?(user) && !remove_content_button(:edit) %>
+    <% if @page.allow_edit?(user) && !remove_content_button(:edit, @page) %>
       <% content = content_tag('span', label_for_edit_article(@page)) %>
       <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }) %>
       <%= expirable_button @page, :edit, content, url %>
     <% end %>
  
-    <% if @page != profile.home_page && !@page.has_posts?  && @page.allow_delete?(user) && !remove_content_button(:delete)%>
+    <% if @page != profile.home_page && !@page.has_posts?  && @page.allow_delete?(user) && !remove_content_button(:delete, @page)%>
       <% content = content_tag( 'span', _('Delete') ) %>
       <% 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 %>
  
-    <% if !@page.folder? && @page.allow_spread?(user) && !remove_content_button(:spread) %>
-      <% content = content_tag( 'span', _('Spread this') ) %>
-      <% url = nil %>
-      <% if profile.kind_of?(Person) %>
-        <% 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.id }) %>
-      <% end %>
-      <%= expirable_button @page, :spread, content, url if url %>
+    <% if @page.allow_spread?(user) && !remove_content_button(:spread, @page) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %>
+      <%= expirable_button @page, :spread, content_tag( 'span', _('Spread this') ), url, {:class => 'colorbox'} if url %>
     <% end %>
  
     <% if !@page.gallery? && (@page.allow_create?(user) || (@page.parent && @page.parent.allow_create?(user))) %>
-      <% if @page.translatable? && !@page.native_translation.language.blank? && !remove_content_button(:locale) %>
+      <% if @page.translatable? && !@page.native_translation.language.blank? && !remove_content_button(:locale, @page) %>
         <% content = _('Add translation') %>
         <% parent_id = (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)) %>
         <% url = profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => parent_id, :type => @page.type, :article => { :translation_of_id => @page.native_translation.id })%>
         <%= expirable_button @page, :locale, content, url %>
       <% end %>
  
-      <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) unless remove_content_button(:new) %>
+      <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) unless remove_content_button(:new, @page) %>
     <% end %>
  
     <% if @page.accept_uploads? && @page.allow_create?(user) %>
-      <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) unless remove_content_button(:upload)%>
+      <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) unless remove_content_button(:upload, @page)%>
     <% end %>
  
-    <% if !@page.allow_create?(user) && profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) && !remove_content_button(:suggest) %>
+    <% if !@page.allow_create?(user) && profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) && !remove_content_button(:suggest, @page) %>
       <% content = content_tag( 'span', _('Suggest an article') ) %>
       <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}) %>
       <% options = {:id => 'suggest-article-link'} %>
@@ -7,7 +7,7 @@
   <div id="article-actions">
     <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
  
-    <% if @page.allow_edit?(user) && !remove_content_button(:undo) %>
+    <% if @page.allow_edit?(user) && !remove_content_button(:undo, @page) %>
       <% content = content_tag('span', _('Revert to this version')) %>
       <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id, :version => @version }) %>
       <%= expirable_button @page, :undo, content, url, :id => 'article-revert-version-link' %>
 <h1><%= _('Enterprise registration completed') %></h1>
+<p><%= _("Your enterprise (%s) was successfully registered.") % @enterprise.name %></p>
+<p><%= link_to _('You can manage your enterprise now.'), @enterprise.admin_url %></p>
  
-<p>
-<%= _("Your enterprise (%s) was successfully registered.") % @enterprise.name %>
-</p>
+<%= render :partial => 'shared/template_welcome_page', :locals => {:template => @enterprise.template, :header => _("What can I do with a %s?")} %>
+
+<% button_bar do %>
+  <%= button :back, _('Back'), {:controller => 'memberships', :action => 'index', :profile => user.identifier} %>
+<% end %>
  
-<p>
-<%= link_to _('You can manage your enterprise now.'), @enterprise.admin_url %>
-</p>
@@ -0,0 +1,16 @@
+<ul class="profile-list">
+  <% profiles.each do |profile| %>
+    <li>
+    <%= link_to_profile profile_image(profile) + '<br/>' + profile.short_name,
+                        profile.identifier, :class => 'profile-link' %>
+    <div class="controll">
+      <%= button_without_text :remove, content_tag('span',_('remove')),
+          { :action => 'remove', :id => profile.id },
+            :title => _('remove') %>
+      <%= button_without_text 'menu-mail', content_tag('span',_('contact')),
+            profile.url.merge(:controller => 'contact', :action => 'new', :profile => profile.identifier),
+            :title => _('contact') %>
+    </div><!-- end class="controll" -->
+    </li>
+  <% end %>
+</ul>
@@ -0,0 +1,7 @@
+<h1><%= _("Connections with %s") % @suggestion.suggestion.name %></h1>
+
+<% button_bar do %>
+  <%= button(:back, _('Go to friends list'), :controller => 'friends') %>
+<% end %>
+
+<%= render :partial => 'shared/profile_connections', :locals => { :suggestion => @suggestion, :tags => @tags, :profiles => @profiles } %>
@@ -10,46 +10,28 @@
         <%= link_to _('Do you want to see other people in this environment?'), :controller => 'search', :action => 'assets', :asset => 'people' %>
       </em>
     </p>
-  <% else %>
-    <% button_bar do %>
-      <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
-      <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
-      <% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
-        <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
-      <% end %>
-    <% end %>
   <% end %>
  
-  <ul class="profile-list">
-    <% @friends.each do |friend| %>
-      <li>
-      <%= link_to_profile profile_image(friend) + '<br/>' + friend.short_name,
-                          friend.identifier, :class => 'profile-link' %>
-      <div class="controll">
-        <%= link_to content_tag('span',_('remove')),
-            { :action => 'remove', :id => friend.id },
-              :class => 'button icon-remove',
-              :title => _('remove') %>
-        <%= link_to content_tag('span',_('contact')),
-              friend.url.merge(:controller => 'contact', :action => 'new', :profile => friend.identifier),
-              :class => 'button icon-menu-mail',
-              :title => _('contact') %>
-      </div><!-- end class="controll" -->
-      </li>
-    <% end %>
-  </ul>
-  <div id='pagination-friends'>
-    <%= pagination_links @friends, :param_name => 'npage' %>
-  </div>
-
   <% button_bar do %>
     <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
     <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
     <% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
-      <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
+      <%= button(:person, _('Invite people'), :controller => 'invite', :action => 'invite_friends') %>
     <% end %>
   <% end %>
+
+  <%= render :partial => 'profile_list', :locals => { :profiles => @friends } %>
+
+  <br style="clear:both" />
+  <%= pagination_links @friends, :param_name => 'npage' %>
 <% end %>
  
-</div><!-- end id="manage_friends" -->
+<% unless @suggestions.empty? %>
+  <br style="clear:both" />
+  <h2><%= _("Friends suggestions") %></h2>
+  <div class="profiles-suggestions">
+    <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :friends_suggestions, :per_page => 12 } %>
+  </div>
+<% end %>
  
+</div><!-- end id="manage_friends" -->
@@ -0,0 +1,5 @@
+<div id="remove_suggestion">
+  <h1><%= _('Removing suggestion for friend: %s') % @person.name %></h1>
+
+  <%= render :partial => 'shared/remove_suggestion', :locals => { :suggestion => @person } %>
+</div>
@@ -0,0 +1,9 @@
+<h1><%= _("Friends suggestions for %s") % profile.name %></h1>
+
+<% button_bar do %>
+  <%= button(:back, _('Go to friends list'), :controller => 'friends') %>
+<% end %>
+
+<div class="profiles-suggestions">
+  <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :friends_suggestions, :per_page => 12 } %>
+</div>
@@ -0,0 +1,30 @@
+<% default_message = defined?(default_message) ? default_message : false %>
+
+<div id='thanks-for-signing'>
+  <h1><%= _("Welcome to %s!") % environment.name %></h1>
+  <% if environment.has_custom_welcome_screen? && !default_message %>
+    <%= environment.settings[:signup_welcome_screen_body].html_safe %>
+  <% else %>
+      <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
+      <% if @display_confirmation_tips %>
+        <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>
+      <% else %>
+        <h4><%= _("Wait for admin approvement!") %></h4>
+        <p><%= _("The administrators will evaluate your signup request for approvement.") %></p>
+        <p><%= _("You won't appear as %s until your account is approved.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
+      <% end %>
+      <h4><%= _("What to do next?") %></h4>
+      <p><%= _("Access your %s and see your face on the network!") %
+        (user.present? ? link_to(_('Profile'), {:controller => 'profile', :profile => user.identifier}, :target => '_blank') : 'Profile') %>
+      <%= _("You can also explore your %s to customize your profile. Here are some %s on what you can do there.") %
+        [user.present? ? link_to(_('Control Panel'), {:controller => 'profile_editor', :profile => user.identifier}, :target => '_blank') : 'Control Panel',
+          link_to(_('tips'), {:controller => 'doc', :action => 'topic', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank')] %></p>
+      <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :action => 'topic', :section => 'user', :topic => 'invite-contacts'}, :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><%= _("Start exploring and have fun!") %></p>
+  <% end %>
+  <%= render :partial => 'shared/template_welcome_page', :locals => {:template => @person_template, :header => _("What can I do as a %s?")} %>
+</div>
@@ -0,0 +1,8 @@
+<br/>
+
+<%= link_to ('Personalize invitation mail'), nil, :onclick => "jQuery('#invitation-mail_template').show(); return false;" %>
+
+<div id='invitation-mail_template' style='display:none'>
+  <%= h _("Now enter an invitation message. You must keep the <url> code in your invitation text. When your friends receive the invitation e-mail, <url> will be replaced by a link that they need to click to activate their account. <user> and <friend> codes will be replaced by your name and friend name, but they are optional.") %>
+  <%= labelled_form_field(_('Invitation text:'), text_area_tag(:mail_template, mail_template, :cols => 72, :rows => 8)) %>
+</div>
@@ -0,0 +1,41 @@
+<% header ||='h2' %>
+<<%= header %>><%= _('Step 1 of 2: Select address book') %></<%= header %>>
+
+<%= form_tag do %>
+
+  <%= [
+        radio_button_tag(:import_from, "manual", @import_from == "manual", :onclick => 'hide_invite_friend_login_password()') + content_tag('label', _('Manually (empty field)'), :for => "import_from_manual"),
+        radio_button_tag(:import_from, "gmail", @import_from == "gmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Gmail', :for => 'import_from_gmail'),
+        radio_button_tag(:import_from, "yahoo", @import_from == "yahoo", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Yahoo', :for => "import_from_yahoo"),
+        radio_button_tag(:import_from, "hotmail", @import_from == "hotmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Hotmail', :for => "import_from_hotmail")
+      ].join("\n<br/>\n") %>
+
+  <script type="text/javascript">
+    function hide_invite_friend_login_password() {
+      $('invite-friends-login-password').hide();
+    }
+    function show_invite_friend_login_password(option) {
+      if (option == 'hotmail') {
+        $('hotmail_username_tip').show();
+      } else {
+        $('hotmail_username_tip').hide();
+      }
+      $('invite-friends-login-password').show();
+      $('login').focus();
+    }
+  </script>
+  <div id='invite-friends-login-password' <%= "style='display: none;'" if (@import_from == 'manual') %>>
+    <div id='hotmail_username_tip'>
+      <%= ui_icon('ui-icon-alert') %>
+      <%= _('Please type your username in the format yourname@example.com') %>
+    </div>
+
+    <%= labelled_form_field(_("Username") + ":", text_field_tag(:login, @login)) %>
+    <%= labelled_form_field(_("Password") + ":", password_field_tag(:password)) %>
+  </div>
+
+  <% button_bar do %>
+    <%= submit_button(:forward, _("Next")) %>
+  <% end %>
+  <p><%= _("We won't store your password or contact anyone without your permission.") %></p>
+<% end %>
@@ -0,0 +1,42 @@
+<% if profile.person? %>
+  <h1><%= _('Ask for friendship') %></h1>
+  <% description = _('You can search for user profiles and ask them to become your friends.') %>
+<% else %>
+  <h1><%= _('Invite people to join') %></h1>
+  <% description = _('You can search for user profiles and invite them to join this group.') %>
+<% end %>
+
+<h3>
+  <%= _("Choose person by:") %>
+</h3>
+
+<p>
+  <%= labelled_radio_button _("Name"), :invite_friend_by, 1, true, :id => "invite_friend_by_name", :class => "invite_friend_by" %>
+  <%= labelled_radio_button _("Email"), :invite_friend_by, 2, false, :id => "invite_friend_by_email", :class => "invite_friend_by" %>
+</p>
+
+<div class='invite_by_name'>
+  <p><%= description %></p>
+  <%= form_tag :action => 'invite_registered_friend' do %>
+    <% search_action = url_for(:action => 'search') %>
+    <%= token_input_field_tag(
+      :q, 'search-people', search_action,
+      { :hint_text => _('Type in the person\'s %{search_fields}') % {:search_fields => @search_fields},
+        :focus => false }) %>
+
+    <% button_bar do %>
+      <%= submit_button('save', _('Invite'))%>
+      <%= button('cancel', _('Cancel'), profile.url)%>
+    <% end %>
+  <% end %>
+</div>
+
+<div class='invite_by_email' style="display: none;">
+  <h2><%= _('Invite people from my e-mail contacts') %></h2>
+  <% header = 'h3' %>
+
+<%= render :partial => 'invite/select_address_book', :locals => {:header => header} %>
+</div>
+
+<div id="loadingScreen"></div>
+<%= javascript_include_tag 'invite' %>
@@ -1,51 +0,0 @@
-<% if profile.person? %>
-  <h1><%= _('Invite your friends') %></h1>
-<% else %>
-  <h1><%= _('Invite your friends to join %s') % profile.name %></h1>
-<% end %>
-
-<h2><%= _('Step 1 of 2: Select address book') %></h2>
-
-<%= form_tag do %>
-
-  <%= [
-        radio_button_tag(:import_from, "manual", @import_from == "manual", :onclick => 'hide_invite_friend_login_password()') + content_tag('label', _('Manually (empty field)'), :for => "import_from_manual"),
-        radio_button_tag(:import_from, "gmail", @import_from == "gmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Gmail', :for => 'import_from_gmail'),
-        radio_button_tag(:import_from, "yahoo", @import_from == "yahoo", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Yahoo', :for => "import_from_yahoo"),
-        radio_button_tag(:import_from, "hotmail", @import_from == "hotmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Hotmail', :for => "import_from_hotmail")
-      ].join("\n<br/>\n") %>
-
-  <script type="text/javascript">
-    function hide_invite_friend_login_password() {
-      $('invite-friends-login-password').hide();
-    }
-    function show_invite_friend_login_password(option) {
-      if (option == 'hotmail') {
-        $('hotmail_username_tip').show();
-      } else {
-        $('hotmail_username_tip').hide();
-      }
-      $('invite-friends-login-password').show();
-      $('login').focus();
-    }
-  </script>
-  <div id='invite-friends-login-password' <%= "style='display: none;'" if (@import_from == 'manual') %>>
-    <div id='hotmail_username_tip'>
-      <%= ui_icon('ui-icon-alert') %>
-      <%= _('Please type your username in the format yourname@example.com') %>
-    </div>
-
-    <%= labelled_form_field(_("Username") + ":", text_field_tag(:login, @login)) %>
-    <%= labelled_form_field(_("Password") + ":", password_field_tag(:password)) %>
-  </div>
-
-  <% button_bar do %>
-    <%= submit_button(:forward, _("Next")) %>
-  <% end %>
-  <p><%= _("We won't store your password or contact anyone without your permission.") %></p>
-<% end %>
-
-<div id="loadingScreen"></div>
-
-
-
 <%= render :partial => 'invite/dialog_wait_loading', :locals => {:contact_list => @contact_list.id } if @import_from != 'manual' %>
  
 <% if profile.person? %>
-  <h1><%= _('Invite your friends') %></h1>
+  <h1><%= _('Invite people') %></h1>
 <% else %>
-  <h1><%= _('Invite your friends to join %s') % profile.name %></h1>
+  <h1><%= _('Invite people to join') %></h1>
 <% end %>
  
  
-<h2><%= _('Step 2 of 2: Selecting Friends') %></h2>
+<h2><%= _('Step 2 of 2: Selecting People') %></h2>
  
-<%= button(:back, _('Back'), { :action => 'select_address_book' }, :id => 'invitation_back_button') %>
+<%= button(:back, _('Back'), { :action => 'invite_friends' }, :id => 'invitation_back_button') %>
  
 <p>
-<%= _('Indicate which friends you want to invite.') %>
+<%= _('Indicate which people you want to invite.') %>
 </p>
  
 <%= form_tag do %>
@@ -30,16 +30,9 @@
     </div>
   <% end -%>
  
-  <br/>
-
-  <%= link_to ('Personalize invitation mail'), nil, :onclick => "jQuery('#invitation-mail_template').show(); return false;" %>
-
-  <div id='invitation-mail_template' style='display:none'>
-    <%= h _("Now enter an invitation message. You must keep the <url> code in your invitation text. When your friends receive the invitation e-mail, <url> will be replaced by a link that they need to click to activate their account. <user> and <friend> codes will be replaced by your name and friend name, but they are optional.") %>
-    <%= labelled_form_field(_('Invitation text:'), text_area_tag(:mail_template, @mail_template, :cols => 72, :rows => 8)) %>
-  </div>
+  <%= render :partial => 'invite/personalize_invitation_mail', :locals => {:mail_template => @mail_template } %>
  
   <% button_bar do %>
-    <%= submit_button(:ok, _("Invite my friends!")) %>
+    <%= submit_button(:ok, _("Invite!")) %>
   <% end %>
 <% end %>
@@ -2,8 +2,8 @@
 'jquery-2.1.1.min', 'jquery-migrate-1.2.1',
 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
 'jquery-ui-1.10.4/js/jquery-ui-1.10.4.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
-'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
-'add-and-join', 'report-abuse', 'catalog', 'manage-products', 'autogrow',
+'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput', 'jquery.typewatch', 'jquery.textchange',
+'add-and-join', 'report-abuse', 'catalog', 'manage-products', 'autogrow', 'select-or-die/_src/selectordie',
 'jquery-timepicker-addon/dist/jquery-ui-timepicker-addon', 'application.js', 'rails.js', 'inputosaurus.js', :cache => 'cache/application' %>
  
 <% language = FastGettext.locale %>
@@ -10,16 +10,17 @@
       <%= _("<span class='login'>%s</span>") % thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
       <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_exec(&content) }.join("") %>
  
-      <div id='inlineLoginBox' style='display: none;'>
-        <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
-      </div>
+    <div id='inlineLoginBox' style='display: none;'>
+      <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
+    </div>
  
-      <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
-        <%= _("<span class='or'>or</span> <span class='signup'>%s</span>") % link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup')%>
-      <% end %>
-    </span>
+    <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
+      <%= _("<span class='or'>or</span> <span class='signup'>%s</span>") % link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup')%>
+    <% end %>
+
+  </span>
   <% end %>
-  <form action="/search" id="top-search" class="search_form clean" method="get">
+  <form action="/search/articles" id="top-search" class="search_form clean" method="get">
     <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />
     <div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>
     <%= javascript_tag 'jQuery("#user form input").hint();' %>
@@ -0,0 +1,7 @@
+<h1><%= _("Connections with %s") % @suggestion.suggestion.name %></h1>
+
+<% button_bar do %>
+  <%= button(:back, _('Go to groups list'), :controller => 'memberships') %>
+<% end %>
+
+<%= render :partial => 'shared/profile_connections', :locals => { :suggestion => @suggestion, :tags => @tags, :profiles => @profiles } %>
@@ -16,6 +16,8 @@
   <%= labelled_select(_('Filter')+': ', :filter_type, :first, :last, @filter,  type_collection, :id => 'memberships_filter')%>
 </p>
  
+<p><%= link_to _('See some suggestions of communities...'), :action => 'suggest' %></p>
+
 <% if @memberships.empty? %>
   <p>
     <em><%= _('No groups to list') %></em>
@@ -0,0 +1,5 @@
+<div id="remove_suggestion">
+  <h1><%= _('Removing suggestion for community: %s') % @community.name %></h1>
+
+  <%= render :partial => 'shared/remove_suggestion', :locals => { :suggestion => @community } %>
+</div>
@@ -0,0 +1,9 @@
+<h1><%= _("Communities suggestions for %s") % profile.name %></h1>
+
+<% button_bar do %>
+  <%= button(:back, _('Go to groups list'), :controller => 'memberships') %>
+<% end %>
+
+<div class="profiles-suggestions">
+  <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :communities_suggestions, :per_page => 12 } %>
+</div>
@@ -0,0 +1,9 @@
+<h1><%= _('Community created') %></h1>
+<p><%= _("Your community (%s) was successfully created.") % @community.name %></p>
+<p><%= link_to _('You can manage your community now.'), @community.admin_url %></p>
+
+<%= render :partial => 'shared/template_welcome_page', :locals => {:template => @community.template, :header => _("What can I do with a %s?")} %>
+
+<% button_bar do %>
+  <%= button :back, _('Back'), @back_to %>
+<% end %>
@@ -10,5 +10,5 @@
     </div>
   </div>
 </div>
-<div title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-newgallery'></div>
+<div title='<%#= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-newgallery'></div>
 <br/>
@@ -18,7 +18,7 @@
   <%= button :back, _('Go back'), { :controller => 'profile' } %>
   <% if user == profile %>
     <%= button :edit, _('Manage my friends'), :controller => 'friends', :action => 'index', :profile => profile.identifier %>
-    <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
+    <%= button(:person, _('Invite people'), :controller => 'invite', :action => 'invite_friends') %>
   <% end %>
 <% end %>
  
@@ -18,7 +18,7 @@
   <%= button :back, _('Go back'), { :controller => 'profile' } %>
   <% if profile.community? and user %>
     <% if user.has_permission?(:invite_members, profile) %>
-      <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'select_address_book' %>
+      <%= button :person, _('Invite people to join'), :controller => 'invite', :action => 'invite_friends' %>
     <% end %>
     <% if user.has_permission?(:send_mail_to_members, profile) %>
       <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
 <h2><%= _('Moderation options') %></h2>
 <% if profile.community? %>
   <div style='margin-bottom: 1em'>
+    <h4><%= _('Invitation moderation:')%></h4>
+  </div>
+  <div style='margin-bottom: 0.5em'>
+    <%= check_box(:profile_data, :allow_members_to_invite, :style => 'float: left') %>
+    <div style='margin-left: 30px'>
+      <%= _('Allow all members to send invitation (Default: only administrator)') %>
+    </div>
+    <br>
+    <div class = 'invite_friends_only' >
+      <%= check_box(:profile_data, :invite_friends_only, :style => 'float: left') %>
+      <div style='margin-left: 30px'>
+        <%= _('Allow members to invite only friends (Default: all users)') %>
+      </div>
+    </div>
+  </div>
+  <br>
+
+  <div style='margin-bottom: 1em'>
     <%= _('New members must be approved:')%>
   </div>
   <div style='margin-bottom: 0.5em'>
@@ -33,3 +51,5 @@
     <%= _('<strong>After</strong> being published in this group (a moderator can always remove publicated articles later).') %>
   </div>
 </div>
+
+<%= javascript_include_tag('invite') %>
@@ -52,6 +52,12 @@
     'profile_data[redirect_l10n]', true, @profile.redirect_l10n
   )%>
  
+  <h2><%= _('Suggestions') %></h2>
+  <%= labelled_check_box(
+    _('Send me relationship suggestions by email'),
+    'profile_data[email_suggestions]', true, @profile.email_suggestions
+  )%>
+
   <%=
     @plugins.dispatch(:profile_editor_extras).map do |content|
       content.kind_of?(Proc) ? self.instance_exec(&content) : content
@@ -68,6 +68,8 @@
  
   <%= control_panel_button(_('Manage SPAM'), 'manage-spam', :controller => 'spam', :action => 'index') %>
  
+  <%= control_panel_button(_('Edit welcome page'), 'welcome-page', :action => 'welcome_page') if has_welcome_page %>
+
   <% @plugins.dispatch(:control_panel_buttons).each do |button| %>
     <%= control_panel_button(button[:title], button[:icon], button[:url]) %>
   <% end %>
@@ -0,0 +1,21 @@
+<h1><%= _('Edit welcome page') %></h1>
+
+<%= labelled_form_for :welcome_page do |f| %>
+  <%= error_messages_for :welcome_page %>
+
+  <%= f.check_box(:published) %>
+  <div class='explanation'>
+    <%= _('Your welcome page will only be displayed if this options is selected.') %>
+  </div>
+
+  <%= f.text_area(:body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor') %>
+  <div class='explanation'>
+    <%= _('This page will be displayed to the user after his signup with this template.') %>
+  </div>
+
+  <% button_bar do%>
+    <%= submit_button('save',  _('Save'), :cancel => @back_to) %>
+  <% end %>
+<% end %>
+
+<%= render :file => 'shared/tiny_mce' %>
@@ -2,7 +2,7 @@
   <%= button :back, _('Back'), :controller => 'profile_editor' %>
   <%= button :add, _('Add members'), :action => 'add_members' if profile.enterprise? %>
   <% if profile.community? and user.has_permission?(:invite_members, profile) %>
-    <%= button :search, _('Invite your friends to join %s') % profile.short_name, :controller => 'invite', :action => 'select_address_book' %>
+    <%= button :person, _('Invite people to join'), :controller => 'invite', :action => 'invite_friends' %>
   <% end %>
   <% if profile.community? and user.has_permission?(:send_mail_to_members, profile) %>
     <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
@@ -0,0 +1,15 @@
+<div id='search-content'>
+  <% if @results %>
+    <div class='results-found-message'>
+      <%= _("%s results found") % @results.total_entries %>
+    </div>
+
+    <ul class='results-list'>
+      <% @results.sort_by { |r| r.is_image? ? 0 : 1}.each do |result| %>
+        <%= render :partial => partial_for_class(result.class), :locals => { :article => result } %>
+      <% end %>
+    </ul>
+
+    <%= pagination_links @results %>
+  <% end %>
+</div>
@@ -3,17 +3,7 @@
  
   <%= render :partial => 'shared/profile_search_form' %>
  
-  <% if @results %>
-    <div class='results-found-message'>
-      <%= _("%s results found") % @results.total_entries %>
-    </div>
+  <%= render :partial => 'results-list' %>
  
-    <ul class='results-list'>
-      <% @results.sort_by { |r| r.is_image? ? 0 : 1}.each do |result| %>
-        <%= render :partial => partial_for_class(result.class), :locals => { :article => result } %>
-      <% end %>
-    </ul>
-
-    <%= pagination_links @results %>
-  <% end %>
 </div>
+<%= javascript_include_tag 'search' %>
@@ -0,0 +1 @@
+jQuery('#search-content').html('<%= escape_javascript(render :partial => "results-list") %>');
-<% filter_label = profile.send(@filter + '_label') %>
-<% filter_label += show_date(profile.created_at) if @filter == 'more_recent' %>
+<% filter_label = profile.send(@order + '_label') %>
+<% filter_label += show_date(profile.created_at) if @order == 'more_recent' %>
 <li class="search-profile-item">
   <%= profile_image_link profile, :portrait, 'div', filter_label %>
 </li>
 <div id="search-results" class="<%= !multiple_search? ? 'only-one-result-box' : 'multiple-results-boxes' %>">
-  <% @order.each do |name| %>
+  <% @assets.each do |name| %>
     <% search = @searches[name] %>
  
     <div class="search-results-<%= name %> search-results-box <%= "search-results-empty" if search[:results].blank? %>">
@@ -2,7 +2,7 @@
   <div class="search-enterprise-item">
     <div class="search-enterprise-item-column-left">
       <%= profile_image_link enterprise, :portrait, 'div',
-        @filter == 'more_recent' ? enterprise.send(@filter + '_label') + show_date(enterprise.created_at) : enterprise.send(@filter + '_label') %>
+        @order == 'more_recent' ? enterprise.send(@order + '_label') + show_date(enterprise.created_at) : enterprise.send(@order + '_label') %>
     </div>
     <div class="search-enterprise-item-column-right">
       <%= link_to_homepage(enterprise.name, enterprise.identifier, :class => "search-result-title") %>
...	...	@@ -21,6 +21,8 @@ gem 'exception_notification', '~> 4.0.1'
21	21	gem 'gettext', '~> 2.2.1', :require => false, :group => :development
22	22	gem 'locale', '~> 2.0.5'
23	23
	24	+gem 'whenever', :require => false
	25	+
24	26	# FIXME list here all actual dependencies (i.e. the ones in debian/control),
25	27	# with their GEM names (not the Debian package names)
26	28
...	...
...	...	@@ -33,7 +33,7 @@ class RegionValidatorsController < AdminController
33	33	def load_region_and_search
34	34	@region = environment.regions.find(params[:id])
35	35	if params[:search]
36		- @search = find_by_contents(:organizations, Organization, params[:search])[:results].reject {\|item\| @region.validator_ids.include?(item.id) }
	36	+ @search = find_by_contents(:organizations, environment, Organization, params[:search])[:results].reject {\|item\| @region.validator_ids.include?(item.id) }
37	37	end
38	38	end
39	39
...	...
...	...	@@ -18,7 +18,7 @@ class UsersController < AdminController
18	18	end
19	19	scope = scope.order('name ASC')
20	20	@q = params[:q]
21		- @collection = find_by_contents(:people, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
	21	+ @collection = find_by_contents(:people, environment, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
22	22	end
23	23
24	24	def set_admin_role
...	...
...	...	@@ -183,21 +183,19 @@ class ApplicationController < ActionController::Base
183	183	end
184	184	end
185	185
186		- def find_by_contents(asset, scope, query, paginate_options={:page => 1}, options={})
187		- plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options) \|\|
188		- fallback_find_by_contents(asset, scope, query, paginate_options, options)
189		- end
	186	+ include SearchTermHelper
190	187
191		- private
	188	+ def find_by_contents(asset, context, scope, query, paginate_options={:page => 1}, options={})
	189	+ search = plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options)
	190	+ register_search_term(query, scope.count, search[:results].count, context, asset)
	191	+ search
	192	+ end
192	193
193		- def fallback_find_by_contents(asset, scope, query, paginate_options, options)
194		- scope = scope.like_search(query) unless query.blank?
195		- scope = scope.send(options[:filter]) unless options[:filter].blank?
196		- {:results => scope.paginate(paginate_options)}
	194	+ def find_suggestions(query, context, asset, options={})
	195	+ plugins.dispatch_first(:find_suggestions, query, context, asset, options)
197	196	end
198	197
199	198	def private_environment?
200	199	@environment.enabled?(:restrict_to_members)
201	200	end
202		-
203	201	end
...	...
...	...	@@ -23,6 +23,9 @@ class CmsController < MyProfileController
23	23	end
24	24
25	25	before_filter :login_required, :except => [:suggest_an_article]
	26	+ before_filter :load_recent_files, :only => [:new, :edit]
	27	+
	28	+ helper_method :file_types
26	29
27	30	protect_if :only => :upload_files do \|c, user, profile\|
28	31	article_id = c.params[:parent_id]
...	...	@@ -30,7 +33,7 @@ class CmsController < MyProfileController
30	33	(user && (user.has_permission?('post_content', profile) \|\| user.has_permission?('publish_content', profile)))
31	34	end
32	35
33		- protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish, :upload_files, :new] do \|c, user, profile\|
	36	+ protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish, :publish_on_portal_community, :publish_on_communities, :search_communities_to_publish, :upload_files, :new] do \|c, user, profile\|
34	37	user && (user.has_permission?('post_content', profile) \|\| user.has_permission?('publish_content', profile))
35	38	end
36	39
...	...	@@ -40,7 +43,7 @@ class CmsController < MyProfileController
40	43	(user && (user.has_permission?('post_content', profile) \|\| user.has_permission?('publish_content', profile)))
41	44	end
42	45
43		- protect_if :only => [:destroy, :publish] do \|c, user, profile\|
	46	+ protect_if :only => :destroy do \|c, user, profile\|
44	47	profile.articles.find(c.params[:id]).allow_post_content?(user)
45	48	end
46	49
...	...	@@ -117,7 +120,7 @@ class CmsController < MyProfileController
117	120	@success_back_to = params[:success_back_to]
118	121	# user must choose an article type first
119	122
120		- @parent = profile.articles.find(params[:parent_id]) if params && params[:parent_id]
	123	+ @parent = profile.articles.find(params[:parent_id]) if params && params[:parent_id].present?
121	124	record_coming
122	125	@type = params[:type]
123	126	if @type.blank?
...	...	@@ -163,7 +166,10 @@ class CmsController < MyProfileController
163	166	if continue
164	167	redirect_to :action => 'edit', :id => @article
165	168	else
166		- success_redirect
	169	+ respond_to do \|format\|
	170	+ format.html { success_redirect }
	171	+ format.json { render :text => {:id => @article.id, :full_name => profile.identifier + '/' + @article.full_name}.to_json }
	172	+ end
167	173	end
168	174	return
169	175	end
...	...	@@ -256,28 +262,53 @@ class CmsController < MyProfileController
256	262	render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'article' }
257	263	end
258	264
	265	+ def search_communities_to_publish
	266	+ render :text => find_by_contents(:profiles, environment, user.memberships, params['q'], {:page => 1}, {:fields => ['name']})[:results].map {\|community\| {:id => community.id, :name => community.name} }.to_json
	267	+ end
	268	+
259	269	def publish
260	270	@article = profile.articles.find(params[:id])
261	271	record_coming
262		- @groups = profile.memberships - [profile]
263		- @marked_groups = []
264		- groups_ids = profile.memberships.map{\|m\|m.id.to_s}
265		- @marked_groups = params[:marked_groups].map do \|key, item\|
266		- if groups_ids.include?(item[:group_id])
267		- item.merge :group => Profile.find(item.delete(:group_id))
	272	+ @failed = {}
	273	+ if request.post?
	274	+ article_name = params[:name]
	275	+ task = ApproveArticle.create!(:article => @article, :name => article_name, :target => user, :requestor => user)
	276	+ begin
	277	+ task.finish
	278	+ rescue Exception => ex
	279	+ @failed[ex.message] ? @failed[ex.message] << @article.name : @failed[ex.message] = [@article.name]
	280	+ task.cancel
	281	+ end
	282	+ if @failed.blank?
	283	+ session[:notice] = _("Your publish request was sent successfully")
	284	+ if @back_to
	285	+ redirect_to @back_to
	286	+ else
	287	+ redirect_to @article.view_url
	288	+ end
268	289	end
269		- end.compact unless params[:marked_groups].nil?
	290	+ end
	291	+ end
	292	+
	293	+ def publish_on_communities
270	294	if request.post?
	295	+ @back_to = params[:back_to]
	296	+ @article = profile.articles.find(params[:id])
271	297	@failed = {}
	298	+ article_name = params[:name]
	299	+ params_marked = (params['q'] \|\| '').split(',').select { \|marked\| user.memberships.map(&:id).include? marked.to_i }
	300	+ @marked_groups = Profile.find(params_marked)
272	301	if @marked_groups.empty?
	302	+ redirect_to @back_to
273	303	return session[:notice] = _("Select some group to publish your article")
274	304	end
275	305	@marked_groups.each do \|item\|
276		- task = ApproveArticle.create!(:article => @article, :name => item[:name], :target => item[:group], :requestor => profile)
	306	+ task = ApproveArticle.create!(:article => @article, :name => article_name, :target => item, :requestor => user)
277	307	begin
278		- task.finish unless item[:group].moderated_articles?
	308	+ task.finish unless item.moderated_articles?
279	309	rescue Exception => ex
280		- @failed[ex.message] ? @failed[ex.message] << item[:group].name : @failed[ex.message] = [item[:group].name]
	310	+ @failed[ex.message] ? @failed[ex.message] << item.name : @failed[ex.message] = [item.name]
	311	+ task.cancel
281	312	end
282	313	end
283	314	if @failed.blank?
...	...	@@ -287,23 +318,27 @@ class CmsController < MyProfileController
287	318	else
288	319	redirect_to @article.view_url
289	320	end
	321	+ else
	322	+ session[:notice] = _("Some of your publish requests couldn't be sent.")
	323	+ render :action => 'publish'
290	324	end
291	325	end
292	326	end
293	327
294	328	def publish_on_portal_community
295		- @article = profile.articles.find(params[:id])
296	329	if request.post?
297		- if environment.portal_community
	330	+ @article = profile.articles.find(params[:id])
	331	+ if environment.portal_enabled
298	332	task = ApproveArticle.create!(:article => @article, :name => params[:name], :target => environment.portal_community, :requestor => user)
299	333	begin
300	334	task.finish unless environment.portal_community.moderated_articles?
301		- flash[:notice] = _("Your publish request was sent successfully")
	335	+ session[:notice] = _("Your publish request was sent successfully")
302	336	rescue
303		- flash[:error] = _("Your publish request couldn't be sent.")
	337	+ session[:notice] = _("Your publish request couldn't be sent.")
	338	+ task.cancel
304	339	end
305	340	else
306		- flash[:notice] = _("There is no portal community to publish your article.")
	341	+ session[:notice] = _("There is no portal community to publish your article.")
307	342	end
308	343
309	344	if @back_to
...	...	@@ -331,7 +366,7 @@ class CmsController < MyProfileController
331	366
332	367	def search
333	368	query = params[:q]
334		- results = find_by_contents(:uploaded_files, profile.files.published, query)[:results]
	369	+ results = find_by_contents(:uploaded_files, profile, profile.files.published, query)[:results]
335	370	render :text => article_list_to_json(results), :content_type => 'application/json'
336	371	end
337	372
...	...	@@ -342,15 +377,26 @@ class CmsController < MyProfileController
342	377	end
343	378
344	379	def media_upload
345		- files_uploaded = []
346	380	parent = check_parent(params[:parent_id])
347		- files = [:file1,:file2, :file3].map { \|f\| params[f] }.compact
348	381	if request.post?
349		- files.each do \|file\|
350		- files_uploaded << UploadedFile.create(:uploaded_data => file, :profile => profile, :parent => parent) unless file == ''
	382	+ begin
	383	+ @file = UploadedFile.create!(:uploaded_data => params[:file], :profile => profile, :parent => parent) unless params[:file] == ''
	384	+ @file = FilePresenter.for(@file)
	385	+ rescue Exception => exception
	386	+ render :text => exception.to_s, :status => :bad_request
351	387	end
352	388	end
353		- render :text => article_list_to_json(files_uploaded), :content_type => 'text/plain'
	389	+ end
	390	+
	391	+ def published_media_items
	392	+ load_recent_files(params[:parent_id], params[:q])
	393	+ render :partial => 'published_media_items'
	394	+ end
	395	+
	396	+ def view_all_media
	397	+ paginate_options = {:page => params[:page].blank? ? 1 : params[:page] }
	398	+ @key = params[:key].to_sym
	399	+ load_recent_files(params[:parent_id], params[:q], paginate_options)
354	400	end
355	401
356	402	protected
...	...	@@ -445,4 +491,36 @@ class CmsController < MyProfileController
445	491	end
446	492	end
447	493
	494	+ def file_types
	495	+ {:images => _('Images'), :generics => _('Files')}
	496	+ end
	497	+
	498	+ def load_recent_files(parent_id = nil, q = nil, paginate_options = {:page => 1, :per_page => 6})
	499	+ #TODO Since we only have special support for images, I'm limiting myself to
	500	+ # consider generic files as non-images. In the future, with more supported
	501	+ # file types we'll need to have a smart way to fetch from the database
	502	+ # scopes of each supported type as well as the non-supported types as a
	503	+ # whole.
	504	+ @recent_files = {}
	505	+
	506	+ parent = parent_id.present? ? profile.articles.find(parent_id) : nil
	507	+ if parent.present?
	508	+ files = parent.children.files
	509	+ else
	510	+ files = profile.files
	511	+ end
	512	+
	513	+ files = files.reorder('created_at DESC')
	514	+ images = files.images
	515	+ generics = files.no_images
	516	+
	517	+ if q.present?
	518	+ @recent_files[:images] = find_by_contents(:images, profile, images, q, paginate_options)[:results]
	519	+ @recent_files[:generics] = find_by_contents(:generics, profile, generics, q, paginate_options)[:results]
	520	+ else
	521	+ @recent_files[:images] = images.paginate(paginate_options)
	522	+ @recent_files[:generics] = generics.paginate(paginate_options)
	523	+ end
	524	+ end
	525	+
448	526	end
...	...
...	...	@@ -3,6 +3,7 @@ class FriendsController < MyProfileController
3	3	protect 'manage_friends', :profile
4	4
5	5	def index
	6	+ @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)
6	7	if is_cache_expired?(profile.manage_friends_cache_key(params))
7	8	@friends = profile.friends.paginate(:per_page => per_page, :page => params[:npage])
8	9	end
...	...	@@ -16,6 +17,30 @@ class FriendsController < MyProfileController
16	17	end
17	18	end
18	19
	20	+ def suggest
	21	+ @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)
	22	+ end
	23	+
	24	+ def remove_suggestion
	25	+ @person = profile.suggested_people.find_by_identifier(params[:id])
	26	+ redirect_to :action => 'suggest' unless @person
	27	+ if @person && request.post?
	28	+ profile.remove_suggestion(@person)
	29	+ @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)
	30	+ render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :friends_suggestions, :per_page => params[:per_page] \|\| per_page }
	31	+ end
	32	+ end
	33	+
	34	+ def connections
	35	+ @suggestion = profile.profile_suggestions.of_person.enabled.find_by_suggestion_id(params[:id])
	36	+ if @suggestion
	37	+ @tags = @suggestion.tag_connections
	38	+ @profiles = @suggestion.profile_connections
	39	+ else
	40	+ redirect_to :action => 'suggest'
	41	+ end
	42	+ end
	43	+
19	44	protected
20	45
21	46	class << self
...	...
...	...	@@ -20,12 +20,54 @@ class MembershipsController < MyProfileController
20	20	@community.environment = environment
21	21	@back_to = params[:back_to] \|\| url_for(:action => 'index')
22	22	if request.post? && @community.valid?
23		- @community = Community.create_after_moderation(user, params[:community].merge({:environment => environment}))
24		- if @community.new_record?
	23	+ begin
	24	+ # Community was created
	25	+ @community = Community.create_after_moderation(user, params[:community].merge({:environment => environment}))
	26	+ @community.reload
	27	+ redirect_to :action => 'welcome', :community_id => @community.id, :back_to => @back_to
	28	+ rescue ActiveRecord::RecordNotFound
	29	+ # Community pending approval
25	30	session[:notice] = _('Your new community creation request will be evaluated by an administrator. You will be notified.')
	31	+ redirect_to @back_to
26	32	end
27		- redirect_to @back_to
28	33	return
29	34	end
30	35	end
	36	+
	37	+ def welcome
	38	+ @community = Community.find(params[:community_id])
	39	+ @back_to = params[:back_to]
	40	+ end
	41	+
	42	+ def suggest
	43	+ @suggestions = profile.profile_suggestions.of_community.enabled.includes(:suggestion).limit(per_page)
	44	+ end
	45	+
	46	+ def remove_suggestion
	47	+ @community = profile.suggested_communities.find_by_identifier(params[:id])
	48	+ custom_per_page = params[:per_page] \|\| per_page
	49	+ redirect_to :action => 'suggest' unless @community
	50	+ if @community && request.post?
	51	+ profile.remove_suggestion(@community)
	52	+ @suggestions = profile.profile_suggestions.of_community.enabled.includes(:suggestion).limit(custom_per_page)
	53	+ render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :communities_suggestions, :per_page => custom_per_page}
	54	+ end
	55	+ end
	56	+
	57	+ def connections
	58	+ @suggestion = profile.profile_suggestions.of_community.enabled.find_by_suggestion_id(params[:id])
	59	+ if @suggestion
	60	+ @tags = @suggestion.tag_connections
	61	+ @profiles = @suggestion.profile_connections
	62	+ else
	63	+ redirect_to :action => 'suggest'
	64	+ end
	65	+ end
	66	+
	67	+ protected
	68	+
	69	+ def per_page
	70	+ 12
	71	+ end
	72	+
31	73	end
...	...
...	...	@@ -3,6 +3,10 @@ class ProfileEditorController < MyProfileController
3	3	protect 'edit_profile', :profile, :except => [:destroy_profile]
4	4	protect 'destroy_profile', :profile, :only => [:destroy_profile]
5	5
	6	+ before_filter :access_welcome_page, :only => [:welcome_page]
	7	+ before_filter :back_to
	8	+ helper_method :has_welcome_page
	9	+
6	10	def index
7	11	@pending_tasks = Task.to(profile).pending.without_spam.select{\|i\| user.has_permission?(i.permission, profile)}
8	12	end
...	...	@@ -85,6 +89,21 @@ class ProfileEditorController < MyProfileController
85	89	end
86	90	end
87	91
	92	+ def welcome_page
	93	+ @welcome_page = profile.welcome_page \|\| TinyMceArticle.new(:name => 'Welcome Page', :profile => profile, :published => false)
	94	+ if request.post?
	95	+ begin
	96	+ @welcome_page.update_attributes!(params[:welcome_page])
	97	+ profile.welcome_page = @welcome_page
	98	+ profile.save!
	99	+ session[:notice] = _('Welcome page saved successfully.')
	100	+ redirect_to :action => 'index'
	101	+ rescue Exception => exception
	102	+ session[:notice] = _('Welcome page could not be saved.')
	103	+ end
	104	+ end
	105	+ end
	106	+
88	107	def deactivate_profile
89	108	if environment.admins.include?(current_person)
90	109	profile = environment.profiles.find(params[:id])
...	...	@@ -116,9 +135,24 @@ class ProfileEditorController < MyProfileController
116	135	protected
117	136
118	137	def redirect_to_previous_location
119		- back = request.referer
120		- back = "/" if back.nil?
	138	+ redirect_to @back_to
	139	+ end
121	140
122		- redirect_to back
	141	+ #TODO Consider using this as a general controller feature to be available on every action.
	142	+ def back_to
	143	+ @back_to = params[:back_to] \|\| request.referer \|\| "/"
123	144	end
	145	+
	146	+ private
	147	+
	148	+ def has_welcome_page
	149	+ profile.is_template
	150	+ end
	151	+
	152	+ def access_welcome_page
	153	+ unless has_welcome_page
	154	+ render_access_denied
	155	+ end
	156	+ end
	157	+
124	158	end
...	...
...	...	@@ -82,10 +82,12 @@ class AccountController < ApplicationController
82	82	if @plugins.dispatch(:allow_user_registration).include?(false)
83	83	redirect_back_or_default(:controller => 'home')
84	84	session[:notice] = _("This environment doesn't allow user registration.")
	85	+ return
85	86	end
86	87
87	88	store_location(request.referer) unless params[:return_to] or session[:return_to]
88	89
	90	+ # Tranforming to boolean
89	91	@block_bot = !!session[:may_be_a_bot]
90	92	@invitation_code = params[:invitation_code]
91	93	begin
...	...	@@ -129,8 +131,8 @@ class AccountController < ApplicationController
129	131	check_join_in_community(@user)
130	132	go_to_signup_initial_page
131	133	else
	134	+ redirect_to :controller => :home, :action => :welcome, :template_id => (@user.person.template && @user.person.template.id)
132	135	session[:notice] = _('Thanks for registering!')
133		- @register_pending = true
134	136	end
135	137	end
136	138	end
...	...	@@ -461,6 +463,8 @@ class AccountController < ApplicationController
461	463	redirect_to user.url
462	464	when 'user_control_panel'
463	465	redirect_to user.admin_url
	466	+ when 'welcome_page'
	467	+ redirect_to :controller => :home, :action => :welcome, :template_id => (user.template && user.template.id)
464	468	else
465	469	redirect_back_or_default(default)
466	470	end
...	...
...	...	@@ -18,4 +18,10 @@ class HomeController < PublicController
18	18	@no_design_blocks = true
19	19	end
20	20
	21	+ def welcome
	22	+ @no_design_blocks = true
	23	+ @display_confirmation_tips = !user.present? && !environment.enabled?(:skip_new_user_email_confirmation)
	24	+ @person_template = user && user.template \|\| params[:template_id] && Person.find(params[:template_id])
	25	+ end
	26	+
21	27	end
...	...