merging with stable

Leandro Nunes dos Santos
1 parent e22e8356
Showing 1039 changed files with 144546 additions and 114933 deletions Show diff stats
AUTHORS
Gemfile
Gemfile.lock
INSTALL
INSTALL.chat
RELEASING
Rakefile
app/controllers/admin/environment_design_controller.rb
app/controllers/admin/region_validators_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/application_controller.rb
app/controllers/box_organizer_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/my_profile/profile_members_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/catalog_controller.rb
app/controllers/public/profile_search_controller.rb
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
@@ -13,16 +13,30 @@ Alessandro Palmeira + Caio Salgado &lt;alessandro.palmeira@gmail.com&gt;
 Alessandro Palmeira + Caio Salgado <caio.csalgado@gmail.com>
 Alessandro Palmeira + Caio Salgado + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
 Alessandro Palmeira + Carlos Morais <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Daniel Alves <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
+Alessandro Palmeira + Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
+Alessandro Palmeira + Diego Araujo <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Diego Araújo <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araujo + Daniela Feitosa <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araujo <diegoamc90@gmail.com>
 Alessandro Palmeira + Diego Araújo <diegoamc90@gmail.com>
+Alessandro Palmeira + Diego Araujo + Eduardo Morais <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araújo + João M. M. da Silva <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
+Alessandro Palmeira + Diego Araujo + João M. M. da Silva + Paulo Meirelles <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
 Alessandro Palmeira + Diego Araújo + Pedro Leal + João M. M. da Silva <diegoamc90@gmail.com>
 Alessandro Palmeira + Diego Araujo + Rafael Manzo <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Eduardo Morais <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Guilherme Rojas <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Jefferson Fernandes <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + João M. M. da Silva <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Joao M. M. da Silva + Diego Araujo <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + João M. M. da Silva + Renan Teruo <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + João M. M. Silva <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
 Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
 Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
@@ -32,6 +46,7 @@ Braulio Bhavamitra &lt;brauliobo@gmail.com&gt;
 Bráulio Bhavamitra <brauliobo@gmail.com>
 Caio <caio.csalgado@gmail.com>
 Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
+Caio Formiga <caio.formiga@gmail.com>
 Caio, Pedro <caio.csalgado@gmail.com>
 Caio Salgado + Alessandro Palmeira <caio.csalgado@gmail.com>
 Caio Salgado <caio.csalgado@gmail.com>
@@ -57,26 +72,42 @@ Carlos Morais + Diego Araújo &lt;diegoamc90@gmail.com&gt;
 Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
 Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
 Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
+Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
+Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
+Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
+Daniel Alves + Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
+Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
+Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
+Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
 Daniel Cunha <daniel@colivre.coop.br>
 diegoamc <diegoamc90@gmail.com>
 Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
+Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
+Diego Araújo + Alessandro Palmeira + Rafael Manzo <rr.manzo@gmail.com>
 Diego Araujo + Caio Salgado <diegoamc90@gmail.com>
+Diego Araújo + Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
 Diego Araújo <diegoamc90@gmail.com>
+Diego Araújo + Eduardo Morais + Paulo Meirelles <diegoamc90@gmail.com>
+Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
 Diego Araújo + Jefferson Fernandes <diegoamc90@gmail.com>
 Diego Araujo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
 Diego Araújo + João Machini <diegoamc90@gmail.com>
 Diego Araújo + João Machini <digoamc90@gmail.com>
+Diego Araújo + João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
 Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
 Diego Araújo + João M. M. da Silva + João Machini <diegoamc90@gmail.com>
 Diego Araújo + João M. M. da Silva + Pedro Leal <diegoamc90@gmail.com>
 Diego Araújo + Paulo Meirelles <diegoamc90@gmail.com>
 Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
+Diego Araujo + Rafael Manzo <diegoamc90@gmail.com>
 Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
 Diego Araújo + Renan Teruo + Alessandro Palmeira <diegoamc90@gmail.com>
 Diego Araújo + Renan Teruo <diegoamc90@gmail.com>
+Diego Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo@gmail.com>
 Diego + Jefferson <diegoamc90@gmail.com>
 Diego Martinez <diegoamc90@gmail.com>
+Diego Martinez <diego@diego-K55A.(none)>
 Diego + Renan <renanteruoc@gmail.com>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
 Grazieno Pellegrino <grazieno@gmail.com>
@@ -89,6 +120,7 @@ João da Silva &lt;jaodsilv@linux.ime.usp.br&gt;
 João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Alessandro Palmeira + Diego Araújo <jaodsilv@linux.ime.usp.br>
+Joao M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Alessandro Palmeira + João Machini <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Caio Salgado + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
@@ -120,21 +152,30 @@ Larissa Reis &lt;reiss.larissa@gmail.com&gt;
 Leandro Nunes dos Santos <leandronunes@gmail.com>
 Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
 LinguÁgil 2010 <linguagil.bahia@gmail.com>
+Lucas Melo <lucas@colivre.coop.br>
 Luis David Aguilar Carlos <ludwig9003@gmail.com>
 Martín Olivera <molivera@solar.org.ar>
 Moises Machado <moises@colivre.coop.br>
 Nanda Lopes <nanda.listas+psl@gmail.com>
+Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
 Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
 Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
 Paulo Meirelles + Diego Araújo <paulo@softwarelivre.org>
 Paulo Meirelles + João M. M. da Silva <paulo@softwarelivre.org>
 Paulo Meirelles <paulo@softwarelivre.org>
+Paulo Meirelles + Rafael Manzo <paulo@softwarelivre.org>
 Rafael Gomes <rafaelgomes@techfree.com.br>
+Rafael Manzo + Alessandro Palmeira <rr.manzo@gmail.com>
+Rafael Manzo + Daniel Alves <danpaulalves@gmail.com>
+Rafael Manzo + Diego Araújo <rr.manzo@gmail.com>
 Rafael Manzo + João M. M. Silva <rr.manzo@gmail.com>
+Rafael Manzo + Paulo Meirelles <rr.manzo@gmail.com>
 Rafael Martins <rmmartins@gmail.com>
 Rafael Reggiani Manzo + Caio Salgado + Jefferson Fernandes <rr.manzo@gmail.com>
 Rafael Reggiani Manzo + Diego Araujo <diegoamc90@gmail.com>
 Rafael Reggiani Manzo + Diego Araujo <rr.manzo@gmail.com>
+Rafael Reggiani Manzo + Diego Araújo <rr.manzo@gmail.com>
+Rafael Reggiani Manzo + João M. M. da Silva <rr.manzo@gmail.com>
 Rafael Reggiani Manzo <rr.manzo@gmail.com>
 Raphaël Rousseau <raph@r4f.org>
 Raquel Lira <raquel.lira@gmail.com>
@@ -146,8 +187,11 @@ Renan Teruo + Paulo Meirelles &lt;renanteruoc@gmail.com&gt;
 Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
 Rodrigo Souto <rodrigo@colivre.coop.br>
 Ronny Kursawe <kursawe.ronny@googlemail.com>
+root <root@debian.sdr.serpro>
 Samuel R. C. Vale <srcvale@holoscopio.com>
 Valessio Brito <valessio@gmail.com>
+vfcosta <vfcosta@gmail.com>
+Visita <visita@debian.(none)>
 Yann Lugrin <yann.lugrin@liquid-concept.ch>
 Ideas, specifications and incentive
-source :rubygems
-gem 'cucumber', '0.4.0'
-gem 'webrat', '0.5.1'
-gem 'rspec', '1.2.9'
-gem 'rspec-rails', '1.2.9'
-gem 'Selenium', '>= 1.1.14'
-gem 'selenium-client', '>= 1.2.17'
-gem 'database_cleaner'
+source "https://rubygems.org"
+
 gem 'exception_notification', '1.0.20090728'
 gem 'system_timer'
