Merge remote branch 'noosfero-bsc/new-search-merge'

Conflicts: app/controllers/application.rb app/controllers/public/browse_controller.rb app/helpers/application_helper.rb app/helpers/display_helper.rb app/models/environment_finder.rb app/models/product.rb app/views/layouts/_javascript.rhtml app/views/layouts/application-ng.rhtml public/javascripts/application.js public/stylesheets/application.css test/functional/browse_controller_test.rb test/functional/search_controller_test.rb vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake

Merge remote branch 'noosfero-bsc/new-search-merge'
Conflicts: app/controllers/application.rb app/controllers/public/browse_controller.rb app/helpers/application_helper.rb app/helpers/display_helper.rb app/models/environment_finder.rb app/models/product.rb app/views/layouts/_javascript.rhtml app/views/layouts/application-ng.rhtml public/javascripts/application.js public/stylesheets/application.css test/functional/browse_controller_test.rb test/functional/search_controller_test.rb vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
Rafael Martins
2 parents 3ebe0593 74a91f4b
Showing 129 changed files with 7962 additions and 5141 deletions Show diff stats
app/controllers/application.rb
app/controllers/public/browse_controller.rb
app/controllers/public/map_balloon_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/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
app/models/certifier.rb
app/models/communities_block.rb
app/models/community.rb
app/models/enterprise.rb
app/models/enterprise_homepage.rb
app/models/environment.rb
app/models/environment_finder.rb
 require 'application_controller'
+
+# his is the application's main controller. Features defined here are
+# available in all controllers.
+class ApplicationController < ActionController::Base
+
+  before_filter :change_pg_schema
+
+  include ApplicationHelper
+  layout :get_layout
+  def get_layout
+    theme_option(:layout) || 'application'
+  end
+
+  filter_parameter_logging :password
+
+  def log_processing
+    super
+    return unless ENV['RAILS_ENV'] == 'production'
+    if logger && logger.info?
+      logger.info("  HTTP Referer: #{request.referer}")
+      logger.info("  User Agent: #{request.user_agent}")
+      logger.info("  Accept-Language: #{request.headers['HTTP_ACCEPT_LANGUAGE']}")
+    end
+  end
+
+  helper :document
+  helper :language
+
+  def self.no_design_blocks
+    @no_design_blocks = true
+  end
+  def self.uses_design_blocks?
+    !@no_design_blocks
+  end
+  def uses_design_blocks?
+    !@no_design_blocks && self.class.uses_design_blocks?
+  end
+
+  # Be sure to include AuthenticationSystem in Application Controller instead
+  include AuthenticatedSystem
+  include PermissionCheck
+
+  def self.require_ssl(*options)
+    before_filter :check_ssl, *options
+  end
+  def check_ssl
+    return true if (request.ssl? || ENV['RAILS_ENV'] == 'development')
+    redirect_to_ssl
+  end
+  def redirect_to_ssl
+    if environment.enable_ssl
+      redirect_to(params.merge(:protocol => 'https://', :host => ssl_hostname))
+      true
+    else
+      false
+    end
+  end
+
+  def self.refuse_ssl(*options)
+    before_filter :avoid_ssl, *options
+  end
+  def avoid_ssl
+    if (!request.ssl? || ENV['RAILS_ENV'] == 'development')
+      true
+    else
+      redirect_to(params.merge(:protocol => 'http://'))
+      false
+    end
+  end
+
+  before_filter :set_locale
+  def set_locale
+    FastGettext.available_locales = Noosfero.available_locales
+    FastGettext.default_locale = Noosfero.default_locale
+    FastGettext.set_locale(params[:lang] || session[:lang] || Noosfero.default_locale || request.env['HTTP_ACCEPT_LANGUAGE'] || 'en')
+    if params[:lang]
+      session[:lang] = params[:lang]
+    end
+  end
+
+  include NeedsProfile
+
+  before_filter :detect_stuff_by_domain
+  before_filter :init_noosfero_plugins
+  attr_reader :environment
+
+  before_filter :load_terminology
+
+  # declares that the given <tt>actions</tt> cannot be accessed by other HTTP
+  # method besides POST.
+  def self.post_only(actions, redirect = { :action => 'index'})
+    verify :method => :post, :only => actions, :redirect_to => redirect
+  end
+
+  helper_method :current_person, :current_person
+
+  def change_pg_schema
+    if Noosfero::MultiTenancy.on? and ActiveRecord::Base.postgresql?
+      Noosfero::MultiTenancy.db_by_host = request.host
+    end
+  end
+
+  protected
+
+  def boxes_editor?
+    false
+  end
+
+  def content_editor?
+    false
+  end
+
+  def user
+    current_user.person if logged_in?
+  end
+  
+  alias :current_person :user
+
+  # TODO: move this logic somewhere else (Domain class?)
+  def detect_stuff_by_domain
+    @domain = Domain.find_by_name(request.host)
+    if @domain.nil?
+      @environment = Environment.default
+    else
+      @environment = @domain.environment
+      @profile = @domain.profile
+    end
+  end
+
+  def init_noosfero_plugins
+    @plugins = Noosfero::Plugin::Manager.new(self)
+    @plugins.enabled_plugins.map(&:class).each do |plugin|
+      prepend_view_path(plugin.view_path)
+    end
+    init_noosfero_plugins_controller_filters
+  end
+
+  # This is a generic method that initialize any possible filter defined by a
+  # plugin to the current controller being initialized.
+  def init_noosfero_plugins_controller_filters
+    @plugins.enabled_plugins.each do |plugin|
+      plugin.send(self.class.name.underscore + '_filters').each do |plugin_filter|
+        self.class.send(plugin_filter[:type], plugin.class.name.underscore + '_' + plugin_filter[:method_name], (plugin_filter[:options] || {}))
+        self.class.send(:define_method, plugin.class.name.underscore + '_' + plugin_filter[:method_name], plugin_filter[:block])
+      end
+    end
+  end
+
+  def load_terminology
+    # cache terminology for performance
+    @@terminology_cache ||= {}
+    @@terminology_cache[environment.id] ||= environment.terminology
+    Noosfero.terminology = @@terminology_cache[environment.id]
+  end
+
+  def render_not_found(path = nil)
+    @no_design_blocks = true
+    @path ||= request.path
+    render :template => 'shared/not_found.rhtml', :status => 404, :layout => get_layout
+  end
+  alias :render_404 :render_not_found
+
+  def render_access_denied(message = nil, title = nil)
+    @no_design_blocks = true
+    @message = message
+    @title = title
+    render :template => 'shared/access_denied.rhtml', :status => 403
+  end
+
+end
@@ -1,79 +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], {:per_page => per_page, :page => params[:page]})[:results]
-    else
-      @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
-    end
-  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], {:per_page => per_page, :page => params[:page]})[:results]
-    else
-      @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
-    end
-  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])[:results]
-    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,28 @@
+class MapBalloonController < PublicController
+
+  before_filter :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 profile
+    @profile = Profile.find(params[:id])
+  end
+
+end
 class SearchController < PublicController
  
+  MAP_SEARCH_LIMIT = 2000
+  LIST_SEARCH_LIMIT = 20
+  BLOCKS_SEARCH_LIMIT = 18
+  MULTIPLE_SEARCH_LIMIT = 8
+
   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)
+    @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 articles
+    @filter = params[:filter] ? filter : nil
+    @filter_title = params[:filter] ? filter_description(@asset, @filter) : nil
+    if !@empty_query
+      full_text_search ['public:true']
+    elsif params[:filter]
+      @results[@asset] = @environment.articles.public.send(@filter).paginate(paginate_options)
     end
   end
  
-  def prepare_filter
-    if @category
-      @noosfero_finder = CategoryFinder.new(@category)
+  def contents
+    redirect_to params.merge(:action => :articles)
+  end
+
+  def people
+    if !@empty_query
+      full_text_search ['public:true']
     else
-      @noosfero_finder = EnvironmentFinder.new(@environment)
+      @results[@asset] = @environment.people.visible.send(@filter).paginate(paginate_options)
+      @facets = {}
+    end
+  end
+
+  def products
+    if !@empty_query
+      full_text_search ['public:true']
     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)
+  def enterprises
+    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 check_valid_assets
-    @asset = params[:asset].to_sym
-    if !where_to_search.map(&:first).include?(@asset)
-      render :text => 'go away', :status => 403
-      return
+  def communities
+    if !@empty_query
+      full_text_search ['public:true']
+    else
+      @results[@asset] = @environment.communities.visible.send(@filter).paginate(paginate_options)
     end
   end
  
   def events
     @category_id = @category ? @category.id : nil
  
+    if params[:year] || params[:month]
+      date = Date.new(year.to_i, month.to_i, 1)
+      date_range = (date - 1.month)..(date + 1.month).at_end_of_month
+    end
+
+    if @query.blank?
+      # Ignore pagination for asset events
+      if date_range
+        @results[@asset] = Event.send('find', :all, 
+          :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
+        @results[@asset] = Event.send('find', :all)
+      end
+    else
+      full_text_search
+    end
+
     @selected_day = nil
     @events_of_the_day = []
     date = build_date(params[:year], params[:month], params[:day])
@@ -58,118 +110,27 @@ class SearchController &lt; PublicController
       end
     end
  
-    events = @results[:events]
-
+    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 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
-  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?
-      ret = @noosfero_finder.find(asset, @query, calculate_find_options(asset, nil, params[:page], @product_category, @region, params[:radius], params[:year], params[:month]).merge({:limit => :all}))
-      @result_ids = ret.is_a?(Hash) ? ret[:results] : ret
-    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
-
-    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
-    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
-    else
-      (searching.size == 1) ? 20 : 6
-    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
-  end
-
   def index
-    @query = params[: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 = {}
-    @facets = {}
     @order = []
     @names = {}
+    @results_only = true
  
-    where_to_search.select { |key,description| @searching[key]  }.each do |key, description|
+    @enabled_searchs.select { |key,description| @searching[key] }.each do |key, description|
+      load_query
+      @asset = key
+      send(key)
       @order << key
-      find_options = calculate_find_options(key, limit, params[:page], @product_category, @region, params[:radius], params[:year], params[:month]);
-      ret = @noosfero_finder.find(key, @query, find_options)
-      @results[key] = ret.is_a?(Hash) ? ret[:results] : ret
-      @facets[key] = ret.is_a?(Hash) ? ret[:facets] : {}
       @names[key] = getterm(description)
     end
+    @asset = nil
+    @facets = {}
  
     if @results.keys.size == 1
       specific_action = @results.keys.first
@@ -180,34 +141,32 @@ class SearchController &lt; PublicController
         return
       end
     end
-
-    render :action => 'index'
   end
  
-  alias :assets :index
-
-  #######################################################
+  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)
+      @names[asset] = name
     end
   end
-  attr_reader :category
  
   def tags
     @tags_cache_key = "tags_env_#{environment.id.to_s}"
@@ -224,21 +183,123 @@ class SearchController &lt; PublicController
     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)
+
+    @query = params[:query] || ''
+    @empty_query = @category.nil? && @query.blank?
+  end
  
-  def popup
-    @regions = Region.find(:all).select{|r|r.lat && r.lng}
-    render :action => 'popup', :layout => false
+  def load_category
+    unless params[:category_path].blank?
+      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
   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]))
+  FILTERS = %w(
+    more_recent
+    more_active
+    more_popular
+  )
+  def filter
+    if FILTERS.include?(params[:filter])
+      params[:filter]
     else
-      @events_of_the_day = environment.events.by_day(@selected_day)
+      'more_recent'
     end
-    render :partial => 'events/events_by_day'
+  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'),
+    }[asset.to_s + '_' + filter]
+  end
+
+  def load_search_assets
+    @enabled_searchs = [
+      [ :articles, _('Contents') ],
+      [ :enterprises, _('Enterprises') ],
+      [ :people, _('People') ],
+      [ :communities, _('Communities') ],
+      [ :products, _('Products and Services') ],
+      [ :events, _('Events') ]
+    ].select {|key, name| !environment.enabled?('disable_asset_' + key.to_s) }
+
+    @searching = {}
+    @titles = {}
+    @enabled_searchs.each do |key, name|
+      @titles[key] = name
+      @searching[key] = params[:action] == 'index' || params[:action] == key.to_s
+    end
+  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 = [])
+    paginate_options = paginate_options(params[:page])
+    asset_class = asset_class(@asset)
+
+    solr_options = {}
+    if !@results_only and asset_class.methods.include?('facets')
+      solr_options.merge! asset_class.facets_find_options(params[:facet])
+      solr_options[:all_facets] = true
+      solr_options[:limit] = 0 if @facets_only
+      solr_options[:facets][:browse] << asset_class.facet_category_query.call(@category) if @category and asset_class.facet_category_query
+    end
+    solr_options[:order] = params[:order_by] if params[:order_by]
+    solr_options[:filter_queries] ||= []
+    solr_options[:filter_queries] += filters
+    solr_options[:filter_queries] << "environment_id:#{environment.id}"
+
+    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
@@ -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',
@@ -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-contents'), {: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,4 +1328,8 @@ 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
+
 end
@@ -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?
@@ -1,2 +0,0 @@
-module ProductCategoryViewerHelper
-end
@@ -3,116 +3,160 @@ module SearchHelper
   # FIXME remove it after search_controler refactored
   include EventsHelper
  
-  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 display_results(use_map = true)
+  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
  
-    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 && GoogleMaps.enabled?(environment.default_hostname)
+      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' ,
-        }
-      else
-        {
-          :partial => 'display_results',
-          :toggle => button(:search, _('Display in map'), params.merge(:display => 'map'), :class => "map-toggle-button" ),
-          :class => 'list' ,
-        }
-      end
+    content_tag('div', render(:partial => partial), :class => "map-or-list-search-results #{klass}")
+  end
  
-    content_tag('div', data[:toggle] + (render :partial => data[:partial]), :class => "map-or-list-search-results #{data[:class]}")
+  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" ) if GoogleMaps.enabled?(environment.default_hostname)
   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)
