Merge commit 'refs/merge-requests/173' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/173

Merge commit 'refs/merge-requests/173' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/173
Daniela Feitosa
2 parents 93103d85 420c09be
Showing 471 changed files with 122499 additions and 14444 deletions Show diff stats
HACKING
INSTALL
Rakefile
app/controllers/application.rb
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_search_controller.rb
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/helpers/display_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/article.rb
app/models/blog.rb
app/models/category.rb
app/models/category_finder.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-ruby-data 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'
 require 'application_controller'
+
@@ -265,9 +265,10 @@ class CmsController &lt; MyProfileController
   def search
     query = params[:q]
-    results = query.blank? ? [] : profile.articles.published.find_by_contents(query)
+    results = query.blank? ? [] : profile.articles.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
@@ -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 read 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,33 +1085,46 @@ 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 Read') => {: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
+
+  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
-  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
@@ -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
@@ -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?
@@ -278,7 +278,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
-    render(:partial => 'product_categories_menu', :object => product_categories_menu)
+    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
+  
+  def asset_table(asset)
+    asset_class(asset).table_name
   end
 end
@@ -2,6 +2,12 @@ require &#39;hpricot&#39;
 class Article < ActiveRecord::Base
+  # 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], :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
@@ -22,6 +28,9 @@ class Article &lt; ActiveRecord::Base
   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 +56,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| {
@@ -96,11 +105,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 +120,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 +128,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 +140,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
@@ -142,13 +154,33 @@ class Article &lt; ActiveRecord::Base
     {: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 +198,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 +447,7 @@ class Article &lt; ActiveRecord::Base
   end
   def comments_updated
-    ferret_update
+    solr_save
   end
   def accept_category?(cat)
@@ -573,6 +599,99 @@ class Article &lt; ActiveRecord::Base
   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]' => _("Last year"), '[NOW-1MONTHS TO NOW/DAY]' => _("Last month"), '[NOW-7DAYS TO NOW/DAY]' => _("Last week"), '[NOW-1DAYS TO NOW/DAY]' => _("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
     sanitizer = HTML::FullSanitizer.new
     self.tag_list.names.map!{|i| strip_tag_name sanitizer.sanitize(i) }
@@ -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
@@ -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
@@ -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?
 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)
@@ -358,11 +365,11 @@ class Environment &lt; ActiveRecord::Base
   end
   def terminology
-    if self.settings[:terminology]
-      self.settings[:terminology].constantize.instance
-    else
+    #if self.settings[:terminology]
+      #self.settings[:terminology].constantize.instance
+    #else
       Noosfero.terminology
-    end
+    #end
   end
   def terminology=(value)
@@ -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)
 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
 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
@@ -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?
 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|
@@ -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, _("")];
+        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}$/
@@ -181,8 +183,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
@@ -217,12 +231,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)
@@ -527,6 +544,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)
@@ -822,18 +840,100 @@ private :generate_url, :url_options
     name
   end
-  protected
+  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)
@@ -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,6 +4,10 @@
 # of the file itself is kept. (FIXME?)
 class UploadedFile < Article
+  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? }
   include ShortFilename
@@ -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" -->
 <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')) %>
@@ -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') %>
+
-<li class="<%= icon_for_article(article) %>">
-  <strong><%= link_to(article.title, article.view_url) %></strong>
-  <div class="item_meta">
-    <% if article.last_changed_by %>
-      <span class="cat_item_by">
-      <%= _('by %s') % link_to(article.last_changed_by.name, article.last_changed_by.url) %>
-      </span>
-    <% end %>
-    <span class="cat_item_update"><%= _('Last update: %s.') % show_date(article.updated_at) %></span>
+<li class="search-article-item article-item">
+  <%= link_to(article.title, article.url, :class => "search-result-title") %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => article %>
   </div>
+  <table class="noborder search-content-second-column">
+    <%= render :partial => 'article_common', :object => article %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => article %>
+
+  <div style="clear:both"></div>
 </li>
@@ -0,0 +1,8 @@
+<% article = article_author %>
+
+<tr class="search-article-author search-article-author-name">
+  <td class="search-field-label"><%= _("Author") %></td>
+  <td>
+    <%= link_to_profile article.profile.name, article.profile.identifier %>
+  </td>
+</tr>
@@ -0,0 +1,9 @@
+<tr class="search-article-categories">
+  <td class="search-field-label"><%= _('Categories') %></td>
+  <td class="search-article-categories-container <%= "search-field-none" if article_categories.empty? %>">
+    <% article_categories.each do |category| %>
+      <%= link_to_category category, false, :class => "search-article-category" %>
+    <% end %>
+    <%= _('None') if article_categories.empty? %>
+  </td>
+</tr>
@@ -0,0 +1,7 @@
+<% article = article_common %>
+<% show_description = true if show_description.nil? %>
+
+<%= render :partial => 'article_author', :object => article %>
+<%= render :partial => 'article_description', :object => article if show_description %>
+<%= render :partial => 'article_tags', :object => article.tags %>
+<%= render :partial => 'article_categories', :object => article.categories %>
@@ -0,0 +1,15 @@
+<% article = article_description %>
+
+<tr class="search-article-description">
+  <td class="search-field-label"><%= _("Description") %></td>
+
+  <% if !article.body.blank? %>
+    <% description = strip_tags(article.body.to_s) %>
+    <% description.gsub!(/\s{2,}/, ' ') %>
+    <% description = excerpt(description, description.first(3), 200) %>
+
+    <td class="search-article-body"><%= description %></td>
+  <% else %>
+    <td class="search-field-none"><%= _('None') %></td>
+  <% end %>
+</tr>
@@ -0,0 +1,10 @@
+<% article = article_last_change %>
+
+<div class="search-article-author-changes">
+  <% if article.last_changed_by and article.last_changed_by != article.profile %>
+    <span><%= _('by %{name} at %{date}') % {:name => link_to(article.last_changed_by.name, article.last_changed_by.url),
+      :date => show_date(article.updated_at) } %></span>
+  <% else %>
+    <span><%= _('Last update: %s.') % show_date(article.updated_at) %></span>
+  <% end %>
+</div>
@@ -0,0 +1,9 @@
+<tr class="search-article-tags">
+  <td class="search-field-label"><%= _('Tags') %></td>
+  <td class="search-article-tags-container <%= "search-field-none" if article_tags.empty? %>">
+    <% article_tags.each do |tag| %>
+      <%= link_to_tag tag, :class => "search-article-tag" %>
+    <% end %>
+    <%= _('None') if article_tags.empty? %>
+  </td>
+</tr>
@@ -0,0 +1,24 @@
+<li class="search-blog article-item">
+  <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => blog %>
+  </div>
+  <table class="noborder search-content-second-column">
+    <tr class="search-blog-items">
+      <td class="search-field-label"><%= _("Last posts") %></td>
+
+      <% r = blog.children.find(:all, :order => :updated_at, :conditions => ['type != ?', 'RssFeed']).last(3) %>
+      <td class="<%= "search-field-none" if r.empty? %>">
+        <% r.each do |a| %>
+          <%= link_to a.title, a.view_url, :class => 'search-blog-sample-item '+icon_for_article(a) %>
+        <% end %>
+        <%= _('None') if r.empty? %>
+      </td>
+    </tr>
+    
+    <%= render :partial => 'article_common', :object => blog %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => blog %>
+
+  <div style="clear: both;"/></div>
+</li>
@@ -0,0 +1 @@
+_article.rhtml
 \ No newline at end of file
-<div id="search-results" class="<%= 'only-one-result-box' if @results.size == 1 %>">
+<div id="search-results" class="<%= @results.size == 1 ? 'only-one-result-box' : 'multiple-results-boxes' %>">
+  <% @order.each do |name| %>
+    <% results = @results[name] %>
+    <% empty = results.nil? || results.empty? %>
-<%
-  pos2 = :odd  # allow to format in a two columns layout
-  pos3 = 3     # allow to format in a thre columns layout
-%>
-<% @order.each do |name| %>
-  <% results = @results[name] %>
-  <%
-    pos3 += 1;  pos3 = 1 if pos3 > 3
-    pos2==:odd ? pos2=:even : pos2=:odd
-  %>
-  <% if !results.nil? and !results.empty? %>
-    <div class="search-results-<%= name %> search-results-box <%= pos2 %> <%= 'col%s_of3' % pos3.to_s %>">
-      <% if @controller.action_name != 'assets' %>
-        <% if @results.size != 1 %>
-          <h3>
-            <%= @names[name] %>
-          </h3>
-        <% end %>
-        <%# FIXME: don't hardcode an asset like this %>
-        <% if name == :most_commented_articles %>
-          <%= link_to( results.respond_to?(:total_entries) ? _('see all (%d)') % results.total_entries : _('see all...'),
-                       params.merge(:action => 'index',
-                       :asset => 'articles' ),
-                       :class => 'see-more' ) if @results.size > 1 %>
+    <div class="search-results-<%= name %> search-results-box <%= "search-results-empty" if empty %>">
+      <% if not empty %>
+        <% partial = partial_for_class(results.first.class.class_name.constantize) %>
-        <% else %>
-          <%= link_to( results.respond_to?(:total_entries) ? _('see all (%d)') % results.total_entries : _('see all...'),
-                       params.merge(:action => 'index',
-                       :asset => name ),
-                       :class => 'see-more' ) if @results.size > 1 %>
+        <% if @results.size > 1 %>
+          <h3><%= @names[name] %></h3>
+          <% if results.total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %>
+            <%= link_to(_('see all (%d)') % results.total_entries, params.merge(:action => name), :class => 'see-more' ) %>
+          <% end %>
         <% end %>
