Merge branch 'master' into stable

Rodrigo Souto
2 parents 3b08f804 e23f1bea
Showing 477 changed files with 33932 additions and 5764 deletions Show diff stats
AUTHORS
Gemfile
Gemfile.lock
INSTALL.varnish
RELEASING
app/controllers/admin/environment_design_controller.rb
app/controllers/box_organizer_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/helpers/application_helper.rb
app/helpers/block_helper.rb
app/helpers/blog_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/dates_helper.rb
app/helpers/forms_helper.rb
app/helpers/layout_helper.rb
app/models/article.rb
app/models/article_block.rb
app/models/blog.rb
app/models/enterprise.rb
app/models/environment.rb
@@ -13,16 +13,30 @@ Alessandro Palmeira + Caio Salgado &lt;alessandro.palmeira@gmail.com&gt;
 Alessandro Palmeira + Caio Salgado <caio.csalgado@gmail.com>
 Alessandro Palmeira + Caio Salgado + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
 Alessandro Palmeira + Carlos Morais <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Daniel Alves <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
+Alessandro Palmeira + Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
+Alessandro Palmeira + Diego Araujo <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Diego Araújo <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araujo + Daniela Feitosa <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araujo <diegoamc90@gmail.com>
 Alessandro Palmeira + Diego Araújo <diegoamc90@gmail.com>
+Alessandro Palmeira + Diego Araujo + Eduardo Morais <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araújo + João M. M. da Silva <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
+Alessandro Palmeira + Diego Araujo + João M. M. da Silva + Paulo Meirelles <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
 Alessandro Palmeira + Diego Araújo + Pedro Leal + João M. M. da Silva <diegoamc90@gmail.com>
 Alessandro Palmeira + Diego Araujo + Rafael Manzo <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Eduardo Morais <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Guilherme Rojas <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Jefferson Fernandes <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + João M. M. da Silva <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Joao M. M. da Silva + Diego Araujo <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + João M. M. da Silva + Renan Teruo <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + João M. M. Silva <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
 Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
 Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
@@ -32,6 +46,7 @@ Braulio Bhavamitra &lt;brauliobo@gmail.com&gt;
 Bráulio Bhavamitra <brauliobo@gmail.com>
 Caio <caio.csalgado@gmail.com>
 Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
+Caio Formiga <caio.formiga@gmail.com>
 Caio, Pedro <caio.csalgado@gmail.com>
 Caio Salgado + Alessandro Palmeira <caio.csalgado@gmail.com>
 Caio Salgado <caio.csalgado@gmail.com>
@@ -57,26 +72,42 @@ Carlos Morais + Diego Araújo &lt;diegoamc90@gmail.com&gt;
 Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
 Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
 Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
+Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
+Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
+Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
+Daniel Alves + Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
+Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
+Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
+Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
 Daniel Cunha <daniel@colivre.coop.br>
 diegoamc <diegoamc90@gmail.com>
 Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
+Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
+Diego Araújo + Alessandro Palmeira + Rafael Manzo <rr.manzo@gmail.com>
 Diego Araujo + Caio Salgado <diegoamc90@gmail.com>
+Diego Araújo + Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
 Diego Araújo <diegoamc90@gmail.com>
+Diego Araújo + Eduardo Morais + Paulo Meirelles <diegoamc90@gmail.com>
+Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
 Diego Araújo + Jefferson Fernandes <diegoamc90@gmail.com>
 Diego Araujo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
 Diego Araújo + João Machini <diegoamc90@gmail.com>
 Diego Araújo + João Machini <digoamc90@gmail.com>
+Diego Araújo + João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
 Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
 Diego Araújo + João M. M. da Silva + João Machini <diegoamc90@gmail.com>
 Diego Araújo + João M. M. da Silva + Pedro Leal <diegoamc90@gmail.com>
 Diego Araújo + Paulo Meirelles <diegoamc90@gmail.com>
 Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
+Diego Araujo + Rafael Manzo <diegoamc90@gmail.com>
 Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
 Diego Araújo + Renan Teruo + Alessandro Palmeira <diegoamc90@gmail.com>
 Diego Araújo + Renan Teruo <diegoamc90@gmail.com>
+Diego Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo@gmail.com>
 Diego + Jefferson <diegoamc90@gmail.com>
 Diego Martinez <diegoamc90@gmail.com>
+Diego Martinez <diego@diego-K55A.(none)>
 Diego + Renan <renanteruoc@gmail.com>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
 Grazieno Pellegrino <grazieno@gmail.com>
@@ -89,6 +120,7 @@ João da Silva &lt;jaodsilv@linux.ime.usp.br&gt;
 João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Alessandro Palmeira + Diego Araújo <jaodsilv@linux.ime.usp.br>
+Joao M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Alessandro Palmeira + João Machini <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Caio Salgado + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
@@ -124,17 +156,25 @@ Luis David Aguilar Carlos &lt;ludwig9003@gmail.com&gt;
 Martín Olivera <molivera@solar.org.ar>
 Moises Machado <moises@colivre.coop.br>
 Nanda Lopes <nanda.listas+psl@gmail.com>
+Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
 Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
 Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
 Paulo Meirelles + Diego Araújo <paulo@softwarelivre.org>
 Paulo Meirelles + João M. M. da Silva <paulo@softwarelivre.org>
 Paulo Meirelles <paulo@softwarelivre.org>
+Paulo Meirelles + Rafael Manzo <paulo@softwarelivre.org>
 Rafael Gomes <rafaelgomes@techfree.com.br>
+Rafael Manzo + Alessandro Palmeira <rr.manzo@gmail.com>
+Rafael Manzo + Daniel Alves <danpaulalves@gmail.com>
+Rafael Manzo + Diego Araújo <rr.manzo@gmail.com>
 Rafael Manzo + João M. M. Silva <rr.manzo@gmail.com>
+Rafael Manzo + Paulo Meirelles <rr.manzo@gmail.com>
 Rafael Martins <rmmartins@gmail.com>
 Rafael Reggiani Manzo + Caio Salgado + Jefferson Fernandes <rr.manzo@gmail.com>
 Rafael Reggiani Manzo + Diego Araujo <diegoamc90@gmail.com>
 Rafael Reggiani Manzo + Diego Araujo <rr.manzo@gmail.com>
+Rafael Reggiani Manzo + Diego Araújo <rr.manzo@gmail.com>
+Rafael Reggiani Manzo + João M. M. da Silva <rr.manzo@gmail.com>
 Rafael Reggiani Manzo <rr.manzo@gmail.com>
 Raphaël Rousseau <raph@r4f.org>
 Raquel Lira <raquel.lira@gmail.com>
@@ -146,8 +186,10 @@ Renan Teruo + Paulo Meirelles &lt;renanteruoc@gmail.com&gt;
 Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
 Rodrigo Souto <rodrigo@colivre.coop.br>
 Ronny Kursawe <kursawe.ronny@googlemail.com>
+root <root@debian.sdr.serpro>
 Samuel R. C. Vale <srcvale@holoscopio.com>
 Valessio Brito <valessio@gmail.com>
+vfcosta <vfcosta@gmail.com>
 Visita <visita@debian.(none)>
 Yann Lugrin <yann.lugrin@liquid-concept.ch>
-source :rubygems
-gem 'cucumber', '0.4.0'
-gem 'webrat', '0.5.1'
-gem 'rspec', '1.2.9'
-gem 'rspec-rails', '1.2.9'
-gem 'Selenium', '>= 1.1.14'
-gem 'selenium-client', '>= 1.2.17'
-gem 'database_cleaner'
+source "https://rubygems.org"
+
 gem 'exception_notification', '1.0.20090728'
 gem 'system_timer'
+group :test do
+  gem 'rspec', '1.2.9'
+  gem 'rspec-rails', '1.2.9'
+end
+
+group :cucumber do
+  gem 'rake', '0.8.7'
+  gem 'cucumber-rails', '0.3.2'
+  gem 'capybara', '1.1.1'
+  gem 'cucumber', '1.1.0'
+  gem 'database_cleaner'
+end
+
 def program(name)
   unless system("which #{name} > /dev/null")
     puts "W: Program #{name} is needed, but was not found in your PATH"
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    Selenium (1.1.14)
-    builder (3.0.0)
-    cucumber (0.4.0)
+    builder (3.1.4)
+    capybara (1.1.1)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    cucumber (1.1.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      polyglot (>= 0.2.9)
-      term-ansicolor (>= 1.0.3)
-      treetop (>= 1.4.2)
-    database_cleaner (0.7.0)
+      gherkin (~> 2.5.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    cucumber-rails (0.3.2)
+      cucumber (>= 0.8.0)
+    database_cleaner (0.9.1)
     diff-lcs (1.1.3)
     exception_notification (1.0.20090728)
-    nokogiri (1.5.0)
-    polyglot (0.3.3)
-    rack (1.3.5)
+    ffi (1.2.0)
+    gherkin (2.5.4)
+      json (>= 1.4.6)
+    json (1.7.5)
+    libwebsocket (0.1.6.1)
+      websocket
+    mime-types (1.19)
+    multi_json (1.3.7)
+    nokogiri (1.5.5)
+    rack (1.1.0)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (0.8.7)
     rspec (1.2.9)
     rspec-rails (1.2.9)
       rack (>= 1.0.0)
       rspec (>= 1.2.9)
-    selenium-client (1.2.18)
+    rubyzip (0.9.9)
+    selenium-webdriver (2.26.0)
+      childprocess (>= 0.2.5)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
+      rubyzip
     system_timer (1.2.4)
     term-ansicolor (1.0.7)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    webrat (0.5.1)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
+    websocket (1.0.4)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
 PLATFORMS
   ruby
 DEPENDENCIES
-  Selenium (>= 1.1.14)
-  cucumber (= 0.4.0)
+  capybara (= 1.1.1)
+  cucumber (= 1.1.0)
+  cucumber-rails (= 0.3.2)
   database_cleaner
   exception_notification (= 1.0.20090728)
+  rake (= 0.8.7)
   rspec (= 1.2.9)
   rspec-rails (= 1.2.9)
-  selenium-client (>= 1.2.17)
   system_timer
-  webrat (= 0.5.1)
@@ -45,6 +45,10 @@ Install the RPAF apache module (or skip this step if not using apache):
 On manual installations, change "/etc/noosfero/*" to
 "{Rails.root}/etc/noosfero/*"
+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".
+
 4c) Restart Varnish
   # invoke-rc.d varnish restart
@@ -31,6 +31,7 @@ To prepare a release of noosfero, you must follow the steps below:
   sha1 of the package (with sha1sum and paste the SHA1 hash as comment in the
   attachment form)
 * Download the attached and verify the MD5 hash
+* Push the new version tag (with git push --tags)
 * Update an eventual demonstration version that you run.
 * Write an announcement e-mail to the relevant mailing lists pointing to the
   release notes, and maybe to the demonstration version.
@@ -3,7 +3,8 @@ class EnvironmentDesignController &lt; BoxOrganizerController
   protect 'edit_environment_design', :environment
   def available_blocks
-    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock ]
+    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
+    @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
   end
 end
@@ -68,8 +68,8 @@ class BoxOrganizerController &lt; ApplicationController
         raise ArgumentError.new("Type %s is not allowed. Go away." % type)
       end
     else
-      @center_block_types = Box.acceptable_center_blocks & available_blocks
-      @side_block_types = Box.acceptable_side_blocks & available_blocks
+      @center_block_types = (Box.acceptable_center_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => 1)
+      @side_block_types = (Box.acceptable_side_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => [2,3])
       @boxes = boxes_holder.boxes
       render :action => 'add_block', :layout => false
     end
@@ -7,17 +7,25 @@ class ProfileDesignController &lt; BoxOrganizerController
   def available_blocks
     blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock, HighlightsBlock ]
+    blocks += plugins.dispatch(:extra_blocks)
+
     # blocks exclusive for organizations
     if profile.has_members?
       blocks << MembersBlock
     end
-    # blocks exclusive to person
+    # blocks exclusive to people
     if profile.person?
       blocks << FriendsBlock
       blocks << FavoriteEnterprisesBlock
       blocks << CommunitiesBlock
       blocks << EnterprisesBlock
+      blocks += plugins.dispatch(:extra_blocks, :type => Person)
+    end
+
+    # blocks exclusive to communities
+    if profile.community?
+      blocks += plugins.dispatch(:extra_blocks, :type => Community)
     end
     # blocks exclusive for enterprises
@@ -26,6 +34,7 @@ class ProfileDesignController &lt; BoxOrganizerController
       blocks << HighlightsBlock
       blocks << FeaturedProductsBlock
       blocks << FansBlock
+      blocks += plugins.dispatch(:extra_blocks, :type => Enterprise)
     end
     # product block exclusive for enterprises in environments that permits it
@@ -33,7 +42,7 @@ class ProfileDesignController &lt; BoxOrganizerController
       blocks << ProductsBlock
     end
-    # block exclusive to profile has blog
+    # block exclusive to profiles that have blog
     if profile.has_blog?
       blocks << BlogArchivesBlock
     end
@@ -30,6 +30,12 @@ module ApplicationHelper
   include AccountHelper
+  include BlogHelper
+
+  include ContentViewerHelper
+
+  include LayoutHelper
+
   def locale
     (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   end
@@ -260,7 +266,10 @@ module ApplicationHelper
   end
   def button_bar(options = {}, &block)
-    concat(content_tag('div', capture(&block) + tag('br', :style => 'clear: left;'), { :class => 'button-bar' }.merge(options)))
+    options[:class].nil? ?
+      options[:class]='button-bar' :
+      options[:class]+=' button-bar'
+    concat(content_tag('div', capture(&block) + tag('br', :style => 'clear: left;'), options))
   end
   VIEW_EXTENSIONS = %w[.rhtml .html.erb]
@@ -352,10 +361,6 @@ module ApplicationHelper
     end
   end
-  def theme_stylesheet_path
-    theme_path + '/style.css'
-  end
-
   def current_theme
     @current_theme ||=
       begin
@@ -874,14 +879,6 @@ module ApplicationHelper
     content_tag('div', labelled_check_box(_('Public'), 'profile_data[fields_privacy]['+name+']', 'public', profile.public_fields.include?(name)), :class => 'field-privacy-selector')
   end
-  def template_stylesheet_path
-    if profile.nil?
-      "/designs/templates/#{environment.layout_template}/stylesheets/style.css"
-    else
-      "/designs/templates/#{profile.layout_template}/stylesheets/style.css"
-    end
-  end
-
   def login_url
     options = Noosfero.url_options.merge({ :controller => 'account', :action => 'login' })
     url_for(options)
@@ -920,18 +917,6 @@ module ApplicationHelper
     end
   end
-  def icon_theme_stylesheet_path
-    icon_themes = []
-    theme_icon_themes = theme_option(:icon_theme) || []
-    for icon_theme in theme_icon_themes do
-      theme_path = "/designs/icons/#{icon_theme}/style.css"
-      if File.exists?(File.join(RAILS_ROOT, 'public', theme_path))
-        icon_themes << theme_path
-      end
-    end
-    icon_themes
-  end
-
   def page_title
     (@page ? @page.title + ' - ' : '') +
     (profile ? profile.short_name + ' - ' : '') +
@@ -943,40 +928,11 @@ module ApplicationHelper
     (@category ? " - #{@category.full_name}" : '')
   end
-  def noosfero_javascript
-    render :file =>  'layouts/_javascript'
-  end
-
-  def noosfero_stylesheets
-    [
-      'application',
-      'search',
-      'thickbox',
-      'lightbox',
-      'colorpicker',
-      'colorbox',
-      pngfix_stylesheet_path,
-    ] +
-    tokeninput_stylesheets
-  end
-
   # DEPRECATED. Do not use this·
   def import_controller_stylesheets(options = {})
     stylesheet_import( "controller_"+ @controller.controller_name(), options )
   end
-  def pngfix_stylesheet_path
-    'iepngfix/iepngfix.css'
-  end
-
-  def tokeninput_stylesheets
-    ['token-input', 'token-input-facebook', 'token-input-mac', 'token-input-facet']
-  end
-
-  def noosfero_layout_features
-    render :file => 'shared/noosfero_layout_features'
-  end
-
   def link_to_email(email)
     javascript_tag('var array = ' + email.split('@').to_json + '; document.write("<a href=\'mailto:" + array.join("@") + "\'>" + array.join("@") +  "</a>")'.html_safe)
   end
@@ -995,6 +951,36 @@ module ApplicationHelper
     content
   end
+  # Please, use link_to by default!
+  # This method was created to work around to inexplicable
+  # chain of problems when display_short_format was called
+  # from Article model for an ArticleBlock.
+  def reference_to_article(text, article, anchor=nil)
+    if article.profile.domains.empty?
+      href = "/#{article.url[:profile]}/"
+    else
+      href = "http://#{article.profile.domains.first.name}/"
+    end
+    href += article.url[:page].join('/')
+    href += '#' + anchor if anchor
+    content_tag('a', text, :href => href)
+  end
+
+  def display_short_format(article, options={})
+    options[:comments_link] ||= true
+    options[:read_more_link] ||= true
+    html = content_tag('div',
+             article.lead +
+             content_tag('div',
+               (options[:comments_link] ? link_to_comments(article) : '') +
+               (options[:read_more_link] ? reference_to_article( _('Read more'), article) : ''),
+               :class => 'read-more'
+             ),
+             :class => 'short-post'
+           )
+    html
+  end
+
   def colorpicker_field(object_name, method, options = {})
     text_field(object_name, method, options.merge(:class => 'colorpicker_field'))
   end
@@ -1019,10 +1005,6 @@ module ApplicationHelper
     theme_option(:jquery_theme) || 'smoothness_mod'
   end
-  def jquery_ui_theme_stylesheet_path
-    'jquery.ui/' + jquery_theme + '/jquery-ui-1.8.2.custom'
-  end
-
   def ui_error(message)
     content_tag('div', ui_icon('ui-icon-alert') + message, :class => 'alert fg-state-error ui-state-error')
   end
@@ -1423,4 +1405,14 @@ module ApplicationHelper
     @no_design_blocks = true
   end
+  def default_folder_for_image_upload(profile)
+    default_folder = profile.folders.find_by_type('Gallery')
+    default_folder = profile.folders.find_by_type('Folder') if default_folder.nil?
+    default_folder
+  end
+
+  def content_id_to_str(content)
+    content.nil? ? '' : content.id.to_s
+  end
+
 end
@@ -6,4 +6,21 @@ module BlockHelper
     content_tag 'h3', content_tag('span', h(title)), :class => tag_class
   end
+  def highlights_block_config_image_fields(block, image={})
+    "
+    <tr class=\"image-data-line\">
+      <td>
+        #{select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i).html_safe}
+      </td>
+      <td>#{text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 20}</td>
+      <td>#{text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 1}</td>
+    </tr><tr class=\"image-title\">
+      <td colspan=\"3\"><label>#{
+        content_tag('span', _('Title')) +
+        text_field_tag('block[images][][title]', image[:title], :class => 'highlight-title', :size => 45)
+      }</label></td>
+    </tr>
+    "
+  end
+
 end