+  def city_with_state(city)
+    s = city.parent
+    if city and city.kind_of?(City) and s and s.kind_of?(State) and s.acronym 
+      city.name + ', ' + s.acronym
+    else
+      city.name
     end
   end
+
+  def facets_menu(asset, _facets)
+    @asset_class = asset_class(asset)
+    @facets = _facets
+    render(:partial => 'facets_menu')
+  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)
+    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.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] ||= {}
+
+    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.push(value) )
+      ))
+    else
+      url = params.merge(:facet => {
+        id => facet[:label_id].nil? ? value : { facet[:label_id] => value }
+      })
     end
-    content_tag('table',
-      content_tag('tr',
-        content_tag('td', content_tag('div', image_tag(product.image ? product.image.public_filename(:thumb) : '/images/icons-app/product-default-pic-portrait.png'), :class => 'profile-info-picture')) +
-        content_tag('td', content_tag('strong', link_to(product.name, :controller => 'catalog', :profile => product.enterprise.identifier, :action => 'show', :id => product)) + '<br/>' + data)
-        ), :class => 'profile-info')
+
+    content_tag 'div', link_to(link_label, url, :class => 'facet-result-link-label') +
+        content_tag('span', (has_extra ? label[1] : ''), :class => 'facet-result-extra-label') +
+        (count > 0 ? content_tag('span', " (#{count})", :class => 'facet-result-count') : ''),
+      :class => 'facet-menu-item' + (selected ? ' facet-result-link-selected' : '')
   end
  
-  def product_categories_menu(asset, product_category, object_ids = nil)
-    cats = ProductCategory.menu_categories(@product_category, environment)
-    cats += cats.select { |c| c.children_count > 0 }.map(&:children).flatten
-    product_categories_ids = cats.map(&:id)
-
-    counts = @noosfero_finder.product_categories_count(asset, product_categories_ids, object_ids)
-
-    product_categories_menu = ProductCategory.menu_categories(product_category, environment).map do |cat|
-      hits = counts[cat.id]
-      childs = []
-      if hits
-        if cat.children_count > 0
-          childs = cat.children.map do |child|
-            child_hits = counts[child.id]
-            [child, child_hits]
-          end.select{|child, child_hits| child_hits }
-        else
-          childs = []
+  def facet_selecteds_html_for(environment, klass, params)
+    def name_with_extra(klass, facet, value)
+      name = klass.facet_result_name(facet, value)
+      name = name[0] + name[1] if name.kind_of?(Array) 
+      name
+    end
+
+    ret = []
+    params = params.dup
+    params[:facet].each do |id, value|
+      facet = klass.facet_by_id(id.to_sym)
+      if value.kind_of?(Hash)
+        label_hash = facet[:label].call(environment)
+        value.each do |label_id, value|
+          facet[:label_id] = label_id
+          facet[:label] = label_hash[label_id]
+          value.to_a.each do |value|
+            ret << [facet[:label], name_with_extra(klass, facet, value),
+              params.merge(:facet => params[:facet].merge(id => params[:facet][id].merge(label_id => params[:facet][id][label_id].to_a.reject{ |v| v == value })))]
+          end
         end
+      else
+        ret << [klass.facet_label(facet), name_with_extra(klass, facet, value),
+          params.merge(:facet => params[:facet].reject{ |k,v| k == id })]
       end
-      [cat, hits, childs]
-    end.select{|cat, hits| hits }
+    end
+
+    ret.map do |label, name, url|
+      content_tag('div', content_tag('span', label, :class => 'facet-selected-label') + 
+        content_tag('span', name, :class => 'facet-selected-name') +
+        link_to('', url, :class => 'facet-selected-remove'), :class => 'facet-selected')
+    end.join
+  end
+
+  def order_by(asset)
+    options = {
+      :products => [[_('Relevance'), ''], [_('Name'), 'name_or_category_sort asc'], [_('Lower price'), 'price_sort asc'], [_('Higher price'), 'price_sort desc']],
+      :events => [[_('Relevance'), ''], [_('Name'), 'name_sort asc']],
+      :articles => [[_('Relevance'), ''], [_('Name'), 'name_sort asc'], [_('Most recent'), 'updated_at desc']],
+      :enterprises => [[_('Relevance'), ''], [_('Name'), 'name_sort asc']],
+      :people => [[_('Relevance'), ''], [_('Name'), 'name_sort asc']],
+      :communities  => [[_('Relevance'), ''], [_('Name'), 'name_sort asc']],
+    }
+
+    content_tag('div', _('Sort results by ') +
+      select_tag(asset.to_s + '[order]', options_for_select(options[asset], params[:order_by]),
+        {:onchange => "window.location=jQuery.param.querystring(window.location.href, { 'order_by' : this.options[this.selectedIndex].value})"}),
+      :class => "search-ordering")
+  end
  
-    render(:partial => 'product_categories_menu', :object => product_categories_menu)
+  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
@@ -125,8 +131,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
@@ -141,13 +145,31 @@ class Article &lt; ActiveRecord::Base
     {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]}
   }
  
+  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
@@ -165,20 +187,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
@@ -561,6 +577,81 @@ 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
+  def name_sort
+    name
+  end
+  def public
+    self.public?
+  end
+  def environment_id
+    profile.environment_id
+  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| "f_category:\"#{c.name}\"" },
+    :order => [:f_type, :f_published_at, :f_profile_type, :f_category]
+
+  acts_as_searchable :additional_fields => [
+      {:name => {:type => :string}},
+      {:public => {:type => :boolean}},
+      {:environment_id => {:type => :integer}},
+      ] + facets_fields_for_solr,
+    :exclude_fields => [:setting],
+    :include => [:profile],
+    :facets => facets_option_for_solr,
+    :boost => proc {|a| 10 if 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
@@ -36,18 +36,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.find(:all, :conditions => [ 'start_date >= ?', Date.today ], :order => 'start_date')
+  end
+
   def display_in_menu?
     display_in_menu
   end
@@ -1,146 +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?
-      options.delete(:facets)
-      asset_class(asset).send(finder_method, :all, options_for_find(asset_class(asset), {:order => "#{asset_table(asset)}.name"}.merge(options), date_range))
-    else
-      pg_options = {:page => options.delete(:page), :per_page => options.delete(:per_page)}
-      solr_options = {:facets => options.delete(:facets)}
-      asset_class(asset).find_by_contents(query, pg_options, solr_options, options_for_find(asset_class(asset), options, date_range))[:results]
-    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,9 +2,12 @@ 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, :dependent => :destroy
+  has_many :products, :through => :product_qualifiers, :source => :product
+
   validates_presence_of :environment_id
   validates_presence_of :name
  
@@ -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')
  
@@ -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'
@@ -163,6 +167,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
@@ -247,6 +247,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
@@ -353,11 +357,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,115 +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?
-      options.delete(:facets)
-
-      # 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
-      pg_options = {:page => options.delete(:page), :per_page => options.delete(:per_page)}
-      solr_options = {:facets => options.delete(:facets)}
-      if product_category && asset == :products
-        # SECURITY no risk of SQL injection, since product_category_ids comes from trusted source
-        ret = @environment.send(asset).find_by_contents(query, pg_options, solr_options, options.merge({:include => 'product_categorizations', :conditions => 'product_categorizations.category_id = (%s)' % product_category.id }))
-      elsif product_category && asset == :enterprises
-        ret = @environment.send(asset).find_by_contents(query, pg_options, solr_options, options.merge(:joins => 'inner join products on products.enterprise_id = profiles.id inner join product_categorizations on (product_categorizations.product_id = products.id)', :include => 'products', :conditions => "product_categorizations.category_id = (#{product_category.id})"))
-      else
-        ret = @environment.send(asset).find_by_contents(query, pg_options, solr_options, options)
-      end
-      if solr_options[:facets].nil?
-        ret[:results]
-      else
-        ret
-      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
@@ -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
  
 class Product < ActiveRecord::Base
   belongs_to :enterprise
+  has_one :region, :through => :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
@@ -28,17 +32,6 @@ class Product &lt; ActiveRecord::Base
     p.enterprise.product_updated if p.enterprise
   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
-  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'
  
@@ -90,9 +83,11 @@ class Product &lt; ActiveRecord::Base
   end
  
   def enterprise_updated(e)
-    self.lat = e.lat
-    self.lng = e.lng
-    save!
+    if self.lat != e.lat or self.lng != e.lng
+      self.lat = e.lat
+      self.lng = e.lng
+      save!
+    end
   end
  
   def url
@@ -100,7 +95,7 @@ class Product &lt; ActiveRecord::Base
   end
  
   def public?
-    enterprise.public_profile
+    enterprise.public?
   end
  
   def formatted_value(method)
@@ -213,4 +208,64 @@ 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
  
+  private
+  def name_or_category
+    name ? name : product_category.name
+  end
+  def price_sort
+    (price.nil? or price.zero?) ? 999999999.9 : price
+  end
+  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(id)
+    pq = ProductQualifier.find(id)
+    if pq.certifier
+      [pq.qualifier.name, _(' cert. ') + pq.certifier.name]
+    else
+      pq.qualifier.name
+    end
+  end
+  def f_qualifier
+    product_qualifier_ids
+  end
+  def public
+    self.public?
+  end
+  def environment_id
+    enterprise.environment_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| "f_category:\"#{c.name}\"" },
+    :order => [:f_category, :f_region, :f_qualifier]
+
+  acts_as_searchable :additional_fields => [
+      {:name => {:type => :text, :boost => 5.0}},
+      {:price_sort => {:type => :decimal}},
+      {:public => {:type => :boolean}},
+      {:environment_id => {:type => :integer}},
+      {:name_or_category => {:type => :string, :as => :name_or_category_sort, :boost => 2.0}},
+      :category_full_name ] + facets.keys.map{|i| {i => :facet}},
+    :include => [:enterprise, :qualifiers, :certifiers, :product_category],
+    :boost => proc {|p| 10 if p.enterprise.enabled},
+    :facets => facets.keys
+  handle_asynchronously :solr_save
+
 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
@@ -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)
@@ -70,8 +76,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
@@ -179,6 +183,15 @@ class Profile &lt; ActiveRecord::Base
  
   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
@@ -818,18 +831,66 @@ 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
+    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
+  end
  
-    def followed_by?(person)
-      person.is_member_of?(self)
-    end
+  def f_type
+    self.class.name
+  end
+  def self.f_type_proc(klass)
+    klass.constantize.type_name
+  end
+  def name_sort
+    name
+  end
+  def public
+    self.public?
+  end
+  public
  
-    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
+  acts_as_faceted :fields => {
+      :f_type => {:label => _('Type'), :type_if => proc { |klass| klass.kind_of?(Enterprise) }, :proc => proc { |id| f_type_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| "f_categories:#{c.id}" },
+    :order => [:f_type, :f_categories]
+
+  acts_as_searchable :additional_fields => [
+      {:name_sort => {:type => :string}},
+      {:public => {:type => :boolean}},
+      :extra_data_for_index ] + facets.keys.map{|i| {i => :facet}},
+    :boost => proc {|p| 10 if p.enabled},
+    :facets => facets.keys
+  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,14 +2,15 @@ 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
 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
 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)
 class TextileArticle < TextArticle
  
+  def self.type_name
+    _('Article')
+  end
+
   def self.short_description
     _('Text article with Textile markup language')
   end
 class TinyMceArticle < TextArticle
  
+  def self.type_name
+    _('Article')
+  end
+
   def self.short_description
     _('Text article with visual editor.')
   end
@@ -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
@@ -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', 
+'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 
+'jquery.cookie', 'reflection', 'add-and-join', 'jquery.tokeninput', 
+'jquery.ba-bbq.min.js', 'report-abuse','colorbox', 'jquery-validation/jquery.validate', 'catalog', 
+'manage-products', :cache => 'cache-general' %>
 <% language = FastGettext.locale %>
-<%= javascript_include_tag 'jquery-validation/localization/messages_'+language, 'jquery-validation/localization/methods_'+language %>
+<%= javascript_include_tag 'jquery-validation/localization/messages_'+language,
+ 'jquery-validation/localization/methods_'+language %>
@@ -12,6 +12,8 @@
     <%= stylesheet_link_tag template_stylesheet_path %>
     <%= stylesheet_link_tag icon_theme_stylesheet_path %>
     <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
+    <%= stylesheet_link_tag "token-input" %>
+    <%= stylesheet_link_tag "token-input-facet" %>
     <% @plugins.enabled_plugins.each do |plugin| %>
       <% if plugin.stylesheet? %>
         <%= stylesheet_tag plugin.class.public_path('style.css'), {} %>
@@ -63,16 +65,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" -->
  
@@ -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 %>
+        <% unless @profile.products.empty? %>
+          <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>
-<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>
+  <div class="search-content-second-column">
+
+  </div>
+
+  <div style="clear:both"></div>
 </li>
@@ -0,0 +1,8 @@
+<% article = article_author %>
+
+<div class="search-article-author">
+  <div class="search-article-author-name">
+    <span class="search-field-label"><%= _("Author") %></span>
+    <%= link_to_profile article.profile.name, article.profile.identifier %>
+  </div>
+</div>
@@ -0,0 +1,9 @@
+<div class="search-article-categories">
+  <span class="search-field-label"><%= _('Categories') %></span>
+  <span class="search-article-categories-container">
+    <% article_categories.each do |category| %>
+      <%= link_to_category category, false, :class => "search-article-category" %>
+    <% end %>
+    <span class="search-field-none"><%= _('None') if article_categories.empty? %></span>
+  </span>
+</div>
@@ -0,0 +1,8 @@
+<% 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 %>
+<%= render :partial => 'article_last_change', :object => article %>
@@ -0,0 +1,11 @@
+<% article = article_description %>
+
+<div class="search-article-description">
+  <span class="search-field-label"><%= _("Description") %></span>
+  <% if !article.body.blank? %>
+    <% body_stripped = strip_tags(article.body.to_s) %>
+    <span class="search-article-body"><%= excerpt(body_stripped, body_stripped.first(3), 200) %></span>
+  <% else %>
+    <span class="search-field-none"><%= _('None') %></span>
+  <% end %>
+</div>
@@ -0,0 +1,9 @@
+<% article = article_last_change %>
+
+<div class="search-article-author-changes">
+  <% if article.last_changed_by && article.last_changed_by != article.profile %>
+    <span><%= _('by %s') % link_to(article.last_changed_by.name, article.last_changed_by.url) %>&nbsp<%= _(' at %s.') % show_date(article.updated_at) %></span>
+  <% else %>
+    <span><%= _('Last update: %s.') % show_date(article.updated_at) %></span>
+  <% end %>
+</div>
@@ -0,0 +1,9 @@
+<div class="search-article-tags">
+    <span class="search-field-label"><%= _('Tags') %></span>
+  <span class="search-article-tags-container">
+    <% article_tags.each do |tag| %>
+      <%= link_to_tag tag, :class => "search-article-tag" %>
+    <% end %>
+    <span class="search-field-none"><%= _('None') if article_tags.empty? %></span>
+  </span>
+</div>
@@ -0,0 +1,23 @@
+<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>
+  <div class="search-content-second-column">
+    <div class="search-blog-items">
+      <span class="search-field-label"><%= _("Last posts") %></span>
+      <% r = blog.children.find(:all, :order => :updated_at, :conditions => ['type != ?', 'RssFeed']).last(3) %>
+      <% r.each do |a| %>
+        <%= link_to a.title, a.view_url, :class => 'search-blog-sample-item '+icon_for_article(a) %>
+      <% end %>
+      <span class="search-field-none"><%= _('None') if r.empty? %></span>
+    </div>
+    
+    <%= render :partial => 'article_author', :object => blog %>
+    <%= render :partial => 'article_tags', :object => blog.tags %>
+    <%= render :partial => 'article_categories', :object => blog.categories %>
+    <%= render :partial => 'article_last_change', :object => blog %>
+  </div>
+
+  <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 %>">
  
-<%
-  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 %>
-
-        <% 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 %>
+  <% @order.each do |name| %>
+    <% results = @results[name] %>
+    <% if !results.nil? and !results.empty? %>
+      <div class="search-results-<%= name %> search-results-box">
+  
+        <% if @results.size > 1 %>
+          <h3><%= @names[name] %></h3>
+          <%= link_to(results.respond_to?(:total_entries) ? _('see all (%d)') % results.total_entries : _('see all...'),
+                      params.merge(:action => name), :class => 'see-more' ) %>
         <% 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 -->
-          <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 ) } %>
-          <% 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 %>
+  
+        <% partial = partial_for_class(results.first.class.class_name.constantize) %>
+        <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 -->
+            <ul>
+              <% results.each do |hit| %>
+                <%= 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">
+        <% if @results.size > 1 %>
           <h3><%= @names[name] %></h3>
         <% end %>