-      <% end %>
-      <% partial = partial_for_class results.first.class %>
-      <div class="search-results-innerbox search-results-type-<%= partial %> <%= 'common-profile-list-block' if partial == 'profile' %>">
-        <div class="search-results-innerbox2"><!-- the innerbox2 is a workarround for MSIE -->
+
+        <div class="search-results-innerbox search-results-type-<%= partial %> <%= 'common-profile-list-block' if partial == 'profile' %>">
           <ul>
-          <% hit_pos = 0 %>
           <% results.each do |hit| %>
-            <% next if hit.respond_to?(:visible) && !hit.visible?  %>
-            <%= render :partial => partial_for_class(hit.class),
-
-                       :object => hit,
-                       :locals => { :pos => ( hit_pos += 1 ) } %>
+            <%= render :partial => partial_for_class(hit.class), :object => hit %>
           <% end %>
           </ul>
-          <hr />
-        </div><!-- end class="search-results-innerbox2" -->
-      </div><!-- end class="search-results-innerbox" -->
-    </div><!-- end class="search-results-<%= name %>" -->
-  <% else %>
-    <div class="search-results-<%= name %> search-results-empty search-results-box <%= pos2 %> <%= 'col%s_of3' % pos3.to_s %>">
-      <% if @controller.action_name != 'assets' %>
-        <% if @results.size != 1 %>
+        </div>
+      <% else %>
+        <% if @results.size > 1 %>
           <h3><%= @names[name] %></h3>
         <% end %>
+        <div class="search-results-innerbox search-results-type-empty">
+          <div> <%= _('None') %> </div>
+        </div>
       <% end %>
-      <div class="search-results-innerbox search-results-type-empty">
-        <div> <%= _('None') %> </div>
-        <hr />
-      </div><!-- end class="search-results-innerbox" -->
-    </div><!-- end class="search-results-<%= name %>" -->
+    </div>
   <% end %>
-<% end %>
+  
+  <div style="clear:both"></div>
-<br style="clear:both" />
-</div><!-- end id="search-results" -->
+  <%= add_zoom_to_images %>
+</div>
@@ -0,0 +1 @@
+<%= render :partial => 'text_article', :object => enterprise_homepage %>
-<li class="<%= icon_for_article(event) %>">
-  <strong><%= link_to(event.title, event.url) %></strong>
-  <div class="item_meta">
-    <%= show_period(event.start_date, event.end_date) %>
-  </div>
+<li class="search-event-item article-item">
+<%= link_to(event.title, event.url, :class => "search-result-title") %>
+<div class="search-content-first-column">
+  <%= render :partial => 'image', :object => event %>
+</div>
+<table class="noborder search-content-second-column">
+  <% if event.start_date %>
+    <tr class="search-article-event-date">
+      <td class="search-field-label"><%= _('Start date') %></td>
+      <td class="article-item-date"><%= event.start_date %></td>
+    </tr>
+  <% end %>
+  <% if event.end_date %>
+    <tr class="search-article-event-date">
+      <td class="search-field-label"><%= _('End date') %></td>
+      <td class="article-item-date"><%= event.end_date %></td>
+    </tr>
+  <% end %>
+
+  <%= render :partial => 'article_common', :object => event %>
+</table>
+<%= render :partial => 'article_last_change', :object => event %>
+
+<div style="clear: both"></div>
 </li>
@@ -0,0 +1,36 @@
+<% less_options_limit = 8 %>
+
+<div id="facets-menu">
+  <% @asset_class.map_facets_for(environment).each do |facet| %>
+
+    <div id="facet-menu-<%= facet[:id].to_s %>" class="facet-menu">
+      <div class="facet-menu-label">
+        <%= @asset_class.facet_label(facet) %>
+      </div>
+
+      <% results = @asset_class.map_facet_results(facet, params[:facet], @facets, @all_facets, :limit => less_options_limit) %>
+      <% facet_count = results.total_entries %>
+
+      <% if facet_count > 0 %>
+        <div class="facet-menu-options facet-menu-more-options" style="display: none">
+        </div>
+
+        <div class="facet-menu-options facet-menu-less-options">
+          <% results.each do |id, label, count| %>
+            <%= facet_link_html(facet, params, id, label, count) %><br />
+          <% end %>
+        </div> <br />
+
+        <% if facet_count > less_options_limit %>
+          <%= link_to_function _("Options"),
+            "facet_options_toggle('#{facet[:id].to_s}', '#{url_for(params.merge(:action => 'facets_browse', :facet_id => facet[:id], :asset => @asset, :escape => false))}'); " + 
+            "jQuery(this).toggleClass('facet-less-options')", :class => "facet-options-toggle" %>
+          <br />
+        <% end %>
+
+      <% else %>
+        <span class="facet-any-result-found"><%= _("No filter available") %></span>
+      <% end %>
+    </div>
+  <% end %>
+</div>
@@ -0,0 +1,6 @@
+<div class="facets-applied">
+  <% if params[:facet] and params[:facet].count > 0 %>
+    <span class="facets-applied-label"><%= _("Applied filters") %> </span>
+    <%= facet_selecteds_html_for(environment, asset_class(@asset), params) %>
+  <% end %>
+</div>
@@ -0,0 +1,24 @@
+<li class="search-folder-item article-item">
+  <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => folder %>
+  </div>
+  <table class="noborder search-content-second-column">
+    <tr class="search-folder-items">
+      <td class="search-field-label"><%= _("Last items") %></td>
+
+      <% r = folder.children.last(3) %>
+      <td class="<%= "search-field-none" if r.empty? %>">
+        <% r.each do |a| %>
+          <%= link_to a.title, a.view_url, :class => 'search-folder-sample-item '+icon_for_article(a) %>
+        <% end %>
+        <%= _('None') if r.empty? %>
+      </td>
+    </tr>
+
+    <%= render :partial => 'article_common', :object => folder %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => folder %>
+
+  <div style="clear:both"></div>
+</li>
@@ -0,0 +1,24 @@
+<li class="search-forum-item article-item">
+  <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => forum %>
+  </div>
+  <table class="noborder search-content-second-column">
+    <tr class="search-forum-items">
+      <td class="search-field-label"><%= _("Last topics") %></td>
+
+      <% r = forum.children.find(:all, :order => :updated_at, :conditions => ['type != ?', 'RssFeed']).last(3) %>
+      <td class="<%= "search-field-none" if r.empty? %>">
+        <% r.each do |a| %>
+          <%= link_to a.title, a.view_url, :class => 'search-forum-sample-item '+icon_for_article(a) %>
+        <% end %>
+        <%= _('None') if r.empty? %>
+      </td>
+    </tr>
+
+    <%= render :partial => 'article_common', :object => forum %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => forum %>
+
+  <div style="clear:both"></div>
+</li>
@@ -0,0 +1,13 @@
+<li class="search-gallery article-item">
+  <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => gallery %>
+  </div>
+  <table class="noborder search-content-second-column">
+    <%= render :partial => 'article_common', :object => gallery %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => gallery %>
+
+  <div style="clear: both"></div>
+</li>
+
-<%= content_tag('script', '', :src => GoogleMaps.api_url(environment.default_hostname), :type => 'text/javascript') %>
-
-
+<div style="clear: both;"></div>
 <div style='text-align: center;'>
   <div id="map"></div>
 </div>
-<script type='text/javascript'>
-var points = {};
-   
-function putMarker(lat, lng, title, summary) {
-  var point_str = lat + ":" + lng;
-   
-  if (points[point_str]) {
-    lng += (Math.random() - 0.5) * 0.02;
-    lat += (Math.random() - 0.5) * 0.02;
-  } else {
-    points[point_str] = true;
-  }
-     
-  var point = new GLatLng(lat, lng);
-  var options = { 'title' : title, 'icon' : icon };
-  var marker = new GMarker(point, options);
-  map.addOverlay(marker);
-  GEvent.addListener(marker, 'click', function() {
-    map.openInfoWindowHtml(point, summary);
-  });
-  bounds.extend(point);
-}
-
-window.unload = function() {
-  GUnload();
-};
-
-if (GBrowserIsCompatible()) {
-  var map = new GMap2(document.getElementById("map"));
-
-  new GKeyboardHandler(map);
-  map.addControl(new GLargeMapControl());
-  map.addControl(new GMapTypeControl());
-
-  centerPoint = new GLatLng(-15.0, -50.1419);
-  map.setCenter(centerPoint, <%= GoogleMaps.initial_zoom.to_json %>);
-  var bounds = new GLatLngBounds();
-
-  var baseIcon = new GIcon();
-      baseIcon.iconSize=new GSize(32,32);
-      baseIcon.shadowSize=new GSize(36,32);
-      baseIcon.iconAnchor=new GPoint(16,32);
-      baseIcon.infoWindowAnchor=new GPoint(16,0);
-  <%
-    icon = default_or_themed_icon("/images/icons-map/enterprise.png")
-    icon_shadow = default_or_themed_icon("/images/icons-map/enterprise_shadow.png")
-  %>
-  var icon = new GIcon(baseIcon, "<%= icon %>", null, "<%= icon_shadow %>");
+<%= content_tag('script', '', :src => "http://maps.google.com/maps/api/js?sensor=true", :type => 'text/javascript') %>
+<%= javascript_include_tag('google_maps') %>
 <%
-  @results.each do |name,results|
-    results.each do |item|
-      if item.lat && item.lng
-      %>
-        putMarker(<%= item.lat.to_json %>, <%= item.lng.to_json %>, <%= item.name.to_json %>, <%= display_item_map_info(item).to_json %>);
-      <%
-      end
-    end
-  end
+  icon = default_or_themed_icon("/images/icons-map/enterprise.png")
 %>
-}
-  map.setZoom(map.getBoundsZoomLevel(bounds));
-  map.setCenter(bounds.getCenter());
+<script type='text/javascript'>
+  mapLoad(<%= GoogleMaps.initial_zoom.to_json %>);
+
+  <% @results.each do |name,results| %>
+    <% results.each do |item| %>
+      <% if item.lat && item.lng %>
+        mapPutMarker(<%= item.lat.to_json %>, <%= item.lng.to_json %>, <%= item.name.to_json %>, '<%= icon %>',
+          '<%= url_for(:controller => :map_balloon, :action => name.to_s.singularize, :id => item.id) %>');
+      <% end %>
+    <% end %>
+  <% end %>
+
+  mapCenter();
 </script>