+group :test do
+  gem 'rspec', '1.2.9'
+  gem 'rspec-rails', '1.2.9'
+end
+
+group :cucumber do
+  gem 'rake', '0.8.7'
+  gem 'cucumber-rails', '0.3.2'
+  gem 'capybara', '1.1.1'
+  gem 'cucumber', '1.1.0'
+  gem 'database_cleaner'
+end
+
 def program(name)
   unless system("which #{name} > /dev/null")
     puts "W: Program #{name} is needed, but was not found in your PATH"
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    Selenium (1.1.14)
-    builder (3.0.0)
-    cucumber (0.4.0)
+    builder (3.1.4)
+    capybara (1.1.1)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    cucumber (1.1.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      polyglot (>= 0.2.9)
-      term-ansicolor (>= 1.0.3)
-      treetop (>= 1.4.2)
-    database_cleaner (0.7.0)
+      gherkin (~> 2.5.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    cucumber-rails (0.3.2)
+      cucumber (>= 0.8.0)
+    database_cleaner (0.9.1)
     diff-lcs (1.1.3)
     exception_notification (1.0.20090728)
-    nokogiri (1.5.0)
-    polyglot (0.3.3)
-    rack (1.3.5)
+    ffi (1.2.0)
+    gherkin (2.5.4)
+      json (>= 1.4.6)
+    json (1.7.5)
+    libwebsocket (0.1.6.1)
+      websocket
+    mime-types (1.19)
+    multi_json (1.3.7)
+    nokogiri (1.5.5)
+    rack (1.1.0)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (0.8.7)
     rspec (1.2.9)
     rspec-rails (1.2.9)
       rack (>= 1.0.0)
       rspec (>= 1.2.9)
-    selenium-client (1.2.18)
+    rubyzip (0.9.9)
+    selenium-webdriver (2.26.0)
+      childprocess (>= 0.2.5)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
+      rubyzip
     system_timer (1.2.4)
     term-ansicolor (1.0.7)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    webrat (0.5.1)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
+    websocket (1.0.4)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
 PLATFORMS
   ruby
 DEPENDENCIES
-  Selenium (>= 1.1.14)
-  cucumber (= 0.4.0)
+  capybara (= 1.1.1)
+  cucumber (= 1.1.0)
+  cucumber-rails (= 0.3.2)
   database_cleaner
   exception_notification (= 1.0.20090728)
+  rake (= 0.8.7)
   rspec (= 1.2.9)
   rspec-rails (= 1.2.9)
-  selenium-client (>= 1.2.17)
   system_timer
-  webrat (= 0.5.1)
@@ -33,7 +33,7 @@ You need to install some packages Noosfero depends on.  On Debian GNU/Linux or
 Debian-based systems, all of these packages are available through the Debian
 archive. You can install them with the following command:
- # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libwill-paginate-ruby iso-codes libfeedparser-ruby openjdk-6-jre libdaemons-ruby thin tango-icon-theme libhpricot-ruby
+ # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libwill-paginate-ruby iso-codes libfeedparser-ruby libdaemons-ruby thin tango-icon-theme libhpricot-ruby
 On other systems, they may or may not be available through your regular package
 management system. Below are the links to their homepages.
@@ -43,7 +43,6 @@ management system. Below are the links to their homepages.
 * po4a: http://po4a.alioth.debian.org/
 * Ruby-sqlite3: http://rubyforge.org/projects/sqlite-ruby
 * rcov: http://eigenclass.org/hiki/rcov
-* Solr: http://lucene.apache.org/solr
 * RMagick: http://rmagick.rubyforge.org/
 * RedCloth: http://redcloth.org/
 * will_paginate: http://github.com/mislav/will_paginate/wikis
@@ -111,9 +110,6 @@ $ tar -zxvf noosfero-0.39.0.tar.gz
 $ ln -s noosfero-0.39.0 current
 $ cd current
-Copy config/solr.yml.dist to config/solr.yml. You will
-probably not need to customize this configuration, but have a look at it.
-
 Create the thin configuration file:
 $ thin -C config/thin.yml -e production config
@@ -195,10 +191,6 @@ Compile the translations:
 $ RAILS_ENV=production rake noosfero:translations:compile
-Run Solr:
-
-$ rake solr:start
-
 Now we must create some initial data. To create your default environment
 (the first one), run the command below:
@@ -6,15 +6,13 @@ To configure XMPP/BOSH in Noosfero you need:
 * SystemTimer - http://ph7spot.com/musings/system-timer
 * Pidgin data files - http://www.pidgin.im/
-If you use Debian Lenny:
+If you use Debian Wheezy:
-# apt-get install librestclient-ruby (from backports)
-# apt-get install pidgin-data
-# apt-get install ruby1.8-dev
+# apt-get install librestclient-ruby pidgin-data ruby1.8-dev
 # gem install SystemTimer
-Take a look at util/chat directory to see samples of config file to configure a
-XMPP/BOSH server with ejabberd, postgresql and apache2.
+The samples of config file to configure a XMPP/BOSH server with
+ejabberd, postgresql and apache2 can be found at util/chat directory.
 == XMPP/Chat Server Setup
@@ -22,8 +20,7 @@ This is a step-by-step guide to get a XMPP service working, in a Debian system.
 1. Install the required packages
-# apt-get -t lenny-backports install ejabberd
-# apt-get install odbc-postgresql
+# apt-get install ejabberd odbc-postgresql
 2. Ejabberd configuration
@@ -108,7 +105,7 @@ Unused modules can be disabled, for example:
  * web_admin
  * mod_pubsub
  * mod_irc
- * mod_offine
+ * mod_offline
  * mod_admin_extra
  * mod_register
@@ -132,7 +129,7 @@ This will create a new schema inside the noosfero database, called &#39;ejabberd&#39;.
 Note 'noosfero' user should have permission to create Postgresql schemas. Also,
 there should be at least one domain with 'is_default = true' in 'domains'
-table, otherwise people couldn't see your friends online.
+table, otherwise people won't be able to see their friends online.
 4. ODBC configuration
@@ -168,9 +165,12 @@ Debug       = 0
 CommLog     = 1
 UsageCount  = 3
- * testing all:
+ 4.1 testing all:
-# isql 'PostgreSQLEjabberdNoosfero' DBUSER
+# isql 'PostgreSQLEjabberdNoosfero'
+
+If the configuration was done right, the message "Connected!"
+will be displayed.
 5. Enabling kernel polling and SMP in /etc/default/ejabberd
@@ -19,11 +19,12 @@ To prepare a release of noosfero, you must follow the steps below:
 * Finish all requirements and bugs assigned to the to-be-released version
 * Make sure all tests pass
-* Change the version in lib/noosfero.rb and debian/changelog to the
-  to-be-released version (e.g. 0.2.0, 0.3.1)
 * Write release notes at the version's wiki topic
-* Generate packages with <tt>rake noosfero:release</tt>. Your tarball and deb
-  pkg will be under the pkg/ directory. This task will create a git tag too.
+* Generate packages with <tt>rake noosfero:release[(stable|test)]</tt>. This task will:
+  * Update the version in lib/noosfero.rb and debian/changelog.
+  * Create the tarbal and the deb pkg under pkg/ directory.
+  * Create a git tag and push it.
+  * Upload the pkg to the configured repository (if configured) on ~/.dput.cf.
 * Test that the tarball and deb package are ok
 * Go to the version's wiki topic and edit it to reflect the new reality
 * Edit the topic WebPreferences and update DEBIAN_REPOSITORY_TOPICS setting
@@ -7,6 +7,10 @@ require &#39;rake&#39;
 require 'rake/testtask'
 require 'rake/rdoctask'
-ACTS_AS_SEARCHABLE_ENABLED = false if Rake.application.top_level_tasks.detect{|t| t == 'db:data:minimal'}
-
+# rails tasks
 require 'tasks/rails'
+
+# plugins' tasks
+plugins_tasks = Dir.glob("config/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake").sort +
+  Dir.glob("config/plugins/*/vendor/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake").sort
+plugins_tasks.each{ |ext| load ext }
@@ -3,7 +3,8 @@ class EnvironmentDesignController &lt; BoxOrganizerController
   protect 'edit_environment_design', :environment
   def available_blocks
-    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock ]
+    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
+    @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
   end
 end
@@ -33,7 +33,7 @@ class RegionValidatorsController &lt; AdminController
   def load_region_and_search
     @region = environment.regions.find(params[:id])
     if params[:search]
-      @search = @region.search_possible_validators(params[:search])
+      @search = find_by_contents(:organizations, Organization, params[:search])[:results].reject {|item| @region.validator_ids.include?(item.id) }
     end
   end
+require 'csv'
+
 class UsersController < AdminController
   protect 'manage_environment_users', :environment
@@ -15,8 +17,16 @@ class UsersController &lt; AdminController
           :disposition => "attachment; filename=users.xml"
       end
       format.csv do
-        @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
-        render :template => "users/index_csv.rhtml", :content_type => 'text/csv', :layout => false
+        # using a direct connection with the dbms to optimize
+        command = User.send(:sanitize_sql, ["SELECT profiles.name, users.email FROM profiles
+                                             INNER JOIN users ON profiles.user_id=users.id
+                                             WHERE profiles.environment_id = ?", environment.id])
+        users = User.connection.execute(command)
+        csv_content = "name;email\n"
+        users.each { |u|
+          CSV.generate_row([u['name'], u['email']], 2, csv_content, fs=';')
+        }
+        render :text => csv_content, :content_type => 'text/csv', :layout => false
       end
     end
   end
@@ -154,4 +154,18 @@ class ApplicationController &lt; ActionController::Base
     end
   end
+  def find_by_contents(asset, scope, query, paginate_options={:page => 1}, options={})
+    scope = scope.send(options[:filter]) if options[:filter]
+
+    @plugins.first(:find_by_contents, asset, scope, query, paginate_options, options) ||
+    fallback_find_by_contents(asset, scope, query, paginate_options, options)
+  end
+
+  private
+
+  def fallback_find_by_contents(asset, scope, query, paginate_options, options)
+    return {:results => scope.paginate(paginate_options)} if query.blank?
+    {:results => scope.like_search(query).paginate(paginate_options)}
+  end
+
 end
@@ -68,8 +68,8 @@ class BoxOrganizerController &lt; ApplicationController
         raise ArgumentError.new("Type %s is not allowed. Go away." % type)
       end
     else
-      @center_block_types = Box.acceptable_center_blocks & available_blocks
-      @side_block_types = Box.acceptable_side_blocks & available_blocks
+      @center_block_types = (Box.acceptable_center_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => 1)
+      @side_block_types = (Box.acceptable_side_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => [2,3])
       @boxes = boxes_holder.boxes
       render :action => 'add_block', :layout => false
     end
@@ -270,7 +270,7 @@ class CmsController &lt; MyProfileController
   def search
     query = params[:q]
-    results = profile.files.published.find_by_contents(query)[:results]
+    results = find_by_contents(:uploaded_files, profile.files.published, query)[:results]
     render :text => article_list_to_json(results), :content_type => 'application/json'
   end
@@ -7,17 +7,25 @@ class ProfileDesignController &lt; BoxOrganizerController
   def available_blocks
     blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock, HighlightsBlock ]
+    blocks += plugins.dispatch(:extra_blocks)
+
     # blocks exclusive for organizations
     if profile.has_members?
       blocks << MembersBlock
     end
-    # blocks exclusive to person
+    # blocks exclusive to people
     if profile.person?
       blocks << FriendsBlock
       blocks << FavoriteEnterprisesBlock
       blocks << CommunitiesBlock
       blocks << EnterprisesBlock
+      blocks += plugins.dispatch(:extra_blocks, :type => Person)
+    end
+
+    # blocks exclusive to communities
+    if profile.community?
+      blocks += plugins.dispatch(:extra_blocks, :type => Community)
     end
     # blocks exclusive for enterprises
@@ -26,6 +34,7 @@ class ProfileDesignController &lt; BoxOrganizerController
       blocks << HighlightsBlock
       blocks << FeaturedProductsBlock
       blocks << FansBlock
+      blocks += plugins.dispatch(:extra_blocks, :type => Enterprise)
     end
     # product block exclusive for enterprises in environments that permits it
@@ -33,7 +42,7 @@ class ProfileDesignController &lt; BoxOrganizerController
       blocks << ProductsBlock
     end
-    # block exclusive to profile has blog
+    # block exclusive to profiles that have blog
     if profile.has_blog?
       blocks << BlogArchivesBlock
     end
@@ -32,7 +32,6 @@ class ProfileMembersController &lt; MyProfileController
   def last_admin
     @roles = [Profile::Roles.admin(environment.id)]
-    @pre_population = [].to_json
   end
   def add_role
@@ -71,10 +71,6 @@ class AccountController &lt; ApplicationController
     @block_bot = !!session[:may_be_a_bot]
     @invitation_code = params[:invitation_code]
     begin
-      if params[:user]
-        params[:user].delete(:password_confirmation_clear)
-        params[:user].delete(:password_clear)
-      end
       @user = User.new(params[:user])
       @user.terms_of_use = environment.terms_of_use
       @user.environment = environment
@@ -7,7 +7,7 @@ class CatalogController &lt; PublicController
   def index
     @category = params[:level] ? ProductCategory.find(params[:level]) : nil
     @products = @profile.products.from_category(@category).paginate(:order => 'available desc, highlighted desc, name asc', :per_page => 9, :page => params[:page])
-    @categories = ProductCategory.on_level(params[:level])
+    @categories = ProductCategory.on_level(params[:level]).order(:name)
   end
   protected
@@ -11,7 +11,7 @@ class ProfileSearchController &lt; PublicController
       if params[:where] == 'environment'
         redirect_to :controller => 'search', :query => @q
       else
-        @results = profile.articles.published.find_by_contents(@q, {:per_page => 10, :page => params[:page]})[:results]
+        @results = find_by_contents(:articles, profile.articles.published, @q, {:per_page => 10, :page => params[:page]})[:results]
       end
     end
   end
@@ -4,10 +4,11 @@ class SearchController &lt; PublicController
   include SearchHelper
   include ActionView::Helpers::NumberHelper
-  before_filter :redirect_asset_param, :except => [:facets_browse, :assets]
+  before_filter :redirect_asset_param, :except => :assets
   before_filter :load_category
   before_filter :load_search_assets
   before_filter :load_query
+  before_filter :load_filter
   # Backwards compatibility with old URLs
   def redirect_asset_param
@@ -17,25 +18,51 @@ class SearchController &lt; PublicController
   no_design_blocks
-  def facets_browse
-    @asset = params[:asset]
-    @asset_class = asset_class(@asset)
+  def index
+    @searches = {}
+    @order = []
+    @names = {}
+    @results_only = true
-    @facets_only = true
-    send(@asset)
+    @enabled_searches.select { |key,description| @searching[key] }.each do |key, description|
+      load_query
+      @asset = key
+      send(key)
+      @order << key
+      @names[key] = getterm(description)
+    end
+    @asset = nil
-    @facet = @asset_class.map_facets_for(environment).find { |facet| facet[:id] == params[:facet_id] }
-    raise 'Facet not found' if @facet.nil?
+    if @searches.keys.size == 1
+      @asset = @searches.keys.first
+      render :action => @asset
+    end
+  end
-    render :layout => false
+  # view the summary of one category
+  def category_index
+    @searches = {}
+    @order = []
+    @names = {}
+    limit = MULTIPLE_SEARCH_LIMIT
+    [
+      [ :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
+      @searches[asset]= {:results => @category.send(filter, limit)}
+      raise "No total_entries for: #{asset}" unless @searches[asset][:results].respond_to?(:total_entries)
+      @names[asset] = name
+    end
   end
   def articles
-    if !@empty_query
-      full_text_search ['public:true']
-    else
-      @results[@asset] = @environment.articles.public.send(@filter).paginate(paginate_options)
-    end
+    @scope = @environment.articles.public
+    full_text_search
   end
   def contents
@@ -43,49 +70,23 @@ class SearchController &lt; PublicController
   end
   def people
-    if !@empty_query
-      full_text_search ['public:true']
-    else
-      @results[@asset] = visible_profiles(Person).send(@filter).paginate(paginate_options)
-    end
+    @scope = visible_profiles(Person)
+    full_text_search
   end
   def products
-    public_filters = ['public:true', 'enabled:true']
-    if !@empty_query
-      full_text_search public_filters
-    else
-      @one_page = true
-      @geosearch = logged_in? && current_user.person.lat && current_user.person.lng
-
-      extra_limit = LIST_SEARCH_LIMIT*5
-      sql_options = {:limit => LIST_SEARCH_LIMIT, :order => 'random()'}
-      if @geosearch
-        full_text_search public_filters, :sql_options => sql_options, :extra_limit => extra_limit,
-          :alternate_query => "{!boost b=recip(geodist(),#{"%e" % (1.to_f/DistBoost)},1,1)}",
-          :radius => DistFilt, :latitude => current_user.person.lat, :longitude => current_user.person.lng
-      else
-        full_text_search public_filters, :sql_options => sql_options, :extra_limit => extra_limit,
-          :boost_functions => ['recip(ms(NOW/HOUR,updated_at),1.3e-10,1,1)']
-      end
-    end
+    @scope = @environment.products
+    full_text_search
   end
   def enterprises
-    if !@empty_query
-      full_text_search ['public:true']
-    else
-      @filter_title = _('Enterprises from network')
-      @results[@asset] = visible_profiles(Enterprise, [{:products => :product_category}]).paginate(paginate_options)
-    end
+    @scope = visible_profiles(Enterprise, [{:products => :product_category}])
+    full_text_search
   end
   def communities
-    if !@empty_query
-      full_text_search ['public:true']
-    else
-      @results[@asset] = visible_profiles(Community).send(@filter).paginate(paginate_options)
-    end
+    @scope = visible_profiles(Community)
+    full_text_search
   end
   def events
@@ -93,7 +94,7 @@ class SearchController &lt; PublicController
     month = (params[:month] ? params[:month].to_i : Date.today.month)
     day = (params[:day] ? params[:day].to_i : Date.today.day)
     date = build_date(params[:year], params[:month], params[:day])
-    date_range = (date - 1.month)..(date + 1.month).at_end_of_month
+    date_range = (date - 1.month).at_beginning_of_month..(date + 1.month).at_end_of_month
     @selected_day = nil
     @events_of_the_day = []
@@ -104,64 +105,21 @@ class SearchController &lt; PublicController
         environment.events.by_day(@selected_day)
     end
-    if !@empty_query
-      full_text_search
-    else
-      @results[@asset] = date_range ? environment.events.by_range(date_range) : environment.events
-    end
+    @scope = date_range && params[:action] == 'events' ? environment.events.by_range(date_range) : environment.events
+    full_text_search
-    events = @results[@asset]
+    events = @searches[@asset][:results]
     @calendar = populate_calendar(date, events)
     @previous_calendar = populate_calendar(date - 1.month, events)
     @next_calendar = populate_calendar(date + 1.month, events)
   end
-  def index
-    @results = {}
-    @order = []
-    @names = {}
-    @results_only = true
-
-    @enabled_searches.select { |key,description| @searching[key] }.each do |key, description|
-      load_query
-      @asset = key
-      send(key)
-      @order << key
-      @names[key] = getterm(description)
-    end
-    @asset = nil
-    @facets = {}
-
-    render :action => @results.keys.first if @results.keys.size == 1
-  end
-
   # keep old URLs workings
   def assets
     params[:action] = params[:asset].is_a?(Array) ? :index : params.delete(:asset)
     redirect_to params
   end
-  # view the summary of one category
-  def category_index
-    @results = {}
-    @order = []
-    @names = {}
-    limit = MULTIPLE_SEARCH_LIMIT
-    [
-      [ :people, _('People'), :recent_people ],
-      [ :enterprises, _('Enterprises'), :recent_enterprises ],
-      [ :products, _('Products'), :recent_products ],
-      [ :events, _('Upcoming events'), :upcoming_events ],
-      [ :communities, _('Communities'), :recent_communities ],
-      [ :articles, _('Contents'), :recent_articles ]
-    ].each do |asset, name, filter|
-      @order << asset
-      @results[asset] = @category.send(filter, limit)
-      raise "No total_entries for: #{asset}" unless @results[asset].respond_to?(:total_entries)
-      @names[asset] = name
-    end
-  end
-
   def tags
     @tags_cache_key = "tags_env_#{environment.id.to_s}"
     if is_cache_expired?(@tags_cache_key)
@@ -173,7 +131,7 @@ class SearchController &lt; PublicController
     @tag = params[:tag]
     @tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_env_#{environment.id.to_s}_page_#{params[:npage]}"
     if is_cache_expired?(@tag_cache_key)
-      @results[@asset] = environment.articles.find_tagged_with(@tag).paginate(paginate_options)
+      @searches[@asset] = {:results => environment.articles.find_tagged_with(@tag).paginate(paginate_options)}
     end
   end
@@ -187,11 +145,9 @@ class SearchController &lt; PublicController
   protected
   def load_query
-    @asset = params[:action].to_sym
+    @asset = (params[:asset] || params[:action]).to_sym
     @order ||= [@asset]
-    @results ||= {}
-    @filter = filter
-    @filter_title = filter_description(@asset, @filter)
+    @searches ||= {}
     @query = params[:query] || ''
     @empty_query = @category.nil? && @query.blank?
@@ -211,42 +167,13 @@ class SearchController &lt; PublicController
     end
   end
-  FILTERS = %w(
-    more_recent
-    more_active
-    more_popular
-    more_comments
-  )
-  def filter
-    if FILTERS.include?(params[:filter])
-      params[:filter]
-    else
-      'more_recent'
-    end
-  end
-
-  def filter_description(asset, filter)
-    {
-      'articles_more_recent' => _('More recent contents from network'),
-      'articles_more_popular' => _('More viewed contents from network'),
-      'articles_more_comments' => _('Most commented contents from network'),
-      'people_more_recent' => _('More recent people from network'),
-      'people_more_active' => _('More active people from network'),
-      'people_more_popular' => _('More popular people from network'),
-      'communities_more_recent' => _('More recent communities from network'),
-      'communities_more_active' => _('More active communities from network'),
-      'communities_more_popular' => _('More popular communities from network'),
-      'products_more_recent' => _('Highlights'),
-    }[asset.to_s + '_' + filter]
-  end
-
   def load_search_assets
-    if Searches.keys.include?(params[:action].to_sym) and environment.enabled?("disable_asset_#{params[:action]}")
+    if SEARCHES.keys.include?(params[:action].to_sym) && environment.enabled?("disable_asset_#{params[:action]}")
       render_not_found
       return
     end
-    @enabled_searches = Searches.select {|key, name| environment.disabled?("disable_asset_#{params[:action]}") }
+    @enabled_searches = SEARCHES.select {|key, name| environment.disabled?("disable_asset_#{key}") }
     @searching = {}
     @titles = {}
     @enabled_searches.each do |key, name|
@@ -256,13 +183,19 @@ class SearchController &lt; PublicController
     @names = @titles if @names.nil?
   end
+  def load_filter
+    @filter = 'more_recent'
+    if SEARCHES.keys.include?(@asset.to_sym)
+      available_filters = asset_class(@asset)::SEARCH_FILTERS
+      @filter = params[:filter] if available_filters.include?(params[:filter])
+    end
+  end
+
   def limit
-    if map_search?
+    if map_search?(@searches)
       MAP_SEARCH_LIMIT
     elsif !multiple_search?
-      if [:people, :communities].include? @asset
-        BLOCKS_SEARCH_LIMIT
-      elsif @asset == :enterprises and @empty_query
+      if [:people, :communities, :enterprises].include? @asset
         BLOCKS_SEARCH_LIMIT
       else
         LIST_SEARCH_LIMIT
@@ -273,41 +206,12 @@ class SearchController &lt; PublicController
   end
   def paginate_options(page = params[:page])
-    page = 1 if multiple_search? or params[:display] == 'map'
+    page = 1 if multiple_search?(@searches) || params[:display] == 'map'
     { :per_page => limit, :page => page }
   end
-  def full_text_search(filters = [], options = {})
-    paginate_options = paginate_options(params[:page])
-    asset_class = asset_class(@asset)
-    solr_options = options
-    pg_options = paginate_options(params[:page])
-
-    if !multiple_search?
-      if !@results_only and asset_class.respond_to? :facets
-        solr_options.merge! asset_class.facets_find_options(params[:facet])
-        solr_options[:all_facets] = true
-      end
-      solr_options[:filter_queries] ||= []
-      solr_options[:filter_queries] += filters
-      solr_options[:filter_queries] << "environment_id:#{environment.id}"
-      solr_options[:filter_queries] << asset_class.facet_category_query.call(@category) if @category
-
-      solr_options[:boost_functions] ||= []
-      params[:order_by] = nil if params[:order_by] == 'none'
-      if params[:order_by]
-        order = SortOptions[@asset][params[:order_by].to_sym]
-        raise "Unknown order by" if order.nil?
-        order[:solr_opts].each do |opt, value|
-          solr_options[opt] = value.is_a?(Proc) ? instance_eval(&value) : value
-        end
-      end
-    end
-
-    ret = asset_class.find_by_contents(@query, paginate_options, solr_options)
-    @results[@asset] = ret[:results]
-    @facets = ret[:facets]
-    @all_facets = ret[:all_facets]
+  def full_text_search
+    @searches[@asset] = find_by_contents(@asset, @scope, @query, paginate_options, {:category => @category, :filter => @filter})
   end
   private
@@ -30,6 +30,12 @@ module ApplicationHelper
   include AccountHelper
+  include BlogHelper
+
+  include ContentViewerHelper
+
+  include LayoutHelper
+
   def locale
     (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   end
@@ -260,14 +266,17 @@ module ApplicationHelper
   end
   def button_bar(options = {}, &block)
-    concat(content_tag('div', capture(&block) + tag('br', :style => 'clear: left;'), { :class => 'button-bar' }.merge(options)))
+    options[:class].nil? ?
+      options[:class]='button-bar' :
+      options[:class]+=' button-bar'
+    concat(content_tag('div', capture(&block) + tag('br', :style => 'clear: left;'), options))
   end
   VIEW_EXTENSIONS = %w[.rhtml .html.erb]
-  def partial_for_class_in_view_path(klass, view_path, suffix = nil)
+  def partial_for_class_in_view_path(klass, view_path, prefix = nil, suffix = nil)
     return nil if klass.nil?
-    name = [klass.name.underscore, suffix].compact.map(&:to_s).join('_')
+    name = [prefix, klass.name.underscore, suffix].compact.map(&:to_s).join('_')
     search_name = String.new(name)
     if search_name.include?("/")
@@ -282,14 +291,14 @@ module ApplicationHelper
       return name if File.exists?(File.join(path))
     end
-    partial_for_class_in_view_path(klass.superclass, view_path, suffix)
+    partial_for_class_in_view_path(klass.superclass, view_path, prefix, suffix)
   end
-  def partial_for_class(klass, suffix=nil)
+  def partial_for_class(klass, prefix=nil, suffix=nil)
     raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
     name = klass.name.underscore
     @controller.view_paths.each do |view_path|
-      partial = partial_for_class_in_view_path(klass, view_path, suffix)
+      partial = partial_for_class_in_view_path(klass, view_path, prefix, suffix)
       return partial if partial
     end
@@ -352,10 +361,6 @@ module ApplicationHelper
     end
   end
-  def theme_stylesheet_path
-    theme_path + '/style.css'
-  end
-
   def current_theme
     @current_theme ||=
       begin
@@ -493,23 +498,24 @@ module ApplicationHelper
   def profile_cat_icons( profile )
     if profile.class == Enterprise
-      icons =
-        profile.product_categories.map{ |c| c.size > 1 ? c[1] : nil }.
-          compact.uniq.map{ |c|
-            cat_name = c.gsub( /[-_\s,.;'"]+/, '_' )
-            cat_icon = "/images/icons-cat/#{cat_name}.png"
-            if ! File.exists? RAILS_ROOT.to_s() + '/public/' + cat_icon
-              cat_icon = '/images/icons-cat/undefined.png'
-            end
-            content_tag 'span',
-                        content_tag( 'span', c ),
-                        :title => c,
-                        :class => 'product-cat-icon cat_icon_' + cat_name,
-                        :style => "background-image:url(#{cat_icon})"
-          }.join "\n"
-      content_tag 'div',
-                  content_tag( 'span', _('Principal Product Categories'), :class => 'header' ) +"\n"+ icons,
-                  :class => 'product-category-icons'
+      icons = profile.product_categories.map{ |c| c.size > 1 ? c[1] : nil }.
+        compact.uniq.map do |c|
+          cat_name = c.gsub( /[-_\s,.;'"]+/, '_' )
+          cat_icon = "/images/icons-cat/#{cat_name}.png"
+          if ! File.exists? RAILS_ROOT.to_s() + '/public/' + cat_icon
+            cat_icon = '/images/icons-cat/undefined.png'
+          end
+          content_tag('span',
+            content_tag( 'span', c ),
+            :title => c,
+            :class => 'product-cat-icon cat_icon_' + cat_name,
+            :style => "background-image:url(#{cat_icon})"
+          )
+        end.join("\n").html_safe
+        content_tag('div',
+          content_tag( 'span', _('Principal Product Categories'), :class => 'header' ) +"\n"+ icons,
+          :class => 'product-category-icons'
+        )
     else
       ''
     end
@@ -633,10 +639,10 @@ module ApplicationHelper
       # FIXME
       ([toplevel] + toplevel.children_for_menu).each do |cat|
         if cat.top_level?
-          result << '<div class="categorie_box">'
+          result << '<div class="categorie_box">'.html_safe
           result << icon_button( :down, _('open'), '#', :onclick => 'open_close_cat(this); return false' )
           result << content_tag('h5', toplevel.name)
-          result << '<div style="display:none"><ul class="categories">'
+          result << '<div style="display:none"><ul class="categories">'.html_safe
         else
           checkbox_id = "#{object_name}_#{cat.full_name.downcase.gsub(/\s+|\//, '_')}"
           result << content_tag('li', labelled_check_box(
@@ -647,7 +653,7 @@ module ApplicationHelper
                     :class => ( object.category_ids.include?(cat.id) ? 'cat_checked' : '' ) ) + "\n"
         end
       end
-      result << '</ul></div></div>'
+      result << '</ul></div></div>'.html_safe
     end
     content_tag('div', result)
@@ -787,10 +793,10 @@ module ApplicationHelper
             :class => 'lineitem' + (line_item+=1).to_s() ) +"\n"
         if line_item == line_size
           line_item = 0
-          html += "<br />\n"
+          html += "<br />\n".html_safe
         end
       }
-      html += "<br />\n"  if line_size == 0 || ( values.size % line_size ) > 0
+      html += "<br />\n".html_safe if line_size == 0 || ( values.size % line_size ) > 0
       column = object.class.columns_hash[method.to_s]
       text =
         ( column ?
@@ -873,14 +879,6 @@ module ApplicationHelper
     content_tag('div', labelled_check_box(_('Public'), 'profile_data[fields_privacy]['+name+']', 'public', profile.public_fields.include?(name)), :class => 'field-privacy-selector')
   end
-  def template_stylesheet_path
-    if profile.nil?
-      "/designs/templates/#{environment.layout_template}/stylesheets/style.css"
-    else
-      "/designs/templates/#{profile.layout_template}/stylesheets/style.css"
-    end
-  end
-
   def login_url
     options = Noosfero.url_options.merge({ :controller => 'account', :action => 'login' })
     url_for(options)
@@ -919,18 +917,6 @@ module ApplicationHelper
     end
   end
-  def icon_theme_stylesheet_path
-    icon_themes = []
-    theme_icon_themes = theme_option(:icon_theme) || []
-    for icon_theme in theme_icon_themes do
-      theme_path = "/designs/icons/#{icon_theme}/style.css"
-      if File.exists?(File.join(RAILS_ROOT, 'public', theme_path))
-        icon_themes << theme_path
-      end
-    end
-    icon_themes
-  end
-
   def page_title
     (@page ? @page.title + ' - ' : '') +
     (profile ? profile.short_name + ' - ' : '') +
@@ -942,42 +928,13 @@ module ApplicationHelper
     (@category ? " - #{@category.full_name}" : '')
   end
-  def noosfero_javascript
-    render :file =>  'layouts/_javascript'
-  end
-
-  def noosfero_stylesheets
-    [
-      'application',
-      'search',
-      'thickbox',
-      'lightbox',
-      'colorpicker',
-      'colorbox',
-      pngfix_stylesheet_path,
-    ] +
-    tokeninput_stylesheets
-  end
-
   # DEPRECATED. Do not use this·
   def import_controller_stylesheets(options = {})
     stylesheet_import( "controller_"+ @controller.controller_name(), options )
   end
-  def pngfix_stylesheet_path
-    'iepngfix/iepngfix.css'
-  end
-
-  def tokeninput_stylesheets
-    ['token-input', 'token-input-facebook', 'token-input-mac', 'token-input-facet']
-  end
-
-  def noosfero_layout_features
-    render :file => 'shared/noosfero_layout_features'
-  end
-
   def link_to_email(email)
-    javascript_tag('var array = ' + email.split('@').to_json + '; document.write("<a href=\'mailto:" + array.join("@") + "\'>" + array.join("@") +  "</a>")')
+    javascript_tag('var array = ' + email.split('@').to_json + '; document.write("<a href=\'mailto:" + array.join("@") + "\'>" + array.join("@") +  "</a>")'.html_safe)
   end
   def stylesheet(*args)
@@ -987,13 +944,43 @@ module ApplicationHelper
   def article_to_html(article, options = {})
     options.merge!(:page => params[:npage])
     content = article.to_html(options)
-    content = content.kind_of?(Proc) ? self.instance_eval(&content) : content
+    content = content.kind_of?(Proc) ? self.instance_eval(&content).html_safe : content.html_safe
     @plugins && @plugins.each do |plugin|
       content = plugin.parse_content(content)
     end
     content
   end
+  # Please, use link_to by default!
+  # This method was created to work around to inexplicable
+  # chain of problems when display_short_format was called
+  # from Article model for an ArticleBlock.
+  def reference_to_article(text, article, anchor=nil)
+    if article.profile.domains.empty?
+      href = "/#{article.url[:profile]}/"
+    else
+      href = "http://#{article.profile.domains.first.name}/"
+    end
+    href += article.url[:page].join('/')
+    href += '#' + anchor if anchor
+    content_tag('a', text, :href => href)
+  end
+
+  def display_short_format(article, options={})
+    options[:comments_link] ||= true
+    options[:read_more_link] ||= true
+    html = content_tag('div',
+             article.lead +
+             content_tag('div',
+               (options[:comments_link] ? link_to_comments(article) : '') +
+               (options[:read_more_link] ? reference_to_article( _('Read more'), article) : ''),
+               :class => 'read-more'
+             ),
+             :class => 'short-post'
+           )
+    html
+  end
+
   def colorpicker_field(object_name, method, options = {})
     text_field(object_name, method, options.merge(:class => 'colorpicker_field'))
   end
@@ -1003,7 +990,7 @@ module ApplicationHelper
   end
   def ui_icon(icon_class, extra_class = '')
-    "<span class='ui-icon #{icon_class} #{extra_class}' style='float:left; margin-right:7px;'></span>"
+    "<span class='ui-icon #{icon_class} #{extra_class}' style='float:left; margin-right:7px;'></span>".html_safe
   end
   def ui_button(label, url, html_options = {})
@@ -1018,10 +1005,6 @@ module ApplicationHelper
     theme_option(:jquery_theme) || 'smoothness_mod'
   end
-  def jquery_ui_theme_stylesheet_path
-    'jquery.ui/' + jquery_theme + '/jquery-ui-1.8.2.custom'
-  end
-
   def ui_error(message)
     content_tag('div', ui_icon('ui-icon-alert') + message, :class => 'alert fg-state-error ui-state-error')
   end
@@ -1035,13 +1018,13 @@ module ApplicationHelper
   end
   def collapsed_item_icon
-    "<span class='ui-icon ui-icon-circlesmall-plus' style='float:left;'></span>"
+    "<span class='ui-icon ui-icon-circlesmall-plus' style='float:left;'></span>".html_safe
   end
   def expanded_item_icon
-    "<span class='ui-icon ui-icon-circlesmall-minus' style='float:left;'></span>"
+    "<span class='ui-icon ui-icon-circlesmall-minus' style='float:left;'></span>".html_safe
   end
   def leaf_item_icon
-    "<span class='ui-icon ui-icon-arrow-1-e' style='float:left;'></span>"
+    "<span class='ui-icon ui-icon-arrow-1-e' style='float:left;'></span>".html_safe
   end
   def display_category_menu(block, categories, root = true)
@@ -1300,9 +1283,7 @@ module ApplicationHelper
     titles = tabs.inject(''){ |result, tab| result << content_tag(:li, link_to(tab[:title], '#'+tab[:id]), :class => 'tab') }
     contents = tabs.inject(''){ |result, tab| result << content_tag(:div, tab[:content], :id => tab[:id]) }
-    content_tag :div, :class => 'ui-tabs' do
-      content_tag(:ul, titles) + contents
-    end
+    content_tag(:div, content_tag(:ul, titles) + raw(contents), :class => 'ui-tabs')
   end
   def jquery_token_input_messages_json(hintText = _('Type in an keyword'), noResultsText = _('No results'), searchingText = _('Searching...'))
@@ -1331,11 +1312,12 @@ module ApplicationHelper
   end
   def template_options(klass, field_name)
-    return '' if klass.templates.count == 0
-    return hidden_field_tag("#{field_name}[template_id]", klass.templates.first.id) if klass.templates.count == 1
+    templates = klass.templates(environment)
+    return '' if templates.count == 0
+    return hidden_field_tag("#{field_name}[template_id]", templates.first.id) if templates.count == 1
     counter = 0
-    radios = klass.templates.map do |template|
+    radios = templates.map do |template|
       counter += 1
       content_tag('li', labelled_radio_button(link_to(template.name, template.url, :target => '_blank'), "#{field_name}[template_id]", template.id, counter==1))
     end.join("\n")
@@ -1425,4 +1407,14 @@ module ApplicationHelper
     @no_design_blocks = true
   end
+  def default_folder_for_image_upload(profile)
+    default_folder = profile.folders.find_by_type('Gallery')
+    default_folder = profile.folders.find_by_type('Folder') if default_folder.nil?
+    default_folder
+  end
+
+  def content_id_to_str(content)
+    content.nil? ? '' : content.id.to_s
+  end
+
 end
@@ -3,7 +3,24 @@ module BlockHelper
   def block_title(title)
     tag_class = 'block-title'
     tag_class += ' empty' if title.empty?
-    content_tag 'h3', content_tag('span', title), :class => tag_class
+    content_tag 'h3', content_tag('span', h(title)), :class => tag_class
+  end
+
+  def highlights_block_config_image_fields(block, image={})
+    "
+    <tr class=\"image-data-line\">
+      <td>
+        #{select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i).html_safe}
+      </td>
+      <td>#{text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 20}</td>
+      <td>#{text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 1}</td>
+    </tr><tr class=\"image-title\">
+      <td colspan=\"3\"><label>#{
+        content_tag('span', _('Title')) +
+        text_field_tag('block[images][][title]', image[:title], :class => 'highlight-title', :size => 45)
+      }</label></td>
+    </tr>
+    "
   end
 end
@@ -18,8 +18,9 @@ module BlogHelper
     pagination = will_paginate(articles, {
       :param_name => 'npage',
       :previous_label => _('&laquo; Newer posts'),
-      :next_label => _('Older posts &raquo;')
-    })
+      :next_label => _('Older posts &raquo;'),
+      :params => {:action=>"view_page", :page=>articles.first.parent.path.split('/'), :controller=>"content_viewer"}
+    }) if articles.present?
     content = []
     artic_len = articles.length
     articles.each_with_index{ |art,i|
@@ -31,7 +32,7 @@ module BlogHelper
       css_add << position + '-inner'
       content << content_tag('div',
                              content_tag('div',
-                                         display_post(art, format) + '<br style="clear:both"/>',
+                                         display_post(art, format).html_safe + '<br style="clear:both"/>'.html_safe,
                                          :class => 'blog-post ' + css_add.join(' '),
                                          :id => "post-#{art.id}"), :class => position
                             )
@@ -46,18 +47,6 @@ module BlogHelper
     article_title(article, :no_comments => no_comments) + html
   end
-  def display_short_format(article)
-    html = content_tag('div',
-             article.lead +
-             content_tag('div',
-               link_to_comments(article) +
-               link_to( _('Read more'), article.url),
-               :class => 'read-more'),
-             :class => 'short-post'
-           )
-    html
-  end
-
   def display_full_format(article)
     html = article_to_html(article)
     html = content_tag('p', html) if ! html.include?('</p>')
@@ -21,7 +21,7 @@ module CatalogHelper
   def category_sub_links(category)
     sub_categories = []
-    category.children.each do |sub_category|
+    category.children.order(:name).each do |sub_category|
       sub_categories << category_link(sub_category, true)
     end
     content_tag('ul', sub_categories) if sub_categories.size > 1
@@ -39,7 +39,7 @@ module ContentViewerHelper
   def link_to_comments(article, args = {})
     return '' unless article.accept_comments?
-    link_to(number_of_comments(article), article.url.merge(:anchor => 'comments_list') )
+    reference_to_article number_of_comments(article), article, 'comments_list'
   end
   def article_translations(article)
@@ -48,7 +48,7 @@ module ContentViewerHelper
         { article.environment.locales[translation.language] => { :href => url_for(translation.url) } }
       end
       content_tag(:div, link_to(_('Translations'), '#',
-                                :onclick => "toggleSubmenu(this, '#{_('Translations')}', #{links.to_json}); return false",
+                                :onmouseover => "toggleSubmenu(this, '#{_('Translations')}', #{links.to_json}); return false",
                                 :class => 'article-translations-menu simplemenu-trigger up'),
                   :class => 'article-translations')
     end
@@ -23,11 +23,13 @@ module DatesHelper
   end
   # formats a date for displaying.
-  def show_date(date, use_numbers = false)
+  def show_date(date, use_numbers = false, year=true)
     if date && use_numbers
-      _('%{month}/%{day}/%{year}') % { :day => date.day, :month => date.month, :year => date.year }
+      date_format = year ? _('%{month}/%{day}/%{year}') : _('%{month}/%{day}')
+      date_format % { :day => date.day, :month => date.month, :year => date.year }
     elsif date
-      _('%{month} %{day}, %{year}') % { :day => date.day, :month => month_name(date.month), :year => date.year }
+      date_format = year ? _('%{month_name} %{day}, %{year}') : _('%{month_name} %{day}')
+      date_format % { :day => date.day, :month_name => month_name(date.month), :year => date.year }
     else
       ''
     end
@@ -46,7 +48,27 @@ module DatesHelper
     if (date1 == date2) || (date2.nil?)
       show_date(date1, use_numbers)
     else
-      _('from %{date1} to %{date2}') % {:date1 => show_date(date1, use_numbers), :date2 => show_date(date2, use_numbers)}
+      if date1.year == date2.year
+        if date1.month == date2.month
+          _('from %{month} %{day1} to %{day2}, %{year}') % {
+            :day1 => date1.day,
+            :day2 => date2.day,
+            :month => use_numbers ? date1.month : month_name(date1.month),
+            :year => date1.year
+          }
+        else
+          _('from %{date1} to %{date2}, %{year}') % {
+            :date1 => show_date(date1, use_numbers, false),
+            :date2 => show_date(date2, use_numbers, false),
+            :year => date1.year
+          }
+        end
+      else
+        _('from %{date1} to %{date2}') % {
+          :date1 => show_date(date1, use_numbers),
+          :date2 => show_date(date2, use_numbers)
+        }
+      end
     end
   end
@@ -142,38 +142,6 @@ module FormsHelper
     content_tag('table',rows.join("\n"))
   end
-  def select_folder(label_text, field_id, collection, default_value=nil, html_options = {}, js_options = {})
-    root = profile ? profile.identifier : _("root")
-    labelled_form_field(
-      label_text,
-      select_tag(
-        field_id,
-        options_for_select(
-          [[root, '']] +
-          collection.collect {|f| [ root + '/' +  f.full_name, f.id ] },
-          default_value
-        ),
-        html_options.merge(js_options)
-      )
-    )
-  end
-
-  def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {})
-    result = labelled_form_field(
-      label_text,
-      select_tag(
-        field_id,
-        options_for_select(
-          [[profile.identifier, '']] +
-          profile.folders.collect {|f| [ profile.identifier + '/' +  f.full_name, f.id ] },
-          default_value
-        ),
-        html_options.merge(js_options)
-      )
-    )
-    return result
-  end
-
   def date_field(name, value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
     datepicker_options[:disabled] ||= false
     datepicker_options[:alt_field] ||= ''
@@ -276,7 +244,7 @@ module FormsHelper
         yearSuffix: #{datepicker_options[:year_suffix].to_json}
       })
     </script>
-    "
+    ".html_safe
     result
   end
@@ -295,23 +263,28 @@ module FormsHelper
         field_id,
         options_for_select(
           [[root, '']] +
-          collection.collect {|f| [ root + '/' +  f.full_name, f.id ] },
-          default_value
+          collection.collect {|f| [ root + '/' +  f.full_name, f.id.to_s ] },
+          default_value.to_s
         ),
         html_options.merge(js_options)
       )
     )
   end
-  def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {})
+  def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {}, find_options = {})
+    if find_options.empty?
+      folders = profile.folders
+    else
+      folders = profile.folders.where(find_options)
+    end
     result = labelled_form_field(
       label_text,
       select_tag(
         field_id,
         options_for_select(
           [[profile.identifier, '']] +
-          profile.folders.collect {|f| [ profile.identifier + '/' +  f.full_name, f.id ] },
-          default_value
+          folders.collect {|f| [ profile.identifier + '/' +  f.full_name, f.id.to_s ] },
+          default_value.to_s
         ),
         html_options.merge(js_options)
       )
@@ -0,0 +1,94 @@
+module LayoutHelper
+
+  def body_classes
+    # Identify the current controller and action for the CSS:
+    " controller-#{@controller.controller_name}" +
+    " action-#{@controller.controller_name}-#{@controller.action_name}" +
+    " template-#{profile.nil? ? "default" : profile.layout_template}" +
+    (!profile.nil? && profile.is_on_homepage?(request.path,@page) ? " profile-homepage" : "")
+  end
+
+  def noosfero_javascript
+    plugins_javascripts = @plugins.map { |plugin| plugin.js_files.map { |js| plugin.class.public_path(js) } }.flatten
+
+    output = ''
+    output += render :file =>  'layouts/_javascript'
+    output += javascript_tag 'render_all_jquery_ui_widgets()'
+    unless plugins_javascripts.empty?
+      output += javascript_include_tag plugins_javascripts, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_javascripts.to_s}"
+    end
+    output
+  end
+
+  def noosfero_stylesheets
+    standard_stylesheets = [
+      'application',
+      'search',
+      'thickbox',
+      'lightbox',
+      'colorpicker',
+      'colorbox',
+      pngfix_stylesheet_path,
+    ] + tokeninput_stylesheets
+    plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
+
+    output = ''
+    output += stylesheet_link_tag standard_stylesheets, :cache => 'cache'
+    output += stylesheet_link_tag template_stylesheet_path
+    output += stylesheet_link_tag icon_theme_stylesheet_path
+    output += stylesheet_link_tag jquery_ui_theme_stylesheet_path
+    unless plugins_stylesheets.empty?
+      output += stylesheet_link_tag plugins_stylesheets, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_stylesheets.to_s}"
+    end
+    output += stylesheet_link_tag theme_stylesheet_path
+    output
+  end
+
+  def pngfix_stylesheet_path
+    'iepngfix/iepngfix.css'
+  end
+
+  def tokeninput_stylesheets
+    ['token-input', 'token-input-facebook', 'token-input-mac', 'token-input-facet']
+  end
+
+  def noosfero_layout_features
+    render :file => 'shared/noosfero_layout_features'
+  end
+
+  def template_stylesheet_path
+    if profile.nil?
+      "/designs/templates/#{environment.layout_template}/stylesheets/style.css"
+    else
+      "/designs/templates/#{profile.layout_template}/stylesheets/style.css"
+    end
+  end
+
+  def icon_theme_stylesheet_path
+    icon_themes = []
+    theme_icon_themes = theme_option(:icon_theme) || []
+    for icon_theme in theme_icon_themes do
+      theme_path = "/designs/icons/#{icon_theme}/style.css"
+      if File.exists?(File.join(RAILS_ROOT, 'public', theme_path))
+        icon_themes << theme_path
+      end
+    end
+    icon_themes
+  end
+
+  def jquery_ui_theme_stylesheet_path
+    'jquery.ui/' + jquery_theme + '/jquery-ui-1.8.2.custom'
+  end
+
+  def theme_stylesheet_path
+    theme_path + '/style.css'
+  end
+
+  def addthis_javascript
+    if NOOSFERO_CONF['addthis_enabled']
+      '<script src="http://s7.addthis.com/js/152/addthis_widget.js"></script>'
+    end
+  end
+
+end
+
@@ -136,7 +136,7 @@ module ProfileEditorHelper
     concat(
       content_tag(
         'div',
-        capture(&block) + '<br style="clear:left;"/>&nbsp;',
+        capture(&block) + content_tag('br', '', :style => 'clear: left'),
         :class => 'control-panel')
     )
   end
