[Mezuro] Merge branch 'master' into mezuro

Paulo Meireles
2 parents 0e8830f9 8f081d75
Showing 507 changed files with 80620 additions and 72719 deletions Show diff stats
AUTHORS
Gemfile
Gemfile.lock
HACKING
INSTALL
INSTALL.email
INSTALL.varnish
app/controllers/admin/environment_design_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/catalog_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/catalog_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/display_helper.rb
app/helpers/folder_helper.rb
app/helpers/forms_helper.rb
@@ -6,45 +6,144 @@ noosfero, that&#39;s not a problem).
 Developers
 ==========
+Alan Freihof Tygel <alantygel@gmail.com>
+Alessandro Palmeira <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
+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 + Diego Araújo <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araújo <diegoamc90@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 + Jefferson Fernandes <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + João M. M. da Silva <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 + Rafael Manzo <alessandro.palmeira@gmail.com>
 Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
 Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
 Antonio Terceiro <terceiro@colivre.coop.br>
 Aurelio A. Heckert <aurelio@colivre.coop.br>
 Braulio Bhavamitra <brauliobo@gmail.com>
 Bráulio Bhavamitra <brauliobo@gmail.com>
+Caio <caio.csalgado@gmail.com>
+Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
+Caio, Pedro <caio.csalgado@gmail.com>
+Caio Salgado + Alessandro Palmeira <caio.csalgado@gmail.com>
+Caio Salgado <caio.csalgado@gmail.com>
+Caio Salgado + Carlos Morais + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
+Caio Salgado + Diego Araujo <caio.csalgado@gmail.com>
+Caio Salgado + Diego Araújo <caio.csalgado@gmail.com>
+Caio Salgado + Diego Araújo <diegoamc90@gmail.com>
+Caio Salgado + Diego Araújo + Jefferson Fernandes <caio.csalgado@gmail.com>
+Caio Salgado + Diego Araújo + João M. M. da Silva <caio.csalgado@gmail.com>
+Caio Salgado + Diego Araújo + Pedro Leal <caio.csalgado@gmail.com>
+Caio Salgado + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
+Caio Salgado + Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
+Caio Salgado + Jefferson Fernandes <caio.csalgado@gmail.com>
+Caio Salgado + Jefferson Fernandes <jeffs.fernandes@gmail.com>
+Caio Salgado + Rafael Manzo <caio.csalgado@gmail.com>
+Caio Salgado + Renan Teruo <caio.csalgado@gmail.com>
+Caio Salgado + Renan Teruo <caio.salgado@gmail.com>
+Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
+Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
 Caio SBA <caio@colivre.coop.br>
 Carlos Morais <carlos88morais@gmail.com>
 Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
+Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
 Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
+Carlos Morais + Pedro Leal <carlos88morais@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 Araujo + Caio Salgado <diegoamc90@gmail.com>
 Diego Araújo <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 <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 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 + Jefferson <diegoamc90@gmail.com>
+Diego Martinez <diegoamc90@gmail.com>
+Diego + Renan <renanteruoc@gmail.com>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
 Grazieno Pellegrino <grazieno@gmail.com>
 Isaac Canan <isaac@intelletto.com.br>
 Italo Valcy <italo@dcc.ufba.br>
+Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
+Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
+Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
 João da Silva <jaodsilv@linux.ime.usp.br>
+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>
+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>
+João M. M. da Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Carlos Morais <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Diego Araújo <diegoamc90@gmail.com>
 João M. M. da Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Diego Araújo + Pedro Leal <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva <jaodsilv@linux.ime.usp.br>
+Joao M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + João M. Miranda <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Pedro Leal <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Rafael Manzo + Diego Araújo <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
+João M. M. Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
+João M. M. Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
+Joao M. M. Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
+João M. M. Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
+João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
+João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
 Joenio Costa <joenio@colivre.coop.br>
 Josef Spillner <josef.spillner@tu-dresden.de>
 Keilla Menezes <keilla@colivre.coop.br>
 Larissa Reis <larissa@colivre.coop.br>
 Larissa Reis <reiss.larissa@gmail.com>
 Leandro Nunes dos Santos <leandronunes@gmail.com>
+Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
 LinguÁgil 2010 <linguagil.bahia@gmail.com>
+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 <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>
 Rafael Gomes <rafaelgomes@techfree.com.br>
+Rafael Manzo + João M. M. Silva <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 <rr.manzo@gmail.com>
 Raphaël Rousseau <raph@r4f.org>
 Raquel Lira <raquel.lira@gmail.com>
+Renan Teruo + Caio Salgado <renanteruoc@gmail.com>
+Renan Teruoc + Diego Araujo <renanteruoc@gmail.com>
+Renan Teruo + Diego Araujo <renanteruoc@gmail.com>
+Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
+Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
+Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
 Rodrigo Souto <rodrigo@colivre.coop.br>
 Ronny Kursawe <kursawe.ronny@googlemail.com>
 Samuel R. C. Vale <srcvale@holoscopio.com>
 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'
+
 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/
   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)
 = Noosfero instructions for developers
-This document provides useful information to those who want to help with
-Noosfero development.
+== A work about your the development platform
-== Requirements for development
+These instructions are tested and known to work on Debian stable, which is the
+system that the Noosfero core developers use to work on Noosfero.
-First, install all requirements listed in INSTALL. Note that you do not need to
-follow all the steps described there, you only need to install the packages
-listed in the "Requirements" section.
+If you want to use another OS, read "Instructions for other systems" below.
-After installing the requirements listed in INSTALL, you need to install some
-packages be able to run Noosfero tests. On Debian GNU/Linux and Debian-based
-systems, you install them with the following command:
+== Instructions for Debian stable
- # apt-get install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev
+Download the source code:
-On other systems, they may or may not be available through your regular package
-management system. Below are the links to their homepages.
+  $ git clone git://gitorious.org/noosfero/noosfero.git
+  $ cd noosfero
-* Mocha: http://mocha.rubyforge.org/
-* Tidy: http://tidy.sourceforge.net/
-* Hpricot: http://github.com/whymirror/hpricot
-* Imagemagick: http://wwwimagemagick.org/
-* po4a: http://po4a.alioth.debian.org/
-* xvfb: http://packages.debian.org/lenny/xvfb
-* Libxml2: http://xmlsoft.org/
-* Libxslt: http://xmlsoft.org/xslt
+Run the quick start script:
-== Boostraping a development/test environment
+  $ ./script/quick-start
-You can copy and paste the commands below into a terminal (please review the
-commands and make sure you understand what you are doing):
+Now you can execute the development server with:
- # checkout the code from repository
- git clone git://gitorious.org/noosfero/noosfero.git
- # enter the directory
- cd noosfero
- # copy a sample config file
- cp config/database.yml.sqlite3 config/database.yml
- # create tmp directory if it doesn't exist
- mkdir tmp
- # start Solr
- rake solr:start
- # create the development database
- rake db:schema:load
- # run pending migrations
- rake db:migrate
- # compile translations:
- rake makemo
- # create some test data:
- ./script/sample-data
- # install latest requirements for running tests
- RAILS_ENV=cucumber rake gems:install
- RAILS_ENV=test rake gems:install
- # run the automated test suite to make sure your environment is sane:
- rake test
+  $ ./script/development
-You should now be ready to go. Issue the following command to start the Rails
-development server:
+You will be able to access Noosfero at http://localhost:3000/
- ./script/server
+If you want to use a different port than 3000, pass `-p <PORT>` to
+./script/development
-The server will be available at http://localhost:3000/ . If you want to use
-another port than 3000, you can use the -p option of ./script/server:
+== Instructions for other systems
- ./script/server -p 9999
+On other OS, you have 2 options:
-The above command makes the server available at http://localhost:9999/
+1) using a chroot or a VM with Debian stable (easier)
-The sample-data data scripts creates two administrator users with login "ze" and
-password "test" and login "adminuser" and password "admin".
+Use a chroot (http://wiki.debian.org/Schroot) or a Virtual Machine (e.g. with
+VirtualBox) with a Debian stable system and follow the instructions above for
+Debian stable.
-Note that some operations, like generating image thumbnails, sending e-mails,
-etc, are done in background in the context of a service independent from the
-Rails application server. To have those tasks performed in a development
-environment, you must run the delayed_job server like this:
+2) Installing dependencies on other OS (harder)
- ./script/delayed_job run
+If you want to setup a development environment in another OS, you can create a
+file under script/install-dependencies/, called <OS>-<CODENAME>.sh, which
+installed the dependencies for your system. With this script in place,
+./script/quick-start will call it at the point of installing the required
+packages for Noosfero development.
-This will block your terminal. To stop the delayed_job server, hit Control-C.
+You can check script/install-dependencies/debian-squeeze.sh to have an idea of
+what kind of stuff that script has to do. 
-== Enabling exceptions notification
-
-By default, exception notifications are disabled in development environment. If
-you want to enable it then you need to change some files:
-
-1) Add in config/environments/development.rb:
-   config.action_controller.consider_all_requests_local = false
-
-2) Add in app/controller/application.rb:
-   local_addresses.clear
-
-3) Add in config/noosfero.yml at development section:
-   exception_recipients: [admin@example.com]
-
-== Releasing and building Debian package
-
-See RELEASING file.
+If you write such script for your own OS, *please* share it with us at the
+development mailing list so that we can include it in the official repository.
+This way other people using the same OS will have to put less effort to develop
+Noosfero.
-= Noosfero installation instructions
+= Noosfero installation instructions from source for production environments
-Noosfero is written in Ruby with the "Rails framework":http://www.rubyonrails.org,
-so the process of setting it up is pretty similar to other Rails applications.
+The instructions below can be used for setting up a Noosfero production
+environment from the Noosfero sources.
-Below we have the instructions for installing Noosfero dependencies and setting
-up a production environment. If you have problems with the setup, please feel
-free to ask questions in the development mailing list.
+Before you start installing Noosfero manually, see the information about the
+Noosfero Debian package at http://noosfero.org/Development/DebianPackage. Using
+the Debian packages on a Debian stable system is the recommended method for
+installing production environments.
+
+If you want to setup a development environment instead of a production one,
+stop reading this file right now and read the file HACKING instead.
+
+For a complete installation guide, please see the following web page:
+http://noosfero.org/Development/HowToInstall
+
+If you have problems with the setup, please feel free to ask questions in the
+development mailing list.
 == Requirements
+DISCLAIMER: this installation procedure is tested with Debian stable, which is
+currently the only recommended operating system for production usage. It is
+possible that you can install it on other systems, and if you do so, please
+report it on one of the Noosfero mailing lists, and please send a patch
+updating these instructions.
+
+Noosfero is written in Ruby with the "Rails
+framework":http://www.rubyonrails.org, so the process of setting it up is
+pretty similar to other Rails applications.
+
 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:
@@ -38,21 +58,9 @@ If you manage to install Noosfero successfully on other systems than Debian,
 please feel free to contact the Noosfero development mailing with the
 instructions for doing so, and we'll include it here.
-=== Setting up a production environment
-
-DISCLAIMER: this installation procedure is tested with Debian stable, which is
-currently the only recommended operating system for production usage. It is
-possible that you can install it on other systems, and if you do so, please
-report it on one of the Noosfero mailing lists, and please send a patch
-updating these instructions.
-
 As root user
 ============
-NOTE: these instructions are for seting up a *production* environment. If you
-are going to do Noosfero development, you don't need to do these steps. Stop
-here and see the HACKING file instead.
-
 Install memcached. On Debian:
 # apt-get install memcached
@@ -96,11 +104,11 @@ $ git checkout -b stable origin/stable
 downloading tarball
 -------------------
-Note: replace 0.35.0 below from the latest stable version.
+Note: replace 0.39.0 below from the latest stable version.
-$ wget http://noosfero.org/pub/Development/NoosferoVersion00x35x00/noosfero-0.35.0.tar.gz
-$ tar -zxvf noosfero-0.35.0.tar.gz
-$ ln -s noosfero-0.35.0 current
+$ wget http://noosfero.org/pub/Development/NoosferoVersion00x39x00/noosfero-0.39.0.tar.gz
+$ 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
@@ -108,7 +116,7 @@ probably not need to customize this configuration, but have a look at it.
 Create the thin configuration file:
-$ thin -C config/thin.yml config
+$ thin -C config/thin.yml -e production config
 Edit config/thin.yml to suit your needs. Make sure your apache
 configuration matches the thin cluster configuration, specially in respect
@@ -147,48 +155,7 @@ Restart postgresql:
 Noosfero needs a functional e-mail setup to work: the local mail system should
 be able to deliver e-mail to the internet, either directly or through an
-external SMTP server.
-
-If you know mail systems well, you just need to make sure thet the local MTA,
-listening on localhost:25, is able to deliver e-mails to the internet. Any mail
-server will do it.
-
-If you are not a mail specialist, we suggest that you use the Postfix mail
-server, since it is easy to configure and very reliable. Just follow the
-instructions below.
-
-To install Postfix:
-
-# apt-get install postfix
-
-During the installation process, you will be asked a few questions. Your answer
-to them will vary in 2 cases:
-
-Case 1: you can send e-mails directly to the internet. This will be the case
-for most commercial private servers. Your answers should be:
-
-  General type of mail configuration: Internet site
-  System mail name: the name of your domain, e.g. "mysocialnetwork.com"
-
-Case 2: you cannot, or don't want to, send e-mail directly to the internet.
-This happens for example if your server is not allowed to make outbound
-connections on port 25, or if you want to concentrate all your outbound mail
-through a single SMTP server. Your answers in this case should be:
-
-  General type of mail configuration: Internet with smarthost
-  System mail name: the name of your domain, e.g. "mysocialnetwork.com"
-  SMTP relay host: smtp.yourprovider.com
-
-Note that smtp.yourprovider.com must allow your server to deliver e-mails
-through it. You should probably ask your servive provider about this.
-
-There is another possibility: if you are installing on a shared server, and
-don't have permission to configure the local MTA, you can instruct Noosfero to
-send e-mails directly through an external server. Please note that this should
-be your last option, since contacting an external SMTP server directly may slow
-down your Noosfero application server. To configure Noosfero to send e-mails
-through an external SMTP server, follow the instructions on
-http://noosfero.org/Development/SMTPMailSending
+external SMTP server. Please check the documentation at the INSTALL.email file.
 As noosfero user
 ================
@@ -220,19 +187,6 @@ $ ./script/dbconsole production
 If it connects to your database, then everything is fine. If you got an error
 message, then you have to check your database configuration.
-Installing gem rack
-===================
-
-This gem is required if you want to run Mezuro plugin.
-
-Install RubyGem Rack 1.0.1.
-Others versions may not be compatible with Noosfero:
-
-# gem install rack -v 1.0.1
-
-As noosfero user
-================
-
 Create the database structure:
 $ RAILS_ENV=production rake db:schema:load
@@ -245,7 +199,7 @@ Run Solr:
 $ rake solr:start
-Now we have to create some initial data. To create your default environment
+Now we must create some initial data. To create your default environment
 (the first one), run the command below:
 $ RAILS_ENV=production ./script/runner 'Environment.create!(:name => "My environment", :is_default => true)'
@@ -261,10 +215,10 @@ $ RAILS_ENV=production ./script/runner &quot;Environment.default.domains &lt;&lt; Domain.ne
 Add at least one user as admin of environment:
-$ RAILS_ENV=production ./script/runner "User.create(:login => 'adminuser', :email => 'admin@example.com', :password => 'admin', :password_confirmation => 'admin', :environment => Environment.default)"
+$ RAILS_ENV=production ./script/runner "User.create(:login => 'adminuser', :email => 'admin@example.com', :password => 'admin', :password_confirmation => 'admin', :environment => Environment.default, :activated_at => Time.new)"
 (replace "adminuser", "admin@example.com", "admin" with the login, email
-and password of your environment admin)
+and password of your environment administrator)
 To start the Noosfero application servers:
@@ -274,23 +228,6 @@ At this point you have a functional Noosfero installation running, the only
 thing left is to configure your webserver as a reverse proxy to pass requests
 to them.
-Enabling exception notifications
-================================
-
-This is an optional step. You will need it only if you want to receive e-mail
-notifications when some exception occurs on Noosfero.
-
-First, install this version of the gem.
-Others versions may not be compatible with Noosfero:
-
-# gem install exception_notification -v 1.0.20090728
-
-You can configure the e-mails that will receive the notifications.
-Change the file config/noosfero.yml as the following example, replacing the
-e-mails by real ones:
-
-  production:
-    exception_recipients: [admin@example.com, you@example.com]
 ==================
 Apache instalation
@@ -384,6 +321,26 @@ Now restart your apache server (as root):
 # invoke-rc.d apache2 restart
+
+Enabling exception notifications
+================================
+
+This is an optional step. You will need it only if you want to receive e-mail
+notifications when some exception occurs on Noosfero.
+
+First, install this version of the gem.
+Others versions may not be compatible with Noosfero:
+
+# gem install exception_notification -v 1.0.20090728
+
+You can configure the e-mails that will receive the notifications.
+Change the file config/noosfero.yml as the following example, replacing the
+e-mails by real ones:
+
+  production:
+    exception_recipients: [admin@example.com, you@example.com]
+
+
 ============
 Maintainance
 ============
@@ -0,0 +1,43 @@
+= Noosfero email setup
+
+If you know mail systems well, you just need to make sure that the local MTA,
+listening on localhost:25, is able to deliver e-mails to the internet. Any mail
+server will do it. You can stop reading now.
+
+If you are not an email specialist, then follow the instructions below. We
+suggest that you use the Postfix mail server, since it is easy to configure and
+very reliable. Just follow the instructions below.
+
+To install Postfix:
+
+# apt-get install postfix
+
+During the installation process, you will be asked a few questions. Your answer
+to them will vary in 2 cases:
+
+Case 1: you can send e-mails directly to the internet. This will be the case
+for most commercial private servers. Your answers should be:
+
+  General type of mail configuration: Internet site
+  System mail name: the name of your domain, e.g. "mysocialnetwork.com"
+
+Case 2: you cannot, or don't want to, send e-mail directly to the internet.
+This happens for example if your server is not allowed to make outbound
+connections on port 25, or if you want to concentrate all your outbound mail
+through a single SMTP server. Your answers in this case should be:
+
+  General type of mail configuration: Internet with smarthost
+  System mail name: the name of your domain, e.g. "mysocialnetwork.com"
+  SMTP relay host: smtp.yourprovider.com
+
+Note that smtp.yourprovider.com must allow your server to deliver e-mails
+through it. You should probably ask your servive provider about this.
+
+There is another possibility: if you are installing on a shared server, and
+don't have permission to configure the local MTA, you can instruct Noosfero to
+send e-mails directly through an external server. Please note that this should
+be your last option, since contacting an external SMTP server directly may slow
+down your Noosfero application server. To configure Noosfero to send e-mails
+through an external SMTP server, follow the instructions on
+http://noosfero.org/Development/SMTPMailSending
+
@@ -5,75 +5,67 @@ recommended. See http://www.varnish-cache.org/ for more information on Varnish.
 Varnish can be set up to use with Noosfero with the following steps:
-1) setup Noosfero with apache according to the INSTALL file.
+1) setup Noosfero with apache according to the INSTALL file. If you used the
+Debian package to install noosfero, you don't need to do anything about this.
 2) install Varnish
   # apt-get install varnish
-Noosfero was tested with Varnish 2.x. If you are using a Debian Lenny (and you
-should, unless Debian already released Squeeze by now), make sure you install
-varnish from the lenny-backports suite.
-
 Install the RPAF apache module (or skip this step if not using apache):
   # apt-get install libapache2-mod-rpaf