@@ -0,0 +1,52 @@
+<div class="search-image-container">
+  
+  <% if image.is_a? UploadedFile and image.filename %>
+    <% extension = image.filename[(image.filename.rindex('.')+1)..-1].downcase %>
+    <% if ['jpg', 'jpeg', 'gif', 'png', 'tiff', 'svg'].include? extension %>
+      <%= link_to '', image.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% image.public_filename(:thumb) %>
+      <% if image.width && image.height %>
+        <% javascript_tag do %>
+          image = jQuery('script').last().parent().find('.search-image-pic');
+          des_width = parseInt(image.css('width'));
+          des_height = parseInt(image.css('height'));
+
+          width = <%= image.width %>;
+          height = <%= image.height %>;
+          scale_factor = width > height ? des_width/width : des_height/height;
+
+          image.css({'width' : scale_factor*width +'px', 'height' : scale_factor*height+'px'});
+        <% end %>
+      <% end %>
+    <% elsif ['pdf'].include? extension %>
+      <%= link_to '', image.view_url, :class => 'search-image-pic icon-application-pdf' %>
+    <% elsif ['doc', 'docx', 'odt', 'rtf', 'txt', 'html', 'htm'].include? extension %>
+      <%= link_to '', image.view_url, :class => 'search-image-pic icon-application-vnd-oasis-opendocument-text' %>
+    <% elsif ['xls', 'xlsx', 'ods', 'csv', 'tsv', 'tab'].include? extension %>
+      <%= link_to '', image.view_url, :class => 'search-image-pic icon-application-vnd-oasis-opendocument-spreadsheet' %>
+    <% end %>
+  <% elsif image.is_a? Gallery %>
+    <div class="search-gallery-items">
+      <% r = image.children.find(:all, :order => :updated_at, :conditions => ['type = ?', 'UploadedFile']).last(3) %>
+      <% if r.length > 0 %>
+        <% r.each do |i| %>
+          <%= link_to '', i.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% i.public_filename(:thumb) %>
+        <% end %>
+      <% else %>
+        <div class="search-no-image"><span><%= _('No image') %></span></div>
+      <% end %>
+    </div>
+  <% elsif image.is_a? Product %>
+    <% if image.image %>
+    <div class="zoomable-image">
+      <%= link_to '', product_path(image), :class => "search-image-pic", 
+          :style => 'background-image: url(%s)'% image.default_image(:thumb) %>
+      <%= link_to content_tag(:span, _('Zoom in')), image.image.public_filename, 
+          :class => 'zoomify-image' %>
+    </div>
+    <% else %>
+      <div class="search-no-image"><span><%= _('No image') %></span></div>
+    <% end %>
+  <% else %>
+    <div class="search-content-type-icon icon-content-<%=image.class.to_s.underscore.dasherize%>"></div>
+  <% end %>
+</div>
-<%# FIXME add more information %>
-
-<%
-product_item_pos = 0  if ! product_item_pos
-product_item_pos += 1
-%>
-
 <% extra_content = @plugins.dispatch(:asset_product_extras, product, product.enterprise).collect { |content| instance_eval(&content) } %>
 <% extra_properties = @plugins.dispatch(:asset_product_properties, product)%>
-<li class="product-item <%= ( pos % 2 == 0 ) ? 'odd' : 'even' %>">
-  <%= link_to_product product, :class => 'product-pic', :style => 'background-image:url(%s)' % product.default_image(:minor) %>
-  <strong>
-    <%= link_to_product product %>
-  </strong> 
-  <ul>
-    <li> <%= _('Price: %s') % (product.price ? product.price : _('Not informed')) %> </li>
-    <% if product.enterprise && product.display_supplier_on_search? %>
-      <li> <%= _('Supplier: %s') % link_to_homepage(product.enterprise.name, product.enterprise.identifier) %> </li>
-    <% end %>
+<li class="search-product-item">
-    <li> <%= _('Category:') + ' ' + link_to_product_category(product.product_category) %> </li>
+  <div class="search-product-item-first-column">
+    <%= render :partial => 'search/image', :object => product %>
-    <% extra_properties.each do |property| %>
-      <li><%= property[:name] + ': ' + instance_eval(&property[:content]) %></li>
+    <% if product.available %>
+      <% if product.price && product.price > 0 %>
+        <% has_discount = product.discount && product.discount > 0 %>
+        <% if product.price %>
+          <span class="search-product-price-textid"><%=_("from") if has_discount %></span><%= price_span(product.price, :class => "search-product-price " + (has_discount ? 'with-discount' : '')) %>
+          <% if has_discount %>
+            <span class="search-product-price-textid"><%=_("by")%></span><%= price_span(product.price_with_discount, :class => "search-product-price") %>
+          <% end %>
+          <% if product.unit %>
+            <span class="search-product-unit">&nbsp;<%= _('/') %>&nbsp;<%= product.unit.name %></span>
+          <% end %>
+        <% end %>
+        <div class="search-product-inputs-info">
+          <% if p = product.percentage_from_solidarity_economy %>
+            <div class="search-product-percentage-from-solidarity-economy search-product-ecosol-percentage-icon-<%= p[0].to_s %>" 
+              title="<%=_('Percentage of inputs from solidarity economy')%>">
+              <%= p[1] %>
+            </div>
+          <% end %>
+
+          <% if product.price_described? %>
+            <% title = (product.inputs + product.price_details).map{ |i|
+              '<div class="search-product-input-dots-to-price">' +
+                '<div class="search-product-input-name">' + i.product_category.name + '</div>' + 
+                price_span(i.price, :class => 'search-product-input-price') +
+              '</div>' }.join('') %>
+            <%= link_to_function _("Open Price"), '', :title => title, :class => "search-product-price-details" %>
+          <% end %>
+        </div>
+      <% end %>
+    <% else %>
+      <span class="product-not-available"><%= _('Not available') %></div>
     <% end %>
-  </ul>
+
+  </div>
+  <div class="search-product-item-second-column">
+    <%= link_to_product product, :class => 'search-result-title' %>
+    <div class="search-product-supplier">
+      <span class="search-field-label"><%= _('Supplier') %>  </span><%= link_to_homepage(product.enterprise.name, product.enterprise.identifier) %>
+    </div>
+    <div class="search-product-description">
+      <% if product.description %>
+        <% desc_stripped = strip_tags(product.description) %>
+        <span class="search-field-label"><%= _('Description') %>  </span><%= excerpt(desc_stripped, desc_stripped.first(3), 300) %>
+      <% end %>
+    </div>
+  </div>
+  <div class="search-product-item-third-column">
+    <div class="search-product-region">
+      <% if product.enterprise.region %>
+        <span class="search-field-label"><%= _('City') %></span>
+        <br /><%= city_with_state(product.enterprise.region) %>
+      <% end %>
+    </div>
+    <div class="search-product-qualifiers">
+      <% if product.product_qualifiers.count > 0 %>
+        <span class="search-field-label"><%= _('Qualifiers') %></span>
+        <% product.product_qualifiers.each do |pq| %>
+          <% if pq.qualifier %>
+            <span class="search-product-qualifier"><%= pq.qualifier.name + (pq.certifier.nil? ?  _(";") : '') %></span>
+          <% end %>
+          <% if pq.certifier %>
+            <span class="search-product-certifier">&nbsp;<%= _('cert. ') + pq.certifier.name + _(";") %></span>
+          <% end %>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+
+  <div style="clear: both"></div>
   <%= extra_content.join('\n') %>
+  <% extra_properties.each do |property| %>
+    <div><%= property[:name] + ': ' + instance_eval(&property[:content]) %></div>
+  <% end %>
 </li>