-      <% 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 class="search-results-innerbox search-results-type-empty">
+          <div> <%= _('None') %> </div>
+          <hr />
+        </div><!-- end class="search-results-innerbox" -->
+      </div><!-- end class="search-results-<%= name %>" -->
+    <% end %>
   <% end %>
-<% end %>
-
-<br style="clear:both" />
+  
+  <div style="clear:both"></div>
 </div><!-- end id="search-results" -->
  
@@ -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) %>
+<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>
+  <div class="search-content-second-column">
+    <% if event.start_date %>
+      <div class="searc-article-event-date">
+        <span class="search-field-label"><%= _('Start date') %></span>
+        <span class="article-item-date"><%= event.start_date %></span>
+      </div>
+    <% end %>
+    <% if event.end_date %>
+      <div class="searc-article-event-date">
+        <span class="search-field-label"><%= _('End date') %></span>
+        <span class="article-item-date"><%= event.end_date %></span>
+      </div>
+    <% end %>
+
+    <%= render :partial => 'article_common', :object => event %>
+  </div>
+
+  <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,20 @@
+<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>
+  <div class="search-content-second-column">
+    <div class="search-folder-items">
+      <span class="search-field-label"><%= _("Last items") %></span>
+      <% r = folder.children.last(3) %>
+      <% r.each do |a| %>
+        <%= link_to a.title, a.view_url, :class => 'search-folder-sample-item '+icon_for_article(a) %>
+      <% end %>
+      <span class="search-field-none"><%= _('None') if r.empty? %></span>
+    </div>
+
+    <%= render :partial => 'article_common', :object => folder %>
+  </div>
+
+  <div style="clear:both"></div>
+</li>
@@ -0,0 +1,20 @@
+<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>
+  <div class="search-content-second-column">
+    <div class="search-forum-items">
+      <span class="search-field-label"><%= _("Last topics") %></span>
+      <% r = forum.children.find(:all, :order => :updated_at, :conditions => ['type != ?', 'RssFeed']).last(3) %>
+      <% r.each do |a| %>
+        <%= link_to a.title, a.view_url, :class => 'search-forum-sample-item '+icon_for_article(a) %>
+      <% end %>
+      <span class="search-field-none"><%= _('None') if r.empty? %></span>
+    </div>
+
+    <%= render :partial => 'article_common', :object => forum %>
+  </div>
+
+  <div style="clear:both"></div>
+</li>
@@ -0,0 +1,12 @@
+<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>
+  <div class="search-content-second-column">
+    <%= render :partial => 'article_common', :object => gallery %>
+  </div>
+
+  <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 => GoogleMaps.api_url(environment.default_hostname), :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")
+  icon_shadow = default_or_themed_icon("/images/icons-map/enterprise_shadow.png")
 %>
-}
  
-  map.setZoom(map.getBoundsZoomLevel(bounds));
-  map.setCenter(bounds.getCenter());
+<script type='text/javascript'>
+  mapLoad(<%= GoogleMaps.initial_zoom.to_json %>);
+
+  mapBaseIcon = new GIcon();
+  mapBaseIcon.iconSize=new GSize(32,32);
+  mapBaseIcon.shadowSize=new GSize(36,32);
+  mapBaseIcon.iconAnchor=new GPoint(16,32);
+  mapBaseIcon.infoWindowAnchor=new GPoint(16,0);
+  icon = new GIcon(mapBaseIcon, "<%= icon %>", null, "<%= icon_shadow %>");
+
+  <% @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,47 @@
+<div class="search-image-container">
+  
+  <% if image.is_a? UploadedFile %>
+    <% 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"><%= _('No image') %></div>
+      <% end %>
+    </div>
+  <% elsif image.is_a? Product %>
+    <% if image.image %>
+      <%= link_to '', product_path(image), :class => "search-image-pic", :style => 'background-image: url(%s)'% image.default_image(:thumb) %>
+    <% else %>
+      <div class="search-no-image"><%= _('No image') %></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.map(:asset_product_extras, product, product.enterprise).collect { |content| instance_eval(&content) } %>
 <% extra_properties = @plugins.map(: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">
+  <div class="search-product-item-first-column">
+    <%= render :partial => 'image', :object => product %>
  
-    <li> <%= _('Category:') + ' ' + link_to_product_category(product.product_category) %> </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 product.inputs.count > product.inputs.collect(&:is_from_solidarity_economy).count(nil) %>
+            <% se_i = t_i = 0 %>
+            <% product.inputs.each{ |i| t_i += 1; se_i += 1 if i.is_from_solidarity_economy } %>
+            <% p = case (se_i.to_f/t_i)*100 when 0..24.999 then ["0", _("0%")]; when 25..49.999 then ["25", _("25%")]; when 50..74.999 then ["50", _("50%")]; when 75..100 then ["75", _("100%")]; end %>
+            <div class="search-product-percentage-from-solidarity-economy search-product-ecosol-percentage-icon-<%=p[0]%>" title="<%=_('Percentage of inputs from solidarity economy')%>">
+              <%= p[1] %>
+            </div>
+          <% end %>
  
-    <% extra_properties.each do |property| %>
-      <li><%= property[:name] + ': ' + instance_eval(&property[:content]) %></li>
+          <% if product.inputs.count == product.inputs.collect(&:has_price_details?).count(true) %>
+            <% title = product.inputs.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_per_unit*i.amount_used, :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>
  
   <%= extra_content.join('\n') %>
+  <% extra_properties.each do |property| %>
+    <div><%= property[:name] + ': ' + instance_eval(&property[:content]) %></div>
+  <% end %>
  
+  <br /><br />
 </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>
+          <% else %>
+          <% end %>
+        </div>
+        <% if !profile.description.blank? %>
+          <div><%= profile.description %></div><br />
+        <% end %>
+
+        <div class="search-enterprise-categorization">
+          <% profile.top_level_categorization.each do |parent, children| %>
+            <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 %>
+        </div>
+      </div>
+      <hr class="clearfix" />
+    </div>
+  <% end %>
+</li>
@@ -0,0 +1,19 @@
+<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"> 
+      <%= 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 %>
+    </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) %>
-    <% 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>
+  <% 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] %>
+  
+    <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) %>
+        <%= javascript_tag "jQuery('.search_form').submit(function() {
+          if (jQuery('#search-input').val().length < 3) {
+            jQuery('#search-empty-query-error').slideDown(200).delay(2500).slideUp(200);
+            return false;
+          }
+        });" %>
+      </span>
+  
+      <%= submit_button(:search, _('Search')) %>
+  
+      <div id="search-empty-query-error">
+        <%= _("Type more than 2 characters to start a search") %>
       </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>
+  
+    <% if @empty_query %>
+      <% hint = environment.search_hints[@asset] %>
+      <% if hint and !hint.blank? %>
+        <span class="search-hint"><%= hint %></span>
+      <% end %>
+    <% end %>
  
-  <% 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 lightbox?; button_bar do %>
-  <%= lightbox_close_button _('Close') %>
-  <% end; end %>
-
-<% end %>
-
-</div> <!-- id="search-form" -->
+  <div style="clear: both"></div>
+</div>
@@ -0,0 +1,11 @@
+<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>
+  <div class="search-content-second-column">
+    <%= render :partial => 'article_common', :object => text_article %>
+  </div>
+
+  <div style="clear: both"></div>
+</li>
@@ -0,0 +1,37 @@
+<li class="search-uploaded-file-item article-item">
+  <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %>
+	<hr class="clear" />
+
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => uploaded_file %>
+  </div>
+
+  <div class="search-uploaded-file-second-column">
+    <%= render :partial => 'article_author', :object => uploaded_file %>
+
+    <div class="search-uploaded-file-description">
+      <% if !uploaded_file.body.blank? %>
+        <span class="search-field-label"><%= _("Description") %></span>
+        <% body = strip_tags(uploaded_file.body.to_s) %>
+        <%= excerpt(body, body.first(3), 200) %>
+      <% end %>
+    </div>
+
+    <div class="search-uploaded-file-parent">
+      <% if uploaded_file.parent && uploaded_file.parent.published? %>
+        <% if uploaded_file.parent.gallery? %>
+          <span class="search-field-label"><%= _("Gallery") %></span>
+        <% else %>
+          <span class="search-field-label"><%= _("Folder") %></span>
+        <% end %>
+        <%= link_to uploaded_file.parent.name, {:controller => 'content_viewer', :profile => uploaded_file.profile.identifier, :action => 'view_page', :page => [uploaded_file.parent.slug]} %>
+      <% end %>
+    </div>
+
+    <%= render :partial => 'article_tags', :object => uploaded_file.tags %>
+    <%= render :partial => 'article_categories', :object => uploaded_file.categories %>
+    <%= render :partial => 'article_last_change', :object => uploaded_file %>
+  </div>
+
+  <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) %>
+  <% if !@empty_query or @filter %>
+    <%= display_results %>
+    <%= pagination_links @results.values.first %>
+  <% end %>
+</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>
  
@@ -1,7 +0,0 @@
-<% unless @regions.empty? %>
-  <ul>
-    <% for region in @regions %>
-      <li><%= region.name %></li>
-    <% end %>
-  </ul>
-<% end%>
@@ -0,0 +1 @@
+articles.rhtml
 \ No newline at end of file
