Merge branch 'master' into AI2371

Conflicts: app/controllers/my_profile/cms_controller.rb

Merge branch 'master' into AI2371
Conflicts: app/controllers/my_profile/cms_controller.rb
Antonio Terceiro
2 parents 2c2aa084 824e34a2
Showing 571 changed files with 133905 additions and 22540 deletions Show diff stats
HACKING
INSTALL
Rakefile
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/maps_controller.rb
app/controllers/public/browse_controller.rb
app/controllers/public/map_balloon_controller.rb
app/controllers/public/profile_controller.rb
app/controllers/public/profile_search_controller.rb
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/helpers/display_helper.rb
app/helpers/forum_helper.rb
app/helpers/lightbox_helper.rb
app/helpers/manage_products_helper.rb
app/helpers/product_category_viewer_helper.rb
app/helpers/search_helper.rb
app/models/action_tracker_notification.rb
app/models/article.rb
app/models/blog.rb
@@ -40,6 +40,8 @@ commands and make sure you understand what you are doing):
  cp config/database.yml.sqlite3 config/database.yml
  # create tmp directory if it doesn't exist
  mkdir tmp
+ # start Solr
+ rake solr:start
  # create the development database
  rake db:schema:load
  # run pending migrations
@@ -13,8 +13,7 @@ You need to install some packages Noosfero depends on.  On Debian GNU/Linux or
 Debian-based systems, all of these packages are available through the Debian
 archive. You can install them with the following command:
  
- # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libwill-paginate-ruby iso-codes libfeedparser-ruby libferret-ruby libdaemons-ruby thin tango-icon-theme libhpricot-ruby
-
+ # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libwill-paginate-ruby iso-codes libfeedparser-ruby openjdk-6-jre libdaemons-ruby thin tango-icon-theme libhpricot-ruby
  
 On other systems, they may or may not be available through your regular package
 management system. Below are the links to their homepages.
@@ -24,7 +23,7 @@ management system. Below are the links to their homepages.
 * po4a: http://po4a.alioth.debian.org/
 * Ruby-sqlite3: http://rubyforge.org/projects/sqlite-ruby
 * rcov: http://eigenclass.org/hiki/rcov
-* Ferret: http://ferret.davebalmain.com/trac
+* Solr: http://lucene.apache.org/solr
 * RMagick: http://rmagick.rubyforge.org/
 * RedCloth: http://redcloth.org/
 * will_paginate: http://github.com/mislav/will_paginate/wikis
@@ -104,7 +103,7 @@ $ tar -zxvf noosfero-0.35.0.tar.gz
 $ ln -s noosfero-0.35.0 current
 $ cd current
  
-Copy config/ferret_server.yml.dist to config/ferret_server.yml. You will
+Copy config/solr.yml.dist to config/solr.yml. You will
 probably not need to customize this configuration, but have a look at it.
  
 Create the thin configuration file:
@@ -242,6 +241,10 @@ Compile the translations:
  
 $ RAILS_ENV=production rake noosfero:translations:compile
  
+Run Solr:
+
+$ rake solr:start
+
 Now we have to create some initial data. To create your default environment
 (the first one), run the command below:
  
@@ -7,4 +7,6 @@ require &#39;rake&#39;
 require 'rake/testtask'
 require 'rake/rdoctask'
  
+ACTS_AS_SEARCHABLE_ENABLED = false if Rake.application.top_level_tasks.detect{|t| t == 'db:data:minimal'}
+
 require 'tasks/rails'
@@ -265,9 +265,10 @@ class CmsController &lt; MyProfileController
  
   def search
     query = params[:q]
-    results = query.blank? ? [] : profile.files.published.find_by_contents(query)
+    results = query.blank? ? [] : profile.files.published.find_by_contents(query)[:results]
     render :text => article_list_to_json(results), :content_type => 'application/json'
   end
+
   def media_upload
     files_uploaded = []
     parent = check_parent(params[:parent_id])
@@ -6,16 +6,48 @@ class MapsController &lt; MyProfileController
     @profile_data = profile
     if request.post?
       begin
+        country = params[:profile_data][:country]
+        city = params[:profile_data][:city]
+        state = params[:profile_data][:state]
+        nregion = NationalRegion.validate!(city, state, country)
+        unless nregion.blank?
+          params[:profile_data][:national_region_code] = nregion.national_region_code
+        end
+
         Profile.transaction do
           if profile.update_attributes!(params[:profile_data])
             session[:notice] = _('Address was updated successfully!')
             redirect_to :action => 'edit_location'
           end
         end
-      rescue
-        flash[:error] = _('Address could not be saved.')
+      rescue Exception => exc
+        flash[:error] = exc.message
       end
     end
   end
  
+  def google_map
+    render :partial => 'google_map.js'
+  end
+
+  def search_city
+
+    term = params[:term];
+
+    regions = NationalRegion.search_city(term + "%", true).map {|r|{ :label => r.city , :category => r.state}}
+
+    render :json => regions
+
+  end
+
+  def search_state
+
+    term = params[:term];
+
+    regions = NationalRegion.search_state(term + "%", true).map {|r|{ :label => r.state}}
+
+    render :json => regions
+
+  end
+
 end
@@ -1,77 +0,0 @@
-class BrowseController < PublicController
-
-  no_design_blocks
-
-  FILTERS = %w(
-    more_recent
-    more_active
-    more_popular
-    more_comments
-    more_views
-  )
-
-  def per_page
-    27
-  end
-
-  def people
-    @filter = filter
-    @title = self.filter_description(params[:action] + '_' + @filter )
-
-    @results = @environment.people.visible.send(@filter)
-
-    if !params[:query].blank?
-      @results = @results.find_by_contents(params[:query])
-    end
-    @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
-  end
-
-  def communities
-    @filter = filter
-    @title = self.filter_description(params[:action] + '_' + @filter )
-
-    @results = @environment.communities.visible.send(@filter)
-
-    if !params[:query].blank?
-      @results = @results.find_by_contents(params[:query])
-    end
-    @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
-  end
-
-  def contents
-    @filter = filter
-    @title = self.filter_description(params[:action] + '_' + @filter )
-
-    @results = @environment.articles.published.text_articles.send(@filter)
-
-    if !params[:query].blank?
-      @results = @results.find_by_contents(params[:query])
-    end
-    @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
-  end
-
-  protected
-
-  def filter
-    if FILTERS.include?(params[:filter])
-      params[:filter]
-    else
-      'more_recent'
-    end
-  end
-
-  def filter_description(str)
-    {
-      'people_more_recent' => _('More recent people'),
-      'people_more_active' => _('More active people'),
-      'people_more_popular' => _('More popular people'),
-      'communities_more_recent' => _('More recent communities'),  
-      'communities_more_active' => _('More active communities'),  
-      'communities_more_popular' => _('More popular communities'),
-      'contents_more_recent' => _('More recent contents'),
-      'contents_more_views' => _('Most viewed contents'),
-      'contents_more_comments' => _('Most commented contents'),
-    }[str] || str
-  end
-
-end
@@ -0,0 +1,30 @@
+class MapBalloonController < PublicController
+
+  helper SearchHelper
+
+  before_filter :load_profile, :only => [:person, :enterprise, :community]
+
+  def product
+    @product = Product.find(params[:id])
+    render :action => 'product', :layout => false
+  end
+
+  def person
+    render :action => 'profile', :layout => false
+  end
+
+  def enterprise
+    render :action => 'profile', :layout => false
+  end
+
+  def community
+    render :action => 'profile', :layout => false
+  end
+
+  protected
+
+  def load_profile
+    @profile = Profile.find(params[:id])
+  end
+
+end
@@ -3,17 +3,15 @@ class ProfileController &lt; PublicController
   needs_profile
   before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
   before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse]
-  before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_scraps, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report]
+  before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity]
  
   helper TagsHelper
  
   def index
-    @activities = @profile.tracked_actions.paginate(:per_page => 30, :page => params[:page])
-    @wall_items = []
-    @network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page]) : []
+    @network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) : []
     if logged_in? && current_person.follows?(@profile)
-      @network_activities = @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page]) if @network_activities.empty?
-      @wall_items = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page])
+      @network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) if @network_activities.empty?
+      @activities = @profile.activities.paginate(:per_page => 15, :page => params[:page])
     end
     @tags = profile.article_tags
     unless profile.display_info_to?(user)
@@ -180,22 +178,33 @@ class ProfileController &lt; PublicController
     @scrap.receiver= receiver
     @tab_action = params[:tab_action]
     @message = @scrap.save ? _("Message successfully sent.") : _("You can't leave an empty message.")
-    @scraps = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page]) if params[:not_load_scraps].nil?
-    render :partial => 'leave_scrap'
+    activities = @profile.activities.paginate(:per_page => 15, :page => params[:page]) if params[:not_load_scraps].nil?
+    render :partial => 'profile_activities_list', :locals => {:activities => activities}
   end
  
-  def view_more_scraps
-    @scraps = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page])
-    render :partial => 'profile_scraps', :locals => {:scraps => @scraps}
+  def leave_comment_on_activity
+    @comment = Comment.new(params[:comment])
+    @comment.author = user
+    @activity = ActionTracker::Record.find(params[:source_id])
+    @comment.source_type, @comment.source_id = (@activity.target_type == 'Article' ? ['Article', @activity.target_id] : [@activity.class.to_s, @activity.id])
+    @tab_action = params[:tab_action]
+    @message = @comment.save ? _("Comment successfully added.") : _("You can't leave an empty comment.")
+    if @tab_action == 'wall'
+      activities = @profile.activities.paginate(:per_page => 15, :page => params[:page]) if params[:not_load_scraps].nil?
+      render :partial => 'profile_activities_list', :locals => {:activities => activities}
+    else
+      network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page])
+      render :partial => 'profile_network_activities', :locals => {:network_activities => network_activities}
+    end
   end
  
   def view_more_activities
-    @activities = @profile.tracked_actions.paginate(:per_page => 30, :page => params[:page])
-    render :partial => 'profile_activities', :locals => {:activities => @activities}
+    @activities = @profile.activities.paginate(:per_page => 10, :page => params[:page])
+    render :partial => 'profile_activities_list', :locals => {:activities => @activities}
   end
  
   def view_more_network_activities
-    @activities = @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page]) 
+    @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page]) 
     render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}
   end
  
@@ -213,7 +222,11 @@ class ProfileController &lt; PublicController
     begin
       raise if !can_edit_profile
       activity = ActionTracker::Record.find(params[:activity_id])
-      activity.destroy
+      if params[:only_hide]
+        activity.update_attribute(:visible, false)
+      else
+        activity.destroy
+      end
       render :text => _('Activity successfully removed.')
     rescue
       render :text => _('You could not remove this activity')
@@ -285,6 +298,16 @@ class ProfileController &lt; PublicController
     end
   end
  
+  def remove_comment
+    #FIXME Check whether these permissions are enough
+    @comment = Comment.find(params[:comment_id])
+    if (user == @comment.author || user == profile || user.has_permission?(:moderate_comments, profile))
+      @comment.destroy
+      session[:notice] = _('Comment successfully deleted')
+    end
+    redirect_to :action => :index
+  end
+
   protected
  
   def check_access_to_profile
@@ -8,11 +8,10 @@ class ProfileSearchController &lt; PublicController
   def index
     @q = params[:q]
     unless @q.blank?
-      @filtered_query = remove_stop_words(@q)
       if params[:where] == 'environment'
         redirect_to :controller => 'search', :query => @q
       else
-        @results = profile.articles.published.find_by_contents(@filtered_query).paginate(:per_page => 10, :page => params[:page])
+        @results = profile.articles.published.find_by_contents(@q, {:per_page => 10, :page => params[:page]})[:results]
       end
     end
   end
 class SearchController < PublicController
  
   helper TagsHelper
+  include SearchHelper
+  include ActionView::Helpers::NumberHelper
  
   before_filter :load_category
-  before_filter :prepare_filter
-  before_filter :check_search_whole_site
   before_filter :load_search_assets
-  before_filter :check_valid_assets, :only => [ :assets ]
+  before_filter :load_query
  
   no_design_blocks
  
-  protected
+  def facets_browse
+    @asset = params[:asset]
+    @asset_class = asset_class(@asset)
  
-  def load_search_assets
-    @search_in = where_to_search
-    @searching = {}
-    @search_in.each do |key, name|
-      @searching[key] = (params[:asset].blank? && (params[:find_in].nil? || params[:find_in].empty? || params[:find_in].include?(key.to_s))) || (params[:asset] == key.to_s)
-    end
+    @facets_only = true
+    send(@asset)
+
+    @facet = @asset_class.map_facets_for(environment).find { |facet| facet[:id] == params[:facet_id] }
+    raise 'Facet not found' if @facet.nil?
+
+    render :layout => false
   end
  
-  def prepare_filter
-    if @category
-      @noosfero_finder = CategoryFinder.new(@category)
+  def articles
+    if !@empty_query
+      full_text_search ['public:true']
     else
-      @noosfero_finder = EnvironmentFinder.new(@environment)
+      @results[@asset] = @environment.articles.public.send(@filter).paginate(paginate_options)
     end
   end
  
-  def check_search_whole_site
-    if params[:search_whole_site_yes] or params[:search_whole_site] == 'yes'
-      redirect_to params.merge(:category_path => [], :search_whole_site => nil, :search_whole_site_yes => nil)
-    end
+  def contents
+    redirect_to params.merge(:action => :articles)
   end
  
-  def check_valid_assets
-    @asset = params[:asset].to_sym
-    if !where_to_search.map(&:first).include?(@asset)
-      render :text => 'go away', :status => 403
-      return
+  def people
+    if !@empty_query
+      full_text_search ['public:true']
+    else
+      @results[@asset] = @environment.people.visible.send(@filter).paginate(paginate_options)
     end
   end
  
-  def events
-    @category_id = @category ? @category.id : nil
-
-    @selected_day = nil
-    @events_of_the_day = []
-    date = build_date(params[:year], params[:month], params[:day])
-
-    if params[:day] || !params[:year] && !params[:month]
-      @selected_day = date
-      if @category_id and Category.exists?(@category_id)
-        @events_of_the_day = environment.events.by_day(@selected_day).in_category(Category.find(@category_id))
+  def products
+    public_filters = ['public:true', 'enabled:true']
+    if !@empty_query
+      full_text_search public_filters
+    else
+      @one_page = true
+      @geosearch = logged_in? && current_user.person.lat && current_user.person.lng
+
+      extra_limit = LIST_SEARCH_LIMIT*5
+      sql_options = {:limit => LIST_SEARCH_LIMIT, :order => 'random()'}
+      if @geosearch
+        full_text_search public_filters, :sql_options => sql_options, :extra_limit => extra_limit,
+          :alternate_query => "{!boost b=recip(geodist(),#{"%e" % (1.to_f/DistBoost)},1,1)}",
+          :radius => DistFilt, :latitude => current_user.person.lat, :longitude => current_user.person.lng
       else
-        @events_of_the_day = environment.events.by_day(@selected_day)
+        full_text_search public_filters, :sql_options => sql_options, :extra_limit => extra_limit,
+          :boost_functions => ['recip(ms(NOW/HOUR,updated_at),1.3e-10,1,1)']
       end
     end
-
-    events = @results[:events]
-
-    @calendar = populate_calendar(date, events)
-    @previous_calendar = populate_calendar(date - 1.month, events)
-    @next_calendar = populate_calendar(date + 1.month, events)
   end
  
-  def people
-    #nothing, just to enable
-  end
   def enterprises
-    load_product_categories_menu(:enterprises)
-    @categories_menu = true
-  end
-  def communities
-    #nothing, just to enable
-  end
-  def articles
-    #nothins, just to enable
-  end
-
-  def products
-    load_product_categories_menu(:products)
-    @categories_menu = true
+    if !@empty_query
+      full_text_search ['public:true']
+    else
+      @filter_title = _('Enterprises from network')
+      @results[@asset] = @environment.enterprises.visible.paginate(paginate_options)
+    end
   end
  
-  def load_product_categories_menu(asset)
-    @results[asset].uniq!
-    # REFACTOR DUPLICATED CODE inner loop doing the same thing that outter loop
-
-    if !@query.blank? || @region && !params[:radius].blank?
-      @result_ids = @noosfero_finder.find(asset, @filtered_query, calculate_find_options(asset, nil, params[:page], @product_category, @region, params[:radius], params[:year], params[:month]).merge({:limit => :all}))
+  def communities
+    if !@empty_query
+      full_text_search ['public:true']
+    else
+      @results[@asset] = @environment.communities.visible.send(@filter).paginate(paginate_options)
     end
-
   end
  
-  def calculate_find_options(asset, limit, page, product_category, region, radius, year, month)
-    result = { :product_category => product_category, :per_page => limit, :page => page }
-    if [:enterprises, :people, :products].include?(asset) && region
-      result.merge!(:within => radius, :region => region.id)
-    end
+  def events
+    year = (params[:year] ? params[:year].to_i : Date.today.year)
+    month = (params[:month] ? params[:month].to_i : Date.today.month)
+    day = (params[:day] ? params[:day].to_i : Date.today.day)
+    date = build_date(params[:year], params[:month], params[:day])
+    date_range = (date - 1.month)..(date + 1.month).at_end_of_month
  
-    if month || year
-      date = Date.new(year.to_i, month.to_i, 1)
-      result[:date_range] = (date - 1.month)..(date + 1.month).at_end_of_month
+    @selected_day = nil
+    @events_of_the_day = []
+    if params[:day] || !params[:year] && !params[:month]
+      @selected_day = date
+      @events_of_the_day = @category ?
+        environment.events.by_day(@selected_day).in_category(Category.find(@category_id)) :
+        environment.events.by_day(@selected_day)
     end
  
-    result
-  end
-
-  # limit the number of results per page
-  # TODO: dont hardcore like this
-  def limit
-    searching = @searching.values.select{|v|v}
-    if params[:display] == 'map'
-      2000
+    if !@empty_query
+      full_text_search
     else
-      (searching.size == 1) ? 20 : 6
+      @results[@asset] = date_range ? environment.events.by_range(date_range) : environment.events
     end
-  end
-
-  public
-
-  include SearchHelper
-
-  ######################################################
-
-  def where_to_search
-    [
-      [ :articles, N_('Articles') ],
-      [ :enterprises, N_('Enterprises') ],
-      [ :people, N_('People') ],
-      [ :communities, N_('Communities') ],
-      [ :products, N_('Products') ],
-      [ :events, N_('Events') ]
-    ].select {|key, name| !environment.enabled?('disable_asset_' + key.to_s) }
-  end
  
-  def cities
-    @cities = City.find(:all, :order => 'name', :conditions => ['parent_id = ? and lat is not null and lng is not null', params[:state_id]])
-    render :action => 'cities', :layout => false
-  end
-  
-  def complete_region
-    # FIXME this logic should be in the model
-    @regions = Region.find(:all, :conditions => [ '(name like ? or name like ?) and lat is not null and lng is not null', '%' + params[:region][:name] + '%', '%' + params[:region][:name].capitalize + '%' ])
-    render :action => 'complete_region', :layout => false
+    events = @results[@asset]
+    @calendar = populate_calendar(date, events)
+    @previous_calendar = populate_calendar(date - 1.month, events)
+    @next_calendar = populate_calendar(date + 1.month, events)
   end
  
   def index
-    @query = params[:query] || ''
-    @filtered_query = remove_stop_words(@query)
-    @product_category = ProductCategory.find(params[:product_category]) if params[:product_category]
-
-    @region = City.find_by_id(params[:city]) if !params[:city].blank? && params[:city] =~ /^\d+$/
-
-    # how many assets we are searching for?
-    number_of_result_assets = @searching.values.select{|v| v}.size
-
     @results = {}
     @order = []
     @names = {}
+    @results_only = true
  
-    where_to_search.select { |key,description| @searching[key]  }.each do |key, description|
+    @enabled_searches.select { |key,description| @searching[key] }.each do |key, description|
+      load_query
+      @asset = key
+      send(key)
       @order << key
-      @results[key] = @noosfero_finder.find(key, @filtered_query, calculate_find_options(key, limit, params[:page], @product_category, @region, params[:radius], params[:year], params[:month]))
       @names[key] = getterm(description)
     end
+    @asset = nil
+    @facets = {}
  
-    if @results.keys.size == 1
-      specific_action = @results.keys.first
-      if respond_to?(specific_action)
-        @asset_name = getterm(@names[@results.keys.first])
-        send(specific_action)
-        render :action => specific_action
-        return
-      end
-    end
-
-    render :action => 'index'
+    render :action => @results.keys.first if @results.keys.size == 1
   end
  
-  alias :assets :index
-
-  #######################################################
+  # keep old URLs workings
+  def assets
+    params[:action] = params[:asset].is_a?(Array) ? :index : params.delete(:asset)
+    redirect_to params
+  end
  
   # view the summary of one category
   def category_index
     @results = {}
     @order = []
     @names = {}
+    limit = MULTIPLE_SEARCH_LIMIT
     [
-      [ :people, _('People'), @noosfero_finder.recent('people', limit) ],
-      [ :enterprises, __('Enterprises'), @noosfero_finder.recent('enterprises', limit) ],
-      [ :products, _('Products'), @noosfero_finder.recent('products', limit) ],
-      [ :events, _('Upcoming events'), @noosfero_finder.upcoming_events({:per_page => limit}) ],
-      [ :communities, __('Communities'), @noosfero_finder.recent('communities', limit) ],
-      [ :most_commented_articles, _('Most commented articles'), @noosfero_finder.most_commented_articles(limit) ],
-      [ :articles, _('Articles'), @noosfero_finder.recent('text_articles', limit) ]
-    ].each do |key, name, list|
-      @order << key
-      @results[key] = list
-      @names[key] = name
+      [ :people, _('People'), :recent_people ],
+      [ :enterprises, _('Enterprises'), :recent_enterprises ],
+      [ :products, _('Products'), :recent_products ],
+      [ :events, _('Upcoming events'), :upcoming_events ],
+      [ :communities, _('Communities'), :recent_communities ],
+      [ :articles, _('Contents'), :recent_articles ]
+    ].each do |asset, name, filter|
+      @order << asset
+      @results[asset] = @category.send(filter, limit)
+      raise "No total_entries for: #{asset}" unless @results[asset].respond_to?(:total_entries)
+      @names[asset] = name
     end
   end
-  attr_reader :category
  
   def tags
     @tags_cache_key = "tags_env_#{environment.id.to_s}"
@@ -216,25 +166,137 @@ class SearchController &lt; PublicController
     @tag = params[:tag]
     @tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_env_#{environment.id.to_s}_page_#{params[:npage]}"
     if is_cache_expired?(@tag_cache_key)
-      @tagged = environment.articles.find_tagged_with(@tag).paginate(:per_page => 10, :page => params[:npage])
+      @results[@asset] = environment.articles.find_tagged_with(@tag).paginate(paginate_options)
     end
   end
  
+  def events_by_day
+    @selected_day = build_date(params[:year], params[:month], params[:day])
+    @events_of_the_day = environment.events.by_day(@selected_day)
+    render :partial => 'events/events_by_day'
+  end
+
   #######################################################