@@ -2,12 +2,10 @@ module SearchHelper
   MAP_SEARCH_LIMIT = 2000
   LIST_SEARCH_LIMIT = 20
-  BLOCKS_SEARCH_LIMIT = 18
+  BLOCKS_SEARCH_LIMIT = 24
   MULTIPLE_SEARCH_LIMIT = 8
-  DistFilt = 200
-  DistBoost = 50
-  Searches = ActiveSupport::OrderedHash[
+  SEARCHES = ActiveSupport::OrderedHash[
     :articles, _('Contents'),
     :enterprises, _('Enterprises'),
     :people, _('People'),
@@ -16,46 +14,31 @@ module SearchHelper
     :events, _('Events'),
   ]
-  SortOptions = {
-    :products => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
-      :more_recent, {:label => _('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
-      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
-      :closest, {:label => _('Closest to me'), :if => proc{ logged_in? && (profile=current_user.person).lat && profile.lng },
-        :solr_opts => {:sort => "geodist() asc",
-          :latitude => proc{ current_user.person.lat }, :longitude => proc{ current_user.person.lng }}},
-    ],
-    :events => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
-      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
-    ],
-    :articles => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
-      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
-      :more_recent, {:label => _('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
-    ],
-    :enterprises => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
-      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
-    ],
-    :people => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
-      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
-    ],
-    :communities => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
-      :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
-    ],
+  FILTER_TRANSLATION = {
+    'more_popular' => _('More popular'),
+    'more_active' => _('More active'),
+    'more_recent' => _('More recent'),
+    'more_comments' => _('More comments')
   }
   # FIXME remove it after search_controler refactored
   include EventsHelper