-<h1> 
-  <% if !@query.blank? %>
-    <%=h @category ? (__('Enterprise results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (__('Enterprise results for "%s"') % @query) %>
-  <% else %>
-    <%=h @category ? (__('Enterprises in "%s"') % @category.name) : __('Enterprises') %>
-  <% end %>
-</h1>
-
-<% if @radius && @region %>
-  <h2><%=h (_('Within %s km from %s') % [@radius, @region.name]) %><h2>
-<% end %>
-
-<%= search_page_link_to_all( { :asset => params[:asset],
-                               :category => @category }) %>
-
-<%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %>
+<%= search_page_title( @titles[:enterprises], @category ) %>
  
-<% if logged_in? && environment.enabled?('enterprise_registration') %>
-  <% button_bar do %>
-    <%= button(:add, __('New enterprise'), {:controller => 'enterprise_registration'}) %>
+<div id="search-column-left">
+  <% if logged_in? && environment.enabled?('enterprise_registration') %>
+    <% button_bar do %>
+      <%= button(:add, __('New enterprise'), {:controller => 'enterprise_registration'}) %>
+    <% end %>
   <% end %>
-<% end %>
  
-<% if @categories_menu %>
-<div class="has_cat_list">
-<% end %>
-
-<% cache(:action => 'assets', :asset => 'enterprises', :category_path => params[:category_path], :query => @query, :product_category => @product_category, :region => @region, :radius => params[:radius]) do %>
-  <%= product_categories_menu(:enterprises, @product_category, @result_ids) %>
-<% end %>
-
-<%= display_results %>
+  <% if !@empty_query %>
+    <% button_bar do %>
+      <%= display_map_list_button %>
+    <% end %>
+    <%= facets_menu(:enterprises, @facets) %>
+  <% end %>
+</div>
  
-<% if @categories_menu %>
-</div><!-- class="has_cat_list" -->
-<% end %>
+<div id="search-column-right">
+  <%= render :partial => 'search_form', :locals => { :hint => _("Type words about the enterprise you're looking for") } %>
+  <%= render :partial => 'results_header' %>
  
-<%= pagination_links @results[:enterprises] %>
+  <%= display_results(true) %>
+  <% if params[:display] != 'map' %>
+    <%= pagination_links @results[:enterprises] %>
+  <% end %>
+</div>
  
-<br style="clear:both" />
+<div style="clear: both"></div>
-<h1>
-  <%= _("%s's events") % @environment.name %>
-  <% if @category %>
-    :<small><%= @category.name %></small>
-  <% end %>
-</h1>
+<%= search_page_title( @titles[:events], @category ) %>
  
 <%= render :partial => 'events/agenda' %>
@@ -0,0 +1,8 @@
+<% results = @asset_class.map_facet_results(@facet, params[:facet], @facets, @all_facets) %>
+
+<% array = [] %>
+<% @asset_class.facet_result_sort(@facet, results, :alphabetically).each do |id, label, count| %>
+  <% array << {:id => id, :name => facet_link_html(@facet, params.merge(:controller => 'search', :action => @asset), id, label, count)} %>
+<% end %>
+
+<%= facet_javascript('facet-input-'+@facet[:id].to_s, @facet, array) %>
-<div id="search-page">
+<div id="search-page" class="<%= "view-category" if @category %>">
  
-<%= search_page_title(_('Search Results'), :query => CGI.escapeHTML(@query), :category => @category ? @category.name : nil, :total_results => @total_results) %>
+  <% if @category %>
+    <div id="category-image"><%= image_tag(@category.image.public_filename(:thumb), :id => 'category-image') if @category.image %></div>
+  <% end %>
  
-<%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %>
+  <%= search_page_title(_('Search Results'), @category) %>
+  <%= render :partial => 'search_form', :locals => { :hint => '' } %>
+  <%= category_context(@category, params) %>
+  <%= display_results %>
+    
+  <div id="category-childs">
+    <% if @category %>
+      <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 %>
+    <% end %>
+  </div>
  
-<%= render :partial => 'display_results' %>
+</div>
  
-</div><!-- end id="search-page" -->
-<br style="clear:both" />
+<div style="clear: both"></div>
-<%= search_page_title( _('People'), { :query => @query, 
-                                      :category => @category ? @category.name : nil, 
-                                      :total_results => @total_results, 
-                                      :region => @region ? @region.name : nil, 
-                                      :distance => @radius } ) %>
+<%= search_page_title( @titles[:people], @category ) %>
  
-<%= search_page_link_to_all( { :asset => params[:asset],
-                               :category => @category }) %>
+<div id='search-column-left'>
+  <% if !@empty_query %>
+    <%= facets_menu(:people, @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 words about the person you're looking for") } %>
+  <%= render :partial => 'results_header' %>
  
-<%# FIXME ARMENGUE %>
-<%= display_results(false) %>
+  <%= display_results %>
+  <% if params[:display] != 'map' %>
+    <%= pagination_links @results.values.first %>
+  <% end %>
+</div>
  
-<%= pagination_links @results.values.first %>
-
-<br style="clear:both" />
+<div style="clear: both"></div>
@@ -1,9 +0,0 @@
-<div id="search-popup">
-
-<%= render :partial => 'search_form', :locals => { :form_title => _('Search %s') % @environment.name } %>
-
-<script type='text/javascript'>
-  $('query').focus();
-</script>
-
-</div><!-- fim id="search-popup" -->
-<%= search_page_title( _('Products and Services'), { :query => @query, 
-                                                     :category => @category ? @category.name : nil, 
-                                                     :total_results => @total_results, 
-                                                     :region => @region ? @region.name : nil, 
-                                                     :distance => @radius } ) %>
-
-<%= search_page_link_to_all( { :asset => params[:asset],
-                               :category => @category }) %>
-
-<%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %>
-
-<% if @categories_menu %>
-<div class="has_cat_list">
-<% end %>
-
-<% cache(:action => 'assets', :asset => 'products', :category_path => params[:category_path], :query => @query, :product_category => @product_category, :region => @region, :radius => params[:radius]) do %>
-  <%= product_categories_menu(:products, @product_category, @result_ids)  %>
-<% end %>
-
-<%= display_results %>
-
-<% if @categories_menu %>
-</div><!-- class="has_cat_list" -->
-<% end %>
-
-<%= pagination_links @results[:products] %>
-
-<br style="clear:both" />
+<%= search_page_title( @titles[:products], @category ) %>
+
+<div id="search-column-left">
+  <% if !@empty_query %>
+    <% button_bar do %>
+      <%= display_map_list_button %>
+    <% end %>
+    <%= facets_menu(:products, @facets) %>
+  <% end %>
+</div>
+
+<div id="search-column-right">
+  <%= render :partial => 'search_form', :locals => { :hint => _('Type the product, service, city or qualifier desired') } %>
+  <%= render :partial => 'results_header' %>
+
+  <% if !@empty_query %>
+    <%= display_results(true) %>
+    <% if params[:display] != 'map' %>
+      <%= pagination_links @results[:products] %>
+    <% end %>
+  <% end %>
+</div>
+
+<div style="clear: both"></div>
@@ -18,4 +18,5 @@
   </div>
   <%= pagination_links @tagged, :param_name => 'npage' %>
  
+  <div style="clear: both"></div>
 <% end %>
 # locally-developed modules
+require 'acts_as_faceted'
 require 'acts_as_filesystem'
 require 'acts_as_having_settings'
 require 'acts_as_searchable'
@@ -52,10 +52,6 @@ ActionController::Routing::Routes.draw do |map|
   # search
   map.connect 'search/:action/*category_path', :controller => 'search'
  
-  # Browse
-  map.connect 'browse/:action/:filter', :controller => 'browse'
-  map.connect 'browse/:action', :controller => 'browse'
-
   # events
   map.events 'profile/:profile/events_by_day', :controller => 'events', :action => 'events_by_day', :profile => /#{Noosfero.identifier_format}/
   map.events 'profile/:profile/events/:year/:month/:day', :controller => 'events', :action => 'events', :year => /\d*/, :month => /\d*/, :day => /\d*/, :profile => /#{Noosfero.identifier_format}/
@@ -85,6 +81,9 @@ ActionController::Routing::Routes.draw do |map|
   # contact
   map.contact 'contact/:profile/:action/:id', :controller => 'contact', :action => 'index', :id => /.*/, :profile => /#{Noosfero.identifier_format}/
  
+  # map balloon
+  map.contact 'map_balloon/:action/:id', :controller => 'map_balloon', :id => /.*/
+
   # chat
   map.chat 'chat/:action/:id', :controller => 'chat'
   map.chat 'chat/:action', :controller => 'chat'
@@ -0,0 +1,11 @@
+class AddAcronymAndAbbreviationToCategory < ActiveRecord::Migration
+  def self.up
+    add_column :categories, :acronym, :string
+    add_column :categories, :abbreviation, :string
+  end
+
+  def self.down
+    remove_column :categories, :abbreviation
+    remove_column :categories, :acronym
+  end
+end
@@ -0,0 +1,9 @@
+class DropProductCategorization < ActiveRecord::Migration
+  def self.up
+    drop_table :product_categorizations
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
@@ -175,6 +175,8 @@ ActiveRecord::Schema.define(:version =&gt; 20111004184104) do
     t.integer "children_count",  :default => 0
     t.boolean "accept_products", :default => true
     t.integer "image_id"
+    t.string  "acronym"
+    t.string  "abbreviation"
   end
  
   create_table "categories_profiles", :id => false, :force => true do |t|
@@ -452,9 +454,9 @@ ActiveRecord::Schema.define(:version =&gt; 20111004184104) do
  
   create_table "roles", :force => true do |t|
     t.string  "name"
+    t.text    "permissions"
     t.string  "key"
     t.boolean "system",         :default => false
-    t.text    "permissions"
     t.integer "environment_id"
   end
  
@@ -0,0 +1,219 @@
+module ActsAsFaceted
+
+  module ClassMethods
+  end
+
+  module ActsMethods
+    # Example:
+    #
+    #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")}},
+    #  :f_profile_type => {:label => _('Author'), :proc => proc{|klass| f_profile_type_proc(klass)}},
+    #  :f_category => {:label => _('Categories')}},
+    #  :order => [:f_type, :f_published_at, :f_profile_type, :f_category]
+    #
+    #acts_as_searchable :additional_fields => [ {:name => {:type => :string, :as => :name_sort, :boost => 5.0}} ] + facets_fields_for_solr,
+    #  :exclude_fields => [:setting],
+    #  :include => [:profile],
+    #  :facets => facets_option_for_solr,
+    #  :if => proc{|a| ! ['RssFeed'].include?(a.class.name)}
+    def acts_as_faceted(options)
+      extend ClassMethods
+      extend ActsAsSolr::CommonMethods
+
+      cattr_accessor :facets
+      cattr_accessor :facets_order
+      cattr_accessor :to_solr_fields_names
+      cattr_accessor :facets_results_containers
+      cattr_accessor :solr_fields_names
+      cattr_accessor :facets_option_for_solr
+      cattr_accessor :facets_fields_for_solr
+      cattr_accessor :facet_category_query
+
+      self.facets = options[:fields]
+      self.facets_order = options[:order] || facets
+      self.facets_results_containers = {:fields => 'facet_fields', :queries => 'facet_queries', :ranges => 'facet_ranges'}
+      self.facets_option_for_solr = Hash[facets.select{ |id,data| ! data.has_key?(:queries) }].keys
+      self.facets_fields_for_solr = facets.map{ |id,data| {id => data[:type] || :facet} } 
+      self.solr_fields_names = facets.map{ |id,data| id.to_s + '_' + get_solr_field_type(data[:type] || :facet) }
+      self.facet_category_query = options[:category_query]
+
+      # A hash to retrieve the field key for the solr facet string returned
+      # :field_name => "field_name_facet"
+      self.to_solr_fields_names = Hash[facets.keys.zip(solr_fields_names)]
+
+      def facet_by_id(id)
+        {:id => id}.merge(facets[id]) if facets[id]
+      end
+
+      def map_facets_for(environment)
+        list = facets_order ? facets_order : facets.keys
+        list.map do |id|
+          facet = facet_by_id(id)
+          next if facet[:type_if] and !facet[:type_if].call(self.new)
+
+          if facet[:multi]
+            facet[:label].call(environment).map do |label_id, label|
+              facet.merge({:id => facet[:id].to_s+'_'+label_id.to_s, :solr_field => facet[:id], :label_id => label_id, :label => label})
+            end
+          else
+            facet.merge(:id => facet[:id].to_s, :solr_field => facet[:id])
+          end
+        end.compact.flatten
+      end
+
+      def map_facet_results(facet, facet_params, facets_data, unfiltered_facets_data = {}, options = {})
+        facets_data ||= {}
+        solr_facet = to_solr_fields_names[facet[:solr_field]]
+
+        if facet[:queries]
+          container = facets_data[facets_results_containers[:queries]]
+          facet_data = (container.nil? or container.empty?) ? [] : container.select{ |k,v| k.starts_with? solr_facet }
+          container = unfiltered_facets_data[facets_results_containers[:queries]]
+          unfiltered_facet_data = (container.nil? or container.empty?) ? [] : container.select{ |k,v| k.starts_with? solr_facet }
+        else
+          container = facets_data[facets_results_containers[:fields]]
+          facet_data = (container.nil? or container.empty?) ? [] : container[solr_facet] || []
+          container = unfiltered_facets_data[facets_results_containers[:fields]]
+          unfiltered_facet_data = (container.nil? or container.empty?) ? [] : container[solr_facet] || []
+        end
+
+        if !unfiltered_facets_data.blank? and !facet_params.blank?
+          f = Hash[Array(facet_data)]
+          zeros = []
+          facet_data = unfiltered_facet_data.map do |id, count|
+            count = f[id]
+            if count.nil?
+              zeros.push [id, 0]
+              nil
+            else
+              [id, count]
+            end
+          end.compact + zeros
+        end
+
+        facet_count = facet_data.length
+
+        if facet[:queries]
+          result = facet_data.map do |id, count|
+            q = id[id.index(':')+1,id.length]
+            label = facet_result_name(facet, q)
+            [q, label, count] if count > 0
+          end.compact
+          result = facet[:queries_order].map{ |id| result.detect{ |rid, label, count| rid == id } }.compact if facet[:queries_order]
+        elsif facet[:proc]
+          if facet[:label_id]
+            result = facet_data.map do |id, count|
+              name = facet_result_name(facet, id)
+              [id, name, count] if name
+            end.compact
+            # FIXME limit is NOT improving performance in this case :(
+            facet_count = result.length
+            result = result.first(options[:limit]) if options[:limit]
+          else
+            facet_data = facet_data.first(options[:limit]) if options[:limit]
+            result = facet_data.map { |id, count| [id, facet_result_name(facet, id), count] }
+          end
+        else
+          facet_data = facet_data.first(options[:limit]) if options[:limit]
+          result = facet_data.map { |id, count| [id, facet_result_name(facet, id), count] }
+        end
+
+        sorted = facet_result_sort(facet, result, options[:sort])
+
+        # length can't be used if limit option is given;
+        # total_entries comes to help
+        sorted.class.send(:define_method, :total_entries, proc { facet_count })
+
+        sorted
+      end
+
+      def facet_result_sort(facet, facets_data, sort_by = nil)
+        if facet[:queries_order]
+          facets_data
+        elsif sort_by == :alphabetically
+          facets_data.sort{ |a,b| a[1] <=> b[1] }
+        elsif sort_by == :count
+           facets_data.sort{ |a,b| -1*(a[2] <=> b[2]) }
+        else
+          facets_data
+        end
+      end
+
+      def facet_result_name(facet, data)
+        if facet[:queries]
+          gettext(facet[:queries][data])
+        elsif facet[:proc]
+          if facet[:multi]
+            facet[:label_id] ||= 0
+            facet[:proc].call(facet, data)
+          else
+            gettext(facet[:proc].call(data))
+          end
+        else
+          data
+        end
+      end
+
+      def facet_label(facet)
+        _ facet[:label]
+      end
+
+      def facets_find_options(facets_selected = {}, options = {})
+        browses = []
+        facets_selected ||= {}
+        facets_selected.map do |id, value|
+          if value.kind_of?(Hash)
+            value.map do |label_id, value|
+              value.to_a.each do |value|
+                browses << id.to_s + ':' + (facets[id.to_sym][:queries] ? value : '"'+value.to_s+'"')
+              end
+            end
+          else
+            browses << id.to_s + ':' + (facets[id.to_sym][:queries] ? value : '"'+value.to_s+'"')
+          end
+        end.flatten
+
+        {:facets => {:zeros => false, :sort => :count,
+            :fields => facets_option_for_solr,
+            :browse => browses,
+            :query => facets.map { |f, options| options[:queries].keys.map { |q| f.to_s + ':' + q } if options[:queries] }.compact.flatten,
+          }
+        }
+      end
+    end
+  end
+
+end
+
+ActiveRecord::Base.extend ActsAsFaceted::ActsMethods
+
+# from https://github.com/rubyworks/facets/blob/master/lib/core/facets/enumerable/graph.rb
+module Enumerable
+  def graph(&yld)
+    if yld
+      h = {}
+      each do |*kv|
+        r = yld[*kv]
+        case r
+        when Hash
+          nk, nv = *r.to_a[0]
+        when Range
+          nk, nv = r.first, r.last
+        else
+          nk, nv = *r
+        end
+        h[nk] = nv
+      end
+      h
+    else
+      Enumerator.new(self,:graph)
+    end
+  end
+
+  # Alias for #graph, which stands for "map hash".
+  alias_method :mash, :graph
+end
+
@@ -4,16 +4,16 @@ module ActsAsSearchable
     ACTS_AS_SEARCHABLE_ENABLED = true unless defined? ACTS_AS_SEARCHABLE_ENABLED
  
     def acts_as_searchable(options = {})
-      if ACTS_AS_SEARCHABLE_ENABLED
-        if (!options[:fields])
-          options[:additional_fields] |= [{:schema_name => :string}]
-        else
-          options[:fields] << {:schema_name => :string}
-        end
-        acts_as_solr options
-        extend FindByContents
-        send :include, InstanceMethods
+      return if !ACTS_AS_SEARCHABLE_ENABLED
+
+      if (!options[:fields])
+        options[:additional_fields] |= [{:schema_name => :string}]
+      else
+        options[:fields] << {:schema_name => :string}
       end
+      acts_as_solr options
+      extend FindByContents
+      send :include, InstanceMethods
     end
  
     module InstanceMethods
@@ -31,14 +31,20 @@ module ActsAsSearchable
       def find_by_contents(query, pg_options = {}, options = {}, db_options = {})
         pg_options[:page] ||= 1
         pg_options[:per_page] ||= 20
-        options[:limit] = pg_options[:per_page].to_i*pg_options[:page].to_i
-        options[:scores] = true;
-
+        options[:limit] ||= pg_options[:per_page].to_i*pg_options[:page].to_i
+        options[:scores] ||= true;
+        all_facets_enabled = options.delete(:all_facets)
         query = !schema_name.empty? ? "+schema_name:\"#{schema_name}\" AND #{query}" : query
+        results = []
+        facets = all_facets = {}
+
         solr_result = find_by_solr(query, options)
-        if solr_result.nil?
-          results = facets = []
-        else
+        if all_facets_enabled
+          options[:facets][:browse] = nil
+          all_facets = find_by_solr(query, options.merge(:limit => 0)).facets
+        end
+        
+        if !solr_result.nil?
           facets = options.include?(:facets) ? solr_result.facets : []
  
           if db_options.empty?
@@ -61,7 +67,7 @@ module ActsAsSearchable
           results = results.paginate(pg_options.merge(:total_entries => solr_result.total))
         end
  
-        {:results => results, :facets => facets}
+        {:results => results, :facets => facets, :all_facets => all_facets}
       end
     end
   end
 <li>
-  <%= browse_people_menu %>
+  <%= search_people_menu %>
 </li>
 <li>
-  <%= browse_communities_menu %>
+  <%= search_communities_menu %>
   </li>
 <li>
-  <%= browse_contents_menu %>
+  <%= search_contents_menu %>
 </li>
-<li><a href="/assets/events"><span class='icon-menu-events'><%= _('Events') %></span></a></li>
+<li><a href="/search/events"><span class='icon-menu-events'><%= _('Events') %></span></a></li>
 /* ==> button.css <== */
  
-
 .button {
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
@@ -108,14 +107,14 @@ body, th, td, input {
   margin-left: 20px;
 }
  
-#user form input {
+#user form input .blur {
   width: 160px;
   border: 1px solid #BBB;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   color: #CCC;
 }
-#user form.focused input {
+#user form input {
   border: 1px solid #888;
   color: #555;
 }
@@ -502,11 +501,11 @@ div#notice {
 }
  
 #content .profile-list li a,
-#content .common-profile-list-block li a {
+#content .common-profile-list-block .vcard li a {
   color: #555;
 }
 #content .profile-list li a:hover,