+  protected
+
+  def load_query
+    @asset = params[:action].to_sym
+    @order ||= [@asset]
+    @results ||= {}
+    @filter = filter
+    @filter_title = filter_description(@asset, @filter)
  
-  def popup
-    @regions = Region.find(:all).select{|r|r.lat && r.lng}
-    render :action => 'popup', :layout => false
+    @query = params[:query] || ''
+    @empty_query = @category.nil? && @query.blank?
   end
  
-  def events_by_day
-    @selected_day = build_date(params[:year], params[:month], params[:day])
-    if params[:category_id] and Category.exists?(params[:category_id])
-      @events_of_the_day = environment.events.by_day(@selected_day).in_category(Category.find(params[:category_id]))
+  def load_category
+    if params[:category_path].blank?
+      render_not_found if params[:action] == 'category_index'
     else
-      @events_of_the_day = environment.events.by_day(@selected_day)
+      path = params[:category_path].join('/')
+      @category = environment.categories.find_by_path(path)
+      if @category.nil?
+        render_not_found(path)
+      else
+        @category_id = @category.id
+      end
     end
-    render :partial => 'events/events_by_day'
+  end
+
+  FILTERS = %w(
+    more_recent
+    more_active
+    more_popular
+  )
+  def filter
+    if FILTERS.include?(params[:filter])
+      params[:filter]
+    else
+      'more_recent'
+    end
+  end
+
+  def filter_description(asset, filter)
+    {
+      'articles_more_recent' => _('More recent contents from network'),
+      'articles_more_popular' => _('More viewed 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'),
+      'products_more_recent' => _('Highlights'),
+    }[asset.to_s + '_' + filter]
+  end
+
+  def load_search_assets
+    if Searches.keys.include?(params[:action].to_sym) and environment.enabled?("disable_asset_#{params[:action]}")
+      render_not_found
+      return
+    end
+
+    @enabled_searches = Searches.select {|key, name| environment.disabled?("disable_asset_#{params[:action]}") }
+    @searching = {}
+    @titles = {}
+    @enabled_searches.each do |key, name|
+      @titles[key] = name
+      @searching[key] = params[:action] == 'index' || params[:action] == key.to_s
+    end
+    @names = @titles if @names.nil?
+  end
+
+  def limit
+    searching = @searching.values.select{ |v| v }
+    if params[:display] == 'map'
+      MAP_SEARCH_LIMIT
+    elsif searching.size <= 1
+      if [:people, :communities].include? @asset
+        BLOCKS_SEARCH_LIMIT
+      elsif @asset == :enterprises and @empty_query
+        BLOCKS_SEARCH_LIMIT
+      else
+        LIST_SEARCH_LIMIT
+      end
+    else
+      MULTIPLE_SEARCH_LIMIT
+    end
+  end
+
+  def paginate_options(page = params[:page])
+    { :per_page => limit, :page => page }
+  end
+
+  def full_text_search(filters = [], options = {})
+    paginate_options = paginate_options(params[:page])
+    asset_class = asset_class(@asset)
+
+    solr_options = options
+    if !@results_only and asset_class.respond_to? :facets
+      solr_options.merge! asset_class.facets_find_options(params[:facet])
+      solr_options[:all_facets] = true
+      solr_options[:limit] = 0 if @facets_only
+    end
+    solr_options[:filter_queries] ||= []
+    solr_options[:filter_queries] += filters
+    solr_options[:filter_queries] << "environment_id:#{environment.id}"
+    solr_options[:filter_queries] << asset_class.facet_category_query.call(@category) if @category
+
+    solr_options[:boost_functions] ||= []
+    params[:order_by] = nil if params[:order_by] == 'none'
+    if params[:order_by]
+      order = SortOptions[@asset][params[:order_by].to_sym]
+      raise "Unknown order by" if order.nil?
+      order[:solr_opts].each do |opt, value|
+        solr_options[opt] = value.is_a?(Proc) ? instance_eval(&value) : value
+      end
+    end
+
+    ret = asset_class.find_by_contents(@query, paginate_options, solr_options)
+    @results[@asset] = ret[:results]
+    @facets = ret[:facets]
+    @all_facets = ret[:all_facets]
   end
  
 end
@@ -4,7 +4,7 @@ require &#39;redcloth&#39;
 # application.
 module ApplicationHelper
  
-  include PermissionName
+  include PermissionNameHelper
  
   include LightboxHelper
  
@@ -574,7 +574,7 @@ module ApplicationHelper
     end
     extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
     links = links_for_balloon(profile)
-    content_tag tag,
+    content_tag('div', content_tag(tag,
         (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{links.to_json}); return false", :class => "menu-submenu-trigger #{trigger_class}", :url => url) : "") +
         link_to(
             content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
@@ -584,7 +584,7 @@ module ApplicationHelper
             :class => 'profile_link url',
             :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
             :title => profile.name ),
-        :class => 'vcard'
+        :class => 'vcard'), :class => 'common-profile-list-block')
   end
  
   def gravatar_url_for(email, options = {})
@@ -890,22 +890,6 @@ module ApplicationHelper
     result
   end
  
-  def search_page_title(title, options={})
-    title = "<h1>" + title + "</h1>"
-    title += "<h2 class='query'>" + _("Searched for '%s'") % options[:query] + "</h2>" if !options[:query].blank?
-    title += "<h2 class='query'>" + _("In category %s") % options[:category] + "</h2>" if !options[:category].blank?
-    title += "<h2 class='query'>" + _("within %d km from %s") % [options[:distance], options[:region]] + "</h2>" if !options[:distance].blank? && !options[:region].blank?
-    title += "<h2 class='query'>" + _("%d results found") % options[:total_results] + "</h2>" if !options[:total_results].blank?
-    title
-  end
-
-  def search_page_link_to_all(options={})
-    if options[:category]
-      title = "<div align='center'>" + _('In all categories') + "</div>"
-      link_to title, :action => 'assets', :asset => options[:asset], :category_path => []
-    end
-  end
-
   def template_stylesheet_path
     if profile.nil?
       "/designs/templates/#{environment.layout_template}/stylesheets/style.css"