-3) Enable varnish logging:
+3) Change Apache to listen on port 8080 instead of 80
-3a) Edit /etc/default/varnishncsa and uncomment the line that contains:
+3a) Edit /etc/apache2/ports.conf, and:
-VARNISHNCSA_ENABLED=1
+  * change 'NameVirtualHost *:80' to 'NameVirtualHost *:8080'
+  * change 'Listen 80' to 'Listen 127.0.0.1:8080'
-The varnish log will be written to /var/log/varnish/varnishncsa.log in an
-apache-compatible format. You should change your statistics generation software
-(e.g. awstats) to use that instead of apache logs.
+3b) Edit /etc/apache2/sites-enabled/*, and change '<VirtualHost *:80>' to
+'<VirtualHost *:8080>'
-3b) Restart Varnish Logging service
+3c) Restart apache
-  # invoke-rc.d varnishncsa start
+  # invoke-rc.d apache2 restart
-4) Change Apache to listen on port 8080 instead of 80
+4) Varnish configuration
-4a) Edit /etc/apache2/ports.conf, and:
+4a) Edit /etc/default/varnish
-  * change 'Listen 80' to 'Listen 127.0.0.1:8080'
-  * change 'NameVirtualHost *:80' to 'NameVirtualHost *:8080'
+   * change the line that says "START=no" to say "START=yes"
+   * change '-a :6081' to '-a :80'
-4b) Edit /etc/apache2/sites-enabled/*, and change '<VirtualHost *:80>' to '<VirtualHost *:8080>'
+4b) Edit /etc/varnish/default.vcl and add the following lines at the end:
-4c) Restart apache
+  include "/etc/noosfero/varnish-noosfero.vcl";
+  include "/etc/noosfero/varnish-accept-language.vcl";
-  # invoke-rc.d apache2 restart
+On manual installations, change "/etc/noosfero/*" to
+"{Rails.root}/etc/noosfero/*"
-5) Change Varnish to listen on port 80
+NOTE: it is very important that the *.vcl files are included in that order,
+i.e. *first* include "varnish-noosfero.vcl", and *after*
+"noosfero-accept-language.cvl".
-5a) Edit /etc/default/varnish and change '-a :6081' to '-a :80'
-
-5b) Restart Varnish
+4c) Restart Varnish
   # invoke-rc.d varnish restart
-6) Configure varnish to fit noosfero
-(assuming Noosfero is installed in /var/lib/noosfero)
-
-6a) Configure noosfero to do specific routines to varnish
-
-Add the following line to your /etc/varnish/default.vcl file:
+5) Enable varnish logging:
-  include "/var/lib/noosfero/etc/noosfero/varnish-noosfero.vcl";
+5a) Edit /etc/default/varnishncsa and uncomment the line that contains:
-6b) Configure varnish to store separate caches for each language
-
-Add the following line to your /etc/varnish/default.vcl file:
+VARNISHNCSA_ENABLED=1
-  include "/var/lib/noosfero/etc/noosfero/varnish-accept-language.vcl";
+The varnish log will be written to /var/log/varnish/varnishncsa.log in an
+apache-compatible format. You should change your statistics generation software
+(e.g. awstats) to use that instead of apache logs.
-7) Restart Varnish
+5b) Restart Varnish Logging service
-  # invoke-rc.d varnish restart
+  # invoke-rc.d varnishncsa restart
 Thanks to Cosimo Streppone for varnish-accept-language. See
 http://github.com/cosimo/varnish-accept-language for more information.
-
- -- Antonio Terceiro <terceiro@colivre.coop.br>  Sat, 04 Sep 2010 17:29:27 -0300
@@ -3,7 +3,7 @@ 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 ]
   end
 end
@@ -16,7 +16,13 @@ class CmsController &lt; MyProfileController
   before_filter :login_required, :except => [:suggest_an_article]
-  protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish] do |c, user, profile|
+  protect_if :only => :upload_files do |c, user, profile|
+    article_id = c.params[:parent_id]
+    (!article_id.blank? && profile.articles.find(article_id).allow_create?(user)) ||
+    (user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile)))
+  end
+
+  protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish, :upload_files] do |c, user, profile|
     user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile))
   end
@@ -92,7 +98,7 @@ class CmsController &lt; MyProfileController
       @article_types = []
       available_article_types.each do |type|
         @article_types.push({
-          :name => type.name,
+          :class => type,
           :short_description => type.short_description,
           :description => type.description
         })
@@ -154,7 +160,7 @@ class CmsController &lt; MyProfileController
     end
     if request.post? && params[:uploaded_files]
       params[:uploaded_files].each do |file|
-        @uploaded_files << UploadedFile.create(:uploaded_data => file, :profile => profile, :parent => @parent) unless file == ''
+        @uploaded_files << UploadedFile.create(:uploaded_data => file, :profile => profile, :parent => @parent, :last_changed_by => user) unless file == ''
       end
       @errors = @uploaded_files.select { |f| f.errors.any? }
       if @errors.any?
@@ -9,7 +9,7 @@ class TasksController &lt; MyProfileController
   end
   def processed
-    @tasks = Task.to(profile).finished.sort_by(&:created_at)
+    @tasks = Task.to(profile).closed.sort_by(&:created_at)
   end
   VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]
@@ -4,6 +4,7 @@ class AccountController &lt; ApplicationController
   before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise]
   before_filter :redirect_if_logged_in, :only => [:login, :signup]
+  before_filter :protect_from_bots, :only => :signup
   # say something nice, you goof!  something sweet.
   def index
@@ -55,6 +56,11 @@ class AccountController &lt; ApplicationController
     render :action => 'login', :layout => false
   end
+  def signup_time
+    key = set_signup_start_time_for_now
+    render :text => { :ok=>true, :key=>key }.to_json
+  end
+
   # action to register an user to the application
   def signup
     if @plugins.dispatch(:allow_user_registration).include?(false)
@@ -62,12 +68,9 @@ class AccountController &lt; ApplicationController
       session[:notice] = _("This environment doesn't allow user registration.")
     end
+    @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
@@ -76,19 +79,28 @@ class AccountController &lt; ApplicationController
       @person = Person.new(params[:profile_data])
       @person.environment = @user.environment
       if request.post?
-        @user.signup!
-        owner_role = Role.find_by_name('owner')
-        @user.person.affiliate(@user.person, [owner_role]) if owner_role
-        invitation = Task.find_by_code(@invitation_code)
-        if invitation
-          invitation.update_attributes!({:friend => @user.person})
-          invitation.finish
-        end
-        if @user.activated?
-          self.current_user = @user
-          redirect_to '/'
+        if may_be_a_bot
+          set_signup_start_time_for_now
+          @block_bot = true
+          session[:may_be_a_bot] = true
         else
-          @register_pending = true
+          if session[:may_be_a_bot]
+            return false unless verify_recaptcha :model=>@user, :message=>_('Captcha (the human test)')
+          end
+          @user.signup!
+          owner_role = Role.find_by_name('owner')
+          @user.person.affiliate(@user.person, [owner_role]) if owner_role
+          invitation = Task.find_by_code(@invitation_code)
+          if invitation
+            invitation.update_attributes!({:friend => @user.person})
+            invitation.finish
+          end
+          if @user.activated?
+            self.current_user = @user
+            redirect_to '/'
+          else
+            @register_pending = true
+          end
         end
       end
     rescue ActiveRecord::RecordInvalid
@@ -97,6 +109,7 @@ class AccountController &lt; ApplicationController
       @person.errors.delete(:user_id)
       render :action => 'signup'
     end
+    clear_signup_start_time
   end
   # action to perform logout from the application
@@ -271,7 +284,36 @@ class AccountController &lt; ApplicationController
   def no_redirect
     @cannot_redirect = true
   end
-  
+
+  def set_signup_start_time_for_now
+    key = 'signup_start_time_' + rand.to_s.split('.')[1]
+    Rails.cache.write key, Time.now
+    key
+  end
+
+  def get_signup_start_time
+    Rails.cache.read params[:signup_time_key]
+  end
+
+  def clear_signup_start_time
+    Rails.cache.delete params[:signup_time_key] if params[:signup_time_key]
+  end
+
+  def may_be_a_bot
+    # No minimum signup delay, no bot test.
+    return false if environment.min_signup_delay == 0
+
+    # answering captcha, may be human!
+    return false if params[:recaptcha_response_field]
+
+    # never set signup_time, hi wget!
+    signup_start_time = get_signup_start_time
+    return true if signup_start_time.nil?
+
+    # so fast, so bot.
+    signup_start_time > ( Time.now - environment.min_signup_delay.seconds )
+  end
+
   def check_answer
     unless answer_correct
       @enterprise.block
 class CatalogController < PublicController
   needs_profile
+  no_design_blocks
   before_filter :check_enterprise_and_environment
   def index
-    @products = @profile.products.paginate(:order => 'name asc', :per_page => 9, :page => params[:page])
+    @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]).order(:name)
   end
   protected
@@ -25,24 +25,26 @@ class ContentViewerController &lt; ApplicationController
           return
         end
       end
-
-      # page not found, give error
-      if @page.nil?
-        render_not_found(@path)
-        return
-      end
     end
-    if !@page.display_to?(user)
-      if profile.display_info_to?(user) || !profile.visible?
-        message = _('You are not allowed to view this content. You can contact the owner of this profile to request access then.')
+    if !@page.nil? && !@page.display_to?(user)
+      if !profile.public?
+        private_profile_partial_parameters
+        render :template => 'profile/_private_profile.rhtml', :status => 403
+      else #if !profile.visible?
+        message = _('You are not allowed to view this content.')
+        message += ' ' + _('You can contact the owner of this profile to request access then.')
         render_access_denied(message)
-      elsif !profile.public?
-        redirect_to :controller => 'profile', :action => 'index', :profile => profile.identifier
       end
       return
     end
+    # page not found, give error
+    if @page.nil?
+      render_not_found(@path)
+      return
+    end
+
     if request.xhr? && params[:toolbar]
       render :partial => 'article_toolbar'
       return
@@ -368,18 +368,13 @@ class ProfileController &lt; PublicController
   end
   def private_profile
-    if profile.person?
-      @action = :add_friend
-      @message = _("The content here is available to %s's friends only.") % profile.short_name
-    else
-      @action = :join
-      @message = _('The contents in this community is available to members only.')
-    end
-    @no_design_blocks = true
+    private_profile_partial_parameters
   end
   def invisible_profile
-    render_access_denied(_("This profile is inaccessible. You don't have the permission to view the content here."), _("Oops ... you cannot go ahead here"))
+    unless profile.is_template?
+      render_access_denied(_("This profile is inaccessible. You don't have the permission to view the content here."), _("Oops ... you cannot go ahead here"))
+    end
   end
   def per_page
@@ -1284,7 +1284,7 @@ module ApplicationHelper
       (user.already_reported?(profile) ?
         content_tag('a', text, :class => klass + ' disabled comment-footer comment-footer-link', :title => already_reported_message) :
         link_to(text, url, :class => klass + ' comment-footer comment-footer-link', :title => report_profile_message)
-      ) + content_tag('span', ' | ', :class => 'comment-footer comment-footer-hide')
+      ) + content_tag('span', ' ', :class => 'comment-footer comment-footer-hide')
     end
   end
@@ -1337,11 +1337,12 @@ module ApplicationHelper
     counter = 0
     radios = klass.templates.map do |template|
       counter += 1
-      content_tag('li', labelled_radio_button(template.name, "#{field_name}[template_id]", template.id, 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")
-    content_tag('div', content_tag('span', _('Template:')) +
-      content_tag('ul', radios, :style => 'list-style: none; padding-left: 0; margin-top: 0.5em;'),
+    content_tag('div', content_tag('label', _('Profile organization'), :for => 'template-options', :class => 'formlabel') +
+      content_tag('p', _('Your profile will be created according to the selected template. Click on the options to view them.'), :style => 'margin: 5px 15px;padding: 0px 10px;') +
+      content_tag('ul', radios, :style => 'list-style: none; padding-left: 20px; margin-top: 0.5em;'),
       :id => 'template-options',
       :style => 'margin-top: 1em'
     )
@@ -1410,4 +1411,16 @@ module ApplicationHelper
     options[:class] = "comment-footer comment-footer-link comment-footer-hide"
     expirable_content_reference content, action, text, url, options
   end
+
+  def private_profile_partial_parameters
+    if profile.person?
+      @action = :add_friend
+      @message = _("The content here is available to %s's friends only.") % profile.short_name
+    else
+      @action = :join
+      @message = _('The contents in this community is available to members only.')
+    end
+    @no_design_blocks = true
+  end
+
 end
@@ -3,4 +3,28 @@ module CatalogHelper
   include DisplayHelper
   include ManageProductsHelper
+  def breadcrumb(category)
+    start = link_to(_('Start'), {:action => 'index'})
+    ancestors = category.ancestors.map { |c| link_to(c.name, {:action => 'index', :level => c.id}) }.reverse
+    current_level = content_tag('strong', category.name)
+    all_items = [start] + ancestors + [current_level]
+    content_tag('div', all_items.join(' &rarr; '), :id => 'breadcrumb')
+  end
+
+  def category_link(category, sub = false)
+    count = profile.products.from_category(category).count
+    name = truncate(category.name, :length => 22 - count.to_s.size)
+    link_name = sub ? name : content_tag('strong', name)
+    link = link_to(link_name, {:action => 'index', :level => category.id}, :title => category.name)
+    content_tag('li', "#{link} (#{count})") if count > 0
+  end
+
+  def category_sub_links(category)
+    sub_categories = []
+    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
+  end
+
 end
@@ -26,7 +26,7 @@ module ContentViewerHelper
       end
       title << content_tag('span',
         content_tag('span', show_date(article.published_at), :class => 'date') +
-        content_tag('span', [_(", by %s") % link_to(article.author_name, article.author.url)], :class => 'author') +
+        content_tag('span', [_(", by %s") % link_to(article.author_name, article.author_url)], :class => 'author') +
         content_tag('span', comments, :class => 'comments'),
         :class => 'created-at'
       )
@@ -8,6 +8,14 @@ module DisplayHelper
             opts
   end
+  def themed_path(file)
+    if File.exists?(File.join(Rails.root, 'public', theme_path, file))
+      File.join(theme_path, file)
+    else
+      file
+    end
+  end
+
   def image_link_to_product(product, opts={})
     return _('No product') unless product
     target = product_path(product)
@@ -52,8 +52,8 @@ module FolderHelper
     end
   end
-  def icon_for_new_article(type)
-    "icon-new icon-new%s" % type.constantize.icon_name
+  def icon_for_new_article(klass)
+    "icon-new icon-new%s" % klass.icon_name
   end
   def custom_options_for_article(article)
@@ -142,6 +142,38 @@ 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] ||= ''
@@ -13,19 +13,20 @@ module LanguageHelper
   alias :calendar_date_select_language :tinymce_language
-  def language_chooser(environment, options = {})
-    return if environment.locales.size < 2
+  def language_chooser(environment=nil, options = {})
+    locales = environment.nil? ? Noosfero.locales : environment.locales
+    return if locales.size < 2
     current = language
     separator = options[:separator] || ' &mdash; '
     if options[:element] == 'dropdown'
       select_tag('lang', 
-        options_for_select(environment.locales.map{|code,name| [name, code]}, current),
+        options_for_select(locales.map{|code,name| [name, code]}, current),
         :onchange => "document.location.href= #{url_for(params.merge(:lang => 'LANGUAGE')).inspect}.replace(/LANGUAGE/, this.value) ;",
         :help => _('The language you choose here is the language used for options, buttons, etc. It does not affect the language of the content created by other users.')
       )
     else
-      languages = environment.locales.map do |code,name|
+      languages = locales.map do |code,name|
         if code == current
           content_tag('strong', name)
         else
@@ -48,7 +48,7 @@ class ApproveArticle &lt; Task
   end
   def perform
-     article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source)
+    article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.author_id)
   end
   def title
@@ -13,10 +13,18 @@ class Article &lt; ActiveRecord::Base
   # xss_terminate plugin can't sanitize array fields
   before_save :sanitize_tag_list
+  before_create do |article|
+    if article.last_changed_by_id
+      article.author_name = Person.find(article.last_changed_by_id).name
+    end
+  end
+
   belongs_to :profile
   validates_presence_of :profile_id, :name
   validates_presence_of :slug, :path, :if => lambda { |article| !article.name.blank? }
+  validates_length_of :name, :maximum => 150
+
   validates_uniqueness_of :slug, :scope => ['profile_id', 'parent_id'], :message => N_('The title (article name) is already being used by another article, please use another title.'), :if => lambda { |article| !article.slug.blank? }
   belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
@@ -289,7 +297,7 @@ class Article &lt; ActiveRecord::Base
     if last_comment
       {:date => last_comment.created_at, :author_name => last_comment.author_name, :author_url => last_comment.author_url}
     else
-      {:date => updated_at, :author_name => author.name, :author_url => author.url}
+      {:date => updated_at, :author_name => author_name, :author_url => author_url}
     end
   end
@@ -441,7 +449,7 @@ class Article &lt; ActiveRecord::Base
   end
   def allow_post_content?(user = nil)
-    user && (user.has_permission?('post_content', profile) || allow_publish_content?(user) && (user == self.creator))
+    user && (user.has_permission?('post_content', profile) || allow_publish_content?(user) && (user == author))
   end
   def allow_publish_content?(user = nil)
@@ -496,7 +504,6 @@ class Article &lt; ActiveRecord::Base
     :slug,
     :updated_at,
     :created_at,
-    :last_changed_by_id,
     :version,
     :lock_version,
     :type,
@@ -539,15 +546,24 @@ class Article &lt; ActiveRecord::Base
   end
   def author
-    if reference_article
-      reference_article.author
+    if versions.empty?
+      last_changed_by
     else
-      last_changed_by || profile
+      author_id = versions.first.last_changed_by_id
+      Person.exists?(author_id) ? Person.find(author_id) : nil
     end
   end
   def author_name
-    setting[:author_name].blank? ? author.name : setting[:author_name]
+    author ? author.name : (setting[:author_name] || _('Unknown'))
+  end
+
+  def author_url
+    author ? author.url : nil
+  end
+
+  def author_id
+    author ? author.id : nil
   end
   alias :active_record_cache_key :cache_key
@@ -572,11 +588,6 @@ class Article &lt; ActiveRecord::Base
     truncate sanitize_html(self.lead), :length => 170, :omission => '...'
   end
-  def creator
-    creator_id = versions[0][:last_changed_by_id]
-    creator_id && Profile.find(creator_id)
-  end
-
   def notifiable?
     false
   end
@@ -13,6 +13,16 @@ class Category &lt; ActiveRecord::Base
     {:conditions => ['parent_id is null and environment_id = ?', environment.id ]}
   }
+  named_scope :on_level, lambda { |parent| {:conditions => {:parent_id => parent}} }
+
+  named_scope :sub_categories, lambda { |category|
+    {:conditions => ['categories.path LIKE ? AND categories.id != ?', "%#{category.slug}%", category.id]}
+  }
+
+  named_scope :sub_tree, lambda { |category|
+    {:conditions => ['categories.path LIKE ?', "%#{category.slug}%"]}
+  }
+
   acts_as_filesystem
   has_many :article_categorizations, :dependent => :destroy
@@ -74,6 +74,10 @@ class Comment &lt; ActiveRecord::Base
     self.find(:all, :order => 'created_at desc, id desc', :limit => limit)
   end
+  def notification_emails
+    self.article.profile.notification_emails - [self.author_email || self.email]
+  end
+
   after_save :notify_article
   after_destroy :notify_article
   def notify_article
@@ -114,7 +118,7 @@ class Comment &lt; ActiveRecord::Base
   def notify_by_mail
     if source.kind_of?(Article) && article.notify_comments?
-      if !article.profile.notification_emails.empty?
+      if !notification_emails.empty?
         Comment::Notifier.deliver_mail(self)
       end
       emails = article.followers - [author_email]
@@ -174,7 +178,7 @@ class Comment &lt; ActiveRecord::Base
   class Notifier < ActionMailer::Base
     def mail(comment)
       profile = comment.article.profile
-      recipients profile.notification_emails
+      recipients comment.notification_emails
       from "#{profile.environment.name} <#{profile.environment.contact_email}>"
       subject _("[%s] you got a new comment!") % [profile.environment.name]
       body :recipient => profile.nickname || profile.name,
@@ -224,6 +228,7 @@ class Comment &lt; ActiveRecord::Base
   def spam!
     self.spam = true
     self.save!
+    SpammerLogger.log(ip_address, self)
     Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
     self
   end
@@ -5,7 +5,7 @@ class EnterpriseHomepage &lt; Article
   end
   def self.short_description
-    __('Enterprise homepage.')
+    __('Enterprise homepage')
   end
   def self.description
@@ -233,8 +233,10 @@ class Environment &lt; ActiveRecord::Base
     settings[:message_for_member_invitation] || InviteMember.mail_template
   end
+  settings_items :min_signup_delay, :type => Integer, :default => 3 #seconds
   settings_items :activation_blocked_text, :type => String
-  settings_items :message_for_disabled_enterprise, :type => String
+  settings_items :message_for_disabled_enterprise, :type => String,
+                 :default => _('This enterprise needs to be enabled.')
   settings_items :location, :type => String
   settings_items :layout_template, :type => String, :default => 'default'
   settings_items :homepage, :type => String
@@ -616,12 +618,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
@@ -38,7 +38,7 @@ class Event &lt; Article
   filter_iframes :body, :link, :address, :whitelist => lambda { profile && profile.environment && profile.environment.trusted_sites_for_iframe }
   def self.description
-    _('A calendar event')
+    _('A calendar event.')
   end
   def self.short_description
@@ -78,6 +78,8 @@ class Organization &lt; Profile
     country
     tag_list
     template_id
+    district
+    address_reference
   ]
   def self.fields
@@ -96,8 +98,8 @@ class Organization &lt; Profile
     []
   end
-  N_('Display name'); N_('Description'); N_('Contact person'); N_('Contact email'); N_('Acronym'); N_('Foundation year'); N_('Legal form'); N_('Economic activity'); N_('Management information'); N_('Tag list')
-  settings_items :display_name, :description, :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information
+  N_('Display name'); N_('Description'); N_('Contact person'); N_('Contact email'); N_('Acronym'); N_('Foundation year'); N_('Legal form'); N_('Economic activity'); N_('Management information'); N_('Tag list'); N_('District'); N_('Address reference')
+  settings_items :display_name, :description, :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :district, :address_reference
   validates_format_of :foundation_year, :with => Noosfero::Constants::INTEGER_FORMAT
   validates_format_of :contact_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |org| !org.contact_email.blank? })
@@ -67,6 +67,9 @@ class Person &lt; Profile
     :order => 'total DESC',
     :conditions => ['action_tracker.created_at >= ? OR action_tracker.id IS NULL', ActionTracker::Record::RECENT_DELAY.days.ago]
+  named_scope :abusers, :joins => :abuse_complaints, :conditions => ['tasks.status = 3'], :select => 'DISTINCT profiles.*'
+  named_scope :non_abusers, :joins => "LEFT JOIN tasks ON profiles.id = tasks.requestor_id AND tasks.type='AbuseComplaint'", :conditions => ["tasks.status != 3 OR tasks.id is NULL"], :select => "DISTINCT profiles.*"
+
   after_destroy do |person|
     Friendship.find(:all, :conditions => { :friend_id => person.id}).each { |friendship| friendship.destroy }
   end
@@ -144,6 +147,9 @@ class Person &lt; Profile
   contact_phone
   contact_information
   description
+  image
+  district
+  address_reference
   ]
   validates_multiparameter_assignments
@@ -198,8 +204,8 @@ class Person &lt; Profile
   N_('Education'); N_('Custom education'); N_('Custom area of study');
   settings_items :formation, :custom_formation, :custom_area_of_study
-  N_('Contact information'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code')
-  settings_items :photo, :contact_information, :sex, :city, :state, :country, :zip_code
+  N_('Contact information'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code'); N_('District'); N_('Address reference')
+  settings_items :photo, :contact_information, :sex, :city, :state, :country, :zip_code, :district, :address_reference
   extend SetProfileRegionFromCityState::ClassMethods
   set_profile_region_from_city_state
@@ -440,6 +446,10 @@ class Person &lt; Profile
     abuse_report.save!
   end
+  def abuser?
+    AbuseComplaint.finished.where(:requestor_id => self).count > 0
+  end
+
   def control_panel_settings_button
     {:title => _('Edit Profile'), :icon => 'edit-profile'}
   end
@@ -23,6 +23,10 @@ class Product &lt; ActiveRecord::Base
   named_scope :more_recent, :order => "created_at DESC"
+  named_scope :from_category, lambda { |category|
+    {:joins => :product_category, :conditions => ['categories.path LIKE ?', "%#{category.slug}%"]} if category
+  }
+
   after_update :save_image
   def lat
@@ -141,6 +141,10 @@ class Profile &lt; ActiveRecord::Base
   acts_as_having_settings :field => :data
+  def settings
+    data
+  end
+
   settings_items :redirect_l10n, :type => :boolean, :default => false
   settings_items :public_content, :type => :boolean, :default => true
   settings_items :description
@@ -229,7 +233,7 @@ class Profile &lt; ActiveRecord::Base
     if myregion
       myregion.hierarchy.reverse.first(2).map(&:name).join(separator)
     else
-      %w[address city state country_name zip_code ].map {|item| (self.respond_to?(item) && !self.send(item).blank?) ? self.send(item) : nil }.compact.join(separator)
+      %w[address district city state country_name zip_code ].map {|item| (self.respond_to?(item) && !self.send(item).blank?) ? self.send(item) : nil }.compact.join(separator)
     end
   end
@@ -463,6 +467,10 @@ class Profile &lt; ActiveRecord::Base
     { :profile => identifier, :controller => 'profile_editor', :action => 'index' }
   end
+  def tasks_url
+    { :profile => identifier, :controller => 'tasks', :action => 'index', :host => default_hostname }
+  end
+
   def leave_url(reload = false)
     { :profile => identifier, :controller => 'profile', :action => 'leave', :reload => reload }
   end
@@ -694,7 +702,7 @@ private :generate_url, :url_options
   def custom_footer_expanded
     footer = custom_footer
     if footer
-      %w[contact_person contact_email contact_phone location address economic_activity city state country zip_code].each do |att|
+      %w[contact_person contact_email contact_phone location address district address_reference economic_activity city state country zip_code].each do |att|
         if self.respond_to?(att) && footer.match(/\{[^{]*#{att}\}/)
           if !self.send(att).nil? && !self.send(att).blank?
             footer = footer.gsub(/\{([^{]*)#{att}\}/, '\1' + self.send(att))
@@ -5,11 +5,11 @@ class RawHTMLArticle &lt; TextArticle
   end
   def self.short_description
-    _('Raw HTML text article.')
+    _('Raw HTML text article')
   end
   def self.description
-    _('Allows HTML without filter (only for admins)')
+    _('Allows HTML without filter (only for admins).')
   end
   xss_terminate :only => [  ]
@@ -0,0 +1,24 @@
+class SpammerLogger < Logger
+  @logpath = File.join(Rails.root, 'log', "#{ENV['RAILS_ENV']}_spammers.log")
+  @logger = new(@logpath)
+
+  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"
+      end
+    else
+        @logger << "[#{Time.now.strftime('%F %T %z')}] IP: #{spammer_ip}\n"
+    end
+  end
+
+  def self.clean_log
+    File.delete(@logpath) if File.exists?(@logpath)
+  end
+
+  def self.reload_log
+    clean_log
+    @logger = new(@logpath)
+  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 ) +
+    tag_cloud( tags, tagname_option, url, :max_size => 16, :min_size => 9 ) +
     "\n</div><!-- end class='tag_cloud' -->\n";
   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
@@ -267,7 +267,10 @@ class Task &lt; ActiveRecord::Base
   end
   named_scope :pending, :conditions => { :status =>  Task::Status::ACTIVE }
-  named_scope :finished, :conditions => { :status =>  [Task::Status::CANCELLED, Task::Status::FINISHED] }
+  named_scope :hidden, :conditions => { :status =>  Task::Status::HIDDEN }
+  named_scope :finished, :conditions => { :status =>  Task::Status::FINISHED }
+  named_scope :canceled, :conditions => { :status =>  Task::Status::CANCELLED }
+  named_scope :closed, :conditions => { :status =>  [Task::Status::CANCELLED, Task::Status::FINISHED] }
   named_scope :opened, :conditions => { :status =>  [Task::Status::ACTIVE, Task::Status::HIDDEN] }
   named_scope :of, lambda { |type| conditions = type ? "type LIKE '#{type}'" : "1=1"; {:conditions =>  [conditions]} }
   named_scope :order_by, lambda { |attribute, ord| {:order => "#{attribute} #{ord}"} }
@@ -14,7 +14,7 @@ class TaskMailer &lt; ActionMailer::Base
     recipients task.target.notification_emails
-    url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.url.merge(:controller => 'tasks', :action => 'index'))
+    url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.tasks_url)
     from self.class.generate_from(task)
     subject '[%s] %s' % [task.environment.name, task.target_notification_description]
 class TinyMceArticle < TextArticle
   def self.short_description
-    _('Text article with visual editor.')
+    _('Text article with visual editor')
   end
   def self.description
@@ -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
@@ -31,7 +31,7 @@ class User &lt; ActiveRecord::Base
   after_create do |user|
     user.person ||= Person.new
     user.person.attributes = user.person_data.merge(:identifier => user.login, :user => user, :environment_id => user.environment_id)
-    user.person.name ||= user.login
+    user.person.name ||= user.name
     user.person.visible = false unless user.activated?
     user.person.save!
     if user.environment.enabled?('skip_new_user_email_confirmation')
@@ -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
-<%= error_messages_for :user, :person %>
+<% if @block_bot %>
+  <div class="atention" style="font-size: 150%;">
+    <strong><%=_('Are you a robot?')%></strong> <br />
+    <%=_('Please, prove that you are human by filling the captcha.')%>
+  </div>
+<% end %>
+
+<% @profile_data = @person %>
+
+<%= error_messages_for :user, :person, :header_message => _('The account could not be created') %>
+
+<% labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form', :honeypot => true } do |f| %>
-<% labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form' } do |f| %>
+<input type="hidden" id="signup_time_key" name="signup_time_key" />
+<script type="text/javascript">
+  jQuery.ajax({
+    type: "POST",
+    url: "<%= url_for :controller=>'account', :action=>'signup_time' %>",
+    dataType: 'json',
+    success: function(data) {
+      if (data.ok) jQuery('#signup_time_key').val(data.key);
+    }
+  });
+</script>
 <%= hidden_field_tag :invitation_code, @invitation_code %>
 <div id='signup-form-header'>
-  <span id="signup-domain"><%= environment.default_hostname %>/</span>
-  <div id='signup-login'>
-    <div id='signup-login-field'>
-      <%= required f.text_field(:login, :onchange => 'this.value = convToValidLogin(this.value);', :rel => s_('signup|Login')) %>
-      <div id='url-check'><p>&nbsp;</p></div>
+  <div id='signup-formfield-group'>
+    <%= label(:user, :login, _('Username'), {:class => 'formlabel'}) %>
+    <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 = 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') %>
+      <br style="clear: both;" />
     </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') %>
-    <br style="clear: both;" />
   </div>
   <%= observe_field 'user_login',
         :url => { :action => 'check_url' },
@@ -26,20 +51,19 @@
   <div id='signup-password'>
     <%= required f.password_field(:password, :id => 'user_pw') %>
-    <%= f.text_field(:password_clear, :value => _('password')) %>
     <%= content_tag(:small,_('Choose a password that you can remember easily. It must have at least 4 characters.'), :id => 'password-balloon') %>
     <div id='fake-check'><p>&nbsp;</p></div>
   </div>
   <div id='signup-password-confirmation'>
     <%= required f.password_field(:password_confirmation) %>
-    <%= f.text_field(:password_confirmation_clear, :value => _('password confirmation')) %>
+    <%= content_tag(:small,_('We need to be sure that you filled in your password correctly. Confirm you password.'), :id => 'password-confirmation-balloon') %>
     <div id='password-check'><p>&nbsp;</p></div>
   </div>
   <div id='signup-email'>
-    <%= required f.text_field(:email, :rel => _('e-Mail')) %>
-    <%= content_tag(:small,_('This e-mail address will be used to contact you.')) %>
+    <%= required f.text_field(:email) %>
+    <%= content_tag(:small,_('This e-mail address will be used to contact you.'), :id => 'email-balloon') %>
     <div id='email-check'><p>&nbsp;</p></div>
   </div>
   <%= observe_field "user_email",
@@ -62,21 +86,23 @@
                       }"
   %>
-  <%= label :profile_data, :name %>
-  <%= required text_field(:profile_data, :name, :rel => _('Full name')) %>
+  <div id='signup-name'>
+    <%= labelled_form_field(_('Full name'), text_field(:profile_data, :name)) %>
+    <%= content_tag(:small,_('Tell us your name, it will be used to identify yourself.'), :id => 'name-balloon') %>
+  </div>
 </div>
 <div id="signup-form-profile">
-  <%= template_options(Person, 'profile_data') %>
-
   <% labelled_fields_for :profile_data, @person do |f| %>
     <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %>
   <% end %>
   <%= @plugins.dispatch(:signup_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
+  <%= template_options(Person, 'profile_data') %>
+
   <% unless @terms_of_use.blank? %>
     <div id='terms-of-use-box' class='formfieldline'>
       <%= labelled_check_box(_('I accept the %s') % link_to(_('terms of use'), {:controller => 'home', :action => 'terms'}, :target => '_blank'), 'user[terms_accepted]') %>
@@ -91,6 +117,8 @@
   <% end %>
 </div>
+<%= recaptcha_tags :ajax => true, :display => {:theme => 'clean'} if @block_bot %>
+
 <p style="text-align: center">
   <%= submit_button('save', _('Create my account')) %>
 </p>
@@ -99,70 +127,59 @@
 <script type="text/javascript">
 jQuery(function($) {
+
+  $('#signup-form #user_login').css('width', 335 - $('#signup-domain').outerWidth());
+
   $('#signup-form input[type=text], #signup-form textarea').each(function() {
-    if ($(this).attr('rel')) var default_value = $(this).attr('rel').toLowerCase();
-    if ($(this).val() == '') $(this).val(default_value);
-    $(this).bind('focus', function() {
-      if ($(this).val() == default_value) $(this).val('');
-    });
     $(this).bind('blur', function() {
       if ($(this).val() == '') {
-        $(this).val(default_value);
         $(this).removeClass('filled-in');
       }
       else $(this).addClass('filled-in');
     });
   });
-  $('#signup-form').bind('submit', function() {
-    $('#signup-form input[type=text], #signup-form textarea').each(function() {
-      if ($(this).attr('rel')) var default_value = $(this).attr('rel').toLowerCase();
-      if ($(this).val() == default_value) $(this).val('');
-    });
-    return true;
-  });
-
-  $('#user_password_clear, #user_password_confirmation_clear').show();
-  $('#user_password_clear, #user_password_confirmation_clear').unbind();
-  $('#user_pw, #user_password_confirmation').hide();
-  $('#user_password_clear').focus(function() {
-    $(this).hide();
-    $('#user_pw').show();
-    $('#user_pw').focus();
-  });
   $('#user_pw').focus(function() {
     $('#password-balloon').fadeIn('slow');
   });
-  $('#user_pw').blur(function() {
-    if ($(this).val() == '') {
-      $('#user_password_clear').show();
-      $(this).hide();
-    }
-  });
-  $('#user_password_confirmation_clear').focus(function() {
-    $(this).hide();
-    $('#user_password_confirmation').show();
-    $('#user_password_confirmation').focus();
+  $('#user_password_confirmation').focus(function() {
+    $('#password-confirmation-balloon').fadeIn('slow');
   });
   $('#user_password_confirmation, #user_pw').blur(function() {
-    if ($('#user_password_confirmation').val() == '') {
-      $('#user_password_confirmation_clear').show();
-      $('#user_password_confirmation').hide();
-    } else if ($('#user_password_confirmation').val() == $('#user_pw').val()) {
-      $('#user_password_confirmation').addClass('validated').removeClass('invalid');
-      $('#user_pw').removeClass('invalid_input').addClass('valid_input');
-      $('#password-check').html("<p>&nbsp;</p>");
-    } else if ($('#user_password_confirmation').val() != $('#user_pw').val()) {
-      $('#user_password_confirmation').removeClass('validated').addClass('invalid');
-      $('#user_pw').addClass('invalid_input').removeClass('valid_input');
-      $('#password-check').html("<p><span class='invalid'><%= _('Passwords don\'t match') %></span></p>");
+    if ($('#user_password_confirmation').val() != '') {
+      if ($('#user_password_confirmation').val() == $('#user_pw').val()) {
+        $('#user_password_confirmation').addClass('validated').removeClass('invalid');
+        $('#user_pw').removeClass('invalid_input').addClass('valid_input');
+        $('#password-check').html("<p>&nbsp;</p>");
+      } else if ($('#user_password_confirmation').val() != $('#user_pw').val()) {
+        $('#user_password_confirmation').removeClass('validated').addClass('invalid');
+        $('#user_pw').addClass('invalid_input').removeClass('valid_input');
+        $('#password-check').html("<p><span class='invalid'><%= _('Passwords don\'t match') %></span></p>");
+      }
     }
     $('#password-balloon').fadeOut('slow');
+    $('#password-confirmation-balloon').fadeOut('slow');
   });
   $('#user_login').focus(function() {
     $('#signup-balloon').fadeIn('slow');
   });
   $('#user_login').blur(function() { $('#signup-balloon').fadeOut('slow'); });
   $('#signup-form').validate({ rules: { 'user[email]': { email: true } }, messages: { 'user[email]' : '' } });
+  $('#user_email').focus(function() {
+    $('#email-balloon').fadeIn('slow');
+  });
+  $('#user_email').blur(function() {
+    $('#email-balloon').fadeOut('slow');
+  });
+  $('#profile_data_name').focus(function() {
+    $('#name-balloon').fadeIn('slow');
+  });
+  $('#profile_data_name').blur(function() {
+    $('#name-balloon').fadeOut('slow');
+    if ($(this).val() == '') {
+      $(this).removeClass('validated');
+    }
+    else $(this).addClass('validated');
+  });
 });
 </script>
@@ -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})} %>
 <% extra_content = [] %>
 <% extra_content_list = [] %>
-<ul id="product-list">
-  <li><h1><%= _('Products/Services') %></h1></li>
+<h1><%= _('Products/Services') %></h1>
+<%= breadcrumb(@category) if params[:level] %>
+
+<div class='l-sidebar-left-bar'>
+  <ul>
+    <%= content_tag('li', link_to(_('Enterprise homepage'), profile.public_profile_url), :id => 'catalog-categories-homepage-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 categories available.'), :id => 'catalog-categories-notice') %>
+    <% end %>
+  </ul>
+</div>
+
+<ul id="product-list" class="l-sidebar-left-content">
   <% @products.each do |product| %>
     <% extra_content = @plugins.dispatch(:catalog_item_extras, product).collect { |content| instance_eval(&content) } %>
     <% extra_content_list = @plugins.dispatch(:catalog_list_item_extras, product).collect { |content| instance_eval(&content) } %>
-    <li class="product <%= "not-available" unless product.available %>">
+    <% status = [] %>
+    <% status << 'not-available' if !product.available %>
+    <% status << 'highlighted' if product.highlighted %>
+
+    <li id="product-<%= product.id %>" class="product <%= status.join(' ') %>">
       <ul>
         <li class="product-image-link">
+          <% if product.highlighted? %>
+            <%= link_to image_tag(themed_path('/images/star.png'), :class => 'star', :alt => _('Highlighted product')), product_path(product) %>
+          <% end %>
           <% if product.image %>
             <div class="zoomable-image">
               <%= link_to_product product, :class => 'product-big', :style => "background-image: url(#{product.default_image(:big)})" %>
@@ -4,7 +4,7 @@
 <%= render :file => 'shared/tiny_mce' %>
-<%= required f.text_field(:name, :size => '64', :onchange => "updateUrlField(this, 'article_slug')") %>
+<%= required f.text_field(:name, :size => '64', :maxlength => 150, :onchange => "updateUrlField(this, 'article_slug')") %>
 <%= render :partial => 'general_fields' %>
@@ -3,7 +3,7 @@
 <%# TODO add Textile help here %>
 <%= render :file => 'shared/tiny_mce' %>
-<%= required f.text_field('name', :size => '64') %>
+<%= required f.text_field('name', :size => '64', :maxlength => 150) %>
 <%= render :partial => 'general_fields' %>
 <%= render :partial => 'translatable' %>
 <%= required_fields_message %>
-<%= required f.text_field('name', :size => '64') %>
+<%= required f.text_field('name', :size => '64', :maxlength => 150) %>
 <%= render :partial => 'general_fields' %>
 <%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
@@ -4,7 +4,7 @@
 <%= render :file => 'shared/tiny_mce' %>
-<%= required f.text_field(:name, :size => '64', :onchange => "updateUrlField(this, 'article_slug')") %>
+<%= required f.text_field(:name, :size => '64', :maxlength => 150, :onchange => "updateUrlField(this, 'article_slug')") %>
 <%= render :partial => 'general_fields' %>
 <%= required_fields_message %>
-<%= required f.text_field('name', :size => '64') %>
+<%= required f.text_field('name', :size => '64', :maxlength => 150) %>
 <%= render :partial => 'general_fields' %>
-<%= f.text_field 'name', :size => '64' %>
+<%= f.text_field 'name', :size => '64', :maxlength => 150 %>
 <%= render :partial => 'general_fields' %>
 <p><%= _('This is a republication of "%s", by %s.') % [link_to(h(@article.reference_article.name), @article.reference_article.url), @article.reference_article.profile.name] %></p>
 <%= required_fields_message %>
-<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64')) %>
+<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
 <%= render :partial => 'general_fields' %>
 <%= render :partial => 'translatable' %>
@@ -2,7 +2,7 @@
 <%# TODO add Textile help here %>
-<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '72')) %>
+<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '72', :maxlength => 150)) %>
 <%= render :partial => 'general_fields' %>
 <%= render :partial => 'translatable' %>
@@ -3,7 +3,7 @@
 <%= render :file => 'shared/tiny_mce' %>
 <div>
-  <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64')) %>
+  <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
   <%= render :partial => 'general_fields' %>
   <%= render :partial => 'translatable' %>
@@ -2,9 +2,9 @@
 <ul id="article_types">
   <% for type in @article_types %>
-    <% action = type[:name] == 'UploadedFile' ? {:action => 'upload_files'} : {:action => 'new', :type => type[:name]} %>
+    <% 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 %>
-      <li class="<%= icon_for_new_article(type[:name]) %>" onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
+      <li class="<%= icon_for_new_article(type[:class]) %>" onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
         <strong><%= type[:short_description] %></strong>
         <div class='description'><%= type[:description] %></div>
       </li>
@@ -34,11 +34,11 @@
         <%= expirable_button @page, :locale, content, url %>
       <% end %>
-      <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) %>
+      <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) unless remove_content_button(:new) %>
     <% end %>
     <% if @page.accept_uploads? && @page.allow_create?(user) %>
-      <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) %>
+      <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) unless remove_content_button(:upload)%>
     <% end %>
     <% if !@page.allow_create?(user) && profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) && !remove_content_button(:suggest) %>
@@ -21,8 +21,6 @@ function submit_comment_form(button) {
 }
 </script>
-<% focus_on = logged_in? ? 'title' : 'name' %>
-
 <% if @comment && @comment.errors.any? && @comment.reply_of_id.blank? %>
   <%= error_messages_for :comment %>
   <script type="text/javascript">jQuery(function() { document.location.href = '#page-comment-form'; });</script>
@@ -32,17 +30,7 @@ function submit_comment_form(button) {
 <div class="post_comment_box <%= @form_div %>">
-<% if display_link %>
-  <h4 onclick="var d = jQuery(this).parent('.post_comment_box');
-               if (d.hasClass('closed')) {
-                 d.removeClass('closed');
-                 d.addClass('opened');
-                 d.find('input[name=comment[title]], textarea').val('');
-                 d.find('.comment_form input[name=comment[<%= focus_on %>]]').focus();
-               }">
-    <%= content_tag('a', '', :name => 'comment_form') + _('Post a comment') %>
-  </h4>
-<% end %>
+  <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form') if display_link %>
 <% unless pass_without_comment_captcha? %>
   <div id="recaptcha-container" style="display: none">
@@ -62,8 +50,6 @@ function submit_comment_form(button) {
 <% end %>
 <% form_tag( url, { :class => 'comment_form' } ) do %>
-  <%= hidden_field_tag(:confirm, 'false') %>
-
   <%= required_fields_message %>
   <% unless logged_in? %>
@@ -84,10 +70,13 @@ function submit_comment_form(button) {
   <%= labelled_form_field(_('Title'), text_field(:comment, :title)) %>
   <%= required labelled_form_field(_('Enter your comment'), text_area(:comment, :body, :rows => 5)) %>
+  <%= hidden_field_tag(:confirm, 'false') %>
+  <%= hidden_field_tag(:view, params[:view])%>
+
   <% button_bar do %>
     <%= submit_button('add', _('Post comment'), :onclick => "submit_comment_form(this); return false") %>
     <% if cancel_triggers_hide %>
-      <%= button_to_function :cancel, _('Cancel'), "f=jQuery(this).parents('.post_comment_box'); f.removeClass('opened'); f.addClass('closed'); return false" %>
+      <%= button :cancel, _('Cancel'), '', :id => 'cancel-comment' %>
     <% else %>
       <%= button('cancel', _('Cancel'), {:action => 'view_page', :profile => profile.identifier, :page => @comment.article.explode_path})%>
     <% end %>
@@ -95,3 +84,5 @@ function submit_comment_form(button) {
 <% end %>
 </div><!-- end class="post_comment_box" -->
+
+<%= javascript_include_tag 'comment_form'%>
@@ -90,7 +90,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') %>
   <% end %>
   <ul class="article-comments-list">
@@ -69,7 +69,7 @@
               <% end %>
           </span>
-          <form action="/search" class="search_form" method="get" class="clean">
+          <form action="/search" class="search_form clean" method="get" id="top-search">
             <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();' %>
@@ -9,7 +9,7 @@
   <div class='profile-activity-lead'>
     <div class='article-name'><%= link_to(activity.params['name'], activity.params['url']) %></div>
     <span title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-new<%= activity.target.class.icon_name %>'></span>
-    <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'], :length => 1000, :ommision => '...')).gsub(/(\xA0|\xC2|\s)+/, ' ').gsub(/^\s+/, '') %> <small><%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %></small>
+    <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'], :length => 1000, :ommision => '...')).gsub(/(\xC2\xA0|\s)+/, ' ').gsub(/^\s+/, '') %> <small><%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %></small>
   </div>
   <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>
   <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
@@ -5,7 +5,7 @@
 <% cache_timeout(profile.communities_cache_key(params), 4.hour) do %>
   <ul class='profile-list'>
   <% @communities.each do |community| %>
-    <li><%= profile_image_link(community)%></li>
+    <%= profile_image_link(community)%>
   <% end %>
   </ul>
@@ -21,6 +21,8 @@
 <%= optional_field(@person, 'city', f.text_field(:city, :rel => _('City'))) %>
 <%= optional_field(@person, 'zip_code', labelled_form_field(_('ZIP code'), text_field(:profile_data, :zip_code, :rel => _('ZIP code')))) %>
 <%= optional_field(@person, 'address', labelled_form_field(_('Address (street and number)'), text_field(:profile_data, :address, :rel => _('Address')))) %>
+<%= optional_field(@person, 'address_reference', labelled_form_field(_('Address reference'), text_field(:profile_data, :address_reference, :rel => _('Address reference')))) %>
+<%= optional_field(@person, 'district', labelled_form_field(_('District'), text_field(:profile_data, :district, :rel => _('District')))) %>
 <% optional_field(@person, 'schooling') do %>
   <div class="formfieldline">
@@ -28,8 +28,9 @@
     <div class="search-gallery-items">
       <% r = image.children.find(:all, :order => :updated_at, :conditions => ['type = ?', 'UploadedFile']).last(3) %>
       <% if r.length > 0 %>
-        <% r.each do |i| %>
-          <%= link_to '', i.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% i.public_filename(:thumb) %>
+        <% r.each_index do |i| img = r[i] %>
+          <%= link_to '', img.view_url, :class => "search-image-pic pic-num#{i+1}",
+                                        :style => 'background-image: url(%s)'% img.public_filename(:thumb) %>
         <% end %>
       <% else %>
         <div class="search-no-image"><span><%= _('No image') %></span></div>
-<% extra_content = @plugins.dispatch(:asset_product_extras, product, product.enterprise).collect { |content| instance_eval(&content) } %>
+<% 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">
+<li class="search-product-item <%= 'highlighted' if product.highlighted? %>">
   <div class="search-product-item-first-column">
     <%= render :partial => 'search/image', :object => product %>
@@ -10,6 +10,8 @@
 <%= optional_field(profile, 'economic_activity', f.text_field(:economic_activity)) %>
 <%= optional_field(profile, 'management_information', f.text_area(:management_information, :rows => 5)) %>
 <%= optional_field(profile, 'address', labelled_form_field(_('Address (street and number)'), text_field(object_name, :address))) %>
+<%= optional_field(profile, 'address_reference', labelled_form_field(_('Address reference'), text_field(object_name, :address_reference))) %>
+<%= optional_field(profile, 'district', labelled_form_field(_('District'), text_field(object_name, :district))) %>
 <%= optional_field(profile, 'zip_code', labelled_form_field(_('ZIP code'), text_field(object_name, :zip_code))) %>
 <%= optional_field(profile, 'city', f.text_field(:city)) %>
 <%= optional_field(profile, 'state', f.text_field(:state)) %>
@@ -20,7 +20,7 @@ tinyMCE.init({
         editor_selector : "mceEditor",
         theme : "advanced",
         relative_urls : false,
-        remove_script_host : true,
+        remove_script_host : false,
         document_base_url : <%= environment.top_url.to_json %>,
         plugins: myplugins,
         theme_advanced_toolbar_location : "top",
@@ -4,7 +4,7 @@
 <%= render :file => 'shared/tiny_mce' %>
-<% form_for :mailing, :url => {:action => 'send_mail', :host => @environment.default_hostname} do |f| %>
+<% form_for :mailing do |f| %>
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
   <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
   <%= submit_button(:send, _('Send')) %>
-default: --tags ~@selenium,~@wip --exclude features/support/selenium.rb --exclude features/step_definitions/selenium_steps.rb -r features/support -r features/step_definitions
-selenium: --tags @selenium,~@wip -r features/support -r features/step_definitions
+default: --color --format progress --strict --tags ~@selenium --tags ~@selenium-fixme --tags ~@fixme --exclude features/support/selenium.rb -r features/support -r features/step_definitions
+selenium: --strict --tags @selenium -r features/support -r features/step_definitions
@@ -6,6 +6,7 @@ development:
 test: &TEST
   adapter: sqlite3
   database: db/test.db
+  timeout: 2000
 production:
   adapter: sqlite3
-# IMPORTANT: This file was generated by Cucumber 0.4.0
 # Edit at your own peril - it's recommended to regenerate this file
 # in the future when you upgrade to a newer version of Cucumber.
-config.cache_classes = true # This must be true for Cucumber to operate correctly!
+# IMPORTANT: Setting config.cache_classes to false is known to
+# break Cucumber's use_transactional_fixtures method.
+# For more information see https://rspec.lighthouseapp.com/projects/16211/tickets/165
+config.cache_classes = true
 # Log error messages when you accidentally call methods on nil.
 config.whiny_nils = true
@@ -18,3 +20,8 @@ config.action_controller.allow_forgery_protection    = false
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
+
+config.gem 'cucumber-rails',   :lib => false, :version => '>=0.3.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails'))
+config.gem 'database_cleaner', :lib => false, :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
+config.gem 'capybara',         :lib => false, :version => '>=0.3.5' unless File.directory?(File.join(Rails.root, 'vendor/plugins/capybara'))
+
@@ -3,4 +3,5 @@ require &#39;noosfero/plugin/hot_spot&#39;
 require 'noosfero/plugin/manager'
 require 'noosfero/plugin/active_record'
 require 'noosfero/plugin/mailer_base'
+require 'noosfero/plugin/settings'
 Noosfero::Plugin.init_system if $NOOSFERO_LOAD_PLUGINS
@@ -0,0 +1,39 @@
+class AggressiveIndexingStrategy3 < ActiveRecord::Migration
+  def self.up
+    add_index :articles, :slug
+    add_index :articles, :parent_id
+    add_index :articles, :profile_id
+    add_index :articles, :name
+
+    add_index :article_versions, :article_id
+
+    add_index :comments, [:source_id, :spam]
+
+    add_index :profiles, :identifier
+
+    add_index :friendships, :person_id
+    add_index :friendships, :friend_id
+    add_index :friendships, [:person_id, :friend_id], :uniq => true
+
+    add_index :external_feeds, :blog_id
+  end
+
+  def self.down
+    remove_index :articles, :slug
+    remove_index :articles, :parent_id
+    remove_index :articles, :profile_id
+    remove_index :articles, :name
+
+    remove_index :article_versions, :article_id
+
+    remove_index :comments, [:source_id, :spam]
+
+    remove_index :profiles, :identifier
+
+    remove_index :friendships, :person_id
+    remove_index :friendships, :friend_id
+    remove_index :friendships, [:person_id, :friend_id]
+
+    remove_index :external_feeds, :blog_id
+  end
+end
@@ -0,0 +1,9 @@
+class RemoveIndexArticlesOnName < ActiveRecord::Migration
+  def self.up
+    remove_index :articles, :name
+  end
+
+  def self.down
+    add_index :articles, :name
+  end
+end
@@ -0,0 +1,10 @@
+class AddDefaultValueToProductHighlighted < ActiveRecord::Migration
+  def self.up
+    change_column :products, :highlighted, :boolean, :default => false
+    execute('UPDATE products SET highlighted=(0>1) WHERE highlighted IS NULL;')
+  end
+
+  def self.down
+    say 'This migraiton is not reversible!'
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20121008185303) do
+ActiveRecord::Schema.define(:version => 20130304200849) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -88,6 +88,8 @@ ActiveRecord::Schema.define(:version =&gt; 20121008185303) do
     t.integer  "license_id"
   end
+  add_index "article_versions", ["article_id"], :name => "index_article_versions_on_article_id"
+
   create_table "articles", :force => true do |t|
     t.string   "name"
     t.string   "slug"
@@ -129,6 +131,10 @@ ActiveRecord::Schema.define(:version =&gt; 20121008185303) do
     t.integer  "license_id"
   end
+  add_index "articles", ["name"], :name => "index_articles_on_name"
+  add_index "articles", ["parent_id"], :name => "index_articles_on_parent_id"
+  add_index "articles", ["profile_id"], :name => "index_articles_on_profile_id"
+  add_index "articles", ["slug"], :name => "index_articles_on_slug"
   add_index "articles", ["translation_of_id"], :name => "index_articles_on_translation_of_id"
   create_table "articles_categories", :id => false, :force => true do |t|
@@ -217,6 +223,8 @@ ActiveRecord::Schema.define(:version =&gt; 20121008185303) do
     t.string   "referrer"
   end
+  add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
+
   create_table "contact_lists", :force => true do |t|
     t.text     "list"
     t.string   "error_fetching"
@@ -280,6 +288,7 @@ ActiveRecord::Schema.define(:version =&gt; 20121008185303) do
     t.integer  "update_errors", :default => 0
   end
+  add_index "external_feeds", ["blog_id"], :name => "index_external_feeds_on_blog_id"
   add_index "external_feeds", ["enabled"], :name => "index_external_feeds_on_enabled"
   add_index "external_feeds", ["fetched_at"], :name => "index_external_feeds_on_fetched_at"
@@ -295,6 +304,10 @@ ActiveRecord::Schema.define(:version =&gt; 20121008185303) do
     t.string   "group"
   end
+  add_index "friendships", ["friend_id"], :name => "index_friendships_on_friend_id"
+  add_index "friendships", ["person_id", "friend_id"], :name => "index_friendships_on_person_id_and_friend_id"
+  add_index "friendships", ["person_id"], :name => "index_friendships_on_person_id"
+
   create_table "images", :force => true do |t|
     t.integer "parent_id"
     t.string  "content_type"
@@ -402,7 +415,7 @@ ActiveRecord::Schema.define(:version =&gt; 20121008185303) do
     t.datetime "updated_at"
     t.decimal  "discount"
     t.boolean  "available",           :default => true
-    t.boolean  "highlighted"
+    t.boolean  "highlighted",         :default => false
     t.integer  "unit_id"
     t.integer  "image_id"
   end
@@ -446,6 +459,7 @@ ActiveRecord::Schema.define(:version =&gt; 20121008185303) do
   end
   add_index "profiles", ["environment_id"], :name => "index_profiles_on_environment_id"
+  add_index "profiles", ["identifier"], :name => "index_profiles_on_identifier"
   add_index "profiles", ["region_id"], :name => "index_profiles_on_region_id"
   create_table "qualifier_certifiers", :force => true do |t|
+noosfero (0.41.1) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Fri, 08 Mar 2013 11:33:11 -0300
+
+noosfero (0.41.0) unstable; urgency=low
+
+  * Features version with anti spam-bot measures
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Mon, 28 Jan 2013 10:20:21 +0000
+
+noosfero (0.40.0) unstable; urgency=low
+
+  * Features version release 
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Sat, 19 Jan 2013 21:58:06 +0000
+
+noosfero (0.39.3) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Sat, 19 Jan 2013 19:27:04 +0000
+
+noosfero (0.39.2) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Sat, 12 Jan 2013 10:13:46 +0000
+
+noosfero (0.39.1) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Thu, 20 Dec 2012 15:47:55 -0200
+
+noosfero (0.39.0) unstable; urgency=low
+
+  * Features version release
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Fri, 07 Dec 2012 09:53:42 -0200
+
 noosfero (0.39.0~1) UNRELEASED; urgency=low
   * Pre-release to test the antispam mechanism.
  -- Antonio Terceiro <terceiro@debian.org>  Thu, 30 Aug 2012 14:55:10 -0300
+noosfero (0.38.3) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Wed, 07 Nov 2012 20:25:51 -0200
+
 noosfero (0.38.2) unstable; urgency=low
   * Bugfixes release
@@ -32,6 +32,8 @@ debian/solr.yml                   etc/noosfero
 debian/thin.yml                   etc/noosfero
 etc/logrotate.d/noosfero          etc/logrotate.d
 debian/noosfero.yml               etc/noosfero
+etc/noosfero/varnish-accept-language.vcl  etc/noosfero
+etc/noosfero/varnish-noosfero.vcl         etc/noosfero
 locale                            usr/share/noosfero
 doc/noosfero                      usr/share/noosfero/doc
 sub vcl_recv {
   if (req.request == "GET" || req.request == "HEAD") {
     if (req.http.Cookie) {
-      # We only care about the "_noosfero_session.*" cookie, used for
-      # authentication.
-      if (req.http.Cookie !~ "_noosfero_session.*" ) {
+      # We only care about the "_noosfero_.*" cookies, used by Noosfero
+      if (req.http.Cookie !~ "_noosfero_.*" ) {
         # strip all cookies
         unset req.http.Cookie;
       }
@@ -14,10 +14,11 @@ Feature: accept member
     And the community "My Community" is closed
     And "Mario Souto" is admin of "My Community"
+  @selenium
   Scenario: approve a task to accept a member as admin in a closed community
     Given "Marie Curie" asked to join "My Community"
     And I am logged in as "mario"
-    And I go to My Community's control panel
+    And I go to mycommunity's control panel
     And I follow "Process requests"
     And I should see "Marie Curie wants to be a member"
     When I choose "Accept"
@@ -25,10 +26,11 @@ Feature: accept member
     And I press "Apply!"
     Then "Marie Curie" should be admin of "My Community"
+  @selenium
   Scenario: approve a task to accept a member as member in a closed community
     Given "Marie Curie" asked to join "My Community"
     And I am logged in as "mario"
-    And I go to My Community's control panel
+    And I go to mycommunity's control panel
     And I follow "Process requests"
     And I should see "Marie Curie wants to be a member"
     When I choose "Accept"
@@ -36,10 +38,11 @@ Feature: accept member
     And I press "Apply!"
     Then "Marie Curie" should be a member of "My Community"
+  @selenium
   Scenario: approve a task to accept a member as moderator in a closed community
     Given "Marie Curie" asked to join "My Community"
     And I am logged in as "mario"
-    And I go to My Community's control panel
+    And I go to mycommunity's control panel
     And I follow "Process requests"
     And I should see "Marie Curie wants to be a member"
     When I choose "Accept"
@@ -11,7 +11,7 @@ Feature: activate enterprise
   Scenario: added an unexistent code
     Given feature "enterprise_activation" is enabled on environment
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I fill in "Enterprise activation code" with "abcde"
     When I press "Activate"
     Then I should see "Invalid enterprise code"
@@ -21,7 +21,7 @@ Feature: activate enterprise
     And the following enterprises
       | identifier | name | enabled |
       | products-factory | Products Factory | false |
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And enterprise "Products Factory" is enabled
     And I fill in "Enterprise activation code" with code of "Products Factory"
     When I press "Activate"
@@ -32,7 +32,7 @@ Feature: activate enterprise
     And the following enterprises
       | identifier | name | enabled |
       | products-factory | Products Factory | false |
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I fill in "Enterprise activation code" with code of "Products Factory"
     When I press "Activate"
     Then I should see "We don't have enough information about your enterprise to identify you."
@@ -43,7 +43,7 @@ Feature: activate enterprise
     And the following enterprises
       | identifier | name | enabled | foundation_year |
       | services-provider | Services Provider | false | 2000 |
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I fill in "Enterprise activation code" with code of "Services Provider"
     And I press "Activate"
     And I fill in "What year your enterprise was founded? It must have 4 digits, eg 1990." with "1999"
@@ -56,7 +56,7 @@ Feature: activate enterprise
     And the following enterprises
       | identifier | name | enabled | cnpj |
       | services-provider | Services Provider | false | 94.132.024/0001-48 |
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I fill in "Enterprise activation code" with code of "Services Provider"
     And I press "Activate"
     And I fill in "What is the CNPJ of your enterprise?" with "12345678912345"
@@ -70,9 +70,9 @@ Feature: activate enterprise
     And the following enterprises
       | identifier | name | enabled | foundation_year |
       | services-provider | Services Provider | false | 2000 |
-    And I visit "Joao Silva's control panel" and wait
+    And I go to joaosilva's control panel
     And I fill in "Enterprise activation code" with code of "Services Provider"
-    And I press "Activate" and wait
+    And I press "Activate"
     And I fill in "What year your enterprise was founded? It must have 4 digits, eg 1990." with "2000"
     And I press "Continue"
     And I check "I read the terms of use and accepted them"
@@ -91,9 +91,9 @@ Feature: activate enterprise
       | active-template | Active Template | false | 2000 |
     And "Active Template" is the active enterprise template
     And "Services Provider 2" doesnt have "Active Template" as template
-    And I visit "Joao Silva's control panel" and wait
+    And I go to joaosilva's control panel
     And I fill in "Enterprise activation code" with code of "Services Provider 2"
-    And I press "Activate" and wait
+    And I press "Activate"
     And I fill in "What year your enterprise was founded? It must have 4 digits, eg 1990." with "2000"
     And I press "Continue"
     And I check "I read the terms of use and accepted them"
@@ -113,9 +113,9 @@ Feature: activate enterprise
       | active-template | Active Template | false | 2000 |
     And "Active Template" is the active enterprise template
     And "Services Provider 3" doesnt have "Active Template" as template
-    When I visit "Joao Silva's control panel" and wait
+    When I go to joaosilva's control panel
     And I fill in "Enterprise activation code" with code of "Services Provider 3"
-    And I press "Activate" and wait
+    And I press "Activate"
     And I fill in "What year your enterprise was founded? It must have 4 digits, eg 1990." with "2000"
     And I press "Continue"
     And I check "I read the terms of use and accepted them"
@@ -16,22 +16,22 @@ Feature: manage categories
   @selenium
   Scenario: admin user could access new category
     Given I follow "Administration"
-    When I follow "Manage Categories"
-    And I follow "New category" and wait
+    When I follow "Categories"
+    And I follow "New category"
     Then I should be on /admin/categories/new
   @selenium
   Scenario: admin user could create a category
-    Given I visit "/admin/categories/new" and wait
-    When I fill in "Name" with "Category 1"
-    And I press "Save"
-    Then I should see "Categories"
-    And I should see "Category 1"
+    Given I go to /admin/categories/new
+      And I fill in "Name" with "Category 1"
+     When I press "Save"
+     Then I should see "Categories"
+      And I should see "Category 1"
   @selenium
   Scenario: admin user could see all the category tree
     Given I follow "Administration"
-    And I follow "Manage Categories"
+    And I follow "Categories"
     When I follow "Show"
     Then I should see "Vegetarian"
     And I should see "Steak"
@@ -39,13 +39,13 @@ Feature: manage categories
   @selenium
   Scenario: admin user could hide the category tree
     Given I follow "Administration"
-    And I follow "Manage Categories"
-    When I follow "Show"
+    And I follow "Categories"
+    When I follow "Show" and wait while it hides
     Then I should see "Vegetarian"
     And I should see "Steak"
-    When I follow "Hide" and sleep 1 second
-    Then I should not see "Vegetarian"
-    And I should not see "Steak"
+    When I follow "Hide" and wait while it hides
+    Then "Vegetarian" should not be visible within "div"
+    And "Steak" should not be visible within "div"
   @selenium
   Scenario: the show link is available just for categories with category tree
@@ -54,7 +54,7 @@ Feature: manage categories
       | Steak   | Pig      | true            |
     And I am on the homepage
     When I follow "Administration"
-    And I follow "Manage Categories"
+    And I follow "Categories"
     Then I should see "Food Show"
     When I follow "Show"
     Then I should see "Vegetarian"
@@ -19,52 +19,52 @@ Feature: approve article
     And "Maria Silva" is a member of "Sample Community"
     And "Joao Silva" is admin of "Sample Community"
-  @selenium
+  @selenium-fixme
   Scenario: edit an article before approval
     Given I am logged in as "mariasilva"
-    And I am on Maria Silva's homepage
-    When I follow "Spread" and wait
+    And I am on mariasilva's homepage
+    When I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
     And I am logged in as "joaosilva"
-    And I go to Sample Community's control panel
-    And I follow "Process requests" and wait
+    And I go to sample-community's control panel
+    And I follow "Process requests"
     And I fill in "Text" with "This is an article edited"
     And I choose "Accept"
     And I press "Apply!"
-    And I go to Sample Community's sitemap
+    And I go to sample-community's sitemap
     And I follow "Sample Article"
     Then I should see "This is an article edited"
   @selenium
   Scenario: reject an article with explanation
     Given I am logged in as "mariasilva"
-    And I go to Maria Silva's cms
+    And I go to mariasilva's cms
     And I follow "Sample Article"
-    And I follow "Spread" and wait
+    And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
     And I am logged in as "joaosilva"
-    And I go to Sample Community's control panel
-    And I follow "Process requests" and wait
+    And I go to sample-community's control panel
+    And I follow "Process requests"
     And I choose "Reject"
     And I fill in "Rejection explanation" with "This is not an appropriate article for this community."
     And I press "Apply!"
-    When I go to Sample Community's sitemap
+    When I go to sample-community's sitemap
     Then I should not see "Sample Article"
   @selenium
   Scenario: reject an article that was removed
     Given I am logged in as "mariasilva"
     And I follow "Dub Wars"
-    And I follow "Spread" and wait
+    And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
     And I follow "Delete"
-    And I press "Yes, I want."
+    And I confirm the browser dialog
     When I am logged in as "joaosilva"
-    And I go to Sample Community's control panel
-    And I follow "Process requests" and wait
+    And I go to sample-community's control panel
+    And I follow "Process requests"
     And I choose "Reject"
     And I fill in "Rejection explanation" with "Article was removed."
     And I press "Apply!"
@@ -12,33 +12,29 @@ Feature: balloon
   @selenium
   Scenario: I should not see trigger if not enabled
     Given feature "show_balloon_with_profile_links_when_clicked" is disabled on environment
-    When I go to /browse/people
+    When I go to /search/people
     Then I should not see "Profile links"
   @selenium
   Scenario: I should not see trigger by default
-    Given the following blocks
-      | owner       | type        |
-      | environment | PeopleBlock |
-    And feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    When I go to the homepage
+    Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
+    When I go to /search/people
     Then I should not see "Friends"
   @selenium
   Scenario: I should see balloon when clicked on people block trigger
-    Given the following blocks
-      | owner       | type        |
-      | environment | PeopleBlock |
-    And feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    When I go to the homepage
-    And I follow "Profile links"
+    Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
+    And I go to /search/people
+    And display ".person-trigger"
+    When I follow "Profile links"
     Then I should see "Friends"
   @selenium
   Scenario: I should see balloon when clicked on community block trigger
     Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    When I go to /browse/communities
-    And I follow "Profile links"
+    And I go to /search/communities
+    And display ".community-trigger"
+    When I follow "Profile links"
     Then I should see "Members"
   @selenium
@@ -56,7 +52,8 @@ Feature: balloon
   @selenium
   Scenario: I should see balloon when clicked on page trigger
     Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    When I go to /assets/communities
-    And I follow "Profile links"
+    And I go to /assets/communities
+    And display ".community-trigger"
+    When I follow "Profile links"
     Then I should see "Members"
     And I should see "Agenda"
@@ -11,16 +11,16 @@ Feature: blog
     And I am logged in as "joaosilva"
   Scenario: create a blog
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Create blog"
     Then I should see "My Blog"
     When I fill in "Title" with "My Blog"
     And I press "Save"
-    And I go to Joao Silva's control panel
+    And I go to joaosilva's control panel
     Then I should see "Configure blog"
   Scenario: redirect to blog after create blog from control panel
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Create blog"
     Then I should see "My Blog"
     When I fill in "Title" with "My Blog"
@@ -28,7 +28,7 @@ Feature: blog
     Then I should be on /joaosilva/my-blog
   Scenario: redirect to blog after create blog from cms
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     When I follow "Blog"
@@ -37,13 +37,13 @@ Feature: blog
     Then I should be on /joaosilva/blog-from-cms
   Scenario: create multiple blogs
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     And I follow "Blog"
     And I fill in "Title" with "Blog One"
     And I press "Save"
-    Then I go to the Control panel
+    Then I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     And I follow "Blog"
@@ -53,7 +53,7 @@ Feature: blog
     And I should be on /joaosilva/blog-two
   Scenario: cancel button back to cms
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     And I follow "Blog"
@@ -61,7 +61,7 @@ Feature: blog
     Then I should be on /myprofile/joaosilva/cms
   Scenario: cancel button back to myprofile
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Create blog"
     When I follow "Cancel" within ".main-block"
     Then I should be on /myprofile/joaosilva
@@ -71,7 +71,7 @@ Feature: blog
       | owner     | name     |
       | joaosilva | Blog One |
       | joaosilva | Blog Two |
-    And I go to the Control panel
+    And I go to joaosilva's control panel
     When I follow "Configure blog"
     Then I should be on /myprofile/joaosilva/cms
@@ -79,7 +79,7 @@ Feature: blog
     Given the following blogs
        | owner     | name     |
        | joaosilva | Blog One |
-    And I go to the Control panel
+    And I go to joaosilva's control panel
     When I follow "Configure blog"
     Then I should be on edit "Blog One" by joaosilva
@@ -89,14 +89,14 @@ Feature: blog
        | owner     | name     |
        | joaosilva | Blog One |
     And I go to /joaosilva/blog-one
-    When I follow "Configure blog" and wait
+    When I follow "Configure blog"
     Then I should be on edit "Blog One" by joaosilva
   Scenario: change address of blog
     Given the following blogs
       | owner     | name     |
       | joaosilva | Blog One |
-    And I go to the Control panel
+    And I go to joaosilva's control panel
     And I follow "Configure blog"
     And I fill in "Address" with "blog-two"
     And I press "Save"
@@ -104,7 +104,7 @@ Feature: blog
     Then I should see "Blog One"
   Scenario: display tag list field when creating new blog
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     When I follow "Blog"
@@ -17,32 +17,34 @@ Feature: browse
   @selenium
   Scenario: Show people browse menu
-    Given I should not see "More Recent"
-    And I should not see "More Active"
-    And I should not see "More Popular"
-    When I click "#submenu-people-trigger"
-    Then I should see "More Recent"
-    And I should see "More Active"
-    And I should see "More Popular"
+    Given I should not see "More recent"
+    And I should not see "More active"
+    And I should not see "More popular"
+    And display "#submenu-people-trigger"
+    When I follow "submenu-people-trigger"
+    Then I should see "More recent"
+    And I should see "More active"
+    And I should see "More popular"
   @selenium
   Scenario: People browse menu should add logged information
     Given I am logged in as "joaosilva"
-    And I should not see "More Recent"
-    And I should not see "More Active"
-    And I should not see "More Popular"
+    And I should not see "More recent"
+    And I should not see "More active"
+    And I should not see "More popular"
     And I should not see "Invite friends"
     And I should not see "My friends"
-    When I click "#submenu-people-trigger"
-    Then I should see "More Recent"
-    And I should see "More Active"
-    And I should see "More Popular"
+    And display "#submenu-people-trigger"
+    When I follow "submenu-people-trigger"
+    Then I should see "More recent"
+    And I should see "More active"
+    And I should see "More popular"
     And I should see "Invite friends"
     And I should see "My friends"
   Scenario: Browse people by query
     Given I go to /search/people
-    When I fill in "Silva" for "query"
+    When I fill in "Silva" for "search-input"
     And I press "Search"
     Then I should see "Joao Silva"
     And I should see "Pedro Silva"
@@ -54,31 +56,33 @@ Feature: browse
   Scenario: Communities browse menu should add logged information
     Given I am logged in as "joaosilva"
     When I go to /joaosilva
-    Then I should not see "More Recent"
-    And I should not see "More Active"
-    And I should not see "More Popular"
+    Then I should not see "More recent"
+    And I should not see "More active"
+    And I should not see "More popular"
     And I should not see "My communities"
     And I should not see "New community"
-    When I click "#submenu-communities-trigger"
-    Then I should see "More Recent"
-    And I should see "More Active"
-    And I should see "More Popular"
+    And display "#submenu-communities-trigger"
+    When I follow "submenu-communities-trigger"
+    Then I should see "More recent"
+    And I should see "More active"
+    And I should see "More popular"
     And I should see "My communities"
     And I should see "New community"
   @selenium
   Scenario: Show communities browse menu
-    Given I should not see "More Recent"
-    And I should not see "More Active"
-    And I should not see "More Popular"
-    When I click "#submenu-communities-trigger"
-    Then I should see "More Recent"
-    And I should see "More Active"
-    And I should see "More Popular"
+    Given I should not see "More recent"
+    And I should not see "More active"
+    And I should not see "More popular"
+    And display "#submenu-communities-trigger"
+    When I follow "submenu-communities-trigger"
+    Then I should see "More recent"
+    And I should see "More active"
+    And I should see "More popular"
   Scenario: Browse communities by query
     When I go to /search/communities
-    And I fill in "Neto" for "query"
+    And I fill in "Neto" for "search-input"
     And I press "Search"
     Then I should see "Community Neto"
     And I should not see "Joao Silva"
@@ -88,13 +92,14 @@ Feature: browse
   @selenium
   Scenario: Show contents browse menu
-    Given I should not see "More Comments"
-    And I should not see "More Views"
-    And I should not see "More Recent"
-    When I click "#submenu-contents-trigger"
-    Then I should see "More Comments"
-    And I should see "More Views"
-    And I should see "More Recent"
+    Given I should not see "Most commented"
+    And I should not see "More viewed"
+    And I should not see "More recent"
+    And display "#submenu-contents-trigger"
+    When I follow "submenu-contents-trigger"
+    Then I should see "Most commented"
+    And I should see "More viewed"
+    And I should see "More recent"
   Scenario: Browse contents by query
     Given the following articles
@@ -103,7 +108,7 @@ Feature: browse
       | joaosilva | Bees and ants are insects | this is another article |
       | joaosilva | Ants are small            | this is another article |
     When I go to /search/contents
-    And I fill in "bees" for "query"
+    And I fill in "bees" for "search-input"
     And I press "Search"
     Then I should see "Bees can fly"
     And I should see "Bees and ants are insects"
@@ -18,7 +18,7 @@ Feature: browse catalogs
   Scenario: display titles
     Then I should see "Associação de Artesanato de Bonito"
-    And I should see "Products/Services" within "#product-list"
+    And I should see "Products/Services"
   Scenario: display the simplest possible product
     Given the following products
@@ -132,7 +132,7 @@ Feature: browse catalogs
     And I should not see "qualifiers"
     And I should not see "price composition"
-  @selenium
+  @selenium-fixme
   Scenario: display description button when needed (but not the description)
     Given the following products
       | owner      | category | name     | price | description                                           |
@@ -142,22 +142,22 @@ Feature: browse catalogs
     Then I should see "Produto2" within "li.product-link"
     And I should see "12.34" within "span.product-price"
     And I should see "description" within "#product-description-button"
-    And the "product-description-button" should be visible
+    And "description" should not be visible within "product-description-button"
     And I should see "A small description" within "#product-description"
-    And the "product-description" should not be visible
+    And "A small description for a product that doesn't exist" should not be visible within "product-description"
-  @selenium
+  @selenium-fixme
   Scenario: display description when button is clicked
     Given the following products
       | owner      | category | name     | price | description                                           |
       | artebonito | categ1   | Produto3 | 12.34 | A small description for a product that doesn't exist. |
     And I am on /catalog/artebonito
     And I reload and wait for the page
-    When I click "product-description-button"
+    When I follow "product-description-button"
     Then I should see "A small description" within "#product-description"
-    And the "product-description" should be visible
+    And "A small description for a product that doesn't exist" should not be visible within "product-description"
-  @selenium
+  @selenium-fixme
   Scenario: hide description
     Given the following products
       | owner      | category | name     | price | description                                           |
@@ -198,7 +198,7 @@ Feature: browse catalogs
     And I should see "Organic" within "span.search-product-qualifier"
     And I should not see "price composition"
-  @selenium
+  @selenium-fixme
   Scenario: not display price composition button if price is not described
     Given the following product
       | owner      | category | name     | price |
@@ -212,7 +212,7 @@ Feature: browse catalogs
     And I should see "10.00" within "span.product-price"
     And the "#product-price-composition-button" should not be visible
-  @selenium
+  @selenium-fixme
   Scenario: display price composition button (but not inputs)
     Given the following product
       | owner      | category | name     | price |
@@ -229,7 +229,7 @@ Feature: browse catalogs
     And I should see "food" within "#product-price-composition"
     And I should see "10.00" within "#product-price-composition"
-  @selenium
+  @selenium-fixme
   Scenario: display price composition when button is clicked
     Given the following product
       | owner      | category | name     | price |
@@ -244,7 +244,7 @@ Feature: browse catalogs
     And I should see "food" within "#product-price-composition"
     And I should see "10.88" within "#product-price-composition"
-  @selenium
+  @selenium-fixme
   Scenario: display inputs and raw materials button when not completely filled
     Given the following product
       | owner      | category | name     | price |
@@ -260,7 +260,7 @@ Feature: browse catalogs
     Then the "#inputs-button" should be visible
     And I should see "inputs and raw materials" within "#inputs-button"
-  @selenium
+  @selenium-fixme
   Scenario: display inputs and raw materials button
     Given the following product
       | owner      | category | name     | price |
@@ -280,7 +280,7 @@ Feature: browse catalogs
     And the "#inputs-description" should not be visible
     And I should see "7.0 Liter of food" within "#inputs-description"
-  @selenium
+  @selenium-fixme
   Scenario: display inputs and raw materials description
     Given the following product
       | owner      | category | name     | price |
@@ -297,7 +297,7 @@ Feature: browse catalogs
     Then the "#inputs-description" should be visible
     And I should see "7.0 Liter of food" within "#inputs-description"
-  @selenium
+  @selenium-fixme
   Scenario: hide inputs and raw materials
     Given the following product
       | owner      | category | name     | price |
@@ -24,7 +24,7 @@ Scenario: show profile links button
   And I should not see "Members"
   And I should not see "Agenda"
-@selenium
+@selenium-fixme
 Scenario: show profile links when clicked
   Given I am on /assets/enterprises
   When I follow "Profile links"
@@ -32,7 +32,7 @@ Scenario: show profile links when clicked
   And I should see "Members" within "ul.menu-submenu-list"
   And I should see "Agenda" within "ul.menu-submenu-list"
-@selenium
+@selenium-fixme
 Scenario: go to catalog when click on products link
   Given I am on /assets/enterprises
   When I follow "Profile links"
@@ -25,7 +25,7 @@ Feature: categories_block
       | environment | CategoriesBlock |
     And I am logged in as admin
-  @selenium
+  @selenium @ignore-hidden-elements
   Scenario: List just product categories
     Given I go to /admin/environment_design
     And I follow "Edit" within ".categories-block"
@@ -33,11 +33,11 @@ Feature: categories_block
     When I press "Save"
     Then I should see "Food"
     And I should see "Book"
-    And I should not see "Vegetarian"
-    And I should not see "Steak"
-    And I should not see "Fiction"
+    And "Vegetarian" should not be visible within "span#category-name"
+    And "Steak" should not be visible within "span#category-name"
+    And "Fiction" should not be visible within "span#category-name"
-  @selenium
+  @selenium @ignore-hidden-elements
   Scenario: Show submenu if it exists
     Given I go to /admin/environment_design
     And I follow "Edit" within ".categories-block"
@@ -45,40 +45,39 @@ Feature: categories_block
     And I press "Save"
     Then I should see "Food"
     And I should see "Book"
-    And I should not see "Vegetarian"
-    And I should not see "Steak"
-    And I should not see "Literature"
-    When I click ".category-link-expand category-root"
+    And "Vegetarian" should not be visible within "span#category-name"
+    And "Steak" should not be visible within "span#category-name"
+    And "Literature" should not be visible within "span#category-name"
+    When I follow "block_2_category_2"
     Then I should see "Literature"
-    When I click ".category-link-expand category-root"
+    When I follow "block_2_category_1"
     Then I should see "Vegetarian"
     And I should see "Steak"
     And I should not see "Fiction"
-  @selenium
+  @selenium @ignore-hidden-elements
   Scenario: Show only one submenu per time
     Given I go to /admin/environment_design
     And I follow "Edit" within ".categories-block"
     And I check "Product"
     And I press "Save"
     Then I should see "Book"
-    And I should not see "Literature"
-    When I click ".category-link-expand category-root"
+    And "Literature" should not be visible within "span#category-name"
+    When I follow "block_2_category_2"
     Then I should see "Literature"
-  @selenium
+  @selenium @ignore-hidden-elements
   Scenario: List just general categories
     Given I go to /admin/environment_design
     And I follow "Edit" within ".categories-block"
-    And I check "Generic Category"
+    And I check "Generic category"
     When I press "Save"
     Then I should see "Wood"
-  @selenium
+  @selenium @ignore-hidden-elements
   Scenario: List just regions
     Given I go to /admin/environment_design
     And I follow "Edit" within ".categories-block"
     And I check "Region"
     When I press "Save"
     Then I should see "Bahia"
-
@@ -12,12 +12,12 @@ Feature: change organization name
       | joaosilva | Joao Silva |
     And "Joao Silva" is admin of "Sample Community"
     And I am logged in as "joaosilva"
-    And I am on Sample Community's control panel
+    And I am on sample-community's control panel
     And I follow "Community Info and settings"
     And I fill in "Name" with "New Sample Community"
     When I press "Save"
-    Then I should be on New Sample Community's control panel
-
+    Then I should be on sample-community's control panel
+    And I should see "New Sample Community" within "title"
   Scenario: changing enterprise's name
     Given the following enterprises
@@ -28,8 +28,9 @@ Feature: change organization name
       | joaosilva | Joao Silva |
     And "Joao Silva" is admin of "Sample Enterprise"
     And I am logged in as "joaosilva"
-    And I am on Sample Enterprise's control panel
+    And I am on sample-enterprise's control panel
     And I follow "Enterprise Info and settings"
     And I fill in "Name" with "New Sample Enterprise"
     When I press "Save"
-    Then I should be on New Sample Enterprise's control panel
+    Then I should be on sample-enterprise's control panel
+    And I should see "New Sample Enterprise" within "title"
@@ -17,7 +17,7 @@ Feature: chat
   Scenario: provide link to open chat
     Given feature "xmpp_chat" is enabled on environment
     And I am logged in as "tame"
-    Then I should see "Open chat" link
+    Then I should see "Open chat" within "#user"
   @selenium
   Scenario: provide the chat online users content
@@ -30,18 +30,18 @@ Feature: chat
     Given the profile "tame" has no blocks
     And feature "xmpp_chat" is enabled on environment
     And I am logged in as "tame"
-    And I go to Tame's profile
-    When I click "#chat-online-users-title"
+    And I go to tame's profile
+    When I follow "chat-online-users-title"
     Then I should see "Maria Silva"
     And I should see "Jose Silva"
   Scenario: not provide link to chat when environment not support that
     Given I am logged in as "tame"
-    Then I should not see "Open chat" link
+    Then I should not see "Open chat" within "#user"
   Scenario: not provide link to chat when the user is logged out
-    Given I am on Tame's homepage
-    Then I should not see "Open chat" link
+    Given I am on tame's homepage
+    Then I should not see "Open chat" within "#user"
   @selenium
   Scenario: not provide the chat online users list when environment not support that
@@ -71,8 +71,8 @@ Feature: chat
     Given the profile "tame" has no blocks
     And feature "xmpp_chat" is enabled on environment
     And I am logged in as "tame"
-    And I go to Tame's profile
-    When I click "#chat-online-users-title"
+    And I go to tame's profile
+    When I follow "chat-online-users-title"
     And I follow "Maria Silva"
     And I select window "noosfero_chat"
     Then I should see "Chat - Colivre.net - Friends online (0)"
@@ -83,7 +83,7 @@ Feature: chat
     And I am logged in as "tame"
     When I follow "Open chat"
     And I select window "noosfero_chat"
-    Then I should see "Offline" link
+    Then I should see "Offline" within "a"
   @selenium
   Scenario: view options to change my chat status through menu
@@ -91,13 +91,13 @@ Feature: chat
     And I am logged in as "tame"
     And I follow "Open chat"
     When I select window "noosfero_chat"
-    Then the "#chat-online" should not be visible
-    And the "#chat-busy" should not be visible
-    And the "#chat-disconnect" should not be visible
+    Then "Online" should not be visible within "#user-status"
+    And "Busy" should not be visible within "#user-status"
+    And "Sign out of chat" should not be visible within "#user-status"
     When I follow "Offline"
-    Then the "#chat-connect" should be visible
-    And the "#chat-busy" should be visible
-    And the "#chat-disconnect" should be visible
+    Then "Online" should be visible within "#user-status"
+    And "Busy" should be visible within "#user-status"
+    And "Sign out of chat" should be visible within "#user-status"
   @selenium
   Scenario: link to open chatroom of a community
@@ -107,8 +107,8 @@ Feature: chat
     And "Tame" is a member of "Autoramas"
     And feature "xmpp_chat" is enabled on environment
     And I am logged in as "tame"
-    When I go to Autoramas's profile
-    Then I should see "Enter chat room" link
+    When I go to autoramas's profile
+    Then I should see "Enter chat room"
   @selenium
   Scenario: not see link to open chatroom of a community if not a member
@@ -117,8 +117,8 @@ Feature: chat
       | autoramas | Autoramas |
     And feature "xmpp_chat" is enabled on environment
     And I am logged in as "tame"
-    When I go to Autoramas's profile
-    Then I should not see "Enter chat room" link
+    When I go to autoramas's profile
+    Then I should not see "Enter chat room" within "a"
   @selenium
   Scenario: not see link to open chatroom of a community if xmpp_chat disabled
@@ -127,8 +127,8 @@ Feature: chat
       | autoramas | Autoramas |
     And "Tame" is a member of "Autoramas"
     And I am logged in as "tame"
-    When I go to Autoramas's profile
-    Then I should not see "Enter chat room" link
+    When I go to autoramas's profile
+    Then I should not see "Enter chat room" within "a"
   @selenium
   Scenario: open chatroom of a community in a new window
@@ -138,7 +138,7 @@ Feature: chat
       | autoramas | Autoramas |
     And "Tame" is a member of "Autoramas"
     And I am logged in as "tame"
-    When I go to Autoramas's profile
+    When I go to autoramas's profile
     And I follow "Enter chat room"
     And I select window "noosfero_chat"
     Then I should see "Chat - Colivre.net - Friends online (0)"
@@ -22,7 +22,7 @@ Feature: clickable images
       | owner   | name | image     | dimensions |
       | booking | real | rails.png | 50x64      |
     When I go to /booking/real
-    Then I should not see "Zoom in"
+    Then "Zoom in" should not be visible within "a#zoomify-image"
   @selenium
   Scenario: not show link if image does not have dimensions set
@@ -30,9 +30,9 @@ Feature: clickable images
       | owner   | name    | image     |
       | booking | not set | rails.png |
     When I go to /booking/not-set
-    Then I should not see "Zoom in"
+    Then "Zoom in" should not be visible within "a#zoomify-image"
-  @selenium
+  @selenium-fixme
   Scenario: copy style from image
     Given the following article with image
       | owner   | name       | image     | style        | dimensions |
@@ -40,11 +40,11 @@ Feature: clickable images
     When I go to /booking/with-style
     Then "zoomable-image" should be right aligned
-  @selenium
+  @selenium-fixme
   Scenario: zoom image
     Given the following article with image
       | owner   | name | image     | dimensions |
       | booking | zoom | rails.png | 25x32      |
     When I go to /booking/zoom
-    And I follow "Zoom in"
-    Then the "#fancybox-wrap" should be visible
+    And I follow "Zoom in" within "a#zoomify-image"
+    Then I should see "fancybox-wrap"
@@ -14,19 +14,23 @@ Feature: comment
       | article              | author  | title | body         |
       | article with comment | booking | hi    | how are you? |
       | article with comment | booking | hello | i am fine    |
+    And feature "captcha_for_logged_users" is disabled on environment
+    And I am logged in as "booking"
   Scenario: not post a comment without javascript
     Given I am on /booking/article-to-comment
-    And I fill in "Name" with "Joey Ramone"
-    And I fill in "e-mail" with "joey@ramones.com"
+    And I follow "Post a comment"
     And I fill in "Title" with "Hey ho, let's go!"
     And I fill in "Enter your comment" with "Hey ho, let's go!"
     When I press "Post comment"
     Then I should not see "Hey ho, let's go"
-  @selenium
+  # This test requires some way to overcome the captcha with unauthenticated
+  # user.
+  @selenium-fixme
   Scenario: post a comment while not authenticated
     Given I am on /booking/article-to-comment
+    And I follow "Post a comment"
     And I fill in "Name" with "Joey Ramone"
     And I fill in "e-mail" with "joey@ramones.com"
     And I fill in "Title" with "Hey ho, let's go!"
@@ -36,8 +40,8 @@ Feature: comment
   @selenium
   Scenario: post comment while authenticated
-    Given I am logged in as "booking"
-    And I am on /booking/article-to-comment
+    Given I am on /booking/article-to-comment
+    And I follow "Post a comment"
     And I fill in "Title" with "Hey ho, let's go!"
     And I fill in "Enter your comment" with "Hey ho, let's go!"
     When I press "Post comment"
@@ -48,8 +52,8 @@ Feature: comment
     Given the following files
       | owner   | file      | mime      |
       | booking | rails.png | image/png |
-    Given I am logged in as "booking"
     And I am on /booking/rails.png?view=true
+    And I follow "Post a comment"
     And I fill in "Title" with "Hey ho, let's go!"
     And I fill in "Enter your comment" with "Hey ho, let's go!"
     When I press "Post comment"
@@ -57,35 +61,34 @@ Feature: comment
   @selenium
   Scenario: show error messages when make a blank comment
-    Given I am logged in as "booking"
-    And I am on /booking/article-to-comment
+    Given I am on /booking/article-to-comment
+    And I follow "Post a comment"
     When I press "Post comment"
-    Then I should see "Title can't be blank"
-    And I should see "Body can't be blank"
+    Then I should see "Body can't be blank"
-  @selenium
+  @selenium-fixme
   Scenario: disable post comment button
     Given I am on /booking/article-to-comment
-    And I fill in "Name" with "Joey Ramone"
-    And I fill in "e-mail" with "joey@ramones.com"
+    And I follow "Post a comment"
     And I fill in "Title" with "Hey ho, let's go!"
     And I fill in "Enter your comment" with "Hey ho, let's go!"
     When I press "Post comment"
-    Then the "value.Post comment" button should not be enabled
-    And I should see "Hey ho, let's go"
+# Implement these steps...
+#    Then "Post comment" button should not be enabled
+#    And I should see "Hey ho, let's go"
   @selenium
   Scenario: render comment form and go to bottom
     Given I am on /booking/article-with-comment
-    When I follow "Post a comment" within ".post-comment-button"
-    Then I should see "Enter your comment" within "div#page-comment-form div.post_comment_box.opened"
-    And I should be exactly on /booking/article-with-comment
-    And I should be moved to anchor "comment_form"
+    When I follow "Post a comment"
+    Then I should see "Enter your comment"
+    And I should be on /booking/article-with-comment
   @selenium
   Scenario: keep comments field filled while trying to do a comment
     Given I am on /booking/article-with-comment
-    And I fill in "Name" with "Joey Ramone"
+    And I follow "Post a comment"
+    And I fill in "Title" with "Joey Ramone"
     When I press "Post comment"
-    Then the "Name" field should contain "Joey Ramone"
-    And I should see "errors prohibited"
+    Then the "Title" field should contain "Joey Ramone"
+    And I should see "Body can't be blank"
@@ -25,7 +25,7 @@ Feature: comment
     Then I should not see "Enter your comment" within "div.comment-balloon"
     And I should see "Reply" within "div.comment-balloon"
-  @selenium
+  @selenium-fixme
   Scenario: show error messages when make a blank comment reply
     Given I am logged in as "booking"
     And I go to /booking/article-to-comment
@@ -51,9 +51,9 @@ Feature: comment
     Given I am on /booking/article-to-comment
     When I follow "Reply" within ".comment-balloon"
     And I follow "Cancel" within ".comment-balloon"
-    Then I should see "Enter your comment" within "div.comment_reply.closed"
+    Then I should not see "Enter your comment" within "div.comment_reply.closed"
-  @selenium
+  @selenium-fixme
   Scenario: not render same reply form twice
     Given I am on /booking/article-to-comment
     When I follow "Reply" within ".comment-balloon"
@@ -62,7 +62,7 @@ Feature: comment
     Then there should be 1 "comment_form" within "comment_reply"
     And I should see "Enter your comment" within "div.comment_reply.opened"
-  @selenium
+  @selenium-fixme
   Scenario: reply a comment
     Given I go to /booking/another-article
     And I follow "Reply" within ".comment-balloon"
@@ -74,7 +74,7 @@ Feature: comment
     Then I should see "Hey ho, let's go" within "ul.comment-replies"
     And there should be 1 "comment-replies" within "article-comment"
-  @selenium
+  @selenium-fixme
   Scenario: redirect to right place after reply a picture comment
     Given the following files
       | owner   | file      | mime      |
@@ -14,8 +14,8 @@ In order to ask questions and solve problems
   @selenium
   Scenario: without states
-    Given I am on Sample Community's homepage
-    When I follow "Send an e-mail" and wait
+    Given I am on sample-community's homepage
+    When I follow "Send an e-mail"
     Then I should not see "City and state"
   @selenium
@@ -23,7 +23,6 @@ In order to ask questions and solve problems
     Given the following states
       | name  |
       | Bahia |
-    And I am on Sample Community's homepage
-    When I follow "Send an e-mail" and wait
+    And I am on sample-community's homepage
+    When I follow "Send an e-mail"
     Then I should see "City and state"
-    
@@ -11,7 +11,7 @@ Feature: create community
   Scenario: a user creates a community
     Given I am logged in as "joaosilva"
     And feature "admin_must_approve_new_communities" is disabled on environment
-    And I go to the Control panel
+    And I go to joaosilva's control panel
     And I follow "Manage my groups"
     When I follow "Create a new community"
     And I fill in "Name" with "Fancy community"
@@ -22,7 +22,7 @@ Feature: create community
   Scenario: a user creates a community when environment moderates it
     Given I am logged in as "joaosilva"
     And feature "admin_must_approve_new_communities" is enabled on environment
-    When I go to the Control panel
+    And I go to joaosilva's control panel
     And I follow "Manage my groups"
     And I follow "Create a new community"
     And I fill in "Name" with "Community for moderation"
@@ -32,7 +32,7 @@ Feature: create community
   Scenario: a user tries to create a community without a name
     Given I am logged in as "joaosilva"
     And feature "admin_must_approve_new_communities" is disabled on environment
-    And I go to the Control panel
+    And I go to joaosilva's control panel
     And I follow "Manage my groups"
     When I follow "Create a new community"
     And I press "Create"
@@ -42,20 +42,20 @@ Feature: create community
     Given I am logged in as admin
     And feature "admin_must_approve_new_communities" is enabled on environment
     When I create community "Community for approval"
-    And I go to the Control panel
+    And I go to admin_user's control panel
     Then I should see "admin_user wants to create community Community for approval"
   Scenario: environment admin accepts new community task
     Given I am logged in as admin
     And feature "admin_must_approve_new_communities" is enabled on environment
     When I create community "Community for approval"
-    And I go to the Control panel
+    And I go to admin_user's control panel
     And I follow "Process requests"
     And I should see "admin_user wants to create community Community for approval"
     And I choose "Accept"
     When I press "Apply!"
     Then I should not see "admin_user wants to create community Community for approval"
-    When I go to the Control panel
+    And I go to admin_user's control panel
     And I follow "Manage my groups"
     Then I should see "Community for approval"
@@ -63,13 +63,13 @@ Feature: create community
     Given I am logged in as admin
     And feature "admin_must_approve_new_communities" is enabled on environment
     When I create community "Community for approval"
-    And I go to the Control panel
+    And I go to admin_user's control panel
     And I follow "Process requests"
     And I should see "admin_user wants to create community Community for approval"
     And I choose "Reject"
     When I press "Apply!"
     Then I should not see "admin_user wants to create community Community for approval"
-    When I go to the Control panel
+    And I go to admin_user's control panel
     And I follow "Manage my groups"
     Then I should not see "Community for approval"
@@ -78,7 +78,7 @@ Feature: create community
     And feature "admin_must_approve_new_communities" is enabled on environment
     When I create community "Community for approval"
     And I approve community "Community for approval"
-    When I go to the Control panel
+    And I go to admin_user's control panel
     And I follow "Manage my groups"
     Then I should see "Community for approval"
@@ -87,6 +87,6 @@ Feature: create community
     And feature "admin_must_approve_new_communities" is enabled on environment
     When I create community "Community for approval"
     And I reject community "Community for approval"
-    When I go to the Control panel
+    And I go to admin_user's control panel
     And I follow "Manage my groups"
     Then I should not see "Community for approval"
@@ -13,9 +13,10 @@ Feature: delete profile
       | sample-community | Sample Community |
     And "Maria Silva" is a member of "Sample Community"
+  @selenium
   Scenario: deleting profile
     Given I am logged in as "joaosilva"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Edit Profile"
     And I follow "Delete profile"
     Then I should see "Are you sure you want to delete this profile?"
@@ -31,24 +32,25 @@ Feature: delete profile
   Scenario: giving up of deleting profile
     Given I am logged in as "joaosilva"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Edit Profile"
     And I follow "Delete profile"
     Then I should see "Are you sure you want to delete this profile?"
     When I follow "No, I gave up"
-    Then I should be on Joao Silva's profile
+    Then I should be on joaosilva's profile
   Scenario: community admin can see link to delete profile
     Given "Joao Silva" is admin of "Sample Community"
     And I am logged in as "joaosilva"
-    And I am on Sample Community's control panel
+    And I am on sample-community's control panel
     When I follow "Community Info and settings"
     Then I should see "Delete profile"
+  @selenium
   Scenario: community admin deletes the community
     Given "Joao Silva" is admin of "Sample Community"
     And I am logged in as "joaosilva"
-    And I am on Sample Community's control panel
+    And I am on sample-community's control panel
     And I follow "Community Info and settings"
     And I follow "Delete profile"
     Then I should see "Are you sure you want to delete this profile?"
@@ -69,17 +71,18 @@ Feature: delete profile
       | sample-enterprise | Sample Enterprise |
     And "Joao Silva" is admin of "Sample Enterprise"
     And I am logged in as "joaosilva"
-    And I am on Sample Enterprise's control panel
+    And I am on sample-enterprise's control panel
     When I follow "Enterprise Info and settings"
     Then I should see "Delete profile"
+  @selenium
   Scenario: enterprise admin deletes the enterprise
     Given the following enterprise
       | identifier | name |
       | sample-enterprise | Sample Enterprise |
     And "Joao Silva" is admin of "Sample Enterprise"
     And I am logged in as "joaosilva"
-    And I am on Sample Enterprise's control panel
+    And I am on sample-enterprise's control panel
     When I follow "Enterprise Info and settings"
     And I follow "Delete profile"
     Then I should see "Are you sure you want to delete this profile?"
@@ -98,9 +101,10 @@ Feature: delete profile
     And I go to /myprofile/sample-enterprise/profile_editor/destroy_profile
     Then I should see "Access denied"
+  @selenium
   Scenario: environment admin deletes profile
     Given I am logged in as admin
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Edit Profile"
     And I follow "Delete profile"
     Then I should see "Are you sure you want to delete this profile?"
@@ -13,17 +13,17 @@ Feature: edit article
     And I am logged in as "joaosilva"
   Scenario: create a folder
-    Given I am on Joao Silva's control panel
+    Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     When I follow "Folder"
     And I fill in "Title" with "My Folder"
     And I press "Save"
-    And I go to Joao Silva's control panel
+    And I go to joaosilva's control panel
     Then I should see "My Folder"
   Scenario: redirect to the created folder
-    Given I am on Joao Silva's control panel
+    Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     When I follow "Folder"
@@ -33,29 +33,29 @@ Feature: edit article
     And I should be on /joaosilva/my-folder
   Scenario: cancel button back to cms
-    Given I go to the Control panel
+    Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     And I follow "Folder"
     When I follow "Cancel" within ".main-block"
-    Then I should be on Joao Silva's cms
+    Then I should be on joaosilva's cms
   Scenario: display tag list field when creating event
-    Given I go to the Control panel
+    Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     When I follow "Event"
     Then I should see "Tag list"
   Scenario: display tag list field when creating folder
-    Given I go to the Control panel
+    Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     When I follow "Folder"
     Then I should see "Tag list"
   Scenario: create new article with tags
-    Given I go to the Control panel
+    Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     When I follow "Text article with Textile markup language"
@@ -68,7 +68,7 @@ Feature: edit article
     And I should see "bug" within "#article-tags a:last"
   Scenario: redirect to the created article
-    Given I am on Joao Silva's control panel
+    Given I am on joaosilva's control panel
     And I follow "Manage Content"
     When I follow "New content"
     When I follow "Text article with visual editor"
@@ -79,62 +79,62 @@ Feature: edit article
   @selenium
   Scenario: edit an article
-    Given I am on Joao Silva's sitemap
-    When I follow "Save the whales" and wait
-    And I follow "Edit" and wait
+    Given I am on joaosilva's sitemap
+    When I follow "Save the whales"
+    And I follow "Edit"
     And I fill in "Title" with "My Article edited"
-    And I press "Save" and wait
+    And I press "Save"
     Then I should be on /joaosilva/my-article-edited
   @selenium
   Scenario: cancel button back to article when edit
-    Given I am on Joao Silva's sitemap
-    When I follow "Save the whales" and wait
-    And I follow "Edit" and wait
-    And I follow "Cancel" and wait
+    Given I am on joaosilva's sitemap
+    When I follow "Save the whales"
+    And I follow "Edit" within "#article-actions"
+    And I follow "Cancel"
     Then I should be on /joaosilva/save-the-whales
   @selenium
   Scenario: create an article inside a folder
-    Given I am on Joao Silva's control panel
+    Given I am on joaosilva's control panel
     When I follow "Manage Content"
     And I follow "New content"
-    And I follow "Folder" and wait
+    And I follow "Folder"
     And I fill in "Title" with "My Folder"
-    And I press "Save" and wait
+    And I press "Save"
     Then I should be on /joaosilva/my-folder
     When I follow "New article"
-    And I follow "Text article with visual editor" and wait
+    And I follow "Text article with visual editor"
     And I fill in "Title" with "My Article"
-    And I press "Save" and wait
+    And I press "Save"
     Then I should see "My Article"
     And I should be on /joaosilva/my-folder/my-article
   @selenium
   Scenario: cancel button back to folder after giving up creating
-    Given I am on Joao Silva's control panel
+    Given I am on joaosilva's control panel
     When I follow "Manage Content"
     And I follow "New content"
-    And I follow "Folder" and wait
+    And I follow "Folder"
     And I fill in "Title" with "My Folder"
-    And I press "Save" and wait
+    And I press "Save"
     Then I should be on /joaosilva/my-folder
     When I follow "New article"
-    And I follow "Text article with visual editor" and wait
-    And I follow "Cancel" within ".no-boxes" and wait
+    And I follow "Text article with visual editor"
+    And I follow "Cancel" within ".no-boxes"
     Then I should be on /joaosilva/my-folder
   @selenium
   Scenario: save and continue
     Given I am on /joaosilva/save-the-whales
-    And I follow "Edit" and wait
+    And I follow "Edit"
     When I fill in "Text" with "new text"
     And I press "Save and continue"
     Then the "Text" field should contain "new text"
     And I should be on "Save the whales" edit page
   Scenario: save and continue when creating a new article
-    Given I am on Joao Silva's control panel
+    Given I am on joaosilva's control panel
     When I follow "Manage Content"
     And I follow "New content"
     And I follow "Text article with visual editor"
@@ -147,16 +147,16 @@ Feature: edit article
   @selenium
   Scenario: add a translation to an article
-    Given I am on Joao Silva's sitemap
+    Given I am on joaosilva's sitemap
     And I follow "Save the whales"
     Then I should not see "Add translation"
-    And I follow "Edit" and wait
+    And I follow "Edit"
     And I select "English" from "Language"
-    Then I press "Save" and wait
-    And I follow "Add translation" and wait
+    Then I press "Save"
+    And I follow "Add translation"
     And I fill in "Title" with "Mi neuvo artículo"
     And I select "Español" from "Language"
-    When I press "Save" and wait
+    When I press "Save"
     Then I should be on /joaosilva/mi-neuvo-articulo
     And I should see "Translations"
@@ -165,13 +165,13 @@ Feature: edit article
     Given the following articles
       | owner     | name               | language |
       | joaosilva | Article in English | en       |
-    And I am on Joao Silva's sitemap
-    When I follow "Article in English" and wait
-    And I follow "Add translation" and wait
+    And I am on joaosilva's sitemap
+    When I follow "Article in English"
+    And I follow "Add translation"
     And I fill in "Title" with "Article in Portuguese"
-    And I press "Save" and wait
+    And I press "Save"
     Then I should see "Language must be choosen"
     When I select "Português" from "Language"
-    And I press "Save" and wait
+    And I press "Save"
     Then I should not see "Language must be choosen"
     And I should be on /joaosilva/article-in-portuguese
@@ -12,7 +12,7 @@ Feature: edit_block_of_links
       | eddievedder | LinkListBlock |
     And I am logged in as "eddievedder"
-  @selenium
+  @selenium-fixme
   Scenario: show the icon selector
     Given I follow "Edit sideboxes"
     And I follow "Edit" within ".link-list-block"
@@ -4,50 +4,46 @@ Feature: edit environment templates
   Background:
     Given that the default environment have all profile templates
+    And I am logged in as admin
+    And I am on the environment control panel
+  @selenium
   Scenario: See links to edit all templates
-    Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Profile templates"
-    Then I should see "Person template" link
-    And I should see "Community template" link
-    And I should see "Enterprise template" link
-    And I should see "Inactive Enterprise template" link
+    Given I follow "Profile templates"
+    Then I should see "Person template"
+    And I should see "Community template"
+    And I should see "Enterprise template"
+    And I should see "Inactive Enterprise template"
+  @selenium
   Scenario: Go to control panel of person template
-    Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Profile templates"
+    Given I follow "Profile templates"
     And I follow "Person template"
-    Then I should be on Person template's control panel
+    Then I should be on colivre.net_person_template's control panel
+  @selenium
   Scenario: Go to control panel of enterprise template
-    Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Profile templates"
+    Given I follow "Profile templates"
     And I follow "Enterprise template"
-    Then I should be on Enterprise template's control panel
+    Then I should be on colivre.net_enterprise_template's control panel
+  @selenium
   Scenario: Go to control panel of inactive enterprise template
-    Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Profile templates"
-    And I follow "Inactive enterprise template"
-    Then I should be on Inactive Enterprise template's control panel
+    Given I follow "Profile templates"
+    And I follow "Inactive Enterprise template"
+    Then I should be on colivre.net_inactive_enterprise_template's control panel
+  @selenium
   Scenario: Go to control panel of community template
-    Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Profile templates"
-    And I follow "Community template"
-    Then I should be on Community template's control panel
+    Given I follow "Profile templates"
+    When I follow "Community template"
+    Then I should be on colivre.net_community_template's control panel
+  @selenium
   Scenario: Not see link to edit an unexistent template
-    Given that the default environment have no Inactive Enterprise template
-    And I am logged in as admin
-    When I follow "Administration"
-    And I follow "Profile templates"
-    Then I should see "Person template" link
-    And I should see "Community template" link
-    And I should see "Enterprise template" link
-    And I should not see "Inactive enterprise template" link
+    Given I follow "Profile templates"
+    And that the default environment have no Inactive Enterprise template
+    Then I should see "Person template"
+    And I should see "Community template"
+    And I should see "Enterprise template"
+    And I should not see "Inactive enterprise template"
@@ -15,25 +15,25 @@ Feature: edit language of block
   Scenario: display in all languages
     Given I go to edit ArticleBlock of joaosilva
     And I fill in "Custom title for this block" with "Block displayed"
-    And I select "all languages"
+    And I select "all languages" from "Show for"
     And I press "Save"
-    When I go to Jose Silva's homepage
+    When I go to joaosilva's homepage
     Then I should see "Block displayed"
   Scenario: display in the selected language
     Given I go to edit LinkListBlock of joaosilva
     And I fill in "Custom title for this block" with "Block displayed"
-    And I select "English"
+    And I select "English" from "Show for"
     And I press "Save"
     And my browser prefers English
-    When I go to Jose Silva's homepage
+    When I go to joaosilva's homepage
     Then I should see "Block displayed"
   Scenario: not display in a not selected language
     Given I go to edit LinkListBlock of joaosilva
     And I fill in "Custom title for this block" with "Block not displayed"
-    And I select "English"
+    And I select "English" from "Show for"
     And I press "Save"
     And my browser prefers Portuguese
-    When I go to Jose Silva's homepage
+    When I go to joaosilva's homepage
     Then I should not see "Block displayed"
@@ -12,8 +12,8 @@ Feature: edit profile
       | birth_date |
     When I go to joao's control panel
     And I follow "Edit Profile"
-    And I select "November"
-    And I select "15"
+    And I select "November" from "profile_data_birth_date_2i"
+    And I select "15" from "profile_data_birth_date_3i"
     And I press "Save"
     Then I should see "Birth date is invalid"
     And I should not see "Birth date can't be blank"
@@ -24,8 +24,8 @@ Feature: edit profile
       | birth_date |
     When I go to joao's control panel
     And I follow "Edit Profile"
-    And I select "November"
-    And I select "15"
+    And I select "November" from "profile_data_birth_date_2i"
+    And I select "15" from "profile_data_birth_date_3i"
     And I press "Save"
     Then I should see "Birth date is invalid"
     And I should not see "Birth date can't be blank"
@@ -36,9 +36,9 @@ Feature: edit profile
       | birth_date |
     When I go to joao's control panel
     And I follow "Edit Profile"
-    And I select "November"
-    And I select "15"
-    And I select "1980"
+    And I select "November" from "profile_data_birth_date_2i"
+    And I select "15" from "profile_data_birth_date_3i"
+    And I select "1980" from "profile_data_birth_date_1i"
     And I press "Save"
     Then I should not see "Birth date is invalid"
     And I should not see "Birth date is mandatory"
@@ -49,9 +49,9 @@ Feature: edit profile
       | birth_date |
     When I go to joao's control panel
     And I follow "Edit Profile"
-    And I select "November"
-    And I select "15"
-    And I select "1980"
+    And I select "November" from "profile_data_birth_date_2i"
+    And I select "15" from "profile_data_birth_date_3i"
+    And I select "1980" from "profile_data_birth_date_1i"
     And I press "Save"
     Then I should not see "Birth date is invalid"
     And I should not see "Birth date is mandatory"
@@ -62,11 +62,11 @@ Feature: edit profile
       | identifier | name | owner |
       | o-rappa | O Rappa | joao  |
     And feature "enable_organization_url_change" is enabled on environment
-    When I go to O Rappa's control panel
-    And I follow "Community Info and settings" and wait
-    Then the "#identifier-change-confirmation" should not be visible
+    When I go to o-rappa's control panel
+    And I follow "Community Info and settings"
+    And I should not see "identifier-change-confirmation"
     When I fill in "Address" with "banda-o-rappa"
-    Then the "#identifier-change-confirmation" should be visible
+    And I should see "identifier-change-confirmation"
   @selenium
   Scenario: Confirm url change
@@ -74,12 +74,12 @@ Feature: edit profile
       | identifier | name | owner |
       | o-rappa | O Rappa | joao  |
     And feature "enable_organization_url_change" is enabled on environment
-    When I go to O Rappa's control panel
-    And I follow "Community Info and settings" and wait
+    When I go to o-rappa's control panel
+    And I follow "Community Info and settings"
     When I fill in "Address" with "banda-o-rappa"
-    Then the "#identifier-change-confirmation" should be visible
+    Then I should see "identifier-change-confirmation"
     When I follow "Yes"
-    Then the "#identifier-change-confirmation" should not be visible
+    Then "identifier-change-confirmation" should not be visible within "profile-identifier-formitem"
   @selenium
   Scenario: Cancel url change
@@ -87,9 +87,9 @@ Feature: edit profile
       | identifier | name | owner |
       | o-rappa | O Rappa | joao  |
     And feature "enable_organization_url_change" is enabled on environment
-    When I go to O Rappa's control panel
-    And I follow "Community Info and settings" and wait
+    When I go to o-rappa's control panel
+    And I follow "Community Info and settings"
     When I fill in "Address" with "banda-o-rappa"
-    Then the "#identifier-change-confirmation" should be visible
+    Then I should see "identifier-change-confirmation"
     When I follow "No"
-    Then the "#identifier-change-confirmation" should not be visible
+    Then "identifier-change-confirmation" should not be visible within "profile-identifier-formitem"
@@ -3,6 +3,7 @@ Feature: setting environment name
   I want to change the name of the environment
   So that it appears in the window's title bar
+  @selenium-fixme
   Scenario: setting environment name through administration panel
     Given I am logged in as admin
     When I follow "Administration"
	@@ -6,45 +6,144 @@ noosfero, that's not a problem).		@@ -6,45 +6,144 @@ noosfero, that's not a problem).
6	Developers	6	Developers
7	==========	7	==========
8		8
		9	+Alan Freihof Tygel <alantygel@gmail.com>
		10	+Alessandro Palmeira <alessandro.palmeira@gmail.com>
		11	+Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
		12	+Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
		13	+Alessandro Palmeira + Caio Salgado <caio.csalgado@gmail.com>
		14	+Alessandro Palmeira + Caio Salgado + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
		15	+Alessandro Palmeira + Carlos Morais <alessandro.palmeira@gmail.com>
		16	+Alessandro Palmeira + Diego Araújo <alessandro.palmeira@gmail.com>
		17	+Alessandro Palmeira + Diego Araújo <diegoamc90@gmail.com>
		18	+Alessandro Palmeira + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
		19	+Alessandro Palmeira + Diego Araújo + Pedro Leal + João M. M. da Silva <diegoamc90@gmail.com>
		20	+Alessandro Palmeira + Diego Araujo + Rafael Manzo <alessandro.palmeira@gmail.com>
		21	+Alessandro Palmeira + Jefferson Fernandes <alessandro.palmeira@gmail.com>
		22	+Alessandro Palmeira + João M. M. da Silva <alessandro.palmeira@gmail.com>
		23	+Alessandro Palmeira + João M. M. da Silva + Renan Teruo <alessandro.palmeira@gmail.com>
		24	+Alessandro Palmeira + João M. M. Silva <alessandro.palmeira@gmail.com>
		25	+Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
		26	+Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
9	Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>	27	Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
10	Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>	28	Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
11	Antonio Terceiro <terceiro@colivre.coop.br>	29	Antonio Terceiro <terceiro@colivre.coop.br>
12	Aurelio A. Heckert <aurelio@colivre.coop.br>	30	Aurelio A. Heckert <aurelio@colivre.coop.br>
13	Braulio Bhavamitra <brauliobo@gmail.com>	31	Braulio Bhavamitra <brauliobo@gmail.com>
14	Bráulio Bhavamitra <brauliobo@gmail.com>	32	Bráulio Bhavamitra <brauliobo@gmail.com>
		33	+Caio <caio.csalgado@gmail.com>
		34	+Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
		35	+Caio, Pedro <caio.csalgado@gmail.com>
		36	+Caio Salgado + Alessandro Palmeira <caio.csalgado@gmail.com>
		37	+Caio Salgado <caio.csalgado@gmail.com>
		38	+Caio Salgado + Carlos Morais + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
		39	+Caio Salgado + Diego Araujo <caio.csalgado@gmail.com>
		40	+Caio Salgado + Diego Araújo <caio.csalgado@gmail.com>
		41	+Caio Salgado + Diego Araújo <diegoamc90@gmail.com>
		42	+Caio Salgado + Diego Araújo + Jefferson Fernandes <caio.csalgado@gmail.com>
		43	+Caio Salgado + Diego Araújo + João M. M. da Silva <caio.csalgado@gmail.com>
		44	+Caio Salgado + Diego Araújo + Pedro Leal <caio.csalgado@gmail.com>
		45	+Caio Salgado + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
		46	+Caio Salgado + Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
		47	+Caio Salgado + Jefferson Fernandes <caio.csalgado@gmail.com>
		48	+Caio Salgado + Jefferson Fernandes <jeffs.fernandes@gmail.com>
		49	+Caio Salgado + Rafael Manzo <caio.csalgado@gmail.com>
		50	+Caio Salgado + Renan Teruo <caio.csalgado@gmail.com>
		51	+Caio Salgado + Renan Teruo <caio.salgado@gmail.com>
		52	+Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
		53	+Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
15	Caio SBA <caio@colivre.coop.br>	54	Caio SBA <caio@colivre.coop.br>
16	Carlos Morais <carlos88morais@gmail.com>	55	Carlos Morais <carlos88morais@gmail.com>
17	Carlos Morais + Diego Araújo <diegoamc90@gmail.com>	56	Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
		57	+Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
18	Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>	58	Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
		59	+Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
19	Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>	60	Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
20	Daniel Cunha <daniel@colivre.coop.br>	61	Daniel Cunha <daniel@colivre.coop.br>
		62	+diegoamc <diegoamc90@gmail.com>
		63	+Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
		64	+Diego Araujo + Caio Salgado <diegoamc90@gmail.com>
21	Diego Araújo <diegoamc90@gmail.com>	65	Diego Araújo <diegoamc90@gmail.com>
		66	+Diego Araújo + Jefferson Fernandes <diegoamc90@gmail.com>
		67	+Diego Araujo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
		68	+Diego Araújo + João Machini <diegoamc90@gmail.com>
		69	+Diego Araújo + João Machini <digoamc90@gmail.com>
22	Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>	70	Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
		71	+Diego Araújo + João M. M. da Silva + João Machini <diegoamc90@gmail.com>
		72	+Diego Araújo + João M. M. da Silva + Pedro Leal <diegoamc90@gmail.com>
		73	+Diego Araújo + Paulo Meirelles <diegoamc90@gmail.com>
		74	+Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
		75	+Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
		76	+Diego Araújo + Renan Teruo + Alessandro Palmeira <diegoamc90@gmail.com>
		77	+Diego Araújo + Renan Teruo <diegoamc90@gmail.com>
		78	+Diego + Jefferson <diegoamc90@gmail.com>
		79	+Diego Martinez <diegoamc90@gmail.com>
		80	+Diego + Renan <renanteruoc@gmail.com>
23	Fernanda Lopes <nanda.listas+psl@gmail.com>	81	Fernanda Lopes <nanda.listas+psl@gmail.com>
24	Grazieno Pellegrino <grazieno@gmail.com>	82	Grazieno Pellegrino <grazieno@gmail.com>
25	Isaac Canan <isaac@intelletto.com.br>	83	Isaac Canan <isaac@intelletto.com.br>
26	Italo Valcy <italo@dcc.ufba.br>	84	Italo Valcy <italo@dcc.ufba.br>
		85	+Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
		86	+Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
		87	+Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
27	João da Silva <jaodsilv@linux.ime.usp.br>	88	João da Silva <jaodsilv@linux.ime.usp.br>
		89	+João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
		90	+João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
		91	+João M. M. da Silva + Alessandro Palmeira + Diego Araújo <jaodsilv@linux.ime.usp.br>
		92	+João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
		93	+João M. M. da Silva + Alessandro Palmeira + João Machini <jaodsilv@linux.ime.usp.br>
		94	+João M. M. da Silva + Caio Salgado + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
		95	+João M. M. da Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
28	João M. M. da Silva + Carlos Morais <jaodsilv@linux.ime.usp.br>	96	João M. M. da Silva + Carlos Morais <jaodsilv@linux.ime.usp.br>
29	João M. M. da Silva + Diego Araújo <diegoamc90@gmail.com>	97	João M. M. da Silva + Diego Araújo <diegoamc90@gmail.com>
30	João M. M. da Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>	98	João M. M. da Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
		99	+João M. M. da Silva + Diego Araújo + Pedro Leal <jaodsilv@linux.ime.usp.br>
		100	+João M. M. da Silva <jaodsilv@linux.ime.usp.br>
		101	+Joao M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
		102	+João M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
		103	+João M. M. da Silva + João M. Miranda <jaodsilv@linux.ime.usp.br>
31	João M. M. da Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>	104	João M. M. da Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
		105	+João M. M. da Silva + Pedro Leal <jaodsilv@linux.ime.usp.br>
		106	+João M. M. da Silva + Rafael Manzo + Diego Araújo <jaodsilv@linux.ime.usp.br>
		107	+João M. M. da Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
		108	+João M. M. da Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
		109	+João M. M. Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
		110	+João M. M. Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
		111	+Joao M. M. Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
		112	+João M. M. Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
		113	+João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
		114	+João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
32	Joenio Costa <joenio@colivre.coop.br>	115	Joenio Costa <joenio@colivre.coop.br>
33	Josef Spillner <josef.spillner@tu-dresden.de>	116	Josef Spillner <josef.spillner@tu-dresden.de>
34	Keilla Menezes <keilla@colivre.coop.br>	117	Keilla Menezes <keilla@colivre.coop.br>
35	Larissa Reis <larissa@colivre.coop.br>	118	Larissa Reis <larissa@colivre.coop.br>
36	Larissa Reis <reiss.larissa@gmail.com>	119	Larissa Reis <reiss.larissa@gmail.com>
37	Leandro Nunes dos Santos <leandronunes@gmail.com>	120	Leandro Nunes dos Santos <leandronunes@gmail.com>
		121	+Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
38	LinguÁgil 2010 <linguagil.bahia@gmail.com>	122	LinguÁgil 2010 <linguagil.bahia@gmail.com>
		123	+Luis David Aguilar Carlos <ludwig9003@gmail.com>
39	Martín Olivera <molivera@solar.org.ar>	124	Martín Olivera <molivera@solar.org.ar>
40	Moises Machado <moises@colivre.coop.br>	125	Moises Machado <moises@colivre.coop.br>
41	Nanda Lopes <nanda.listas+psl@gmail.com>	126	Nanda Lopes <nanda.listas+psl@gmail.com>
		127	+Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
42	Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>	128	Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
		129	+Paulo Meirelles + Diego Araújo <paulo@softwarelivre.org>
		130	+Paulo Meirelles + João M. M. da Silva <paulo@softwarelivre.org>
43	Paulo Meirelles <paulo@softwarelivre.org>	131	Paulo Meirelles <paulo@softwarelivre.org>
44	Rafael Gomes <rafaelgomes@techfree.com.br>	132	Rafael Gomes <rafaelgomes@techfree.com.br>
		133	+Rafael Manzo + João M. M. Silva <rr.manzo@gmail.com>
45	Rafael Martins <rmmartins@gmail.com>	134	Rafael Martins <rmmartins@gmail.com>
		135	+Rafael Reggiani Manzo + Caio Salgado + Jefferson Fernandes <rr.manzo@gmail.com>
		136	+Rafael Reggiani Manzo + Diego Araujo <diegoamc90@gmail.com>
		137	+Rafael Reggiani Manzo + Diego Araujo <rr.manzo@gmail.com>
		138	+Rafael Reggiani Manzo <rr.manzo@gmail.com>
46	Raphaël Rousseau <raph@r4f.org>	139	Raphaël Rousseau <raph@r4f.org>
47	Raquel Lira <raquel.lira@gmail.com>	140	Raquel Lira <raquel.lira@gmail.com>
		141	+Renan Teruo + Caio Salgado <renanteruoc@gmail.com>
		142	+Renan Teruoc + Diego Araujo <renanteruoc@gmail.com>
		143	+Renan Teruo + Diego Araujo <renanteruoc@gmail.com>
		144	+Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
		145	+Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
		146	+Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
48	Rodrigo Souto <rodrigo@colivre.coop.br>	147	Rodrigo Souto <rodrigo@colivre.coop.br>
49	Ronny Kursawe <kursawe.ronny@googlemail.com>	148	Ronny Kursawe <kursawe.ronny@googlemail.com>
50	Samuel R. C. Vale <srcvale@holoscopio.com>	149	Samuel R. C. Vale <srcvale@holoscopio.com>
1	= Noosfero instructions for developers	1	= Noosfero instructions for developers
2		2
3	-This document provides useful information to those who want to help with
4	-Noosfero development.	3	+== A work about your the development platform
5		4
6	-== Requirements for development	5	+These instructions are tested and known to work on Debian stable, which is the
		6	+system that the Noosfero core developers use to work on Noosfero.
7		7
8	-First, install all requirements listed in INSTALL. Note that you do not need to
9	-follow all the steps described there, you only need to install the packages
10	-listed in the "Requirements" section.	8	+If you want to use another OS, read "Instructions for other systems" below.
11		9
12	-After installing the requirements listed in INSTALL, you need to install some
13	-packages be able to run Noosfero tests. On Debian GNU/Linux and Debian-based
14	-systems, you install them with the following command:	10	+== Instructions for Debian stable
15		11
16	- # apt-get install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev	12	+Download the source code:
17		13
18	-On other systems, they may or may not be available through your regular package
19	-management system. Below are the links to their homepages.	14	+ $ git clone git://gitorious.org/noosfero/noosfero.git
		15	+ $ cd noosfero
20		16
21	-* Mocha: http://mocha.rubyforge.org/
22	-* Tidy: http://tidy.sourceforge.net/
23	-* Hpricot: http://github.com/whymirror/hpricot
24	-* Imagemagick: http://wwwimagemagick.org/
25	-* po4a: http://po4a.alioth.debian.org/
26	-* xvfb: http://packages.debian.org/lenny/xvfb
27	-* Libxml2: http://xmlsoft.org/
28	-* Libxslt: http://xmlsoft.org/xslt	17	+Run the quick start script:
29		18
30	-== Boostraping a development/test environment	19	+ $ ./script/quick-start
31		20
32	-You can copy and paste the commands below into a terminal (please review the
33	-commands and make sure you understand what you are doing):	21	+Now you can execute the development server with:
34		22
35	- # checkout the code from repository
36	- git clone git://gitorious.org/noosfero/noosfero.git
37	- # enter the directory
38	- cd noosfero
39	- # copy a sample config file
40	- cp config/database.yml.sqlite3 config/database.yml
41	- # create tmp directory if it doesn't exist
42	- mkdir tmp
43	- # start Solr
44	- rake solr:start
45	- # create the development database
46	- rake db:schema:load
47	- # run pending migrations
48	- rake db:migrate
49	- # compile translations:
50	- rake makemo
51	- # create some test data:
52	- ./script/sample-data
53	- # install latest requirements for running tests
54	- RAILS_ENV=cucumber rake gems:install
55	- RAILS_ENV=test rake gems:install
56	- # run the automated test suite to make sure your environment is sane:
57	- rake test	23	+ $ ./script/development
58		24
59	-You should now be ready to go. Issue the following command to start the Rails
60	-development server:	25	+You will be able to access Noosfero at http://localhost:3000/
61		26
62	- ./script/server	27	+If you want to use a different port than 3000, pass `-p <PORT>` to
		28	+./script/development
63		29
64	-The server will be available at http://localhost:3000/ . If you want to use
65	-another port than 3000, you can use the -p option of ./script/server:	30	+== Instructions for other systems
66		31
67	- ./script/server -p 9999	32	+On other OS, you have 2 options:
68		33
69	-The above command makes the server available at http://localhost:9999/	34	+1) using a chroot or a VM with Debian stable (easier)
70		35
71	-The sample-data data scripts creates two administrator users with login "ze" and
72	-password "test" and login "adminuser" and password "admin".	36	+Use a chroot (http://wiki.debian.org/Schroot) or a Virtual Machine (e.g. with
		37	+VirtualBox) with a Debian stable system and follow the instructions above for
		38	+Debian stable.
73		39
74	-Note that some operations, like generating image thumbnails, sending e-mails,
75	-etc, are done in background in the context of a service independent from the
76	-Rails application server. To have those tasks performed in a development
77	-environment, you must run the delayed_job server like this:	40	+2) Installing dependencies on other OS (harder)
78		41
79	- ./script/delayed_job run	42	+If you want to setup a development environment in another OS, you can create a
		43	+file under script/install-dependencies/, called <OS>-<CODENAME>.sh, which
		44	+installed the dependencies for your system. With this script in place,
		45	+./script/quick-start will call it at the point of installing the required
		46	+packages for Noosfero development.
80		47
81	-This will block your terminal. To stop the delayed_job server, hit Control-C.	48	+You can check script/install-dependencies/debian-squeeze.sh to have an idea of
		49	+what kind of stuff that script has to do.
82		50
83	-== Enabling exceptions notification
84	-
85	-By default, exception notifications are disabled in development environment. If
86	-you want to enable it then you need to change some files:
87	-
88	-1) Add in config/environments/development.rb:
89	- config.action_controller.consider_all_requests_local = false
90	-
91	-2) Add in app/controller/application.rb:
92	- local_addresses.clear
93	-
94	-3) Add in config/noosfero.yml at development section:
95	- exception_recipients: [admin@example.com]
96	-
97	-== Releasing and building Debian package
98	-
99	-See RELEASING file.	51	+If you write such script for your own OS, please share it with us at the
		52	+development mailing list so that we can include it in the official repository.
		53	+This way other people using the same OS will have to put less effort to develop
		54	+Noosfero.
@@ -0,0 +1,43 @@		@@ -0,0 +1,43 @@
	1	+= Noosfero email setup
	2	+
	3	+If you know mail systems well, you just need to make sure that the local MTA,
	4	+listening on localhost:25, is able to deliver e-mails to the internet. Any mail
	5	+server will do it. You can stop reading now.
	6	+
	7	+If you are not an email specialist, then follow the instructions below. We
	8	+suggest that you use the Postfix mail server, since it is easy to configure and
	9	+very reliable. Just follow the instructions below.
	10	+
	11	+To install Postfix:
	12	+
	13	+# apt-get install postfix
	14	+
	15	+During the installation process, you will be asked a few questions. Your answer
	16	+to them will vary in 2 cases:
	17	+
	18	+Case 1: you can send e-mails directly to the internet. This will be the case
	19	+for most commercial private servers. Your answers should be:
	20	+
	21	+ General type of mail configuration: Internet site
	22	+ System mail name: the name of your domain, e.g. "mysocialnetwork.com"
	23	+
	24	+Case 2: you cannot, or don't want to, send e-mail directly to the internet.
	25	+This happens for example if your server is not allowed to make outbound
	26	+connections on port 25, or if you want to concentrate all your outbound mail
	27	+through a single SMTP server. Your answers in this case should be:
	28	+
	29	+ General type of mail configuration: Internet with smarthost
	30	+ System mail name: the name of your domain, e.g. "mysocialnetwork.com"
	31	+ SMTP relay host: smtp.yourprovider.com
	32	+
	33	+Note that smtp.yourprovider.com must allow your server to deliver e-mails
	34	+through it. You should probably ask your servive provider about this.
	35	+
	36	+There is another possibility: if you are installing on a shared server, and
	37	+don't have permission to configure the local MTA, you can instruct Noosfero to
	38	+send e-mails directly through an external server. Please note that this should
	39	+be your last option, since contacting an external SMTP server directly may slow
	40	+down your Noosfero application server. To configure Noosfero to send e-mails
	41	+through an external SMTP server, follow the instructions on
	42	+http://noosfero.org/Development/SMTPMailSending
	43	+
	@@ -3,7 +3,7 @@ class EnvironmentDesignController < BoxOrganizerController		@@ -3,7 +3,7 @@ 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	end	7	end
8		8
9	end	9	end
	@@ -9,7 +9,7 @@ class TasksController < MyProfileController		@@ -9,7 +9,7 @@ class TasksController < MyProfileController
9	end	9	end
10		10
11	def processed	11	def processed
12	- @tasks = Task.to(profile).finished.sort_by(&:created_at)	12	+ @tasks = Task.to(profile).closed.sort_by(&:created_at)
13	end	13	end
14		14
15	VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]	15	VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]
	@@ -4,6 +4,7 @@ class AccountController < ApplicationController		@@ -4,6 +4,7 @@ class AccountController < ApplicationController
4		4
5	before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise]	5	before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise]
6	before_filter :redirect_if_logged_in, :only => [:login, :signup]	6	before_filter :redirect_if_logged_in, :only => [:login, :signup]
		7	+ before_filter :protect_from_bots, :only => :signup
7		8
8	# say something nice, you goof! something sweet.	9	# say something nice, you goof! something sweet.
9	def index	10	def index
	@@ -55,6 +56,11 @@ class AccountController < ApplicationController		@@ -55,6 +56,11 @@ class AccountController < ApplicationController
55	render :action => 'login', :layout => false	56	render :action => 'login', :layout => false
56	end	57	end
57		58
		59	+ def signup_time
		60	+ key = set_signup_start_time_for_now
		61	+ render :text => { :ok=>true, :key=>key }.to_json
		62	+ end
		63	+
58	# action to register an user to the application	64	# action to register an user to the application
59	def signup	65	def signup
60	if @plugins.dispatch(:allow_user_registration).include?(false)	66	if @plugins.dispatch(:allow_user_registration).include?(false)
	@@ -62,12 +68,9 @@ class AccountController < ApplicationController		@@ -62,12 +68,9 @@ class AccountController < ApplicationController
62	session[:notice] = _("This environment doesn't allow user registration.")	68	session[:notice] = _("This environment doesn't allow user registration.")
63	end	69	end
64		70
		71	+ @block_bot = !!session[:may_be_a_bot]
65	@invitation_code = params[:invitation_code]	72	@invitation_code = params[:invitation_code]
66	begin	73	begin
67	- if params[:user]
68	- params[:user].delete(:password_confirmation_clear)
69	- params[:user].delete(:password_clear)
70	- end
71	@user = User.new(params[:user])	74	@user = User.new(params[:user])
72	@user.terms_of_use = environment.terms_of_use	75	@user.terms_of_use = environment.terms_of_use
73	@user.environment = environment	76	@user.environment = environment
	@@ -76,19 +79,28 @@ class AccountController < ApplicationController		@@ -76,19 +79,28 @@ class AccountController < ApplicationController
76	@person = Person.new(params[:profile_data])	79	@person = Person.new(params[:profile_data])
77	@person.environment = @user.environment	80	@person.environment = @user.environment
78	if request.post?	81	if request.post?
79	- @user.signup!
80	- owner_role = Role.find_by_name('owner')
81	- @user.person.affiliate(@user.person, [owner_role]) if owner_role
82	- invitation = Task.find_by_code(@invitation_code)
83	- if invitation
84	- invitation.update_attributes!({:friend => @user.person})
85	- invitation.finish
86	- end
87	- if @user.activated?
88	- self.current_user = @user
89	- redirect_to '/'	82	+ if may_be_a_bot
		83	+ set_signup_start_time_for_now
		84	+ @block_bot = true
		85	+ session[:may_be_a_bot] = true
90	else	86	else
91	- @register_pending = true	87	+ if session[:may_be_a_bot]
		88	+ return false unless verify_recaptcha :model=>@user, :message=>_('Captcha (the human test)')
		89	+ end
		90	+ @user.signup!
		91	+ owner_role = Role.find_by_name('owner')
		92	+ @user.person.affiliate(@user.person, [owner_role]) if owner_role
		93	+ invitation = Task.find_by_code(@invitation_code)
		94	+ if invitation
		95	+ invitation.update_attributes!({:friend => @user.person})
		96	+ invitation.finish
		97	+ end
		98	+ if @user.activated?
		99	+ self.current_user = @user
		100	+ redirect_to '/'
		101	+ else
		102	+ @register_pending = true
		103	+ end
92	end	104	end
93	end	105	end
94	rescue ActiveRecord::RecordInvalid	106	rescue ActiveRecord::RecordInvalid
	@@ -97,6 +109,7 @@ class AccountController < ApplicationController		@@ -97,6 +109,7 @@ class AccountController < ApplicationController
97	@person.errors.delete(:user_id)	109	@person.errors.delete(:user_id)
98	render :action => 'signup'	110	render :action => 'signup'
99	end	111	end
		112	+ clear_signup_start_time
100	end	113	end
101		114
102	# action to perform logout from the application	115	# action to perform logout from the application
	@@ -271,7 +284,36 @@ class AccountController < ApplicationController		@@ -271,7 +284,36 @@ class AccountController < ApplicationController
271	def no_redirect	284	def no_redirect
272	@cannot_redirect = true	285	@cannot_redirect = true
273	end	286	end
274	-	287	+
		288	+ def set_signup_start_time_for_now
		289	+ key = 'signup_start_time_' + rand.to_s.split('.')[1]
		290	+ Rails.cache.write key, Time.now
		291	+ key
		292	+ end
		293	+
		294	+ def get_signup_start_time
		295	+ Rails.cache.read params[:signup_time_key]
		296	+ end
		297	+
		298	+ def clear_signup_start_time
		299	+ Rails.cache.delete params[:signup_time_key] if params[:signup_time_key]
		300	+ end
		301	+
		302	+ def may_be_a_bot
		303	+ # No minimum signup delay, no bot test.
		304	+ return false if environment.min_signup_delay == 0
		305	+
		306	+ # answering captcha, may be human!
		307	+ return false if params[:recaptcha_response_field]
		308	+
		309	+ # never set signup_time, hi wget!
		310	+ signup_start_time = get_signup_start_time
		311	+ return true if signup_start_time.nil?
		312	+
		313	+ # so fast, so bot.
		314	+ signup_start_time > ( Time.now - environment.min_signup_delay.seconds )
		315	+ end
		316	+
275	def check_answer	317	def check_answer
276	unless answer_correct	318	unless answer_correct
277	@enterprise.block	319	@enterprise.block
	@@ -3,4 +3,28 @@ module CatalogHelper		@@ -3,4 +3,28 @@ module CatalogHelper
3	include DisplayHelper	3	include DisplayHelper
4	include ManageProductsHelper	4	include ManageProductsHelper
5		5
		6	+ def breadcrumb(category)
		7	+ start = link_to(_('Start'), {:action => 'index'})
		8	+ ancestors = category.ancestors.map { \|c\| link_to(c.name, {:action => 'index', :level => c.id}) }.reverse
		9	+ current_level = content_tag('strong', category.name)
		10	+ all_items = [start] + ancestors + [current_level]
		11	+ content_tag('div', all_items.join(' → '), :id => 'breadcrumb')
		12	+ end
		13	+
		14	+ def category_link(category, sub = false)
		15	+ count = profile.products.from_category(category).count
		16	+ name = truncate(category.name, :length => 22 - count.to_s.size)
		17	+ link_name = sub ? name : content_tag('strong', name)
		18	+ link = link_to(link_name, {:action => 'index', :level => category.id}, :title => category.name)
		19	+ content_tag('li', "#{link} (#{count})") if count > 0
		20	+ end
		21	+
		22	+ def category_sub_links(category)
		23	+ sub_categories = []
		24	+ category.children.order(:name).each do \|sub_category\|
		25	+ sub_categories << category_link(sub_category, true)
		26	+ end
		27	+ content_tag('ul', sub_categories) if sub_categories.size > 1
		28	+ end
		29	+
6	end	30	end
	@@ -26,7 +26,7 @@ module ContentViewerHelper		@@ -26,7 +26,7 @@ module ContentViewerHelper
26	end	26	end
27	title << content_tag('span',	27	title << content_tag('span',
28	content_tag('span', show_date(article.published_at), :class => 'date') +	28	content_tag('span', show_date(article.published_at), :class => 'date') +
29	- content_tag('span', [_(", by %s") % link_to(article.author_name, article.author.url)], :class => 'author') +	29	+ content_tag('span', [_(", by %s") % link_to(article.author_name, article.author_url)], :class => 'author') +
30	content_tag('span', comments, :class => 'comments'),	30	content_tag('span', comments, :class => 'comments'),
31	:class => 'created-at'	31	:class => 'created-at'
32	)	32	)
	@@ -8,6 +8,14 @@ module DisplayHelper		@@ -8,6 +8,14 @@ module DisplayHelper
8	opts	8	opts
9	end	9	end
10		10
		11	+ def themed_path(file)
		12	+ if File.exists?(File.join(Rails.root, 'public', theme_path, file))
		13	+ File.join(theme_path, file)
		14	+ else
		15	+ file
		16	+ end
		17	+ end
		18	+
11	def image_link_to_product(product, opts={})	19	def image_link_to_product(product, opts={})
12	return _('No product') unless product	20	return _('No product') unless product
13	target = product_path(product)	21	target = product_path(product)
	@@ -142,6 +142,38 @@ module FormsHelper		@@ -142,6 +142,38 @@ module FormsHelper
142	content_tag('table',rows.join("\n"))	142	content_tag('table',rows.join("\n"))
143	end	143	end
144		144
		145	+ def select_folder(label_text, field_id, collection, default_value=nil, html_options = {}, js_options = {})
		146	+ root = profile ? profile.identifier : _("root")
		147	+ labelled_form_field(
		148	+ label_text,
		149	+ select_tag(
		150	+ field_id,
		151	+ options_for_select(
		152	+ [[root, '']] +
		153	+ collection.collect {\|f\| [ root + '/' + f.full_name, f.id ] },
		154	+ default_value
		155	+ ),
		156	+ html_options.merge(js_options)
		157	+ )
		158	+ )
		159	+ end
		160	+
		161	+ def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {})
		162	+ result = labelled_form_field(
		163	+ label_text,
		164	+ select_tag(
		165	+ field_id,
		166	+ options_for_select(
		167	+ [[profile.identifier, '']] +
		168	+ profile.folders.collect {\|f\| [ profile.identifier + '/' + f.full_name, f.id ] },
		169	+ default_value
		170	+ ),
		171	+ html_options.merge(js_options)
		172	+ )
		173	+ )
		174	+ return result
		175	+ end
		176	+
145	def date_field(name, value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})	177	def date_field(name, value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
146	datepicker_options[:disabled] \|\|= false	178	datepicker_options[:disabled] \|\|= false
147	datepicker_options[:alt_field] \|\|= ''	179	datepicker_options[:alt_field] \|\|= ''