-#content .common-profile-list-block li a:hover {
+#content .common-profile-list-block .vcard li a:hover {
   color: #000;
   text-decoration: none;
 }
1	1	require 'application_controller'
	2	+
	3	+# his is the application's main controller. Features defined here are
	4	+# available in all controllers.
	5	+class ApplicationController < ActionController::Base
	6	+
	7	+ before_filter :change_pg_schema
	8	+
	9	+ include ApplicationHelper
	10	+ layout :get_layout
	11	+ def get_layout
	12	+ theme_option(:layout) \|\| 'application'
	13	+ end
	14	+
	15	+ filter_parameter_logging :password
	16	+
	17	+ def log_processing
	18	+ super
	19	+ return unless ENV['RAILS_ENV'] == 'production'
	20	+ if logger && logger.info?
	21	+ logger.info(" HTTP Referer: #{request.referer}")
	22	+ logger.info(" User Agent: #{request.user_agent}")
	23	+ logger.info(" Accept-Language: #{request.headers['HTTP_ACCEPT_LANGUAGE']}")
	24	+ end
	25	+ end
	26	+
	27	+ helper :document
	28	+ helper :language
	29	+
	30	+ def self.no_design_blocks
	31	+ @no_design_blocks = true
	32	+ end
	33	+ def self.uses_design_blocks?
	34	+ !@no_design_blocks
	35	+ end
	36	+ def uses_design_blocks?
	37	+ !@no_design_blocks && self.class.uses_design_blocks?
	38	+ end
	39	+
	40	+ # Be sure to include AuthenticationSystem in Application Controller instead
	41	+ include AuthenticatedSystem
	42	+ include PermissionCheck
	43	+
	44	+ def self.require_ssl(*options)
	45	+ before_filter :check_ssl, *options
	46	+ end
	47	+ def check_ssl
	48	+ return true if (request.ssl? \|\| ENV['RAILS_ENV'] == 'development')
	49	+ redirect_to_ssl
	50	+ end
	51	+ def redirect_to_ssl
	52	+ if environment.enable_ssl
	53	+ redirect_to(params.merge(:protocol => 'https://', :host => ssl_hostname))
	54	+ true
	55	+ else
	56	+ false
	57	+ end
	58	+ end
	59	+
	60	+ def self.refuse_ssl(*options)
	61	+ before_filter :avoid_ssl, *options
	62	+ end
	63	+ def avoid_ssl
	64	+ if (!request.ssl? \|\| ENV['RAILS_ENV'] == 'development')
	65	+ true
	66	+ else
	67	+ redirect_to(params.merge(:protocol => 'http://'))
	68	+ false
	69	+ end
	70	+ end
	71	+
	72	+ before_filter :set_locale
	73	+ def set_locale
	74	+ FastGettext.available_locales = Noosfero.available_locales
	75	+ FastGettext.default_locale = Noosfero.default_locale
	76	+ FastGettext.set_locale(params[:lang] \|\| session[:lang] \|\| Noosfero.default_locale \|\| request.env['HTTP_ACCEPT_LANGUAGE'] \|\| 'en')
	77	+ if params[:lang]
	78	+ session[:lang] = params[:lang]
	79	+ end
	80	+ end
	81	+
	82	+ include NeedsProfile
	83	+
	84	+ before_filter :detect_stuff_by_domain
	85	+ before_filter :init_noosfero_plugins
	86	+ attr_reader :environment
	87	+
	88	+ before_filter :load_terminology
	89	+
	90	+ # declares that the given <tt>actions</tt> cannot be accessed by other HTTP
	91	+ # method besides POST.
	92	+ def self.post_only(actions, redirect = { :action => 'index'})
	93	+ verify :method => :post, :only => actions, :redirect_to => redirect
	94	+ end
	95	+
	96	+ helper_method :current_person, :current_person
	97	+
	98	+ def change_pg_schema
	99	+ if Noosfero::MultiTenancy.on? and ActiveRecord::Base.postgresql?
	100	+ Noosfero::MultiTenancy.db_by_host = request.host
	101	+ end
	102	+ end
	103	+
	104	+ protected
	105	+
	106	+ def boxes_editor?
	107	+ false
	108	+ end
	109	+
	110	+ def content_editor?
	111	+ false
	112	+ end
	113	+
	114	+ def user
	115	+ current_user.person if logged_in?
	116	+ end
	117	+
	118	+ alias :current_person :user
	119	+
	120	+ # TODO: move this logic somewhere else (Domain class?)
	121	+ def detect_stuff_by_domain
	122	+ @domain = Domain.find_by_name(request.host)
	123	+ if @domain.nil?
	124	+ @environment = Environment.default
	125	+ else
	126	+ @environment = @domain.environment
	127	+ @profile = @domain.profile
	128	+ end
	129	+ end
	130	+
	131	+ def init_noosfero_plugins
	132	+ @plugins = Noosfero::Plugin::Manager.new(self)
	133	+ @plugins.enabled_plugins.map(&:class).each do \|plugin\|
	134	+ prepend_view_path(plugin.view_path)
	135	+ end
	136	+ init_noosfero_plugins_controller_filters
	137	+ end
	138	+
	139	+ # This is a generic method that initialize any possible filter defined by a
	140	+ # plugin to the current controller being initialized.
	141	+ def init_noosfero_plugins_controller_filters
	142	+ @plugins.enabled_plugins.each do \|plugin\|
	143	+ plugin.send(self.class.name.underscore + '_filters').each do \|plugin_filter\|
	144	+ self.class.send(plugin_filter[:type], plugin.class.name.underscore + '_' + plugin_filter[:method_name], (plugin_filter[:options] \|\| {}))
	145	+ self.class.send(:define_method, plugin.class.name.underscore + '_' + plugin_filter[:method_name], plugin_filter[:block])
	146	+ end
	147	+ end
	148	+ end
	149	+
	150	+ def load_terminology
	151	+ # cache terminology for performance
	152	+ @@terminology_cache \|\|= {}
	153	+ @@terminology_cache[environment.id] \|\|= environment.terminology
	154	+ Noosfero.terminology = @@terminology_cache[environment.id]
	155	+ end
	156	+
	157	+ def render_not_found(path = nil)
	158	+ @no_design_blocks = true
	159	+ @path \|\|= request.path
	160	+ render :template => 'shared/not_found.rhtml', :status => 404, :layout => get_layout
	161	+ end
	162	+ alias :render_404 :render_not_found
	163	+
	164	+ def render_access_denied(message = nil, title = nil)
	165	+ @no_design_blocks = true
	166	+ @message = message
	167	+ @title = title
	168	+ render :template => 'shared/access_denied.rhtml', :status => 403
	169	+ end
	170	+
	171	+end
...	...
...	...	@@ -1,79 +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], {:per_page => per_page, :page => params[:page]})[:results]
25		- else
26		- @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
27		- end
28		- end
29		-
30		- def communities
31		- @filter = filter
32		- @title = self.filter_description(params[:action] + '_' + @filter )
33		-
34		- @results = @environment.communities.visible.send(@filter)
35		-
36		- if !params[:query].blank?
37		- @results = @results.find_by_contents(params[:query], {:per_page => per_page, :page => params[:page]})[:results]
38		- else
39		- @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
40		- end
41		- end
42		-
43		- def contents
44		- @filter = filter
45		- @title = self.filter_description(params[:action] + '_' + @filter )
46		-
47		- @results = @environment.articles.published.text_articles.send(@filter)
48		-
49		- if !params[:query].blank?
50		- @results = @results.find_by_contents(params[:query])[:results]
51		- end
52		- @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
53		- end
54		-
55		- protected
56		-
57		- def filter
58		- if FILTERS.include?(params[:filter])
59		- params[:filter]
60		- else
61		- 'more_recent'
62		- end
63		- end
64		-
65		- def filter_description(str)
66		- {
67		- 'people_more_recent' => _('More recent people'),
68		- 'people_more_active' => _('More active people'),
69		- 'people_more_popular' => _('More popular people'),
70		- 'communities_more_recent' => _('More recent communities'),
71		- 'communities_more_active' => _('More active communities'),
72		- 'communities_more_popular' => _('More popular communities'),
73		- 'contents_more_recent' => _('More recent contents'),
74		- 'contents_more_views' => _('Most viewed contents'),
75		- 'contents_more_comments' => _('Most commented contents'),
76		- }[str] \|\| str
77		- end
78		-
79		-end
...	...	@@ -0,0 +1,28 @@
	1	+class MapBalloonController < PublicController
	2	+
	3	+ before_filter :profile, :only => [:person, :enterprise, :community]
	4	+
	5	+ def product
	6	+ @product = Product.find(params[:id])
	7	+ render :action => 'product', :layout => false
	8	+ end
	9	+
	10	+ def person
	11	+ render :action => 'profile', :layout => false
	12	+ end
	13	+
	14	+ def enterprise
	15	+ render :action => 'profile', :layout => false
	16	+ end
	17	+
	18	+ def community
	19	+ render :action => 'profile', :layout => false
	20	+ end
	21	+
	22	+ protected
	23	+
	24	+ def profile
	25	+ @profile = Profile.find(params[:id])
	26	+ end
	27	+
	28	+end
...	...
1	1	class SearchController < PublicController
2	2
	3	+ MAP_SEARCH_LIMIT = 2000
	4	+ LIST_SEARCH_LIMIT = 20
	5	+ BLOCKS_SEARCH_LIMIT = 18
	6	+ MULTIPLE_SEARCH_LIMIT = 8
	7	+