@@ -982,6 +966,7 @@ module ApplicationHelper
   def noosfero_stylesheets
     [
       'application',
+      'search',
       'thickbox',
       'lightbox',
       'colorpicker',
@@ -1001,7 +986,7 @@ module ApplicationHelper
   end
  
   def tokeninput_stylesheets
-    ['token-input', 'token-input-facebook', 'token-input-mac']
+    ['token-input', 'token-input-facebook', 'token-input-mac', 'token-input-facet']
   end
  
   def noosfero_layout_features
@@ -1100,35 +1085,51 @@ module ApplicationHelper
     ") : '')
   end
  
-  def browse_people_menu
+  def search_contents_menu
+    links = [
+      {s_('contents|More Recent') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_recent'})}},
+      {s_('contents|More Viewed') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}}
+    ]
+    if logged_in?
+      links.push(_('New Content') => lightbox_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
+    end
+
+    link_to(content_tag(:span, _('Contents'), :class => 'icon-menu-articles'), {:controller => "search", :action => 'contents', :category_path => ''}, :id => 'submenu-contents') +
+    link_to(content_tag(:span, _('Contents Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
+  end
+  alias :browse_contents_menu :search_contents_menu
+
+  def search_people_menu
      links = [
-       {s_('people|More Recent') => {:href => url_for({:controller => 'browse', :action => 'people', :filter => 'more_recent'})}},
-       {s_('people|More Active') => {:href => url_for({:controller => 'browse', :action => 'people', :filter => 'more_active'})}},
-       {s_('people|More Popular') => {:href => url_for({:controller => 'browse', :action => 'people', :filter => 'more_popular'})}}
+       {s_('people|More Recent') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_recent'})}},
+       {s_('people|More Active') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_active'})}},
+       {s_('people|More Popular') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_popular'})}}
      ]
      if logged_in?
        links.push(_('My friends') => {:href => url_for({:profile => current_user.login, :controller => 'friends'})})
        links.push(_('Invite friends') => {:href => url_for({:profile => current_user.login, :controller => 'invite', :action => 'friends'})})
      end
  
-    link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "browse", :action => 'people'}, :id => 'submenu-people') +
+    link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "search", :action => 'people', :category_path => ''}, :id => 'submenu-people') +
     link_to(content_tag(:span, _('People Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')
   end
+  alias :browse_people_menu :search_people_menu
  
-  def browse_communities_menu
+  def search_communities_menu
      links = [
-       {s_('communities|More Recent') => {:href => url_for({:controller => 'browse', :action => 'communities', :filter => 'more_recent'})}},
-       {s_('communities|More Active') => {:href => url_for({:controller => 'browse', :action => 'communities', :filter => 'more_active'})}},
-       {s_('communities|More Popular') => {:href => url_for({:controller => 'browse', :action => 'communities', :filter => 'more_popular'})}}
+       {s_('communities|More Recent') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_recent'})}},
+       {s_('communities|More Active') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_active'})}},
+       {s_('communities|More Popular') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_popular'})}}
      ]
      if logged_in?
        links.push(_('My communities') => {:href => url_for({:profile => current_user.login, :controller => 'memberships'})})
        links.push(_('New community') => {:href => url_for({:profile => current_user.login, :controller => 'memberships', :action => 'new_community'})})
      end
  
-    link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "browse", :action => 'communities'}, :id => 'submenu-communities') +
+    link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "search", :action => 'communities'}, :id => 'submenu-communities') +
     link_to(content_tag(:span, _('Communities Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
   end
+  alias :browse_communities_menu :search_communities_menu
  
   def browse_contents_menu
      links = [
@@ -1217,15 +1218,12 @@ module ApplicationHelper
           else             _('1 minute')
         end
  
-      when 2..44           then _('%{distance} minutes') % { :distance => distance_in_minutes }
-      when 45..89          then _('about 1 hour')
-      when 90..1439        then _('about %{distance} hours') % { :distance => (distance_in_minutes.to_f / 60.0).round }
-      when 1440..2879      then _('1 day')
-      when 2880..43199     then _('%{distance} days') % { :distance => (distance_in_minutes / 1440).round }
-      when 43200..86399    then _('about 1 month')
-      when 86400..525599   then _('%{distance} months') % { :distance => (distance_in_minutes / 43200).round }
-      when 525600..1051199 then _('about 1 year')
-      else                      _('over %{distance} years') % { :distance => (distance_in_minutes / 525600).round }
+      when 2..44           then _('%{distance} minutes ago') % { :distance => distance_in_minutes }
+      when 45..89          then _('about 1 hour ago')
+      when 90..1439        then _('about %{distance} hours ago') % { :distance => (distance_in_minutes.to_f / 60.0).round }
+      when 1440..2879      then _('1 day ago')
+      when 2880..10079     then _('%{distance} days ago') % { :distance => (distance_in_minutes / 1440).round }
+      else                      show_time(from_time)
     end
   end
  
@@ -1330,6 +1328,10 @@ module ApplicationHelper
     end
   end
  
+  def jquery_token_input_messages_json(hintText = _('Type in an keyword'), noResultsText = _('No results'), searchingText = _('Searching...'))
+    "hintText: '#{hintText}', noResultsText: '#{noResultsText}', searchingText: '#{searchingText}'"
+  end
+
   def delete_article_message(article)
     if article.folder?
       _("Are you sure that you want to remove the folder \"#{article.name}\"? Note that all the items inside it will also be removed!")
@@ -26,15 +26,19 @@ module DisplayHelper
     product.enterprise.enabled? ? product.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => product) : product.enterprise.url
   end
  
-  def link_to_category(category, full = true)
+  def link_to_tag(tag, html_options = {})
+    link_to tag.name, {:controller => 'search', :action => 'tag', :tag => tag.name}, html_options
+  end
+
+  def link_to_category(category, full = true, html_options = {})
     return _('Uncategorized product') unless category
     name = full ? category.full_name(' &rarr; ') : category.name
-    link_to name, Noosfero.url_options.merge({:controller => 'search', :action => 'category_index', :category_path => category.path.split('/'),:host => category.environment.default_hostname })
+    link_to name, Noosfero.url_options.merge({:controller => 'search', :action => 'category_index', :category_path => category.path.split('/'),:host => category.environment.default_hostname }), html_options
   end
  
   def link_to_product_category(category)
     if category
-      link_to(category.name, :controller => 'search', :action => 'assets', :asset => 'products', :product_category => category.id, :host => category.environment.default_hostname)
+      link_to(category.name, :controller => 'search', :action => 'products', :category_path => category.explode_path)
     else
       _('Uncategorized product')
     end
@@ -42,9 +42,9 @@ module ForumHelper
   def last_topic_update(article)
     info = article.info_from_last_update
     if info[:author_url]
-      time_ago_as_sentence(info[:date]) + ' ' + _('ago') + ' ' + _('by') + ' ' + link_to(info[:author_name], info[:author_url])
+      time_ago_as_sentence(info[:date]) + ' ' + _('by') + ' ' + link_to(info[:author_name], info[:author_url])
     else
-      time_ago_as_sentence(info[:date]) + ' ' + _('ago') + ' ' + _('by') + ' ' + info[:author_name]
+      time_ago_as_sentence(info[:date]) + ' ' + _('by') + ' ' + info[:author_name]
     end
   end
  
@@ -22,10 +22,7 @@ module LightboxHelper
   def lightbox_options(options, lightbox_type = 'lbOn')
     the_class = lightbox_type
     the_class << " #{options[:class]}" if options.has_key?(:class)
-    options.merge(
-      :class => the_class,
-      :onclick => 'alert("%s"); return false' % _('Please, try again when the page loading completes.')
-    )
+    options.merge(:class => the_class)
   end
  
   def lightbox?
@@ -241,6 +241,10 @@ module ManageProductsHelper
     end
   end
  
+  def remove_qualifier_button
+    button_to_function(:delete, content_tag('span', _('Delete qualifier')), "jQuery(this).parents('tr').remove()")
+  end
+
   def select_unit(object)
     collection_select(object.class.name.downcase, :unit_id, environment.units, :id, :singular, {:include_blank => _('Select the unit')})
   end
@@ -278,7 +282,7 @@ module ManageProductsHelper
     error_msg = _('Something went wrong. Please, try again')
     select_tag('price_details[][production_cost_id]',
                '<option value="" disabled="disabled">' + _('Select...') + '</option>' +
-               options_for_select(product.available_production_costs.map {|item| [truncate(item.name, 10, '...'), item.id]} + [[_('Other cost'), '']], selected),
+               options_for_select(product.available_production_costs.map {|item| [truncate(item.name, {:length => 10, :omission => '...'}), item.id]} + [[_('Other cost'), '']], selected),
                {:class => 'production-cost-selection',
                 :onchange => "productionCostTypeChange(this, '#{url}', '#{prompt_msg}', '#{error_msg}')"})
   end
@@ -1,2 +0,0 @@
-module ProductCategoryViewerHelper
-end
 module SearchHelper
  
+  MAP_SEARCH_LIMIT = 2000
+  LIST_SEARCH_LIMIT = 20
+  BLOCKS_SEARCH_LIMIT = 18
+  MULTIPLE_SEARCH_LIMIT = 8
+  DistFilt = 200
+  DistBoost = 50
+
+  Searches = ActiveSupport::OrderedHash[
+    :articles, _('Contents'),
+    :enterprises, _('Enterprises'),
+    :people, _('People'),
+    :communities, _('Communities'),
+    :products, _('Products and Services'),
+    :events, _('Events'),
+  ]
+
+  SortOptions = {
+    :products => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
+      :more_recent, {:label => _('More Recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
+      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
+      :closest, {:label => _('Closest to me'), :if => proc{ logged_in? && (profile=current_user.person).lat && profile.lng },
+        :solr_opts => {:sort => "geodist() asc",
+          :latitude => proc{ current_user.person.lat }, :longitude => proc{ current_user.person.lng }}},
+    ],
+    :events => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
+      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
+    ],
+    :articles => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
+      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
+      :more_recent, {:label => _('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
+    ],
+    :enterprises => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
+      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
+    ],
+    :people => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
+      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
+    ],
+    :communities => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
+      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
+    ],
+  }
+
   # FIXME remove it after search_controler refactored
   include EventsHelper
  
-  STOP_WORDS = {
-    'pt_BR' => Ferret::Analysis::FULL_PORTUGUESE_STOP_WORDS,
-    'en'    => Ferret::Analysis::FULL_ENGLISH_STOP_WORDS,
-  }
-  
-  def relevance_for(hit)
-    n = (hit.ferret_score if hit.respond_to?(:ferret_score))
-    n ||= 1.0
-    (n * 100.0).round
+  def search_page_title(title, category = nil)
+    title = "<h1>" + title
+    title += '<small>' + category.name + '</small>' if category
+    title + "</h1>"
   end
  
-  def remove_stop_words(query)
-    (query.downcase.scan(/"[^"]*"?|'[^']*'?|[^'"\s]+/) - (STOP_WORDS[locale] || [])).join(' ')
+  def category_context(category, url)
+    content_tag('div', category.full_name + _(', ') +
+        link_to(_('search in all categories'),
+          url.merge(:category_path => [], :action => (params[:action] == 'category_index' ? 'index' : params[:action]) )),
+      :align => 'center', :class => 'search-category-context') if category
   end
  
-  def display_results(use_map = true)
-
-    unless use_map && GoogleMaps.enabled?(environment.default_hostname)
-      return render(:partial => 'display_results')
+  def display_results(use_map = false)
+    if params[:display] == 'map' && use_map
+      partial = 'google_maps'
+      klass = 'map'
+    else
+      partial = 'display_results'
+      klass = 'list'
     end
  
-    data =
-      if params[:display] == 'map'
-        {
-          :partial => 'google_maps',
-          :toggle => button(:search, _('Display in list'), params.merge(:display => 'list'), :class => "map-toggle-button" ),
-          :class => 'map' ,
-        }
+    content_tag('div', render(:partial => partial), :class => "map-or-list-search-results #{klass}")
+  end
+
+  def display_map_list_button
+    button(:search, params[:display] == 'map' ? _('Display in list') : _('Display in map'),
+           params.merge(:display => (params[:display] == 'map' ? 'list' : 'map')),
+           :class => "map-toggle-button" )
+  end
+
+  def city_with_state(city)
+    if city and city.kind_of?(City)
+      s = city.parent
+      if s and s.kind_of?(State) and s.acronym
+        city.name + ', ' + s.acronym
       else
-        {
-          :partial => 'display_results',
-          :toggle => button(:search, _('Display in map'), params.merge(:display => 'map'), :class => "map-toggle-button" ),
-          :class => 'list' ,
-        }
+        city.name
       end
+    else
+      nil
+    end
+  end
  
-    content_tag('div', data[:toggle] + (render :partial => data[:partial]), :class => "map-or-list-search-results #{data[:class]}")
+  def facets_menu(asset, _facets)
+    @asset_class = asset_class(asset)
+    @facets = _facets
+    render(:partial => 'facets_menu')
   end
  
-  def display_item_map_info(item)
-    if item.kind_of?(Profile)
-      display_profile_info(item)
-    elsif item.kind_of?(Product)
-      display_product_info(item)
-    end
+  def facets_unselect_menu(asset)
+    @asset_class = asset_class(asset)
+    render(:partial => 'facets_unselect_menu')
   end
  
-  def display_profile_info(profile)
-    data = ''
-    unless profile.contact_email.nil?
-      data << content_tag('strong', _('E-Mail: ')) + profile.contact_email + '<br/>'
-    end
-    unless profile.contact_phone.nil?
-      data << content_tag('strong', _('Phone(s): ')) + profile.contact_phone + '<br/>'
-    end
-    unless profile.region.nil?
-      data << content_tag('strong', _('Location: ')) + profile.region.name + '<br/>'
-    end
-    unless profile.address.nil?
-      data << content_tag('strong', _('Address: ')) + profile.address + '<br/>'
-    end
-    unless profile.products.empty?
-      data << content_tag('strong', _('Products/Services: ')) + profile.products.map{|i| link_to(i.name, :controller => 'manage_products', :profile => profile.identifier, :action => 'show', :id => i.id)}.join(', ') + '<br/>'
-    end
-    if profile.respond_to?(:distance) and !profile.distance.nil?
-      data << content_tag('strong', _('Distance: ')) + "%.2f%" % profile.distance + '<br/>'
-    end
-    content_tag('table',
-      content_tag('tr',
-        content_tag('td', content_tag('div', profile_image(profile, :thumb), :class => 'profile-info-picture')) +
-        content_tag('td', content_tag('strong', link_to(profile.name, url_for(profile.url))) + '<br/>' + data
-        )
-      ),
-      :class => 'profile-info'
-    )
+  def facet_javascript(input_id, facet, array)
+    array = [] if array.nil?
+    hintText = _('Type in an option')
+    text_field_tag('facet['+input_id+']', '', :id => input_id) +
+      javascript_tag("jQuery.TokenList(jQuery('##{input_id}'), #{array.to_json},
+        {searchDelay: 0, permanentDropdown: true, theme: 'facet', dontAdd: true, preventDuplicates: true,
+        #{jquery_token_input_messages_json(hintText)}});")
   end
  
-  def display_product_info(product)
-    data = ''
-    unless product.price.nil?
-      data << content_tag('strong', _('Price: ')) + product.price + '<br/>'
-    end
-    unless product.enterprise.nil?
-      data << content_tag('strong', _('Provider: ')) + link_to_profile(product.enterprise.name, product.enterprise.identifier)
-    end
-    unless product.product_category.nil?
-      data << content_tag('strong', _('Category: ')) + link_to(product.product_category.name, :controller => 'search', :action => 'assets', :asset => 'products', :product_category => product.product_category.id)
+  def facet_link_html(facet, params, value, label, count)
+    params = params ? params.dup : {}
+    has_extra = label.kind_of?(Array)
+    link_label = has_extra ? label[0] : label
+    id = facet[:solr_field].to_s
+    params[:facet] ||= {}
+    params[:facet][id] ||= {}
+    params[:page] = {} if params[:page]
+
+    selected = facet[:label_id].nil? ? params[:facet][id] == value : params[:facet][id][facet[:label_id]].to_a.include?(value)
+
+    if count > 0
+      url = params.merge(:facet => params[:facet].merge(
+        id => facet[:label_id].nil? ? value : params[:facet][id].merge( facet[:label_id] => params[:facet][id][facet[:label_id]].to_a | [value] )
+      ))
+    else
+      # preserve others filters and change this filter
+      url = params.merge(:facet => params[:facet].merge(
+        id => facet[:label_id].nil? ? value : { facet[:label_id] => value }
+      ))
     end
-    content_tag('table',
-      content_tag('tr',
-        content_tag('td', content_tag('div', image_tag(product.image ? product.image.public_filename(:thumb) : '/images/icons-app/product-default-pic-portrait.png'), :class => 'profile-info-picture')) +
-        content_tag('td', content_tag('strong', link_to(product.name, :controller => 'catalog', :profile => product.enterprise.identifier, :action => 'show', :id => product)) + '<br/>' + data)
-        ), :class => 'profile-info')
+
+    content_tag 'div', link_to(link_label, url, :class => 'facet-result-link-label') +
+        content_tag('span', (has_extra ? label[1] : ''), :class => 'facet-result-extra-label') +
+        (count > 0 ? content_tag('span', " (#{count})", :class => 'facet-result-count') : ''),
+      :class => 'facet-menu-item' + (selected ? ' facet-result-link-selected' : '')
   end
  
-  def product_categories_menu(asset, product_category, object_ids = nil)
-    cats = ProductCategory.menu_categories(@product_category, environment)
-    cats += cats.select { |c| c.children_count > 0 }.map(&:children).flatten
-    product_categories_ids = cats.map(&:id)
-
-    counts = @noosfero_finder.product_categories_count(asset, product_categories_ids, object_ids)
-
-    product_categories_menu = ProductCategory.menu_categories(product_category, environment).map do |cat|
-      hits = counts[cat.id]
-      childs = []
-      if hits
-        if cat.children_count > 0
-          childs = cat.children.map do |child|
-            child_hits = counts[child.id]
-            [child, child_hits]
-          end.select{|child, child_hits| child_hits }
-        else
-          childs = []
+  def facet_selecteds_html_for(environment, klass, params)
+    def name_with_extra(klass, facet, value)
+      name = klass.facet_result_name(facet, value)
+      name = name[0] + name[1] if name.kind_of?(Array)
+      name
+    end
+
+    ret = []
+    params = params.dup
+    params[:facet].each do |id, value|
+      facet = klass.facet_by_id(id.to_sym)
+      if value.kind_of?(Hash)
+        label_hash = facet[:label].call(environment)
+        value.each do |label_id, value|
+          facet[:label_id] = label_id
+          facet[:label] = label_hash[label_id]
+          value.to_a.each do |value|
+            ret << [facet[:label], name_with_extra(klass, facet, value),
+              params.merge(:facet => params[:facet].merge(id => params[:facet][id].merge(label_id => params[:facet][id][label_id].to_a.reject{ |v| v == value })))]
+          end
         end
+      else
+        ret << [klass.facet_label(facet), name_with_extra(klass, facet, value),
+          params.merge(:facet => params[:facet].reject{ |k,v| k == id })]
       end
-      [cat, hits, childs]
-    end.select{|cat, hits| hits }
+    end
+
+    ret.map do |label, name, url|
+      content_tag('div', content_tag('span', label, :class => 'facet-selected-label') +
+        content_tag('span', name, :class => 'facet-selected-name') +
+        link_to('', url, :class => 'facet-selected-remove', :title => 'remove facet'), :class => 'facet-selected')
+    end.join
+  end
+
+  def order_by(asset)
+    options = SortOptions[asset].map do |name, options|
+      next if options[:if] and ! instance_eval(&options[:if])
+      [_(options[:label]), name.to_s]
+    end.compact
+
+    content_tag('div', _('Sort results by ') +
+      select_tag(asset.to_s + '[order]', options_for_select(options, params[:order_by] || 'none'),
+        {:onchange => "window.location = jQuery.param.querystring(window.location.href, { 'order_by' : this.options[this.selectedIndex].value})"}),
+      :class => "search-ordering")
+  end
+
+  def label_total_found(asset, total_found)
+    labels = {
+      :products => _("%s products offers found"),
+      :articles => _("%s articles found"),
+      :events => _("%s events found"),
+      :people => _("%s people found"),
+      :enterprises => _("%s enterprises found"),
+      :communities => _("%s communities found"),
+    }
+    content_tag('span', labels[asset] % total_found,
+      :class => "total-pages-found") if labels[asset]
+  end
+
+  def asset_class(asset)
+    asset.to_s.singularize.camelize.constantize
+  end
  
-    render(:partial => 'product_categories_menu', :object => product_categories_menu)
+  def asset_table(asset)
+    asset_class(asset).table_name
   end
  
 end
@@ -3,6 +3,8 @@ class ActionTrackerNotification &lt; ActiveRecord::Base
   belongs_to :profile
   belongs_to :action_tracker, :class_name => 'ActionTracker::Record', :foreign_key => 'action_tracker_id'
  
+  has_many :comments, :through => :action_tracker, :class_name => 'Comment', :foreign_key => 'source_id'
+
   validates_presence_of :profile_id, :action_tracker_id
   validates_uniqueness_of :action_tracker_id, :scope => :profile_id
  
@@ -2,9 +2,13 @@ require &#39;hpricot&#39;
  
 class Article < ActiveRecord::Base
  
-  track_actions :create_article, :after_create, :keep_params => [:name, :url], :if => Proc.new { |a| a.is_trackable? && !a.image? }, :custom_target => :action_tracker_target
-  track_actions :update_article, :before_update, :keep_params => [:name, :url], :if => Proc.new { |a| a.is_trackable? && (a.body_changed? || a.name_changed?) }, :custom_target => :action_tracker_target
-  track_actions :remove_article, :before_destroy, :keep_params => [:name], :if => Proc.new { |a| a.is_trackable? }, :custom_target => :action_tracker_target
+  # use for internationalizable human type names in search facets
+  # reimplement on subclasses
+  def self.type_name
+    _('Content')
+  end
+
+  track_actions :create_article, :after_create, :keep_params => [:name, :url, :lead, :first_image], :if => Proc.new { |a| a.is_trackable? && !a.image? }
  
   # xss_terminate plugin can't sanitize array fields
   before_save :sanitize_tag_list
@@ -17,11 +21,14 @@ class Article &lt; ActiveRecord::Base
  
   belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
  
-  has_many :comments, :dependent => :destroy, :order => 'created_at asc'
+  has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
  
   has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]
   has_many :categories, :through => :article_categorizations
  
+  has_many :article_categorizations_including_virtual, :class_name => 'ArticleCategorization', :dependent => :destroy
+  has_many :categories_including_virtual, :through => :article_categorizations_including_virtual, :source => :category
+
   acts_as_having_settings :field => :setting
  
   settings_items :display_hits, :type => :boolean, :default => true
@@ -47,7 +54,7 @@ class Article &lt; ActiveRecord::Base
   xss_terminate :only => [ :name ], :on => 'validation', :with => 'white_list'
  
   named_scope :in_category, lambda { |category|
-    {:include => 'categories', :conditions => { 'categories.id' => category.id }}
+    {:include => 'categories_including_virtual', :conditions => { 'categories.id' => category.id }}
   }
  
   named_scope :by_range, lambda { |range| {
@@ -65,7 +72,7 @@ class Article &lt; ActiveRecord::Base
   validate :translation_must_have_language
  
   def is_trackable?
-    self.published? && self.notifiable? && self.advertise?
+    self.published? && self.notifiable? && self.advertise? && self.profile.public_profile
   end
  
   def external_link=(link)
@@ -96,11 +103,13 @@ class Article &lt; ActiveRecord::Base
     @pending_categorizations ||= []
   end
  
-  def add_category(c)
-    if self.id
-      ArticleCategorization.add_category_to_article(c, self)
-    else
+  def add_category(c, reload=false)
+    if new_record?
       pending_categorizations << c
+    else
+      ArticleCategorization.add_category_to_article(c, self)
+      self.categories(reload)
+      self.solr_save
     end
   end
  
@@ -109,6 +118,7 @@ class Article &lt; ActiveRecord::Base
     ids.uniq.each do |item|
       add_category(Category.find(item)) unless item.to_i.zero?
     end
+    self.categories(true)
   end
  
   after_create :create_pending_categorizations
@@ -116,6 +126,8 @@ class Article &lt; ActiveRecord::Base
     pending_categorizations.each do |item|
       ArticleCategorization.add_category_to_article(item, self)
     end
+    self.categories(true)
+    self.solr_save
     pending_categorizations.clear
   end
  
@@ -126,8 +138,6 @@ class Article &lt; ActiveRecord::Base
  
   acts_as_versioned
  
-  acts_as_searchable :additional_fields => [ :comment_data ]
-
   def comment_data
     comments.map {|item| [item.title, item.body].join(' ') }.join(' ')
   end
@@ -135,20 +145,40 @@ class Article &lt; ActiveRecord::Base
   before_update do |article|
     article.advertise = true
   end
-  
+
   # retrieves all articles belonging to the given +profile+ that are not
   # sub-articles of any other article.
   named_scope :top_level_for, lambda { |profile|
     {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]}
   }
  
+  named_scope :join_profile, :joins => [:profile]
+
+  named_scope :public,
+    :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ]
+
+  named_scope :more_recent,
+    :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND
+      ((articles.type != ?) OR articles.type is NULL)",
+      true, true, true, true, 'RssFeed'
+    ],
+    :order => 'articles.published_at desc, articles.id desc'
+
+  # retrives the most commented articles, sorted by the comment count (largest
+  # first)
+  def self.most_commented(limit)
+    paginate(:order => 'comments_count DESC', :page => 1, :per_page => limit)
+  end
+
+  named_scope :more_popular, :order => 'hits DESC'
+
   # retrieves the latest +limit+ articles, sorted from the most recent to the
   # oldest.
   #
   # Only includes articles where advertise == true
-  def self.recent(limit, extra_conditions = {})
+  def self.recent(limit = nil, extra_conditions = {})
     # FIXME this method is a horrible hack
-    options = { :limit => limit,
+    options = { :page => 1, :per_page => limit,
                 :conditions => [
                   "advertise = ? AND
                   published = ? AND
@@ -166,20 +196,14 @@ class Article &lt; ActiveRecord::Base
       options.delete(:include)
     end
     if extra_conditions == {}
-      self.find(:all, options)
+      self.paginate(options)
     else
       with_scope :find => {:conditions => extra_conditions} do
-        self.find(:all, options)
+        self.paginate(options)
       end
     end
   end
  
-  # retrives the most commented articles, sorted by the comment count (largest
-  # first)
-  def self.most_commented(limit)
-    find(:all, :order => 'comments_count DESC', :limit => limit)
-  end
-
   # produces the HTML code that is to be displayed as this article's contents.
   #
   # The implementation in this class just provides the +body+ attribute as the
@@ -421,7 +445,7 @@ class Article &lt; ActiveRecord::Base
   end
  
   def comments_updated
-    ferret_update
+    solr_save
   end
  
   def accept_category?(cat)
@@ -571,6 +595,114 @@ class Article &lt; ActiveRecord::Base
     _('Created at: ')
   end
  
+  def activity
+    ActionTracker::Record.find_by_target_type_and_target_id 'Article', self.id
+  end
+
+  def create_activity
+    if is_trackable? && !image?
+      save_action_for_verb 'create_article', [:name, :url, :lead, :first_image], Proc.new{}, :author
+    end
+  end
+
+  def first_image
+    img = Hpricot(self.lead.to_s).search('img[@src]').first || Hpricot(self.body.to_s).search('img').first
+    img.nil? ? '' : img.attributes['src']
+  end
+
+  private
+
+  # FIXME: workaround for development env.
+  # Subclasses aren't (re)loaded, and acts_as_solr
+  # depends on subclasses method to search
+  # see http://stackoverflow.com/questions/4138957/activerecordsubclassnotfound-error-when-using-sti-in-rails/4139245
+  UploadedFile
+  TextArticle
+  TinyMceArticle
+  TextileArticle
+  Folder
+  EnterpriseHomepage
+  Gallery
+  Blog
+  Forum
+  Event
+
+  def self.f_type_proc(klass)
+    klass.constantize.type_name
+  end
+
+  def self.f_profile_type_proc(klass)
+    klass.constantize.type_name
+  end
+
+  def f_type
+    #join common types
+    case self.class.name
+    when 'TinyMceArticle', 'TextileArticle'
+      TextArticle.name
+    else
+      self.class.name
+    end
+  end
+
+  def f_profile_type
+    self.profile.class.name
+  end
+
+  def f_published_at
+    self.published_at
+  end
+
+  def f_category
+    self.categories.collect(&:name)
+  end
+
+  delegate :region, :region_id, :environment, :environment_id, :to => :profile
+  def name_sortable # give a different name for solr
+    name
+  end
+
+  def public
+    self.public?
+  end
+
+  def category_filter
+    categories_including_virtual_ids
+  end
+
+  public
+
+  acts_as_faceted :fields => {
+      :f_type => {:label => _('Type'), :proc => proc{|klass| f_type_proc(klass)}},
+      :f_published_at => {:type => :date, :label => _('Published date'), :queries => {'[* TO NOW-1YEARS/DAY]' => _("Older than one year"),
+        '[NOW-1YEARS TO NOW/DAY]' => _("In the last year"), '[NOW-1MONTHS TO NOW/DAY]' => _("In the last month"), '[NOW-7DAYS TO NOW/DAY]' => _("In the last week"), '[NOW-1DAYS TO NOW/DAY]' => _("In the last day")},
+        :queries_order => ['[NOW-1DAYS TO NOW/DAY]', '[NOW-7DAYS TO NOW/DAY]', '[NOW-1MONTHS TO NOW/DAY]', '[NOW-1YEARS TO NOW/DAY]', '[* TO NOW-1YEARS/DAY]']},
+      :f_profile_type => {:label => _('Profile'), :proc => proc{|klass| f_profile_type_proc(klass)}},
+      :f_category => {:label => _('Categories')},
+    }, :category_query => proc { |c| "category_filter:\"#{c.id}\"" },
+    :order => [:f_type, :f_published_at, :f_profile_type, :f_category]
+
+  acts_as_searchable :fields => facets_fields_for_solr + [
+      # searched fields
+      {:name => {:type => :text, :boost => 2.0}},
+      {:slug => :text}, {:body => :text},
+      {:abstract => :text}, {:filename => :text},
+      # filtered fields
+      {:public => :boolean}, {:environment_id => :integer},
+      {:profile_id => :integer}, :language,
+      {:category_filter => :integer},
+      # ordered/query-boosted fields
+      {:name_sortable => :string}, :last_changed_by_id, :published_at, :is_image,
+      :updated_at, :created_at,
+    ], :include => [
+      {:profile => {:fields => [:name, :identifier, :address, :nickname, :region_id, :lat, :lng]}},
+      {:comments => {:fields => [:title, :body, :author_name, :author_email]}},
+      {:categories => {:fields => [:name, :path, :slug, :lat, :lng, :acronym, :abbreviation]}},
+    ], :facets => facets_option_for_solr,
+    :boost => proc { |a| 10 if a.profile && a.profile.enabled },
+    :if => proc{ |a| ! ['RssFeed'].include?(a.class.name) }
+  handle_asynchronously :solr_save
+
   private
  
   def sanitize_tag_list
@@ -9,6 +9,10 @@ class Blog &lt; Folder
   end
   alias_method_chain :posts, :no_folders
  
+  def self.type_name
+    _('Blog')
+  end
+
   def self.short_description
     _('Blog')
   end
@@ -15,13 +15,14 @@ class Category &lt; ActiveRecord::Base
  
   acts_as_filesystem
  
-  has_many :article_categorizations
+  has_many :article_categorizations, :dependent => :destroy
   has_many :articles, :through => :article_categorizations
   has_many :comments, :through => :articles
  
   has_many :events, :through => :article_categorizations, :class_name => 'Event', :source => :article
  
-  has_many :profile_categorizations
+  has_many :profile_categorizations, :dependent => :destroy
+  has_many :profiles, :through => :profile_categorizations, :source => :profile
   has_many :enterprises, :through => :profile_categorizations, :source => :profile, :class_name => 'Enterprise'
   has_many :people, :through => :profile_categorizations, :source => :profile, :class_name => 'Person'
   has_many :communities, :through => :profile_categorizations, :source => :profile, :class_name => 'Community'
@@ -36,18 +37,38 @@ class Category &lt; ActiveRecord::Base
       { :conditions => [ "type IN (?) OR type IS NULL", types.reject{ |t| t.blank? } ] }
   }
  
+  def recent_people(limit = 10)
+    self.people.paginate(:order => 'created_at DESC, id DESC', :page => 1, :per_page => limit)
+  end
+
+  def recent_enterprises(limit = 10)
+    self.enterprises.paginate(:order => 'created_at DESC, id DESC', :page => 1, :per_page => limit)
+  end
+
+  def recent_communities(limit = 10)
+    self.communities.paginate(:order => 'created_at DESC, id DESC', :page => 1, :per_page => limit)
+  end
+
+  def recent_products(limit = 10)
+    self.products.paginate(:order => 'created_at DESC, id DESC', :page => 1, :per_page => limit)
+  end
+
   def recent_articles(limit = 10)
     self.articles.recent(limit)
   end
  
   def recent_comments(limit = 10)
-    comments.find(:all, :order => 'created_at DESC, comments.id DESC', :limit => limit)
+    comments.paginate(:all, :order => 'created_at DESC, comments.id DESC', :page => 1, :per_page => limit)
   end
  
   def most_commented_articles(limit = 10)
     self.articles.most_commented(limit)
   end
  
+  def upcoming_events(limit = 10)
+    self.events.paginate(:conditions => [ 'start_date >= ?', Date.today ], :order => 'start_date', :page => 1, :per_page => limit)
+  end
+
   def display_in_menu?
     display_in_menu
   end
@@ -69,4 +90,23 @@ class Category &lt; ActiveRecord::Base
     self.children.find(:all, :conditions => {:display_in_menu => true}).empty?
   end
  
+  private
+  def name_sortable # give a different name for solr
+    name
+  end
+  public
+
+  acts_as_searchable :fields => [
+    # searched fields
+    {:name => {:type => :text, :boost => 2.0}},
+    {:path => :text}, {:slug => :text},
+    {:abbreviation => :text}, {:acronym => :text},
+    # filtered fields
+    :parent_id,
+    # ordered/query-boosted fields
+    {:name_sortable => :string},
+  ]
+  after_save_reindex [:articles, :profiles], :with => :delayed_job
+  handle_asynchronously :solr_save
+
 end
@@ -1,144 +0,0 @@
-class CategoryFinder
-
-  def initialize(cat)
-    @category = cat
-    @category_id = @category.id
-  end
-
-  attr_reader :category_id
-
-  def find(asset, query='', options={})
-    @region = Region.find_by_id(options.delete(:region)) if options.has_key?(:region)
-    if @region && options[:within]
-      options[:origin] = [@region.lat, @region.lng]
-    else
-      options.delete(:within)
-    end
-
-    date_range = options.delete(:date_range)
-
-    options = {:page => 1, :per_page => options.delete(:limit)}.merge(options)
-
-    if asset == :events
-      finder_method = 'find'
-      options.delete(:page)
-      options.delete(:per_page)
-    else
-      finder_method = 'paginate'
-    end
-
-    if query.blank?
-      asset_class(asset).send(finder_method, :all, options_for_find(asset_class(asset), {:order => "#{asset_table(asset)}.name"}.merge(options), date_range))
-    else
-      ferret_options = {:page => options.delete(:page), :per_page => options.delete(:per_page)}
-      asset_class(asset).find_by_contents(query, ferret_options, options_for_find(asset_class(asset), options, date_range))
-    end
-  end
-
-  def recent(asset, limit = nil)
-    find(asset, nil, :limit => limit, :order => 'created_at DESC, id DESC')
-  end
-
-  def most_commented_articles(limit=10, options={})
-    options = {:page => 1, :per_page => limit, :order => 'comments_count DESC'}.merge(options)
-    Article.paginate(:all, options_for_find(Article, options))
-  end
-
-  def current_events(year, month, options={})
-    options.delete(:page)
-    options.delete(:per_page)
-
-    range = Event.date_range(year, month)
-
-    Event.find(:all, {:include => :categories, :conditions => { 'categories.id' => category_id, :start_date => range }}.merge(options))
-  end
-
-  def upcoming_events(options = {})
-    options.delete(:page)
-    options.delete(:per_page)
-
-    Event.find(:all, {:include => :categories, :conditions => [ 'categories.id = ? and start_date >= ?', category_id, Date.today ], :order => 'start_date' }.merge(options))
-  end
-
-  def product_categories_count(asset, product_categories_ids, objects_ids=nil)
-    conditions = [ "product_categorizations.category_id in (?) and #{ProfileCategorization.table_name}.category_id = ?", product_categories_ids, category_id]
-
-    if asset == :products
-      if objects_ids
-        conditions[0] += ' and product_categorizations.product_id in (?)'
-        conditions << objects_ids
-      end
-      ProductCategory.find(
-        :all, 
-        :select => 'categories.id, count(*) as total', 
-        :joins => "inner join product_categorizations on (product_categorizations.category_id = categories.id) inner join products on (products.id = product_categorizations.product_id) inner join #{ProfileCategorization.table_name} on (#{ProfileCategorization.table_name}.profile_id = products.enterprise_id)", 
-        :group => 'categories.id', 
-        :conditions => conditions
-      )
-    elsif asset == :enterprises
-      if objects_ids
-        conditions[0] += ' and products.enterprise_id in (?)'
-        conditions << objects_ids
-      end
-      ProductCategory.find(
-        :all,
-        :select => 'categories.id, count(distinct products.enterprise_id) as total',
-        :joins => "inner join product_categorizations on (product_categorizations.category_id = categories.id) inner join products on (products.id = product_categorizations.product_id) inner join #{ProfileCategorization.table_name} on (#{ProfileCategorization.table_name}.profile_id = products.enterprise_id)",
-        :group => 'categories.id', 
-        :conditions => conditions 
-      )
-    else
-      raise ArgumentError, 'only products and enterprises supported'
-    end.inject({}) do |results,pc| 
-        results[pc.id]= pc.total.to_i
-        results
-    end
-  end
-
-  protected
-
-  def options_for_find(klass, options={}, date_range = nil)
-    if defined? options[:product_category]
-      prod_cat = options.delete(:product_category)
-    end
-    
-    case klass.name
-    when 'Comment'
-      {:joins => 'inner join articles_categories on articles_categories.article_id = comments.article_id', :conditions => ['articles_categories.category_id = (?)', category_id]}.merge!(options)
-    when 'Product'
-      if prod_cat
-        {:joins => 'inner join categories_profiles on products.enterprise_id = categories_profiles.profile_id inner join product_categorizations on (product_categorizations.product_id = products.id)', :conditions => ['categories_profiles.category_id = (?) and product_categorizations.category_id = (?)', category_id, prod_cat.id]}.merge!(options)
-      else
-        {:joins => 'inner join categories_profiles on products.enterprise_id = categories_profiles.profile_id', :conditions => ['categories_profiles.category_id = (?)', category_id]}.merge!(options)
-      end
-    when 'Article', 'TextArticle'
-      {:joins => 'inner join articles_categories on (articles_categories.article_id = articles.id)', :conditions => ['articles_categories.category_id = (?)', category_id]}.merge!(options)
-    when 'Event'
-      conditions =
-        if date_range
-          ['articles_categories.category_id = (:category_id) and (start_date BETWEEN :start_day AND :end_day OR end_date BETWEEN :start_day AND :end_day)', {:category_id => category_id, :start_day => date_range.first, :end_day => date_range.last} ]
-        else
-          ['articles_categories.category_id = (?) ', category_id ]
-        end
-      {:joins => 'inner join articles_categories on (articles_categories.article_id = articles.id)', :conditions => conditions}.merge!(options)
-    when 'Enterprise'
-      if prod_cat
-        {:joins => 'inner join categories_profiles on (categories_profiles.profile_id = profiles.id) inner join products on (products.enterprise_id = profiles.id) inner join product_categorizations on (product_categorizations.product_id = products.id)', :conditions => ['categories_profiles.category_id = (?) and product_categorizations.category_id = (?)', category_id, prod_cat.id]}.merge!(options)
-      else
-        {:joins => 'inner join categories_profiles on (categories_profiles.profile_id = profiles.id)', :conditions => ['categories_profiles.category_id = (?)', category_id]}.merge!(options)
-      end    
-    when 'Person', 'Community'
-      {:joins => 'inner join categories_profiles on (categories_profiles.profile_id = profiles.id)', :conditions => ['categories_profiles.category_id = (?)', category_id]}.merge!(options)
-    else
-      raise "unreconized class #{klass.name}"
-    end
-  end
-
-  def asset_class(asset)
-    asset.to_s.singularize.camelize.constantize
-  end
-  
-  def asset_table(asset)
-    asset_class(asset).table_name
-  end
-end
@@ -2,12 +2,20 @@ class Certifier &lt; ActiveRecord::Base
  
   belongs_to :environment
  
-  has_many :qualifier_certifiers
+  has_many :qualifier_certifiers, :dependent => :destroy
   has_many :qualifiers, :through => :qualifier_certifiers
  
+  has_many :product_qualifiers
+  has_many :products, :through => :product_qualifiers, :source => :product
+
   validates_presence_of :environment_id
   validates_presence_of :name
  
+  def destroy
+    product_qualifiers.each { |pq| pq.update_attributes! :certifier => nil }
+    super
+  end
+
   def link
     self[:link] || ''
   end
@@ -16,4 +24,6 @@ class Certifier &lt; ActiveRecord::Base
     self.name.downcase.transliterate <=> b.name.downcase.transliterate
   end
  
+  after_save_reindex [:products], :with => :delayed_job
+
 end
 class Comment < ActiveRecord::Base
  
-  track_actions :leave_comment, :after_create, :keep_params => ["article.title", "article.url", "title", "url", "body"], :custom_target => :action_tracker_target 
-
   validates_presence_of :body
-  belongs_to :article, :counter_cache => true
+
+  belongs_to :source, :counter_cache => true, :polymorphic => true
+  alias :article :source
+  alias :article= :source=
+
   belongs_to :author, :class_name => 'Person', :foreign_key => 'author_id'
   has_many :children, :class_name => 'Comment', :foreign_key => 'reply_of_id', :dependent => :destroy
   belongs_to :reply_of, :class_name => 'Comment', :foreign_key => 'reply_of_id'
@@ -70,13 +72,25 @@ class Comment &lt; ActiveRecord::Base
   after_save :notify_article
   after_destroy :notify_article
   def notify_article
-    article.comments_updated
+    article.comments_updated if article.kind_of?(Article)
   end
  
   after_create do |comment|
-    if comment.article.notify_comments? && !comment.article.profile.notification_emails.empty?
+    if comment.source.kind_of?(Article) && comment.article.notify_comments? && !comment.article.profile.notification_emails.empty?
       Comment::Notifier.deliver_mail(comment)
     end
+
+    if comment.source.kind_of?(Article)
+      comment.article.create_activity if comment.article.activity.nil?
+      if comment.article.activity
+        comment.article.activity.increment!(:comments_count)
+        comment.article.activity.update_attribute(:visible, true)
+      end
+    end
+  end
+
+  after_destroy do |comment|
+    comment.article.activity.decrement!(:comments_count) if comment.source.kind_of?(Article) && comment.article.activity
   end
  
   def replies
@@ -21,7 +21,7 @@ class CommunitiesBlock &lt; ProfileListBlock
       end
     when Environment
       lambda do
-        link_to s_('communities|View all'), :controller => 'browse', :action => 'communities'
+        link_to s_('communities|View all'), :controller => 'search', :action => 'communities'
       end
     else
       ''
 class Community < Organization
+
+  def self.type_name
+    _('Community')
+  end
+
   N_('Community')
   N_('Language')
  
   settings_items :language
   settings_items :zip_code, :city, :state, :country
  
+  extend SetProfileRegionFromCityState::ClassMethods
+  set_profile_region_from_city_state
+
   before_create do |community|
     community.moderated_articles = true if community.environment.enabled?('organizations_are_moderated_by_default')
   end
@@ -79,4 +87,8 @@ class Community &lt; Organization
     {:title => __('Community Info and settings'), :icon => 'edit-profile-group'}
   end
  
+  def activities
+    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.target_id = #{self.id} UNION SELECT at.id, at.updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} at INNER JOIN articles a ON at.target_id = a.id WHERE a.profile_id = #{self.id} AND at.target_type = 'Article' ORDER BY updated_at DESC")
+  end
+
 end
@@ -8,9 +8,9 @@ class Domain &lt; ActiveRecord::Base
   # validations
   #############
  
-  # <tt>name</tt> must be a sequence of word characters (a to z, plus 0 to 9,
-  # plus '_'). Letters must be lowercase
-  validates_format_of :name, :with => /^([a-z0-9_-]+\.)+[a-z0-9_-]+$/, :message => N_('%{fn} must be composed only of lowercase latters (a to z), numbers (0 to 9), "_" and "-"').fix_i18n
+  # <tt>name</tt> must be sequences of alphanumeric characters (a to z,
+  # 0 to 9), plus '_' or '-', separated by dots. Letters must be lowercase.
+  validates_format_of :name, :with => /^([a-z0-9_-]+\.)+[a-z0-9_-]+$/, :message => N_('%{fn} must be composed of sequences of lowercase letters (a to z), numbers (0 to 9), "_" and "-", separated by dots.').fix_i18n
  
   # checks validations that could not be expressed using Rails' predefined
   # validations. In particular:
@@ -2,6 +2,10 @@
 # only enterprises can offer products and services.
 class Enterprise < Organization
  
+  def self.type_name
+    _('Enterprise')
+  end
+
   N_('Enterprise')
  
   has_many :products, :dependent => :destroy, :order => 'name ASC'
@@ -10,12 +14,19 @@ class Enterprise &lt; Organization
  
   has_and_belongs_to_many :fans, :class_name => 'Person', :join_table => 'favorite_enteprises_people'
  
+  after_save_reindex [:products], :with => :delayed_job
   extra_data_for_index :product_categories
+  def product_categories
+    products.map{|p| p.category_full_name}.compact
+  end
  
   N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code')
  
   settings_items :organization_website, :historic_and_current_context, :activities_short_description, :zip_code, :city, :state, :country
  
+  extend SetProfileRegionFromCityState::ClassMethods
+  set_profile_region_from_city_state
+
   before_save do |enterprise|
     enterprise.organization_website = enterprise.maybe_add_http(enterprise.organization_website)
   end
@@ -67,22 +78,6 @@ class Enterprise &lt; Organization
     environment ? environment.signup_enterprise_fields : []
   end
  
-  def product_categories
-    products.map{|p| p.category_full_name}.compact
-  end
-
-  def product_updated
-    ferret_update
-  end
-
-  after_save do |e|
-    e.delay.update_products_position
-  end
-
-  def update_products_position
-    products.each{ |p| p.enterprise_updated(self) }
-  end
-
   def closed?
     true
   end
@@ -167,6 +162,10 @@ class Enterprise &lt; Organization
     end
   end
  
+  def control_panel_settings_button
+    {:title => __('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}
+  end
+
   settings_items :enable_contact_us, :type => :boolean, :default => true
  
   def enable_contact?
@@ -181,4 +180,8 @@ class Enterprise &lt; Organization
     true
   end
  
+  def activities
+    Scrap.find_by_sql("SELECT id, updated_at, 'Scrap' AS klass FROM scraps WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, 'ActionTracker::Record' AS klass FROM action_tracker WHERE action_tracker.target_id = #{self.id} UNION SELECT action_tracker.id, action_tracker.updated_at, 'ActionTracker::Record' AS klass FROM action_tracker INNER JOIN articles ON action_tracker.target_id = articles.id WHERE articles.profile_id = #{self.id} AND action_tracker.target_type = 'Article' ORDER BY action_tracker.updated_at DESC")
+  end
+
 end
 class EnterpriseHomepage < Article
  
+  def self.type_name
+    _('Homepage')
+  end
+
   def self.short_description
     __('Enterprise homepage.')
   end
@@ -248,6 +248,10 @@ class Environment &lt; ActiveRecord::Base
  
   settings_items :enabled_plugins, :type => Array, :default => []
  
+  settings_items :search_hints, :type => Hash, :default => {}
+
+  settings_items :top_level_category_as_facet_ids, :type => Array, :default => []
+
   def news_amount_by_folder=(amount)
     settings[:news_amount_by_folder] = amount.to_i
   end
@@ -277,6 +281,9 @@ class Environment &lt; ActiveRecord::Base
   def enabled?(feature)
     self.settings["#{feature}_enabled".to_sym] == true
   end
+  def disabled?(feature)
+    !self.enabled?(feature)
+  end
  
   def plugin_enabled?(plugin)
     enabled_plugins.include?(plugin.to_s)
@@ -1,107 +0,0 @@
-class EnvironmentFinder
-  
-  def initialize env
-    @environment = env
-  end
-
-  def find(asset, query = nil, options={}, finder_method = 'paginate')
-    @region = Region.find_by_id(options.delete(:region)) if options.has_key?(:region)
-    if @region && options[:within]
-      options[:origin] = [@region.lat, @region.lng]
-    else
-      options.delete(:within)
-    end
-
-    product_category = options.delete(:product_category)
-
-    date_range = options.delete(:date_range)
-
-    # FIXME this test is in more than one place
-    if finder_method == 'paginate'
-      options = {:page => 1, :per_page => options.delete(:limit)}.merge(options)
-    end
-
-    if query.blank?
-      # FIXME this test is in more than one place
-      if finder_method == 'paginate'
-        options = {:order => "#{asset_table(asset)}.name"}.merge(options)
-      end
-      if product_category && asset == :products
-        @environment.send(asset).send(finder_method, :all, options.merge(:include => 'product_categorizations', :conditions => ['product_categorizations.category_id = (?)', product_category.id]))
-      elsif product_category && asset == :enterprises
-        @environment.send(asset).send(finder_method, :all, options.merge( :order => 'profiles.name', :joins => 'inner join products on (products.enterprise_id = profiles.id) inner join product_categorizations on (product_categorizations.product_id = products.id)', :conditions => ['product_categorizations.category_id = (?)', product_category.id]))
-      else
-        if asset == :events
-          # Ignore pagination for asset events
-          options.delete(:per_page)
-          options.delete(:page)
-          if date_range
-            @environment.send(asset).send('find', :all, options.merge(:conditions => [
-              'start_date BETWEEN :start_day AND :end_day OR end_date BETWEEN :start_day AND :end_day',
-                 {:start_day => date_range.first, :end_day => date_range.last}
-            ]))
-          else
-            @environment.send(asset).send('find', :all, options)
-          end
-        else
-          @environment.send(asset).send(finder_method, :all, options)
-        end
-      end
-    else
-      ferret_options = {:page => options.delete(:page), :per_page => options.delete(:per_page)}
-      if product_category && asset == :products
-        # SECURITY no risk of SQL injection, since product_category_ids comes from trusted source
-        @environment.send(asset).find_by_contents(query, ferret_options, options.merge({:include => 'product_categorizations', :conditions => 'product_categorizations.category_id = (%s)' % product_category.id }))
-      elsif product_category && asset == :enterprises
-        @environment.send(asset).find_by_contents(query, ferret_options, options.merge(:joins => 'inner join products on products.enterprise_id = profiles.id inner join product_categorizations on (product_categorizations.product_id = products.id)', :conditions => "product_categorizations.category_id = (#{product_category.id})"))
-      else
-        @environment.send(asset).find_by_contents(query, ferret_options, options)
-      end
-    end
-  end
-
-  def recent(asset, limit = nil)
-    find(asset, nil, :limit => limit)
-  end
-
-  def product_categories_count(asset, product_categories_ids, objects_ids=nil)
-    conditions = ['product_categorizations.category_id in (?)', product_categories_ids]
-
-    if asset == :products
-      if objects_ids
-        conditions[0] += ' and product_categorizations.product_id in (?)'
-        conditions << objects_ids
-      end
-      ProductCategory.find(:all, :select => 'categories.id, count(*) as total', :joins => 'inner join product_categorizations on (product_categorizations.category_id = categories.id)', :group => 'categories.id', :conditions => conditions )
-    elsif asset == :enterprises
-      if objects_ids
-        conditions[0] += ' and products.enterprise_id in (?)'
-        conditions << objects_ids
-      end
-      ProductCategory.find(
-        :all,
-        :select => 'categories.id, count(distinct products.enterprise_id) as total',
-        :joins => 'inner join product_categorizations on (product_categorizations.category_id = categories.id) inner join products on (products.id = product_categorizations.product_id)',
-        :group => 'categories.id', 
-        :conditions => conditions 
-      )
-    else
-      raise ArgumentError, 'only products and enterprises supported'
-    end.inject({}) do |results,pc| 
-        results[pc.id]= pc.total.to_i
-        results
-    end
-
-  end
-
-  protected
-
-  def asset_class(asset)
-    asset.to_s.singularize.camelize.constantize
-  end
-  
-  def asset_table(asset)
-    asset_class(asset).table_name
-  end
-
-end
 class Event < Article
  
+  def self.type_name
+    _('Event')
+  end
+
   settings_items :address, :type => :string
  
   def link=(value)
@@ -120,6 +124,10 @@ class Event &lt; Article
     true
   end
  
+  def notifiable?
+    true
+  end
+
   include Noosfero::TranslatableContent
   include MaybeAddHttp
  
@@ -14,7 +14,9 @@ class ExternalFeed &lt; ActiveRecord::Base
     article = TinyMceArticle.new(:name => title, :profile => blog.profile, :body => content, :published_at => date, :source => link, :profile => blog.profile, :parent => blog)
     unless blog.children.exists?(:slug => article.slug)
       article.save!
+      article.delay.create_activity
     end
+    article.valid?
   end
  
   def clear
 class Folder < Article
  
+  def self.type_name
+    _('Folder')
+  end
+
   validate :not_belong_to_blog
  
   def not_belong_to_blog
@@ -2,6 +2,10 @@ class Forum &lt; Folder
  
   acts_as_having_posts :order => 'updated_at DESC'
  
+  def self.type_name
+    _('Forum')
+  end
+
   def self.short_description
     _('Forum')
   end
@@ -24,4 +28,14 @@ class Forum &lt; Folder
   def self.icon_name(article = nil)
     'forum'
   end
+
+  def notifiable?
+    true
+  end
+
+  def first_paragraph
+    return '' if body.blank?
+    paragraphs = Hpricot(body).search('p')
+    paragraphs.empty? ? '' : paragraphs.first.to_html
+  end
 end
 class Gallery < Folder
  
+  def self.type_name
+    _('Gallery')
+  end
+
   def self.short_description
     _('Gallery')
   end
 class GoogleMaps
  
-  extend ActionView::Helpers::TagHelper
-
-  class << self
-
-    include ApplicationHelper
-
-    def enabled?(domain)
-      domain = Domain.find_by_name(domain)
-      domain ? !domain.google_maps_key.nil? : false
-    end
-
-    def key(domainname)
-      domain = Domain.find_by_name(domainname)
-      domain && domain.google_maps_key || ''
-    end
-
-    def initial_zoom
-      NOOSFERO_CONF['googlemaps_initial_zoom'] || 4
-    end
-
-    def api_url(domain)
-      "http://maps.google.com/maps?file=api&amp;v=2&amp;key=#{key(domain)}"
-    end
-
+  def self.initial_zoom
+    NOOSFERO_CONF['googlemaps_initial_zoom'] || 4
   end
+
 end
@@ -13,7 +13,7 @@ class Image &lt; ActiveRecord::Base
                  :thumbnails => { :big      => '150x150',
                                   :thumb    => '100x100',
                                   :portrait => '64x64',
-                                  :minor    => '50x50',
+                                  :minor    => '50x50>',
                                   :icon     => '20x20!' },
                  :max_size => 5.megabytes # remember to update validate message below
  
@@ -59,4 +59,7 @@ class Input &lt; ActiveRecord::Base
     return 0 if self.amount_used.blank? || self.price_per_unit.blank?
     self.amount_used * self.price_per_unit
   end
+
+  alias_method :price, :cost
+
 end
@@ -17,10 +17,10 @@ class LocationBlock &lt; Block
     if profile.lat
       block_title(title) +
       content_tag('div',
-      '<img src="http://maps.google.com/staticmap?center=' + profile.lat.to_s() +
+      '<img src="http://maps.google.com/maps/api/staticmap?center=' + profile.lat.to_s() +
       ',' + profile.lng.to_s() + '&zoom=' + zoom.to_s() +
       '&size=190x250&maptype=' + map_type + '&markers=' + profile.lat.to_s() + ',' +
-      profile.lng.to_s() + ',green&key=' + GoogleMaps::key(profile.default_hostname) + '&sensor=false"/>',
+      profile.lng.to_s() + ',green' + '&sensor=false"/>',
       :class => 'the-localization-map' )
     else
       content_tag('i', _('This profile has no geographical position registered.'))
@@ -0,0 +1,76 @@
+class NationalRegion < ActiveRecord::Base
+
+  def self.search_city(city_name, like = false, state = nil)
+
+    operator = "="
+    find_return = :first
+    adtional_contions = "";
+
+    if like
+     operator  = "like"
+     find_return = :all
+    end
+
+    if state
+      adtional_contions = " AND nr.name = :state "
+    end
+
+
+    conditions  = ["national_regions.name #{operator} :name AND
+                    national_regions.national_region_type_id = :type" + adtional_contions,
+                  {:name => city_name ,
+                   :type => NationalRegionType::CITY,
+                   :state => state}];
+
+    region = NationalRegion.find(find_return,
+                                  :select => "national_regions.name as city, nr.name as state, national_regions.national_region_code",
+                                  :conditions => conditions,
+                                  :joins => "LEFT JOIN national_regions as nr ON  national_regions.parent_national_region_code = nr.national_region_code",
+                                  :limit => 10
+                                  )
+    return region
+  end
+
+  def self.search_state(state_name, like = false)
+    operator = "="
+    find_return = :first
+
+    if like
+     operator  = "like"
+     find_return = :all
+    end
+
+     conditions  = ["national_regions.name #{operator} :name AND
+                    national_regions.national_region_type_id = :type",
+                  {:name => state_name,
+                   :type => NationalRegionType::STATE}];
+
+    region = NationalRegion.find(find_return,
+                                  :select => "national_regions.name as state, national_regions.national_region_code",
+                                  :conditions => conditions,
+                                  :limit => 10
+                                  )
+    return region
+   end
+
+  def self.validate!(city, state, country)
+
+    country_region = NationalRegion.find_by_national_region_code(country,
+                                                :conditions => ["national_region_type_id = :type",
+                                                               {:type => NationalRegionType::COUNTRY}])
+
+    if(country_region)
+
+      nregion = NationalRegion.search_city(city, false, state);
+
+      if nregion == nil
+        raise _('Invalid city or state name.')
+      end
+
+    end
+
+    return nregion
+
+  end
+
+end
@@ -0,0 +1,5 @@
+class NationalRegionType < ActiveRecord::Base
+  COUNTRY = 1
+  STATE   = 2
+  CITY    = 3
+end
@@ -18,7 +18,7 @@ class PeopleBlock &lt; ProfileListBlock
  
   def footer
     lambda do
-      link_to _('View all'), :controller => 'browse', :action => 'people'
+      link_to _('View all'), :controller => 'search', :action => 'people'
     end
   end
  
 # A person is the profile of an user holding all relationships with the rest of the system
 class Person < Profile
  
+  def self.type_name
+    _('Person')
+  end
+
   acts_as_trackable :after_add => Proc.new {|p,t| notify_activity(t)}
   acts_as_accessor
  
@@ -187,6 +191,9 @@ class Person &lt; Profile
   N_('Contact information'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code')
   settings_items :photo, :contact_information, :sex, :city, :state, :country, :zip_code
  
+  extend SetProfileRegionFromCityState::ClassMethods
+  set_profile_region_from_city_state
+
   def self.conditions_for_profiles(conditions, person)
     new_conditions = sanitize_sql(['role_assignments.accessor_id = ?', person])
     new_conditions << ' AND ' +  sanitize_sql(conditions) unless conditions.blank?
@@ -435,6 +442,10 @@ class Person &lt; Profile
     user.save!
   end
  
+  def activities
+    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.user_id = #{self.id} ORDER BY updated_at DESC")
+  end
+
   protected
  
   def followed_by?(profile)
 class Product < ActiveRecord::Base
   belongs_to :enterprise
+  has_one :region, :through => :enterprise
+  validates_presence_of :enterprise
+
   belongs_to :product_category
-  has_many :product_categorizations
-  has_many :product_qualifiers
-  has_many :qualifiers, :through => :product_qualifiers
+
   has_many :inputs, :dependent => :destroy, :order => 'position'
   has_many :price_details, :dependent => :destroy
   has_many :production_costs, :through => :price_details
  
+  has_many :product_qualifiers, :dependent => :destroy
+  has_many :qualifiers, :through => :product_qualifiers
+  has_many :certifiers, :through => :product_qualifiers
+
   validates_uniqueness_of :name, :scope => :enterprise_id, :allow_nil => true
   validates_presence_of :product_category_id
   validates_associated :product_category
@@ -15,35 +20,20 @@ class Product &lt; ActiveRecord::Base
   validates_numericality_of :price, :allow_nil => true
   validates_numericality_of :discount, :allow_nil => true
  
-  after_update :save_image
+  named_scope :more_recent, :order => "created_at DESC"
  
-  before_create do |p|
-    if p.enterprise
-      p['lat'] = p.enterprise.lat
-      p['lng'] = p.enterprise.lng
-    end
-  end
+  after_update :save_image
  
-  after_save do |p|
-    p.enterprise.product_updated if p.enterprise
+  def lat
+    self.enterprise.lat
   end
-
-  after_save do |p|
-    if (p.product_category && !ProductCategorization.find(:first, :conditions => {:category_id => p.product_category.id, :product_id => p.id})) || (!p.product_category)
-      ProductCategorization.remove_all_for(p)
-      if p.product_category
-        ProductCategorization.add_category_to_product(p.product_category, p)
-      end
-    end
+  def lng
+    self.enterprise.lng
   end
  
-  acts_as_searchable :fields => [ :name, :description, :category_full_name ]
-
   xss_terminate :only => [ :name ], :on => 'validation'
   xss_terminate :only => [ :description ], :with => 'white_list', :on => 'validation'
  
-  acts_as_mappable
-
   belongs_to :unit
  
   include FloatHelper
@@ -89,18 +79,12 @@ class Product &lt; ActiveRecord::Base
     self.find(:all, :order => 'id desc', :limit => limit)
   end
  
-  def enterprise_updated(e)
-    self.lat = e.lat
-    self.lng = e.lng
-    save!
-  end
-
   def url
     enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => id)
   end
  
   def public?
-    enterprise.public_profile
+    enterprise.public?
   end
  
   def formatted_value(method)
@@ -128,7 +112,6 @@ class Product &lt; ActiveRecord::Base
     end
   end
  
-  # Note: will probably be completely overhauled for AI1413
   def inputs_prices?
     return false if self.inputs.count <= 0
     self.inputs.each do |input|
@@ -155,7 +138,7 @@ class Product &lt; ActiveRecord::Base
   def qualifiers_list=(qualifiers)
     self.product_qualifiers.destroy_all
     qualifiers.each do |qualifier_id, certifier_id|
-      self.product_qualifiers.create(:qualifier_id => qualifier_id, :certifier_id => certifier_id)
+      self.product_qualifiers.create(:qualifier_id => qualifier_id, :certifier_id => certifier_id) if qualifier_id != 'nil'
     end
   end
  
@@ -213,4 +196,102 @@ class Product &lt; ActiveRecord::Base
     url_for({:host => enterprise.default_hostname, :controller => 'manage_products', :action => 'display_inputs_cost', :profile => enterprise.identifier, :id => self.id }.merge(Noosfero.url_options))
   end
  
+  def percentage_from_solidarity_economy
+    se_i = t_i = 0
+    self.inputs(true).each{ |i| t_i += 1; se_i += 1 if i.is_from_solidarity_economy }
+    t_i = 1 if t_i == 0 # avoid division by 0
+    p = case (se_i.to_f/t_i)*100
+        when 0..24.999 then [0, _("0%")];
+        when 25..49.999 then [25, _("25%")];
+        when 50..74.999 then [50, _("50%")];
+        when 75..99.999 then [75, _("75%")];
+        when 100 then [100, _("100%")];
+        end
+  end
+
+  private
+  def f_category
+    self.product_category.name
+  end
+  def f_region
+    self.enterprise.region.id if self.enterprise.region
+  end
+  def self.f_region_proc(id)
+    c = Region.find(id)
+    s = c.parent
+    if c and c.kind_of?(City) and s and s.kind_of?(State) and s.acronym
+      [c.name, ', ' + s.acronym]
+    else
+      c.name
+    end
+  end
+  def self.f_qualifier_proc(ids)
+    array = ids.split
+    qualifier = Qualifier.find_by_id array[0]
+    certifier = Certifier.find_by_id array[1]
+    certifier ? [qualifier.name, _(' cert. ') + certifier.name] : qualifier.name
+  end
+  def f_qualifier
+    product_qualifiers.map do |pq|
+      "#{pq.qualifier_id} #{pq.certifier_id}"
+    end
+  end
+
+  alias_method :name_sortable, :name
+  delegate :enabled, :region, :region_id, :environment, :environment_id, :to => :enterprise
+  def name_sortable # give a different name for solr
+    name
+  end
+  def public
+    self.public?
+  end
+  def price_sortable
+    (price.nil? or price.zero?) ? nil : price
+  end
+  def category_filter
+    enterprise.categories_including_virtual_ids << product_category_id
+  end
+  public
+
+  acts_as_faceted :fields => {
+      :f_category => {:label => _('Related products')},
+      :f_region => {:label => _('City'), :proc => proc { |id| f_region_proc(id) }},
+      :f_qualifier => {:label => _('Qualifiers'), :proc => proc { |id| f_qualifier_proc(id) }},
+    }, :category_query => proc { |c| "category_filter:#{c.id}" },
+    :order => [:f_category, :f_region, :f_qualifier]
+
+  Boosts = [
+    [:image, 0.55, proc{ |p| p.image ? 1 : 0}],
+    [:qualifiers, 0.45, proc{ |p| p.product_qualifiers.count > 0 ? 1 : 0}],
+    [:open_price, 0.45, proc{ |p| p.price_described? ? 1 : 0}],
+    [:solidarity, 0.45, proc{ |p| p.percentage_from_solidarity_economy[0].to_f/100 }],
+    [:available, 0.35, proc{ |p| p.available ? 1 : 0}],
+    [:price, 0.35, proc{ |p| (!p.price.nil? and p.price > 0) ? 1 : 0}],
+    [:new_product, 0.35, proc{ |p| (p.updated_at.to_i - p.created_at.to_i) < 24*3600 ? 1 : 0}],
+    [:description, 0.3, proc{ |p| !p.description.blank? ? 1 : 0}],
+    [:enabled, 0.2, proc{ |p| p.enterprise.enabled ? 1 : 0}],
+  ]
+
+  acts_as_searchable :fields => facets_fields_for_solr + [
+      # searched fields
+      {:name => {:type => :text, :boost => 2.0}},
+      {:description => :text}, {:category_full_name => :text},
+      # filtered fields
+      {:public => :boolean}, {:environment_id => :integer},
+      {:enabled => :boolean}, {:category_filter => :integer},
+      # ordered/query-boosted fields
+      {:price_sortable => :decimal}, {:name_sortable => :string},
+      {:lat => :float}, {:lng => :float},
+      :updated_at, :created_at,
+    ], :include => [
+      {:product_category => {:fields => [:name, :path, :slug, :lat, :lng, :acronym, :abbreviation]}},
+      {:region => {:fields => [:name, :path, :slug, :lat, :lng]}},
+      {:enterprise => {:fields => [:name, :identifier, :address, :nickname, :lat, :lng]}},
+      {:qualifiers => {:fields => [:name]}},
+      {:certifiers => {:fields => [:name]}},
+    ], :facets => facets_option_for_solr,
+    :boost => proc{ |p| boost = 1; Boosts.each{ |b| boost = boost * (1 - ((1 - b[2].call(p)) * b[1])) }; boost}
+  handle_asynchronously :solr_save
+  after_save_reindex [:enterprise], :with => :delayed_job
+
 end
@@ -1,13 +0,0 @@
-class ProductCategorization < ActiveRecord::Base
-  belongs_to :product_category, :foreign_key => 'category_id'
-  belongs_to :product
-
-  extend Categorization
-
-  class << self
-    alias :add_category_to_product :add_category_to_object
-    def object_id_column
-      :product_id
-    end
-  end
-end
 class ProductCategory < Category
+  # FIXME: do not allow category with products or inputs to be destroyed
   has_many :products
   has_many :inputs
  
@@ -9,4 +10,7 @@ class ProductCategory &lt; Category
   def self.menu_categories(top_category, env)
     top_category ? top_category.children : top_level_for(env).select{|c|c.kind_of?(ProductCategory)}
   end
+
+  after_save_reindex [:products], :with => :delayed_job
+
 end
@@ -3,6 +3,12 @@
 # which by default is the one returned by Environment:default.
 class Profile < ActiveRecord::Base
  
+  # use for internationalizable human type names in search facets
+  # reimplement on subclasses
+  def self.type_name
+    _('Profile')
+  end
+
   module Roles
     def self.admin(env_id)
       find_role('admin', env_id)
@@ -74,8 +80,6 @@ class Profile &lt; ActiveRecord::Base
  
   acts_as_having_boxes
  
-  acts_as_searchable :additional_fields => [ :extra_data_for_index ]
-
   acts_as_taggable
  
   def self.qualified_column_names
@@ -125,8 +129,6 @@ class Profile &lt; ActiveRecord::Base
  
   validates_length_of :description, :maximum => 550, :allow_nil => true
  
-  acts_as_mappable :default_units => :kms
-
   # Valid identifiers must match this format.
   IDENTIFIER_FORMAT = /^#{Noosfero.identifier_format}$/
  
@@ -183,8 +185,20 @@ class Profile &lt; ActiveRecord::Base
   has_many :profile_categorizations, :conditions => [ 'categories_profiles.virtual = ?', false ]
   has_many :categories, :through => :profile_categorizations
  
+  has_many :profile_categorizations_including_virtual, :class_name => 'ProfileCategorization'
+  has_many :categories_including_virtual, :through => :profile_categorizations_including_virtual, :source => :category
+
   has_many :abuse_complaints, :foreign_key => 'requestor_id'
  
+  def top_level_categorization
+    ret = {}
+    self.profile_categorizations.each do |c|
+      p = c.category.top_ancestor
+      ret[p] = (ret[p] || []) + [c.category]
+    end
+    ret
+  end
+
   def interests
     categories.select {|item| !item.is_a?(Region)}
   end
@@ -219,12 +233,15 @@ class Profile &lt; ActiveRecord::Base
     @pending_categorizations ||= []
   end
  
-  def add_category(c)
-    if self.id
-      ProfileCategorization.add_category_to_profile(c, self)
-    else
+  def add_category(c, reload=false)
+    if new_record?
       pending_categorizations << c
+    else
+      ProfileCategorization.add_category_to_profile(c, self)
+      self.categories(true)
+      self.solr_save
     end
+	 self.categories(reload)
   end
  
   def category_ids=(ids)
@@ -529,6 +546,7 @@ private :generate_url, :url_options
     other.top_level_articles.each do |a|
       copy_article_tree a
     end
+    self.articles.reload
   end
  
   def copy_article_tree(article, parent=nil)
@@ -824,18 +842,105 @@ private :generate_url, :url_options
     name
   end
  
-  protected
+  # Override in your subclasses
+  def activities
+    []
+  end
+
+  private
+  def self.f_categories_label_proc(environment)
+    ids = environment.top_level_category_as_facet_ids
+    r = Category.find(ids)
+    map = {}
+    ids.map{ |id| map[id.to_s] = r.detect{|c| c.id == id}.name }
+    map
+  end
+  def self.f_categories_proc(facet, id)
+    id = id.to_i
+    return if id.zero?
+    c = Category.find(id)
+    c.name if c.top_ancestor.id == facet[:label_id].to_i or facet[:label_id] == 0
+  end
+  def f_categories
+    category_ids - [region_id]
+  end
  
-    def followed_by?(person)
-      person.is_member_of?(self)
+  def f_region
+    self.region_id
+  end
+  def self.f_region_proc(id)
+    c = Region.find(id)
+    s = c.parent
+    if c and c.kind_of?(City) and s and s.kind_of?(State) and s.acronym
+      [c.name, ', ' + s.acronym]
+    else
+      c.name
     end
+  end
  
-    def display_private_info_to?(user)
-      if user.nil?
-        false
-      else
-        (user == self) || (user.is_admin?(self.environment)) || user.is_admin?(self) || user.memberships.include?(self)
-      end
+  def self.f_enabled_proc(enabled)
+    enabled = enabled == "true" ? true : false
+    enabled ? _('Enabled') : _('Not enabled')
+  end
+  def f_enabled
+    self.enabled
+  end
+
+  def name_sortable # give a different name for solr
+    name
+  end
+  def public
+    self.public?
+  end
+  def category_filter
+    categories_including_virtual_ids
+  end
+  public
+
+  acts_as_faceted :fields => {
+      :f_enabled => {:label => _('Situation'), :type_if => proc { |klass| klass.kind_of?(Enterprise) },
+        :proc => proc { |id| f_enabled_proc(id) }},
+      :f_region => {:label => _('City'), :proc => proc { |id| f_region_proc(id) }},
+      :f_categories => {:multi => true, :proc => proc {|facet, id| f_categories_proc(facet, id)},
+        :label => proc { |env| f_categories_label_proc(env) }, :label_abbrev => proc{ |env| f_categories_label_abbrev_proc(env) }},
+    }, :category_query => proc { |c| "category_filter:#{c.id}" },
+    :order => [:f_region, :f_categories, :f_enabled]
+
+  acts_as_searchable :fields => facets_fields_for_solr + [:extra_data_for_index,
+      # searched fields
+      {:name => {:type => :text, :boost => 2.0}},
+      {:identifier => :text}, {:address => :text}, {:nickname => :text},
+      # filtered fields
+      {:public => :boolean}, {:environment_id => :integer},
+      {:category_filter => :integer},
+      # ordered/query-boosted fields
+      {:name_sortable => :string}, {:user_id => :integer},
+      :enabled, :active, :validated, :public_profile,
+      {:lat => :float}, {:lng => :float},
+      :updated_at, :created_at,
+    ],
+    :include => [
+      {:region => {:fields => [:name, :path, :slug, :lat, :lng]}},
+      {:categories => {:fields => [:name, :path, :slug, :lat, :lng, :acronym, :abbreviation]}},
+    ], :facets => facets_option_for_solr,
+    :boost => proc{ |p| 10 if p.enabled }
+  after_save_reindex [:articles], :with => :delayed_job
+  handle_asynchronously :solr_save
+
+  def control_panel_settings_button
+    {:title => _('Profile Info and settings'), :icon => 'edit-profile'}
+  end 
+
+  def followed_by?(person)
+    person.is_member_of?(self)
+  end
+
+  def display_private_info_to?(user)
+    if user.nil?
+      false
+    else
+      (user == self) || (user.is_admin?(self.environment)) || user.is_admin?(self) || user.memberships.include?(self)
     end
+  end
  
 end
@@ -2,16 +2,19 @@ class Qualifier &lt; ActiveRecord::Base
  
   belongs_to :environment
  
-  has_many :qualifier_certifiers
+  has_many :qualifier_certifiers, :dependent => :destroy
   has_many :certifiers, :through => :qualifier_certifiers
  
+  has_many :product_qualifiers, :dependent => :destroy
+  has_many :products, :through => :product_qualifiers, :source => :product
+
   validates_presence_of :environment_id
   validates_presence_of :name
  
-  has_many :product_qualifiers, :dependent => :destroy
-
   def <=>(b)
     self.name.downcase.transliterate <=> b.name.downcase.transliterate
   end
  
+  after_save_reindex [:products], :with => :delayed_job
+
 end
 class QualifierCertifier < ActiveRecord::Base
   belongs_to :qualifier
   belongs_to :certifier
+
+  validates_presence_of :qualifier
 end
 class RawHTMLArticle < TextArticle
  
+  def self.type_name
+    _('HTML')
+  end
+
   def self.short_description
     _('Raw HTML text article.')
   end
@@ -5,19 +5,17 @@ class Region &lt; Category
   require_dependency 'enterprise' # enterprises can also be validators
  
   # searches for organizations that could become validators for this region.
-  # <tt>search</tt> is passed as is to ferret's find_by_contents on Organizatio
-  # find_by_contents on Organization class.
+  # <tt>search</tt> is passed as is to find_by_contents on Organization.
   def search_possible_validators(search)
-    Organization.find_by_contents(search).reject {|item| self.validator_ids.include?(item.id) }
+    Organization.find_by_contents(search)[:results].docs.reject {|item| self.validator_ids.include?(item.id) }
   end
  
   def has_validator?
     validators.count > 0
   end
  
-  def self.with_validators
-    Region.find(:all, :joins => 'INNER JOIN region_validators on (region_validators.region_id = categories.id)', :select => "distinct #{table_name}.*")
-  end
+  named_scope :with_validators, :group => 'id',
+    :joins => 'INNER JOIN region_validators on (region_validators.region_id = categories.id)'
  
 end
  
 class RssFeed < Article
  
+  def self.type_name
+    _('RssFeed')
+  end
+
   # i dont know why before filter dont work here
   def initialize(*args)
     super(*args)
@@ -12,6 +12,7 @@ class Scrap &lt; ActiveRecord::Base
   named_scope :not_replies, :conditions => {:scrap_id => nil}
  
   track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.receiver != s.sender}, :custom_target => :action_tracker_target 
+
   track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.receiver == s.sender}
  
   after_create do |scrap|
@@ -4,7 +4,7 @@
 #
 # The specific types of tasks <em>must</em> override the #perform method, so
 # the actual action associated to the type of task can be performed. See the
-# documentation of the #perform method for details. 
+# documentation of the #perform method for details.
 #
 # This class has a +data+ field of type <tt>text</tt>, where you can store any
 # type of data (as serialized Ruby objects) you need for your subclass (which
@@ -64,7 +64,9 @@ class Task &lt; ActiveRecord::Base
  
       begin
         target_msg = task.target_notification_message
-        TaskMailer.deliver_target_notification(task, target_msg) if target_msg
+        if target_msg && task.target && !task.target.notification_emails.empty?
+          TaskMailer.deliver_target_notification(task, target_msg)
+        end
       rescue NotImplementedError => ex
         RAILS_DEFAULT_LOGGER.info ex.to_s
       end
@@ -192,7 +194,7 @@ class Task &lt; ActiveRecord::Base
  
   # The message that will be sent to the *target* of the task when it is
   # created. The indent of this message is to notify the target about the
-  # request that was just created for him/her. 
+  # request that was just created for him/her.
   #
   # The implementation in this class returns +nil+, what makes the notification
   # not to be sent. If you want to send a notification to the target upon task
@@ -225,7 +227,9 @@ class Task &lt; ActiveRecord::Base
  
     begin
       target_msg = target_notification_message
-      TaskMailer.deliver_target_notification(self, target_msg) if target_msg
+       if target_msg && self.target && !self.target.notification_emails.empty?
+         TaskMailer.deliver_target_notification(self, target_msg)
+       end
     rescue NotImplementedError => ex
       RAILS_DEFAULT_LOGGER.info ex.to_s
     end
@@ -253,7 +257,7 @@ class Task &lt; ActiveRecord::Base
  
   # sends notification e-mail about a task, if the task has a requestor.
   #
-  # If 
+  # If
   def send_notification(action)
     if sends_email?
       if self.requestor
@@ -3,6 +3,10 @@ class TextArticle &lt; Article
  
   xss_terminate :only => [ :name ], :on => 'validation'
  
+  def self.type_name
+    _('Article')
+  end
+
   include Noosfero::TranslatableContent
  
   def self.icon_name(article = nil)
@@ -4,7 +4,11 @@
 # of the file itself is kept. (FIXME?)
 class UploadedFile < Article
  
-  track_actions :upload_image, :after_create, :keep_params => ["view_url", "thumbnail_path", "parent.url", "parent.name"], :if => Proc.new { |a| a.published? && a.image? && !a.parent.nil? && a.parent.gallery? }
+  def self.type_name
+    _('File')
+  end
+
+  track_actions :upload_image, :after_create, :keep_params => ["view_url", "thumbnail_path", "parent.url", "parent.name"], :if => Proc.new { |a| a.published? && a.image? && !a.parent.nil? && a.parent.gallery? }, :custom_target => :action_tracker_target
  
   include ShortFilename
  
@@ -25,7 +29,7 @@ class UploadedFile &lt; Article
   end
  
   def thumbnail_path
-    self.image? ? self.full_filename(:thumb).gsub(File.join(RAILS_ROOT, 'public'), '') : nil
+    self.image? ? self.full_filename(:display).gsub(File.join(RAILS_ROOT, 'public'), '') : nil
   end
  
   def display_title
@@ -140,4 +144,9 @@ class UploadedFile &lt; Article
   def uploaded_file?
     true
   end
+
+  def action_tracker_target
+    self
+  end
+
 end
@@ -5,7 +5,7 @@
   <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 => :browse, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></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>
@@ -1,11 +0,0 @@
-<li class="<%= 'browse-results-type-content ' + icon_for_article(result) %>">
-  <strong><%= link_to(result.title, result.view_url) %></strong>
-  <div class="item_meta">
-    <span class="item_by">
-    <%= _('by %s') % link_to(result.author.name, result.author.url) %>
-    </span>
-    <span class="extra-info">
-      <%= (@filter == 'more_recent' ? result.send(@filter + '_label') + show_date(result.created_at) : result.send(@filter + '_label')) %>
-    </span>
-  </div>
-</li>
@@ -1,19 +0,0 @@
-<div id="browse-results">
-
-  <div class='browse-results-innerbox'>
-    <% if @results.empty? %>
-      <div class="browse-results-type-empty">
-        <div> <%= _('None') %> </div>
-      </div><!-- end class="browse-results-innerbox" -->
-    <% end %>
-    <ul class='common-profile-list-block'>
-      <% @results.each do |result| %>
-        <%= render :partial => partial_for_class(result.class), :locals => {:result => result} %>
-      <% end %>
-    </ul>
-    <br style='clear: both;'>
-  </div>
-
-  <br style="clear:both" />
-</div><!-- end id="browse-results" -->
-
@@ -1,3 +0,0 @@
-<%= profile_image_link result, :portrait, 'li',
-                                "<span class='adr'>#{result.city}</span>" +
-                                (@filter == 'more_recent' ? result.send(@filter + '_label') + show_date(result.created_at) : result.send(@filter + '_label')) %>
@@ -1 +0,0 @@
-<%= profile_image_link result, :portrait, 'li', @filter == 'more_recent' ? result.send(@filter + '_label') + show_date(result.created_at) : result.send(@filter + '_label') %>
@@ -1,10 +0,0 @@
-<% form_tag( { :controller => 'browse', :action => action}, :method => 'get', :class => 'search_form' ) do %>
-
-  <div class="search-field">
-    <span class="formfield">
-      <%= text_field_tag 'query', @query, :size => 50 %>
-    </span>
-    <%= submit_button(:search, _('Search')) %>
-  </div>
-
-<% end %>
@@ -1,9 +0,0 @@
-<%= search_page_title( @title, { :query => @query} ) %>
-
-<%= render :partial => 'search_form', :locals => {:action => 'communities'} %>
-
-<%= render :partial => 'display_results' %>
-
-<%= pagination_links @results %>
-
-<br style="clear:both" />
@@ -1,9 +0,0 @@
-<%= search_page_title( @title, { :query => @query} ) %>
-
-<%= render :partial => 'search_form', :locals => {:action => 'contents'} %>
-
-<%= render :partial => 'display_results' %>
-
-<%= pagination_links @results %>
-
-<br style="clear:both" />
@@ -1,9 +0,0 @@
-<%= search_page_title( @title, { :query => @query} ) %>
-
-<%= render :partial => 'search_form', :locals => {:action => 'people'} %>
-
-<%= render :partial => 'display_results' %>
-
-<%= pagination_links @results %>
-
-<br style="clear:both" />
-<h1 id='agenda-title'>
-  <div id='agenda-toolbar'>
-    <%= button :back, _('Back to %s') % profile.name, profile.url %>
-    <% if user && user.has_permission?('post_content', profile) %>
-      <%= button :new, _('New event'), myprofile_url(:controller => 'cms', :action => 'new', :type => 'Event') %>
-    <% end %>
-  </div>
-   <%= _("%s's events") % profile.name %>
-</h1>
+<h1 id='agenda-title'><%= _("%s's events") % profile.name %></h1>
+
+<div id='agenda-toolbar'>
+  <%= button :back, _('Back to %s') % profile.name, profile.url %>
+  <% if user && user.has_permission?('post_content', profile) %>
+    <%= button :new, _('New event'), myprofile_url(:controller => 'cms', :action => 'new', :type => 'Event') %>
+  <% end %>
+</div>
+
+<div style="clear: both"></div>
  
 <%= render :partial => 'agenda' %>
-<%= javascript_include_tag :defaults, 'jquery-latest.js', 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery.cookie', 'reflection', 'add-and-join', 'jquery.tokeninput', 'report-abuse','colorbox', 'jquery-validation/jquery.validate', 'catalog', 'manage-products', :cache => 'cache-general' %>
+<%= javascript_include_tag :defaults, 'jquery-latest.js',
+'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
+'jquery-ui-1.8.2.custom.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', :cache => 'cache-general' %>
  
 <% language = FastGettext.locale %>
 <% %w{messages methods}.each do |type| %>
@@ -61,16 +61,10 @@
                 <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
               </div>
           </span>
-          <form action="/search" class="search_form clean" method="get" id="top-search">
-            <input name="query" size="15" value="<%=_('Search...')%>"
-                onfocus="this.form.className='focused';
-                         if(this.value=='<%=_('Search...')%>'){this.value=''}"
-                onblur="this.form.className='';
-                        if(/^\s*$/.test(this.value)){
-                          this.value='<%=_('Search...')%>';
-                          this.form.className='clean'
-                        }" />
+          <form action="/search" class="search_form" method="get" class="clean">
+            <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();' %>
           </form>
         </div><!-- end id="user" -->
  
-<%= select_certifiers(@qualifier) %>
-<%= button_to_function(:delete, '', "jQuery(this).parents('tr').remove()") %>
+<%= select_certifiers(@qualifier) + remove_qualifier_button %>
 <% javascript_tag do %>
   jQuery('#product-qualifiers-list *').removeClass('small-loading')
 <% end %>
 <div id='display-product-image'>
-  <%= image_tag (@product.reload.default_image('thumb')), :class => 'product-pic' %>
+  <%= image_tag (@product.reload.default_image('big')), :class => 'product-pic' %>
 </div>
  
+<% if @product.image %>
+  <%= link_to content_tag(:span, _('Zoom in')), @product.image.public_filename,
+    :class => 'zoomify-image' %>
+<% end %>
+<%= add_zoom_to_images %>
+
 <%= edit_product_link_to_remote(@product, 'image', _('Change image')) %>
@@ -39,8 +39,7 @@
           <%= select_qualifiers(@product, qualifier.id) %>
         </td>
         <td id='certifier-area-<%= index %>'>
-          <%= select_certifiers(qualifier, @product) %>
-          <%= button_to_function(:delete, content_tag('span', 'Delete qualifier'), "jQuery(this).parents('tr').remove()") %>
+          <%= select_certifiers(qualifier, @product) + remove_qualifier_button %>
         </td>
       </tr>
       <% end %>
@@ -48,9 +47,9 @@
     <%= button_to_function(
       :add,
       _('Add new qualifier'),
-      "new_qualifier_row('#product-qualifiers-list', '#{escape_javascript(select_qualifiers(@product))}')"
+      "new_qualifier_row('#product-qualifiers-list', '#{escape_javascript(select_qualifiers(@product))}', '#{escape_javascript(remove_qualifier_button)}')"
     ) %>
-    <%= hidden_field_tag "product[qualifiers_list]" %>
+    <%= hidden_field_tag "product[qualifiers_list][nil]" %>
   <% end %>
  
   <%= hidden_field_tag 'info-bar-update-url', @product.price_composition_bar_display_url, :class => 'bar-update-url' %>
@@ -9,7 +9,7 @@
   </div>
  
   <div id='product-details'>
-    <div id='product-image'>
+    <div id='product-image' class="zoomable-image">
       <%= render :partial => 'manage_products/display_image' %>
     </div>
     <div id='product-extra-content'>
@@ -0,0 +1,3 @@
+<div id="balloon">
+  <%= render :partial => 'search/product', :locals => {:product => @product} %>
+</div>
@@ -0,0 +1,28 @@
+<div id="balloon">
+  <table class='profile-info'>
+    <tr>
+      <td><div class='profile-info-picture'><%= profile_image(@profile, :thumb) %></div></td>
+      <td>
+        <strong><%= link_to(@profile.name, url_for(@profile.url)) %></strong><br/>
+        <% unless @profile.contact_email.nil? %>
+          <strong><%= _('E-Mail: ') + @profile.contact_email %></strong><br/>
+        <% end %>
+        <% unless @profile.contact_phone.nil? %>
+          <strong><%= _('Phone(s): ') + @profile.contact_phone %></strong><br/>
+        <% end %>
+        <% unless @profile.region.nil? %>
+          <strong><%= _('Location: ') + @profile.region.name %></strong><br/>
+        <% end %>
+        <% unless @profile.address.nil? %>
+          <strong><%= _('Address: ') + @profile.address %></strong><br/>
+        <% end %>
+        <% if @profile.respond_to?(:products) and !@profile.products.blank? %>
+          <strong><%= _('Products/Services: ') + @profile.products.map{|i| link_to(i.name, :controller => 'manage_products', :profile => @profile.identifier, :action => 'show', :id => i.id)}.join(', ') %></strong><br/>
+        <% end %>
+        <% if @profile.respond_to?(:distance) and !@profile.distance.nil? %>
+          <strong><%= _('Distance: ') + "%.2f%" % @profile.distance %></strong><br/>
+        <% end %>
+      </td>
+    </tr>
+  </table>
+</div>
@@ -0,0 +1,252 @@
+
+var geocoder;
+var map;
+var marker;
+var center;
+var move = true;
+var previousCenter;
+
+function getAddress(latlng) {
+  $('location-fields').addClassName("loading");
+
+   if (latlng != null) {
+    geocoder.geocode( {'latLng': latlng}, showAddress);
+   }
+}
+
+function codeAddress() {
+  $('location-fields').addClassName("loading");
+
+  var country_option = $('profile_data_country').value;
+  var address = $('profile_data_address').value + "-" + $('profile_data_zip_code').value + "," + $('profile_data_city').value+ "-" + $('profile_data_state').value + "," + country_option;
+
+  if (geocoder) {
+   geocoder.geocode( { 'address': address}, function(results, status) {
+     if (status == google.maps.GeocoderStatus.OK) {
+       map.setCenter(results[0].geometry.location);
+       marker.setPosition(results[0].geometry.location);
+       getAddress(marker.getPosition());
+
+       $('profile_data_lat').value = results[0].geometry.location.lat();
+       $('profile_data_lng').value = results[0].geometry.location.lng();
+       $('location-fields').removeClassName("loading");
+       enable_save();
+     } else {
+       $('location-fields').removeClassName("loading");
+       alert('<%=_("Address not found, reason:")%>' + translate_status(status));
+     }
+   });
+  }
+
+  map.setZoom(11);
+
+  return false;
+}
+
+function translate_status(status)
+{
+  var translated_status = '';
+
+  if (google.maps.GeocoderStatus.INVALID_REQUEST == status)
+    translated_status = '<%= _('Invalid address') %>';
+  else if (google.maps.GeocoderStatus.REQUEST_DENIED == status)
+    translated_status = '<%= _('Request denied') %>';
+  else if (google.maps.GeocoderStatus.OVER_QUERY_LIMIT == status)
+    translated_status = '<%= _('Over query limit') %>';
+  else if (google.maps.GeocoderStatus.ZERO_RESULTS == status)
+    translated_status = "<%= _('Address do not exist') %>";
+
+  return translated_status;
+}
+
+function getAddressData() {
+  var text = '';
+  var fields = [
+    'profile_data_country',
+    'profile_data_state',
+    'profile_data_city',
+    'profile_data_address',
+    'profile_data_zip_code'
+  ];
+  for (var i = 0; i < fields.length; i++) {
+    var field = fields[i];
+    if ($(field)) {
+      text += $(field).value + " ";
+    }
+  }
+  return text;
+}
+
+function showAddress(results, status) {
+
+  if (status == google.maps.GeocoderStatus.OK) {
+    map.setCenter(results[0].geometry.location);
+    updateFields(results[0]);
+
+  } else {
+    alert("<%=_("Address not found, reason:")%>" + translate_status(status));
+  }
+
+}
+
+function updateFields(place) {
+  var position = marker.getPosition();
+  $('profile_data_lat').value = position.lat();
+  $('profile_data_lng').value = position.lng();
+  $('location-fields').removeClassName("loading");
+
+  form = jQuery('#location-form')[0];
+  form.lat = marker.getPosition().lat();
+  form.lng = marker.getPosition().lng();
+
+  var components_len = place.address_components.size();
+
+  if(components_len <  2)
+  {
+    return false;
+  }
+
+  var components = place.address_components;
+  var address = "";
+  var zip_code = "";
+  var city = "";
+  var state = "";
+  var country_code = "";
+  var i = 0;
+
+  for( i =0 ; i < components_len; i ++)
+  {
+
+      if (components[i].types[0] == 'country')
+        country_code = components[i].short_name;
+      else if (components[i].types[0] == 'administrative_area_level_1')
+        state = components[i].long_name;
+      else if (components[i].types[0] == 'locality')
+        city  = components[i].long_name;
+      else if (components[i].types[0] == 'sublocality')
+        address  = components[i].long_name  + "-" + address;
+      else if (components[i].types[0] == "route")
+        address = components[i].long_name + address;
+      else if (components[i].types[0] == "street_number")
+        address =  address + "," + components[i].short_name ;
+      else if (components[i].types[0] == 'postal_code')
+        zip_code = components[i].short_name;
+  }
+
+  $('profile_data_country').value = country_code;
+  $('profile_data_state').value = state;
+  $('profile_data_address').value = address;
+  $('profile_data_city').value = city;
+  $('profile_data_zip_code').value = zip_code;
+}
+
+
+function initialize_map() {
+  geocoder = new google.maps.Geocoder();
+
+  var lat = <%= profile.lat || 'false' %>;
+  var lng = <%= profile.lng || 'false' %>;
+
+  if ( !(lat && lng) ) {
+    lat = -15.7605361485013;
+    lng = -47.933349609375;
+  }
+
+  var latlng = new google.maps.LatLng(lat,lng);
+
+  var myOptions = {
+    zoom: 8,
+    center: latlng,
+    mapTypeId: google.maps.MapTypeId.ROADMAP
+  }
+
+  center = latlng;
+
+  map = new google.maps.Map(document.getElementById("location-map"), myOptions);
+
+  continueLoadMapV3()
+}
+
+function continueLoadMapV3() {
+
+   marker = new google.maps.Marker({
+            position: center,
+            map: map,
+            draggable: true
+    });
+
+    google.maps.event.addListener(marker, "dragend", function() {
+      move = false;
+      getAddress(marker.getPosition());
+      enable_save();
+    });
+
+}
+
+window.onload = initialize_map;
+
+var delay_autocomplete = 500;
+
+jQuery.noConflict();
+jQuery(document).ready(function (){
+
+  jQuery.widget( "custom.catcomplete",jQuery.ui.autocomplete, {
+    _renderMenu: function( ul, items ) {
+      var self = this,
+      currentCategory = "";
+      jQuery.each( items, function( index, item ) {
+        if ( item.category != currentCategory ) {
+          ul.append( "<li class='ui-autocomplete-category'>" + item.category + "</li>" );
+          currentCategory = item.category;
+        }
+        self._renderItem( ul, item );
+      });
+    }
+  });
+
+
+  jQuery("#profile_data_city").catcomplete({
+    source: "../maps/search_city",
+    minLength: 3,
+    delay: delay_autocomplete,
+    select: function( event, ui ) { $('profile_data_state').value =( ui.item ? ui.item.category : this.value ); }
+  });
+
+  jQuery("#profile_data_state").autocomplete({
+    source: "../maps/search_state",
+    minLength: 3,
+    delay: delay_autocomplete
+  });
+
+  jQuery("#profile_data_city").keyup(function(){
+
+    disable_save();
+
+  });
+
+  jQuery("#profile_data_state").keyup(function(){
+
+    disable_save();
+
+  });
+
+  jQuery("#profile_data_country").change(function(){
+
+    disable_save();
+
+  });
+
+});
+
+function disable_save()
+{
+  jQuery('input[type="submit"]').attr("disabled", "true");
+  jQuery('input[type="submit"]').val('<%=_("Localize before save")%>');
+  jQuery('input[type="submit"]').addClass('disabled');
+}
+function enable_save()
+{
+  jQuery('input[type="submit"]').removeAttr("disabled");
+  jQuery('input[type="submit"]').val('<%=_("Save")%>');
+  jQuery('input[type="submit"]').removeClass('disabled');
+}
@@ -1,136 +0,0 @@
-<%= content_tag('script', '', :src => GoogleMaps.api_url(profile.default_hostname), :type => 'text/javascript') %>
-
-<script type="text/javascript" >
-  var geocoder;
-  var map;
-  var marker;
-  var center;
-  var move = true;
-  var previousCenter;
-
-  function getAddress(overlay, latlng) {
-    $('location-fields').addClassName("loading");
-    if (latlng != null) {
-      geocoder.getLocations(latlng, showAddress);
-    }
-  }
-
-  function getAddressData() {
-    var text = '';
-    var fields = [
-      'profile_data_country',
-      'profile_data_state',
-      'profile_data_city',
-      'profile_data_address',
-      'profile_data_zip_code'
-    ];
-    for (var i = 0; i < fields.length; i++) {
-      var field = fields[i];
-      if ($(field)) {
-        text += $(field).value + " ";
-      }
-    }
-    return text;
-  }
-
-  function showAddress(response) {
-    var message;
-    place = geoCodeAddress(response);
-    if ( place ) {
-      if ( move ) {
-        center = new GLatLng(place.Point.coordinates[1],place.Point.coordinates[0]);
-        marker.setLatLng(center);
-      } else {
-        move = true;
-      }
-      message = showMessage(place);
-      updateFields(place);
-    } else {
-      message  = showNotFoundMessage();
-    }
-    map.addOverlay(marker);
-    map.setCenter(marker.getLatLng());
-    marker.openInfoWindowHtml(message, {maxWidth:300});
-  }
-
-  function geoCodeAddress(response) {
-    if (!response || (response && response.Status.code != '200')) {
-      return false;
-    } else {
-      place = response.Placemark[0];
-      return place;
-    }
-  }
-
-  function showMessage(place) {
-    var message = '<b><%= _('Address:') %></b> ' + place.address + '<br>' +
-      '<b><%= _('Coordinates:') %></b> ' + place.Point.coordinates[0] + "," + place.Point.coordinates[1] + '<br>' +
-      '<b><%= _('Country code:') %></b> ' + place.AddressDetails.Country.CountryNameCode + '<br>';
-      return message;
-  }
-
-  function showNotFoundMessage() {
-    var message = '<%= _('Address not found') %>' + '<br>' +
-      '<b><%= _('Coordinates:') %></b> ' + marker.getLatLng().lng() + "," + marker.getLatLng().lat();
-    return message;
-  }
-
-  function updateFields(response) {
-    var position = marker.getLatLng();
-    $('profile_data_lat').value = position.lat();
-    $('profile_data_lng').value = position.lng();
-    $('location-fields').removeClassName("loading");
-  }
-
-  function loadMap() {
-    if (GBrowserIsCompatible()) {
-      map = new GMap2(document.getElementById("location-map"));
-      geocoder = new GClientGeocoder();
-      var lat = <%= profile.lat || 'false' %>;
-      var lng = <%= profile.lng || 'false' %>;
-      if ( lat && lng ) {
-        center = new GLatLng( lat, lng );
-        continueLoadMap();
-      } else {
-        geocoder.getLocations('<%= profile.geolocation %>', loadAddress);
-      }
-    }
-  }
-
-  function loadAddress(response) {
-    place = geoCodeAddress(response);
-    if ( move ) {
-      center = new GLatLng(place.Point.coordinates[1],place.Point.coordinates[0]);
-    }
-    continueLoadMap();
-  }
-
-  function continueLoadMap() {
-    marker = new GMarker(center, {draggable: true});
-    map.setCenter(center, 4);
-
-    map.addControl(new GLargeMapControl());
-    map.addControl(new GScaleControl());
-    map.addControl(new GMapTypeControl());
-
-    GEvent.addListener(marker, "dragstart", function() {
-      previousCenter = marker.getLatLng();
-      map.closeInfoWindow();
-    });
-
-    GEvent.addListener(marker, "dragend", function() {
-      move = false;
-      getAddress(overlay, marker.getLatLng());
-    });
-
-    GEvent.addListener(marker, "click", function() {
-      move = false;
-      getAddress(overlay, marker.getLatLng());
-    });
-
-    map.addOverlay(marker);
-  }
-
-  window.onload = loadMap;
-  window.unload = GUnload();
-</script>
 <h1><%= _('Location') %></h1>
+<div class="error">
+  <%= flash[:error] %>
+</div>
  
-<% form_for :profile_data, :url => {:action => 'edit_location'} do |f| %>
+<% form_for :profile_data, :url => {:action => 'edit_location'}, :html => {:id => 'location-form'} do |f| %>
  
   <div id='location-fields'>
-    <%= optional_field(profile, 'country', select_country(_('Country'), 'profile_data', 'country', {:class => 'type-select'})) %>
-    <%= optional_field(profile, 'state', labelled_form_field(_('State'), f.text_field(:state))) %>
-    <%= optional_field(profile, 'city', labelled_form_field(_('City'), f.text_field(:city))) %>
-    <%= optional_field(profile, 'zip_code', labelled_form_field(_('ZIP code'), text_field(:profile_data, :zip_code))) %>
-    <%= optional_field(profile, 'address', labelled_form_field(_('Address (street and number)'), text_field(:profile_data, :address))) %>
+    <%= select_country _('Country'), 'profile_data', 'country', {:class => 'type-select'} %>
+    <%= labelled_form_field _('State'), f.text_field(:state) %>
+    <%= labelled_form_field _('City'), f.text_field(:city) %>
+    <%= labelled_form_field _('ZIP code'), text_field(:profile_data, :zip_code) %>
+    <%= labelled_form_field _('Address (street and number)'), text_field(:profile_data, :address) %>
     <% button_bar do %>
-      <%= button_to_function :search, _('Locate in the map'), "getAddress(null, getAddressData())", :title => _("Locate the address informed above in the map below (note that you'll probably need to adjust the marker to get a precise position)")  %>
+      <%= button_to_function :search, _('Locate in the map'), "codeAddress()", :title => _("Locate the address informed above in the map below (note that you'll probably need to adjust the marker to get a precise position)")  %>
       <%= submit_button 'save', _('Save') %>
       <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
     <% end %>
   </div>
  
+  <p><%= _('Drag the balloon to find the exact location.') %> </p>
  
   <div style='overflow: hidden'>
     <p><div id="location-map"></div></p>
   </div>
  
-  <%= f.hidden_field(:lat) %>
-  <%= f.hidden_field(:lng) %>
-
-
-
-  <% button_bar do %>
-    <%= submit_button 'save', _('Save') %>
-    <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
-  <% end %>
+  <%= f.hidden_field :lat %>
+  <%= f.hidden_field :lng %>
  
 <% end %>
  
-<%= render :partial => 'google_map'%>
+<%= content_tag('script', '', :src => "http://maps.googleapis.com/maps/api/js?sensor=false", :type => 'text/javascript') %>
+<%= content_tag('script', '', :src => url_for(:controller => :maps, :action => :google_map), :type => 'text/javascript') %>
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => { :activity => activity, :tab_action => tab_action } %>
@@ -0,0 +1,67 @@
+<% Comment %>
+<% Profile %>
+<% Person %>
+
+<li class="article-comment" style='border-bottom:none;'>
+  <div class="article-comment-inner">
+
+  <div class="comment-content comment-logged-in">
+
+  <% if comment.author %>
+    <%= link_to image_tag(profile_icon(comment.author, :minor)),
+        Person.find(comment.author_id).url,
+        :class => 'comment-picture',
+        :title => comment.author_name
+    %>
+  <% end %>
+
+  <div class="comment-details">
+    <div class="comment-text">
+      <%= link_to(comment.author_name, comment.author.url) %>
+      <% unless comment.title.blank? %>
+        <span class="comment-title"><%= comment.title %></span><br/>
+      <% end %>
+      <%= txt2html comment.body %>
+    </div>
+    <div class="profile-activity-time">
+      <%= time_ago_as_sentence(comment.created_at) %>
+    </div>
+  </div>
+
+  <% if logged_in? && (user == profile || user == comment.author || user.has_permission?(:moderate_comments, profile)) %>
+    <% button_bar(:style => 'float: right; margin-top: 0px;') do %>
+      <%= icon_button(:delete, _('Remove'), { :action => :remove_comment, :comment_id => comment.id }, :method => :get, :confirm => _('Are you sure you want to remove this comment and all its replies?')) %>
+    <% end %>
+  <% end %>
+  <br style="clear: both;" />
+
+  <div class="comment_reply post_comment_box closed">
+    <% if @comment && @comment.errors.any? && @comment.reply_of_id.to_i == comment.id %>
+      <%= error_messages_for :comment %>
+      <script type="text/javascript">
+        jQuery(function() {
+          document.location.href = '#<%= comment.anchor %>';
+          add_comment_reply_form('#comment-reply-to-<%= comment.id %>', <%= comment.id %>);
+        });
+      </script>
+    <% end %>
+    <%= report_abuse(comment.author, :comment_link, comment) if comment.author %>
+    <%= link_to_function _('Reply'),
+        "var f = add_comment_reply_form(this, %s); f.find('input[name=comment[title]], textarea').val(''); return false" % comment.id,
+        :class => 'comment-footer comment-footer-link comment-footer-hide',
+        :id => 'comment-reply-to-' + comment.id.to_s
+    %>
+  </div>
+
+  </div>
+
+  <% unless comment.replies.blank? %>
+  <ul class="comment-replies">
+    <% comment.replies.each do |reply| %>
+      <%= render :partial => 'comment', :locals => { :comment => reply } %>
+    <% end %>
+  </ul>
+  <% end %>
+
+  </div>
+</li>
@@ -0,0 +1,22 @@
+<div class='profile-activity-image'>
+  <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+</div>
+<div class='profile-activity-description profile-activity-article-<%= activity.target.class.icon_name %>'>
+  <p class='profile-activity-text'>
+    <%= link_to activity.user.short_name(20), activity.user.url %>
+    <%= _("on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url) if activity.target.profile.is_a?(Community) %>
+  </p>
+  <div class='profile-activity-lead'>
+    <div class='article-name'><%= link_to(activity.params['name'], activity.params['url']) %></div>
+    <span title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-new<%= activity.target.class.icon_name %>'></span>
+    <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'], :length => 1000, :ommision => '...')).gsub(/(\xA0|\xC2|\s)+/, ' ').gsub(/^\s+/, '') %> <small><%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %></small>
+  </div>
+  <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>
+  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <div class='profile-wall-actions'>
+    <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
+    <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id, :only_hide => true}, :confirm => _('Are you sure?'), :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+  </div>
+</div>
+
+<%= render :partial => 'profile_comments', :locals => { :activity => activity, :tab_action => tab_action } %>
@@ -0,0 +1,13 @@
+<div class='profile-activity-image'>
+  <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+</div>
+<div class='profile-activity-description'>
+  <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
+  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <div class='profile-wall-actions'>
+    <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
+    <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+  </div>
+</div>
+
+<%= render :partial => 'profile_comments', :locals => { :activity => activity, :tab_action => tab_action } %>
@@ -0,0 +1 @@
+_add_member_in_community.rhtml
 \ No newline at end of file
-<%= @message %>
-<% unless @scraps.nil? %>
-  <%= render :partial => 'profile_scraps', :locals => {:scraps => @scraps} %>
-<% end %>
+<div class='profile-activity-image'>
+  <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+</div>
+<div class='profile-activity-description'>
+  <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
+  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <div class='profile-wall-actions'>
+    <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+  </div>
+</div>
+
+<br/>
@@ -0,0 +1 @@
+_leave_scrap.rhtml
 \ No newline at end of file
@@ -0,0 +1 @@
+_add_member_in_community.rhtml
 \ No newline at end of file
@@ -1,18 +0,0 @@
-<% activities.each do |activity| %>
-  <li class='profile-activity-item <%= activity.verb %>' id='profile-activity-item-<%= activity.id %>'>
-    <div class='profile-activity-image'>
-      <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
-    </div>
-    <div class='profile-activity-description'>
-      <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p>
-      <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-      <%= button_to_remote(:delete, content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if can_edit_profile %>
-    </div>
-    <hr />  
-  </li>
-<% end %>
-<% if activities.current_page < activities.total_pages %>
-  <div id='profile_activities_page_<%= activities.current_page %>'>
-    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_activities', :page => (activities.current_page + 1)}, :update => "profile_activities_page_#{activities.current_page}" %>
-  </div>
-<% end %>
@@ -0,0 +1,16 @@
+<% unless activities.nil? %>
+  <% activities.each do |a| %>
+    <% activity = a.klass.constantize.find(a.id) %>
+    <% if activity.kind_of?(ActionTracker::Record) %>
+      <%= render :partial => 'profile_activity', :locals => { :activity => activity, :tab_action => 'wall' } if activity.visible? %>
+    <% else %>
+      <%= render :partial => 'profile_scrap', :locals => {:scrap => activity } %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<% if activities.current_page < activities.total_pages %>
+  <div id='profile_activities_page_<%= activities.current_page %>'>
+    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_activities', :page => (activities.current_page + 1)}, :update => "profile_activities_page_#{activities.current_page}" %>
+  </div>
+<% end %>
@@ -0,0 +1,2 @@
+NÂO DEVE APARECER!!
+
-<div id='profile-activity'>
-  <h3><%= _("%s's activity") % @profile.name %></h3>
-  <ul>
-    <%= render :partial => 'profile_activities', :locals => {:activities => @activities} %>
-  </ul>
-</div>
+<li class='profile-activity-item <%= activity.verb %>' id='profile-activity-item-<%= activity.id %>'>
+  <%= render :partial => activity.verb, :locals => { :activity => activity, :tab_action => tab_action }%>
+  <hr />
+</li>
@@ -0,0 +1,20 @@
+<div id='profile-wall-reply-<%= activity.id%>'>
+  <div id='profile-wall-reply-form-<%= activity.id%>'>
+    <p class='profile-wall-reply'>
+      <% update_area = tab_action == 'wall' ? 'profile_activities' : 'network-activities' %>
+      <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity', :tab_action => tab_action}, :html => { :class => 'profile-wall-reply-form', 'data-update' => update_area } do %>
+        <%= text_area :comment, :body, {:id => "reply_content_#{activity.id}",
+                                        :cols => 50,
+                                        :rows => 1,
+                                        :class => 'submit-with-keypress',
+                                        :title => _('Leave your comment'),
+                                        :onfocus => ('if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + profile_icon(current_person, :icon, false) + ')"' if logged_in?),
+                                        :onblur => ('if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"' if logged_in?),
+                                        :value => _('Leave your comment'),
+                                        :style => 'color: #ccc' } %>
+        <%= hidden_field_tag :source_id, activity.id, :id => "activity_id_#{activity.id}" %>
+      <% end %>
+    </p>
+  </div>
+  <div id='profile-wall-message-response-<%=activity.id%>' class='profile-wall-message-response'></div>
+</div>
@@ -0,0 +1,13 @@
+<hr />
+
+<% if activity.comments_count > 2 %>
+  <div class='view-all-comments icon-chat'>
+    <%= link_to(_("View all %s comments") % activity.comments_count, '#') %>
+  </div>
+<% end %>
+
+<ul class="profile-wall-activities-comments" style="<%= 'display:none;' if (activity.comments_count > 2) %>" >
+  <%= render :partial => 'comment', :collection => activity.comments_as_thread %>
+</ul>
+
+<%= render :partial => 'profile_comment_form', :locals => { :activity => activity, :tab_action => tab_action } %>
 <h3><%= _("%s's network activity") % @profile.name %></h3>
-<ul>
+<ul id='network-activities' class='profile-activities'>
   <%= render :partial => 'profile_network_activities', :locals => {:network_activities => @network_activities} %>
 </ul>
-  <% network_activities.each do |activity| %>
-    <li class='profile-network-item <%= activity.verb %>' id='profile-network-item-<%= activity.id %>'>
-      <div class='profile-network-image'>
-        <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
-        <% if logged_in? && current_person.follows?(activity.user) && current_person != activity.user %>
-          <p class='profile-network-send-message'><%= link_to_function _('Scrap'), "hide_and_show(['#profile-network-message-response-#{activity.id}'],['#profile-network-message-#{activity.id}', '#profile-network-form-#{activity.id}']);$('content_#{activity.id}').value='';return false", :class => "profile-send-message", :title => _("Send a message to %s") % activity.user.name  %></p>
-        <% end %>
-      </div>
-      <div class='profile-network-description'>
-        <p class='profile-network-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p>
-        <p class='profile-network-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-        <%= button_to_remote(:delete, content_tag(:span, _('Remove')), :url =>{:action => 'remove_notification', :activity_id => activity.id}, :update => "profile-network-item-#{activity.id}") if can_edit_profile %>
-        <p class='profile-network-where'><%= _('In community %s') % link_to(activity.target.name, activity.target.url) if !profile.is_a?(Community) && activity.target.is_a?(Community) %></p>
-      </div>
-        <div id='profile-network-message-<%= activity.id%>' style='display:none;'>
-        <div id='profile-network-form-<%= activity.id%>' style='display:none;'>
-        <p class='profile-network-message'>
-          <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :not_load_scraps => true}, :update => "profile-network-message-response-#{activity.id}", :success =>"hide_and_show(['#profile-network-form-#{activity.id}'],['#profile-network-message-response-#{activity.id}'])" do %>
-            <%= limited_text_area :scrap, :content, 420, "content_#{activity.id}", :cols => 50, :rows => 2 %>
-            <%= hidden_field_tag 'receiver_id', activity.user.id %>
-            <%= submit_button :add, _('Leave a message') %>
-            <%= button_to_function :cancel, _('Cancel'), "hide_and_show(['#profile-network-message-#{activity.id}'],[]);return false" %>
-          <% end %>
-        </p>
-        </div>
-        <div id='profile-network-message-response-<%=activity.id%>' class='profile-network-message-response'></div>
-        </div>
-      <hr />  
-    </li>
-  <% end %>
+<% network_activities.each do |activity| %>
+  <%= render :partial => 'profile_activity', :locals => { :activity => activity, :tab_action => 'network' } if activity.visible? %>
+<% end %>
 <% if network_activities.current_page < network_activities.total_pages %>
   <div id='profile_network_activities_page_<%= network_activities.current_page %>'>
     <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_network_activities', :page => (network_activities.current_page + 1)}, :update => "profile_network_activities_page_#{network_activities.current_page}" %>
-<li class='profile-wall-item' id='profile-wall-item-<%= scrap.id %>'>
-  <div class='profile-wall-image'>
+<li class='profile-activity-item' id='profile-activity-item-<%= scrap.id %>'>
+  <div class='profile-activity-image'>
     <%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %>
-    <% if logged_in? && current_person.follows?(scrap.sender) && current_person != scrap.sender %>
-      <p class='profile-wall-send-message'><%= link_to_function _('Scrap'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-message-#{scrap.id}', '#profile-wall-form-#{scrap.id}']);$('content_#{scrap.id}').value='';return false", :class => "profile-send-message", :title => _("Send a message to %s") % scrap.sender.name %></p>
-    <% end %>
   </div>
-  <% comment_balloon :class => 'profile-wall-description' do %>
-    <p class='profile-wall-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
-    <p class='profile-wall-time'><%= time_ago_as_sentence(scrap.created_at) + ' ' + _('ago') %></p>
-    <p class='profile-wall-text'><%= txt2html scrap.content %></p>
-    <%= button_to_remote(:delete, content_tag(:span, _('Remove')), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-wall-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %>
-    <% if logged_in? && current_person.follows?(scrap.sender) && scrap.root.nil? %>
-      <p class='profile-wall-send-reply'><%= link_to_function _('Reply'), "hide_and_show(['#profile-wall-reply-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('scrap_id_#{scrap.id}').value='#{scrap.id}';return false", :class => "profile-send-reply icon-reply" %></p>
+  <div class='profile-activity-description'>
+    <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
+    <p class='profile-activity-text'><%= txt2html scrap.content %></p>
+    <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p>
+    <div class='profile-wall-actions'>
+    <% if logged_in? && current_person.follows?(scrap.sender) %>
+      <span class='profile-activity-send-reply'>
+        <%= link_to_function s_('profile|Comment'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();return false", :class => "profile-send-reply" %>
+      </span>
     <% end %>
+    <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-activity-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %>
+    </div>
+  </div>
+
+  <% if scrap.replies.count > 2 %>
+    <div class='view-all-comments icon-chat'>
+      <%= link_to(_("View all %s comments") % scrap.replies.count, '#') %>
+    </div>
   <% end %>
-  <ul class="profile-wall-scrap-replies">
+
+  <ul class="profile-wall-activities-comments scrap-replies" style="width: auto; <%= 'display:none;' if (scrap.replies.count > 2) %>" >
     <% scrap.replies.map do |reply| %>
       <%= render :partial => 'profile_scrap', :locals => {:scrap => reply} %>
     <% end %>
   </ul>
-  <div id='profile-wall-message-<%= scrap.id%>' style='display:none;'>
-    <div id='profile-wall-form-<%= scrap.id%>' style='display:none;'>
-      <p class='profile-wall-message'>
-        <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :not_load_scraps => true}, :update => "profile-wall-message-response-#{scrap.id}", :success =>"hide_and_show(['#profile-wall-form-#{scrap.id}'],['#profile-wall-message-response-#{scrap.id}'])" do %>
-          <%= limited_text_area :scrap, :content, 420, "content_#{scrap.id}", :cols => 50, :rows => 2 %>
-          <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
-          <%= submit_button :add, _('Leave a scrap') %>
-          <%= button_to_function :cancel, _('Cancel'), "hide_and_show(['#profile-wall-message-#{scrap.id}'],[]);return false" %>
-        <% end %>
-      </p>
-    </div>
-    <div id='profile-wall-message-response-<%=scrap.id%>' class='profile-wall-message-response'></div>
-  </div>
-  <div id='profile-wall-reply-<%= scrap.id%>' style='display:none;'>
-    <div id='profile-wall-reply-form-<%= scrap.id%>' style='display:none;'>
-      <p class='profile-wall-reply'>
-        <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap'}, :update => "profile_scraps", :success =>"hide_and_show(['#profile-wall-reply-form-#{scrap.id}'],['#profile-wall-reply-response-#{scrap.id}'])" do %>
-          <%= limited_text_area :scrap, :content, 420, "reply_content_#{scrap.id}", :cols => 50, :rows => 2 %>
-          <%= hidden_field :scrap, :scrap_id, :id => "scrap_id_#{scrap.id}" %>
-          <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
-          <%= submit_button :add, _('Leave a scrap') %>
-          <%= button_to_function :cancel, _('Cancel'), "hide_and_show(['#profile-wall-reply-#{scrap.id}'],[]);return false" %>
-        <% end %>
-      </p>
-    </div>
-    <div id='profile-wall-message-response-<%=scrap.id%>' class='profile-wall-message-response'></div>
-  </div>
+  <%= render :partial => 'profile_scrap_reply_form', :locals => { :scrap => scrap } %>
   <hr />  
 </li>
@@ -0,0 +1,20 @@
+<div id='profile-wall-reply-<%= scrap.id%>' style='display:none'>
+  <div id='profile-wall-reply-form-<%= scrap.id%>' style='display:none'>
+    <p class='profile-wall-reply'>
+      <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap'}, :update => "profile_activities", :html => { :class => 'profile-wall-reply-form'} do %>
+        <%= text_area :scrap, :content, { :id => "reply_content_#{scrap.id}",
+                                          :cols => 50,
+                                          :rows => 1,
+                                          :class => 'submit-with-keypress',
+                                          :title => _('Leave your comment'),
+                                          :onfocus => ('if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + profile_icon(current_person, :icon, false) + ')"' if logged_in?),
+                                          :onblur => ('if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"' if logged_in?),
+                                        :value => _('Leave your comment')
+                                        } %>
+        <%= hidden_field_tag 'scrap[scrap_id]', scrap.id %>
+        <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
+      <% end %>
+    </p>
+  </div>
+  <div id='profile-wall-message-response-<%=scrap.id%>' class='profile-wall-message-response'></div>
+</div>
-<% scraps.map do |scrap| %>
-  <%= render :partial => 'profile_scrap', :locals => {:scrap => scrap} %>
-<% end %>
-<% if scraps.current_page < scraps.total_pages %>
-  <div id='profile_scraps_page_<%= scraps.current_page %>'>
-    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_scraps', :page => (scraps.current_page + 1)}, :update => "profile_scraps_page_#{scraps.current_page}" %>
-  </div>
-<% end %>
+NÃO DEVE APARECER
 <h3><%= _("%s's wall") % @profile.name %></h3>
 <div id='leave_scrap'>
   <%= flash[:error] %>
-  <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_scraps', :success => "$('leave_scrap_content').value=''" do %>
+  <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''" do %>
     <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2 %>
-    <%= submit_button :scrap, _('Leave a scrap') %>
+    <%= submit_button :new, _('Share') %>
   <% end %>
 </div>
 <div id='leave_scrap_response'></div>
-<ul id='profile_scraps'>
-  <%= render :partial => 'profile_scraps', :locals => {:scraps => @wall_items} %>
+<ul id='profile_activities' class='profile-activities'>
+  <%= render :partial => 'profile_activities_list', :locals => {:activities => @activities} %>
 </ul>
...	...	@@ -40,6 +40,8 @@ commands and make sure you understand what you are doing):
40	40	cp config/database.yml.sqlite3 config/database.yml
41	41	# create tmp directory if it doesn't exist
42	42	mkdir tmp
	43	+ # start Solr
	44	+ rake solr:start
43	45	# create the development database
44	46	rake db:schema:load
45	47	# run pending migrations
...	...
...	...	@@ -13,8 +13,7 @@ You need to install some packages Noosfero depends on. On Debian GNU/Linux or
13	13	Debian-based systems, all of these packages are available through the Debian
14	14	archive. You can install them with the following command:
15	15
16		- # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libwill-paginate-ruby iso-codes libfeedparser-ruby libferret-ruby libdaemons-ruby thin tango-icon-theme libhpricot-ruby
17		-
	16	+ # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libwill-paginate-ruby iso-codes libfeedparser-ruby openjdk-6-jre libdaemons-ruby thin tango-icon-theme libhpricot-ruby
18	17
19	18	On other systems, they may or may not be available through your regular package
20	19	management system. Below are the links to their homepages.
...	...	@@ -24,7 +23,7 @@ management system. Below are the links to their homepages.
24	23	* po4a: http://po4a.alioth.debian.org/
25	24	* Ruby-sqlite3: http://rubyforge.org/projects/sqlite-ruby
26	25	* rcov: http://eigenclass.org/hiki/rcov
27		-* Ferret: http://ferret.davebalmain.com/trac
	26	+* Solr: http://lucene.apache.org/solr
28	27	* RMagick: http://rmagick.rubyforge.org/
29	28	* RedCloth: http://redcloth.org/
30	29	* will_paginate: http://github.com/mislav/will_paginate/wikis
...	...	@@ -104,7 +103,7 @@ $ tar -zxvf noosfero-0.35.0.tar.gz
104	103	$ ln -s noosfero-0.35.0 current
105	104	$ cd current
106	105
107		-Copy config/ferret_server.yml.dist to config/ferret_server.yml. You will
	106	+Copy config/solr.yml.dist to config/solr.yml. You will
108	107	probably not need to customize this configuration, but have a look at it.
109	108
110	109	Create the thin configuration file:
...	...	@@ -242,6 +241,10 @@ Compile the translations:
242	241
243	242	$ RAILS_ENV=production rake noosfero:translations:compile
244	243
	244	+Run Solr:
	245	+
	246	+$ rake solr:start
	247	+
245	248	Now we have to create some initial data. To create your default environment
246	249	(the first one), run the command below:
247	250
...	...
...	...	@@ -7,4 +7,6 @@ require 'rake'
7	7	require 'rake/testtask'
8	8	require 'rake/rdoctask'
9	9
	10	+ACTS_AS_SEARCHABLE_ENABLED = false if Rake.application.top_level_tasks.detect{\|t\| t == 'db:data:minimal'}
	11	+
10	12	require 'tasks/rails'
...	...
...	...	@@ -265,9 +265,10 @@ class CmsController < MyProfileController
265	265
266	266	def search
267	267	query = params[:q]
268		- results = query.blank? ? [] : profile.files.published.find_by_contents(query)
	268	+ results = query.blank? ? [] : profile.files.published.find_by_contents(query)[:results]
269	269	render :text => article_list_to_json(results), :content_type => 'application/json'
270	270	end
	271	+
271	272	def media_upload
272	273	files_uploaded = []
273	274	parent = check_parent(params[:parent_id])
...	...
...	...	@@ -6,16 +6,48 @@ class MapsController < MyProfileController
6	6	@profile_data = profile
7	7	if request.post?
8	8	begin
	9	+ country = params[:profile_data][:country]
	10	+ city = params[:profile_data][:city]
	11	+ state = params[:profile_data][:state]
	12	+ nregion = NationalRegion.validate!(city, state, country)
	13	+ unless nregion.blank?
	14	+ params[:profile_data][:national_region_code] = nregion.national_region_code
	15	+ end
	16	+
9	17	Profile.transaction do
10	18	if profile.update_attributes!(params[:profile_data])
11	19	session[:notice] = _('Address was updated successfully!')
12	20	redirect_to :action => 'edit_location'
13	21	end
14	22	end
15		- rescue
16		- flash[:error] = _('Address could not be saved.')
	23	+ rescue Exception => exc
	24	+ flash[:error] = exc.message
17	25	end
18	26	end
19	27	end
20	28
	29	+ def google_map
	30	+ render :partial => 'google_map.js'
	31	+ end
	32	+
	33	+ def search_city
	34	+
	35	+ term = params[:term];
	36	+
	37	+ regions = NationalRegion.search_city(term + "%", true).map {\|r\|{ :label => r.city , :category => r.state}}
	38	+
	39	+ render :json => regions
	40	+
	41	+ end
	42	+
	43	+ def search_state
	44	+
	45	+ term = params[:term];
	46	+
	47	+ regions = NationalRegion.search_state(term + "%", true).map {\|r\|{ :label => r.state}}
	48	+
	49	+ render :json => regions
	50	+
	51	+ end
	52	+
21	53	end
...	...
...	...	@@ -1,77 +0,0 @@
1		-class BrowseController < PublicController
2		-
3		- no_design_blocks
4		-
5		- FILTERS = %w(
6		- more_recent
7		- more_active
8		- more_popular
9		- more_comments
10		- more_views
11		- )
12		-
13		- def per_page
14		- 27
15		- end
16		-
17		- def people
18		- @filter = filter
19		- @title = self.filter_description(params[:action] + '_' + @filter )
20		-
21		- @results = @environment.people.visible.send(@filter)
22		-
23		- if !params[:query].blank?
24		- @results = @results.find_by_contents(params[:query])
25		- end
26		- @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
27		- end
28		-
29		- def communities
30		- @filter = filter
31		- @title = self.filter_description(params[:action] + '_' + @filter )
32		-
33		- @results = @environment.communities.visible.send(@filter)
34		-
35		- if !params[:query].blank?
36		- @results = @results.find_by_contents(params[:query])
37		- end
38		- @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
39		- end
40		-
41		- def contents
42		- @filter = filter
43		- @title = self.filter_description(params[:action] + '_' + @filter )
44		-
45		- @results = @environment.articles.published.text_articles.send(@filter)
46		-
47		- if !params[:query].blank?
48		- @results = @results.find_by_contents(params[:query])
49		- end
50		- @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
51		- end
52		-
53		- protected
54		-
55		- def filter
56		- if FILTERS.include?(params[:filter])
57		- params[:filter]
58		- else
59		- 'more_recent'
60		- end
61		- end
62		-
63		- def filter_description(str)
64		- {
65		- 'people_more_recent' => _('More recent people'),
66		- 'people_more_active' => _('More active people'),
67		- 'people_more_popular' => _('More popular people'),
68		- 'communities_more_recent' => _('More recent communities'),
69		- 'communities_more_active' => _('More active communities'),
70		- 'communities_more_popular' => _('More popular communities'),
71		- 'contents_more_recent' => _('More recent contents'),
72		- 'contents_more_views' => _('Most viewed contents'),
73		- 'contents_more_comments' => _('Most commented contents'),
74		- }[str] \|\| str
75		- end
76		-
77		-end
...	...	@@ -0,0 +1,30 @@
	1	+class MapBalloonController < PublicController
	2	+
	3	+ helper SearchHelper
	4	+
	5	+ before_filter :load_profile, :only => [:person, :enterprise, :community]
	6	+
	7	+ def product
	8	+ @product = Product.find(params[:id])
	9	+ render :action => 'product', :layout => false
	10	+ end
	11	+
	12	+ def person
	13	+ render :action => 'profile', :layout => false
	14	+ end
	15	+
	16	+ def enterprise
	17	+ render :action => 'profile', :layout => false
	18	+ end
	19	+
	20	+ def community
	21	+ render :action => 'profile', :layout => false
	22	+ end
	23	+
	24	+ protected
	25	+
	26	+ def load_profile
	27	+ @profile = Profile.find(params[:id])
	28	+ end
	29	+
	30	+end
...	...
...	...	@@ -3,17 +3,15 @@ class ProfileController < PublicController
3	3	needs_profile
4	4	before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
5	5	before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse]
6		- before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_scraps, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report]
	6	+ before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity]
7	7
8	8	helper TagsHelper
9	9
10	10	def index
11		- @activities = @profile.tracked_actions.paginate(:per_page => 30, :page => params[:page])
12		- @wall_items = []
13		- @network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page]) : []
	11	+ @network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) : []
14	12	if logged_in? && current_person.follows?(@profile)
15		- @network_activities = @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page]) if @network_activities.empty?
16		- @wall_items = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page])
	13	+ @network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) if @network_activities.empty?
	14	+ @activities = @profile.activities.paginate(:per_page => 15, :page => params[:page])