-  def multiple_search?
-    ['index', 'category_index'].include?(params[:action]) or @results.size > 1
+  def multiple_search?(searches=nil)
+    ['index', 'category_index'].include?(params[:action]) || (searches && searches.size > 1)
   end
-  def map_search?
-    !@empty_query and !multiple_search? and params[:display] == 'map'
+  def map_search?(searches=nil)
+    !multiple_search?(searches) && params[:display] == 'map'
+  end
+
+  def asset_class(asset)
+    asset.to_s.singularize.camelize.constantize
   end
   def search_page_title(title, category = nil)
     title = "<h1>" + title
-    title += '<small>' + category.name + '</small>' if category
+    title += ' - <small>' + category.name + '</small>' if category
     title + "</h1>"
   end
@@ -66,8 +49,12 @@ module SearchHelper
       :align => 'center', :class => 'search-category-context') if category
   end
-  def display_results(map_capable = false)
-    if map_capable and map_search?
+  def display?(asset, mode)
+    defined?(asset_class(asset)::SEARCH_DISPLAYS) && asset_class(asset)::SEARCH_DISPLAYS.include?(mode.to_s)
+  end
+
+  def display_results(searches=nil, asset=nil)
+    if display?(asset, :map) && map_search?(searches)
       partial = 'google_maps'
       klass = 'map'
     else
@@ -78,10 +65,13 @@ module SearchHelper
     content_tag('div', render(:partial => partial), :class => "map-or-list-search-results #{klass}")
   end
-  def display_map_list_button
-    button(:search, params[:display] == 'map' ? _('Display in list') : _('Display in map'),
-           params.merge(:display => (params[:display] == 'map' ? 'list' : 'map')),
-           :class => "map-toggle-button" )
+  def display_filter(asset, display)
+    asset = :articles if asset == :tag
+    if display?(asset, display)
+      display
+    else
+      asset_class(asset).default_search_display
+    end
   end
   def city_with_state(city)
@@ -97,120 +87,50 @@ module SearchHelper
     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 facet_javascript(input_id, facet, array)
-    array = [] if array.nil?
-    hintText = _('Type in an option')
-    text_field_tag('facet['+input_id+']', '', :id => input_id) +
-      javascript_tag("jQuery.TokenList(jQuery('##{input_id}'), #{array.to_json},
-        {searchDelay: 0, permanentDropdown: true, theme: 'facet', dontAdd: true, preventDuplicates: true,
-        #{jquery_token_input_messages_json(hintText)}});")
-  end
-
-  def facet_link_html(facet, params, value, label, count)
-    params = params ? params.dup : {}
-    has_extra = label.kind_of?(Array)
-    link_label = has_extra ? label[0] : label
-    id = facet[:solr_field].to_s
-    params[:facet] ||= {}
-    params[:facet][id] ||= {}
-    params[:page] = {} if params[:page]
-
-    selected = facet[:label_id].nil? ? params[:facet][id] == value : params[:facet][id][facet[:label_id]].to_a.include?(value)
-
-    if count > 0
-      url = params.merge(:facet => params[:facet].merge(
-        id => facet[:label_id].nil? ? value : params[:facet][id].merge( facet[:label_id] => params[:facet][id][facet[:label_id]].to_a | [value] )
-      ))
-    else
-      # preserve others filters and change this filter
-      url = params.merge(:facet => params[:facet].merge(
-        id => facet[:label_id].nil? ? value : { facet[:label_id] => value }
-      ))
+  def display_selector(asset, display, float = 'right')
+    display = nil if display.blank?
+    display ||= asset_class(asset).default_search_display
+    if [display?(asset, :map), display?(asset, :compact), display?(asset, :full)].select {|option| option}.count > 1
+      compact_link = display?(asset, :compact) ? (display == 'compact' ? _('Compact') : link_to(_('Compact'), params.merge(:display => 'compact'))) : nil
+      map_link = display?(asset, :map) ? (display == 'map' ? _('Map') : link_to(_('Map'), params.merge(:display => 'map'))) : nil
+      full_link = display?(asset, :full) ? (display == 'full' ? _('Full') : link_to(_('Full'), params.merge(:display => 'full'))) : nil
+      content_tag('div', 
+        content_tag('strong', _('Display')) + ': ' + [compact_link, map_link, full_link].compact.join(' | ').html_safe,
+        :class => 'search-customize-options'
+      )
     end
-
-    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 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)
-      next unless facet
-      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
+  def filter_selector(asset, filter, float = 'right')
+    klass = asset_class(asset)
+    if klass::SEARCH_FILTERS.count > 1
+      options = options_for_select(klass::SEARCH_FILTERS.map {|f| [FILTER_TRANSLATION[f], f]}, filter)
+      url_params = url_for(params.merge(:filter => 'FILTER'))
+      onchange = "document.location.href = '#{url_params}'.replace('FILTER', this.value)"
+      select_field = select_tag(:filter, options, :onchange => onchange)
+      content_tag('div',
+        content_tag('strong', _('Filter')) + ': ' + select_field,
+        :class => "search-customize-options"
+      )
     end
-
-    ret.map do |label, name, url|
-      content_tag('div', content_tag('span', label, :class => 'facet-selected-label') +
-        content_tag('span', name, :class => 'facet-selected-name') +
-        link_to('', url, :class => 'facet-selected-remove', :title => 'remove facet'), :class => 'facet-selected')
-    end.join
-  end
-
-  def order_by(asset)
-    options = SortOptions[asset].map do |name, options|
-      next if options[:if] and ! instance_eval(&options[:if])
-      [_(options[:label]), name.to_s]
-    end.compact
-
-    content_tag('div', _('Sort results by ') +
-      select_tag(asset.to_s + '[order]', options_for_select(options, params[:order_by] || 'none'),
-        {:onchange => "window.location = jQuery.param.querystring(window.location.href, { 'order_by' : this.options[this.selectedIndex].value})"}),
-      :class => "search-ordering")
-  end
-
-  def label_total_found(asset, total_found)
-    labels = {
-      :products => _("%s products offers found"),
-      :articles => _("%s articles found"),
-      :events => _("%s events found"),
-      :people => _("%s people found"),
-      :enterprises => _("%s enterprises found"),
-      :communities => _("%s communities found"),
-    }
-    content_tag('span', labels[asset] % total_found,
-      :class => "total-pages-found") if labels[asset]
-  end
-
-  def asset_class(asset)
-    asset.to_s.singularize.camelize.constantize
   end
-  def asset_table(asset)
-    asset_class(asset).table_name
+  def filter_title(asset, filter)
+    {
+      'articles_more_recent' => _('More recent contents from network'),
+      'articles_more_popular' => _('More viewed contents from network'),
+      'articles_more_comments' => _('Most commented contents from network'),
+      'people_more_recent' => _('More recent people from network'),
+      'people_more_active' => _('More active people from network'),
+      'people_more_popular' => _('More popular people from network'),
+      'communities_more_recent' => _('More recent communities from network'),
+      'communities_more_active' => _('More active communities from network'),
+      'communities_more_popular' => _('More popular communities from network'),
+      'enterprises_more_recent' => _('More recent enterprises from network'),
+      'enterprises_more_active' => _('More active enterprises from network'),
+      'enterprises_more_popular' => _('More popular enterprises from network'),
+      'products_more_recent' => _('Highlights'),
+    }[asset.to_s + '_' + filter].to_s
   end
 end
@@ -29,10 +29,8 @@ module TagsHelper
   # (pt_BR only).
   def tag_cloud(tags, tagname_option, url, options = {})
-    return content_tag('em', _('No tags yet.')) +
-           ' <a href="' + _('http://en.wikipedia.org/wiki/Tag_%28metadata%29') +
-           '" target="wptags"><span>(' +
-           _('What are tags?') + ')</span></a>' if tags.empty?
+    return content_tag('em', _('No tags yet.') + ' ') +
+      link_to(content_tag(:span, _('What are tags?')),_('http://en.wikipedia.org/wiki/Tag_%28metadata%29')) if tags.empty?
     max_size = options[:max_size] || Cloud::MAX_SIZE
     min_size = options[:min_size] || Cloud::MIN_SIZE
@@ -68,7 +66,7 @@ module TagsHelper
           :title => n_( 'one item', '%d items', count ) % count
       end
-    end.join("\n")
+    end.join("\n").html_safe
   end
 end
@@ -43,7 +43,7 @@ class ApproveComment &lt; Task
   def information
     if article
-      {:message => _('%{requestor} commented on the the article: %{linked_subject}.')  % {:requestor => requestor_name} }
+      {:message => _('%{requestor} commented on the the article: %{linked_subject}.')  % {:requestor => requestor_name, :linked_subject => linked_subject} }
     else
       {:message => _("The article was removed.")}
     end
@@ -2,7 +2,28 @@ require &#39;hpricot&#39;
 class Article < ActiveRecord::Base
-include ActionController::UrlWriter
+  SEARCHABLE_FIELDS = {
+    :name => 10,
+    :abstract => 3,
+    :body => 2,
+    :slug => 1,
+    :filename => 1,
+  }
+
+  SEARCH_FILTERS = %w[
+    more_recent
+    more_popular
+    more_comments
+  ]
+
+  SEARCH_DISPLAYS = %w[full]
+
+  def self.default_search_display
+    'full'
+  end
+
+  #FIXME This is necessary because html is being generated on the model...
+  include ActionView::Helpers::TagHelper
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
@@ -147,7 +168,6 @@ include ActionController::UrlWriter
     else
       ArticleCategorization.add_category_to_article(c, self)
       self.categories(reload)
-      self.solr_save
     end
   end
@@ -165,7 +185,6 @@ include ActionController::UrlWriter
       ArticleCategorization.add_category_to_article(item, self)
     end
     self.categories(true)
-    self.solr_save
     pending_categorizations.clear
   end
@@ -201,20 +220,12 @@ include ActionController::UrlWriter
   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'
   named_scope :relevant_as_recent, :conditions => ["(articles.type != 'UploadedFile' and articles.type != 'RssFeed' and articles.type != 'Blog') OR articles.type is NULL"]
   def self.recent(limit = nil, extra_conditions = {}, pagination = true)
@@ -239,8 +250,13 @@ include ActionController::UrlWriter
   # The implementation in this class just provides the +body+ attribute as the
   # HTML.  Other article types can override this method to provide customized
   # views of themselves.
+  # (To override short format representation, override the lead method)
   def to_html(options = {})
-    body || ''
+    if options[:format] == 'short'
+      display_short_format(self)
+    else
+      body || ''
+    end
   end
   include ApplicationHelper
@@ -429,8 +445,8 @@ include ActionController::UrlWriter
   named_scope :images, :conditions => { :is_image => true }
   named_scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
+  named_scope :more_popular, :order => 'hits DESC'
   named_scope :more_comments, :order => "comments_count DESC"
-  named_scope :more_views, :order => "hits DESC"
   named_scope :more_recent, :order => "created_at DESC"
   def self.display_filter(user, profile)
@@ -596,7 +612,7 @@ include ActionController::UrlWriter
   end
   def lead
-    abstract.blank? ? first_paragraph : abstract
+    abstract.blank? ? first_paragraph.html_safe : abstract.html_safe
   end
   def short_lead
@@ -627,7 +643,7 @@ include ActionController::UrlWriter
   end
-  def more_views_label
+  def more_popular_label
     amount = self.hits
     {
       0 => _('no views'),
@@ -655,98 +671,7 @@ include ActionController::UrlWriter
     img.nil? ? '' : img.attributes['src']
   end
-  private
-
-  # FIXME: workaround for development env.
-  # Subclasses aren't (re)loaded, and acts_as_solr
-  # depends on subclasses method to search
-  # see http://stackoverflow.com/questions/4138957/activerecordsubclassnotfound-error-when-using-sti-in-rails/4139245
-  UploadedFile
-  TextArticle
-  TinyMceArticle
-  TextileArticle
-  Folder
-  EnterpriseHomepage
-  Gallery
-  Blog
-  Forum
-  Event
-
-  def self.f_type_proc(klass)
-    klass.constantize.type_name
-  end
-
-  def self.f_profile_type_proc(klass)
-    klass.constantize.type_name
-  end
-
-  def f_type
-    #join common types
-    case self.class.name
-    when 'TinyMceArticle', 'TextileArticle'
-      TextArticle.name
-    else
-      self.class.name
-    end
-  end
-
-  def f_profile_type
-    self.profile.class.name
-  end
-
-  def f_published_at
-    self.published_at
-  end
-
-  def f_category
-    self.categories.collect(&:name)
-  end
-
   delegate :region, :region_id, :environment, :environment_id, :to => :profile, :allow_nil => true
-  def name_sortable # give a different name for solr
-    name
-  end
-
-  def public
-    self.public?
-  end
-
-  def category_filter
-    categories_including_virtual_ids
-  end
-
-  public
-
-  acts_as_faceted :fields => {
-      :f_type => {:label => _('Type'), :proc => proc{|klass| f_type_proc(klass)}},
-      :f_published_at => {:type => :date, :label => _('Published date'), :queries => {'[* TO NOW-1YEARS/DAY]' => _("Older than one year"),
-        '[NOW-1YEARS TO NOW/DAY]' => _("In the last year"), '[NOW-1MONTHS TO NOW/DAY]' => _("In the last month"), '[NOW-7DAYS TO NOW/DAY]' => _("In the last week"), '[NOW-1DAYS TO NOW/DAY]' => _("In the last day")},
-        :queries_order => ['[NOW-1DAYS TO NOW/DAY]', '[NOW-7DAYS TO NOW/DAY]', '[NOW-1MONTHS TO NOW/DAY]', '[NOW-1YEARS TO NOW/DAY]', '[* TO NOW-1YEARS/DAY]']},
-      :f_profile_type => {:label => _('Profile'), :proc => proc{|klass| f_profile_type_proc(klass)}},
-      :f_category => {:label => _('Categories')},
-    }, :category_query => proc { |c| "category_filter:\"#{c.id}\"" },
-    :order => [:f_type, :f_published_at, :f_profile_type, :f_category]
-
-  acts_as_searchable :fields => facets_fields_for_solr + [
-      # searched fields
-      {:name => {:type => :text, :boost => 2.0}},
-      {:slug => :text}, {:body => :text},
-      {:abstract => :text}, {:filename => :text},
-      # filtered fields
-      {:public => :boolean}, {:environment_id => :integer},
-      {:profile_id => :integer}, :language,
-      {:category_filter => :integer},
-      # ordered/query-boosted fields
-      {:name_sortable => :string}, :last_changed_by_id, :published_at, :is_image,
-      :updated_at, :created_at,
-    ], :include => [
-      {:profile => {:fields => [:name, :identifier, :address, :nickname, :region_id, :lat, :lng]}},
-      {:comments => {:fields => [:title, :body, :author_name, :author_email]}},
-      {:categories => {:fields => [:name, :path, :slug, :lat, :lng, :acronym, :abbreviation]}},
-    ], :facets => facets_option_for_solr,
-    :boost => proc { |a| 10 if a.profile && a.profile.enabled },
-    :if => proc{ |a| ! ['RssFeed'].include?(a.class.name) }
-  handle_asynchronously :solr_save
   private
@@ -12,7 +12,11 @@ class ArticleBlock &lt; Block
     block = self
     lambda do
       block_title(block.title) +
-      (block.article ? article_to_html(block.article, :gallery_view => false) : _('Article not selected yet.'))
+      (block.article ? article_to_html(block.article,
+          :gallery_view => false,
+          :inside_block => block,               # For Blogs and folders
+          :format => block.visualization_format # For Articles and contents
+        ).html_safe : _('Article not selected yet.'))
     end
   end
@@ -49,4 +53,14 @@ class ArticleBlock &lt; Block
     self.box.owner.kind_of?(Environment) ? self.box.owner.portal_community.articles : self.box.owner.articles
   end
+  def posts_per_page
+    self.settings[:posts_per_page] or 1
+  end
+
+  def posts_per_page= value
+    value = value.to_i
+    self.settings[:posts_per_page] = value if value > 0
+  end
+
+  settings_items :visualization_format, :type => :string, :default => 'short'
 end
@@ -24,8 +24,9 @@ class Blog &lt; Folder
   # FIXME isn't this too much including just to be able to generate some HTML?
   include ActionView::Helpers::TagHelper
   def to_html(options = {})
+    me = self
     lambda do
-      render :file => 'content_viewer/blog_page'
+      render :file => 'content_viewer/blog_page', :locals => { :blog=>me, :inside_block=>options[:inside_block] }
     end
   end
 class Category < ActiveRecord::Base
+  SEARCHABLE_FIELDS = {
+    :name => 10,
+    :acronym => 5,
+    :abbreviation => 5,
+    :slug => 1,
+  }
+
   validates_exclusion_of :slug, :in => [ 'index' ], :message => N_('%{fn} cannot be like that.').fix_i18n
   validates_presence_of :name, :environment_id
   validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('%{fn} is already being used by another category.').fix_i18n
@@ -100,23 +107,4 @@ class Category &lt; ActiveRecord::Base
     self.children.find(:all, :conditions => {:display_in_menu => true}).empty?
   end
-  private
-  def name_sortable # give a different name for solr
-    name
-  end
-  public
-
-  acts_as_searchable :fields => [
-    # searched fields
-    {:name => {:type => :text, :boost => 2.0}},
-    {:path => :text}, {:slug => :text},
-    {:abbreviation => :text}, {:acronym => :text},
-    # filtered fields
-    :parent_id,
-    # ordered/query-boosted fields
-    {:name_sortable => :string},
-  ]
-  after_save_reindex [:articles, :profiles], :with => :delayed_job
-  handle_asynchronously :solr_save
-
 end
 class Certifier < ActiveRecord::Base
+  SEARCHABLE_FIELDS = {
+    :name => 10,
+    :description => 3,
+    :link => 1,
+  }
+
   belongs_to :environment
   has_many :qualifier_certifiers, :dependent => :destroy
@@ -24,6 +30,4 @@ class Certifier &lt; ActiveRecord::Base
     self.name.downcase.transliterate <=> b.name.downcase.transliterate
   end
-  after_save_reindex [:products], :with => :delayed_job
-
 end
 class Comment < ActiveRecord::Base
+  SEARCHABLE_FIELDS = {
+    :title => 10,
+    :name => 4,
+    :body => 2,
+  }
+
   validates_presence_of :body
   belongs_to :source, :counter_cache => true, :polymorphic => true
@@ -85,12 +91,6 @@ class Comment &lt; ActiveRecord::Base
     self.article.profile.notification_emails - [self.author_email || self.email]
   end
-  after_save :notify_article
-  after_destroy :notify_article
-  def notify_article
-    article.comments_updated if article.kind_of?(Article)
-  end
-
   after_create :new_follower
   def new_follower
     if source.kind_of?(Article)
@@ -2,6 +2,8 @@
 # only enterprises can offer products and services.
 class Enterprise < Organization
+  SEARCH_DISPLAYS += %w[map full]
+
   def self.type_name
     _('Enterprise')
   end
@@ -14,8 +16,6 @@ class Enterprise &lt; Organization
   has_and_belongs_to_many :fans, :class_name => 'Person', :join_table => 'favorite_enteprises_people'
-  after_save_reindex [:products], :with => :delayed_job
-  extra_data_for_index :product_categories
   def product_categories
     products.includes(:product_category).map{|p| p.category_full_name}.compact
   end
@@ -182,7 +182,15 @@ class Enterprise &lt; Organization
   end
   def activities
-    Scrap.find_by_sql("SELECT id, updated_at, 'Scrap' AS klass FROM scraps WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, 'ActionTracker::Record' AS klass FROM action_tracker WHERE action_tracker.target_id = #{self.id} UNION SELECT action_tracker.id, action_tracker.updated_at, 'ActionTracker::Record' AS klass FROM action_tracker INNER JOIN articles ON action_tracker.target_id = articles.id WHERE articles.profile_id = #{self.id} AND action_tracker.target_type = 'Article' ORDER BY action_tracker.updated_at DESC")
+    Scrap.find_by_sql("SELECT id, updated_at, 'Scrap' AS klass FROM scraps WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, 'ActionTracker::Record' AS klass FROM action_tracker WHERE action_tracker.target_id = #{self.id} UNION SELECT action_tracker.id, action_tracker.updated_at, 'ActionTracker::Record' AS klass FROM action_tracker INNER JOIN articles ON action_tracker.target_id = articles.id WHERE articles.profile_id = #{self.id} AND action_tracker.target_type = 'Article' ORDER BY updated_at DESC")
+  end
+
+  def catalog_url
+    { :profile => identifier, :controller => 'catalog'}
+  end
+
+  def more_recent_label
+    ''
   end
 end
@@ -268,8 +268,6 @@ class Environment &lt; ActiveRecord::Base
   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
@@ -618,12 +616,10 @@ class Environment &lt; ActiveRecord::Base
   end
   def top_url
-    protocol = 'http'
-    result = "#{protocol}://#{default_hostname}"
-    if Noosfero.url_options.has_key?(:port)
-      result << ':' << Noosfero.url_options[:port].to_s
-    end
-    result
+    url = 'http://'
+    url << (Noosfero.url_options.key?(:host) ? Noosfero.url_options[:host] : default_hostname)
+    url << ':' << Noosfero.url_options[:port].to_s if Noosfero.url_options.key?(:port)
+    url
   end
   def to_s
@@ -14,7 +14,6 @@ class Event &lt; Article
     maybe_add_http(self.setting[:link])
   end
-  xss_terminate :only => [ :link ], :on => 'validation'
   xss_terminate :only => [ :body, :link, :address ], :with => 'white_list', :on => 'validation'
   def initialize(*args)
@@ -104,18 +103,30 @@ class Event &lt; Article
         }
       }