3	8	helper TagsHelper
	9	+ include SearchHelper
	10	+ include ActionView::Helpers::NumberHelper
4	11
5	12	before_filter :load_category
6		- before_filter :prepare_filter
7		- before_filter :check_search_whole_site
8	13	before_filter :load_search_assets
9		- before_filter :check_valid_assets, :only => [ :assets ]
	14	+ before_filter :load_query
10	15
11	16	no_design_blocks
12	17
13		- protected
	18	+ def facets_browse
	19	+ @asset = params[:asset]
	20	+ @asset_class = asset_class(@asset)
14	21
15		- def load_search_assets
16		- @search_in = where_to_search
17		- @searching = {}
18		- @search_in.each do \|key, name\|
19		- @searching[key] = (params[:asset].blank? && (params[:find_in].nil? \|\| params[:find_in].empty? \|\| params[:find_in].include?(key.to_s))) \|\| (params[:asset] == key.to_s)
	22	+ @facets_only = true
	23	+ send(@asset)
	24	+
	25	+ @facet = @asset_class.map_facets_for(environment).find { \|facet\| facet[:id] == params[:facet_id] }
	26	+ raise 'Facet not found' if @facet.nil?
	27	+
	28	+ render :layout => false
	29	+ end
	30	+
	31	+ def articles
	32	+ @filter = params[:filter] ? filter : nil
	33	+ @filter_title = params[:filter] ? filter_description(@asset, @filter) : nil
	34	+ if !@empty_query
	35	+ full_text_search ['public:true']
	36	+ elsif params[:filter]
	37	+ @results[@asset] = @environment.articles.public.send(@filter).paginate(paginate_options)
20	38	end
21	39	end
22	40
23		- def prepare_filter
24		- if @category
25		- @noosfero_finder = CategoryFinder.new(@category)
	41	+ def contents
	42	+ redirect_to params.merge(:action => :articles)
	43	+ end
	44	+
	45	+ def people
	46	+ if !@empty_query
	47	+ full_text_search ['public:true']
26	48	else
27		- @noosfero_finder = EnvironmentFinder.new(@environment)
	49	+ @results[@asset] = @environment.people.visible.send(@filter).paginate(paginate_options)
	50	+ @facets = {}
	51	+ end
	52	+ end
	53	+
	54	+ def products
	55	+ if !@empty_query
	56	+ full_text_search ['public:true']
28	57	end
29	58	end
30	59
31		- def check_search_whole_site
32		- if params[:search_whole_site_yes] or params[:search_whole_site] == 'yes'
33		- redirect_to params.merge(:category_path => [], :search_whole_site => nil, :search_whole_site_yes => nil)
	60	+ def enterprises
	61	+ if !@empty_query
	62	+ full_text_search ['public:true']
	63	+ else
	64	+ @filter_title = _('Enterprises from network')
	65	+ @results[@asset] = @environment.enterprises.visible.paginate(paginate_options)
34	66	end
35	67	end
36	68
37		- def check_valid_assets
38		- @asset = params[:asset].to_sym
39		- if !where_to_search.map(&:first).include?(@asset)
40		- render :text => 'go away', :status => 403
41		- return
	69	+ def communities
	70	+ if !@empty_query
	71	+ full_text_search ['public:true']
	72	+ else
	73	+ @results[@asset] = @environment.communities.visible.send(@filter).paginate(paginate_options)
42	74	end
43	75	end
44	76
45	77	def events
46	78	@category_id = @category ? @category.id : nil
47	79
	80	+ if params[:year] \|\| params[:month]
	81	+ date = Date.new(year.to_i, month.to_i, 1)
	82	+ date_range = (date - 1.month)..(date + 1.month).at_end_of_month
	83	+ end
	84	+
	85	+ if @query.blank?
	86	+ # Ignore pagination for asset events
	87	+ if date_range
	88	+ @results[@asset] = Event.send('find', :all,
	89	+ :conditions => [
	90	+ 'start_date BETWEEN :start_day AND :end_day OR end_date BETWEEN :start_day AND :end_day',
	91	+ {:start_day => date_range.first, :end_day => date_range.last}
	92	+ ])
	93	+ else
	94	+ @results[@asset] = Event.send('find', :all)
	95	+ end
	96	+ else
	97	+ full_text_search
	98	+ end
	99	+
48	100	@selected_day = nil
49	101	@events_of_the_day = []
50	102	date = build_date(params[:year], params[:month], params[:day])
...	...	@@ -58,118 +110,27 @@ class SearchController < PublicController
58	110	end
59	111	end
60	112
61		- events = @results[:events]
62		-
	113	+ events = @results[@asset]
63	114	@calendar = populate_calendar(date, events)
64	115	@previous_calendar = populate_calendar(date - 1.month, events)
65	116	@next_calendar = populate_calendar(date + 1.month, events)
66	117	end
67	118
68		- def people
69		- #nothing, just to enable
70		- end
71		- def enterprises
72		- load_product_categories_menu(:enterprises)
73		- @categories_menu = true
74		- end
75		- def communities
76		- #nothing, just to enable
77		- end
78		- def articles
79		- #nothins, just to enable
80		- end
81		-
82		- def products
83		- load_product_categories_menu(:products)
84		- @categories_menu = true
85		- end
86		-
87		- def load_product_categories_menu(asset)
88		- @results[asset].uniq!
89		- # REFACTOR DUPLICATED CODE inner loop doing the same thing that outter loop
90		-
91		- if !@query.blank? \|\| @region && !params[:radius].blank?
92		- ret = @noosfero_finder.find(asset, @query, calculate_find_options(asset, nil, params[:page], @product_category, @region, params[:radius], params[:year], params[:month]).merge({:limit => :all}))
93		- @result_ids = ret.is_a?(Hash) ? ret[:results] : ret
94		- end
95		-
96		- end
97		-
98		- def calculate_find_options(asset, limit, page, product_category, region, radius, year, month)
99		- result = { :product_category => product_category, :per_page => limit, :page => page }
100		- if [:enterprises, :people, :products].include?(asset) && region
101		- result.merge!(:within => radius, :region => region.id)
102		- end
103		-
104		- if month \|\| year
105		- date = Date.new(year.to_i, month.to_i, 1)
106		- result[:date_range] = (date - 1.month)..(date + 1.month).at_end_of_month
107		- end
108		-
109		- result
110		- end
111		-
112		- # limit the number of results per page
113		- # TODO: dont hardcore like this
114		- def limit
115		- searching = @searching.values.select{\|v\|v}
116		- if params[:display] == 'map'
117		- 2000
118		- else
119		- (searching.size == 1) ? 20 : 6
120		- end
121		- end
122		-
123		- public
124		-
125		- include SearchHelper
126		-
127		- ######################################################
128		-
129		- def where_to_search
130		- [
131		- [ :articles, N_('Articles') ],
132		- [ :enterprises, N_('Enterprises') ],
133		- [ :people, N_('People') ],
134		- [ :communities, N_('Communities') ],
135		- [ :products, N_('Products') ],
136		- [ :events, N_('Events') ]
137		- ].select {\|key, name\| !environment.enabled?('disable_asset_' + key.to_s) }
138		- end
139		-
140		- def cities
141		- @cities = City.find(:all, :order => 'name', :conditions => ['parent_id = ? and lat is not null and lng is not null', params[:state_id]])
142		- render :action => 'cities', :layout => false
143		- end
144		-
145		- def complete_region
146		- # FIXME this logic should be in the model
147		- @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 + '%' ])
148		- render :action => 'complete_region', :layout => false
149		- end
150		-
151	119	def index
152		- @query = params[:query] \|\| ''
153		- @product_category = ProductCategory.find(params[:product_category]) if params[:product_category]
154		-
155		- @region = City.find_by_id(params[:city]) if !params[:city].blank? && params[:city] =~ /^\d+$/
156		-
157		- # how many assets we are searching for?
158		- number_of_result_assets = @searching.values.select{\|v\| v}.size
159		-
160	120	@results = {}
161		- @facets = {}
162	121	@order = []
163	122	@names = {}
	123	+ @results_only = true
164	124
165		- where_to_search.select { \|key,description\| @searching[key] }.each do \|key, description\|
	125	+ @enabled_searchs.select { \|key,description\| @searching[key] }.each do \|key, description\|
	126	+ load_query
	127	+ @asset = key
	128	+ send(key)
166	129	@order << key
167		- find_options = calculate_find_options(key, limit, params[:page], @product_category, @region, params[:radius], params[:year], params[:month]);
168		- ret = @noosfero_finder.find(key, @query, find_options)
169		- @results[key] = ret.is_a?(Hash) ? ret[:results] : ret
170		- @facets[key] = ret.is_a?(Hash) ? ret[:facets] : {}
171	130	@names[key] = getterm(description)
172	131	end
	132	+ @asset = nil
	133	+ @facets = {}
173	134
174	135	if @results.keys.size == 1
175	136	specific_action = @results.keys.first
...	...	@@ -180,34 +141,32 @@ class SearchController < PublicController
180	141	return
181	142	end
182	143	end
183		-
184		- render :action => 'index'
185	144	end
186	145
187		- alias :assets :index
188		-
189		- #######################################################
	146	+ def assets
	147	+ params[:action] = params[:asset].is_a?(Array) ? :index : params.delete(:asset)
	148	+ redirect_to params
	149	+ end
190	150
191	151	# view the summary of one category
192	152	def category_index
193	153	@results = {}
194	154	@order = []
195	155	@names = {}
	156	+ limit = MULTIPLE_SEARCH_LIMIT
196	157	[
197		- [ :people, _('People'), @noosfero_finder.recent('people', limit) ],
198		- [ :enterprises, __('Enterprises'), @noosfero_finder.recent('enterprises', limit) ],
199		- [ :products, _('Products'), @noosfero_finder.recent('products', limit) ],
200		- [ :events, _('Upcoming events'), @noosfero_finder.upcoming_events({:per_page => limit}) ],
201		- [ :communities, __('Communities'), @noosfero_finder.recent('communities', limit) ],
202		- [ :most_commented_articles, _('Most commented articles'), @noosfero_finder.most_commented_articles(limit) ],
203		- [ :articles, _('Articles'), @noosfero_finder.recent('text_articles', limit) ]
204		- ].each do \|key, name, list\|
205		- @order << key
206		- @results[key] = list
207		- @names[key] = name
	158	+ [ :people, _('People'), :recent_people ],
	159	+ [ :enterprises, _('Enterprises'), :recent_enterprises ],
	160	+ [ :products, _('Products'), :recent_products ],
	161	+ [ :events, _('Upcoming events'), :upcoming_events ],
	162	+ [ :communities, _('Communities'), :recent_communities ],
	163	+ [ :articles, _('Contents'), :recent_articles ]
	164	+ ].each do \|asset, name, filter\|
	165	+ @order << asset
	166	+ @results[asset] = @category.send(filter, limit)
	167	+ @names[asset] = name
208	168	end
209	169	end
210		- attr_reader :category
211	170
212	171	def tags
213	172	@tags_cache_key = "tags_env_#{environment.id.to_s}"
...	...	@@ -224,21 +183,123 @@ class SearchController < PublicController
224	183	end
225	184	end
226	185
	186	+ def events_by_day
	187	+ @selected_day = build_date(params[:year], params[:month], params[:day])
	188	+ @events_of_the_day = environment.events.by_day(@selected_day)
	189	+ render :partial => 'events/events_by_day'
	190	+ end
	191	+
227	192	#######################################################
	193	+ protected
	194	+
	195	+ def load_query
	196	+ @asset = params[:action].to_sym
	197	+ @order \|\|= [@asset]
	198	+ @results \|\|= {}
	199	+ @filter = filter
	200	+ @filter_title = filter_description(@asset, @filter)
	201	+
	202	+ @query = params[:query] \|\| ''
	203	+ @empty_query = @category.nil? && @query.blank?
	204	+ end
228	205
229		- def popup
230		- @regions = Region.find(:all).select{\|r\|r.lat && r.lng}
231		- render :action => 'popup', :layout => false
	206	+ def load_category
	207	+ unless params[:category_path].blank?
	208	+ path = params[:category_path].join('/')
	209	+ @category = environment.categories.find_by_path(path)
	210	+ if @category.nil?
	211	+ render_not_found(path)
	212	+ else
	213	+ @category_id = @category.id
	214	+ end
	215	+ end
232	216	end
233	217
234		- def events_by_day
235		- @selected_day = build_date(params[:year], params[:month], params[:day])
236		- if params[:category_id] and Category.exists?(params[:category_id])
237		- @events_of_the_day = environment.events.by_day(@selected_day).in_category(Category.find(params[:category_id]))
	218	+ FILTERS = %w(
	219	+ more_recent
	220	+ more_active
	221	+ more_popular
	222	+ )
	223	+ def filter
	224	+ if FILTERS.include?(params[:filter])
	225	+ params[:filter]
238	226	else
239		- @events_of_the_day = environment.events.by_day(@selected_day)
	227	+ 'more_recent'