17	15	end
18	16	@tags = profile.article_tags
19	17	unless profile.display_info_to?(user)
...	...	@@ -180,22 +178,33 @@ class ProfileController < PublicController
180	178	@scrap.receiver= receiver
181	179	@tab_action = params[:tab_action]
182	180	@message = @scrap.save ? _("Message successfully sent.") : _("You can't leave an empty message.")
183		- @scraps = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page]) if params[:not_load_scraps].nil?
184		- render :partial => 'leave_scrap'
	181	+ activities = @profile.activities.paginate(:per_page => 15, :page => params[:page]) if params[:not_load_scraps].nil?
	182	+ render :partial => 'profile_activities_list', :locals => {:activities => activities}
185	183	end
186	184
187		- def view_more_scraps
188		- @scraps = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page])
189		- render :partial => 'profile_scraps', :locals => {:scraps => @scraps}
	185	+ def leave_comment_on_activity
	186	+ @comment = Comment.new(params[:comment])
	187	+ @comment.author = user
	188	+ @activity = ActionTracker::Record.find(params[:source_id])
	189	+ @comment.source_type, @comment.source_id = (@activity.target_type == 'Article' ? ['Article', @activity.target_id] : [@activity.class.to_s, @activity.id])
	190	+ @tab_action = params[:tab_action]
	191	+ @message = @comment.save ? _("Comment successfully added.") : _("You can't leave an empty comment.")
	192	+ if @tab_action == 'wall'
	193	+ activities = @profile.activities.paginate(:per_page => 15, :page => params[:page]) if params[:not_load_scraps].nil?
	194	+ render :partial => 'profile_activities_list', :locals => {:activities => activities}
	195	+ else
	196	+ network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page])
	197	+ render :partial => 'profile_network_activities', :locals => {:network_activities => network_activities}
	198	+ end