+      # TODO: some good soul, please clean this ugly hack:
       if self.body
         html.div('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', :class => 'event-description') 
       end
     }
     if self.body
-      result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.body)
+      if options[:format] == 'short'
+        result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', display_short_format(self))
+      else
+        result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.body)
+      end
     end
     result
   end
+  def lead
+    content_tag('div',
+      show_period(start_date, end_date),
+      :class => 'event-dates'
+    ) + super
+  end
+
   def event?
     true
   end
@@ -11,6 +11,15 @@ class ExternalFeed &lt; ActiveRecord::Base
   }
   def add_item(title, link, date, content)
+    doc = Hpricot(content)
+    doc.search('*').each do |p|
+      if p.instance_of? Hpricot::Elem
+        p.remove_attribute 'style'
+        p.remove_attribute 'class'
+      end
+    end
+    content = doc.to_s
+
     article = TinyMceArticle.new(:name => title, :profile => blog.profile, :body => content, :published_at => date, :source => link, :profile => blog.profile, :parent => blog)
     unless blog.children.exists?(:slug => article.slug)
       article.save!
@@ -47,11 +47,11 @@ class FeedReaderBlock &lt; Block
   def formatted_feed_content
     if error_message.blank?
-      "<ul>\n" +
-      self.feed_items[0..(limit-1)].map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n") +
-      "</ul>"
+      "<ul>\n".html_safe +
+      self.feed_items[0..(limit-1)].map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n").html_safe +
+      "</ul>".html_safe
     else
-      '<p>' + error_message + '</p>'
+      "<p>#{error_message}</p>".html_safe
     end
   end
 class License < ActiveRecord::Base
+
+  SEARCHABLE_FIELDS = {
+    :name => 10,
+    :url => 5,
+  }
+
   belongs_to :environment
   has_many :content, :class_name => 'Article', :foreign_key => 'license_id'
@@ -80,7 +80,7 @@ class LinkListBlock &lt; Block
   def icons_options
     ICONS.map do |i|
-      "<span title=\"#{i[1]}\" class=\"icon-#{i[0]}\" onclick=\"changeIcon(this, '#{i[0]}')\"></span>"
+      "<span title=\"#{i[1]}\" class=\"icon-#{i[0]}\" onclick=\"changeIcon(this, '#{i[0]}')\"></span>".html_safe
     end
   end
 class NationalRegion < ActiveRecord::Base
+  SEARCHABLE_FIELDS = {
+    :name => 1,
+    :national_region_code => 1,
+  }
+
   def self.search_city(city_name, like = false, state = nil)
     operator = "="
 # Represents any organization of the system
 class Organization < Profile
+  SEARCH_FILTERS += %w[
+    more_popular
+    more_active
+  ]
+
   settings_items :closed, :type => :boolean, :default => false
   def closed?
     closed
@@ -5,7 +5,7 @@ class OrganizationMailing &lt; Mailing
   end
   def recipients(offset=0, limit=100)
-   source.members.all(:order => self.id, :offset => offset, :limit => limit, :joins => "LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)", :conditions => { "m.person_id" => nil })
+   source.members.all(:order => :id, :offset => offset, :limit => limit, :joins => "LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)", :conditions => { "m.person_id" => nil })
   end
   def each_recipient
 # A person is the profile of an user holding all relationships with the rest of the system
 class Person < Profile
+  SEARCH_FILTERS += %w[
+    more_popular
+    more_active
+  ]
+
   def self.type_name
     _('Person')
   end
 class Product < ActiveRecord::Base
+  SEARCHABLE_FIELDS = {
+    :name => 10,
+    :description => 1,
+  }
+
+  SEARCH_FILTERS = %w[
+    more_recent
+  ]
+
+  SEARCH_DISPLAYS = %w[map full]
+
+  def self.default_search_display
+    'full'
+  end
+
   belongs_to :enterprise
   has_one :region, :through => :enterprise
   validates_presence_of :enterprise
@@ -173,7 +188,7 @@ class Product &lt; ActiveRecord::Base
   def price_described?
     return false if price.blank? or price == 0
-    (price - total_production_cost).zero?
+    (price - total_production_cost.to_f).zero?
   end
   def update_price_details(price_details)
@@ -215,89 +230,6 @@ class Product &lt; ActiveRecord::Base
         end
   end
-  private
-  def f_category
-    self.product_category.name
-  end
-  def f_region
-    self.enterprise.region.id if self.enterprise.region
-  end
-  def self.f_region_proc(id)
-    c = Region.find(id)
-    s = c.parent
-    if c and c.kind_of?(City) and s and s.kind_of?(State) and s.acronym
-      [c.name, ', ' + s.acronym]
-    else
-      c.name
-    end
-  end
-  def self.f_qualifier_proc(ids)
-    array = ids.split
-    qualifier = Qualifier.find_by_id array[0]
-    certifier = Certifier.find_by_id array[1]
-    certifier ? [qualifier.name, _(' cert. ') + certifier.name] : qualifier.name
-  end
-  def f_qualifier
-    product_qualifiers.map do |pq|
-      "#{pq.qualifier_id} #{pq.certifier_id}"
-    end
-  end
-
-  alias_method :name_sortable, :name
   delegate :enabled, :region, :region_id, :environment, :environment_id, :to => :enterprise
-  def name_sortable # give a different name for solr
-    name
-  end
-  def public
-    self.public?
-  end
-  def price_sortable
-    (price.nil? or price.zero?) ? nil : price
-  end
-  def category_filter
-    enterprise.categories_including_virtual_ids << product_category_id
-  end
-  public
-
-  acts_as_faceted :fields => {
-      :f_category => {:label => _('Related products')},
-      :f_region => {:label => _('City'), :proc => proc { |id| f_region_proc(id) }},
-      :f_qualifier => {:label => _('Qualifiers'), :proc => proc { |id| f_qualifier_proc(id) }},
-    }, :category_query => proc { |c| "category_filter:#{c.id}" },
-    :order => [:f_category, :f_region, :f_qualifier]
-
-  Boosts = [
-    [:image, 0.55, proc{ |p| p.image ? 1 : 0}],
-    [:qualifiers, 0.45, proc{ |p| p.product_qualifiers.count > 0 ? 1 : 0}],
-    [:open_price, 0.45, proc{ |p| p.price_described? ? 1 : 0}],
-    [:solidarity, 0.45, proc{ |p| p.percentage_from_solidarity_economy[0].to_f/100 }],
-    [:available, 0.35, proc{ |p| p.available ? 1 : 0}],
-    [:price, 0.35, proc{ |p| (!p.price.nil? and p.price > 0) ? 1 : 0}],
-    [:new_product, 0.35, proc{ |p| (p.updated_at.to_i - p.created_at.to_i) < 24*3600 ? 1 : 0}],
-    [:description, 0.3, proc{ |p| !p.description.blank? ? 1 : 0}],
-    [:enabled, 0.2, proc{ |p| p.enterprise.enabled ? 1 : 0}],
-  ]
-
-  acts_as_searchable :fields => facets_fields_for_solr + [
-      # searched fields
-      {:name => {:type => :text, :boost => 2.0}},
-      {:description => :text}, {:category_full_name => :text},
-      # filtered fields
-      {:public => :boolean}, {:environment_id => :integer},
-      {:enabled => :boolean}, {:category_filter => :integer},
-      # ordered/query-boosted fields
-      {:price_sortable => :decimal}, {:name_sortable => :string},
-      {:lat => :float}, {:lng => :float},
-      :updated_at, :created_at,
-    ], :include => [
-      {:product_category => {:fields => [:name, :path, :slug, :lat, :lng, :acronym, :abbreviation]}},
-      {:region => {:fields => [:name, :path, :slug, :lat, :lng]}},
-      {:enterprise => {:fields => [:name, :identifier, :address, :nickname, :lat, :lng]}},
-      {:qualifiers => {:fields => [:name]}},
-      {:certifiers => {:fields => [:name]}},
-    ], :facets => facets_option_for_solr,
-    :boost => proc{ |p| boost = 1; Boosts.each{ |b| boost = boost * (1 - ((1 - b[2].call(p)) * b[1])) }; boost}
-  handle_asynchronously :solr_save
-  after_save_reindex [:enterprise], :with => :delayed_job
 end
@@ -11,6 +11,4 @@ class ProductCategory &lt; Category
     top_category ? top_category.children : top_level_for(env).select{|c|c.kind_of?(ProductCategory)}
   end
-  after_save_reindex [:products], :with => :delayed_job
-
 end
@@ -3,10 +3,20 @@
 # 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')
+  SEARCHABLE_FIELDS = {
+    :name => 10,
+    :identifier => 5,
+    :nickname => 2,
+  }
+
+  SEARCH_FILTERS = %w[
+    more_recent
+  ]
+
+  SEARCH_DISPLAYS = %w[compact]
+
+  def self.default_search_display
+    'compact'
   end
   module Roles