@@ -1,42 +0,0 @@
-<% if @product_category %>
-  <h3 class="current-cat-path">
-    <%= @product_category.hierarchy.map {|cat| ((cat == @product_category) ? content_tag('span', cat.name) : link_to((cat.name), params.merge({:product_category => cat.id}))) }.join(' &rarr; ') %>
-  </h3>
-<% end %>
-
-<% if product_categories_menu %>
-
-<div id="product-categories-menu">
-  <ul>
-    <% if product_categories_menu.empty? %>
-      <% if @product_category %>
-        <li class="cat-empty"> <%= _('There is no sub-categories for %s.') % @product_category.name %> </li>
-      <% else %>
-        <li class="cat-empty"> <%= _('There is no categories.') %> </li>
-      <% end %>
-    <% end %>
-    <% product_categories_menu.each do |cat, hits, childs| %>
-      <li class="cat-parent" >
-        <%= link_to(
-              cat.name + " " + content_tag('small', "(#{hits})"),
-              params.merge({:product_category => cat.id})
-         ) %>
-        <% if !childs.blank? %>
-          <div>
-            <ul>
-              <% childs.each do |child, child_hits| %>
-                <li class="cat-child"> <%= link_to(
-                           child.name + " " + content_tag('small', "(#{child_hits})"),
-                           params.merge({:product_category => child.id})
-                      ) %> </li>
-              <% end %>
-            </ul>
-          </div>
-        <% end %>
-      </li>
-    <% end %>
-  </ul>
-</div>
-
-<% end %>
-
-<%= profile_image_link profile, :portrait %>
+<li class="search-profile-item">
+<% if @empty_query or @results.size > 1 or !profile.enterprise?  %>
+  <%= profile_image_link profile, :portrait, 'div' %>
+<% else %>
+  <div class="search-enterprise-item">
+    <div class="search-enterprise-item-column-left">
+      <%= profile_image_link profile, :portrait, 'div' %>
+    </div>
+    <div class="search-enterprise-item-column-right">
+      <%= link_to_homepage(profile.name, profile.identifier, :class => "search-result-title") %>
+      <div class="search-enterprise-description">
+        <% if profile.description %>
+          <% body_stripped = strip_tags(profile.description) %>
+        <% elsif profile.home_page and profile.home_page.body %>
+          <% body_stripped = strip_tags(profile.home_page.body) %>
+        <% end %>
+        <%= excerpt(body_stripped, body_stripped.first(3), 200) if body_stripped %>
+      </div>
+      <div class="search-enterprise-region">
+        <span class="search-enterprise-region-label"><%= _("City") %></span>
+        <% if profile.region %>
+          <span class="search-enterprise-region-name"><%= city_with_state(profile.region) %></span>
+        <% end %>
+      </div>
+
+      <div class="search-enterprise-categorization">
+        <% profile.top_level_categorization.each do |parent, children| %>
+          <% if parent.name != "Territórios" %>
+            <div class="search-enterprise-category-<%=parent.id%> search-enterprise-category">
+              <span class="search-enterprise-categorization-parent"><%= parent.name %></span>
+              <span class="search-enterprise-categorization-children">
+                <%= children.collect(&:name).join(', ')  %>
+              </span>
+            </div>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+
+    <hr class="clearfix" />
+  </div>
+<% end %>
+</li>
@@ -0,0 +1,21 @@
+<div class="search-results-header <%= "search-no-results" if @results[@asset].nil? or @results[@asset].length == 0 %>">
+  <% if !@empty_query %>
+    <div class="search-results-header-information"> 
+      <% if @results[@asset].total_entries > 0 %>
+        <%= label_total_found(@asset, @results[@asset].total_entries) %>
+        <% if params[:display] != 'map' %>
+          <span class="current-page"><%= _("Showing page %s of %s") % [@results[@asset].current_page, @results[@asset].total_pages] %></span>
+        <% end %>
+      <% end %>
+    </div>
+
+    <div class="search-results-header-facets-order-by"> 
+      <%= facets_unselect_menu(@asset) %>
+      <%= order_by(@asset) if params[:display] != 'map' %>
+    </div>
+  <% else %>
+    <div id='search-filter-title'><%= @filter_title if @filter_title %></div>
+  <% end %>
+
+  <div style="clear: both"></div>
+</div>
 <div class='search-form'>
-<% simple_search = false unless defined? simple_search %>
-<% form_tag( { :controller => 'search', :action => 'index', :asset => nil, :category_path => ( @category ? @category.explode_path : [] ) },
-               :method => 'get', :class => 'search_form' ) do %>
-  <%= '<h3>%s</h3>' % form_title if defined? form_title %>
-
-  <%= hidden_field_tag :display, params[:display] %>
-
-  <%= hidden_field_tag :asset, params[:asset] %>
-
-  <div class="search-field">
-    <span class="formfield">
-      <%= text_field_tag 'query', @query, :id => ( lightbox? ? 'popup-search-input' : '' ), :size => 50 %>
-      <%= javascript_tag 'setTimeout("$(\"popup-search-input\").focus()", 10 )' if lightbox? %>
-    </span>
-    <%= submit_button(:search, _('Search'), :name => :search_whole_site_no) %>
-    <% if @category %>
-      <%= submit_button(:search, _('Search in whole site'), :name => :search_whole_site_yes) %>
+  <% form_tag( { :controller => 'search', :action => @asset ? @asset : 'index', :asset => nil, :category_path => ( @category ? @category.explode_path : [] ) },
+                 :method => 'get', :class => 'search_form' ) do %>
+  
+    <%= hidden_field_tag :display, params[:display] %>
+
+    <% params_uri = CGI::unescape(request.request_uri) %>
+    <% if params_uri.index('?') %>
+      <% params_uri[(params_uri.index('?')+1)..-1].to_s.split("&").each do |part| %>
+        <% if part.start_with? "facet" %>
+          <% name_value = part.split("=") %>
+          <%= hidden_field_tag name_value[0], name_value[1] %>
+        <% end %>
+      <% end %>
     <% end %>
-  </div>
-
-  <div id='advanced-search-options' style="display: <%= simple_search ? 'none' : 'block' %>">  
-    <div class="search-options search-within">
-      <h4><%= _('Search within:') %></h4>
-      <br style='clear:left'/>
-      <div>
-        <span class="formfield">
-          <%= select_city %>
-        </span>
-        <span class="formfield">
-          <%= labelled_select(_('Distance:'), 'radius', :first, :last, nil, [15, 30, 50, 100, 150, 200, 300, 400, 500, 1000].map{|n|[n, n.to_s + 'km']}) %>
-        </span>
-      </div>
-    </div><!-- fim class="search-options" -->
-
-    <div class="search-options search-for">
-      <h4><%= _('Search for:') %></h4>
-      <ul>
-        <% @search_in.map { |t,n| [t,getterm(n)] } .
-          sort_by(&:last).each do |thing, name| %>
-            <li>
-            <%= labelled_check_box name, 'find_in[]', thing.to_s, @searching[thing.to_sym] %>
-            </li>
-          <% end %>
-        </ul>
-        <br style="clear:both" />
-      </div><!-- fim class="search-options" -->
-    </div><!-- end id="advanced-search-options" -->
+  
+    <div class="search-field">
+      <span class="formfield">
+        <%= text_field_tag 'query', @query, :id => 'search-input', :size => 50 %>
+        <%= javascript_tag "jQuery('#search-input').attr('title', \"#{hint}\").hint()" if defined?(hint) %>
+      </span>
+  
+      <%= submit_button(:search, _('Search')) %>
+    </div>
-  <% if simple_search %>
-    <%= link_to_function(_('More options'), nil, :id => 'advanced_search_link') do |page|
-      page['advanced_search_link'].hide
-      page['advanced-search-options'].toggle
-    end %>
+  <% end %>
+  
+  <% if @empty_query %>
+    <% hint = environment.search_hints[@asset] %>
+    <% if hint and !hint.blank? %>
+      <div class="search-hint"><%= hint %></div>
+    <% end %>
   <% end %>
-  <% if lightbox?; button_bar do %>
-  <%= lightbox_close_button _('Close') %>
-  <% end; end %>
-
-<% end %>
-
-</div> <!-- id="search-form" -->
+  <div style="clear: both"></div>
+</div>
@@ -0,0 +1,13 @@
+<li class="search-text-article-item article-item">
+  <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %>
+
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => text_article %>
+  </div>
+  <table class="noborder search-content-second-column">
+    <%= render :partial => 'article_common', :object => text_article %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => text_article %>
+
+  <div style="clear: both"></div>
+</li>
@@ -0,0 +1,25 @@
+<li class="search-uploaded-file-item article-item">
+  <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %>
+
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => uploaded_file %>
+  </div>
+
+  <table class="noborder search-content-second-column">
+    <%= render :partial => 'article_author', :object => uploaded_file %>
+    <%= render :partial => 'article_description', :object => uploaded_file %>
+
+    <% if uploaded_file.parent and uploaded_file.parent.published? %>
+      <tr class="search-uploaded-file-parent">
+        <td class="search-field-label"><%= uploaded_file.parent.gallery? ? _("Gallery") : _("Folder") %></td>
+        <td><%= link_to uploaded_file.parent.name, uploaded_file.parent.url %></td>
+      </tr>
+    <% end %>
+
+    <%= render :partial => 'article_tags', :object => uploaded_file.tags %>
+    <%= render :partial => 'article_categories', :object => uploaded_file.categories %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => uploaded_file %>
+
+  <div style="clear:both"></div>
+</li>
-<%= search_page_title( _('Articles'), { :query => @query, 
-                                      :category => @category ? @category.name : nil, 
-                                      :total_results => @total_results, 
-                                      :region => @region ? @region.name : nil, 
-                                      :distance => @radius } ) %>
+<%= search_page_title( @titles[:articles], @category ) %>
-<%= search_page_link_to_all( { :asset => params[:asset],
-                               :category => @category }) %>
+<div id="search-column-left">
+  <% if !@empty_query %>
+    <%= facets_menu(:articles, @facets) %>
+  <% end %>
+</div>
-<%= render :partial => 'search_form', :locals => { :form_title => @query.blank? ? _('Search') : _("Refine your search"), :simple_search => true } %>
+<div id="search-column-right">
+  <%= render :partial => 'search_form', :locals => { :hint => _('Type the title, author or content desired') } %>
+  <%= render :partial => 'results_header' %>
-<%# FIXME ARMENGUE %>
-<%= display_results(false) %>
+  <%= display_results %>
+  <%= pagination_links @results[:articles] %>
+</div>
-<%= pagination_links @results.values.first %>
-
-<br style="clear:both" />
+<div style="clear: both"></div>
@@ -1,23 +0,0 @@
-<div id="view-category">
-
-  <div id="category-image"><%= image_tag(@category.image.public_filename(:thumb), :id => 'category-image') if @category.image %></div>
-  <h1 id="category-name"><%= @category.name %></h1>
-
-  <%= render :partial => 'display_results' %>
-    
-  <div id="category-childs">
-    <h2> <%= _('Sub-categories')  %> </h2>
-    <% if @category.children.empty? %>
-      <strong id="cat-no-child"><%= _('No sub-categories') %></strong>
-    <% else %>
-      <ul>
-        <% @category.children.each do |c| %>
-          <li> <%= link_to_category c, false %> </li>
-        <% end %>
-      </ul>
-    <% end %>
-  </div><!-- end id="child-categories" -->
-
-<br style="clear:both" />
-</div><!-- end id="view-category" -->
-
@@ -0,0 +1 @@
+index.rhtml
 \ No newline at end of file