@@ -18,8 +18,9 @@ module BlogHelper
     pagination = will_paginate(articles, {
       :param_name => 'npage',
       :previous_label => _('&laquo; Newer posts'),
-      :next_label => _('Older posts &raquo;')
-    })
+      :next_label => _('Older posts &raquo;'),
+      :params => {:action=>"view_page", :page=>articles.first.parent.path.split('/'), :controller=>"content_viewer"}
+    }) if articles.present?
     content = []
     artic_len = articles.length
     articles.each_with_index{ |art,i|
@@ -46,18 +47,6 @@ module BlogHelper
     article_title(article, :no_comments => no_comments) + html
   end
-  def display_short_format(article)
-    html = content_tag('div',
-             article.lead +
-             content_tag('div',
-               link_to_comments(article) +
-               link_to( _('Read more'), article.url),
-               :class => 'read-more'),
-             :class => 'short-post'
-           )
-    html
-  end
-
   def display_full_format(article)
     html = article_to_html(article)
     html = content_tag('p', html) if ! html.include?('</p>')
@@ -36,7 +36,7 @@ module ContentViewerHelper
   def link_to_comments(article, args = {})
     return '' unless article.accept_comments?
-    link_to(number_of_comments(article), article.url.merge(:anchor => 'comments_list') )
+    reference_to_article number_of_comments(article), article, 'comments_list'
   end
   def article_translations(article)
@@ -23,11 +23,13 @@ module DatesHelper
   end
   # formats a date for displaying.
-  def show_date(date, use_numbers = false)
+  def show_date(date, use_numbers = false, year=true)
     if date && use_numbers
-      _('%{month}/%{day}/%{year}') % { :day => date.day, :month => date.month, :year => date.year }
+      date_format = year ? _('%{month}/%{day}/%{year}') : _('%{month}/%{day}')
+      date_format % { :day => date.day, :month => date.month, :year => date.year }
     elsif date
-      _('%{month} %{day}, %{year}') % { :day => date.day, :month => month_name(date.month), :year => date.year }
+      date_format = year ? _('%{month_name} %{day}, %{year}') : _('%{month_name} %{day}')
+      date_format % { :day => date.day, :month_name => month_name(date.month), :year => date.year }
     else
       ''
     end
@@ -46,7 +48,27 @@ module DatesHelper
     if (date1 == date2) || (date2.nil?)
       show_date(date1, use_numbers)
     else
-      _('from %{date1} to %{date2}') % {:date1 => show_date(date1, use_numbers), :date2 => show_date(date2, use_numbers)}
+      if date1.year == date2.year
+        if date1.month == date2.month
+          _('from %{month} %{day1} to %{day2}, %{year}') % {
+            :day1 => date1.day,
+            :day2 => date2.day,
+            :month => use_numbers ? date1.month : month_name(date1.month),
+            :year => date1.year
+          }
+        else
+          _('from %{date1} to %{date2}, %{year}') % {
+            :date1 => show_date(date1, use_numbers, false),
+            :date2 => show_date(date2, use_numbers, false),
+            :year => date1.year
+          }
+        end
+      else
+        _('from %{date1} to %{date2}') % {
+          :date1 => show_date(date1, use_numbers),
+          :date2 => show_date(date2, use_numbers)
+        }
+      end
     end
   end
@@ -142,38 +142,6 @@ module FormsHelper
     content_tag('table',rows.join("\n"))
   end
-  def select_folder(label_text, field_id, collection, default_value=nil, html_options = {}, js_options = {})
-    root = profile ? profile.identifier : _("root")
-    labelled_form_field(
-      label_text,
-      select_tag(
-        field_id,
-        options_for_select(
-          [[root, '']] +
-          collection.collect {|f| [ root + '/' +  f.full_name, f.id ] },
-          default_value
-        ),
-        html_options.merge(js_options)
-      )
-    )
-  end
-
-  def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {})
-    result = labelled_form_field(
-      label_text,
-      select_tag(
-        field_id,
-        options_for_select(
-          [[profile.identifier, '']] +
-          profile.folders.collect {|f| [ profile.identifier + '/' +  f.full_name, f.id ] },
-          default_value
-        ),
-        html_options.merge(js_options)
-      )
-    )
-    return result
-  end
-
   def date_field(name, value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
     datepicker_options[:disabled] ||= false
     datepicker_options[:alt_field] ||= ''
@@ -295,23 +263,28 @@ module FormsHelper
         field_id,
         options_for_select(
           [[root, '']] +
-          collection.collect {|f| [ root + '/' +  f.full_name, f.id ] },
-          default_value
+          collection.collect {|f| [ root + '/' +  f.full_name, f.id.to_s ] },
+          default_value.to_s
         ),
         html_options.merge(js_options)
       )
     )
   end
-  def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {})
+  def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {}, find_options = {})
+    if find_options.empty?
+      folders = profile.folders
+    else
+      folders = profile.folders.where(find_options)
+    end
     result = labelled_form_field(
       label_text,
       select_tag(
         field_id,
         options_for_select(
           [[profile.identifier, '']] +
-          profile.folders.collect {|f| [ profile.identifier + '/' +  f.full_name, f.id ] },
-          default_value
+          folders.collect {|f| [ profile.identifier + '/' +  f.full_name, f.id.to_s ] },
+          default_value.to_s
         ),
         html_options.merge(js_options)
       )
@@ -0,0 +1,88 @@
+module LayoutHelper
+
+  def body_classes
+    # Identify the current controller and action for the CSS:
+    " controller-#{@controller.controller_name}" +
+    " action-#{@controller.controller_name}-#{@controller.action_name}" +
+    " template-#{profile.nil? ? "default" : profile.layout_template}" +
+    (!profile.nil? && profile.is_on_homepage?(request.path,@page) ? " profile-homepage" : "")
+  end
+
+  def noosfero_javascript
+    plugins_javascripts = @plugins.map { |plugin| plugin.js_files.map { |js| plugin.class.public_path(js) } }.flatten
+
+    output = ''
+    output += render :file =>  'layouts/_javascript'
+    output += javascript_tag 'render_all_jquery_ui_widgets()'
+    unless plugins_javascripts.empty?
+      output += javascript_include_tag plugins_javascripts, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_javascripts.to_s}"
+    end
+    output
+  end
+
+  def noosfero_stylesheets
+    standard_stylesheets = [
+      'application',
+      'search',
+      'thickbox',
+      'lightbox',
+      'colorpicker',
+      'colorbox',
+      pngfix_stylesheet_path,
+    ] + tokeninput_stylesheets
+    plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
+
+    output = ''
+    output += stylesheet_link_tag standard_stylesheets, :cache => 'cache'
+    output += stylesheet_link_tag template_stylesheet_path
+    output += stylesheet_link_tag icon_theme_stylesheet_path
+    output += stylesheet_link_tag jquery_ui_theme_stylesheet_path
+    unless plugins_stylesheets.empty?
+      output += stylesheet_link_tag plugins_stylesheets, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_stylesheets.to_s}"
+    end
+    output += stylesheet_link_tag theme_stylesheet_path
+    output
+  end
+
+  def pngfix_stylesheet_path
+    'iepngfix/iepngfix.css'
+  end
+
+  def tokeninput_stylesheets
+    ['token-input', 'token-input-facebook', 'token-input-mac', 'token-input-facet']
+  end
+
+  def noosfero_layout_features
+    render :file => 'shared/noosfero_layout_features'
+  end
+
+  def template_stylesheet_path
+    if profile.nil?
+      "/designs/templates/#{environment.layout_template}/stylesheets/style.css"
+    else
+      "/designs/templates/#{profile.layout_template}/stylesheets/style.css"
+    end
+  end
+
+  def icon_theme_stylesheet_path
+    icon_themes = []
+    theme_icon_themes = theme_option(:icon_theme) || []
+    for icon_theme in theme_icon_themes do
+      theme_path = "/designs/icons/#{icon_theme}/style.css"
+      if File.exists?(File.join(RAILS_ROOT, 'public', theme_path))
+        icon_themes << theme_path
+      end
+    end
+    icon_themes
+  end
+
+  def jquery_ui_theme_stylesheet_path
+    'jquery.ui/' + jquery_theme + '/jquery-ui-1.8.2.custom'
+  end
+
+  def theme_stylesheet_path
+    theme_path + '/style.css'
+  end
+
+end
+
@@ -2,6 +2,9 @@ require &#39;hpricot&#39;
 class Article < ActiveRecord::Base
+  #FIXME This is necessary because html is being generated on the model...
+  include ActionView::Helpers::TagHelper
+
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
   def self.type_name
@@ -236,8 +239,13 @@ class Article &lt; ActiveRecord::Base
   # The implementation in this class just provides the +body+ attribute as the
   # HTML.  Other article types can override this method to provide customized
   # views of themselves.
+  # (To override short format representation, override the lead method)
   def to_html(options = {})
-    body || ''
+    if options[:format] == 'short'
+      display_short_format(self)
+    else
+      body || ''
+    end
   end
   include ApplicationHelper
@@ -12,7 +12,11 @@ class ArticleBlock &lt; Block
     block = self
     lambda do
       block_title(block.title) +
-      (block.article ? article_to_html(block.article, :gallery_view => false).html_safe : _('Article not selected yet.'))
+      (block.article ? article_to_html(block.article,
+          :gallery_view => false,
+          :inside_block => block,               # For Blogs and folders
+          :format => block.visualization_format # For Articles and contents
+        ).html_safe : _('Article not selected yet.'))
     end
   end
@@ -49,4 +53,14 @@ class ArticleBlock &lt; Block
     self.box.owner.kind_of?(Environment) ? self.box.owner.portal_community.articles : self.box.owner.articles
   end
+  def posts_per_page
+    self.settings[:posts_per_page] or 1
+  end
+
+  def posts_per_page= value
+    value = value.to_i
+    self.settings[:posts_per_page] = value if value > 0
+  end
+
+  settings_items :visualization_format, :type => :string, :default => 'short'
 end
@@ -24,8 +24,9 @@ class Blog &lt; Folder
   # FIXME isn't this too much including just to be able to generate some HTML?
   include ActionView::Helpers::TagHelper
   def to_html(options = {})
+    me = self
     lambda do
-      render :file => 'content_viewer/blog_page'
+      render :file => 'content_viewer/blog_page', :locals => { :blog=>me, :inside_block=>options[:inside_block] }
     end
   end
@@ -185,4 +185,8 @@ class Enterprise &lt; Organization
     Scrap.find_by_sql("SELECT id, updated_at, 'Scrap' AS klass FROM scraps WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, 'ActionTracker::Record' AS klass FROM action_tracker WHERE action_tracker.target_id = #{self.id} UNION SELECT action_tracker.id, action_tracker.updated_at, 'ActionTracker::Record' AS klass FROM action_tracker INNER JOIN articles ON action_tracker.target_id = articles.id WHERE articles.profile_id = #{self.id} AND action_tracker.target_type = 'Article' ORDER BY action_tracker.updated_at DESC")
   end
+  def catalog_url
+    { :profile => identifier, :controller => 'catalog'}
+  end
+
 end
@@ -618,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
@@ -104,18 +104,30 @@ class Event &lt; Article
         }
       }
+      # TODO: some good soul, please clean this ugly hack:
       if self.body
         html.div('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', :class => 'event-description') 
       end
     }
     if self.body
-      result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.body)
+      if options[:format] == 'short'
+        result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', display_short_format(self))
+      else
+        result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.body)
+      end
     end
     result
   end
+  def lead
+    content_tag('div',
+      show_period(start_date, end_date),
+      :class => 'event-dates'
+    ) + super
+  end
+
   def event?
     true
   end
@@ -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".html_safe+
-    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".html_safe
   end
   def footer
-    owner_id = owner.identifier
-    lambda do
-      link_to s_('tags|View all'), :profile => owner_id, :controller => 'profile', :action => 'tags'
+    if owner.class == Environment
+      lambda do
+        link_to s_('tags|View all'),
+          :controller => 'search', :action => 'tags'
+      end
+    else
+      owner_id = owner.identifier
+      lambda do
+        link_to s_('tags|View all'),
+          :profile => owner_id, :controller => 'profile', :action => 'tags'
+      end
     end
   end
@@ -15,7 +15,7 @@ class User &lt; ActiveRecord::Base
   # FIXME ugly workaround
   def self.human_attribute_name(attrib)
     case attrib.to_sym
-      when :login:  return _('Username')
+      when :login:  return [_('Username'), _('Email')].join(' / ')
       when :email:  return _('e-Mail')
       else _(self.superclass.human_attribute_name(attrib))
     end
@@ -116,10 +116,11 @@ class User &lt; ActiveRecord::Base
   validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('%{fn} must be checked in order to signup.').fix_i18n
-  # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
+  # Authenticates a user by their login name or email and unencrypted password.  Returns the user or nil.
   def self.authenticate(login, password, environment = nil)
     environment ||= Environment.default
-    u = first :conditions => ['login = ? AND environment_id = ? AND activated_at IS NOT NULL', login, environment.id] # need to get the salt
+    u = self.first :conditions => ['(login = ? OR email = ?) AND environment_id = ? AND activated_at IS NOT NULL',
+                                   login, login, environment.id] # need to get the salt
     u && u.authenticated?(password) ? u : nil
   end
@@ -32,7 +32,8 @@
     <span id="signup-domain"><%= environment.default_hostname %>/</span>
     <div id='signup-login'>
       <div id='signup-login-field' class='formfield'>
-        <%= required text_field(:user, :login, :id => 'user_login', :onchange => 'this.value = convToValidLogin(this.value);') %>
+        <%= required text_field(:user, :login, :id => 'user_login',
+                                :onchange => 'this.value = convToValidUsername(this.value);') %>
         <div id='url-check'><p>&nbsp;</p></div>
       </div>
       <%= content_tag(:small, _('Choose your login name carefully! It will be your network access and you will not be able to change it later.'), :id => 'signup-balloon') %>
@@ -5,7 +5,7 @@
 <% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %>
   <%= f.text_field :login,
-                   :onchange => 'this.value = convToValidLogin( this.value )' %>
+                   :onchange => 'this.value = convToValidUsername( this.value )' %>
   <%= f.text_field :email %>
@@ -4,7 +4,7 @@
 <%= render :file => 'shared/tiny_mce' %>
-<% labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do |f| %>
+<% labelled_form_for :environment, @environment do |f| %>
   <% tabs = [] %>
   <% tabs << {:title => _('Site info'), :id => 'site-info',
     :content => (render :partial => 'site_info', :locals => {:f => f})} %>
-<div class='article-block-edition'>
+<div class="article-block-edition">
 <% if @block.box.owner.kind_of?(Environment) and @block.box.owner.portal_community.nil? %>
-  <p id='no_portal_community'>
+  <p id="no_portal_community">
   <%= _("You don't have an community defined as the portal community. Define it before use this block properly.") %>
   </p>
 <% else %>