240	228	end
241		- render :partial => 'events/events_by_day'
	229	+ end
	230	+
	231	+ def filter_description(asset, filter)
	232	+ {
	233	+ 'articles_more_recent' => _('More recent contents from network'),
	234	+ 'articles_more_popular' => _('More read contents from network'),
	235	+ 'people_more_recent' => _('More recent people from network'),
	236	+ 'people_more_active' => _('More active people from network'),
	237	+ 'people_more_popular' => _('More popular people from network'),
	238	+ 'communities_more_recent' => _('More recent communities from network'),
	239	+ 'communities_more_active' => _('More active communities from network'),
	240	+ 'communities_more_popular' => _('More popular communities from network'),
	241	+ }[asset.to_s + '_' + filter]
	242	+ end
	243	+
	244	+ def load_search_assets
	245	+ @enabled_searchs = [
	246	+ [ :articles, _('Contents') ],
	247	+ [ :enterprises, _('Enterprises') ],
	248	+ [ :people, _('People') ],
	249	+ [ :communities, _('Communities') ],
	250	+ [ :products, _('Products and Services') ],
	251	+ [ :events, _('Events') ]
	252	+ ].select {\|key, name\| !environment.enabled?('disable_asset_' + key.to_s) }
	253	+
	254	+ @searching = {}
	255	+ @titles = {}
	256	+ @enabled_searchs.each do \|key, name\|
	257	+ @titles[key] = name
	258	+ @searching[key] = params[:action] == 'index' \|\| params[:action] == key.to_s
	259	+ end
	260	+ end
	261	+
	262	+ def limit
	263	+ searching = @searching.values.select{ \|v\| v }
	264	+ if params[:display] == 'map'
	265	+ MAP_SEARCH_LIMIT
	266	+ elsif searching.size <= 1
	267	+ if [:people, :communities].include? @asset
	268	+ BLOCKS_SEARCH_LIMIT
	269	+ elsif @asset == :enterprises and @empty_query
	270	+ BLOCKS_SEARCH_LIMIT
	271	+ else
	272	+ LIST_SEARCH_LIMIT
	273	+ end
	274	+ else
	275	+ MULTIPLE_SEARCH_LIMIT
	276	+ end
	277	+ end
	278	+
	279	+ def paginate_options(page = params[:page])
	280	+ { :per_page => limit, :page => page }
	281	+ end
	282	+
	283	+ def full_text_search(filters = [])
	284	+ paginate_options = paginate_options(params[:page])
	285	+ asset_class = asset_class(@asset)
	286	+
	287	+ solr_options = {}
	288	+ if !@results_only and asset_class.methods.include?('facets')
	289	+ solr_options.merge! asset_class.facets_find_options(params[:facet])
	290	+ solr_options[:all_facets] = true
	291	+ solr_options[:limit] = 0 if @facets_only
	292	+ solr_options[:facets][:browse] << asset_class.facet_category_query.call(@category) if @category and asset_class.facet_category_query
	293	+ end
	294	+ solr_options[:order] = params[:order_by] if params[:order_by]
	295	+ solr_options[:filter_queries] \|\|= []
	296	+ solr_options[:filter_queries] += filters
	297	+ solr_options[:filter_queries] << "environment_id:#{environment.id}"
	298	+
	299	+ ret = asset_class.find_by_contents(@query, paginate_options, solr_options)
	300	+ @results[@asset] = ret[:results]
	301	+ @facets = ret[:facets]
	302	+ @all_facets = ret[:all_facets]
242	303	end
243	304
244	305	end
...	...
...	...	@@ -574,7 +574,7 @@ module ApplicationHelper
574	574	end
575	575	extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
576	576	links = links_for_balloon(profile)
577		- content_tag tag,
	577	+ content_tag('div', content_tag(tag,
578	578	(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) : "") +
579	579	link_to(
580	580	content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
...	...	@@ -584,7 +584,7 @@ module ApplicationHelper
584	584	:class => 'profile_link url',
585	585	:help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
586	586	:title => profile.name ),
587		- :class => 'vcard'
	587	+ :class => 'vcard'), :class => 'common-profile-list-block')