@@ -1,7 +0,0 @@
-<% if !@cities.empty? %>
-  <% @cities.each do |city| %>
-    <option value=<%= city.id.to_s.inspect %>><%= city.name %></option>
-  <% end %>
-<% else %>
-  <option value=''><%= _('No City') %></option>
-<% end%>
-<%= search_page_title( __('Communities'), { :query => @query, 
-                                      :category => @category ? @category.name : nil, 
-                                      :total_results => @total_results, 
-                                      :region => @region ? @region.name : nil, 
-                                      :distance => @radius } ) %>
+<%= search_page_title( @titles[:communities], @category ) %>
-<%= search_page_link_to_all( { :asset => params[:asset],
-                               :category => @category }) %>
-<%= render :partial => 'search_form', :locals => { :form_title => @query.blank? ? _('Search') : _("Refine your search"), :simple_search => true } %>
+<div id='search-column-left'>
+  <% if logged_in? %>
+    <% button_bar do %>
+      <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
+      <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community')) %>
+    <% end %>
+  <% end %>
-<% if logged_in? %>
-  <% button_bar do %>
-    <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
-    <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community')) %>
+  <% if !@empty_query %>
+    <%= facets_menu(:communities, @facets) %>
   <% end %>
-<% end %>
+</div>
-<div id='search-results-and-pages'>
-  <%# FIXME ARMENGUE %>
-  <%= display_results(false) %>
+<div id='search-column-right'>
+  <%= render :partial => 'search_form', :locals => { :hint => _("Type words about the community you're looking for") } %>
+  <%= render :partial => 'results_header' %>
+  <%= display_results %>
   <%= pagination_links @results.values.first %>
 </div>
-<br style="clear:both" />
+<div style="clear: both"></div>
	@@ -7,4 +7,6 @@ require 'rake'		@@ -7,4 +7,6 @@ require 'rake'
7	require 'rake/testtask'	7	require 'rake/testtask'
8	require 'rake/rdoctask'	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	require 'tasks/rails'	12	require 'tasks/rails'
1	require 'application_controller'	1	require 'application_controller'
		2	+
	@@ -6,16 +6,48 @@ class MapsController < MyProfileController		@@ -6,16 +6,48 @@ class MapsController < MyProfileController
6	@profile_data = profile	6	@profile_data = profile
7	if request.post?	7	if request.post?
8	begin	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	Profile.transaction do	17	Profile.transaction do
10	if profile.update_attributes!(params[:profile_data])	18	if profile.update_attributes!(params[:profile_data])
11	session[:notice] = _('Address was updated successfully!')	19	session[:notice] = _('Address was updated successfully!')
12	redirect_to :action => 'edit_location'	20	redirect_to :action => 'edit_location'
13	end	21	end
14	end	22	end
15	- rescue
16	- flash[:error] = _('Address could not be saved.')	23	+ rescue Exception => exc
		24	+ flash[:error] = exc.message
17	end	25	end
18	end	26	end
19	end	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	end	53	end
	@@ -1,77 +0,0 @@	@@ -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 @@		@@ -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
	@@ -278,7 +278,7 @@ module ManageProductsHelper		@@ -278,7 +278,7 @@ module ManageProductsHelper
278	error_msg = _('Something went wrong. Please, try again')	278	error_msg = _('Something went wrong. Please, try again')
279	select_tag('price_details[][production_cost_id]',	279	select_tag('price_details[][production_cost_id]',
280	'<option value="" disabled="disabled">' + _('Select...') + '</option>' +	280	'<option value="" disabled="disabled">' + _('Select...') + '</option>' +
281	- options_for_select(product.available_production_costs.map {\|item\| [truncate(item.name, 10, '...'), item.id]} + [[_('Other cost'), '']], selected),	281	+ options_for_select(product.available_production_costs.map {\|item\| [truncate(item.name, {:length => 10, :omission => '...'}), item.id]} + [[_('Other cost'), '']], selected),
282	{:class => 'production-cost-selection',	282	{:class => 'production-cost-selection',
283	:onchange => "productionCostTypeChange(this, '#{url}', '#{prompt_msg}', '#{error_msg}')"})	283	:onchange => "productionCostTypeChange(this, '#{url}', '#{prompt_msg}', '#{error_msg}')"})
284	end	284	end
	@@ -1,2 +0,0 @@	@@ -1,2 +0,0 @@
1	-module ProductCategoryViewerHelper
2	-end
1	module SearchHelper	1	module SearchHelper
2		2
		3	+ MAP_SEARCH_LIMIT = 2000
		4	+ LIST_SEARCH_LIMIT = 20
		5	+ BLOCKS_SEARCH_LIMIT = 18
		6	+ MULTIPLE_SEARCH_LIMIT = 8
		7	+ DistFilt = 200
		8	+ DistBoost = 50
		9	+
		10	+ Searches = ActiveSupport::OrderedHash[
		11	+ :articles, _('Contents'),
		12	+ :enterprises, _('Enterprises'),
		13	+ :people, _('People'),
		14	+ :communities, _('Communities'),
		15	+ :products, _('Products and Services'),
		16	+ :events, _('Events'),
		17	+ ]
		18	+
		19	+ SortOptions = {
		20	+ :products => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
		21	+ :more_recent, {:label => _('More Recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
		22	+ :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
		23	+ :closest, {:label => _('Closest to me'), :if => proc{ logged_in? && (profile=current_user.person).lat && profile.lng },
		24	+ :solr_opts => {:sort => "geodist() asc",
		25	+ :latitude => proc{ current_user.person.lat }, :longitude => proc{ current_user.person.lng }}},
		26	+ ],
		27	+ :events => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
		28	+ :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
		29	+ ],
		30	+ :articles => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
		31	+ :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
		32	+ :more_recent, {:label => _('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
		33	+ ],
		34	+ :enterprises => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
		35	+ :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
		36	+ ],
		37	+ :people => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
		38	+ :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
		39	+ ],
		40	+ :communities => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
		41	+ :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
		42	+ ],
		43	+ }
		44	+
3	# FIXME remove it after search_controler refactored	45	# FIXME remove it after search_controler refactored
4	include EventsHelper	46	include EventsHelper
5		47
6	- STOP_WORDS = {
7	- 'pt_BR' => Ferret::Analysis::FULL_PORTUGUESE_STOP_WORDS,
8	- 'en' => Ferret::Analysis::FULL_ENGLISH_STOP_WORDS,
9	- }
10	-
11	- def relevance_for(hit)
12	- n = (hit.ferret_score if hit.respond_to?(:ferret_score))
13	- n \|\|= 1.0
14	- (n * 100.0).round	48	+ def search_page_title(title, category = nil)
		49	+ title = "<h1>" + title
		50	+ title += '<small>' + category.name + '</small>' if category
		51	+ title + "</h1>"
15	end	52	end
16		53
17	- def remove_stop_words(query)
18	- (query.downcase.scan(/"[^"]"?\|'[^']'?\|[^'"\s]+/) - (STOP_WORDS[locale] \|\| [])).join(' ')	54	+ def category_context(category, url)
		55	+ content_tag('div', category.full_name + _(', ') +
		56	+ link_to(_('search in all categories'),
		57	+ url.merge(:category_path => [], :action => (params[:action] == 'category_index' ? 'index' : params[:action]) )),
		58	+ :align => 'center', :class => 'search-category-context') if category
19	end	59	end
20		60
21	- def display_results(use_map = true)
22	-
23	- unless use_map && GoogleMaps.enabled?(environment.default_hostname)
24	- return render(:partial => 'display_results')	61	+ def display_results(use_map = false)
		62	+ if params[:display] == 'map' && use_map
		63	+ partial = 'google_maps'
		64	+ klass = 'map'
		65	+ else
		66	+ partial = 'display_results'
		67	+ klass = 'list'