-  <% articles = @block.available_articles.select {|article| !article.folder? } %>
-  <%= select_tag('block[article_id]', options_for_select_with_title(articles.map {|item| [item.path, item.id]}, @block.article ? @block.article.id : nil)) %>
+  <%
+    articles = @block.available_articles.select {|a| !a.folder? || a.blog? }
+    first_text = articles[articles.find_index{|a| a.kind_of? TextArticle}||-1]
+    selected = @block.article || first_text
+  %>
+  <%= select_tag(
+    'block[article_id]',
+    options_for_select_with_title(articles.map {|item| [item.path, item.id]}, selected.id),
+    :onchange => 'this.changedTo(this.value)'
+  )%>
+  <div id="block_blog_options" style="display:none">
+    <%= labelled_form_field(
+      _('Number of posts:'),
+      text_field_tag('block[posts_per_page]', @block.posts_per_page)
+    )%>
+  </div>
+  <%= labelled_form_field(
+    _('How to display this content:'),
+    select_tag(
+      'block[visualization_format]',
+      options_for_select([[_('Lead'), 'short'], [_('Full post'), 'full']], @block.visualization_format)
+    )
+  )%>
+  <% blogs = @block.available_articles.select{|a|a.blog?} %>
+  <script>
+    var select = jQuery("#block_article_id")[0];
+    select.blogs = <%= blogs.map{|b| b.id.to_s }.to_json %>;
+    select.changedTo = function(articleId) {
+      var blogSelected = this.blogs.indexOf(articleId) != -1;
+      jQuery("#block_blog_options").toggle(blogSelected);
+    }
+    select.changedTo('<%= selected.id %>');
+  </script>
 <% end %>
 </div>
@@ -1,10 +0,0 @@
-<% block_types.in_groups_of(2) do |block1, block2| %>
-  <div style='float: left; width: 48%; padding-top: 2px;'>
-    <%= labelled_radio_button(block1.description, :type, block1.name) %>
-  </div>
-  <% if block2 %>
-    <div style='float: left; width: 48%; padding-top: 2px;'>
-      <%= labelled_radio_button(block2.description, :type, block2.name) %>
-    </div>
-  <% end %>
-<% end %>
 <strong><%= _('Highlights') %></strong>
-<div id='edit-highlights-block' style='width:450px'>
-<table id='highlights' class='noborder'>
-  <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th><th><%= _('Title') %></th></tr>
+
+<table class="noborder"><tbody id="highlights-data-table">
+  <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th></tr>
   <% for image in @block.images do %>
-    <tr>
-      <td>
-        <%= select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i).html_safe, :style => "width: 100px" %></p>
-      </td>
-      <td><%= text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 10 %></td>
-      <td><%= text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 3 %></td>
-      <td><%= text_field_tag 'block[images][][title]', image[:title], :class => 'highlight-title', :size => 10 %></td>
-    </tr>
+    <%= highlights_block_config_image_fields @block, image %>
   <% end %>
-</table>
-</div>
+</tbody></table>
 <%= link_to_function(_('New highlight'), nil, :class => 'button icon-add with-text') do |page|
-    page.insert_html :bottom, 'highlights', content_tag('tr',
-                  content_tag('td', select_tag('block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name).html_safe, :style => "width: 100px")) +
-                  content_tag('td', text_field_tag('block[images][][address]', nil, :class => 'highlight-address', :size => 10)) +
-                  content_tag('td', text_field_tag('block[images][][position]', nil, :class => 'highlight-position', :size => 3)) +
-                  content_tag('td', text_field_tag('block[images][][title]', nil, :class => 'highlight-position', :size => 10))
-    ) +
-    javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
+  page.insert_html :bottom, 'highlights-data-table', highlights_block_config_image_fields(@block)
 end %>
 <%= labelled_form_field _('Image transition:'), select('block', 'interval', [[_('No automatic transition'), 0]] + [1, 2, 3, 4, 5, 10, 20, 30, 60].map {|item| [n_('Every 1 second', 'Every %d seconds', item) % item, item]}) %>
-<div style='height:350px'>
+<div id="add-block-dialog">
   <% form_tag do %>
     <p><%= _('In what area do you want to put your new block?') %></p>
+    <div id="box-position">
     <% @boxes.each do |box| %>
-      <%= labelled_radio_button(_("Area %d") % box.position, :box_id, box.id, box.central?, { :class => 'box-position', 'data-position' => box.position })  %>
+      <% name = box.central? ? _('Main area') : _('Area %d') % box.position %>
+      <%= labelled_radio_button(name, :box_id, box.id, box.central?, { 'data-position' => box.position }) %>
     <% end %>
+    </div>
     <script type="text/javascript">
-      (function ($) {
-        $(document).ready(function () {
-          $(".box-position").live('change', function () {
-            if ($(this).attr('data-position') == '1') {
-              $('#center-block-types').show();
-              $('#side-block-types').hide();
-            } else {
-              $('#center-block-types').hide();
-              $('#side-block-types').show();
-            };
-          });
-      })})(jQuery);
+      jQuery('#box-position input').bind('change',
+        function () {
+          showCenter = jQuery(this).attr('data-position') == '1';
+          jQuery('#center-block-types').toggle(showCenter);
+          jQuery('#side-block-types').toggle(!showCenter);
+        }
+      );
     </script>
     <p><%= _('Select the type of block you want to add to your page.') %></p>
-    <div id='center-block-types'>
-      <%= render :partial => 'block_types', :locals => { :block_types => @center_block_types } %>
+    <div id="center-block-types" class="block-types">
+      <% @center_block_types.each do |block| %>
+        <div class='block-type'>
+          <%= labelled_radio_button(block.description, :type, block.name) %>
+        </div>
+      <% end %>
     </div>
-    <div id='side-block-types' style='display:none'>
-      <%= render :partial => 'block_types', :locals => { :block_types => @side_block_types } %>
+    <div id="side-block-types" class="block-types" style="display:none">
+      <% @side_block_types.each do |block| %>
+        <div class='block-type'>
+          <%= labelled_radio_button(block.description, :type, block.name) %>
+        </div>
+      <% end %>
     </div>
     <br style='clear: both'/>
-<div style='width: 500px;'>
-  <h2><%= _('Editing block') %></h2>
+<div class="block-config-options <%= @block.class.name %>-options">
+  <h2 class="title"><%= _('Editing block') %></h2>
   <% form_tag(:action => 'save', :id => @block.id) do %>
 <h1><%= _('Editing sideboxes')%></h1>
-<% button_bar do %>
+<% button_bar :class=>'design-menu' do %>
   <%= colorbox_button('add', _('Add a block'), { :action => 'add_block' }) %>
   <%= button(:back, _('Back to control panel'), :controller => (profile.nil? ? 'admin_panel': 'profile_editor')) %>
 <% end %>
@@ -7,13 +7,17 @@
 <div class='l-sidebar-left-bar'>
   <ul>
-    <% if @categories.size > 0 %>
+    <%= content_tag('li', link_to(_('Homepage'), profile.url), :class => 'catalog-categories-link') %>
+    <%= content_tag('li', link_to(_('Catalog start'), profile.catalog_url), :class => 'catalog-categories-link') %>
+    <% if @categories.present? %>
       <% @categories.each do |category| %>
         <%= category_link(category) %>
         <%= category_sub_links(category) %>
       <% end %>
+    <% elsif @category.present? %>
+      <%= content_tag('li', _('There are no sub-categories for %s') % @category.name, :id => 'catalog-categories-notice') %>
     <% else %>
-      <%= content_tag('li', _('There are no sub-categories for %s') % @category.name, :style => 'color: #555753; padding-bottom: 0.5em;') %>
+      <%= content_tag('li', _('There are no categories available.'), :id => 'catalog-categories-notice') %>
     <% end %>
   </ul>
 </div>
@@ -64,20 +68,20 @@
         <% if product.description %>
           <li class="product-description expand-box">
-            <span id="product-description-button"><%= _('description') %></span>
-            <div>
+            <span class="product-description-button"><%= _('description') %></span>
+            <div class="float-box">
               <div class="arrow"></div>
-              <div class="content" id="product-description"><%= txt2html(product.description || '') %></div>
+              <div class="content"><%= product.description %></div>
             </div>
           </li>
         <% end %>
         <% if product.price_described? %>
           <li class="product-price-composition expand-box">
-            <span id="product-price-composition-button"><%= _('price composition') %></span>
-            <div>
+            <span class="product-price-composition-button"><%= _('price composition') %></span>
+            <div class="float-box">
               <div class="arrow"></div>
-              <div class="content" id="product-price-composition">
+              <div class="content">
                 <% product.inputs.relevant_to_price.each do |i| %>
                   <div class="search-product-input-dots-to-price">
                     <div class="search-product-input-name"><%= i.product_category.name %></div>
@@ -98,9 +102,9 @@
         <% if product.inputs.count > 0 %>
           <li class="product-inputs expand-box">
             <span id="inputs-button"><%= _('inputs and raw materials') %></span>
-            <div>
+            <div class="float-box">
               <div class="arrow"></div>
-              <div class="content" id="inputs-description">
+              <div class="content">
                 <% product.inputs.each do |i| %>
                   <div>
                     <%= _('%{amount_used} %{unit} of') % {:amount_used => i.amount_used, :unit => i.unit.singular} + ' ' if i.has_all_price_details? %>
@@ -9,7 +9,12 @@
     <div id='media-upload-form'>
       <% form_tag({ :action => 'media_upload' }, :multipart => true) do %>
         <div class='formfield'>
-          <%= select_profile_folder(_('Choose folder to upload files:'), :parent_id, profile) %>
+          <% default_folder = content_id_to_str default_folder_for_image_upload(profile) %>
+          <%= select_profile_folder(
+                _('Choose folder to upload files:'),
+                :parent_id, profile, default_folder, {}, {},
+                'type="Folder" or type="Gallery"'
+          ) %>
         </div>
         <p><%= file_field_tag('file1') %></p>
         <p><%= file_field_tag('file2') %></p>
+<div class="select-article-type">
+
 <h2> <%= _('Choose the type of content:') %> </h2>
-<ul id="article_types">
+<ul class="article-types">
   <% for type in @article_types %>
     <% action = type[:class].name == 'UploadedFile' ? {:action => 'upload_files'} : {:action => 'new', :type => type[:class].name} %>
     <% content_tag('a', :href => url_for(action.merge(:parent_id => @parent_id, :back_to => @back_to))) do %>
@@ -14,3 +16,5 @@
 <br style="clear:both" />
 <%= colorbox_close_button(_('Cancel')) %>
+
+</div>
@@ -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'%>
-<% add_rss_feed_to_head(@page.name, @page.feed.url)  if @page.blog? && @page.feed %>
+<% add_rss_feed_to_head(blog.name, blog.feed.url)  if blog.blog? && blog.feed %>
-<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if @page.blog? && @page.external_feed && @page.external_feed.enabled && @page.external_feed.fetched_at.nil? %>
+<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if blog.blog? && blog.external_feed && blog.external_feed.enabled && blog.external_feed.fetched_at.nil? %>
 <div>
   <div class='blog-description'>
-    <%= @page.body %>
+    <%= blog.body %>
   </div>
 </div>
 <hr class="pre-posts"/>
 <div class="blog-posts">
-  <%= (@page.empty? ? content_tag('em', _('(no posts)')) : list_posts(@posts, @page.visualization_format)) %>
+  <%=
+   posts = @posts
+   format = blog.visualization_format
+   if inside_block
+     posts = blog.posts.paginate(:page=>1, :per_page=>inside_block.posts_per_page)
+     format = inside_block.visualization_format
+   end
+   (blog.empty? ? content_tag('em', _('(no posts)')) : list_posts(posts, format))
+  %>
 </div>
@@ -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', :id => 'top-post-comment-button') %>
   <% end %>
   <ul class="article-comments-list">
@@ -0,0 +1,24 @@
+<div id="user">
+  <span class='logged-in' style='display: none;'>
+    <%= usermenu_logged_in %>
+  </span>
+  <span class='not-logged-in' style='display: none'>
+
+    <%= _("<span class='login'>%s</span>") % thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
+    <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_eval(&content) }.join("") %>
+
+    <div id='inlineLoginBox' style='display: none;'>
+      <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
+    </div>
+
+    <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
+      <%= _("<span class='or'>or</span> <span class='signup'>%s</span>") % link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup')%>
+    <% end %>
+
+  </span>
+  <form action="/search" id="top-search" class="search_form clean" method="get">
+    <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />
+    <div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>
+    <%= javascript_tag 'jQuery("#user form input").hint();' %>
+  </form>
+</div><!-- end id="user" -->
@@ -8,38 +8,19 @@
     <meta name="description" content="<%= @environment.name %>" />
     <link rel="shortcut icon" href="<%= image_path(theme_favicon) %>" type="image/x-icon" />
     <%= noosfero_javascript %>
-    <%= stylesheet_link_tag noosfero_stylesheets, :cache => 'cache' %>
-    <%= stylesheet_link_tag template_stylesheet_path %>
-    <%= stylesheet_link_tag icon_theme_stylesheet_path %>
-    <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
-    <%
-      plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
-    %>
-    <%= stylesheet_link_tag(plugins_stylesheets, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_stylesheets.to_s)) unless plugins_stylesheets.empty? %>
-    <%= stylesheet_link_tag theme_stylesheet_path %>
+    <%= noosfero_stylesheets %>
     <%# Add custom tags/styles/etc via content_for %>
     <%= yield :head %>
-    <%= javascript_tag('render_all_jquery_ui_widgets()') %>
-    <%
-      plugins_javascripts = @plugins.map { |plugin| plugin.js_files.map { |js| plugin.class.public_path(js) } }.flatten
-    %>
-    <%= javascript_include_tag(plugins_javascripts, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_javascripts.to_s)) unless plugins_javascripts.empty? %>
     <%=
       @plugins.dispatch(:head_ending).collect do |content|
         content.respond_to?(:call) ? content.call : content
       end.join("\n")
     %>
   </head>
-  <body class="<%=
-    # Identify the current controller and action for the CSS:
-    " controller-"+ @controller.controller_name() +
-    " action-"+ @controller.controller_name() +"-"+ @controller.action_name() +
-    " template-"+ ( profile.nil? ? "default" : profile.layout_template ) +
-    (!profile.nil? && profile.is_on_homepage?(request.path,@page) ? " profile-homepage" : "")
-    %>" >
-
+  <body class="<%= body_classes %>">
     <a href="#content" id="link-go-content"><span><%= _("Go to the content") %></span></a>
+
     <%=
       @plugins.dispatch(:body_beginning).collect do |content|
         content.respond_to?(:call) ? content.call : content
@@ -51,30 +32,7 @@
         <%= theme_header %>
       </div>
       <div id="wrap-2">
-        <div id="user">
-          <span class='logged-in' style='display: none;'>
-            <%= usermenu_logged_in %>
-          </span>
-          <span class='not-logged-in' style='display: none'>
-
-              <%= _("<span class='login'>%s</span>") % thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
-              <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_eval(&content) }.join("") %>
-
-              <div id='inlineLoginBox' style='display: none;'>
-                <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
-              </div>
-
-              <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
-              <%= _("<span class='or'>or</span> <span class='signup'>%s</span>") % link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup')%>
-              <% end %>
-
-          </span>
-          <form action="/search" class="search_form 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();' %>
-          </form>
-        </div><!-- end id="user" -->
+        <%= render :partial => 'layouts/user' %>
         <h1 id="site-title">
           <%= theme_site_title %>
@@ -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
+<% base_requires = '-r features/support -r features/step_definitions' %>
+<% default_options = "--color --format progress --strict --tags ~@selenium --tags ~@selenium-fixme --tags ~@fixme --exclude features/support/selenium.rb #{base_requires}" %>
+<% selenium_options = "--strict --tags @selenium #{base_requires}" %>
+
+default: <%= default_options %>
+selenium: <%= selenium_options %>
+
+<% enabled_plugins = Dir.glob(File.join('config', 'plugins', '*')).map{|path| plugin = File.basename(path); plugin if File.exist?(File.join('features', 'plugins', plugin)) }.compact %>
+
+<% enabled_plugins.each do |plugin| %>
+<% plugin_features_path = File.join('features', 'plugins', plugin) %>
+<% plugin_base_requires = '' %>
+<% plugin_base_requires += " -r features/plugins/#{plugin}/support" if File.exist?(File.join(plugin_features_path, 'support')) %>
+<% plugin_base_requires += " -r features/plugins/#{plugin}/step_definitions" if File.exist?(File.join(plugin_features_path, 'step_definitions')) %>
+<%= "#{plugin}: #{default_options} #{plugin_base_requires}" %>
+<%= "#{plugin}_selenium: #{selenium_options} #{plugin_base_requires}" %>
+<% end %>
@@ -6,6 +6,7 @@ development:
 test: &TEST
   adapter: sqlite3
   database: db/test.db
+  timeout: 2000
 production:
   adapter: sqlite3
@@ -5,7 +5,7 @@
 #ENV['RAILS_ENV'] ||= 'production'
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.15' unless defined? RAILS_GEM_VERSION
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
-# 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'))
+
+noosfero (0.42.0) unstable; urgency=low
+
+  * Bumping to version 0.42.0
+
+ -- Rodrigo Souto <rodrigo@ravioli>  Mon, 13 May 2013 13:50:43 -0300
+
 noosfero (0.41.2) unstable; urgency=low
   * Bugfixes release 
@@ -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"
@@ -184,7 +184,7 @@ Feature: events
     And "josesilva" is a member of "Sample Community"
     And I go to josesilva's control panel
     And I follow "Manage Content"
-    And I follow "Another Conference" and wait
+    And I follow "Another Conference"
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
@@ -213,15 +213,15 @@ Feature: events
     And I am on josesilva's Event creation
     Then I should see "Lead"