190	199	end
191	200
192	201	def view_more_activities
193		- @activities = @profile.tracked_actions.paginate(:per_page => 30, :page => params[:page])
194		- render :partial => 'profile_activities', :locals => {:activities => @activities}
	202	+ @activities = @profile.activities.paginate(:per_page => 10, :page => params[:page])
	203	+ render :partial => 'profile_activities_list', :locals => {:activities => @activities}
195	204	end
196	205
197	206	def view_more_network_activities
198		- @activities = @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page])
	207	+ @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page])
199	208	render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}
200	209	end
201	210
...	...	@@ -213,7 +222,11 @@ class ProfileController < PublicController
213	222	begin
214	223	raise if !can_edit_profile
215	224	activity = ActionTracker::Record.find(params[:activity_id])
216		- activity.destroy
	225	+ if params[:only_hide]
	226	+ activity.update_attribute(:visible, false)
	227	+ else
	228	+ activity.destroy
	229	+ end
217	230	render :text => _('Activity successfully removed.')
218	231	rescue
219	232	render :text => _('You could not remove this activity')
...	...	@@ -285,6 +298,16 @@ class ProfileController < PublicController
285	298	end
286	299	end
287	300
	301	+ def remove_comment
	302	+ #FIXME Check whether these permissions are enough
	303	+ @comment = Comment.find(params[:comment_id])
	304	+ if (user == @comment.author \|\| user == profile \|\| user.has_permission?(:moderate_comments, profile))
	305	+ @comment.destroy
	306	+ session[:notice] = _('Comment successfully deleted')
	307	+ end
	308	+ redirect_to :action => :index
	309	+ end
	310	+