588	588	end
589	589
590	590	def gravatar_url_for(email, options = {})
...	...	@@ -890,22 +890,6 @@ module ApplicationHelper
890	890	result
891	891	end
892	892
893		- def search_page_title(title, options={})
894		- title = "<h1>" + title + "</h1>"
895		- title += "<h2 class='query'>" + _("Searched for '%s'") % options[:query] + "</h2>" if !options[:query].blank?
896		- title += "<h2 class='query'>" + _("In category %s") % options[:category] + "</h2>" if !options[:category].blank?
897		- title += "<h2 class='query'>" + _("within %d km from %s") % [options[:distance], options[:region]] + "</h2>" if !options[:distance].blank? && !options[:region].blank?
898		- title += "<h2 class='query'>" + _("%d results found") % options[:total_results] + "</h2>" if !options[:total_results].blank?
899		- title
900		- end
901		-
902		- def search_page_link_to_all(options={})
903		- if options[:category]
904		- title = "<div align='center'>" + _('In all categories') + "</div>"
905		- link_to title, :action => 'assets', :asset => options[:asset], :category_path => []
906		- end
907		- end
908		-
909	893	def template_stylesheet_path
910	894	if profile.nil?
911	895	"/designs/templates/#{environment.layout_template}/stylesheets/style.css"
...	...	@@ -982,6 +966,7 @@ module ApplicationHelper
982	966	def noosfero_stylesheets
983	967	[
984	968	'application',
	969	+ 'search',
985	970	'thickbox',
986	971	'lightbox',
987	972	'colorpicker',
...	...	@@ -1100,33 +1085,46 @@ module ApplicationHelper
1100	1085	") : '')
1101	1086	end
1102	1087
1103		- def browse_people_menu
	1088	+ def search_contents_menu
	1089	+ links = [
	1090	+ {s_('contents\|More Recent') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_recent'})}},
	1091	+ {s_('contents\|More Read') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}}
	1092	+ ]
	1093	+ if logged_in?
	1094	+ links.push(_('New Content') => lightbox_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
	1095	+ end
	1096	+
	1097	+ link_to(content_tag(:span, _('Contents'), :class => 'icon-menu-contents'), {:controller => "search", :action => 'contents', :category_path => ''}, :id => 'submenu-contents') +
	1098	+ link_to(content_tag(:span, _('Contents Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
	1099	+ end
	1100	+
	1101	+ def search_people_menu
1104	1102	links = [
1105		- {s_('people\|More Recent') => {:href => url_for({:controller => 'browse', :action => 'people', :filter => 'more_recent'})}},
1106		- {s_('people\|More Active') => {:href => url_for({:controller => 'browse', :action => 'people', :filter => 'more_active'})}},
1107		- {s_('people\|More Popular') => {:href => url_for({:controller => 'browse', :action => 'people', :filter => 'more_popular'})}}
	1103	+ {s_('people\|More Recent') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_recent'})}},
	1104	+ {s_('people\|More Active') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_active'})}},
	1105	+ {s_('people\|More Popular') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_popular'})}}
1108	1106	]
1109	1107	if logged_in?
1110	1108	links.push(_('My friends') => {:href => url_for({:profile => current_user.login, :controller => 'friends'})})
1111	1109	links.push(_('Invite friends') => {:href => url_for({:profile => current_user.login, :controller => 'invite', :action => 'friends'})})
1112	1110	end
1113	1111
1114		- link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "browse", :action => 'people'}, :id => 'submenu-people') +
	1112	+ link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "search", :action => 'people', :category_path => ''}, :id => 'submenu-people') +
1115	1113	link_to(content_tag(:span, _('People Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')
1116	1114	end
1117	1115
1118		- def browse_communities_menu
	1116	+ def search_communities_menu
1119	1117	links = [
1120		- {s_('communities\|More Recent') => {:href => url_for({:controller => 'browse', :action => 'communities', :filter => 'more_recent'})}},
1121		- {s_('communities\|More Active') => {:href => url_for({:controller => 'browse', :action => 'communities', :filter => 'more_active'})}},
1122		- {s_('communities\|More Popular') => {:href => url_for({:controller => 'browse', :action => 'communities', :filter => 'more_popular'})}}
	1118	+ {s_('communities\|More Recent') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_recent'})}},
	1119	+ {s_('communities\|More Active') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_active'})}},
	1120	+ {s_('communities\|More Popular') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_popular'})}}
1123	1121	]
1124	1122	if logged_in?
1125	1123	links.push(_('My communities') => {:href => url_for({:profile => current_user.login, :controller => 'memberships'})})
1126	1124	links.push(_('New community') => {:href => url_for({:profile => current_user.login, :controller => 'memberships', :action => 'new_community'})})
1127	1125	end
1128	1126
1129		- link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "browse", :action => 'communities'}, :id => 'submenu-communities') +
	1127	+ link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "search", :action => 'communities'}, :id => 'submenu-communities') +
1130	1128	link_to(content_tag(:span, _('Communities Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
1131	1129	end
1132	1130
...	...	@@ -1330,4 +1328,8 @@ module ApplicationHelper
1330	1328	end
1331	1329	end
1332	1330
	1331	+ def jquery_token_input_messages_json(hintText = _('Type in an keyword'), noResultsText = _('No results'), searchingText = _('Searching...'))
	1332	+ "hintText: '#{hintText}', noResultsText: '#{noResultsText}', searchingText: '#{searchingText}'"
	1333	+ end
	1334	+
1333	1335	end
...	...
...	...	@@ -26,15 +26,19 @@ module DisplayHelper
26	26	product.enterprise.enabled? ? product.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => product) : product.enterprise.url
27	27	end
28	28
29		- def link_to_category(category, full = true)
	29	+ def link_to_tag(tag, html_options = {})
	30	+ link_to tag.name, {:controller => 'search', :action => 'tag', :tag => tag.name}, html_options
	31	+ end
	32	+
	33	+ def link_to_category(category, full = true, html_options = {})
30	34	return _('Uncategorized product') unless category
31	35	name = full ? category.full_name(' → ') : category.name
32		- link_to name, Noosfero.url_options.merge({:controller => 'search', :action => 'category_index', :category_path => category.path.split('/'),:host => category.environment.default_hostname })
	36	+ link_to name, Noosfero.url_options.merge({:controller => 'search', :action => 'category_index', :category_path => category.path.split('/'),:host => category.environment.default_hostname }), html_options
33	37	end
34	38
35	39	def link_to_product_category(category)
36	40	if category
37		- link_to(category.name, :controller => 'search', :action => 'assets', :asset => 'products', :product_category => category.id, :host => category.environment.default_hostname)
	41	+ link_to(category.name, :controller => 'search', :action => 'products', :category_path => category.explode_path)
38	42	else
39	43	_('Uncategorized product')
40	44	end
...	...
...	...	@@ -22,10 +22,7 @@ module LightboxHelper
22	22	def lightbox_options(options, lightbox_type = 'lbOn')
23	23	the_class = lightbox_type
24	24	the_class << " #{options[:class]}" if options.has_key?(:class)
25		- options.merge(
26		- :class => the_class,
27		- :onclick => 'alert("%s"); return false' % _('Please, try again when the page loading completes.')
28		- )
	25	+ options.merge(:class => the_class)
29	26	end
30	27
31	28	def lightbox?
...	...
...	...	@@ -1,2 +0,0 @@
1		-module ProductCategoryViewerHelper
2		-end
...	...	@@ -3,116 +3,160 @@ module SearchHelper
3	3	# FIXME remove it after search_controler refactored
4	4	include EventsHelper
5	5
6		- def relevance_for(hit)
7		- n = (hit.ferret_score if hit.respond_to?(:ferret_score))
8		- n \|\|= 1.0
9		- (n * 100.0).round
	6	+ def search_page_title(title, category = nil)
	7	+ title = "<h1>" + title
	8	+ title += '<small>' + category.name + '</small>' if category
	9	+ title + "</h1>"
10	10	end
11	11
12		- def display_results(use_map = true)
	12	+ def category_context(category, url)
	13	+ content_tag('div', category.full_name + _(', ') +
	14	+ link_to(_('search in all categories'),
	15	+ url.merge(:category_path => [], :action => (params[:action] == 'category_index' ? 'index' : params[:action]) )),
	16	+ :align => 'center', :class => 'search-category-context') if category
	17	+ end
13	18
14		- unless use_map && GoogleMaps.enabled?(environment.default_hostname)
15		- return render(:partial => 'display_results')
	19	+ def display_results(use_map = false)
	20	+ if params[:display] == 'map' && use_map && GoogleMaps.enabled?(environment.default_hostname)
	21	+ partial = 'google_maps'
	22	+ klass = 'map'
	23	+ else
	24	+ partial = 'display_results'
	25	+ klass = 'list'
16	26	end
17	27
18		- data =
19		- if params[:display] == 'map'
20		- {
21		- :partial => 'google_maps',
22		- :toggle => button(:search, _('Display in list'), params.merge(:display => 'list'), :class => "map-toggle-button" ),
23		- :class => 'map' ,
24		- }
25		- else
26		- {
27		- :partial => 'display_results',
28		- :toggle => button(:search, _('Display in map'), params.merge(:display => 'map'), :class => "map-toggle-button" ),
29		- :class => 'list' ,
30		- }
31		- end
	28	+ content_tag('div', render(:partial => partial), :class => "map-or-list-search-results #{klass}")
	29	+ end
32	30
33		- content_tag('div', data[:toggle] + (render :partial => data[:partial]), :class => "map-or-list-search-results #{data[:class]}")
	31	+ def display_map_list_button
	32	+ button(:search, params[:display] == 'map' ? _('Display in list') : _('Display in map'),
	33	+ params.merge(:display => (params[:display] == 'map' ? 'list' : 'map')),
	34	+ :class => "map-toggle-button" ) if GoogleMaps.enabled?(environment.default_hostname)
34	35	end
35	36
36		- def display_item_map_info(item)
37		- if item.kind_of?(Profile)
38		- display_profile_info(item)
39		- elsif item.kind_of?(Product)
40		- display_product_info(item)
	37	+ def city_with_state(city)
	38	+ s = city.parent
	39	+ if city and city.kind_of?(City) and s and s.kind_of?(State) and s.acronym
	40	+ city.name + ', ' + s.acronym
	41	+ else
	42	+ city.name
41	43	end
42	44	end
	45	+
	46	+ def facets_menu(asset, _facets)
	47	+ @asset_class = asset_class(asset)
	48	+ @facets = _facets
	49	+ render(:partial => 'facets_menu')
	50	+ end
	51	+
	52	+ def facets_unselect_menu(asset)
	53	+ @asset_class = asset_class(asset)
	54	+ render(:partial => 'facets_unselect_menu')
	55	+ end
43	56
44		- def display_profile_info(profile)
45		- data = ''
46		- unless profile.contact_email.nil?
47		- data << content_tag('strong', _('E-Mail: ')) + profile.contact_email + '<br/>'
48		- end
49		- unless profile.contact_phone.nil?
50		- data << content_tag('strong', _('Phone(s): ')) + profile.contact_phone + '<br/>'
51		- end
52		- unless profile.region.nil?
53		- data << content_tag('strong', _('Location: ')) + profile.region.name + '<br/>'
54		- end
55		- unless profile.address.nil?
56		- data << content_tag('strong', _('Address: ')) + profile.address + '<br/>'
57		- end
58		- unless profile.products.empty?
59		- 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/>'
60		- end
61		- if profile.respond_to?(:distance) and !profile.distance.nil?
62		- data << content_tag('strong', _('Distance: ')) + "%.2f%" % profile.distance + '<br/>'
63		- end
64		- content_tag('table',
65		- content_tag('tr',
66		- content_tag('td', content_tag('div', profile_image(profile, :thumb), :class => 'profile-info-picture')) +
67		- content_tag('td', content_tag('strong', link_to(profile.name, url_for(profile.url))) + '<br/>' + data
68		- )
69		- ),
70		- :class => 'profile-info'
71		- )
	57	+ def facet_javascript(input_id, facet, array)
	58	+ hintText = _('Type in an option')
	59	+ text_field_tag('facet['+input_id+']', '', :id => input_id) +
	60	+ javascript_tag("jQuery.TokenList(jQuery('##{input_id}'), #{array.to_json},
	61	+ {searchDelay: 0, permanentDropdown: true, theme: 'facet', dontAdd: true, preventDuplicates: true,
	62	+ #{jquery_token_input_messages_json(hintText)}});")
72	63	end
73	64
74		- def display_product_info(product)
75		- data = ''
76		- unless product.price.nil?
77		- data << content_tag('strong', _('Price: ')) + product.price + '<br/>'
78		- end
79		- unless product.enterprise.nil?
80		- data << content_tag('strong', _('Provider: ')) + link_to_profile(product.enterprise.name, product.enterprise.identifier)
81		- end
82		- unless product.product_category.nil?
83		- data << content_tag('strong', _('Category: ')) + link_to(product.product_category.name, :controller => 'search', :action => 'assets', :asset => 'products', :product_category => product.product_category.id)
	65	+ def facet_link_html(facet, params, value, label, count)
	66	+ params = params.dup
	67	+ has_extra = label.kind_of?(Array)
	68	+ link_label = has_extra ? label[0] : label
	69	+ id = facet[:solr_field].to_s
	70	+ params[:facet] \|\|= {}
	71	+ params[:facet][id] \|\|= {}
	72	+
	73	+ selected = facet[:label_id].nil? ? params[:facet][id] == value : params[:facet][id][facet[:label_id]].to_a.include?(value)
	74	+
	75	+ if count > 0
	76	+ url = params.merge(:facet => params[:facet].merge(
	77	+ id => facet[:label_id].nil? ? value : params[:facet][id].merge( facet[:label_id] => params[:facet][id][facet[:label_id]].to_a.push(value) )
	78	+ ))
	79	+ else
	80	+ url = params.merge(:facet => {
	81	+ id => facet[:label_id].nil? ? value : { facet[:label_id] => value }
	82	+ })
84	83	end
85		- content_tag('table',
86		- content_tag('tr',
87		- 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')) +
88		- content_tag('td', content_tag('strong', link_to(product.name, :controller => 'catalog', :profile => product.enterprise.identifier, :action => 'show', :id => product)) + '<br/>' + data)
89		- ), :class => 'profile-info')
	84	+
	85	+ content_tag 'div', link_to(link_label, url, :class => 'facet-result-link-label') +
	86	+ content_tag('span', (has_extra ? label[1] : ''), :class => 'facet-result-extra-label') +
	87	+ (count > 0 ? content_tag('span', " (#{count})", :class => 'facet-result-count') : ''),
	88	+ :class => 'facet-menu-item' + (selected ? ' facet-result-link-selected' : '')
90	89	end
91	90
92		- def product_categories_menu(asset, product_category, object_ids = nil)
93		- cats = ProductCategory.menu_categories(@product_category, environment)
94		- cats += cats.select { \|c\| c.children_count > 0 }.map(&:children).flatten
95		- product_categories_ids = cats.map(&:id)
96		-
97		- counts = @noosfero_finder.product_categories_count(asset, product_categories_ids, object_ids)
98		-
99		- product_categories_menu = ProductCategory.menu_categories(product_category, environment).map do \|cat\|
100		- hits = counts[cat.id]
101		- childs = []
102		- if hits
103		- if cat.children_count > 0
104		- childs = cat.children.map do \|child\|
105		- child_hits = counts[child.id]
106		- [child, child_hits]
107		- end.select{\|child, child_hits\| child_hits }
108		- else
109		- childs = []
	91	+ def facet_selecteds_html_for(environment, klass, params)
	92	+ def name_with_extra(klass, facet, value)
	93	+ name = klass.facet_result_name(facet, value)
	94	+ name = name[0] + name[1] if name.kind_of?(Array)
	95	+ name
	96	+ end
	97	+
	98	+ ret = []
	99	+ params = params.dup
	100	+ params[:facet].each do \|id, value\|
	101	+ facet = klass.facet_by_id(id.to_sym)
	102	+ if value.kind_of?(Hash)
	103	+ label_hash = facet[:label].call(environment)
	104	+ value.each do \|label_id, value\|
	105	+ facet[:label_id] = label_id
	106	+ facet[:label] = label_hash[label_id]
	107	+ value.to_a.each do \|value\|
	108	+ ret << [facet[:label], name_with_extra(klass, facet, value),
	109	+ params.merge(:facet => params[:facet].merge(id => params[:facet][id].merge(label_id => params[:facet][id][label_id].to_a.reject{ \|v\| v == value })))]
	110	+ end
110	111	end
	112	+ else
	113	+ ret << [klass.facet_label(facet), name_with_extra(klass, facet, value),
	114	+ params.merge(:facet => params[:facet].reject{ \|k,v\| k == id })]
111	115	end
112		- [cat, hits, childs]
113		- end.select{\|cat, hits\| hits }
	116	+ end
	117	+
	118	+ ret.map do \|label, name, url\|
	119	+ content_tag('div', content_tag('span', label, :class => 'facet-selected-label') +
	120	+ content_tag('span', name, :class => 'facet-selected-name') +
	121	+ link_to('', url, :class => 'facet-selected-remove'), :class => 'facet-selected')
	122	+ end.join
	123	+ end
	124	+
	125	+ def order_by(asset)
	126	+ options = {
	127	+ :products => [[_('Relevance'), ''], [_('Name'), 'name_or_category_sort asc'], [_('Lower price'), 'price_sort asc'], [_('Higher price'), 'price_sort desc']],
	128	+ :events => [[_('Relevance'), ''], [_('Name'), 'name_sort asc']],
	129	+ :articles => [[_('Relevance'), ''], [_('Name'), 'name_sort asc'], [_('Most recent'), 'updated_at desc']],
	130	+ :enterprises => [[_('Relevance'), ''], [_('Name'), 'name_sort asc']],
	131	+ :people => [[_('Relevance'), ''], [_('Name'), 'name_sort asc']],
	132	+ :communities => [[_('Relevance'), ''], [_('Name'), 'name_sort asc']],
	133	+ }
	134	+
	135	+ content_tag('div', _('Sort results by ') +
	136	+ select_tag(asset.to_s + '[order]', options_for_select(options[asset], params[:order_by]),
	137	+ {:onchange => "window.location=jQuery.param.querystring(window.location.href, { 'order_by' : this.options[this.selectedIndex].value})"}),
	138	+ :class => "search-ordering")
	139	+ end
114	140
115		- render(:partial => 'product_categories_menu', :object => product_categories_menu)
	141	+ def label_total_found(asset, total_found)
	142	+ labels = {
	143	+ :products => _("%s products offers found"),
	144	+ :articles => _("%s articles found"),
	145	+ :events => _("%s events found"),
	146	+ :people => _("%s people found"),
	147	+ :enterprises => _("%s enterprises found"),
	148	+ :communities => _("%s communities found"),
	149	+ }
	150	+ content_tag('span', labels[asset] % total_found,
	151	+ :class => "total-pages-found") if labels[asset]
	152	+ end
	153	+
	154	+ def asset_class(asset)
	155	+ asset.to_s.singularize.camelize.constantize
	156	+ end
	157	+
	158	+ def asset_table(asset)
	159	+ asset_class(asset).table_name
116	160	end
117	161
118	162	end
...	...
...	...	@@ -2,6 +2,12 @@ require 'hpricot'
2	2
3	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	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	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	13	track_actions :remove_article, :before_destroy, :keep_params => [:name], :if => Proc.new { \|a\| a.is_trackable? }, :custom_target => :action_tracker_target
...	...	@@ -125,8 +131,6 @@ class Article < ActiveRecord::Base
125	131
126	132	acts_as_versioned
127	133
128		- acts_as_searchable :additional_fields => [ :comment_data ]
129		-
130	134	def comment_data
131	135	comments.map {\|item\| [item.title, item.body].join(' ') }.join(' ')
132	136	end
...	...	@@ -141,13 +145,31 @@ class Article < ActiveRecord::Base
141	145	{:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]}
142	146	}
143	147
	148	+ named_scope :public,
	149	+ :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ]
	150	+
	151	+ named_scope :more_recent,
	152	+ :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND
	153	+ ((articles.type != ?) OR articles.type is NULL)",
	154	+ true, true, true, true, 'RssFeed'
	155	+ ],
	156	+ :order => 'articles.published_at desc, articles.id desc'
	157	+
	158	+ # retrives the most commented articles, sorted by the comment count (largest
	159	+ # first)
	160	+ def self.most_commented(limit)
	161	+ paginate(:order => 'comments_count DESC', :page => 1, :per_page => limit)
	162	+ end
	163	+
	164	+ named_scope :more_popular, :order => 'hits DESC'
	165	+
144	166	# retrieves the latest +limit+ articles, sorted from the most recent to the
145	167	# oldest.
146	168	#
147	169	# Only includes articles where advertise == true
148		- def self.recent(limit, extra_conditions = {})
	170	+ def self.recent(limit = nil, extra_conditions = {})
149	171	# FIXME this method is a horrible hack
150		- options = { :limit => limit,
	172	+ options = { :page => 1, :per_page => limit,
151	173	:conditions => [
152	174	"advertise = ? AND
153	175	published = ? AND
...	...	@@ -165,20 +187,14 @@ class Article < ActiveRecord::Base
165	187	options.delete(:include)
166	188	end
167	189	if extra_conditions == {}
168		- self.find(:all, options)
	190	+ self.paginate(options)
169	191	else
170	192	with_scope :find => {:conditions => extra_conditions} do
171		- self.find(:all, options)
	193	+ self.paginate(options)
172	194	end
173	195	end
174	196	end
175	197
176		- # retrives the most commented articles, sorted by the comment count (largest
177		- # first)
178		- def self.most_commented(limit)
179		- find(:all, :order => 'comments_count DESC', :limit => limit)
180		- end
181		-
182	198	# produces the HTML code that is to be displayed as this article's contents.
183	199	#
184	200	# The implementation in this class just provides the +body+ attribute as the
...	...	@@ -561,6 +577,81 @@ class Article < ActiveRecord::Base
561	577
562	578	private
563	579
	580	+ # FIXME: workaround for development env.
	581	+ # Subclasses aren't (re)loaded, and acts_as_solr
	582	+ # depends on subclasses method to search
	583	+ # see http://stackoverflow.com/questions/4138957/activerecordsubclassnotfound-error-when-using-sti-in-rails/4139245
	584	+ UploadedFile
	585	+ TextArticle
	586	+ TinyMceArticle
	587	+ TextileArticle
	588	+ Folder
	589	+ EnterpriseHomepage
	590	+ Gallery
	591	+ Blog
	592	+ Forum
	593	+ Event
	594	+
	595	+ def self.f_type_proc(klass)
	596	+ klass.constantize.type_name
	597	+ end
	598	+ def self.f_profile_type_proc(klass)
	599	+ klass.constantize.type_name
	600	+ end
	601	+
	602	+ def f_type
	603	+ #join common types
	604	+ case self.class.name
	605	+ when 'TinyMceArticle', 'TextileArticle'
	606	+ TextArticle.name
	607	+ else
	608	+ self.class.name
	609	+ end
	610	+ end
	611	+ def f_profile_type
	612	+ self.profile.class.name
	613	+ end
	614	+ def f_published_at
	615	+ self.published_at
	616	+ end
	617	+ def f_category
	618	+ self.categories.collect(&:name)
	619	+ end
	620	+ def name_sort
	621	+ name
	622	+ end
	623	+ def public
	624	+ self.public?
	625	+ end
	626	+ def environment_id
	627	+ profile.environment_id
	628	+ end
	629	+ public
	630	+
	631	+ acts_as_faceted :fields => {
	632	+ :f_type => {:label => _('Type'), :proc => proc{\|klass\| f_type_proc(klass)}},
	633	+ :f_published_at => {:type => :date, :label => _('Published date'), :queries => {'[* TO NOW-1YEARS/DAY]' => _("Older than one year"),
	634	+ '[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")},
	635	+ :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]']},
	636	+ :f_profile_type => {:label => _('Profile'), :proc => proc{\|klass\| f_profile_type_proc(klass)}},
	637	+ :f_category => {:label => _('Categories')}},
	638	+ :category_query => proc { \|c\| "f_category:\"#{c.name}\"" },
	639	+ :order => [:f_type, :f_published_at, :f_profile_type, :f_category]
	640	+
	641	+ acts_as_searchable :additional_fields => [
	642	+ {:name => {:type => :string}},
	643	+ {:public => {:type => :boolean}},
	644	+ {:environment_id => {:type => :integer}},
	645	+ ] + facets_fields_for_solr,
	646	+ :exclude_fields => [:setting],
	647	+ :include => [:profile],
	648	+ :facets => facets_option_for_solr,
	649	+ :boost => proc {\|a\| 10 if a.profile.enabled},
	650	+ :if => proc{\|a\| ! ['RssFeed'].include?(a.class.name)}
	651	+ handle_asynchronously :solr_save
	652	+
	653	+ private
	654	+
564	655	def sanitize_tag_list
565	656	sanitizer = HTML::FullSanitizer.new
566	657	self.tag_list.names.map!{\|i\| strip_tag_name sanitizer.sanitize(i) }
...	...