-  @selenium
+  @selenium-fixme
   Scenario: events lead should be shown on blogs with short format
     Given I am logged in as "josesilva"
     And I am on josesilva's control panel
-    And I follow "Configure blog" and wait
+    And I follow "Configure blog"
     And I select "First paragraph" from "How to display posts:"
     And I press "Save"
     And I follow "New post"
-    And I follow "A calendar event" and wait
+    And I follow "A calendar event"
     And I fill in "Title" with "Leaded event"
     And I type "This is the abstract." in TinyMCE field "article_abstract"
     And I type "This is the real text." in TinyMCE field "article_body"
@@ -9,15 +9,13 @@ Feature: export users
   Scenario: Export users as XML
     Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Users"
+    When I go to /admin/users
     And I follow "[XML]"
     Then I should see "ultraje"
   Scenario: Export users as CSV
     Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Users"
+    When I go to /admin/users
     And I follow "[CSV]"
     Then I should see "name;email"
     And I should see "ultraje"
@@ -23,7 +23,7 @@ Feature: featured_products_block
       | redemoinho | automobile  | Moto | Very long description of and auto-mobile moto to be truncated | true |
     And I am logged in as "eddievedder"
-  @selenium
+  @selenium-fixme
   Scenario: select a product to be featured
     And I follow "Manage my groups"
     And I follow "Control panel of this group"
@@ -35,7 +35,7 @@ Feature: featured_products_block
     And I should not see "float_to_currency"
     And I should not see "product_path"
-  @selenium
+  @selenium-fixme
   Scenario: display block with long description
     Given I follow "Manage my groups"
     And I follow "Control panel of this group"
@@ -10,18 +10,18 @@ Feature: forum
     And "joaosilva" has no articles
     And I am logged in as "joaosilva"
-  @selenium
+  @selenium @ignore-hidden-elements
   Scenario: create a forum
-    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 "Forum" and wait
+    When I follow "Forum"
     And I fill in "Title" with "My Forum"
-    And I press "Save" and wait
+    And I press "Save"
     Then I should see "Configure forum"
   Scenario: redirect to forum after create forum 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 "Forum"
@@ -30,13 +30,13 @@ Feature: forum
     Then I should be on /joaosilva/forum-from-cms
   Scenario: create multiple forums
-    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 "Forum"
     And I fill in "Title" with "Forum 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 "Forum"
@@ -46,7 +46,7 @@ Feature: forum
     And I should be on /joaosilva/forum-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 "Forum"
@@ -54,7 +54,7 @@ Feature: forum
     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 "Manage Content"
     And I follow "New content"
     And I follow "Forum"
@@ -66,8 +66,8 @@ Feature: forum
     Given the following forums
        | owner     | name      |
        | joaosilva | Forum One |
-    And I visit "/joaosilva/forum-one" and wait
-    When I follow "Configure forum" and wait
+    And I go to /joaosilva/forum-one
+    When I follow "Configure forum"
     Then I should be on edit "Forum One" by joaosilva
   Scenario: last topic update by unautenticated user should not link
@@ -94,4 +94,4 @@ Feature: forum
        | article | author | title | body |
        | Post one | joaosilva | Hi all | Hi all |
    When I go to /joaosilva/forum
-   Then I should see "Joao" linking to "http:///joaosilva"
+   Then I should see "Joao" linking to "http://localhost/joaosilva"
@@ -23,7 +23,7 @@ Feature: gallery_navigation
   @selenium
   Scenario: view next image when follow next link
     Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    When I follow "Next »" and wait
+    When I follow "Next »"
     Then I should see "rails.png" within ".title"
   Scenario: not link to next when in last image
@@ -38,7 +38,7 @@ Feature: gallery_navigation
   @selenium
   Scenario: view previous image when follow previous link
     Given I am on /marciopunk/my-gallery/rails.png?view=true
-    When I follow "« Previous" and wait
+    When I follow "« Previous"
     Then I should see "other-pic.jpg" within ".title"
   Scenario: not link to previous when in first image
@@ -68,11 +68,19 @@ Feature: gallery_navigation
     When I follow "Go back to my-gallery"
     Then I should be on /marciopunk/my-gallery
+  # Looking for page title is problematic on selenium since it considers the
+  # title to be invibible. Checkout some information about this:
+  #   * https://github.com/jnicklas/capybara/issues/863
+  #   * https://github.com/jnicklas/capybara/pull/953
   @selenium
   Scenario: image title in window title
     Given I am logged in as "marciopunk"
-    When I visit "/marciopunk/other-gallery/rails.png?view=true" and wait
-    And I follow "Edit" and wait
+    When I go to /marciopunk/other-gallery/rails.png?view=true
+    Then I should see "rails.png" within any "h1"
+#    And the page title should be "rails.png"
+    And I follow "Edit"
     And I fill in "Title" with "Rails is cool"
-    And I press "Save" and wait
-    Then The page title should contain "Rails is cool"
+    And I press "Save"
+    When I go to /marciopunk/other-gallery/rails.png?view=true
+    Then I should see "Rails is cool" within any "h1"
+    #Then the page title should be "Rails is cool"
@@ -35,13 +35,13 @@ Feature: HTTP caching
     Then the response should be valid for 90 minutes
   Scenario: profile pages, default configuaration
-    When I go to João Silva's homepage
+    When I go to joao's homepage
     Then the response should be valid for 15 minutes
   Scenario: profile pages, custom configuration
     Given the following environment configuration
       | profile_cache_in_minutes | 90 |
-    When I go to João Silva's homepage
+    When I go to joao's homepage
     Then the response should be valid for 90 minutes
   Scenario: account controller should not be cached at all
@@ -50,7 +50,7 @@ Feature: HTTP caching
   Scenario: profile administration
     Given I am logged in as "joao"
-    When I go to João Silva's control panel
+    When I go to joao's control panel
     Then there must be no cache at all
   Scenario: environment administration
@@ -28,6 +28,7 @@ Feature: internationalization
     When I follow "Português"
     Then the site should be in Portuguese
+  @fixme
   Scenario: language set by previous users
     Given a user accessed in English before
     And my browser prefers Portuguese
@@ -32,11 +32,13 @@ Feature: invitation
     When I am on /profile/josesilva/invite/friends
     Then I should see "Invite your friends"
+  @selenium
   Scenario: back to friends after invite friends
     Given I am on /myprofile/josesilva/friends
     And I follow "Invite people from my e-mail contacts"
     And I press "Next"
     And I fill in "manual_import_addresses" with "misfits@devil.doll"
+    And I follow "Personalize invitation mail"
     And I fill in "mail_template" with "Follow this link <url>"
     When I press "Invite my friends!"
     Then I should be on /profile/josesilva/friends
@@ -46,8 +48,7 @@ Feature: invitation
     Then I should see "Invite your friends to join 26 Bsslines" link
   Scenario: not see link to invite members to community if has no rights
-    Given I am not logged in
-    And I am logged in as "josesantos"
+    Given I am logged in as "josesantos"
     When I am on /profile/26-bsslines/members
     Then I should not see "Invite your friends to join 26 Bsslines" link
@@ -65,8 +66,7 @@ Feature: invitation
     Then I should not see "Invite your friends to join Beatles For Sale" link
   Scenario: deny access if user has no right to invite members
-    Given I am not logged in
-    And I am logged in as "josesantos"
+    Given I am logged in as "josesantos"
     When I am on /profile/26-bsslines/invite/friends
     Then I should see "Access denied"
@@ -74,93 +74,107 @@ Feature: invitation
     Given I am on Beatles For Sale's members management
     Then I should not see "Invite your friends to join Beatles For Sale" link
+  @selenium
   Scenario: back to members after invite friends to join a community
     Given I am on 26 Bsslines's members management
     And I follow "Invite your friends to join 26 Bsslines"
     And I press "Next"
     And I fill in "manual_import_addresses" with "misfits@devil.doll"
+    And I follow "Personalize invitation mail"
     And I fill in "mail_template" with "Follow this link <url>"
     When I press "Invite my friends!"
     Then I should be on /profile/26-bsslines/members
+  @selenium
   Scenario: noosfero user receives a task when a user invites to join a community
     Given I am on 26 Bsslines's members management
     And I follow "Invite your friends to join 26 Bsslines"
     And I press "Next"
     And I fill in "manual_import_addresses" with "santos@invalid.br"
+    And I follow "Personalize invitation mail"
     And I fill in "mail_template" with "Follow this link <url>"
     And I press "Invite my friends!"
     Given there are no pending jobs
     When I am logged in as "josesantos"
-    And I go to the Control panel
+    And I go to josesantos's control panel
     And I should see "josesilva invited you to join 26 Bsslines."
+  @selenium
   Scenario: noosfero user accepts to join community
     Given I invite email "santos@invalid.br" to join community "26 Bsslines"
     And there are no pending jobs
     When I am logged in as "josesantos"
-    And I go to the Control panel
+    And I go to josesantos's control panel
     And I follow "Process requests"
     And I should see "josesilva invited you to join 26 Bsslines."
     And I choose "Accept"
     When I press "Apply!"
     Then I should not see "josesilva invited you to join 26 Bsslines."
-    When I go to the Control panel
+    When I go to josesantos's control panel
     And I follow "Manage my groups"
     Then I should see "26 Bsslines"
+  @selenium
   Scenario: noosfero user rejects to join community
     Given I invite email "santos@invalid.br" to join community "26 Bsslines"
     And there are no pending jobs
     When I am logged in as "josesantos"
-    And I go to the Control panel
+    And I go to josesantos's control panel
     And I follow "Process requests"
     And I should see "josesilva invited you to join 26 Bsslines."
     And I choose "Reject"
     When I press "Apply!"
     Then I should not see "josesilva invited you to join 26 Bsslines."
-    When I go to the Control panel
+    And I go to josesantos's control panel
     And I follow "Manage my groups"
     Then I should not see "26 Bsslines"
+  @selenium
   Scenario: noosfero user receives a task when a user invites to be friend
     Given I am on josesilva's control panel
-    And I follow "Manage Friends"
+    And I follow "Manage friends"
     And I follow "Invite people from my e-mail contacts"
     And I press "Next"
     And I fill in "manual_import_addresses" with "santos@invalid.br"
+    And I follow "Personalize invitation mail"
     And I fill in "mail_template" with "Follow this link <url>"
     And I press "Invite my friends!"
     Given there are no pending jobs
     When I am logged in as "josesantos"
-    And I go to the Control panel
+    And I go to josesantos's control panel
     And I follow "Process requests"
     Then I should see "josesilva wants to be your friend."
+  @selenium
   Scenario: noosfero user accepts to be friend
-    Given I invite email "santos@invalid.br" to be my friend
+    Given I am logged in as "josesilva"
+    And I go to josesilva's control panel
+    And I invite email "santos@invalid.br" to be my friend
     And there are no pending jobs
     When I am logged in as "josesantos"
-    And I go to the Control panel
+    And I go to josesantos's control panel
     And I follow "Process requests"
     And I should see "josesilva wants to be your friend."
     And I choose "Accept"
     When I press "Apply!"
     And I should not see "josesilva wants to be your friend."
-    When I go to the Control panel
+    When I go to josesantos's control panel
     And I follow "Manage friends"
     Then I should see "josesilva"
+  @selenium
   Scenario: noosfero user rejects to be friend
-    Given I invite email "santos@invalid.br" to be my friend
+    Given I am logged in as "josesilva"
+    And I go to josesilva's control panel
+    And I invite email "santos@invalid.br" to be my friend
     And there are no pending jobs
     When I am logged in as "josesantos"
-    And I go to the Control panel
+    And I go to josesantos's control panel
     And I follow "Process requests"
     And I should see "josesilva wants to be your friend."
     And I choose "Reject"
     When I press "Apply!"
     And I should not see "josesilva wants to be your friend."
-    When I go to the Control panel
+    When I go to josesantos's control panel
     And I follow "Manage friends"
     Then I should not see "josesilva"
@@ -7,7 +7,7 @@ Feature: language redirection
       | login  | name         |
       | manuel | Manuel Silva |
     And the following articles
-      | owner  | name       | body            | lang | translation_of |
+      | owner  | name       | body            | language | translation_of |
       | manuel | Meu Artigo | isso é um teste | pt   | nil            |
       | manuel | My Article | this is a test  | en   | Meu Artigo     |
@@ -26,9 +26,9 @@ Feature: language redirection
     # Testing the web UI
     Given I am logged in as "manuel"
     And my browser prefers English
-    And I go to manuel's profile editor
+    And I go to /myprofile/manuel/profile_editor/edit
     And I check "Automaticaly redirect the visitor to the article translated to his/her language"
-    And I press "save"
+    And I press "Save"
     When I go to /manuel/meu-artigo
     Then the site should be in English
@@ -16,13 +16,14 @@ Feature: Location
       | state    |
       | city     |
       | zip_code |
-    And I go to the Control panel
+    And I go to zezinho's control panel
     And I follow "Location"
     When I fill in "Address" with "Rua Marechal Floriano, 28"
     And I select "Brazil" from "Country"
     And I fill in "State" with "Bahia"
     And I fill in "City" with "Salvador"
-    And I fill in "ZIP Code" with "40110010"
+    And I fill in "ZIP code" with "40110010"
+    And I follow "Locate in the map"
     And I press "Save"
     Then "zezinho" should have the following data
       | address                   | country | state | city     | zip_code |
@@ -38,14 +39,14 @@ Feature: Location
     Given the following <plural>
       | identifier   | name    | owner   |
       | mycollective | My Collective | zezinho |
-    And I am on My Collective's control panel
+    And I am on mycollective's control panel
     And I follow "Location"
     And I select "Brazil" from "Country"
     And I fill in the following:
       | Address   | Rua Marechal Floriano, 28 |
       | State    | Bahia                     |
       | City     | Salvador                  |
-      | ZIP Code | 40110010                  |
+      | ZIP code | 40110010                  |
     When I press "Save"
     Then "mycollective" should have the following data
       | address                   | country | state | city     | zip_code |
@@ -8,17 +8,20 @@ Feature: login
       | login | name |
       | joaosilva | Joao Silva |
+  @selenium
   Scenario: login from portal homepage
     Given feature "allow_change_of_redirection_after_login" is disabled on environment
     And I am not logged in
     And I go to the homepage
+    And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
     Then I should be on the homepage
     And I should be logged in as "joaosilva"
+  @selenium
   Scenario: login from some profile page
     Given feature "allow_change_of_redirection_after_login" is disabled on environment
     And I am not logged in
@@ -28,30 +31,31 @@ Feature: login
     And the following articles
       | owner      | name         | homepage |
       | mariasilva | my home page | true |
-    And I go to Maria Silva's homepage
+    And I go to mariasilva's homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Maria Silva's homepage
+    Then I should be on mariasilva's homepage
   Scenario: view my control panel
     Given feature "allow_change_of_redirection_after_login" is disabled on environment
     And I am not logged in
-    And I go to Joao Silva's control panel
+    And I go to joaosilva's control panel
     And I should be on login page
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Joao Silva's control panel
+    Then I should be on joaosilva's control panel
   Scenario: be redirected if user goes to login page and is logged
     Given I am logged in as "joaosilva"
     And I go to login page
-    Then I should be on Joao Silva's control panel
+    Then I should be on joaosilva's control panel
+  @selenium
   Scenario: stay on the same page after login if this is the environment default
     Given feature "allow_change_of_redirection_after_login" is enabled on environment
     And I am not logged in
@@ -62,26 +66,28 @@ Feature: login
     And the following articles
       | owner      | name         | homepage |
       | mariasilva | my home page | true |
-    And I go to Maria Silva's homepage
+    And I go to mariasilva's homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Maria Silva's homepage
+    Then I should be on mariasilva's homepage
+  @selenium
   Scenario: go to site homepage if this is the environment default
     Given feature "allow_change_of_redirection_after_login" is enabled on environment
     And I am not logged in
     And the environment is configured to redirect to site homepage after login
-    And I go to Joao Silva's homepage
+    And I go to joaosilva's homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
     Then I should be on the homepage
+  @selenium
   Scenario: go to user profile after login if this is the environment default
     Given feature "allow_change_of_redirection_after_login" is enabled on environment
     And I am not logged in
@@ -89,11 +95,12 @@ Feature: login
     And I go to the homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Joao Silva's profile
+    Then I should be on joaosilva's profile
+  @selenium
   Scenario: go to profile homepage after login if this is the environment default
     Given the following articles
       | owner     | name           | body               | homepage |
@@ -104,11 +111,12 @@ Feature: login
     And I go to the homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Joao Silva's homepage
+    Then I should be on joaosilva's homepage
+  @selenium
   Scenario: go to profile control panel after login if this is the environment default
     Given feature "allow_change_of_redirection_after_login" is enabled on environment
     And I am not logged in
@@ -116,11 +124,12 @@ Feature: login
     And I go to the homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Joao Silva's control panel
+    Then I should be on joaosilva's control panel
+  @selenium
   Scenario: stay on the same page after login if this is the profile default
     Given feature "allow_change_of_redirection_after_login" is enabled on environment
     And I am not logged in
@@ -132,27 +141,29 @@ Feature: login
     And the following articles
       | owner      | name         | homepage |
       | mariasilva | my home page | true |