288	311	protected
289	312
290	313	def check_access_to_profile
...	...
...	...	@@ -8,11 +8,10 @@ class ProfileSearchController < PublicController
8	8	def index
9	9	@q = params[:q]
10	10	unless @q.blank?
11		- @filtered_query = remove_stop_words(@q)
12	11	if params[:where] == 'environment'
13	12	redirect_to :controller => 'search', :query => @q
14	13	else
15		- @results = profile.articles.published.find_by_contents(@filtered_query).paginate(:per_page => 10, :page => params[:page])
	14	+ @results = profile.articles.published.find_by_contents(@q, {:per_page => 10, :page => params[:page]})[:results]
16	15	end
17	16	end
18	17	end
...	...
1	1	class SearchController < PublicController
2	2
3	3	helper TagsHelper
	4	+ include SearchHelper
	5	+ include ActionView::Helpers::NumberHelper
4	6
5	7	before_filter :load_category
6		- before_filter :prepare_filter
7		- before_filter :check_search_whole_site
8	8	before_filter :load_search_assets
9		- before_filter :check_valid_assets, :only => [ :assets ]
	9	+ before_filter :load_query
10	10
11	11	no_design_blocks
12	12
13		- protected
	13	+ def facets_browse
	14	+ @asset = params[:asset]
	15	+ @asset_class = asset_class(@asset)