25	end	68	end
26		69
27	- data =
28	- if params[:display] == 'map'
29	- {
30	- :partial => 'google_maps',
31	- :toggle => button(:search, _('Display in list'), params.merge(:display => 'list'), :class => "map-toggle-button" ),
32	- :class => 'map' ,
33	- }	70	+ content_tag('div', render(:partial => partial), :class => "map-or-list-search-results #{klass}")
		71	+ end
		72	+
		73	+ def display_map_list_button
		74	+ button(:search, params[:display] == 'map' ? _('Display in list') : _('Display in map'),
		75	+ params.merge(:display => (params[:display] == 'map' ? 'list' : 'map')),
		76	+ :class => "map-toggle-button" )
		77	+ end
		78	+
		79	+ def city_with_state(city)
		80	+ if city and city.kind_of?(City)
		81	+ s = city.parent
		82	+ if s and s.kind_of?(State) and s.acronym
		83	+ city.name + ', ' + s.acronym
34	else	84	else
35	- {
36	- :partial => 'display_results',
37	- :toggle => button(:search, _('Display in map'), params.merge(:display => 'map'), :class => "map-toggle-button" ),
38	- :class => 'list' ,
39	- }	85	+ city.name
40	end	86	end
		87	+ else
		88	+ nil
		89	+ end
		90	+ end
41		91
42	- content_tag('div', data[:toggle] + (render :partial => data[:partial]), :class => "map-or-list-search-results #{data[:class]}")	92	+ def facets_menu(asset, _facets)
		93	+ @asset_class = asset_class(asset)
		94	+ @facets = _facets
		95	+ render(:partial => 'facets_menu')
43	end	96	end
44		97
45	- def display_item_map_info(item)
46	- if item.kind_of?(Profile)
47	- display_profile_info(item)
48	- elsif item.kind_of?(Product)
49	- display_product_info(item)
50	- end	98	+ def facets_unselect_menu(asset)
		99	+ @asset_class = asset_class(asset)
		100	+ render(:partial => 'facets_unselect_menu')
51	end	101	end
52		102
53	- def display_profile_info(profile)
54	- data = ''
55	- unless profile.contact_email.nil?
56	- data << content_tag('strong', _('E-Mail: ')) + profile.contact_email + '<br/>'
57	- end
58	- unless profile.contact_phone.nil?
59	- data << content_tag('strong', _('Phone(s): ')) + profile.contact_phone + '<br/>'
60	- end
61	- unless profile.region.nil?
62	- data << content_tag('strong', _('Location: ')) + profile.region.name + '<br/>'
63	- end
64	- unless profile.address.nil?
65	- data << content_tag('strong', _('Address: ')) + profile.address + '<br/>'
66	- end
67	- unless profile.products.empty?
68	- 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/>'
69	- end
70	- if profile.respond_to?(:distance) and !profile.distance.nil?
71	- data << content_tag('strong', _('Distance: ')) + "%.2f%" % profile.distance + '<br/>'
72	- end
73	- content_tag('table',
74	- content_tag('tr',
75	- content_tag('td', content_tag('div', profile_image(profile, :thumb), :class => 'profile-info-picture')) +
76	- content_tag('td', content_tag('strong', link_to(profile.name, url_for(profile.url))) + '<br/>' + data
77	- )
78	- ),
79	- :class => 'profile-info'
80	- )	103	+ def facet_javascript(input_id, facet, array)
		104	+ array = [] if array.nil?
		105	+ hintText = _('Type in an option')
		106	+ text_field_tag('facet['+input_id+']', '', :id => input_id) +
		107	+ javascript_tag("jQuery.TokenList(jQuery('##{input_id}'), #{array.to_json},
		108	+ {searchDelay: 0, permanentDropdown: true, theme: 'facet', dontAdd: true, preventDuplicates: true,
		109	+ #{jquery_token_input_messages_json(hintText)}});")
81	end	110	end
82		111
83	- def display_product_info(product)
84	- data = ''
85	- unless product.price.nil?
86	- data << content_tag('strong', _('Price: ')) + product.price + '<br/>'
87	- end
88	- unless product.enterprise.nil?
89	- data << content_tag('strong', _('Provider: ')) + link_to_profile(product.enterprise.name, product.enterprise.identifier)
90	- end
91	- unless product.product_category.nil?
92	- data << content_tag('strong', _('Category: ')) + link_to(product.product_category.name, :controller => 'search', :action => 'assets', :asset => 'products', :product_category => product.product_category.id)	112	+ def facet_link_html(facet, params, value, label, count)
		113	+ params = params ? params.dup : {}
		114	+ has_extra = label.kind_of?(Array)
		115	+ link_label = has_extra ? label[0] : label
		116	+ id = facet[:solr_field].to_s
		117	+ params[:facet] \|\|= {}
		118	+ params[:facet][id] \|\|= {}
		119	+ params[:page] = {} if params[:page]
		120	+
		121	+ selected = facet[:label_id].nil? ? params[:facet][id] == value : params[:facet][id][facet[:label_id]].to_a.include?(value)
		122	+
		123	+ if count > 0
		124	+ url = params.merge(:facet => params[:facet].merge(
		125	+ id => facet[:label_id].nil? ? value : params[:facet][id].merge( facet[:label_id] => params[:facet][id][facet[:label_id]].to_a \| [value] )
		126	+ ))
		127	+ else
		128	+ # preserve others filters and change this filter
		129	+ url = params.merge(:facet => params[:facet].merge(
		130	+ id => facet[:label_id].nil? ? value : { facet[:label_id] => value }
		131	+ ))
93	end	132	end
94	- content_tag('table',
95	- content_tag('tr',
96	- 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')) +
97	- content_tag('td', content_tag('strong', link_to(product.name, :controller => 'catalog', :profile => product.enterprise.identifier, :action => 'show', :id => product)) + '<br/>' + data)
98	- ), :class => 'profile-info')	133	+
		134	+ content_tag 'div', link_to(link_label, url, :class => 'facet-result-link-label') +
		135	+ content_tag('span', (has_extra ? label[1] : ''), :class => 'facet-result-extra-label') +
		136	+ (count > 0 ? content_tag('span', " (#{count})", :class => 'facet-result-count') : ''),
		137	+ :class => 'facet-menu-item' + (selected ? ' facet-result-link-selected' : '')
99	end	138	end
100		139
101	- def product_categories_menu(asset, product_category, object_ids = nil)
102	- cats = ProductCategory.menu_categories(@product_category, environment)
103	- cats += cats.select { \|c\| c.children_count > 0 }.map(&:children).flatten
104	- product_categories_ids = cats.map(&:id)
105	-
106	- counts = @noosfero_finder.product_categories_count(asset, product_categories_ids, object_ids)
107	-
108	- product_categories_menu = ProductCategory.menu_categories(product_category, environment).map do \|cat\|
109	- hits = counts[cat.id]
110	- childs = []
111	- if hits
112	- if cat.children_count > 0
113	- childs = cat.children.map do \|child\|
114	- child_hits = counts[child.id]
115	- [child, child_hits]
116	- end.select{\|child, child_hits\| child_hits }
117	- else
118	- childs = []	140	+ def facet_selecteds_html_for(environment, klass, params)
		141	+ def name_with_extra(klass, facet, value)
		142	+ name = klass.facet_result_name(facet, value)
		143	+ name = name[0] + name[1] if name.kind_of?(Array)
		144	+ name
		145	+ end
		146	+
		147	+ ret = []
		148	+ params = params.dup
		149	+ params[:facet].each do \|id, value\|
		150	+ facet = klass.facet_by_id(id.to_sym)
		151	+ if value.kind_of?(Hash)
		152	+ label_hash = facet[:label].call(environment)
		153	+ value.each do \|label_id, value\|
		154	+ facet[:label_id] = label_id
		155	+ facet[:label] = label_hash[label_id]
		156	+ value.to_a.each do \|value\|
		157	+ ret << [facet[:label], name_with_extra(klass, facet, value),
		158	+ params.merge(:facet => params[:facet].merge(id => params[:facet][id].merge(label_id => params[:facet][id][label_id].to_a.reject{ \|v\| v == value })))]
		159	+ end
119	end	160	end
		161	+ else
		162	+ ret << [klass.facet_label(facet), name_with_extra(klass, facet, value),
		163	+ params.merge(:facet => params[:facet].reject{ \|k,v\| k == id })]
120	end	164	end
121	- [cat, hits, childs]
122	- end.select{\|cat, hits\| hits }	165	+ end
123		166
124	- render(:partial => 'product_categories_menu', :object => product_categories_menu)	167	+ ret.map do \|label, name, url\|
		168	+ content_tag('div', content_tag('span', label, :class => 'facet-selected-label') +
		169	+ content_tag('span', name, :class => 'facet-selected-name') +
		170	+ link_to('', url, :class => 'facet-selected-remove', :title => 'remove facet'), :class => 'facet-selected')
		171	+ end.join
		172	+ end
		173	+
		174	+ def order_by(asset)
		175	+ options = SortOptions[asset].map do \|name, options\|
		176	+ next if options[:if] and ! instance_eval(&options[:if])
		177	+ [_(options[:label]), name.to_s]
		178	+ end.compact
		179	+
		180	+ content_tag('div', _('Sort results by ') +
		181	+ select_tag(asset.to_s + '[order]', options_for_select(options, params[:order_by] \|\| 'none'),
		182	+ {:onchange => "window.location = jQuery.param.querystring(window.location.href, { 'order_by' : this.options[this.selectedIndex].value})"}),
		183	+ :class => "search-ordering")
		184	+ end
		185	+
		186	+ def label_total_found(asset, total_found)
		187	+ labels = {
		188	+ :products => _("%s products offers found"),
		189	+ :articles => _("%s articles found"),
		190	+ :events => _("%s events found"),
		191	+ :people => _("%s people found"),
		192	+ :enterprises => _("%s enterprises found"),
		193	+ :communities => _("%s communities found"),
		194	+ }
		195	+ content_tag('span', labels[asset] % total_found,
		196	+ :class => "total-pages-found") if labels[asset]
		197	+ end
		198	+
		199	+ def asset_class(asset)
		200	+ asset.to_s.singularize.camelize.constantize
		201	+ end
		202	+
		203	+ def asset_table(asset)
		204	+ asset_class(asset).table_name
125	end	205	end
126		206
127	end	207	end
	@@ -2,6 +2,12 @@ require 'hpricot'		@@ -2,6 +2,12 @@ require 'hpricot'
2		2
3	class Article < ActiveRecord::Base	3	class Article < ActiveRecord::Base
4		4
		5	+ # use for internationalizable human type names in search facets
		6	+ # reimplement on subclasses
		7	+ def self.type_name
		8	+ _('Content')
		9	+ end
		10	+
5	track_actions :create_article, :after_create, :keep_params => [:name, :url], :if => Proc.new { \|a\| a.is_trackable? && !a.image? }, :custom_target => :action_tracker_target	11	track_actions :create_article, :after_create, :keep_params => [:name, :url], :if => Proc.new { \|a\| a.is_trackable? && !a.image? }, :custom_target => :action_tracker_target
6	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	12	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
7	track_actions :remove_article, :before_destroy, :keep_params => [:name], :if => Proc.new { \|a\| a.is_trackable? }, :custom_target => :action_tracker_target	13	track_actions :remove_article, :before_destroy, :keep_params => [:name], :if => Proc.new { \|a\| a.is_trackable? }, :custom_target => :action_tracker_target
	@@ -22,6 +28,9 @@ class Article < ActiveRecord::Base		@@ -22,6 +28,9 @@ class Article < ActiveRecord::Base
22	has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]	28	has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]
23	has_many :categories, :through => :article_categorizations	29	has_many :categories, :through => :article_categorizations
24		30
		31	+ has_many :article_categorizations_including_virtual, :class_name => 'ArticleCategorization', :dependent => :destroy
		32	+ has_many :categories_including_virtual, :through => :article_categorizations_including_virtual, :source => :category
		33	+