-    And I go to Maria Silva's homepage
+    And I go to mariasilva's homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Maria Silva's homepage
+    Then I should be on mariasilva's homepage
+  @selenium
   Scenario: go to site homepage if this is the profile default
     Given feature "allow_change_of_redirection_after_login" is enabled on environment
     And I am not logged in
     And the environment is configured to stay on the same page after login
     And the profile joaosilva is configured to redirect to site homepage after login
-    And I go to Joao Silva's homepage
+    And I go to joaosilva's homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
     Then I should be on the homepage
+  @selenium
   Scenario: go to user profile after login if this is the profile default
     Given feature "allow_change_of_redirection_after_login" is enabled on environment
     And I am not logged in
@@ -161,11 +172,12 @@ Feature: login
     And I go to the homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Joao Silva's profile
+    Then I should be on joaosilva's profile
+  @selenium
   Scenario: go to profile homepage after login if this is the profile default
     Given the following articles
       | owner     | name           | body               | homepage |
@@ -177,11 +189,12 @@ Feature: login
     And I go to the homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Joao Silva's homepage
+    Then I should be on joaosilva's homepage
+  @selenium
   Scenario: go to profile control panel after login if this is the profile default
     Given feature "allow_change_of_redirection_after_login" is enabled on environment
     And I am not logged in
@@ -190,7 +203,7 @@ Feature: login
     And I go to the homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Joao Silva's control panel
+    Then I should be on joaosilva's control panel
@@ -26,7 +26,6 @@ Feature: manage categories
   Scenario: load subcategories only after following parent
     Then I should not see "Beans"
     And I should not see "Potatoes"
-    When I follow "Show" and wait for jquery
-    #    Then show me the page
-
-
+    When I follow "Show"
+    Then I should see "Beans"
+    And I should see "Potatoes"
@@ -15,8 +15,10 @@ Feature: manage enterprises
   Scenario: seeing my enterprises on menu
     Given I am logged in as "joaosilva"
     Then I should see "My enterprises" link
-    When I follow "My enterprises" and wait
-    Then I should see "Tangerine Dream" linking to "/myprofile/tangerine-dream"
+    When I follow "My enterprises"
+    And I follow "Tangerine Dream"
+    Then I should be on tangerine-dream's control panel
+
   @selenium
   Scenario: not show enterprises on menu to a user without enterprises
@@ -32,8 +32,8 @@ Feature: manage inputs
     And I follow "Inputs"
     Then I should not see "Add new input or raw material"
     And I follow "Add the inputs or raw material used by this product"
-    And I select "Music »" and wait for jquery
-    And I select "Rock" and wait for jquery
+    And I select "Music »" from "category_id" within "#categories_container_level0"
+    And I select "Rock" from "category_id" within "#categories_container_level1"
     And I press "Save and continue"
     Then I should see "Rock"
@@ -47,8 +47,8 @@ Feature: manage inputs
     And I follow "Inputs"
     And I should not see "Add the inputs or raw material used by this product"
     And I follow "Add new input or raw material"
-    And I select "Music »" and wait for jquery
-    And I select "Rock" and wait for jquery
+    And I select "Music »" from "category_id" within "#categories_container_level0"
+    And I select "Rock" from "category_id" within "#categories_container_level1"
     And I press "Save and continue"
     Then I should see "Rock"
@@ -57,8 +57,8 @@ Feature: manage inputs
     Given I am logged in as "joaosilva"
     When I go to Rede Moinho's page of product Abbey Road
     And I follow "Inputs"
-    And I follow "Add the inputs or raw material used by this product" and wait until "#input-category-form" is present
-    And I click "css=a.cancel-add-input"
+    And I follow "Add the inputs or raw material used by this product"
+    And I follow "Cancel" within "#categories_selection_actionbar"
     Then I should see "Abbey Road"
     And I should see "Add the inputs or raw material used by this product"
@@ -90,7 +90,7 @@ Feature: manage inputs
     And I follow "Inputs and raw material"
     Then I should see "Edit" within ".input-item"
-  @selenium
+  @selenium-fixme
   Scenario: Order inputs by position
     Given the following product_categories
       | name  |
@@ -131,7 +131,7 @@ Feature: manage inputs
     And I follow "Inputs"
     And I follow "Click here to add price and the amount used"
     And I should not see "Price by Meter ($)"
-    When I select "Meter"
+    When I select "Meter" from "input_unit_id" within ".edit_input"
     Then I should see "Price by Meter ($)"
   @selenium
@@ -145,7 +145,7 @@ Feature: manage inputs
     And I follow "Click here to add price and the amount used"
     And I fill in "Amount used" with "2.5"
     And I fill in "Price" with "11.50"
-    And I select "Meter"
+    And I select "Meter" from "input_unit_id" within ".edit_input"
     And I press "Save"
     Then I should see "2.5"
     And I should see "Meter"
@@ -162,14 +162,14 @@ Feature: manage inputs
     And I follow "Click here to add price and the amount used"
     And I fill in "Amount used" with "2.5"
     And I fill in "Price" with "11.50"
-    And I select "Meter"
+    And I select "Meter" from "input_unit_id" within ".edit_input"
     And I press "Save"
     Then I should see "2.5"
     And I should see "Meter"
     When I follow "Edit" within ".input-details"
     And I fill in "Amount used" with "3.0"
     And I fill in "Price" with "23.31"
-    And I select "Litre"
+    And I select "Litre" from "input_unit_id" within ".edit_input"
     And I press "Save"
     Then I should see "3"
     And I should see "Litre"
@@ -182,12 +182,12 @@ Feature: manage inputs
     And I am logged in as "joaosilva"
     When I go to Rede Moinho's page of product Abbey Road
     And I follow "Inputs"
-    And I follow "Click here to add price and the amount used" and wait until ".input-details-form" is present
+    And I follow "Click here to add price and the amount used"
     Then I should see "Cancel"
     And I should see "Amount used"
     And I should see "Price"
     And I should see "This input or raw material inpact on the final price of the product?"
-    When I click "css=a.cancel-edit-input"
+    When I follow "Cancel" within ".edit_input"
     Then I should see "Click here to add price and the amount used"
   @selenium
@@ -199,7 +199,7 @@ Feature: manage inputs
     When I go to Rede Moinho's page of product Abbey Road
     And I follow "Inputs"
     And I follow "Edit" within ".input-details"
-    And I follow "Cancel"
+    And I follow "Cancel" within ".edit_input"
     And I follow "Edit" within ".input-details"
     Then I should see "Amount used"
     And I should see "Price by Meter"
@@ -215,7 +215,7 @@ Feature: manage inputs
     Then I should see "Rock"
     And I should not see "Add the inputs or raw material used by this product"
     When I follow "Remove"
-    And I confirm
+    And I confirm the browser dialog
     Then I should see "Add the inputs or raw material used by this product"
   @selenium
@@ -226,18 +226,18 @@ Feature: manage inputs
       | redemoinho | Music    | Manu Chao    |
     And I am logged in as "joaosilva"
     When I go to Rede Moinho's page of product Depeche Mode
-    Then the content "Add some description to your product" should be visible
-    And the content "Add the inputs or raw material used by this product" should not be visible
+    Then I should see "Add some description to your product"
+    And "Add the inputs or raw material used by this product" should not be visible within "#show_product"
     When I follow "Inputs and raw material"
-    Then the content "Add the inputs or raw material used by this product" should be visible
-    And the content "Add some description to your product" should not be visible
+    Then I should see "Add the inputs or raw material used by this product"
+    And "Add some description to your product" should not be visible within "#show_product"
     When I go to Rede Moinho's page of product Manu Chao
-    Then the content "Add some description to your product" should be visible
+    Then I should see "Add some description to your product"
     When I go to Rede Moinho's page of product Depeche Mode
-    Then the content "Add the inputs or raw material used by this product" should be visible
-    And the content "Add some description to your product" should not be visible
+    Then I should see "Add the inputs or raw material used by this product"
+    And "Add some description to your product" should not be visible within "#show_product"
-  @selenium
+  @selenium-fixme
   Scenario: Order input list
     Given the following product_category
       | name  |
@@ -51,9 +51,9 @@ Feature: manage product price details
     And I follow "Price composition"
     And I follow "Describe here the cost of production"
     And I follow "New cost"
-    And I select "Taxes"
+    And I select "Taxes" from "price_details__production_cost_id" within "#display-product-price-details"
     And I fill in "$" with "5.00"
-    And I leave the ".price-details-price" field
+    And I leave the "#price_details__price" field
     And I press "Save"
     Then I should not see "Save"
     And I should see "Describe here the cost of production"
@@ -67,15 +67,15 @@ Feature: manage product price details
     And I follow "Price composition"
     And I follow "Describe here the cost of production"
     And I follow "New cost"
-    And I select "Taxes"
+    And I select "Taxes" from "price_details__production_cost_id" within "#display-product-price-details"
     And I fill in "$" with "20.00"
     And I leave the ".price-details-price" field
     And I press "Save"
     Then I should not see "Save"
     And I should see "Taxes" within "#display-price-details"
     When I follow "Describe here the cost of production"
-    And I select "Energy"
-    And I leave the ".price-details-price" field
+    And I select "Energy" from "price_details__production_cost_id" within "#display-product-price-details"
+    And I leave the "#price_details__price" field
     And I press "Save"
     And I should not see "Taxes" within "#display-price-details"
     And I should see "Energy" within "#display-price-details"
@@ -102,9 +102,10 @@ Feature: manage product price details
      And I follow "Price composition"
      And I follow "Describe here the cost of production"
      And I follow "New cost"
-     And I select "Taxes"
+     And I select "Taxes" from "price_details__production_cost_id" within "#display-product-price-details"
      And I fill in "$" with "20.00"
      And I press "Save"
+     And I go to Rede Moinho's page of product Abbey Road
      Then I should see "Inputs" within ".price-detail-name"
      And I should see "60.0" within ".price-detail-price"
@@ -114,10 +115,10 @@ Feature: manage product price details
     And I follow "Price composition"
     And I follow "Describe here the cost of production"
     And I follow "New cost"
+    And I select "Other cost" from "price_details__production_cost_id" within "#display-product-price-details"
     And I want to add "Energy" as cost
-    And I select "Other cost"
     And I fill in "$" with "10.00"
-    And I leave the ".price-details-price" field
+    And I leave the "#price_details__price" field
     And I press "Save"
     When I follow "Describe here the cost of production"
     Then I should see "Energy" within ".production-cost-selection"
@@ -127,9 +128,10 @@ Feature: manage product price details
     Given I go to Rede Moinho's page of product Abbey Road
     And I follow "Price composition"
     And I follow "Describe here the cost of production"
+    And I follow "New cost"
+    And I select "Other cost" from "price_details__production_cost_id" within "#display-product-price-details"
     And I want to add "Energy" as cost
-    And I select "Other cost"
-    Then I should see "Energy" within "#new-cost-fields"
+    Then I should see "Energy" within "#display-product-price-details"
   @selenium
   Scenario: remove price detail
@@ -141,7 +143,7 @@ Feature: manage product price details
     And I follow "Describe here the cost of production"
     And I should see "Taxes" within "#manage-product-details-form"
     When I follow "Remove" within "#manage-product-details-form"
-    And I confirm
+    And I confirm the browser dialog
     And I press "Save"
     And I follow "Describe here the cost of production"
     Then I should not see "Taxes" within "#manage-product-details-form"
@@ -160,7 +162,7 @@ Feature: manage product price details
     Then I should see "$ 60.00 of $ 80.00" within "#progressbar-text"
     And I follow "New cost"
     And I fill in "$" with "10.00"
-    And I leave the ".price-details-price" field
+    And I leave the "#price_details__price" field
     Then I should see "$ 70.00 of $ 80.00" within "#progressbar-text"
   @selenium
@@ -13,7 +13,7 @@ Feature: manage products
   Scenario: display "create new product" button
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
+    And I am on redemoinho's control panel
     When I follow "Manage Products and Services"
     Then I should see "New product or service"
@@ -34,7 +34,7 @@ Feature: manage products
       | redemoinho | bicycle  | Bike I | bicycle 9  |
       | redemoinho | bicycle  | Bike J | bicycle 10 |
       | redemoinho | bicycle  | Bike K | bicycle 11 |
-    When I go to /catalog/redemoinho
+    When I go to redemoinho's products page
     Then I should see "Bike A" within "#product-list"
     And I should see "Bike B" within "#product-list"
     And I should see "Bike C" within "#product-list"
@@ -52,13 +52,13 @@ Feature: manage products
   Scenario: listing products and services
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
+    And I am on redemoinho's control panel
     And I follow "Manage Products and Services"
     Then I should see "Listing products and services"
   Scenario: see button to back in categories hierarchy
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
+    And I am on redemoinho's control panel
     And I follow "Manage Products and Services"
     When I follow "New product or service"
     Then I should see "Back to the product listing" link
@@ -69,9 +69,7 @@ Feature: manage products
       | Products |
       | Services |
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    When I follow "New product or service"
+    And I go to redemoinho's new product page
     Then I should see "Products"
     And I should see "Service"
@@ -85,10 +83,8 @@ Feature: manage products
       | Computers level1 | products-level0 |
       | DVDs level1 | products-level0 |
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    When I follow "New product or service"
-    And I select "Products level0 »" and wait for jquery
+    And I go to redemoinho's new product page
+    And I select "Products level0 »" from "category_id" within "#categories_container_level0"
     Then I should see "Computers level1"
     And I should see "DVDs level1"
@@ -103,12 +99,12 @@ Feature: manage products
       | Computers level1 | products-level0 |
       | Software development level1 | services-level0 |
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    When I follow "New product or service"
-    And I select "Products level0 »" and wait for jquery
-    And I select "Computers level1" and wait for jquery
-    And I select "Services level0 »" and wait for jquery
+    And I go to redemoinho's new product page
+    And I should not see /Computers level/
+    And I select "Products level0 »" from "category_id" within "#categories_container_wrapper"
+    And I should see /Computers level/
+    And I should not see /Software develop/
+    And I select "Services level0 »" from "category_id" within "#categories_container_wrapper"
     Then I should see /Software develop/
     And I should not see /Computers level/
@@ -121,11 +117,9 @@ Feature: manage products
       | name | parent |
       | Computers | products |
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    When I follow "New product or service"
-    And I select "Products »" and wait for jquery
-    And I select "Computers" and wait for jquery
+    And I go to redemoinho's new product page
+    And I select "Products »" from "category_id" within "#categories_container_level0"
+    And I select "Computers" from "category_id" within "#categories_container_level1"
     Then I should see "Products → Computers"
   @selenium
@@ -137,11 +131,9 @@ Feature: manage products
       | name | parent |
       | Category Level 1 | toplevel-product-categories |
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    When I follow "New product or service"
-    And I select "Toplevel Product Categories »" and wait for jquery
-    And I select "Category Level 1" and wait for jquery
+    And I go to redemoinho's new product page
+    And I select "Toplevel Product Categories »" from "category_id" within "#categories_container_level0"
+    And I select "Category Level 1" from "category_id" within "#categories_container_level1"
     Then I should see "Toplevel Product Categories" link
     And I should not see "Category Level 1" link
@@ -151,8 +143,8 @@ Feature: manage products
       | name |
       | Only for test |
     And I am logged in as "joaosilva"
-    When I go to /myprofile/redemoinho/manage_products/new
-    Then the "#save_and_continue" button should not be enabled
+    When I go to redemoinho's new product page
+    Then the "#save_and_continue" button should be disabled
   @selenium
   Scenario: enable save button when select one category
@@ -160,11 +152,9 @@ Feature: manage products
     And the following product_category
       | name |
       | Browsers (accept categories) |
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    When I follow "New product or service"
-    And I select "Browsers (accept categories)" and wait for jquery
-    Then the "Save and continue" button should be enabled
+    When I go to redemoinho's new product page
+    And I select "Browsers (accept categories)" from "category_id" within "#categories_container_wrapper"
+    Then the "#save_and_continue" button should be enabled
   @selenium
   Scenario: dont enable save button when select category with not accept products
@@ -172,11 +162,9 @@ Feature: manage products
       | name | accept_products |
       | Browsers | false |
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    When I follow "New product or service"
-    And I select "Browsers" and wait for jquery
-    Then the "#save_and_continue" button should not be enabled
+    When I go to redemoinho's new product page
+    And I select "Browsers" from "category_id" within "#categories_container_wrapper"
+    Then the "#save_and_continue" button should be disabled
   @selenium
   Scenario: save product
@@ -184,32 +172,14 @@ Feature: manage products
       | name |
       | Bicycle |
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    When I follow "New product or service"
-    And I select "Bicycle" and wait for jquery
+    When I go to redemoinho's new product page
+    And I select "Bicycle" from "category_id" within "#categories_container_wrapper"
     And I press "Save and continue"
-    Then I should see "Bicycle"
+    When I go to redemoinho's products page
+    And I follow "Bicycle" within "#product-list"
+    Then I should see "Bicycle" within "#show_product"
     And I should see "Change category"