14	16
15		- def load_search_assets
16		- @search_in = where_to_search
17		- @searching = {}
18		- @search_in.each do \|key, name\|
19		- @searching[key] = (params[:asset].blank? && (params[:find_in].nil? \|\| params[:find_in].empty? \|\| params[:find_in].include?(key.to_s))) \|\| (params[:asset] == key.to_s)
20		- end
	17	+ @facets_only = true
	18	+ send(@asset)
	19	+
	20	+ @facet = @asset_class.map_facets_for(environment).find { \|facet\| facet[:id] == params[:facet_id] }
	21	+ raise 'Facet not found' if @facet.nil?
	22	+
	23	+ render :layout => false
21	24	end
22	25
23		- def prepare_filter
24		- if @category
25		- @noosfero_finder = CategoryFinder.new(@category)
	26	+ def articles
	27	+ if !@empty_query
	28	+ full_text_search ['public:true']
26	29	else
27		- @noosfero_finder = EnvironmentFinder.new(@environment)
	30	+ @results[@asset] = @environment.articles.public.send(@filter).paginate(paginate_options)
28	31	end
29	32	end
30	33
31		- def check_search_whole_site
32		- if params[:search_whole_site_yes] or params[:search_whole_site] == 'yes'
33		- redirect_to params.merge(:category_path => [], :search_whole_site => nil, :search_whole_site_yes => nil)
34		- end
	34	+ def contents
	35	+ redirect_to params.merge(:action => :articles)