25	acts_as_having_settings :field => :setting	34	acts_as_having_settings :field => :setting
26		35
27	settings_items :display_hits, :type => :boolean, :default => true	36	settings_items :display_hits, :type => :boolean, :default => true
	@@ -47,7 +56,7 @@ class Article < ActiveRecord::Base		@@ -47,7 +56,7 @@ class Article < ActiveRecord::Base
47	xss_terminate :only => [ :name ], :on => 'validation', :with => 'white_list'	56	xss_terminate :only => [ :name ], :on => 'validation', :with => 'white_list'
48		57
49	named_scope :in_category, lambda { \|category\|	58	named_scope :in_category, lambda { \|category\|
50	- {:include => 'categories', :conditions => { 'categories.id' => category.id }}	59	+ {:include => 'categories_including_virtual', :conditions => { 'categories.id' => category.id }}
51	}	60	}
52		61
53	named_scope :by_range, lambda { \|range\| {	62	named_scope :by_range, lambda { \|range\| {
	@@ -96,11 +105,13 @@ class Article < ActiveRecord::Base		@@ -96,11 +105,13 @@ class Article < ActiveRecord::Base
96	@pending_categorizations \|\|= []	105	@pending_categorizations \|\|= []
97	end	106	end
98		107
99	- def add_category(c)
100	- if self.id
101	- ArticleCategorization.add_category_to_article(c, self)
102	- else	108	+ def add_category(c, reload=false)
		109	+ if new_record?
103	pending_categorizations << c	110	pending_categorizations << c
		111	+ else
		112	+ ArticleCategorization.add_category_to_article(c, self)
		113	+ self.categories(reload)
		114	+ self.solr_save
104	end	115	end
105	end	116	end
106		117
	@@ -109,6 +120,7 @@ class Article < ActiveRecord::Base		@@ -109,6 +120,7 @@ class Article < ActiveRecord::Base
109	ids.uniq.each do \|item\|	120	ids.uniq.each do \|item\|
110	add_category(Category.find(item)) unless item.to_i.zero?	121	add_category(Category.find(item)) unless item.to_i.zero?
111	end	122	end
		123	+ self.categories(true)
112	end	124	end
113		125
114	after_create :create_pending_categorizations	126	after_create :create_pending_categorizations
	@@ -116,6 +128,8 @@ class Article < ActiveRecord::Base		@@ -116,6 +128,8 @@ class Article < ActiveRecord::Base
116	pending_categorizations.each do \|item\|	128	pending_categorizations.each do \|item\|
117	ArticleCategorization.add_category_to_article(item, self)	129	ArticleCategorization.add_category_to_article(item, self)
118	end	130	end
		131	+ self.categories(true)
		132	+ self.solr_save
119	pending_categorizations.clear	133	pending_categorizations.clear
120	end	134	end
121		135
	@@ -126,8 +140,6 @@ class Article < ActiveRecord::Base		@@ -126,8 +140,6 @@ class Article < ActiveRecord::Base
126		140
127	acts_as_versioned	141	acts_as_versioned
128		142
129	- acts_as_searchable :additional_fields => [ :comment_data ]
130	-
131	def comment_data	143	def comment_data
132	comments.map {\|item\| [item.title, item.body].join(' ') }.join(' ')	144	comments.map {\|item\| [item.title, item.body].join(' ') }.join(' ')
133	end	145	end
	@@ -142,13 +154,33 @@ class Article < ActiveRecord::Base		@@ -142,13 +154,33 @@ class Article < ActiveRecord::Base
142	{:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]}	154	{:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]}
143	}	155	}
144		156
		157	+ named_scope :join_profile, :joins => [:profile]
		158	+
		159	+ named_scope :public,
		160	+ :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ]
		161	+
		162	+ named_scope :more_recent,
		163	+ :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND
		164	+ ((articles.type != ?) OR articles.type is NULL)",
		165	+ true, true, true, true, 'RssFeed'
		166	+ ],
		167	+ :order => 'articles.published_at desc, articles.id desc'
		168	+
		169	+ # retrives the most commented articles, sorted by the comment count (largest
		170	+ # first)
		171	+ def self.most_commented(limit)
		172	+ paginate(:order => 'comments_count DESC', :page => 1, :per_page => limit)
		173	+ end
		174	+
		175	+ named_scope :more_popular, :order => 'hits DESC'
		176	+