-  @selenium
-  Scenario: stay on the same place after error on save
-    Given the following product_category
-      | name |
-      | Bicycle |
-    Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    And I follow "New product or service"
-    And I select "Bicycle" and wait for jquery
-    And I press "Save and continue"
-    When I follow "Back"
-    And I follow "New product or service"
-    And I select "Bicycle" and wait for jquery
-    And I press "Save and continue"
-    Then I should be on Rede Moinho's new product page
-    And I should see "Bicycle"
-
   Scenario: a user with permission can see edit links
     Given the following product_category
       | name |
@@ -331,10 +301,11 @@ Feature: manage products
     And I am logged in as "joaosilva"
     When I go to Rede Moinho's page of product Generic pc
     And I follow "Change category"
-    And I select "Eletronics »" and wait for jquery
-    Then I select "DVDs" and wait for jquery
+    And I select "Eletronics »" from "category_id" within "#categories_container_level0"
+    Then I select "DVDs" from "category_id" within "#categories_container_level1"
     And I press "Save and continue"
-    Then I should see "Eletronics → DVDs"
+    When I go to Rede Moinho's page of product Generic pc
+    Then I should see "Eletronics → DVDs" within ".hierarchy-category"
   @selenium
   Scenario: cancel edition of a product category
@@ -424,7 +395,9 @@ Feature: manage products
     And I follow "Change category"
     And I press "Save and continue"
     Then I should not see "Product category can't be blank"
-    And I should be on Rede Moinho's page of product Generic pc
+    When I go to Rede Moinho's page of product Generic pc
+    Then I should see "Eletronics → Computers" within ".hierarchy-category"
+
     And I should see "Generic pc"
   @selenium
@@ -450,7 +423,7 @@ Feature: manage products
     And I am logged in as "joaosilva"
     When I go to Rede Moinho's page of product Generic pc
     And I follow "Change category"
-    Then the select for category "Netbook from Venus" should be visible
+    Then "Netbook from Venus" should be visible within "#categories_container_wrapper"
   @selenium
   Scenario: Truncate long category name in selection of category
@@ -462,7 +435,7 @@ Feature: manage products
       | name | parent |
       | Netbook Quantum | Super Quantum Computers with teraflops |
     And I am logged in as "joaosilva"
-    When I go to Rede Moinho's new product page
+    When I go to redemoinho's new product page
     Then I should see "Nanonote nanotech with long lo..."
     And I should see "Super Quantum Computers with t... »"
@@ -481,7 +454,7 @@ Feature: manage products
     When I go to Rede Moinho's page of product Bike
     And I follow "Edit name and unit"
     And I fill in "Red bicycle" for "product_name"
-    And I select "Kilo"
+    And I select "Kilo" from "product_unit_id" within "#product-name-form"
     And I press "Save"
     Then I should see "Red bicycle - kilo"
@@ -519,12 +492,14 @@ Feature: manage products
     When I go to Rede Moinho's page of product Bike
     And I follow "Add price and other basic information"
     And I follow "Add new qualifier"
-    And I select "Organic" and wait for jquery
+    And I select "Organic" from "selected_qualifier" within "#product-qualifiers-list"
     And I press "Save"
+    And I go to Rede Moinho's page of product Bike
     Then I should see "Organic (Self declared)"
     When I follow "Edit basic information"
     And I follow "Delete qualifier"
     And I press "Save"
+    And I go to Rede Moinho's page of product Bike
     Then I should not see "Organic (Self declared)"
   @selenium
@@ -20,11 +20,11 @@ Feature: my_network_block
       | identifier              | name                   | owner     | public_profile |
       | other-public-community  | Other Public Community | joaosilva | true           |
       | private-community       | Private Community      | joaosilva | false          |
-    And I am on Joao Silva's homepage
+    And I am on joaosilva's homepage
     And I should see "2 communities"
-    When I go to Public Community's homepage
+    When I go to public-community's homepage
     And I follow "Join"
-    And I go to Joao Silva's homepage
+    And I go to joaosilva's homepage
     Then I should see "3 communities"
   @selenium
@@ -34,11 +34,11 @@ Feature: my_network_block
       | identifier            | name                  | owner     | visible |
       | visible-community     | Visible Community     | joaosilva | true    |
       | not-visible-community | Not Visible Community | joaosilva | false   |
-    And I am on Joao Silva's homepage
+    And I am on joaosilva's homepage
     And I should see "One community"
-    When I go to Public Community's homepage
+    When I go to public-community's homepage
     And I follow "Join"
-    And I go to Joao Silva's homepage
+    And I go to joaosilva's homepage
     Then I should see "2 communities"
   Scenario: display how many public/private friends I have
@@ -48,10 +48,10 @@ Feature: my_network_block
       | josesilva  | Jose Silva  | false          |
     And "joaosilva" is friend of "mariasilva"
     And I am logged in as "joaosilva"
-    And I am on Joao Silva's homepage
+    And I am on joaosilva's homepage
     Then I should see "1 friend"
     And "joaosilva" is friend of "josesilva"
-    When I go to Joao Silva's homepage
+    When I go to joaosilva's homepage
     Then I should see "2 friends"
   Scenario: not display how many invisible friends I have
@@ -62,8 +62,8 @@ Feature: my_network_block
     And "josesilva" is invisible
     And "joaosilva" is friend of "mariasilva"
     And I am logged in as "joaosilva"
-    When I go to Joao Silva's homepage
+    When I go to joaosilva's homepage
     Then I should see "1 friend"
     And "joaosilva" is friend of "josesilva"
-    When I go to Joao Silva's homepage
+    When I go to joaosilva's homepage
     Then I should see "1 friend"
@@ -7,10 +7,10 @@ Feature: create content on cms
       | login     | name       |
       | joaosilva | Joao Silva |
     And I am logged in as "joaosilva"
-    And I am on Joao Silva's cms
+    And I am on joaosilva's cms
   Scenario: open page to select type of content
-    Given I follow "New Content"
+    Given I follow "New content"
     Then I should see "Choose the type of content"
   Scenario: list all content types
@@ -27,7 +27,7 @@ Feature: create content on cms
     When I follow "Folder"
     And I fill in "Title" with "My Folder"
     And I press "Save"
-    And I go to Joao Silva's cms
+    And I go to joaosilva's cms
     Then I should see "My Folder"
   Scenario: create a tiny_mce article
@@ -35,7 +35,7 @@ Feature: create content on cms
     When I follow "Text article with visual editor"
     And I fill in "Title" with "My tiny_mce article"
     And I press "Save"
-    And I go to Joao Silva's cms
+    And I go to joaosilva's cms
     Then I should see "My tiny_mce article"
   Scenario: create a textile article
@@ -43,7 +43,7 @@ Feature: create content on cms
     When I follow "Text article with Textile markup"
     And I fill in "Title" with "My textile article"
     And I press "Save"
-    And I go to Joao Silva's cms
+    And I go to joaosilva's cms
     Then I should see "My textile article"
   Scenario: create a Blog
@@ -51,7 +51,7 @@ Feature: create content on cms
     When I follow "Blog"
     And I fill in "Title" with "My blog"
     And I press "Save"
-    And I go to Joao Silva's cms
+    And I go to joaosilva's cms
     Then I should see "My blog"
   Scenario: create an event
@@ -59,7 +59,7 @@ Feature: create content on cms
     When I follow "Event"
     And I fill in "Title" with "My event"
     And I press "Save"
-    And I go to Joao Silva's cms
+    And I go to joaosilva's cms
     Then I should see "My event"
   Scenario: redirect to upload files if choose UploadedFile
@@ -9,7 +9,7 @@ Feature: organization custom fields
       | joaosilva | Joao Silva |
     And I am logged in as "joaosilva"
     And feature "enterprise_registration" is enabled on environment
-    And I go to the Control panel
+    And I go to joaosilva's control panel
   Scenario Outline: organization active fields are not displayed on creation
     Given the following <organization> fields are active fields
@@ -35,7 +35,7 @@ Feature: organization custom fields
       | name          | identifier    |
       | Organization  | organization  |
     And "Joao Silva" is admin of "Organization"
-    And I am on Organization's control panel
+    And I am on organization's control panel
     And I follow <information>
     Then I should see "Display name"
     Then I should see "Contact email"
@@ -70,7 +70,7 @@ Feature: organization custom fields
       | name          | identifier    | display_name | contact_email | city |
       | Organization  |  organization | organization | bla@bleee.com | city |
     And "Joao Silva" is admin of "Organization"
-    And I am on Organization's control panel
+    And I am on organization's control panel
     And I follow <information>
     And I fill in the following:
       | Display name  | |
@@ -23,36 +23,36 @@ Feature: plugins
   Scenario: a user must see the plugin\'s button in the control panel if the plugin is enabled
     Given plugin TestPlugin is enabled on environment
-    And I go to Joao Silva's control panel
+    And I go to joaosilva's control panel
     Then I should see "Test plugin button"
   Scenario: a user must see the plugin\'s tab in in the profile if the plugin is enabled
     Given plugin TestPlugin is enabled on environment
-    And I am on Joao Silva's profile
+    And I am on joaosilva's profile
     Then I should see "Test plugin tab"
   Scenario: a user must not see the plugin\'s button in the control panel if the plugin is disabled
     Given plugin TestPlugin is disabled on environment
-    And I go to Joao Silva's control panel
+    And I go to joaosilva's control panel
     Then I should not see "Test plugin button"
   Scenario: a user must not see the plugin\'s tab in in the profile if the plugin is disabled
     Given plugin TestPlugin is disabled on environment
-    And I am on Joao Silva's profile
+    And I am on joaosilva's profile
     Then I should not see "Test plugin tab"
   Scenario: an admin should be able to deactivate a plugin
     Given plugin TestPlugin is enabled on environment
     And I am logged in as admin
-    When I go to the Control panel
+    When I go to admin_user's control panel
     Then I should see "Test plugin button"
-    When I go to the profile
+    When I go to admin_user's profile
     Then I should see "Test plugin tab"
     And I go to the environment control panel
     And I follow "Plugins"
     And I uncheck "Test plugin"
     And I press "Save changes"
-    When I go to the Control panel
+    When I go to admin_user's control panel
     Then I should not see "Test plugin button"
-    When I go to the profile
+    When I go to admin_user's profile
     Then I should not see "Test plugin tab"
@@ -0,0 +1,2 @@
+This directory must contain symbolink links to the Noosfero plugins features
+files folder.
@@ -14,7 +14,7 @@ Feature: private profiles
   Scenario: joining a private community
     Given I am logged in as "joao"
-    When I go to Safernet's homepage
+    When I go to safernet's homepage
     Then I should see "members only"
     When I follow "Join"
     And "joao" is accepted on community "Safernet"
@@ -12,62 +12,68 @@ Feature: domain for profile
       | sample-community | Sample Community | localhost |
     And the following blocks
       | owner            | type              |
-      | sample-community | ProfileImageBlock |
-      | sample-community | ProfileInfoBlock  |
+      | joaosilva        | ProfileInfoBlock  |
     And the environment domain is "127.0.0.1"
+    And "Joao Silva" is environment admin
     And "Joao Silva" is admin of "Sample Community"
   @selenium
   Scenario: access profile control panel through profile blocks
     Given I am logged in as "joaosilva"
-    When I visit "/" and wait
-    And I follow "Control panel" within "div.profile-info-block" and wait
-    Then I should see "Sample Community" within "span.control-panel-title"
-    When I visit "/" and wait
-    And I follow "Control panel" within "div.profile-image-block" and wait
-    Then I should see "Sample Community" within "span.control-panel-title"
+    When I go to joaosilva's homepage
+    And I follow "Control panel" within ".profile-info-block"
+    Then I should see "Joao Silva" within "span.control-panel-title"
+    When I follow "Control panel" within ".profile-image-block"
+    Then I should see "Joao Silva" within "span.control-panel-title"
   @selenium
   Scenario: access user control panel
     Given I am logged in as "joaosilva"
-    When I visit "/" and wait
-    And I follow "joaosilva" and wait
+    When I go to the homepage
+    And I follow "joaosilva"
+    And I go to sample-community's homepage
     And I follow "Login"
     And I fill in "joaosilva" for "Username"
     And I fill in "123456" for "Password"
-    And I press "Log in" and wait
-    And I follow "Control panel" within "div#user" and wait
+    And I press "Log in"
+    And I follow "Control panel" within "div#user"
     Then I should see "Joao Silva" within "span.control-panel-title"
+  # Looking for page title is problematic on selenium since it considers the
+  # title to be invibible. Checkout some information about this:
+  #   * https://github.com/jnicklas/capybara/issues/863
+  #   * https://github.com/jnicklas/capybara/pull/953
   @selenium
   Scenario: access user page
     Given I am logged in as "joaosilva"
-    When I visit "/" and wait
-    And I follow "joaosilva" and wait
-    Then The page title should contain "Joao Silva"
+    When I go to the homepage
+    And I follow "joaosilva"
+    Then I should be on joaosilva's profile
+    And I should see "Joao Silva" within any "h1"
+    #And the page title should be "Joao Silva"
-  @selenium
   Scenario: access community by domain
-    When I go to the homepage
-    Then The page title should contain "Sample Community"
+    Given I go to the search communities page
+    When I follow "Sample Community" within ".search-profile-item"
+    Then the page title should be "Sample Community"
-  @selenium
+  # This test is not working because the community domain isn't at all different
+  # from the environment (localhost / 127.0.0.1)
+  @fixme
   Scenario: Go to profile homepage after clicking on home button on not found page
-    Given I am on the homepage
+    Given I am on sample-community's homepage
     When I go to /something-that-does-not-exist
     And I follow "Go to the home page"
     Then the page title should be "Sample Community - Colivre.net"
-  @selenium
   Scenario: Go to environment homepage after clicking on home button on not found page
     Given I am on the homepage
-    And I click on the logo
-    When I open /something-that-does-not-exist
+    When I go to /something-that-does-not-exist
     And I follow "Go to the home page"
-    Then the page title should be "Colivre.net"
+    Then I should be on the homepage
+    And the page title should be "Colivre.net"
   @selenium
   Scenario: Compose link to administration with environment domain
     Given I am logged in as "joaosilva"
-    When I visit "/" and wait
-    Then I should see "Administration" linking to "http://127.0.0.1/admin"
+    Then I should see "Administration" linking to "http://127.0.0.1.*/admin"
@@ -14,7 +14,7 @@ Feature: search inside a profile
       | joaosilva | whales and dolphins  | this is an article about whales and dolphins  |
   Scenario: search on profile
-    Given I go to Joao Silva's profile
+    Given I go to joaosilva's profile
     And I fill in "q" with "bees"
     And I press "Search"
     Then I should see "bees and butterflies" within ".main-block"
@@ -25,7 +25,7 @@ Feature: search inside a profile
       | owner     | name                | start_date |
       | joaosilva | Group meeting       | 2009-10-01 |
       | joaosilva | John Doe's birthday | 2009-09-01 |
-    When I go to Joao Silva's profile
+    When I go to joaosilva's profile
     And I fill in "q" with "birthday"
     And I press "Search"
     Then I should see "John Doe's birthday" within ".main-block"
@@ -35,7 +35,7 @@ Feature: search inside a profile
     Given the following blocks
       | owner     | type                |
       | joaosilva | ProfileSearchBlock  |
-    When I go to Joao Silva's profile
+    When I go to joaosilva's profile
     And I fill in "q" with "bees" within ".profile-search-block"
     And I press "Search"
     Then I should see "bees and butterflies" within ".main-block"
@@ -45,14 +45,14 @@ Feature: search inside a profile
       | owner     | name                | body                      | published |
       | joaosilva | published article   | this is a public article  | true      |
       | joaosilva | unpublished article | this is a private article | false     |
-    And I go to Joao Silva's profile
+    And I go to joaosilva's profile
     And I fill in "q" with "article"
     And I press "Search"
     Then I should see "public article" within ".main-block"
     And I should not see "private article" within ".main-block"
   Scenario: search on environment
-    Given I go to Joao Silva's profile
+    Given I go to joaosilva's profile
     And I fill in "q" with "bees"
     And I choose "General"
     And I press "Search"
@@ -20,48 +20,48 @@ Feature: publish article
   Scenario: publishing an article that doesn't exists in the community
     Given I am logged in as "joaosilva"
     And "Joao Silva" is a member of "Sample Community"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
-    And I go to Sample Community's sitemap
+    And I go to sample-community's sitemap
     When I follow "Sample Article"
     Then I should see "This is the first published article"
   Scenario: publishing an article with a different name
     Given I am logged in as "joaosilva"
     And "Joao Silva" is a member of "Sample Community"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "Spread"
     And I check "Sample Community"
     And I fill in "Title" with "Another name"
     And I press "Spread this"
-    When I go to Sample Community's sitemap
+    When I go to sample-community's sitemap
     Then I should see "Another name"
     And I should not see "Sample Article"
-  @selenium
+  @selenium @ignore-hidden-elements
   Scenario: getting an error message when publishing article with same name
     Given I am logged in as "joaosilva"
     And "Joao Silva" is a member of "Sample Community"
-    And I am on Joao Silva's control panel
-    And I follow "Manage Content" and wait
+    And I am on joaosilva's control panel
+    And I follow "Manage Content"
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
     And I am not logged in
     And I am logged in as "mariasilva"
     And "Maria Silva" is a member of "Sample Community"