35	36	end
36	37
37		- def check_valid_assets
38		- @asset = params[:asset].to_sym
39		- if !where_to_search.map(&:first).include?(@asset)
40		- render :text => 'go away', :status => 403
41		- return
	38	+ def people
	39	+ if !@empty_query
	40	+ full_text_search ['public:true']
	41	+ else
	42	+ @results[@asset] = @environment.people.visible.send(@filter).paginate(paginate_options)
42	43	end
43	44	end
44	45
45		- def events
46		- @category_id = @category ? @category.id : nil
47		-
48		- @selected_day = nil
49		- @events_of_the_day = []
50		- date = build_date(params[:year], params[:month], params[:day])
51		-
52		- if params[:day] \|\| !params[:year] && !params[:month]
53		- @selected_day = date
54		- if @category_id and Category.exists?(@category_id)
55		- @events_of_the_day = environment.events.by_day(@selected_day).in_category(Category.find(@category_id))
	46	+ def products
	47	+ public_filters = ['public:true', 'enabled:true']
	48	+ if !@empty_query
	49	+ full_text_search public_filters
	50	+ else
	51	+ @one_page = true
	52	+ @geosearch = logged_in? && current_user.person.lat && current_user.person.lng
	53	+
	54	+ extra_limit = LIST_SEARCH_LIMIT*5
	55	+ sql_options = {:limit => LIST_SEARCH_LIMIT, :order => 'random()'}
	56	+ if @geosearch
	57	+ full_text_search public_filters, :sql_options => sql_options, :extra_limit => extra_limit,
	58	+ :alternate_query => "{!boost b=recip(geodist(),#{"%e" % (1.to_f/DistBoost)},1,1)}",
	59	+ :radius => DistFilt, :latitude => current_user.person.lat, :longitude => current_user.person.lng
56	60	else
57		- @events_of_the_day = environment.events.by_day(@selected_day)
	61	+ full_text_search public_filters, :sql_options => sql_options, :extra_limit => extra_limit,
	62	+ :boost_functions => ['recip(ms(NOW/HOUR,updated_at),1.3e-10,1,1)']
58	63	end
59	64	end
60		-
61		- events = @results[:events]
62		-
63		- @calendar = populate_calendar(date, events)
64		- @previous_calendar = populate_calendar(date - 1.month, events)
65		- @next_calendar = populate_calendar(date + 1.month, events)
66	65	end
67	66
68		- def people
69		- #nothing, just to enable
70		- end
71	67	def enterprises
72		- load_product_categories_menu(:enterprises)
73		- @categories_menu = true
74		- end
75		- def communities
76		- #nothing, just to enable
77		- end
78		- def articles
79		- #nothins, just to enable
80		- end
81		-
82		- def products
83		- load_product_categories_menu(:products)
84		- @categories_menu = true
	68	+ if !@empty_query
	69	+ full_text_search ['public:true']
	70	+ else
	71	+ @filter_title = _('Enterprises from network')
	72	+ @results[@asset] = @environment.enterprises.visible.paginate(paginate_options)
	73	+ end
85	74	end
86	75
87		- def load_product_categories_menu(asset)
88		- @results[asset].uniq!
89		- # REFACTOR DUPLICATED CODE inner loop doing the same thing that outter loop
90		-
91		- if !@query.blank? \|\| @region && !params[:radius].blank?
92		- @result_ids = @noosfero_finder.find(asset, @filtered_query, calculate_find_options(asset, nil, params[:page], @product_category, @region, params[:radius], params[:year], params[:month]).merge({:limit => :all}))
	76	+ def communities
	77	+ if !@empty_query
	78	+ full_text_search ['public:true']
	79	+ else
	80	+ @results[@asset] = @environment.communities.visible.send(@filter).paginate(paginate_options)
93	81	end
94		-
95	82	end
96	83
97		- def calculate_find_options(asset, limit, page, product_category, region, radius, year, month)
98		- result = { :product_category => product_category, :per_page => limit, :page => page }
99		- if [:enterprises, :people, :products].include?(asset) && region
100		- result.merge!(:within => radius, :region => region.id)
101		- end
	84	+ def events
	85	+ year = (params[:year] ? params[:year].to_i : Date.today.year)
	86	+ month = (params[:month] ? params[:month].to_i : Date.today.month)
	87	+ day = (params[:day] ? params[:day].to_i : Date.today.day)
	88	+ date = build_date(params[:year], params[:month], params[:day])
	89	+ date_range = (date - 1.month)..(date + 1.month).at_end_of_month
102	90
103		- if month \|\| year
104		- date = Date.new(year.to_i, month.to_i, 1)
105		- result[:date_range] = (date - 1.month)..(date + 1.month).at_end_of_month
	91	+ @selected_day = nil
	92	+ @events_of_the_day = []
	93	+ if params[:day] \|\| !params[:year] && !params[:month]
	94	+ @selected_day = date
	95	+ @events_of_the_day = @category ?
	96	+ environment.events.by_day(@selected_day).in_category(Category.find(@category_id)) :
	97	+ environment.events.by_day(@selected_day)
106	98	end
107	99
108		- result
109		- end
110		-
111		- # limit the number of results per page
112		- # TODO: dont hardcore like this
113		- def limit
114		- searching = @searching.values.select{\|v\|v}
115		- if params[:display] == 'map'
116		- 2000
	100	+ if !@empty_query
	101	+ full_text_search
117	102	else
118		- (searching.size == 1) ? 20 : 6
	103	+ @results[@asset] = date_range ? environment.events.by_range(date_range) : environment.events
119	104	end
120		- end
121		-
122		- public
123		-
124		- include SearchHelper
125		-
126		- ######################################################
127		-
128		- def where_to_search
129		- [
130		- [ :articles, N_('Articles') ],
131		- [ :enterprises, N_('Enterprises') ],
132		- [ :people, N_('People') ],
133		- [ :communities, N_('Communities') ],
134		- [ :products, N_('Products') ],
135		- [ :events, N_('Events') ]
136		- ].select {\|key, name\| !environment.enabled?('disable_asset_' + key.to_s) }
137		- end
138	105
139		- def cities
140		- @cities = City.find(:all, :order => 'name', :conditions => ['parent_id = ? and lat is not null and lng is not null', params[:state_id]])
141		- render :action => 'cities', :layout => false
142		- end
143		-
144		- def complete_region
145		- # FIXME this logic should be in the model
146		- @regions = Region.find(:all, :conditions => [ '(name like ? or name like ?) and lat is not null and lng is not null', '%' + params[:region][:name] + '%', '%' + params[:region][:name].capitalize + '%' ])
147		- render :action => 'complete_region', :layout => false
	106	+ events = @results[@asset]
	107	+ @calendar = populate_calendar(date, events)
	108	+ @previous_calendar = populate_calendar(date - 1.month, events)
	109	+ @next_calendar = populate_calendar(date + 1.month, events)
148	110	end
149	111
150	112	def index
151		- @query = params[:query] \|\| ''
152		- @filtered_query = remove_stop_words(@query)
153		- @product_category = ProductCategory.find(params[:product_category]) if params[:product_category]
154		-
155		- @region = City.find_by_id(params[:city]) if !params[:city].blank? && params[:city] =~ /^\d+$/
156		-
157		- # how many assets we are searching for?
158		- number_of_result_assets = @searching.values.select{\|v\| v}.size
159		-
160	113	@results = {}
161	114	@order = []
162	115	@names = {}
	116	+ @results_only = true
163	117
164		- where_to_search.select { \|key,description\| @searching[key] }.each do \|key, description\|
	118	+ @enabled_searches.select { \|key,description\| @searching[key] }.each do \|key, description\|
	119	+ load_query
	120	+ @asset = key
	121	+ send(key)
165	122	@order << key
166		- @results[key] = @noosfero_finder.find(key, @filtered_query, calculate_find_options(key, limit, params[:page], @product_category, @region, params[:radius], params[:year], params[:month]))
167	123	@names[key] = getterm(description)
168	124	end
	125	+ @asset = nil
	126	+ @facets = {}
169	127
170		- if @results.keys.size == 1
171		- specific_action = @results.keys.first
172		- if respond_to?(specific_action)
173		- @asset_name = getterm(@names[@results.keys.first])
174		- send(specific_action)
175		- render :action => specific_action
176		- return
177		- end
178		- end
179		-
180		- render :action => 'index'
	128	+ render :action => @results.keys.first if @results.keys.size == 1
181	129	end
182	130
183		- alias :assets :index
184		-
185		- #######################################################
	131	+ # keep old URLs workings
	132	+ def assets
	133	+ params[:action] = params[:asset].is_a?(Array) ? :index : params.delete(:asset)
	134	+ redirect_to params
	135	+ end
186	136
187	137	# view the summary of one category
188	138	def category_index
189	139	@results = {}
190	140	@order = []
191	141	@names = {}
	142	+ limit = MULTIPLE_SEARCH_LIMIT
192	143	[
193		- [ :people, _('People'), @noosfero_finder.recent('people', limit) ],
194		- [ :enterprises, __('Enterprises'), @noosfero_finder.recent('enterprises', limit) ],
195		- [ :products, _('Products'), @noosfero_finder.recent('products', limit) ],
196		- [ :events, _('Upcoming events'), @noosfero_finder.upcoming_events({:per_page => limit}) ],
197		- [ :communities, __('Communities'), @noosfero_finder.recent('communities', limit) ],
198		- [ :most_commented_articles, _('Most commented articles'), @noosfero_finder.most_commented_articles(limit) ],
199		- [ :articles, _('Articles'), @noosfero_finder.recent('text_articles', limit) ]
200		- ].each do \|key, name, list\|
201		- @order << key
202		- @results[key] = list
203		- @names[key] = name
	144	+ [ :people, _('People'), :recent_people ],
	145	+ [ :enterprises, _('Enterprises'), :recent_enterprises ],
	146	+ [ :products, _('Products'), :recent_products ],
	147	+ [ :events, _('Upcoming events'), :upcoming_events ],
	148	+ [ :communities, _('Communities'), :recent_communities ],
	149	+ [ :articles, _('Contents'), :recent_articles ]
	150	+ ].each do \|asset, name, filter\|
	151	+ @order << asset
	152	+ @results[asset] = @category.send(filter, limit)
	153	+ raise "No total_entries for: #{asset}" unless @results[asset].respond_to?(:total_entries)
	154	+ @names[asset] = name
204	155	end
205	156	end
206		- attr_reader :category
207	157
208	158	def tags
209	159	@tags_cache_key = "tags_env_#{environment.id.to_s}"
...	...	@@ -216,25 +166,137 @@ class SearchController < PublicController
216	166	@tag = params[:tag]
217	167	@tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_env_#{environment.id.to_s}_page_#{params[:npage]}"
218	168	if is_cache_expired?(@tag_cache_key)
219		- @tagged = environment.articles.find_tagged_with(@tag).paginate(:per_page => 10, :page => params[:npage])
	169	+ @results[@asset] = environment.articles.find_tagged_with(@tag).paginate(paginate_options)
220	170	end
221	171	end
222	172
	173	+ def events_by_day
	174	+ @selected_day = build_date(params[:year], params[:month], params[:day])
	175	+ @events_of_the_day = environment.events.by_day(@selected_day)
	176	+ render :partial => 'events/events_by_day'
	177	+ end
	178	+
223	179	#######################################################
	180	+ protected
	181	+
	182	+ def load_query
	183	+ @asset = params[:action].to_sym
	184	+ @order \|\|= [@asset]
	185	+ @results \|\|= {}
	186	+ @filter = filter
	187	+ @filter_title = filter_description(@asset, @filter)
224	188
225		- def popup
226		- @regions = Region.find(:all).select{\|r\|r.lat && r.lng}
227		- render :action => 'popup', :layout => false
	189	+ @query = params[:query] \|\| ''
	190	+ @empty_query = @category.nil? && @query.blank?
228	191	end
229	192
230		- def events_by_day
231		- @selected_day = build_date(params[:year], params[:month], params[:day])
232		- if params[:category_id] and Category.exists?(params[:category_id])
233		- @events_of_the_day = environment.events.by_day(@selected_day).in_category(Category.find(params[:category_id]))
	193	+ def load_category
	194	+ if params[:category_path].blank?
	195	+ render_not_found if params[:action] == 'category_index'
234	196	else
235		- @events_of_the_day = environment.events.by_day(@selected_day)
	197	+ path = params[:category_path].join('/')
	198	+ @category = environment.categories.find_by_path(path)
	199	+ if @category.nil?
	200	+ render_not_found(path)
	201	+ else
	202	+ @category_id = @category.id
	203	+ end
236	204	end
237		- render :partial => 'events/events_by_day'
	205	+ end
	206	+
	207	+ FILTERS = %w(
	208	+ more_recent
	209	+ more_active
	210	+ more_popular
	211	+ )
	212	+ def filter
	213	+ if FILTERS.include?(params[:filter])
	214	+ params[:filter]
	215	+ else
	216	+ 'more_recent'
	217	+ end
	218	+ end
	219	+
	220	+ def filter_description(asset, filter)
	221	+ {
	222	+ 'articles_more_recent' => _('More recent contents from network'),
	223	+ 'articles_more_popular' => _('More viewed contents from network'),
	224	+ 'people_more_recent' => _('More recent people from network'),
	225	+ 'people_more_active' => _('More active people from network'),
	226	+ 'people_more_popular' => _('More popular people from network'),
	227	+ 'communities_more_recent' => _('More recent communities from network'),
	228	+ 'communities_more_active' => _('More active communities from network'),
	229	+ 'communities_more_popular' => _('More popular communities from network'),
	230	+ 'products_more_recent' => _('Highlights'),
	231	+ }[asset.to_s + '_' + filter]
	232	+ end
	233	+
	234	+ def load_search_assets
	235	+ if Searches.keys.include?(params[:action].to_sym) and environment.enabled?("disable_asset_#{params[:action]}")
	236	+ render_not_found
	237	+ return
	238	+ end
	239	+
	240	+ @enabled_searches = Searches.select {\|key, name\| environment.disabled?("disable_asset_#{params[:action]}") }
	241	+ @searching = {}
	242	+ @titles = {}
	243	+ @enabled_searches.each do \|key, name\|
	244	+ @titles[key] = name
	245	+ @searching[key] = params[:action] == 'index' \|\| params[:action] == key.to_s
	246	+ end
	247	+ @names = @titles if @names.nil?
	248	+ end
	249	+
	250	+ def limit
	251	+ searching = @searching.values.select{ \|v\| v }
	252	+ if params[:display] == 'map'
	253	+ MAP_SEARCH_LIMIT
	254	+ elsif searching.size <= 1
	255	+ if [:people, :communities].include? @asset
	256	+ BLOCKS_SEARCH_LIMIT
	257	+ elsif @asset == :enterprises and @empty_query
	258	+ BLOCKS_SEARCH_LIMIT
	259	+ else
	260	+ LIST_SEARCH_LIMIT
	261	+ end
	262	+ else
	263	+ MULTIPLE_SEARCH_LIMIT
	264	+ end
	265	+ end
	266	+
	267	+ def paginate_options(page = params[:page])
	268	+ { :per_page => limit, :page => page }
	269	+ end
	270	+
	271	+ def full_text_search(filters = [], options = {})
	272	+ paginate_options = paginate_options(params[:page])
	273	+ asset_class = asset_class(@asset)
	274	+
	275	+ solr_options = options
	276	+ if !@results_only and asset_class.respond_to? :facets
	277	+ solr_options.merge! asset_class.facets_find_options(params[:facet])
	278	+ solr_options[:all_facets] = true
	279	+ solr_options[:limit] = 0 if @facets_only
	280	+ end
	281	+ solr_options[:filter_queries] \|\|= []
	282	+ solr_options[:filter_queries] += filters
	283	+ solr_options[:filter_queries] << "environment_id:#{environment.id}"
	284	+ solr_options[:filter_queries] << asset_class.facet_category_query.call(@category) if @category
	285	+
	286	+ solr_options[:boost_functions] \|\|= []
	287	+ params[:order_by] = nil if params[:order_by] == 'none'
	288	+ if params[:order_by]
	289	+ order = SortOptions[@asset][params[:order_by].to_sym]
	290	+ raise "Unknown order by" if order.nil?
	291	+ order[:solr_opts].each do \|opt, value\|
	292	+ solr_options[opt] = value.is_a?(Proc) ? instance_eval(&value) : value
	293	+ end
	294	+ end
	295	+
	296	+ ret = asset_class.find_by_contents(@query, paginate_options, solr_options)
	297	+ @results[@asset] = ret[:results]
	298	+ @facets = ret[:facets]
	299	+ @all_facets = ret[:all_facets]
238	300	end
239	301
240	302	end
...	...