145	# retrieves the latest +limit+ articles, sorted from the most recent to the	177	# retrieves the latest +limit+ articles, sorted from the most recent to the
146	# oldest.	178	# oldest.
147	#	179	#
148	# Only includes articles where advertise == true	180	# Only includes articles where advertise == true
149	- def self.recent(limit, extra_conditions = {})	181	+ def self.recent(limit = nil, extra_conditions = {})
150	# FIXME this method is a horrible hack	182	# FIXME this method is a horrible hack
151	- options = { :limit => limit,	183	+ options = { :page => 1, :per_page => limit,
152	:conditions => [	184	:conditions => [
153	"advertise = ? AND	185	"advertise = ? AND
154	published = ? AND	186	published = ? AND
	@@ -166,20 +198,14 @@ class Article < ActiveRecord::Base		@@ -166,20 +198,14 @@ class Article < ActiveRecord::Base
166	options.delete(:include)	198	options.delete(:include)
167	end	199	end
168	if extra_conditions == {}	200	if extra_conditions == {}
169	- self.find(:all, options)	201	+ self.paginate(options)
170	else	202	else
171	with_scope :find => {:conditions => extra_conditions} do	203	with_scope :find => {:conditions => extra_conditions} do
172	- self.find(:all, options)	204	+ self.paginate(options)
173	end	205	end
174	end	206	end
175	end	207	end
176		208
177	- # retrives the most commented articles, sorted by the comment count (largest
178	- # first)
179	- def self.most_commented(limit)
180	- find(:all, :order => 'comments_count DESC', :limit => limit)
181	- end
182	-
183	# produces the HTML code that is to be displayed as this article's contents.	209	# produces the HTML code that is to be displayed as this article's contents.
184	#	210	#
185	# The implementation in this class just provides the +body+ attribute as the	211	# The implementation in this class just provides the +body+ attribute as the
	@@ -421,7 +447,7 @@ class Article < ActiveRecord::Base		@@ -421,7 +447,7 @@ class Article < ActiveRecord::Base
421	end	447	end
422		448
423	def comments_updated	449	def comments_updated
424	- ferret_update	450	+ solr_save
425	end	451	end
426		452
427	def accept_category?(cat)	453	def accept_category?(cat)
	@@ -573,6 +599,99 @@ class Article < ActiveRecord::Base		@@ -573,6 +599,99 @@ class Article < ActiveRecord::Base
573		599
574	private	600	private
575		601
		602	+ # FIXME: workaround for development env.
		603	+ # Subclasses aren't (re)loaded, and acts_as_solr
		604	+ # depends on subclasses method to search
		605	+ # see http://stackoverflow.com/questions/4138957/activerecordsubclassnotfound-error-when-using-sti-in-rails/4139245
		606	+ UploadedFile
		607	+ TextArticle
		608	+ TinyMceArticle
		609	+ TextileArticle
		610	+ Folder
		611	+ EnterpriseHomepage
		612	+ Gallery
		613	+ Blog
		614	+ Forum
		615	+ Event
		616	+
		617	+ def self.f_type_proc(klass)
		618	+ klass.constantize.type_name
		619	+ end
		620	+
		621	+ def self.f_profile_type_proc(klass)
		622	+ klass.constantize.type_name
		623	+ end
		624	+
		625	+ def f_type
		626	+ #join common types
		627	+ case self.class.name
		628	+ when 'TinyMceArticle', 'TextileArticle'
		629	+ TextArticle.name
		630	+ else
		631	+ self.class.name
		632	+ end
		633	+ end
		634	+
		635	+ def f_profile_type
		636	+ self.profile.class.name
		637	+ end
		638	+
		639	+ def f_published_at
		640	+ self.published_at
		641	+ end
		642	+
		643	+ def f_category
		644	+ self.categories.collect(&:name)
		645	+ end
		646	+
		647	+ delegate :region, :region_id, :environment, :environment_id, :to => :profile
		648	+ def name_sortable # give a different name for solr
		649	+ name
		650	+ end
		651	+
		652	+ def public
		653	+ self.public?
		654	+ end
		655	+
		656	+ def category_filter
		657	+ categories_including_virtual_ids
		658	+ end
		659	+
		660	+ public
		661	+
		662	+ acts_as_faceted :fields => {
		663	+ :f_type => {:label => _('Type'), :proc => proc{\|klass\| f_type_proc(klass)}},
		664	+ :f_published_at => {:type => :date, :label => _('Published date'), :queries => {'[* TO NOW-1YEARS/DAY]' => _("Older than one year"),
		665	+ '[NOW-1YEARS TO NOW/DAY]' => _("Last year"), '[NOW-1MONTHS TO NOW/DAY]' => _("Last month"), '[NOW-7DAYS TO NOW/DAY]' => _("Last week"), '[NOW-1DAYS TO NOW/DAY]' => _("Last day")},
		666	+ :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]']},
		667	+ :f_profile_type => {:label => _('Profile'), :proc => proc{\|klass\| f_profile_type_proc(klass)}},
		668	+ :f_category => {:label => _('Categories')},
		669	+ }, :category_query => proc { \|c\| "category_filter:\"#{c.id}\"" },
		670	+ :order => [:f_type, :f_published_at, :f_profile_type, :f_category]
		671	+
		672	+ acts_as_searchable :fields => facets_fields_for_solr + [
		673	+ # searched fields
		674	+ {:name => {:type => :text, :boost => 2.0}},
		675	+ {:slug => :text}, {:body => :text},
		676	+ {:abstract => :text}, {:filename => :text},
		677	+ # filtered fields
		678	+ {:public => :boolean}, {:environment_id => :integer},
		679	+ {:profile_id => :integer}, :language,
		680	+ {:category_filter => :integer},
		681	+ # ordered/query-boosted fields
		682	+ {:name_sortable => :string}, :last_changed_by_id, :published_at, :is_image,
		683	+ :updated_at, :created_at,
		684	+ ], :include => [
		685	+ {:profile => {:fields => [:name, :identifier, :address, :nickname, :region_id, :lat, :lng]}},
		686	+ {:comments => {:fields => [:title, :body, :author_name, :author_email]}},
		687	+ {:categories => {:fields => [:name, :path, :slug, :lat, :lng, :acronym, :abbreviation]}},
		688	+ ], :facets => facets_option_for_solr,
		689	+ :boost => proc { \|a\| 10 if a.profile && a.profile.enabled },
		690	+ :if => proc{ \|a\| ! ['RssFeed'].include?(a.class.name) }
		691	+ handle_asynchronously :solr_save
		692	+
		693	+ private
		694	+
576	def sanitize_tag_list	695	def sanitize_tag_list
577	sanitizer = HTML::FullSanitizer.new	696	sanitizer = HTML::FullSanitizer.new
578	self.tag_list.names.map!{\|i\| strip_tag_name sanitizer.sanitize(i) }	697	self.tag_list.names.map!{\|i\| strip_tag_name sanitizer.sanitize(i) }
	@@ -15,13 +15,14 @@ class Category < ActiveRecord::Base		@@ -15,13 +15,14 @@ class Category < ActiveRecord::Base
15		15
16	acts_as_filesystem	16	acts_as_filesystem
17		17
18	- has_many :article_categorizations	18	+ has_many :article_categorizations, :dependent => :destroy
19	has_many :articles, :through => :article_categorizations	19	has_many :articles, :through => :article_categorizations
20	has_many :comments, :through => :articles	20	has_many :comments, :through => :articles
21		21
22	has_many :events, :through => :article_categorizations, :class_name => 'Event', :source => :article	22	has_many :events, :through => :article_categorizations, :class_name => 'Event', :source => :article
23		23
24	- has_many :profile_categorizations	24	+ has_many :profile_categorizations, :dependent => :destroy
		25	+ has_many :profiles, :through => :profile_categorizations, :source => :profile
25	has_many :enterprises, :through => :profile_categorizations, :source => :profile, :class_name => 'Enterprise'	26	has_many :enterprises, :through => :profile_categorizations, :source => :profile, :class_name => 'Enterprise'
26	has_many :people, :through => :profile_categorizations, :source => :profile, :class_name => 'Person'	27	has_many :people, :through => :profile_categorizations, :source => :profile, :class_name => 'Person'
27	has_many :communities, :through => :profile_categorizations, :source => :profile, :class_name => 'Community'	28	has_many :communities, :through => :profile_categorizations, :source => :profile, :class_name => 'Community'
	@@ -36,18 +37,38 @@ class Category < ActiveRecord::Base		@@ -36,18 +37,38 @@ class Category < ActiveRecord::Base
36	{ :conditions => [ "type IN (?) OR type IS NULL", types.reject{ \|t\| t.blank? } ] }	37	{ :conditions => [ "type IN (?) OR type IS NULL", types.reject{ \|t\| t.blank? } ] }
37	}	38	}
38		39
		40	+ def recent_people(limit = 10)
		41	+ self.people.paginate(:order => 'created_at DESC, id DESC', :page => 1, :per_page => limit)
		42	+ end
		43	+
		44	+ def recent_enterprises(limit = 10)
		45	+ self.enterprises.paginate(:order => 'created_at DESC, id DESC', :page => 1, :per_page => limit)
		46	+ end
		47	+
		48	+ def recent_communities(limit = 10)
		49	+ self.communities.paginate(:order => 'created_at DESC, id DESC', :page => 1, :per_page => limit)
		50	+ end
		51	+
		52	+ def recent_products(limit = 10)
		53	+ self.products.paginate(:order => 'created_at DESC, id DESC', :page => 1, :per_page => limit)
		54	+ end
		55	+
39	def recent_articles(limit = 10)	56	def recent_articles(limit = 10)
40	self.articles.recent(limit)	57	self.articles.recent(limit)
41	end	58	end
42		59
43	def recent_comments(limit = 10)	60	def recent_comments(limit = 10)
44	- comments.find(:all, :order => 'created_at DESC, comments.id DESC', :limit => limit)	61	+ comments.paginate(:all, :order => 'created_at DESC, comments.id DESC', :page => 1, :per_page => limit)
45	end	62	end
46		63
47	def most_commented_articles(limit = 10)	64	def most_commented_articles(limit = 10)
48	self.articles.most_commented(limit)	65	self.articles.most_commented(limit)
49	end	66	end
50		67
		68	+ def upcoming_events(limit = 10)
		69	+ self.events.paginate(:conditions => [ 'start_date >= ?', Date.today ], :order => 'start_date', :page => 1, :per_page => limit)
		70	+ end
		71	+
51	def display_in_menu?	72	def display_in_menu?
52	display_in_menu	73	display_in_menu
53	end	74	end
	@@ -69,4 +90,23 @@ class Category < ActiveRecord::Base		@@ -69,4 +90,23 @@ class Category < ActiveRecord::Base
69	self.children.find(:all, :conditions => {:display_in_menu => true}).empty?	90	self.children.find(:all, :conditions => {:display_in_menu => true}).empty?
70	end	91	end
71		92
		93	+ private
		94	+ def name_sortable # give a different name for solr
		95	+ name
		96	+ end
		97	+ public
		98	+
		99	+ acts_as_searchable :fields => [
		100	+ # searched fields
		101	+ {:name => {:type => :text, :boost => 2.0}},
		102	+ {:path => :text}, {:slug => :text},
		103	+ {:abbreviation => :text}, {:acronym => :text},
		104	+ # filtered fields
		105	+ :parent_id,
		106	+ # ordered/query-boosted fields
		107	+ {:name_sortable => :string},
		108	+ ]
		109	+ after_save_reindex [:articles, :profiles], :with => :delayed_job
		110	+ handle_asynchronously :solr_save
		111	+
72	end	112	end