-    And I am on Maria Silva's control panel
+    And I am on mariasilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
-    And I follow "Text article with Textile markup language" and wait
+    And I follow "Text article with Textile markup language"
     And I fill in the following:
       | Title | Sample Article |
       | Text | this is Maria's first published article |
-    And I press "Save" and wait
+    And I press "Save"
     And I follow "Spread"
     And I check "Sample Community"
     When I press "Spread this"
@@ -77,13 +77,13 @@ Feature: publish article
     And "Joao Silva" is a member of "Sample Community"
     And "Joao Silva" is a member of "Another Community1"
     And "Joao Silva" is a member of "Another Community2"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
     And I should not see "This article name is already in use in the following community(ies):"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "Spread"
     And I check "Sample Community"
@@ -91,30 +91,30 @@ Feature: publish article
     And I check "Another Community2"
     When I press "Spread this"
     Then I should see "The title (article name) is already being used by another article, please use another title."
-    When I go to Another Community1's sitemap
+    When I go to another-community1's sitemap
     Then I should see "Sample Article"
-    When I go to Another Community2's sitemap
+    When I go to another-community2's sitemap
     Then I should see "Sample Article"
   Scenario: publishing articles with the same name in a moderated community
     Given I am logged in as "joaosilva"
     And "Joao Silva" is a member of "Sample Community"
     And "Joao Silva" is admin of "Sample Community"
-    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 choose "profile_data_moderated_articles_true"
     And I press "Save"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
-    And I am on Sample Community's control panel
+    And I am on sample-community's control panel
     And I follow "Tasks"
     And I choose "Accept"
     And I press "Apply!"
@@ -126,17 +126,17 @@ Feature: publish article
   Scenario: ask to publish an article that was deleted before approval
     Given I am logged in as "joaosilva"
     And "Joao Silva" is admin of "Sample Community"
-    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 choose "profile_data_moderated_articles_true"
     And I press "Save"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
     And "joaosilva" has no articles
-    And I am on Sample Community's control panel
+    And I am on sample-community's control panel
     When I follow "Tasks"
     Then I should see "The article was removed."
     And I press "Apply!"
@@ -9,7 +9,7 @@ Feature: register enterprise
       | joaosilva | Joao Silva | joaosilva@example.com  |
     And I am logged in as "joaosilva"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And feature "enterprise_registration" is enabled on environment
   Scenario: enterprise registration is disabled by admin
@@ -92,7 +92,7 @@ Feature: register enterprise
     And I press "Next"
     Then I should see "Enterprise registration completed"
     And I am logged in as admin
-    And I go to the Control panel
+    And I go to admin_user's control panel
     When I follow "Tasks" within ".control-panel"
     Then I should see "Joao Silva wants to create enterprise My Enterprise."
     And the first mail is to admin_user@example.com
@@ -100,10 +100,11 @@ Feature: register enterprise
     And I press "Apply!"
     Then the last mail is to joaosilva@example.com
     And I am logged in as "joaosilva"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     When I follow "Manage my groups"
     Then I should see "My Enterprise"
+  @selenium
   Scenario: a user register an enterprise successfully through the admin
             validator method and the admin rejects
     Given organization_approval_method is "admin" on environment
@@ -119,7 +120,7 @@ Feature: register enterprise
     And I press "Next"
     Then I should see "Enterprise registration completed"
     And I am logged in as admin
-    And I go to the Control panel
+    And I go to admin_user's control panel
     When I follow "Tasks" within ".control-panel"
     Then I should see "Joao Silva wants to create enterprise My Enterprise."
     And the first mail is to admin_user@example.com
@@ -128,7 +129,7 @@ Feature: register enterprise
     And I press "Apply!"
     Then the last mail is to joaosilva@example.com
     And I am logged in as "joaosilva"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     When I follow "Manage my groups"
     Then I should not see "My Enterprise"
@@ -156,15 +157,16 @@ Feature: register enterprise
     When I choose "Validator"
     And I press "Confirm"
     Then I should see "Enterprise registration completed"
-    And I am on Validator's control panel
+    And I am on validator's control panel
     When I follow "Tasks"
     Then I should see "Joao Silva wants to create enterprise My Enterprise."
     And I choose "Accept"
     And I press "Apply!"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     When I follow "Manage my groups"
     Then I should see "My Enterprise"
+  @selenium
   Scenario: a user register an enterprise successfully through the region
             validator method and the validator rejects
     Given organization_approval_method is "region" on environment
@@ -189,13 +191,13 @@ Feature: register enterprise
     When I choose "Validator"
     And I press "Confirm"
     Then I should see "Enterprise registration completed"
-    And I am on Validator's control panel
+    And I am on validator's control panel
     When I follow "Tasks"
     Then I should see "Joao Silva wants to create enterprise My Enterprise."
     And I choose "Reject"
     And I fill in "Rejection explanation" with "This enterprise has some irregularities."
     And I press "Apply"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     When I follow "Manage my groups"
     Then I should not see "My Enterprise"
@@ -9,7 +9,7 @@ Feature: search
   Scenario: show empty results in all enabled assets
     Given I go to the search page
-    And I fill in "query" with "Anything"
+    And I fill in "search-input" with "Anything"
     And I press "Search"
     Then I should see "People" within ".search-results-people"
     And I should see "None" within ".search-results-people"
@@ -30,7 +30,7 @@ Feature: search
       | joaosilva  | Joao Silva  |
       | josearaujo | Jose Araujo |
     When I go to the search page
-    And I fill in "query" with "Silva"
+    And I fill in "search-input" with "Silva"
     And I press "Search"
     Then I should see "Joao Silva" within ".common-profile-list-block"
     And I should not see "Jose Araujo"
@@ -51,7 +51,7 @@ Feature: search
       | joaosilva | article #8 |
       | joaosilva | article #9 |
     When I go to the search page
-    And I fill in "query" with "article"
+    And I fill in "search-input" with "article"
     And I press "Search"
     Then I should see "article #8" within ".search-results-articles"
     And I should not see "article #9" within ".search-results-articles"
@@ -65,7 +65,7 @@ Feature: search
       | boring-community | Boring community | semterrinha |
       | fancy-community  | Fancy community  | agrotox |
     And I go to the search page
-    And I fill in "query" with "fancy"
+    And I fill in "search-input" with "fancy"
     And I press "Search"
     Then I should see "Fancy community" within ".common-profile-list-block"
     And I should not see "Boring community"
@@ -76,7 +76,7 @@ Feature: search
       | shop1 | Shoes shop |
       | shop2 | Fruits shop |
     And I go to the search page
-    And I fill in "query" with "shoes"
+    And I fill in "search-input" with "shoes"
     And I press "Search"
     Then I should see "Shoes shop" within ".common-profile-list-block"
     And I should not see "Fruits shop"
@@ -90,7 +90,7 @@ Feature: search
       | joaosilva | bees and butterflies | this is an article about bees and butterflies |
       | joaosilva | whales and dolphins | this is an article about whales and dolphins |
     When I go to the search page
-    And I fill in "query" with "whales"
+    And I fill in "search-input" with "whales"
     And I press "Search"
     Then I should see "whales and dolphins" within "div.search-results-articles"
     And I should not see "bees and butterflies"
@@ -107,7 +107,7 @@ Feature: search
       | colivre-ent | development | social networks consultancy |
       | colivre-ent | development | wikis consultancy           |
     When I go to the search page
-    And I fill in "query" with "wikis"
+    And I fill in "search-input" with "wikis"
     And I press "Search"
     Then I should see "wikis consultancy" within "div.search-results-products"
     And I should not see "social networks consultancy"
@@ -121,7 +121,7 @@ Feature: search
       | nice-people | Group meeting | 2009-10-01 |
       | nice-people | John Doe's birthday | 2009-09-01 |
     When I go to the search page
-    And I fill in "query" with "birthday"
+    And I fill in "search-input" with "birthday"
     And I press "Search"
     Then I should see "John Doe's birthday" within "div.search-results-events"
     And I should not see "Group meeting"
@@ -140,7 +140,7 @@ Feature: search
       | owner       | name              | category    |
       | colivre_dev | Noosfero platform | Development |
     When I go to the search page
-    And I fill in "query" with "noosfero"
+    And I fill in "search-input" with "noosfero"
     And I press "Search"
     Then I should see "Colivre - Noosfero dev." within "div.search-results-enterprises"
     And I should see "Noosfero users" within "div.search-results-communities"
@@ -28,7 +28,7 @@ Feature: search communities
   Scenario: simple search for community
     When I go to the search communities page
-    And I fill in "query" with "noosfero"
+    And I fill in "search-input" with "noosfero"
     And I press "Search"
     Then I should see "Noosfero Community" within "#search-results"
     And I should see "Noosfero Community" within ".only-one-result-box"
@@ -42,7 +42,7 @@ Feature: search communities
       | identifier | name               | category       |
       | noos-comm  | Noosfero Community | software-livre |
     When I go to the search communities page
-    And I fill in "query" with "software livre"
+    And I fill in "search-input" with "software livre"
     And I press "Search"
     Then I should see "Noosfero" within "#search-results"
@@ -57,7 +57,7 @@ Feature: search communities
       | identifier | name            | category       |
       | linux      | Linux Community | software-livre |
     When I go to the search communities page
-    And I fill in "query" with "Linux"
+    And I fill in "search-input" with "Linux"
     And I press "Search"
     Then I should see "Temáticas" within "#facets-menu"
@@ -66,7 +66,7 @@ Feature: search communities
       | identifier | name                       |
       | luwac      | Linux Users Without a Clue |
     When I go to the search communities page
-    And I fill in "query" with "Linux Clue"
+    And I fill in "search-input" with "Linux Clue"
     And I press "Search"
     Then I should see "Linux Users Without a Clue" within "#search-results"
@@ -83,7 +83,7 @@ Feature: search communities
       | noos-dev   | Noosfero Developers | software-livre |
       | facebook   | Facebook Developers | big-brother    |
     When I go to the search communities page
-    And I fill in "query" with "Developers"
+    And I fill in "search-input" with "Developers"
     And I press "Search"
     And I follow "Software Livre" within "#facets-menu"
     Then I should see "Noosfero Developers" within "#search-results"
@@ -106,10 +106,10 @@ Feature: search communities
       | rails-dev  | Rails Developers    | other-category |
       | rails-usr  | Rails Users         | software-livre |
     When I go to the search communities page
-    And I fill in "query" with "Developers"
+    And I fill in "search-input" with "Developers"
     And I press "Search"
     And I follow "Software Livre" within "#facets-menu"
-    And I fill in "query" with "Rails"
+    And I fill in "search-input" with "Rails"
     And I press "Search"
     Then I should see "Rails Users" within "#search-results"
     And I should not see "Rails Developers"
@@ -26,7 +26,7 @@ Feature: search contents
     Then I should see "whales and dolphins" within ".search-text-article-item"
     And I should see "whales and dolphins" within ".only-one-result-box"
     And I should not see "bees and butterflies"
-    And I should see content inside ".icon-content-textile-article"
+    And The page should contain ".icon-content-textile-article"
     When I follow "whales and dolphins"
     Then I should be on article "whales and dolphins"
@@ -155,19 +155,19 @@ Feature: search contents
   Scenario: link to author on search results
     When I go to the search articles page
-    And I fill in "query" with "whales"
+    And I fill in "search-input" with "whales"
     And I press "Search"
     Then I should see "Author" within ".search-article-author"
     Then I should see "Joao Silva" within ".search-article-author-name"
     When I follow "Joao Silva"
-    Then I should be on Joao Silva's profile
+    Then I should be on joaosilva's profile
   Scenario: show clean description excerpt on search results
     Given the following articles
       | owner     | name        | body |
       | joaosilva | Herreninsel | The island    <b>Herreninsel</b>,    with an area of 238 hectares, is the biggest of the three main islands of the Chiemsee, a lake in the state of Bavaria, Germany. Together with the islands of Fraueninsel and Krautinsel it forms the municipality of Chiemsee. |
     When I go to the search articles page
-    And I fill in "query" with "island"
+    And I fill in "search-input" with "island"
     And I press "Search"
     Then I should see "Description" within ".search-article-description"
     And I should see "The island Herreninsel, with" within ".search-article-description"
@@ -178,7 +178,7 @@ Feature: search contents
       | owner     | name        | body |
       | joaosilva | Herreninsel |      |
     When I go to the search articles page
-    And I fill in "query" with "Herreninsel"
+    And I fill in "search-input" with "Herreninsel"
     And I press "Search"
     Then I should see "None" within ".search-article-description"
@@ -188,7 +188,7 @@ Feature: search contents
       | bees and butterflies | Hymenoptera |
       | bees and butterflies | Lepidoptera |
     When I go to the search articles page
-    And I fill in "query" with "bees"
+    And I fill in "search-input" with "bees"
     And I press "Search"
     Then I should see "Tags" within ".search-article-tags"
     And I should see "Hymenoptera" within ".search-article-tags"
@@ -198,7 +198,7 @@ Feature: search contents
   Scenario: show empty tags in search results
     When I go to the search articles page
-    And I fill in "query" with "dolphins"
+    And I fill in "search-input" with "dolphins"
     And I press "Search"
     Then I should see "None" within ".search-article-tags"
@@ -210,14 +210,14 @@ Feature: search contents
       | owner     | name           | body                       | category       |
       | joaosilva | Sergei Sorokin | Retired ice hockey player  | soviet |
     When I go to the search articles page
-    And I fill in "query" with "hockey"
+    And I fill in "search-input" with "hockey"
     And I press "Search"
     Then I should see "Categories" within ".search-article-categories"
     And I should see "Soviet" within ".search-article-category"
   Scenario: show empty categories on search results
     When I go to the search articles page
-    And I fill in "query" with "whales"
+    And I fill in "search-input" with "whales"
     And I press "Search"
     Then I should see "whales and dolphins"
     And I should see "None" within ".search-article-categories-container"
@@ -243,7 +243,7 @@ Feature: search contents
       | owner     | name           | body                    | category       |
       | joaosilva | using noosfero | noosfero is a great CMS | software-livre |
     When I go to the search articles page
-    And I fill in "query" with "Software"
+    And I fill in "search-input" with "Software"
     And I press "Search"
     Then I should see "using noosfero" within "#search-results"
     And I should not see "bees and butterflies"
@@ -255,7 +255,7 @@ Feature: search contents
       | joaosilva | JSilva blog |
     When I search contents for "JSilva"
     Then I should see "JSilva blog" within ".search-result-title"
-    And I should see content inside ".icon-content-blog"
+    And The page should contain ".icon-content-blog"
   Scenario: show and link last posts on blog search results
     Given the following blogs
@@ -286,7 +286,7 @@ Feature: search contents
   Scenario: see default facets when searching
     When I go to the search articles page
-    And I fill in "query" with "bees"
+    And I fill in "search-input" with "bees"
     And I press "Search"
     Then I should see "Type" within "#facets-menu"
     And I should see "Published date" within "#facets-menu"
@@ -295,7 +295,7 @@ Feature: search contents
   Scenario: find enterprises without exact query
     When I go to the search articles page
-    And I fill in "query" with "article bees"
+    And I fill in "search-input" with "article bees"
     And I press "Search"
     Then I should see "bees and butterflies" within "#search-results"
@@ -309,7 +309,7 @@ Feature: search contents
       | joaosilva | noosfero and debian | this is an article about noosfero and debian | software-livre |
       | joaosilva | facebook and 1984 | this is an article about facebook and 1984 | big-brother |
     When I go to the search articles page
-    And I fill in "query" with "this is an article"
+    And I fill in "search-input" with "this is an article"
     And I press "Search"
     #  Then show me the page
     And I follow "Software Livre" within "#facets-menu"
@@ -329,10 +329,10 @@ Feature: search contents
       | joaosilva | facebook and 1984 | this is an article about facebook and 1984 | big-brother |
       | joaosilva | facebook defense | facebook is not so bad | software-livre |
     When I go to the search articles page
-    And I fill in "query" with "this is an article"
+    And I fill in "search-input" with "this is an article"
     And I press "Search"
     And I follow "Software Livre" within "#facets-menu"
-    And I fill in "query" with "facebook"
+    And I fill in "search-input" with "facebook"
     And I press "Search"
     Then I should see "facebook defense" within "#search-results"
     And I should not see "1984"
@@ -14,6 +14,7 @@ Feature: search enterprises
       | Temáticas |
   Scenario: show recent enterprises on index
+    Given there are no pending jobs
     When I go to the search enterprises page
     Then I should see "Shoes shop" within "#search-results"
     And I should see Shoes shop's profile image
@@ -26,7 +27,7 @@ Feature: search enterprises
   Scenario: simple search for enterprise
     When I go to the search enterprises page
-    And I fill in "query" with "shoes"
+    And I fill in "search-input" with "shoes"
     And I press "Search"
     Then I should see "Shoes shop" within ".only-one-result-box"
     And I should see Shoes shop's profile image
@@ -36,7 +37,7 @@ Feature: search enterprises
   Scenario: link to enterprise homepage on search results
     Given I search enterprises for "shoes"
     When I follow "Shoes shop"
-    Then I should be on Shoes shop's profile
+    Then I should be on shop1's profile
   Scenario: show clean enterprise homepage on search results
     Given the following articles