@@ -68,7 +78,7 @@ class Profile &lt; ActiveRecord::Base
   #FIXME: these will work only if the subclass is already loaded
   named_scope :enterprises, lambda { {:conditions => (Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
   named_scope :communities, lambda { {:conditions => (Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
-  named_scope :templates, :conditions => {:is_template => true}
+  named_scope :templates, lambda { |environment| { :conditions => {:is_template => true, :environment_id => environment.id} } }
   def members
     scopes = plugins.dispatch_scopes(:organization_members, self)
@@ -127,18 +137,6 @@ class Profile &lt; ActiveRecord::Base
     scrap.nil? ? Scrap.all_scraps(self) : Scrap.all_scraps(self).find(scrap)
   end
-  class_inheritable_accessor :extra_index_methods
-  self.extra_index_methods = []
-
-  def extra_data_for_index
-    self.class.extra_index_methods.map { |meth| meth.to_proc.call(self) }.flatten
-  end
-
-  def self.extra_data_for_index(sym = nil, &block)
-    self.extra_index_methods.push(sym) if sym
-    self.extra_index_methods.push(block) if block_given?
-  end
-
   acts_as_having_settings :field => :data
   def settings
@@ -211,7 +209,7 @@ class Profile &lt; ActiveRecord::Base
   has_many :profile_categorizations_including_virtual, :class_name => 'ProfileCategorization'
   has_many :categories_including_virtual, :through => :profile_categorizations_including_virtual, :source => :category
-  has_many :abuse_complaints, :foreign_key => 'requestor_id'
+  has_many :abuse_complaints, :foreign_key => 'requestor_id', :dependent => :destroy
   def top_level_categorization
     ret = {}
@@ -262,7 +260,6 @@ class Profile &lt; ActiveRecord::Base
     else
       ProfileCategorization.add_category_to_profile(c, self)
       self.categories(true)
-      self.solr_save
     end
     self.categories(reload)
   end
@@ -894,86 +891,6 @@ private :generate_url, :url_options
     self.active_fields
   end
-  private
-  def self.f_categories_label_proc(environment)
-    ids = environment.top_level_category_as_facet_ids
-    r = Category.find(ids)
-    map = {}
-    ids.map{ |id| map[id.to_s] = r.detect{|c| c.id == id}.name }
-    map
-  end
-  def self.f_categories_proc(facet, id)
-    id = id.to_i
-    return if id.zero?
-    c = Category.find(id)
-    c.name if c.top_ancestor.id == facet[:label_id].to_i or facet[:label_id] == 0
-  end
-  def f_categories
-    category_ids - [region_id]
-  end
-
-  def f_region
-    self.region_id
-  end
-  def self.f_region_proc(id)
-    c = Region.find(id)
-    s = c.parent
-    if c and c.kind_of?(City) and s and s.kind_of?(State) and s.acronym
-      [c.name, ', ' + s.acronym]
-    else
-      c.name
-    end
-  end
-
-  def self.f_enabled_proc(enabled)
-    enabled = enabled == "true" ? true : false
-    enabled ? s_('facets|Enabled') : s_('facets|Not enabled')
-  end
-  def f_enabled
-    self.enabled
-  end
-
-  def name_sortable # give a different name for solr
-    name
-  end
-  def public
-    self.public?
-  end
-  def category_filter
-    categories_including_virtual_ids
-  end
-  public
-
-  acts_as_faceted :fields => {
-      :f_enabled => {:label => _('Situation'), :type_if => proc { |klass| klass.kind_of?(Enterprise) },
-        :proc => proc { |id| f_enabled_proc(id) }},
-      :f_region => {:label => _('City'), :proc => proc { |id| f_region_proc(id) }},
-      :f_categories => {:multi => true, :proc => proc {|facet, id| f_categories_proc(facet, id)},
-        :label => proc { |env| f_categories_label_proc(env) }, :label_abbrev => proc{ |env| f_categories_label_abbrev_proc(env) }},
-    }, :category_query => proc { |c| "category_filter:#{c.id}" },
-    :order => [:f_region, :f_categories, :f_enabled]
-
-  acts_as_searchable :fields => facets_fields_for_solr + [:extra_data_for_index,
-      # searched fields
-      {:name => {:type => :text, :boost => 2.0}},
-      {:identifier => :text}, {:nickname => :text},
-      # filtered fields
-      {:public => :boolean}, {:environment_id => :integer},
-      {:category_filter => :integer},
-      # ordered/query-boosted fields
-      {:name_sortable => :string}, {:user_id => :integer},
-      :enabled, :active, :validated, :public_profile,
-      {:lat => :float}, {:lng => :float},
-      :updated_at, :created_at,
-    ],
-    :include => [
-      {:region => {:fields => [:name, :path, :slug, :lat, :lng]}},
-      {:categories => {:fields => [:name, :path, :slug, :lat, :lng, :acronym, :abbreviation]}},
-    ], :facets => facets_option_for_solr,
-    :boost => proc{ |p| 10 if p.enabled }
-  after_save_reindex [:articles], :with => :delayed_job
-  handle_asynchronously :solr_save
-
   def control_panel_settings_button
     {:title => _('Profile Info and settings'), :icon => 'edit-profile'}
   end
@@ -49,13 +49,12 @@ class ProfileListBlock &lt; Block
                send(:profile_image_link, item, :minor )
              }.join("\n  ")
       if list.empty?
-        list = '<div class="common-profile-list-block-none">'+ _('None') +'</div>'
+        list = content_tag 'div', _('None'), :class => 'common-profile-list-block-none'
       else
         list = content_tag 'ul', nl +'  '+ list + nl
       end
       block_title(title) + nl +
-      '<div class="common-profile-list-block">' +
-      nl + list + nl + '<br style="clear:both" /></div>'
+      content_tag('div', nl + list + nl + content_tag('br', '', :style => 'clear:both'))
     end
   end
 class Qualifier < ActiveRecord::Base
+  SEARCHABLE_FIELDS = {
+    :name => 1,
+  }
+
   belongs_to :environment
   has_many :qualifier_certifiers, :dependent => :destroy
@@ -15,6 +19,4 @@ class Qualifier &lt; ActiveRecord::Base
     self.name.downcase.transliterate <=> b.name.downcase.transliterate
   end
-  after_save_reindex [:products], :with => :delayed_job
-
 end
@@ -7,7 +7,7 @@ class RawHTMLBlock &lt; Block
   settings_items :html, :type => :text
   def content(args={})
-    (title.blank? ? '' : block_title(title)) + html.to_s
+    (title.blank? ? '' : block_title(title)).html_safe + html.to_s.html_safe
   end
 end
@@ -4,12 +4,6 @@ class Region &lt; Category
   require_dependency 'enterprise' # enterprises can also be validators
-  # searches for organizations that could become validators for this region.
-  # <tt>search</tt> is passed as is to find_by_contents on Organization.
-  def search_possible_validators(search)
-    Organization.find_by_contents(search)[:results].docs.reject {|item| self.validator_ids.include?(item.id) }
-  end
-
   def has_validator?
     validators.count > 0
   end
 class Scrap < ActiveRecord::Base
+  SEARCHABLE_FIELDS = {
+    :content => 1,
+  }
   validates_presence_of :content
   validates_presence_of :sender_id, :receiver_id
@@ -5,10 +5,10 @@ class SpammerLogger &lt; Logger
   def self.log(spammer_ip, object=nil)
     if object
       if object.kind_of?(Comment)
-        @logger << "[#{Time.now.strftime("%F %T %z")}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
+        @logger << "[#{Time.now.strftime('%F %T %z')}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
       end
     else
-        @logger << "[#{Time.now.strftime("%F %T %z")}] IP: #{spammer_ip}\n"
+        @logger << "[#{Time.now.strftime('%F %T %z')}] IP: #{spammer_ip}\n"
     end
   end
@@ -20,7 +20,8 @@ class TagsBlock &lt; Block
   end
   def content(args={})
-    tags = owner.article_tags
+    is_env = owner.class == Environment
+    tags = is_env ? owner.tag_counts : owner.article_tags
     return '' if tags.empty?
     if limit
@@ -29,18 +30,28 @@ class TagsBlock &lt; Block
       tags_tmp.map{ |k,v| tags[k] = v }
     end
+    url = is_env ? {:host=>owner.default_hostname, :controller=>'search', :action => 'tag'} :
+          owner.public_profile_url.merge(:controller => 'profile', :action => 'tags')
+    tagname_option = is_env ? :tag : :id
+
     block_title(title) +
-    "\n<div class='tag_cloud'>\n"+
-    tag_cloud( tags, :id,
-               owner.public_profile_url.merge(:controller => 'profile', :action => 'tags'),
-               :max_size => 16, :min_size => 9 ) +
-    "\n</div><!-- end class='tag_cloud' -->\n";
+    "\n<div class='tag_cloud'>\n".html_safe+
+    tag_cloud( tags, tagname_option, url, :max_size => 16, :min_size => 9 ) +
+    "\n</div><!-- end class='tag_cloud' -->\n".html_safe
   end
   def footer
-    owner_id = owner.identifier
-    lambda do
-      link_to s_('tags|View all'), :profile => owner_id, :controller => 'profile', :action => 'tags'
+    if owner.class == Environment
+      lambda do
+        link_to s_('tags|View all'),
+          :controller => 'search', :action => 'tags'
+      end
+    else
+      owner_id = owner.identifier
+      lambda do
+        link_to s_('tags|View all'),
+          :profile => owner_id, :controller => 'profile', :action => 'tags'
+      end
     end
   end
@@ -113,7 +113,7 @@ class UploadedFile &lt; Article
           content_tag(
             'div',
-            link_to_previous + content_tag('span', _('image %d of %d'), :class => 'total-of-images') % [current_index + 1, total_of_images] + link_to_next,
+            link_to_previous + (content_tag('span', _('image %d of %d'), :class => 'total-of-images') % [current_index + 1, total_of_images]).html_safe + link_to_next,
             :class => 'gallery-navigation'
           )
         end.to_s +
@@ -15,7 +15,7 @@ class User &lt; ActiveRecord::Base
   # FIXME ugly workaround
   def self.human_attribute_name(attrib)
     case attrib.to_sym
-      when :login:  return _('Username')
+      when :login:  return [_('Username'), _('Email')].join(' / ')
       when :email:  return _('e-Mail')
       else _(self.superclass.human_attribute_name(attrib))
     end
@@ -116,10 +116,11 @@ class User &lt; ActiveRecord::Base
   validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('%{fn} must be checked in order to signup.').fix_i18n
-  # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
+  # Authenticates a user by their login name or email and unencrypted password.  Returns the user or nil.
   def self.authenticate(login, password, environment = nil)
     environment ||= Environment.default
-    u = first :conditions => ['login = ? AND environment_id = ? AND activated_at IS NOT NULL', login, environment.id] # need to get the salt
+    u = self.first :conditions => ['(login = ? OR email = ?) AND environment_id = ? AND activated_at IS NOT NULL',
+                                   login, login, environment.id] # need to get the salt
     u && u.authenticated?(password) ? u : nil
   end
@@ -293,7 +294,8 @@ class User &lt; ActiveRecord::Base
       'email_domain' => self.enable_email ? self.email_domain : nil,
       'friends_list' => friends_list,
       'enterprises' => enterprises,
-      'amount_of_friends' => friends_list.count
+      'amount_of_friends' => friends_list.count,
+      'chat_enabled' => person.environment.enabled?('xmpp_chat')
     }
   end
@@ -32,7 +32,8 @@
     <span id="signup-domain"><%= environment.default_hostname %>/</span>
     <div id='signup-login'>
       <div id='signup-login-field' class='formfield'>
-        <%= required text_field(:user, :login, :id => 'user_login', :onchange => 'this.value = convToValidLogin(this.value);') %>
+        <%= required text_field(:user, :login, :id => 'user_login',
+                                :onchange => 'this.value = convToValidUsername(this.value);') %>
         <div id='url-check'><p>&nbsp;</p></div>
       </div>
       <%= content_tag(:small, _('Choose your login name carefully! It will be your network access and you will not be able to change it later.'), :id => 'signup-balloon') %>
@@ -5,7 +5,7 @@
 <% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %>
   <%= f.text_field :login,
-                   :onchange => 'this.value = convToValidLogin( this.value )' %>
+                   :onchange => 'this.value = convToValidUsername( this.value )' %>
   <%= f.text_field :email %>
@@ -4,7 +4,7 @@
 <%= render :file => 'shared/tiny_mce' %>
-<% labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do |f| %>
+<% labelled_form_for :environment, @environment do |f| %>
   <% tabs = [] %>
   <% tabs << {:title => _('Site info'), :id => 'site-info',
     :content => (render :partial => 'site_info', :locals => {:f => f})} %>
-<div class='article-block-edition'>
+<div class="article-block-edition">
 <% if @block.box.owner.kind_of?(Environment) and @block.box.owner.portal_community.nil? %>
-  <p id='no_portal_community'>
+  <p id="no_portal_community">
   <%= _("You don't have an community defined as the portal community. Define it before use this block properly.") %>
   </p>
 <% else %>
-  <% articles = @block.available_articles.select {|article| !article.folder? } %>
-  <%= select_tag('block[article_id]', options_for_select_with_title(articles.map {|item| [item.path, item.id]}, @block.article ? @block.article.id : nil)) %>
+  <%
+    articles = @block.available_articles.select {|a| !a.folder? || a.blog? }
+    first_text = articles[articles.find_index{|a| a.kind_of? TextArticle}||-1]
+    selected = @block.article || first_text
+  %>
+  <%= select_tag(
+    'block[article_id]',
+    options_for_select_with_title(articles.map {|item| [item.path, item.id]}, selected.id),
+    :onchange => 'this.changedTo(this.value)'
+  )%>
+  <div id="block_blog_options" style="display:none">
+    <%= labelled_form_field(
+      _('Number of posts:'),
+      text_field_tag('block[posts_per_page]', @block.posts_per_page)
+    )%>
+  </div>
+  <%= labelled_form_field(
+    _('How to display this content:'),
+    select_tag(
+      'block[visualization_format]',
+      options_for_select([[_('Lead'), 'short'], [_('Full post'), 'full']], @block.visualization_format)
+    )
+  )%>
+  <% blogs = @block.available_articles.select{|a|a.blog?} %>
+  <script>
+    var select = jQuery("#block_article_id")[0];
+    select.blogs = <%= blogs.map{|b| b.id.to_s }.to_json %>;
+    select.changedTo = function(articleId) {
+      var blogSelected = this.blogs.indexOf(articleId) != -1;
+      jQuery("#block_blog_options").toggle(blogSelected);
+    }
+    select.changedTo('<%= selected.id %>');
+  </script>
 <% end %>
 </div>
@@ -1,10 +0,0 @@
-<% block_types.in_groups_of(2) do |block1, block2| %>
-  <div style='float: left; width: 48%; padding-top: 2px;'>
-    <%= labelled_radio_button(block1.description, :type, block1.name) %>
-  </div>
-  <% if block2 %>
-    <div style='float: left; width: 48%; padding-top: 2px;'>
-      <%= labelled_radio_button(block2.description, :type, block2.name) %>
-    </div>
-  <% end %>
-<% end %>
 <strong><%= _('Highlights') %></strong>
-<div id='edit-highlights-block' style='width:450px'>
-<table id='highlights' class='noborder'>
-  <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th><th><%= _('Title') %></th></tr>
+
+<table class="noborder"><tbody id="highlights-data-table">
+  <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th></tr>
   <% for image in @block.images do %>
-    <tr>
-      <td>
-        <%= select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i), :style => "width: 100px" %></p>
-      </td>
-      <td><%= text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 10 %></td>
-      <td><%= text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 3 %></td>
-      <td><%= text_field_tag 'block[images][][title]', image[:title], :class => 'highlight-title', :size => 10 %></td>
-    </tr>
+    <%= highlights_block_config_image_fields @block, image %>
   <% end %>
-</table>
-</div>
+</tbody></table>
 <%= link_to_function(_('New highlight'), nil, :class => 'button icon-add with-text') do |page|
-    page.insert_html :bottom, 'highlights', content_tag('tr',
-                  content_tag('td', select_tag('block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name), :style => "width: 100px")) +
-                  content_tag('td', text_field_tag('block[images][][address]', nil, :class => 'highlight-address', :size => 10)) +
-                  content_tag('td', text_field_tag('block[images][][position]', nil, :class => 'highlight-position', :size => 3)) +
-                  content_tag('td', text_field_tag('block[images][][title]', nil, :class => 'highlight-position', :size => 10))
-    ) +
-    javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
+  page.insert_html :bottom, 'highlights-data-table', highlights_block_config_image_fields(@block)
 end %>
 <%= labelled_form_field _('Image transition:'), select('block', 'interval', [[_('No automatic transition'), 0]] + [1, 2, 3, 4, 5, 10, 20, 30, 60].map {|item| [n_('Every 1 second', 'Every %d seconds', item) % item, item]}) %>
-<div style='height:350px'>
+<div id="add-block-dialog">
   <% form_tag do %>
     <p><%= _('In what area do you want to put your new block?') %></p>
+    <div id="box-position">
     <% @boxes.each do |box| %>
-      <%= labelled_radio_button(_("Area %d") % box.position, :box_id, box.id, box.central?, { :class => 'box-position', 'data-position' => box.position })  %>
+      <% name = box.central? ? _('Main area') : _('Area %d') % box.position %>
+      <%= labelled_radio_button(name, :box_id, box.id, box.central?, { 'data-position' => box.position }) %>
     <% end %>
+    </div>
     <script type="text/javascript">
-      (function ($) {
-        $(document).ready(function () {
-          $(".box-position").live('change', function () {
-            if ($(this).attr('data-position') == '1') {
-              $('#center-block-types').show();
-              $('#side-block-types').hide();
-            } else {
-              $('#center-block-types').hide();
-              $('#side-block-types').show();
-            };
-          });
-      })})(jQuery);
+      jQuery('#box-position input').bind('change',
+        function () {
+          showCenter = jQuery(this).attr('data-position') == '1';
+          jQuery('#center-block-types').toggle(showCenter);
+          jQuery('#side-block-types').toggle(!showCenter);
+        }
+      );
     </script>
     <p><%= _('Select the type of block you want to add to your page.') %></p>
-    <div id='center-block-types'>
-      <%= render :partial => 'block_types', :locals => { :block_types => @center_block_types } %>
+    <div id="center-block-types" class="block-types">
+      <% @center_block_types.each do |block| %>
+        <div class='block-type'>
+          <%= labelled_radio_button(block.description, :type, block.name) %>
+        </div>
+      <% end %>
     </div>
-    <div id='side-block-types' style='display:none'>
-      <%= render :partial => 'block_types', :locals => { :block_types => @side_block_types } %>
+    <div id="side-block-types" class="block-types" style="display:none">
+      <% @side_block_types.each do |block| %>
+        <div class='block-type'>
+          <%= labelled_radio_button(block.description, :type, block.name) %>
+        </div>
+      <% end %>
     </div>
     <br style='clear: both'/>
-<div style='width: 500px;'>
-  <h2><%= _('Editing block') %></h2>
+<div class="block-config-options <%= @block.class.name %>-options">
+  <h2 class="title"><%= _('Editing block') %></h2>
   <% form_tag(:action => 'save', :id => @block.id) do %>
 <h1><%= _('Editing sideboxes')%></h1>
-<% button_bar do %>
+<% button_bar :class=>'design-menu' do %>
   <%= colorbox_button('add', _('Add a block'), { :action => 'add_block' }) %>
   <%= button(:back, _('Back to control panel'), :controller => (profile.nil? ? 'admin_panel': 'profile_editor')) %>
 <% end %>
@@ -7,13 +7,17 @@
 <div class='l-sidebar-left-bar'>
   <ul>
-    <% if @categories.size > 0 %>
+    <%= content_tag('li', link_to(_('Homepage'), profile.url), :class => 'catalog-categories-link') %>
+    <%= content_tag('li', link_to(_('Catalog start'), profile.catalog_url), :class => 'catalog-categories-link') %>
+    <% if @categories.present? %>
       <% @categories.each do |category| %>
         <%= category_link(category) %>
         <%= category_sub_links(category) %>
       <% end %>
+    <% elsif @category.present? %>
+      <%= content_tag('li', _('There are no sub-categories for %s') % @category.name, :id => 'catalog-categories-notice') %>
     <% else %>
-      <%= content_tag('li', _('There are no sub-categories for %s') % @category.name, :style => 'color: #555753; padding-bottom: 0.5em;') %>
+      <%= content_tag('li', _('There are no categories available.'), :id => 'catalog-categories-notice') %>
     <% end %>
   </ul>
 </div>
@@ -64,20 +68,20 @@
         <% if product.description %>
           <li class="product-description expand-box">
-            <span id="product-description-button"><%= _('description') %></span>
-            <div>
+            <span class="product-description-button"><%= _('description') %></span>
+            <div class="float-box">
               <div class="arrow"></div>
-              <div class="content" id="product-description"><%= txt2html(product.description || '') %></div>
+              <div class="content"><%= product.description %></div>
             </div>
           </li>
         <% end %>
         <% if product.price_described? %>
           <li class="product-price-composition expand-box">
-            <span id="product-price-composition-button"><%= _('price composition') %></span>
-            <div>
+            <span class="product-price-composition-button"><%= _('price composition') %></span>
+            <div class="float-box">
               <div class="arrow"></div>
-              <div class="content" id="product-price-composition">
+              <div class="content">
                 <% product.inputs.relevant_to_price.each do |i| %>
                   <div class="search-product-input-dots-to-price">
                     <div class="search-product-input-name"><%= i.product_category.name %></div>
@@ -98,9 +102,9 @@
         <% if product.inputs.count > 0 %>
           <li class="product-inputs expand-box">
             <span id="inputs-button"><%= _('inputs and raw materials') %></span>
-            <div>
+            <div class="float-box">
               <div class="arrow"></div>
-              <div class="content" id="inputs-description">
+              <div class="content">
                 <% product.inputs.each do |i| %>
                   <div>
                     <%= _('%{amount_used} %{unit} of') % {:amount_used => i.amount_used, :unit => i.unit.singular} + ' ' if i.has_all_price_details? %>
@@ -9,7 +9,12 @@
     <div id='media-upload-form'>
       <% form_tag({ :action => 'media_upload' }, :multipart => true) do %>
         <div class='formfield'>
-          <%= select_profile_folder(_('Choose folder to upload files:'), :parent_id, profile) %>
+          <% default_folder = content_id_to_str default_folder_for_image_upload(profile) %>
+          <%= select_profile_folder(
+                _('Choose folder to upload files:'),
+                :parent_id, profile, default_folder, {}, {},
+                "type='Folder' or type='Gallery'"
+          ) %>
         </div>
         <p><%= file_field_tag('file1') %></p>
         <p><%= file_field_tag('file2') %></p>
+<div class="select-article-type">
+
 <h2> <%= _('Choose the type of content:') %> </h2>
-<ul id="article_types">
+<ul class="article-types">
   <% for type in @article_types %>
     <% action = type[:class].name == 'UploadedFile' ? {:action => 'upload_files'} : {:action => 'new', :type => type[:class].name} %>
     <% content_tag('a', :href => url_for(action.merge(:parent_id => @parent_id, :back_to => @back_to))) do %>
@@ -14,3 +16,5 @@
 <br style="clear:both" />
 <%= colorbox_close_button(_('Cancel')) %>
+
+</div>
-<% add_rss_feed_to_head(@page.name, @page.feed.url)  if @page.blog? && @page.feed %>
+<% add_rss_feed_to_head(blog.name, blog.feed.url)  if blog.blog? && blog.feed %>
-<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if @page.blog? && @page.external_feed && @page.external_feed.enabled && @page.external_feed.fetched_at.nil? %>
+<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if blog.blog? && blog.external_feed && blog.external_feed.enabled && blog.external_feed.fetched_at.nil? %>
 <div>
   <div class='blog-description'>
-    <%= @page.body %>
+    <%= blog.body %>
   </div>
 </div>
 <hr class="pre-posts"/>
 <div class="blog-posts">
-  <%= (@page.empty? ? content_tag('em', _('(no posts)')) : list_posts(@posts, @page.visualization_format)) %>
+  <%=
+   posts = @posts
+   format = blog.visualization_format
+   if inside_block
+     posts = blog.posts.paginate(:page=>1, :per_page=>inside_block.posts_per_page)
+     format = inside_block.visualization_format
+   end
+   (blog.empty? ? content_tag('em', _('(no posts)')) : list_posts(posts, format))
+  %>
 </div>
@@ -66,7 +66,6 @@
   addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>';
 </script>
 <a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><%= addthis_image_tag %></a>
-<script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script>
 </div>
 <% end %>
@@ -96,7 +95,7 @@
   <% end %>
   <% if @page.accept_comments? && @comments_count > 1 %>
-    <p class="post-comment-button"><a href="#comment_form" onclick="jQuery('#page-comment-form h4').first().trigger('click')"><%= _('Post a comment') %></a></p>
+    <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button') %>
   <% end %>
   <ul class="article-comments-list">
@@ -5,7 +5,7 @@
 <ul class="profile-list">
 <% @favorite_enterprises.each do |enterprise| %>
   <li>
-    <%= link_to_profile profile_image(enterprise) + '<br/>' + enterprise.name,
+    <%= link_to_profile profile_image(enterprise) + '<br/>'.html_safe + enterprise.name,
                         enterprise.identifier, :class => 'profile-link' %>
     <%# profile_image_link enterprise, :portrait, 'div' %>
     <div class="controll">
@@ -0,0 +1,24 @@
+<div id="user">
+  <span class='logged-in' style='display: none;'>
+    <%= usermenu_logged_in %>
+  </span>
+  <span class='not-logged-in' style='display: none'>
+
+    <%= _("<span class='login'>%s</span>") % thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
+    <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_eval(&content) }.join("") %>
+
+    <div id='inlineLoginBox' style='display: none;'>
+      <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
+    </div>
+
+    <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
+      <%= _("<span class='or'>or</span> <span class='signup'>%s</span>") % link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup')%>
+    <% end %>
+
+  </span>
+  <form action="/search" id="top-search" class="search_form clean" method="get">
+    <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />
+    <div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>
+    <%= javascript_tag 'jQuery("#user form input").hint();' %>
+  </form>
+</div><!-- end id="user" -->
@@ -8,23 +8,10 @@
     <meta name="description" content="<%= @environment.name %>" />
     <link rel="shortcut icon" href="<%= image_path(theme_favicon) %>" type="image/x-icon" />
     <%= noosfero_javascript %>
-    <%= stylesheet_link_tag noosfero_stylesheets, :cache => 'cache' %>
-    <%= stylesheet_link_tag template_stylesheet_path %>
-    <%= stylesheet_link_tag icon_theme_stylesheet_path %>
-    <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
-    <%
-      plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
-    %>
-    <%= stylesheet_link_tag(plugins_stylesheets, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_stylesheets.to_s)) unless plugins_stylesheets.empty? %>
-    <%= stylesheet_link_tag theme_stylesheet_path %>
+    <%= noosfero_stylesheets %>
     <%# Add custom tags/styles/etc via content_for %>
     <%= yield :head %>
-    <%= javascript_tag('render_all_jquery_ui_widgets()') %>
-    <%
-      plugins_javascripts = @plugins.map { |plugin| plugin.js_files.map { |js| plugin.class.public_path(js) } }.flatten
-    %>
-    <%= javascript_include_tag(plugins_javascripts, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_javascripts.to_s)) unless plugins_javascripts.empty? %>
     <%=
       @plugins.dispatch(:head_ending).collect do |content|
         content.respond_to?(:call) ? content.call : content
@@ -35,15 +22,9 @@
       DEFAULT_LOADING_MESSAGE = <%="'#{ _('loading...') }'" %>;
     </script>
   </head>
-  <body class="<%=
-    # Identify the current controller and action for the CSS:
-    " controller-"+ @controller.controller_name() +
-    " action-"+ @controller.controller_name() +"-"+ @controller.action_name() +
-    " template-"+ ( profile.nil? ? "default" : profile.layout_template ) +
-    (!profile.nil? && profile.is_on_homepage?(request.path,@page) ? " profile-homepage" : "")
-    %>" >
-
+  <body class="<%= body_classes %>">
     <a href="#content" id="link-go-content"><span><%= _("Go to the content") %></span></a>
+
     <%=
       @plugins.dispatch(:body_beginning).collect do |content|
         content.respond_to?(:call) ? content.call : content
@@ -55,31 +36,7 @@
         <%= theme_header %>
       </div>
       <div id="wrap-2">
-        <div id="user">
-          <span class='logged-in' style='display: none;'>
-            <%= usermenu_logged_in %>
-          </span>
-          <span class='not-logged-in' style='display: none'>
-
-              <%= _("<span class='login'>%s</span>") % thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
-              <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_eval(&content) }.join("") %>
-
-              <div id='inlineLoginBox' style='display: none;'>
-                <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
-              </div>
-
-              <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
-              <%= _("<span class='or'>or</span> <span class='signup'>%s</span>") % link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup')%>
-              <% end %>
-
-          </span>
-          <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" -->
-
+        <%= render :partial => 'layouts/user' %>
         <h1 id="site-title">
           <%= theme_site_title %>
         </h1>
@@ -103,5 +60,6 @@
     </div><!-- end id="theme-footer" -->
     <%= noosfero_layout_features %>
     <%= theme_javascript_ng %>
+    <%= addthis_javascript %>
   </body>
 </html>
 <div id="balloon">
-  <%= render :partial => 'search/product', :locals => {:product => @product} %>
+  <%= render :partial => 'search/full_product', :locals => {:product => @product} %>
 </div>
 <h3><%= _("%s's wall") % @profile.name %></h3>
 <div id='leave_scrap'>
   <%= flash[:error] %>
-  <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''" do %>
+  <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''", :complete => "jQuery('#leave_scrap_form').removeClass('loading').find('*').attr('disabled', false)", :loading => "jQuery('#leave_scrap_form').addClass('loading').find('*').attr('disabled', true)", :html => {:id => 'leave_scrap_form' } do %>
     <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2 %>
     <%= submit_button :new, _('Share') %>
   <% end %>
@@ -13,11 +13,11 @@
 <% @roles.each do |role| %>
   <% search_url = url_for(:action => 'search_user', :profile => profile.identifier, :role => role.id) %>
-  <% @pre_population ||= profile.members_by_role_to_json(role) %>
+  <% pre_population = params[:action] == 'last_admin' ? [].to_json : profile.members_by_role_to_json(role) %>
   <script type="text/javascript">
     jQuery(<%= ('#search_' + role.key).to_json %>)
     .tokenInput("<%= search_url %>", {
-      prePopulate: <%= @pre_population %>,
+      prePopulate: <%= pre_population %>,
       hintText: <%= _('Type in a search term for users').to_json %>,
       noResultsText: <%= _('No results').to_json %>,
       searchingText: <%= _('Searching...').to_json %>,
@@ -1,12 +0,0 @@
-<li class="search-article-item article-item">
-  <%= link_to(article.title, article.url, :class => "search-result-title") %>
-  <div class="search-content-first-column">
-    <%= render :partial => 'image', :object => article %>
-  </div>
-  <table class="noborder search-content-second-column">
-    <%= render :partial => 'article_common', :object => article %>
-  </table>
-  <%= render :partial => 'article_last_change', :object => article %>
-
-  <div style="clear:both"></div>
-</li>
@@ -1,24 +0,0 @@
-<li class="search-blog article-item">
-  <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %>
-  <div class="search-content-first-column">
-    <%= render :partial => 'image', :object => blog %>
-  </div>
-  <table class="noborder search-content-second-column">
-    <tr class="search-blog-items">
-      <td class="search-field-label"><%= _("Last posts") %></td>
-
-      <% r = blog.children.find(:all, :order => :updated_at, :conditions => ['type != ?', 'RssFeed']).last(3) %>
-      <td class="<%= "search-field-none" if r.empty? %>">
-        <% r.each do |a| %>
-          <%= link_to a.title, a.view_url, :class => 'search-blog-sample-item '+icon_for_article(a) %>
-        <% end %>
-        <%= _('None') if r.empty? %>
-      </td>
-    </tr>
-
-    <%= render :partial => 'article_common', :object => blog %>
-  </table>
-  <%= render :partial => 'article_last_change', :object => blog %>
-
-  <div style="clear: both;"/></div>
-</li>
@@ -0,0 +1,5 @@
+<% filter_label = profile.send(@filter + '_label') %>
+<% filter_label += show_date(profile.created_at) if @filter == 'more_recent' %>
+<li class="search-profile-item">
+  <%= profile_image_link profile, :portrait, 'div', filter_label %>
+</li>
@@ -1 +0,0 @@
-_article.rhtml
 \ No newline at end of file
 <div id="search-results" class="<%= !multiple_search? ? 'only-one-result-box' : 'multiple-results-boxes' %>">
   <% @order.each do |name| %>
-    <% results = @results[name] %>
-    <% empty = results.nil? || results.empty? %>
+    <% search = @searches[name] %>
-    <div class="search-results-<%= name %> search-results-box <%= "search-results-empty" if empty %>">
-      <% if not empty %>
-        <% partial = partial_for_class(results.first.class.class_name.constantize) %>
+    <div class="search-results-<%= name %> search-results-box <%= "search-results-empty" if search[:results].blank? %>">
+      <% if !search[:results].blank? %>
-        <% if multiple_search? %>
+        <% if multiple_search?(@searches) %>
           <h3><%= @names[name] %></h3>
-          <% if results.total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %>
-            <%= link_to(_('see all (%d)') % results.total_entries, params.merge(:action => name), :class => 'see-more' ) %>
+          <% if search[:results].total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %>
+            <%= link_to(_('see all (%d)') % search[:results].total_entries, params.merge(:action => name), :class => 'see-more' ) %>
           <% end %>
         <% end %>
-        <div class="search-results-innerbox search-results-type-<%= partial %> <%= 'common-profile-list-block' if partial == 'profile' %>">
+        <% display = display_filter(name, params[:display]) %>
+
+        <div class="search-results-innerbox search-results-type-<%= name.to_s.singularize %> <%= 'common-profile-list-block' if [:enterprises, :people, :communities].include?(name) %>">
           <ul>
-          <% results.each do |hit| %>
-            <%= render :partial => partial_for_class(hit.class), :object => hit %>
-          <% end %>
+            <% search[:results].each do |hit| %>
+              <% partial = partial_for_class(hit.class, display) %>
+              <% variable_name = partial.gsub("#{display}_", '').to_sym %>
+              <%= render :partial => partial, :locals => {variable_name => hit} %>
+            <% end %>
           </ul>
         </div>
       <% else %>
@@ -1,25 +0,0 @@
-<li class="search-event-item article-item">
-<%= link_to(event.title, event.url, :class => "search-result-title") %>
-<div class="search-content-first-column">
-  <%= render :partial => 'image', :object => event %>
-</div>
-<table class="noborder search-content-second-column">
-  <% if event.start_date %>
-    <tr class="search-article-event-date">
-      <td class="search-field-label"><%= _('Start date') %></td>
-      <td class="article-item-date"><%= event.start_date %></td>
-    </tr>
-  <% end %>
-  <% if event.end_date %>
-    <tr class="search-article-event-date">
-      <td class="search-field-label"><%= _('End date') %></td>
-      <td class="article-item-date"><%= event.end_date %></td>
-    </tr>
-  <% end %>
-
-  <%= render :partial => 'article_common', :object => event %>
-</table>
-<%= render :partial => 'article_last_change', :object => event %>
-
-<div style="clear: both"></div>
-</li>
@@ -1,36 +0,0 @@
-<% 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>
@@ -1,6 +0,0 @@
-<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>
@@ -1,24 +0,0 @@
-<li class="search-folder-item article-item">
-  <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %>
-  <div class="search-content-first-column">
-    <%= render :partial => 'image', :object => folder %>
-  </div>
-  <table class="noborder search-content-second-column">
-    <tr class="search-folder-items">
-      <td class="search-field-label"><%= _("Last items") %></td>
-
-      <% r = folder.children.last(3) %>
-      <td class="<%= "search-field-none" if r.empty? %>">
-        <% r.each do |a| %>
-          <%= link_to a.title, a.view_url, :class => 'search-folder-sample-item '+icon_for_article(a) %>
-        <% end %>
-        <%= _('None') if r.empty? %>
-      </td>
-    </tr>
-
-    <%= render :partial => 'article_common', :object => folder %>
-  </table>
-  <%= render :partial => 'article_last_change', :object => folder %>
-
-  <div style="clear:both"></div>
-</li>
@@ -1,24 +0,0 @@
-<li class="search-forum-item article-item">
-  <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %>
-  <div class="search-content-first-column">
-    <%= render :partial => 'image', :object => forum %>
-  </div>
-  <table class="noborder search-content-second-column">
-    <tr class="search-forum-items">
-      <td class="search-field-label"><%= _("Last topics") %></td>
-
-      <% r = forum.children.find(:all, :order => :updated_at, :conditions => ['type != ?', 'RssFeed']).last(3) %>
-      <td class="<%= "search-field-none" if r.empty? %>">
-        <% r.each do |a| %>
-          <%= link_to a.title, a.view_url, :class => 'search-forum-sample-item '+icon_for_article(a) %>
-        <% end %>
-        <%= _('None') if r.empty? %>
-      </td>
-    </tr>
-
-    <%= render :partial => 'article_common', :object => forum %>
-  </table>
-  <%= render :partial => 'article_last_change', :object => forum %>
-
-  <div style="clear:both"></div>
-</li>
@@ -0,0 +1,12 @@
+<li class="search-article-item article-item">
+  <%= link_to(article.title, article.url, :class => "search-result-title") %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => article %>
+  </div>
+  <table class="noborder search-content-second-column">
+    <%= render :partial => 'article_common', :object => article %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => article %>
+
+  <div style="clear:both"></div>
+</li>
@@ -0,0 +1,24 @@
+<li class="search-blog article-item">
+  <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => blog %>
+  </div>
+  <table class="noborder search-content-second-column">
+    <tr class="search-blog-items">
+      <td class="search-field-label"><%= _("Last posts") %></td>
+
+      <% r = blog.children.find(:all, :order => :updated_at, :conditions => ['type != ?', 'RssFeed']).last(3) %>
+      <td class="<%= "search-field-none" if r.empty? %>">
+        <% r.each do |a| %>
+          <%= link_to a.title, a.view_url, :class => 'search-blog-sample-item '+icon_for_article(a) %>
+        <% end %>
+        <%= _('None') if r.empty? %>
+      </td>
+    </tr>
+
+    <%= render :partial => 'article_common', :object => blog %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => blog %>
+
+  <div style="clear: both;"/></div>
+</li>
@@ -0,0 +1,38 @@
+<li class="search-profile-item">
+  <div class="search-enterprise-item">
+    <div class="search-enterprise-item-column-left">
+      <%= profile_image_link enterprise, :portrait, 'div',
+        @filter == 'more_recent' ? enterprise.send(@filter + '_label') + show_date(enterprise.created_at) : enterprise.send(@filter + '_label') %>
+    </div>
+    <div class="search-enterprise-item-column-right">
+      <%= link_to_homepage(enterprise.name, enterprise.identifier, :class => "search-result-title") %>
+      <div class="search-enterprise-description">
+        <% if enterprise.description %>
+          <% body_stripped = strip_tags(enterprise.description) %>
+        <% elsif enterprise.home_page and enterprise.home_page.body %>
+          <% body_stripped = strip_tags(enterprise.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 enterprise.region %>
+          <span class="search-enterprise-region-name"><%= city_with_state(enterprise.region) %></span>
+        <% end %>
+      </div>
+
+      <div class="search-enterprise-categorization">
+        <% enterprise.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>
+</li>
@@ -0,0 +1,25 @@
+<li class="search-event-item article-item">
+<%= link_to(event.title, event.url, :class => "search-result-title") %>
+<div class="search-content-first-column">
+  <%= render :partial => 'image', :object => event %>
+</div>
+<table class="noborder search-content-second-column">
+  <% if event.start_date %>
+    <tr class="search-article-event-date">
+      <td class="search-field-label"><%= _('Start date') %></td>
+      <td class="article-item-date"><%= event.start_date %></td>
+    </tr>
+  <% end %>
+  <% if event.end_date %>
+    <tr class="search-article-event-date">
+      <td class="search-field-label"><%= _('End date') %></td>
+      <td class="article-item-date"><%= event.end_date %></td>
+    </tr>
+  <% end %>
+
+  <%= render :partial => 'article_common', :object => event %>
+</table>
+<%= render :partial => 'article_last_change', :object => event %>
+
+<div style="clear: both"></div>
+</li>
@@ -0,0 +1,24 @@
+<li class="search-folder-item article-item">
+  <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => folder %>
+  </div>
+  <table class="noborder search-content-second-column">
+    <tr class="search-folder-items">
+      <td class="search-field-label"><%= _("Last items") %></td>
+
+      <% r = folder.children.last(3) %>
+      <td class="<%= "search-field-none" if r.empty? %>">
+        <% r.each do |a| %>
+          <%= link_to a.title, a.view_url, :class => 'search-folder-sample-item '+icon_for_article(a) %>
+        <% end %>
+        <%= _('None') if r.empty? %>
+      </td>
+    </tr>
+
+    <%= render :partial => 'article_common', :object => folder %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => folder %>
+
+  <div style="clear:both"></div>
+</li>
@@ -0,0 +1,24 @@
+<li class="search-forum-item article-item">
+  <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => forum %>
+  </div>
+  <table class="noborder search-content-second-column">
+    <tr class="search-forum-items">
+      <td class="search-field-label"><%= _("Last topics") %></td>
+
+      <% r = forum.children.find(:all, :order => :updated_at, :conditions => ['type != ?', 'RssFeed']).last(3) %>
+      <td class="<%= "search-field-none" if r.empty? %>">
+        <% r.each do |a| %>
+          <%= link_to a.title, a.view_url, :class => 'search-forum-sample-item '+icon_for_article(a) %>
+        <% end %>
+        <%= _('None') if r.empty? %>
+      </td>
+    </tr>
+
+    <%= render :partial => 'article_common', :object => forum %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => forum %>
+
+  <div style="clear:both"></div>
+</li>
@@ -0,0 +1,13 @@
+<li class="search-gallery article-item">
+  <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => gallery %>
+  </div>
+  <table class="noborder search-content-second-column">
+    <%= render :partial => 'article_common', :object => gallery %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => gallery %>
+
+  <div style="clear: both"></div>
+</li>
+
@@ -0,0 +1,85 @@
+<% extra_content = @plugins.dispatch(:asset_product_extras, product).collect { |content| instance_eval(&content) } %>
+<% extra_properties = @plugins.dispatch(:asset_product_properties, product)%>
+
+<li class="search-product-item <%= 'highlighted' if product.highlighted? %>">
+
+  <div class="search-product-item-first-column">
+    <%= render :partial => 'search/image', :object => product %>
+
+    <% if product.available %>
+      <% if product.price && product.price > 0 %>
+        <% has_discount = product.discount && product.discount > 0 %>
+        <% if product.price %>
+          <span class="search-product-price-textid"><%=_("from") if has_discount %></span><%= price_span(product.price, :class => "search-product-price " + (has_discount ? 'with-discount' : '')) %>
+          <% if has_discount %>
+            <span class="search-product-price-textid"><%=_("by")%></span><%= price_span(product.price_with_discount, :class => "search-product-price") %>
+          <% end %>
+          <% if product.unit %>
+            <span class="search-product-unit">&nbsp;<%= _('/') %>&nbsp;<%= product.unit.name %></span>
+          <% end %>
+        <% end %>
+        <div class="search-product-inputs-info">
+          <% if p = product.percentage_from_solidarity_economy %>
+            <div class="search-product-percentage-from-solidarity-economy search-product-ecosol-percentage-icon-<%= p[0].to_s %>"
+              title="<%=_('Percentage of inputs from solidarity economy')%>">
+              <%= p[1] %>
+            </div>
+          <% end %>
+
+          <% if product.price_described? %>
+            <% title = (product.inputs.relevant_to_price + product.price_details).map{ |i|
+              '<div class="search-product-input-dots-to-price">' +
+                '<div class="search-product-input-name">' + i.name + '</div>' +
+                price_span(i.price, :class => 'search-product-input-price') +
+              '</div>' }.join('') %>
+            <%= link_to_function _("Open Price"), '', :title => title, :class => "search-product-price-details" %>
+          <% end %>
+        </div>
+      <% end %>
+    <% else %>
+      <span class="product-not-available"><%= _('Not available') %></div>
+    <% end %>
+
+  </div>
+  <div class="search-product-item-second-column">
+    <%= link_to_product product, :class => 'search-result-title' %>
+    <div class="search-product-supplier">
+      <span class="search-field-label"><%= _('Supplier') %>  </span><%= link_to_homepage(product.enterprise.name, product.enterprise.identifier) %>
+    </div>
+    <div class="search-product-description">
+      <% if product.description %>
+        <% desc_stripped = strip_tags(product.description) %>
+        <span class="search-field-label"><%= _('Description') %>  </span><%= excerpt(desc_stripped, desc_stripped.first(3), 300) %>
+      <% end %>
+    </div>
+  </div>
+  <div class="search-product-item-third-column">
+    <div class="search-product-region">
+      <% if product.enterprise.region %>
+        <span class="search-field-label"><%= _('City') %></span>
+        <br /><%= city_with_state(product.enterprise.region) %>
+      <% end %>
+    </div>
+    <div class="search-product-qualifiers">
+      <% if product.product_qualifiers.count > 0 %>
+        <span class="search-field-label"><%= _('Qualifiers') %></span>
+        <% product.product_qualifiers.each do |pq| %>
+          <% if pq.qualifier %>
+            <span class="search-product-qualifier"><%= pq.qualifier.name + (pq.certifier.nil? ?  _(";") : '') %></span>
+          <% end %>
+          <% if pq.certifier %>
+            <span class="search-product-certifier">&nbsp;<%= _('cert. ') + pq.certifier.name + _(";") %></span>
+          <% end %>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+
+  <div style="clear: both"></div>
+
+  <%= extra_content.join('\n') %>
+  <% extra_properties.each do |property| %>
+    <div><%= property[:name] + ': ' + instance_eval(&property[:content]) %></div>
+  <% end %>
+
+</li>
@@ -0,0 +1,13 @@
+<li class="search-text-article-item article-item">
+  <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %>
+
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => text_article %>
+  </div>
+  <table class="noborder search-content-second-column">
+    <%= render :partial => 'article_common', :object => text_article %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => text_article %>
+
+  <div style="clear: both"></div>
+</li>
@@ -0,0 +1,25 @@
+<li class="search-uploaded-file-item article-item">
+  <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %>
+
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => uploaded_file %>
+  </div>
+
+  <table class="noborder search-content-second-column">
+    <%= render :partial => 'article_author', :object => uploaded_file %>
+    <%= render :partial => 'article_description', :object => uploaded_file %>
+
+    <% if uploaded_file.parent and uploaded_file.parent.published? %>
+      <tr class="search-uploaded-file-parent">
+        <td class="search-field-label"><%= uploaded_file.parent.gallery? ? _("Gallery") : _("Folder") %></td>
+        <td><%= link_to uploaded_file.parent.name, uploaded_file.parent.url %></td>
+      </tr>
+    <% end %>
+
+    <%= render :partial => 'article_tags', :object => uploaded_file.tags %>
+    <%= render :partial => 'article_categories', :object => uploaded_file.categories %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => uploaded_file %>
+
+  <div style="clear:both"></div>
+</li>
	@@ -3,7 +3,8 @@ class EnvironmentDesignController < BoxOrganizerController		@@ -3,7 +3,8 @@ class EnvironmentDesignController < BoxOrganizerController
3	protect 'edit_environment_design', :environment	3	protect 'edit_environment_design', :environment
4		4
5	def available_blocks	5	def available_blocks
6	- @available_blocks \|\|= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock ]	6	+ @available_blocks \|\|= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
		7	+ @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
7	end	8	end
8		9
9	end	10	end
	@@ -33,7 +33,7 @@ class RegionValidatorsController < AdminController		@@ -33,7 +33,7 @@ class RegionValidatorsController < AdminController
33	def load_region_and_search	33	def load_region_and_search
34	@region = environment.regions.find(params[:id])	34	@region = environment.regions.find(params[:id])
35	if params[:search]	35	if params[:search]
36	- @search = @region.search_possible_validators(params[:search])	36	+ @search = find_by_contents(:organizations, Organization, params[:search])[:results].reject {\|item\| @region.validator_ids.include?(item.id) }
37	end	37	end
38	end	38	end
39		39
		1	+require 'csv'
		2	+
1	class UsersController < AdminController	3	class UsersController < AdminController
2		4
3	protect 'manage_environment_users', :environment	5	protect 'manage_environment_users', :environment
	@@ -15,8 +17,16 @@ class UsersController < AdminController		@@ -15,8 +17,16 @@ class UsersController < AdminController
15	:disposition => "attachment; filename=users.xml"	17	:disposition => "attachment; filename=users.xml"
16	end	18	end
17	format.csv do	19	format.csv do
18	- @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
19	- render :template => "users/index_csv.rhtml", :content_type => 'text/csv', :layout => false	20	+ # using a direct connection with the dbms to optimize
		21	+ command = User.send(:sanitize_sql, ["SELECT profiles.name, users.email FROM profiles
		22	+ INNER JOIN users ON profiles.user_id=users.id
		23	+ WHERE profiles.environment_id = ?", environment.id])
		24	+ users = User.connection.execute(command)
		25	+ csv_content = "name;email\n"
		26	+ users.each { \|u\|
		27	+ CSV.generate_row([u['name'], u['email']], 2, csv_content, fs=';')
		28	+ }
		29	+ render :text => csv_content, :content_type => 'text/csv', :layout => false
20	end	30	end
21	end	31	end
22	end	32	end
	@@ -154,4 +154,18 @@ class ApplicationController < ActionController::Base		@@ -154,4 +154,18 @@ class ApplicationController < ActionController::Base
154	end	154	end
155	end	155	end
156		156
		157	+ def find_by_contents(asset, scope, query, paginate_options={:page => 1}, options={})
		158	+ scope = scope.send(options[:filter]) if options[:filter]
		159	+
		160	+ @plugins.first(:find_by_contents, asset, scope, query, paginate_options, options) \|\|
		161	+ fallback_find_by_contents(asset, scope, query, paginate_options, options)
		162	+ end
		163	+
		164	+ private
		165	+
		166	+ def fallback_find_by_contents(asset, scope, query, paginate_options, options)
		167	+ return {:results => scope.paginate(paginate_options)} if query.blank?
		168	+ {:results => scope.like_search(query).paginate(paginate_options)}
		169	+ end
		170	+
157	end	171	end
	@@ -270,7 +270,7 @@ class CmsController < MyProfileController		@@ -270,7 +270,7 @@ class CmsController < MyProfileController
270		270
271	def search	271	def search
272	query = params[:q]	272	query = params[:q]
273	- results = profile.files.published.find_by_contents(query)[:results]	273	+ results = find_by_contents(:uploaded_files, profile.files.published, query)[:results]
274	render :text => article_list_to_json(results), :content_type => 'application/json'	274	render :text => article_list_to_json(results), :content_type => 'application/json'
275	end	275	end
276		276
	@@ -32,7 +32,6 @@ class ProfileMembersController < MyProfileController		@@ -32,7 +32,6 @@ class ProfileMembersController < MyProfileController
32		32
33	def last_admin	33	def last_admin
34	@roles = [Profile::Roles.admin(environment.id)]	34	@roles = [Profile::Roles.admin(environment.id)]
35	- @pre_population = [].to_json
36	end	35	end
37		36
38	def add_role	37	def add_role
	@@ -7,7 +7,7 @@ class CatalogController < PublicController		@@ -7,7 +7,7 @@ class CatalogController < PublicController
7	def index	7	def index
8	@category = params[:level] ? ProductCategory.find(params[:level]) : nil	8	@category = params[:level] ? ProductCategory.find(params[:level]) : nil
9	@products = @profile.products.from_category(@category).paginate(:order => 'available desc, highlighted desc, name asc', :per_page => 9, :page => params[:page])	9	@products = @profile.products.from_category(@category).paginate(:order => 'available desc, highlighted desc, name asc', :per_page => 9, :page => params[:page])
10	- @categories = ProductCategory.on_level(params[:level])	10	+ @categories = ProductCategory.on_level(params[:level]).order(:name)
11	end	11	end
12		12
13	protected	13	protected
	@@ -11,7 +11,7 @@ class ProfileSearchController < PublicController		@@ -11,7 +11,7 @@ class ProfileSearchController < PublicController
11	if params[:where] == 'environment'	11	if params[:where] == 'environment'
12	redirect_to :controller => 'search', :query => @q	12	redirect_to :controller => 'search', :query => @q
13	else	13	else
14	- @results = profile.articles.published.find_by_contents(@q, {:per_page => 10, :page => params[:page]})[:results]	14	+ @results = find_by_contents(:articles, profile.articles.published, @q, {:per_page => 10, :page => params[:page]})[:results]
15	end	15	end
16	end	16	end
17	end	17	end
	@@ -3,7 +3,24 @@ module BlockHelper		@@ -3,7 +3,24 @@ module BlockHelper
3	def block_title(title)	3	def block_title(title)
4	tag_class = 'block-title'	4	tag_class = 'block-title'
5	tag_class += ' empty' if title.empty?	5	tag_class += ' empty' if title.empty?
6	- content_tag 'h3', content_tag('span', title), :class => tag_class	6	+ content_tag 'h3', content_tag('span', h(title)), :class => tag_class
		7	+ end
		8	+
		9	+ def highlights_block_config_image_fields(block, image={})
		10	+ "
		11	+ <tr class=\"image-data-line\">
		12	+ <td>
		13	+ #{select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i).html_safe}
		14	+ </td>
		15	+ <td>#{text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 20}</td>
		16	+ <td>#{text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 1}</td>
		17	+ </tr><tr class=\"image-title\">
		18	+ <td colspan=\"3\"><label>#{
		19	+ content_tag('span', _('Title')) +
		20	+ text_field_tag('block[images][][title]', image[:title], :class => 'highlight-title', :size => 45)
		21	+ }</label></td>
		22	+ </tr>
		23	+ "
7	end	24	end
8		25
9	end	26	end
	@@ -21,7 +21,7 @@ module CatalogHelper		@@ -21,7 +21,7 @@ module CatalogHelper
21		21
22	def category_sub_links(category)	22	def category_sub_links(category)
23	sub_categories = []	23	sub_categories = []
24	- category.children.each do \|sub_category\|	24	+ category.children.order(:name).each do \|sub_category\|
25	sub_categories << category_link(sub_category, true)	25	sub_categories << category_link(sub_category, true)
26	end	26	end
27	content_tag('ul', sub_categories) if sub_categories.size > 1	27	content_tag('ul', sub_categories) if sub_categories.size > 1