@@ -56,13 +57,13 @@ Feature: search enterprises
   Scenario: see default facets when searching
     When I go to the search enterprises page
-    And I fill in "query" with "shoes"
+    And I fill in "search-input" with "shoes"
     And I press "Search"
     Then I should see "City" within "#facets-menu"
   Scenario: see category facets when searching
     When I go to the search enterprises page
-    And I fill in "query" with "shoes"
+    And I fill in "search-input" with "shoes"
     And I press "Search"
     Then I should see "Temáticas" within "#facets-menu"
@@ -74,7 +75,7 @@ Feature: search enterprises
       | identifier | name          | region           |
       | art-pp     | Artesanato PP | Pres. Prudente |
     When I go to the search enterprises page
-    And I fill in "query" with "Artesanato"
+    And I fill in "search-input" with "Artesanato"
     And I press "Search"
     Then I should see "Pres. Prudente" within "#facet-menu-f_region"
     And I should see ", SP" within "#facet-menu-f_region"
@@ -89,7 +90,7 @@ Feature: search enterprises
       | identifier | name          | region         |
       | art-pp     | Artesanato PP | Pres. Prudente |
     When I go to the search enterprises page
-    And I fill in "query" with "Prudente"
+    And I fill in "search-input" with "Prudente"
     And I press "Search"
     Then I should see "Artesanato PP" within "#search-results"
@@ -101,7 +102,7 @@ Feature: search enterprises
       | identifier | name     | category       |
       | noosfero   | Noosfero | software-livre |
     When I go to the search enterprises page
-    And I fill in "query" with "software"
+    And I fill in "search-input" with "software"
     And I press "Search"
     Then I should see "Noosfero" within "#search-results"
     And I should see "Software Livre" within ".search-enterprise-category"
@@ -123,7 +124,7 @@ Feature: search enterprises
       | identifier | name                            |
       | noosfero   | Noosfero Developers Association |
     When I go to the search enterprises page
-    And I fill in "query" with "Noosfero Association"
+    And I fill in "search-input" with "Noosfero Association"
     And I press "Search"
     Then I should see "Noosfero Developers Association" within "#search-results"
@@ -136,7 +137,7 @@ Feature: search enterprises
       | noosfero   | Noosfero Developers | software-livre |
       | facebook   | Facebook Developers |                |
     When I go to the search enterprises page
-    And I fill in "query" with "Developers"
+    And I fill in "search-input" with "Developers"
     And I press "Search"
     And I follow "Software Livre" within "#facets-menu"
     Then I should see "Noosfero Developers" within "#search-results"
@@ -155,10 +156,10 @@ Feature: search enterprises
       | rails-dev  | Rails Developers    |                |
       | rails-usr  | Rails Users         | software-livre |
     When I go to the search enterprises page
-    And I fill in "query" with "Developers"
+    And I fill in "search-input" with "Developers"
     And I press "Search"
     And I follow "Software Livre" within "#facets-menu"
-    And I fill in "query" with "Rails"
+    And I fill in "search-input" with "Rails"
     And I press "Search"
     Then I should see "Rails Users" within "#search-results"
     And I should not see "Rails Developers"
	@@ -3,7 +3,8 @@ class EnvironmentDesignController < BoxOrganizerController		@@ -3,7 +3,8 @@ class EnvironmentDesignController < BoxOrganizerController
3	protect 'edit_environment_design', :environment	3	protect 'edit_environment_design', :environment
4		4
5	def available_blocks	5	def available_blocks
6	- @available_blocks \|\|= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock ]	6	+ @available_blocks \|\|= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
		7	+ @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
7	end	8	end
8		9
9	end	10	end
	@@ -6,4 +6,21 @@ module BlockHelper		@@ -6,4 +6,21 @@ module BlockHelper
6	content_tag 'h3', content_tag('span', h(title)), :class => tag_class	6	content_tag 'h3', content_tag('span', h(title)), :class => tag_class
7	end	7	end
8		8
		9	+ def highlights_block_config_image_fields(block, image={})
		10	+ "
		11	+ <tr class=\"image-data-line\">
		12	+ <td>
		13	+ #{select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i).html_safe}
		14	+ </td>
		15	+ <td>#{text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 20}</td>
		16	+ <td>#{text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 1}</td>
		17	+ </tr><tr class=\"image-title\">
		18	+ <td colspan=\"3\"><label>#{
		19	+ content_tag('span', _('Title')) +
		20	+ text_field_tag('block[images][][title]', image[:title], :class => 'highlight-title', :size => 45)
		21	+ }</label></td>
		22	+ </tr>
		23	+ "
		24	+ end
		25	+
9	end	26	end
	@@ -36,7 +36,7 @@ module ContentViewerHelper		@@ -36,7 +36,7 @@ module ContentViewerHelper
36		36
37	def link_to_comments(article, args = {})	37	def link_to_comments(article, args = {})
38	return '' unless article.accept_comments?	38	return '' unless article.accept_comments?
39	- link_to(number_of_comments(article), article.url.merge(:anchor => 'comments_list') )	39	+ reference_to_article number_of_comments(article), article, 'comments_list'
40	end	40	end
41		41
42	def article_translations(article)	42	def article_translations(article)
	@@ -23,11 +23,13 @@ module DatesHelper		@@ -23,11 +23,13 @@ module DatesHelper
23	end	23	end
24		24
25	# formats a date for displaying.	25	# formats a date for displaying.
26	- def show_date(date, use_numbers = false)	26	+ def show_date(date, use_numbers = false, year=true)
27	if date && use_numbers	27	if date && use_numbers
28	- _('%{month}/%{day}/%{year}') % { :day => date.day, :month => date.month, :year => date.year }	28	+ date_format = year ? _('%{month}/%{day}/%{year}') : _('%{month}/%{day}')
		29	+ date_format % { :day => date.day, :month => date.month, :year => date.year }
29	elsif date	30	elsif date
30	- _('%{month} %{day}, %{year}') % { :day => date.day, :month => month_name(date.month), :year => date.year }	31	+ date_format = year ? _('%{month_name} %{day}, %{year}') : _('%{month_name} %{day}')
		32	+ date_format % { :day => date.day, :month_name => month_name(date.month), :year => date.year }
31	else	33	else
32	''	34	''
33	end	35	end
	@@ -46,7 +48,27 @@ module DatesHelper		@@ -46,7 +48,27 @@ module DatesHelper
46	if (date1 == date2) \|\| (date2.nil?)	48	if (date1 == date2) \|\| (date2.nil?)
47	show_date(date1, use_numbers)	49	show_date(date1, use_numbers)
48	else	50	else
49	- _('from %{date1} to %{date2}') % {:date1 => show_date(date1, use_numbers), :date2 => show_date(date2, use_numbers)}	51	+ if date1.year == date2.year
		52	+ if date1.month == date2.month
		53	+ _('from %{month} %{day1} to %{day2}, %{year}') % {
		54	+ :day1 => date1.day,
		55	+ :day2 => date2.day,
		56	+ :month => use_numbers ? date1.month : month_name(date1.month),
		57	+ :year => date1.year
		58	+ }
		59	+ else
		60	+ _('from %{date1} to %{date2}, %{year}') % {
		61	+ :date1 => show_date(date1, use_numbers, false),
		62	+ :date2 => show_date(date2, use_numbers, false),
		63	+ :year => date1.year
		64	+ }
		65	+ end
		66	+ else
		67	+ _('from %{date1} to %{date2}') % {
		68	+ :date1 => show_date(date1, use_numbers),
		69	+ :date2 => show_date(date2, use_numbers)
		70	+ }
		71	+ end
50	end	72	end
51	end	73	end
52		74
	@@ -142,38 +142,6 @@ module FormsHelper		@@ -142,38 +142,6 @@ 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	-
177	def date_field(name, value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})	145	def date_field(name, value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
178	datepicker_options[:disabled] \|\|= false	146	datepicker_options[:disabled] \|\|= false
179	datepicker_options[:alt_field] \|\|= ''	147	datepicker_options[:alt_field] \|\|= ''
	@@ -295,23 +263,28 @@ module FormsHelper		@@ -295,23 +263,28 @@ module FormsHelper
295	field_id,	263	field_id,
296	options_for_select(	264	options_for_select(
297	[[root, '']] +	265	[[root, '']] +
298	- collection.collect {\|f\| [ root + '/' + f.full_name, f.id ] },
299	- default_value	266	+ collection.collect {\|f\| [ root + '/' + f.full_name, f.id.to_s ] },
		267	+ default_value.to_s
300	),	268	),
301	html_options.merge(js_options)	269	html_options.merge(js_options)
302	)	270	)
303	)	271	)
304	end	272	end
305		273
306	- def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {})	274	+ def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {}, find_options = {})
		275	+ if find_options.empty?
		276	+ folders = profile.folders
		277	+ else
		278	+ folders = profile.folders.where(find_options)
		279	+ end
307	result = labelled_form_field(	280	result = labelled_form_field(
308	label_text,	281	label_text,
309	select_tag(	282	select_tag(
310	field_id,	283	field_id,
311	options_for_select(	284	options_for_select(
312	[[profile.identifier, '']] +	285	[[profile.identifier, '']] +
313	- profile.folders.collect {\|f\| [ profile.identifier + '/' + f.full_name, f.id ] },
314	- default_value	286	+ folders.collect {\|f\| [ profile.identifier + '/' + f.full_name, f.id.to_s ] },
		287	+ default_value.to_s
315	),	288	),
316	html_options.merge(js_options)	289	html_options.merge(js_options)
317	)	290	)
@@ -0,0 +1,88 @@		@@ -0,0 +1,88 @@
	1	+module LayoutHelper
	2	+
	3	+ def body_classes
	4	+ # Identify the current controller and action for the CSS:
	5	+ " controller-#{@controller.controller_name}" +
	6	+ " action-#{@controller.controller_name}-#{@controller.action_name}" +
	7	+ " template-#{profile.nil? ? "default" : profile.layout_template}" +
	8	+ (!profile.nil? && profile.is_on_homepage?(request.path,@page) ? " profile-homepage" : "")
	9	+ end
	10	+
	11	+ def noosfero_javascript
	12	+ plugins_javascripts = @plugins.map { \|plugin\| plugin.js_files.map { \|js\| plugin.class.public_path(js) } }.flatten
	13	+
	14	+ output = ''
	15	+ output += render :file => 'layouts/_javascript'
	16	+ output += javascript_tag 'render_all_jquery_ui_widgets()'
	17	+ unless plugins_javascripts.empty?
	18	+ output += javascript_include_tag plugins_javascripts, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_javascripts.to_s}"
	19	+ end
	20	+ output
	21	+ end
	22	+
	23	+ def noosfero_stylesheets
	24	+ standard_stylesheets = [
	25	+ 'application',
	26	+ 'search',
	27	+ 'thickbox',
	28	+ 'lightbox',
	29	+ 'colorpicker',
	30	+ 'colorbox',
	31	+ pngfix_stylesheet_path,
	32	+ ] + tokeninput_stylesheets
	33	+ plugins_stylesheets = @plugins.select(&:stylesheet?).map { \|plugin\| plugin.class.public_path('style.css') }
	34	+
	35	+ output = ''
	36	+ output += stylesheet_link_tag standard_stylesheets, :cache => 'cache'
	37	+ output += stylesheet_link_tag template_stylesheet_path
	38	+ output += stylesheet_link_tag icon_theme_stylesheet_path
	39	+ output += stylesheet_link_tag jquery_ui_theme_stylesheet_path
	40	+ unless plugins_stylesheets.empty?
	41	+ output += stylesheet_link_tag plugins_stylesheets, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_stylesheets.to_s}"
	42	+ end
	43	+ output += stylesheet_link_tag theme_stylesheet_path
	44	+ output
	45	+ end
	46	+
	47	+ def pngfix_stylesheet_path
	48	+ 'iepngfix/iepngfix.css'
	49	+ end
	50	+
	51	+ def tokeninput_stylesheets
	52	+ ['token-input', 'token-input-facebook', 'token-input-mac', 'token-input-facet']
	53	+ end
	54	+
	55	+ def noosfero_layout_features
	56	+ render :file => 'shared/noosfero_layout_features'
	57	+ end
	58	+
	59	+ def template_stylesheet_path
	60	+ if profile.nil?
	61	+ "/designs/templates/#{environment.layout_template}/stylesheets/style.css"
	62	+ else
	63	+ "/designs/templates/#{profile.layout_template}/stylesheets/style.css"
	64	+ end
	65	+ end
	66	+
	67	+ def icon_theme_stylesheet_path
	68	+ icon_themes = []
	69	+ theme_icon_themes = theme_option(:icon_theme) \|\| []
	70	+ for icon_theme in theme_icon_themes do
	71	+ theme_path = "/designs/icons/#{icon_theme}/style.css"
	72	+ if File.exists?(File.join(RAILS_ROOT, 'public', theme_path))
	73	+ icon_themes << theme_path
	74	+ end
	75	+ end
	76	+ icon_themes
	77	+ end
	78	+
	79	+ def jquery_ui_theme_stylesheet_path
	80	+ 'jquery.ui/' + jquery_theme + '/jquery-ui-1.8.2.custom'
	81	+ end
	82	+
	83	+ def theme_stylesheet_path
	84	+ theme_path + '/style.css'
	85	+ end
	86	+
	87	+end
	88	+
	@@ -12,7 +12,11 @@ class ArticleBlock < Block		@@ -12,7 +12,11 @@ class ArticleBlock < Block
12	block = self	12	block = self
13	lambda do	13	lambda do
14	block_title(block.title) +	14	block_title(block.title) +
15	- (block.article ? article_to_html(block.article, :gallery_view => false).html_safe : _('Article not selected yet.'))	15	+ (block.article ? article_to_html(block.article,
		16	+ :gallery_view => false,
		17	+ :inside_block => block, # For Blogs and folders
		18	+ :format => block.visualization_format # For Articles and contents
		19	+ ).html_safe : _('Article not selected yet.'))
16	end	20	end
17	end	21	end
18		22
	@@ -49,4 +53,14 @@ class ArticleBlock < Block		@@ -49,4 +53,14 @@ class ArticleBlock < Block
49	self.box.owner.kind_of?(Environment) ? self.box.owner.portal_community.articles : self.box.owner.articles	53	self.box.owner.kind_of?(Environment) ? self.box.owner.portal_community.articles : self.box.owner.articles
50	end	54	end
51		55
		56	+ def posts_per_page
		57	+ self.settings[:posts_per_page] or 1
		58	+ end
		59	+
		60	+ def posts_per_page= value
		61	+ value = value.to_i
		62	+ self.settings[:posts_per_page] = value if value > 0
		63	+ end
		64	+
		65	+ settings_items :visualization_format, :type => :string, :default => 'short'
52	end	66	end
	@@ -185,4 +185,8 @@ class Enterprise < Organization		@@ -185,4 +185,8 @@ class Enterprise < Organization
185	Scrap.find_by_sql("SELECT id, updated_at, 'Scrap' AS klass FROM scraps WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, 'ActionTracker::Record' AS klass FROM action_tracker WHERE action_tracker.target_id = #{self.id} UNION SELECT action_tracker.id, action_tracker.updated_at, 'ActionTracker::Record' AS klass FROM action_tracker INNER JOIN articles ON action_tracker.target_id = articles.id WHERE articles.profile_id = #{self.id} AND action_tracker.target_type = 'Article' ORDER BY action_tracker.updated_at DESC")	185	Scrap.find_by_sql("SELECT id, updated_at, 'Scrap' AS klass FROM scraps WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, 'ActionTracker::Record' AS klass FROM action_tracker WHERE action_tracker.target_id = #{self.id} UNION SELECT action_tracker.id, action_tracker.updated_at, 'ActionTracker::Record' AS klass FROM action_tracker INNER JOIN articles ON action_tracker.target_id = articles.id WHERE articles.profile_id = #{self.id} AND action_tracker.target_type = 'Article' ORDER BY action_tracker.updated_at DESC")
186	end	186	end
187		187
		188	+ def catalog_url
		189	+ { :profile => identifier, :controller => 'catalog'}
		190	+ end
		191	+
188	end	192	end
	@@ -5,7 +5,7 @@		@@ -5,7 +5,7 @@
5	<% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do \|f\| %>	5	<% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do \|f\| %>
6		6
7	<%= f.text_field :login,	7	<%= f.text_field :login,
8	- :onchange => 'this.value = convToValidLogin( this.value )' %>	8	+ :onchange => 'this.value = convToValidUsername( this.value )' %>
9		9
10	<%= f.text_field :email %>	10	<%= f.text_field :email %>
11		11
	@@ -4,7 +4,7 @@		@@ -4,7 +4,7 @@
4		4
5	<%= render :file => 'shared/tiny_mce' %>	5	<%= render :file => 'shared/tiny_mce' %>
6		6
7	-<% labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do \|f\| %>	7	+<% labelled_form_for :environment, @environment do \|f\| %>
8	<% tabs = [] %>	8	<% tabs = [] %>
9	<% tabs << {:title => _('Site info'), :id => 'site-info',	9	<% tabs << {:title => _('Site info'), :id => 'site-info',
10	:content => (render :partial => 'site_info', :locals => {:f => f})} %>	10	:content => (render :partial => 'site_info', :locals => {:f => f})} %>