Merge branch 'master' into oauth_rails3

Victor Costa
2 parents 6cc86ce6 debcfb2a
Showing 716 changed files with 11187 additions and 55690 deletions Show diff stats
AUTHORS.md
Gemfile
INSTALL.md
app/controllers/public/account_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/profile_controller.rb
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/profile_helper.rb
app/helpers/sweeper_helper.rb
app/helpers/tinymce_helper.rb
app/models/article.rb
app/models/block.rb
app/models/community.rb
app/models/enterprise.rb
app/models/environment.rb
app/models/external_feed.rb
app/models/link_list_block.rb
app/models/organization.rb
@@ -198,6 +198,7 @@ Martín Olivera &lt;molivera@solar.org.ar&gt;
 Moises Machado <moises@colivre.coop.br>
 Naíla Alves <naila@colivre.coop.br>
 Nanda Lopes <nanda.listas+psl@gmail.com>
+Parley Martins <parleypachecomartins@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>
@@ -18,6 +18,7 @@ gem &#39;rake&#39;, :require =&gt; false
 gem 'rest-client',              '~> 1.6.7'
 gem 'exception_notification',   '~> 4.0.1'
 gem 'gettext',                  '~> 2.2.1', :require => false, :group => :development
+gem 'locale',                   '~> 2.0.5'
  
 # FIXME list here all actual dependencies (i.e. the ones in debian/control),
 # with their GEM names (not the Debian package names)
@@ -40,8 +41,9 @@ group :cucumber do
   gem 'selenium-webdriver',     '~> 2.39.0'
 end
  
-# include plugin gemfiles
-Dir.glob(File.join('config', 'plugins', '*')).each do |plugin|
-  plugin_gemfile = File.join(plugin, 'Gemfile')
-  eval File.read(plugin_gemfile) if File.exists?(plugin_gemfile)
+# include gemfiles from enabled plugins
+# plugins in baseplugins/ are not included on purpose. They should not have any
+# dependencies.
+Dir.glob('config/plugins/*/Gemfile').each do |gemfile|
+  eval File.read(gemfile)
 end
@@ -186,8 +186,8 @@ Apache instalation
  
     # apt-get install apache2
  
-Apache configuration
---------------------
+Configuration - noosfero at /
+-----------------------------
  
 First you have to enable the following some apache modules:
  
@@ -257,6 +257,62 @@ Now restart your apache server (as root):
  
     # invoke-rc.d apache2 restart
  
+Configuration - noosfero at a /subdirectory
+-------------------------------------------
+
+This section describes how to configure noosfero at a subdirectory, what is
+specially useful when you want Noosfero to share a domain name with other
+applications. For example you can host noosfero at yourdomain.com/social, a
+webmail application at yourdomain.com/webmail, and have a static HTML website
+at yourdomain.com/.
+
+**NOTE:** Some plugins might not work well with this setting. Before deploying
+this setting, make sure you test that everything  you need works properly with
+it.
+
+The configuration is similar to the main configuration instructions, except for
+the following points. In the description below, replace '/subdirectory' with
+the actual subdirectory you want.
+
+1) add a `prefix: /subdirectory` line to your thin configuration file (thin.yml).
+
+1.1) remember to restart the noosfero application server whenever you make
+changes to that configuration file.
+
+    # service noosfero restart
+
+2) add a line saying `export RAILS_RELATIVE_URL_ROOT=/subdirectory` to
+/etc/default/noosfero (you can create it with just this line if it does not
+exist already).
+
+3) You should add the following apache configuration to an existing virtual
+host (plus the `<Proxy balancer://noosfero>` section as displayed above):
+
+```
+Alias /subdirectory /path/to/noosfero/public
+<Directory "/path/to/noosfero/public">
+  Options FollowSymLinks
+  AllowOverride None
+  Order Allow,Deny
+  Allow from all
+
+  Include /path/to/noosfero/etc/noosfero/apache/cache.conf
+
+  RewriteEngine On
+  RewriteBase /subdirectory
+  # Rewrite index to check for static index.html
+  RewriteRule ^$ index.html [QSA]
+  # Rewrite to check for Rails cached page
+  RewriteRule ^([^.]+)$ $1.html [QSA]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteRule ^(.*)$ http://localhost:3000%{REQUEST_URI} [P,QSA,L]
+</Directory>
+```
+
+3.1) remember to reload the apache server whenever any apache configuration
+file changes.
+
+    # sudo service apache2 reload
  
 Enabling exception notifications
 ================================
@@ -193,7 +193,7 @@ class AccountController &lt; ApplicationController
         else
           @change_password.errors[:base] << _('Could not find any user with %s equal to "%s".') % [fields_label, params[:value]]
         end
-      rescue ActiveRecord::RecordInvald
+      rescue ActiveRecord::RecordInvalid
         @change_password.errors[:base] << _('Could not perform password recovery for the user.')
       end
     end
@@ -126,7 +126,7 @@ class ContentViewerController &lt; ApplicationController
     elsif !@page.display_to?(user)
       if !profile.public?
         private_profile_partial_parameters
-        render :template => 'profile/_private_profile', :status => 403
+        render :template => 'profile/_private_profile', :status => 403, :formats => [:html]
         allowed = false
       else #if !profile.visible?
         render_access_denied
@@ -17,7 +17,11 @@ class ProfileController &lt; PublicController
     end
     @tags = profile.article_tags
     unless profile.display_info_to?(user)
-      profile.visible? ? private_profile : invisible_profile
+      if profile.visible?
+        private_profile
+      else
+        invisible_profile
+      end
     end
   end
  
@@ -315,7 +319,7 @@ class ProfileController &lt; PublicController
         abuse_report = AbuseReport.new(params[:abuse_report])
         if !params[:content_type].blank?
           article = params[:content_type].constantize.find(params[:content_id])
-          abuse_report.content = instance_eval(&article.reported_version)
+          abuse_report.content = article_reported_version(article)
         end
  
         user.register_report(abuse_report, profile)
@@ -394,6 +398,7 @@ class ProfileController &lt; PublicController
  
   def private_profile
     private_profile_partial_parameters
+    render :action => 'index', :status => 403
   end
  
   def invisible_profile
@@ -90,10 +90,14 @@ class SearchController &lt; PublicController
   end
  
   def events
-    year = (params[:year] ? params[:year].to_i : Date.today.year)
-    month = (params[:month] ? params[:month].to_i : Date.today.month)
-    day = (params[:day] ? params[:day].to_i : Date.today.day)
-    @date = build_date(year, month, day)
+    if params[:year].blank? && params[:year].blank? && params[:day].blank?
+      @date = Date.today
+    else
+      year = (params[:year] ? params[:year].to_i : Date.today.year)
+      month = (params[:month] ? params[:month].to_i : Date.today.month)
+      day = (params[:day] ? params[:day].to_i : 1)
+      @date = build_date(year, month, day)
+    end
     date_range = (@date - 1.month).at_beginning_of_month..(@date + 1.month).at_end_of_month
  
     @events = []
@@ -304,7 +304,7 @@ module ApplicationHelper
   def partial_for_class(klass, prefix=nil, suffix=nil)
     raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
     name = klass.name.underscore
-    controller.view_paths.reverse_each do |view_path|
+    controller.view_paths.each do |view_path|
       partial = partial_for_class_in_view_path(klass, view_path, prefix, suffix)
       return partial if partial
     end
@@ -1377,7 +1377,7 @@ module ApplicationHelper
       #     are old things that do not support it we are keeping this hot spot.
       html = @plugins.pipeline(:parse_content, html, source).first
     end
-    html
+    html && html.html_safe
   end
  
   def convert_macro(html, source)
@@ -3,6 +3,12 @@ module ArticleHelper
   include PrototypeHelper
   include TokenHelper
  
+  def article_reported_version(article)
+    search_path = Rails.root.join('app', 'views', 'shared', 'reported_versions')
+    partial_path = File.join('shared', 'reported_versions', 'profile', partial_for_class_in_view_path(article.class, search_path))
+    render_to_string(:partial => partial_path, :locals => {:article => article})
+  end
+
   def custom_options_for_article(article, tokenized_children)
     @article = article
  
 module ProfileHelper
  
-  def display_field(title, profile, field, force = false)
+  COMMON_CATEGORIES = ActiveSupport::OrderedHash.new
+  COMMON_CATEGORIES[:content] = [:blogs, :image_galleries, :events, :article_tags]
+  COMMON_CATEGORIES[:interests] = [:interests]
+  COMMON_CATEGORIES[:general] = nil
+
+  PERSON_CATEGORIES = ActiveSupport::OrderedHash.new
+  PERSON_CATEGORIES[:basic_information] = [:nickname, :sex, :birth_date, :location, :privacy_setting, :created_at]
+  PERSON_CATEGORIES[:contact] = [:contact_phone, :cell_phone, :comercial_phone, :contact_information, :email, :personal_website, :jabber_id]
+  PERSON_CATEGORIES[:location] = [:address, :address_reference, :zip_code, :city, :state, :district, :country, :nationality]
+  PERSON_CATEGORIES[:work] = [:organization, :organization_website, :professional_activity]
+  PERSON_CATEGORIES[:study] = [:schooling, :formation, :area_of_study]
+  PERSON_CATEGORIES[:network] = [:friends, :communities, :enterprises]
+  PERSON_CATEGORIES.merge!(COMMON_CATEGORIES)
+
+  ORGANIZATION_CATEGORIES = ActiveSupport::OrderedHash.new
+  ORGANIZATION_CATEGORIES[:basic_information] = [:display_name, :created_at, :foundation_year, :type, :language, :members_count, :location, :address_reference, :historic_and_current_context, :admins]
+  ORGANIZATION_CATEGORIES[:contact] = [:contact_person, :contact_phone, :contact_email, :organization_website, :jabber_id]
+  ORGANIZATION_CATEGORIES[:economic] = [:business_name, :acronym, :economic_activity, :legal_form, :products, :activities_short_description, :management_information]
+  ORGANIZATION_CATEGORIES.merge!(COMMON_CATEGORIES)
+
+  CATEGORY_MAP = ActiveSupport::OrderedHash.new
+  CATEGORY_MAP[:person] = PERSON_CATEGORIES
+  CATEGORY_MAP[:organization] = ORGANIZATION_CATEGORIES
+
+  FORCE = {
+    :person => [:privacy_setting],
+    :organization => [:privacy_setting, :location],
+  }
+
+  MULTIPLE = {
+    :person => [:blogs, :image_galleries, :interests],
+    :organization => [:blogs, :image_galleries, :interests],
+  }
+
+  CUSTOM_LABELS = {
+    :zip_code => _('ZIP code'),
+    :email => _('e-Mail'),
+    :jabber_id => _('Jabber'),
+    :birth_date => _('Date of birth'),
+    :created_at => _('Profile created at'),
+    :members_count => _('Members'),
+    :privacy_setting => _('Privacy setting'),
+    :article_tags => _('Tags')
+  }
+
+  EXCEPTION = {
+    :person => [:image, :preferred_domain, :description, :tag_list],
+    :organization => [:image, :preferred_domain, :description, :tag_list, :address, :zip_code, :city, :state, :country, :district]
+  }
+
+  def general_fields
+    categorized_fields = CATEGORY_MAP[kind].values.flatten
+    profile.class.fields.map(&:to_sym) - categorized_fields - EXCEPTION[kind]
+  end
+
+  def kind
+    if profile.kind_of?(Person)
+      :person
+    else
+      :organization
+    end
+  end
+
+  def title(field, entry = nil)
+    return self.send("#{field}_custom_title", entry) if MULTIPLE[kind].include?(field) && entry.present?
+    CUSTOM_LABELS[field.to_sym] || _(field.to_s.humanize)
+  end
+
+  def display_field(field)
+    force = FORCE[kind].include?(field)
+    multiple = MULTIPLE[kind].include?(field)
     unless force || profile.may_display_field_to?(field, user)
       return ''
     end
-    value = profile.send(field)
-    if !value.blank?
-      if block_given?
-        value = yield(value)
-      end
-      content_tag('tr', content_tag('td', title, :class => 'field-name') + content_tag('td', value))
+    value = begin profile.send(field) rescue nil end
+    return '' if value.blank?
+    if value.kind_of?(Hash)
+      content = self.send("treat_#{field}", value)
+      content_tag('tr', content_tag('td', title(field), :class => 'field-name') + content_tag('td', content))
     else
-      ''
+      entries = multiple ? value : [] << value
+      entries.map do |entry|
+        content = self.send("treat_#{field}", entry)
+        unless content.blank?
+          content_tag('tr', content_tag('td', title(field, entry), :class => 'field-name') + content_tag('td', content))
+        end
+      end.join("\n")
     end
   end
  
-  def display_contact(profile)
-    fields = []
-    fields << display_field(_('Address:'), profile, :address).html_safe
-    fields << display_field(_('ZIP code:'), profile, :zip_code).html_safe
-    fields << display_field(_('Contact phone:'), profile, :contact_phone).html_safe
-    fields << display_field(_('e-Mail:'), profile, :email) { |email| link_to_email(email) }.html_safe
-    fields << display_field(_('Personal website:'), profile, :personal_website).html_safe
-    fields << display_field(_('Jabber:'), profile, :jabber_id).html_safe
-    if fields.reject!(&:blank?).empty?
-      ''
-    else
-      content_tag('tr', content_tag('th', _('Contact'), { :colspan => 2 })) + fields.join.html_safe
+  def treat_email(email)
+    link_to_email(email)
+  end
+
+  def treat_organization_website(url)
+    link_to(url, url)
+  end
+
+  def treat_sex(gender)
+    { 'male' => _('Male'), 'female' => _('Female') }[gender]
+  end
+
+  def treat_date(date)
+    show_date(date.to_date)
+  end
+  alias :treat_birth_date :treat_date
+  alias :treat_created_at :treat_date
+
+  def treat_friends(friends)
+     link_to friends.count, :controller => 'profile', :action => 'friends'
+  end
+
+  def treat_communities(communities)
+    link_to communities.count, :controller => "profile", :action => 'communities'
+  end
+
+  def treat_enterprises(enterprises)
+    if environment.disabled?('disable_asset_enterprises')
+      link_to enterprises.count, :controller => "profile", :action => 'enterprises'
+    end
+  end
+
+  def treat_members_count(count)
+    link_to count, :controller => 'profile', :action => 'members'
+  end
+
+  def treat_products(products)
+    if profile.kind_of?(Enterprise) && profile.environment.enabled?('products_for_enterprises')
+      link_to _('Products/Services'), :controller => 'catalog', :action => 'index'
     end
   end
  
-  def display_work_info(profile)
-    organization = display_field(_('Organization:'), profile, :organization)
-    organization_site = display_field(_('Organization website:'), profile, :organization_website) { |url| link_to(url, url) }
-    if organization.blank? && organization_site.blank?
-      ''
+  def treat_admins(admins)
+    profile.admins.map { |admin| link_to(admin.short_name, admin.url)}.join(', ')
+  end
+
+  def treat_blogs(blog)
+    link_to(n_('One post', '%{num} posts', blog.posts.published.count) % { :num => blog.posts.published.count }, blog.url)
+  end
+
+  def treat_image_galleries(gallery)
+    link_to(n_('One picture', '%{num} pictures', gallery.images.published.count) % { :num => gallery.images.published.count }, gallery.url)
+  end
+
+  def treat_events(events)
+    link_to events.published.count, :controller => 'events', :action => 'events'
+  end
+
+  def treat_article_tags(tags)
+    tag_cloud @tags, :id, { :action => 'tags' }, :max_size => 18, :min_size => 10
+  end
+
+  def treat_interests(interest)
+    link_to interest.name, :controller => 'search', :action => 'category_index', :category_path => interest.explode_path
+  end
+
+  def article_custom_title(article)
+    article.name
+  end
+  alias :blogs_custom_title :article_custom_title
+  alias :image_galleries_custom_title :article_custom_title
+
+  def interests_custom_title(interest)
+    ''
+  end
+
+  def method_missing(method, *args, &block)
+    if method.to_s =~ /^treat_(.+)$/
+      args[0]
+    elsif method.to_s =~ /^display_(.+)$/ && CATEGORY_MAP[kind].has_key?($1.to_sym)
+      category = $1.to_sym
+      fields = category == :general ? general_fields : CATEGORY_MAP[kind][category]
+      contents = []
+
+      fields.each do |field|
+        contents << display_field(field).html_safe
+      end
+
+      contents = contents.delete_if(&:blank?)
+
+      unless contents.empty?
+        content_tag('tr', content_tag('th', title(category), { :colspan => 2 })) + contents.join.html_safe
+      else
+        ''
+      end
     else
-      content_tag('tr', content_tag('th', _('Work'), { :colspan => 2 })) + organization + organization_site
+      super
     end
   end
  
@@ -56,12 +56,12 @@ module SweeperHelper
     if profile
       profile.blocks.each {|block|
         conditions = block.class.expire_on
-        blocks_to_expire << block unless (conditions[:profile] & causes).empty?
+        blocks_to_expire << block unless (conditions[:profile] & causes).blank?
       }
     end
     environment.blocks.each {|block|
       conditions = block.class.expire_on
-      blocks_to_expire << block unless (conditions[:environment] & causes).empty?
+      blocks_to_expire << block unless (conditions[:environment] & causes).blank?
     }
  
     blocks_to_expire.uniq!
@@ -0,0 +1,51 @@
+module TinymceHelper
+  include MacrosHelper
+
+  def tinymce_js
+    output = ''
+    output += javascript_include_tag 'tinymce/js/tinymce/tinymce.min.js'
+    output += javascript_include_tag 'tinymce/js/tinymce/jquery.tinymce.min.js'
+    output += javascript_include_tag 'tinymce.js'
+    output += include_macro_js_files.to_s
+    output
+  end
+
+  def tinymce_init_js options = {}
+    options.merge! :document_base_url => environment.top_url,
+      :content_css => "/stylesheets/tinymce.css,#{macro_css_files}",
+      :plugins => %w[compat3x advlist autolink lists link image charmap print preview hr anchor pagebreak
+        searchreplace wordcount visualblocks visualchars code fullscreen
+        insertdatetime media nonbreaking save table contextmenu directionality
+        emoticons template paste textcolor colorpicker textpattern],
+      :language => tinymce_language
+
+    options[:toolbar1] = "insertfile undo redo | copy paste | bold italic underline | styleselect fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image"
+    if options[:mode] == 'simple'
+      options[:menubar] = false
+    else
+      options[:menubar] = 'edit insert view tools'
+      options[:toolbar2] = 'print preview code media | table'
+
+      options[:toolbar2] += ' | macros'
+      macros_with_buttons.each do |macro|
+        options[:toolbar2] += " #{macro.identifier}"
+      end
+    end
+
+    options[:macros_setup] = macros_with_buttons.map do |macro|
+      <<-EOS
+        ed.addButton('#{macro.identifier}', {
+          title: #{macro_title(macro).to_json},
+          onclick: #{generate_macro_config_dialog macro},
+          image : '#{macro.configuration[:icon_path]}'
+        });
+      EOS
+    end
+
+    #cleanup non tinymce options
+    options = options.except :mode
+
+    "noosfero.tinymce.init(#{options.to_json})"
+  end
+
+end
@@ -285,13 +285,6 @@ class Article &lt; ActiveRecord::Base
     end
   end
  
-  def reported_version(options = {})
-    article = self
-    search_path = Rails.root.join('app', 'views', 'shared', 'reported_versions')
-    partial_path = File.join('shared', 'reported_versions', partial_for_class_in_view_path(article.class, search_path))
-    lambda { render_to_string(:partial => partial_path, :locals => {:article => article}) }
-  end
-
   # returns the data of the article. Must be overriden in each subclass to
   # provide the correct content for the article.
   def data
@@ -192,7 +192,7 @@ class Block &lt; ActiveRecord::Base
  
   # Override in your subclasses.
   # Define which events and context should cause the block cache to expire
-  # Possible events are: :article, :profile, :friendship, :category
+  # Possible events are: :article, :profile, :friendship, :category, :role_assignment
   # Possible contexts are: :profile, :environment
   def self.expire_on
     {
@@ -234,4 +234,9 @@ class Block &lt; ActiveRecord::Base
     duplicated_block
   end
  
+  def copy_from(block)
+    self.settings = block.settings
+    self.position = block.position
+  end
+
 end
@@ -50,16 +50,6 @@ class Community &lt; Organization
     super + FIELDS
   end
  
-  validate :presence_of_required_fieds
-
-  def presence_of_required_fieds
-    self.required_fields.each do |field|
-      if self.send(field).blank?
-        self.errors.add_on_blank(field)
-      end
-    end
-  end
-
   def active_fields
     environment ? environment.active_community_fields : []
   end
@@ -59,16 +59,6 @@ class Enterprise &lt; Organization
     super + FIELDS
   end
  
-  validate :presence_of_required_fieds
-
-  def presence_of_required_fieds
-    self.required_fields.each do |field|
-      if self.send(field).blank?
-        self.errors.add_on_blank(field)
-      end
-    end
-  end
-
   def active_fields
     environment ? environment.active_enterprise_fields : []
   end
@@ -660,6 +660,7 @@ class Environment &lt; ActiveRecord::Base
     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 << Noosfero.root('')
     url
   end
  
@@ -13,6 +13,7 @@ class ExternalFeed &lt; ActiveRecord::Base
   attr_accessible :address, :enabled
  
   def add_item(title, link, date, content)
+    return if content.blank?
     doc = Hpricot(content)
     doc.search('*').each do |p|
       if p.instance_of? Hpricot::Elem
@@ -78,8 +78,13 @@ class LinkListBlock &lt; Block
       address
     end
     if add !~ /^[a-z]+:\/\// && add !~ /^\//
-      'http://' + add
+      '//' + add
     else
+      if root = Noosfero.root
+        if !add.starts_with?(root)
+          add = root + add
+        end
+      end
       add
     end
   end
@@ -96,4 +101,5 @@ class LinkListBlock &lt; Block
     sanitizer = HTML::WhiteListSanitizer.new
     sanitizer.sanitize(text)
   end
+
 end
@@ -30,6 +30,16 @@ class Organization &lt; Profile
  
   scope :more_popular, :order => 'members_count DESC'
  
+  validate :presence_of_required_fieds, :unless => :is_template
+
+  def presence_of_required_fieds
+    self.required_fields.each do |field|
+      if self.send(field).blank?
+        self.errors.add_on_blank(field)
+      end
+    end
+  end
+
   def validation_methodology
     self.validation_info ? self.validation_info.validation_methodology : nil
   end
@@ -161,7 +161,7 @@ class Person &lt; Profile
     FIELDS
   end
  
-  validate :presence_of_required_fields
+  validate :presence_of_required_fields, :unless => :is_template
  
   def presence_of_required_fields
     self.required_fields.each do |field|
@@ -346,16 +346,17 @@ class Profile &lt; ActiveRecord::Base
   end
  
   def copy_blocks_from(profile)
+    template_boxes = profile.boxes.select{|box| box.position}
     self.boxes.destroy_all
-    profile.boxes.each do |box|
-      new_box = Box.new
+    self.boxes = template_boxes.size.times.map { Box.new }
+
+    template_boxes.each_with_index do |box, i|
+      new_box = self.boxes[i]
       new_box.position = box.position
-      self.boxes << new_box
       box.blocks.each do |block|
         new_block = block.class.new(:title => block[:title])
-        new_block.settings = block.settings
-        new_block.position = block.position
-        self.boxes[-1].blocks << new_block
+        new_block.copy_from(block)
+        new_box.blocks << new_block
       end
     end
   end
@@ -285,8 +285,9 @@ class Task &lt; ActiveRecord::Base
   # If
   def send_notification(action)
     if sends_email?
-      if self.requestor
-         TaskMailer.generic_message("task_#{action}", self)
+      if self.requestor && !self.requestor.notification_emails.empty?
+        message = TaskMailer.generic_message("task_#{action}", self)
+        message.deliver if message
       end
     end
   end
@@ -13,20 +13,22 @@ class RoleAssignmentSweeper &lt; ActiveRecord::Observer
 protected
  
   def expire_caches(role_assignment)
-    expire_cache(role_assignment.accessor)
-    expire_cache(role_assignment.resource) if role_assignment.resource.respond_to?(:cache_keys)
+    expire_cache(role_assignment.accessor) if role_assignment.accessor.kind_of?(Profile)
+    expire_cache(role_assignment.resource) if role_assignment.resource.kind_of?(Profile)
   end
  
   def expire_cache(profile)
     per_page = Noosfero::Constants::PROFILE_PER_PAGE
-    profile.cache_keys(:per_page => per_page).each { |ck|
-      expire_timeout_fragment(ck)
-    }
+
+    profile.cache_keys(:per_page => per_page).each { |ck| expire_timeout_fragment(ck) }
+    expire_timeout_fragment(profile.members_cache_key(:per_page => per_page))
  
     profile.blocks_to_expire_cache.each { |block|
       blocks = profile.blocks.select{|b| b.kind_of?(block)}
       BlockSweeper.expire_blocks(blocks)
     }
+
+    expire_blocks_cache(profile, [:role_assignment])
   end
  
 end
@@ -13,8 +13,8 @@
                 date.day,
                 :url => {:action => 'events_by_day', :year => date.year, :month => date.month, :day => date.day, :category_id => @category_id},
                 :update => 'events-of-the-day',
-                :loading => '$("events-of-the-day").addClassName("loading")',
-                :complete => '$("events-of-the-day").removeClassName("loading")'
+                :loading => "$('events-of-the-day').addClassName('loading')",
+                :complete => "$('events-of-the-day').removeClassName('loading')"
               ) :
               date.day
             %>
@@ -19,6 +19,9 @@
     <meta property="og:site_name" content="<%= profile ? profile.name : @environment.name %>">
     <meta property="og:description" content="<%= @page ? truncate(strip_tags(@page.body.to_s), :length => 200) : @environment.name %>">
  
+    <!-- site root -->
+    <meta property="noosfero:root" content="<%= Noosfero.root %>"/>
+
     <% if @page %>
       <meta property="article:published_time" content="<%= show_date(@page.published_at) %>">
       <% @page.body_images_paths.each do |img| %>
 <%= render :file => 'shared/tiny_mce', :locals => {:mode => 'simple'} %>
 <%= remote_form_for(@product,
                    :loading => "small_loading('product-description-form')",
-                   :before => ("tinyMCE.triggerSave()" unless Rails.env == 'test'),
                    :update => 'product-description',
                    :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'description'},
                    :html => {:id => 'product-description-form', :method => 'post'}) do |f| %>
 <% unless @action %>
   <% cache_timeout(profile.cache_key + '-profile-general-info', 4.hours) do %>
-    <tr>
-      <th colspan='2'>
-        <%= _('Content') %>
-      </th>
-    </tr>
-
-    <% profile.blogs.each do |blog| %>
-      <tr>
-        <td><%= blog.name + ':' %></td>
-        <td>
-          <%= link_to(n_('One post', '%{num} posts', blog.posts.published.count) % { :num => blog.posts.published.count }, blog.url) %>
-        </td>
-      </tr>
-    <% end %>
-    <% profile.image_galleries.each do |gallery| %>
-      <tr>
-        <td><%= gallery.name + ':' %></td>
-        <td>
-          <%= link_to(n_('One picture', '%{num} pictures', gallery.images.published.count) % { :num => gallery.images.published.count }, gallery.url) %>
-        </td>
-      </tr>
-    <% end %>
-
-    <tr>
-      <td><%= _('Events:') %></td>
-      <td>
-        <%= link_to profile.events.published.count, :controller => 'events', :action => 'events' %>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <%= _('Tags:') %>
-      </td>
-      <td>
-        <%= tag_cloud @tags, :id, { :action => 'tags' }, :max_size => 18, :min_size => 10%>
-      </td>
-    </tr>
+    <%= display_content %>
  
     <% if !environment.enabled?('disable_categories') && !profile.interests.empty? %>
-      <tr>
-        <th colspan='2'><%= _('Interests') %></th>
-      </tr>
-      <% profile.interests.each do |item| %>
-        <tr>
-          <td></td>
-          <td><%= link_to item.name, :controller => 'search', :action => 'category_index', :category_path => item.explode_path %></td>
-        </tr>
-      <% end %>
+      <%= display_interests %>
     <% end %>
+
+    <%= display_general %>
   <% end %>
 <% end %>
 <table>
-  <tr>
-    <th colspan='2'><%= _('Basic information')%></th>
-  </tr>
-
-  <tr>
-    <td class='field-name'><%= _('Members') %></td>
-    <td>
-      <%= link_to profile.members_count, :controller => 'profile', :action => 'members' %>
-    </td>
-  </tr>
-
-  <%= display_field(_('Type:'), profile, :privacy_setting, true) %>
-
-  <%= display_field(_('Location:'), profile, :location, true) %>
-
-  <tr>
-    <td class='field-name'><%= _('Profile created at:')  %></td>
-    <td><%= show_date(profile.created_at) %></td>
-  </tr>
-
-  <% if profile.kind_of?(Enterprise) && profile.environment.enabled?('products_for_enterprises') %>
-    <tr>
-      <td></td>
-      <td>
-        <%= link_to _('Products/Services'), :controller => 'catalog', :action => 'index' %>
-      </td>
-    </tr>
-  <% end %>
-
-  <tr>
-    <td class='field-name'><%= _('Administrators:') %></td>
-    <td>
-      <%= profile.admins.map { |admin| link_to(admin.short_name, admin.url)}.join(', ') %>
-    </td>
-  </tr>
-
+  <%= display_basic_information %>
+  <%= display_contact %>
+  <%= display_economic %>
   <%= render :partial => 'common' %>
 </table>
 <table>
-  <tr>
-    <th colspan='2'><%= _('Basic information')%></th>
-  </tr>
-  <%= display_field(_('Sex:'), profile, :sex) { |gender| { 'male' => _('Male'), 'female' => _('Female') }[gender] } %>
-  <%= display_field(_('Date of birth:'), profile, :birth_date) { |date| show_date(date)  }%>
-  <%= display_field _('Location:'), profile, :location %>
-
-  <%= display_field(_('Type:'), profile, :privacy_setting, true) %>
-
-  <tr>
-    <td class='field-name'><%= _('Profile created at:')  %></td>
-    <td><%= show_date(profile.created_at) %></td>
-  </tr>
-
-  <%= display_contact profile %>
+  <%= display_basic_information %>
+  <%= display_contact %>
+  <%= display_location %>
  
   <% cache_timeout(profile.relationships_cache_key, 4.hours) do %>
-    <%= display_work_info profile %>
-
-    <tr>
-      <th colspan='2'><%= _('Network')%></th>
-    </tr>
-    <tr>
-      <td><%= _('Friends') + ':' %></td>
-      <td><%= link_to  profile.friends.count, { :controller => 'profile', :action => 'friends' } %></td>
-    </tr>
-    <tr>
-      <td><%= _('Communities') + ':' %></td>
-      <td><%= link_to profile.communities.count, :controller => "profile", :action => 'communities' %></td>
-    </tr>
-    <% if environment.disabled?('disable_asset_enterprises') %>
-      <tr id="person-profile-network-enterprises">
-        <td><%= _('Enterprises') + ':' %></td>
-        <td><%= link_to profile.enterprises.count, :controller => "profile", :action => 'enterprises' %></td>
-      </tr>
-    <% end %>
+    <%= display_work %>
+    <%= display_study %>
+    <%= display_network %>
  
     <%= render :partial => 'common' %>
-
   <% end %>
 </table>
  
@@ -10,8 +10,8 @@
                                  :rows => 1,
                                  :class => 'submit-with-keypress',
                                  :title => _('Leave your comment'),
-                                 :onfocus => ('if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + profile_icon(current_person, :icon, false) + ')"' if logged_in?),
-                                 :onblur => ('if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"' if logged_in?),
+                                 :onfocus => ("if(this.value==this.title){this.value='';this.style.color='#000'};this.style.backgroundImage='url(" + profile_icon(current_person, :icon, false) + ")'" if logged_in?),
+                                 :onblur => ("if(this.value==''){this.value=this.title;this.style.color='#ccc'};this.style.backgroundImage='none'" if logged_in?),
                                  :value => _('Leave your comment'),
                                  :style => 'color: #ccc' %>
         <%= hidden_field_tag :source_id, activity.id, :id => "activity_id_#{activity.id}" %>
@@ -9,8 +9,8 @@
                                  :rows => 1,
                                  :class => 'submit-with-keypress',
                                  :title => _('Leave your comment'),
-                                 :onfocus => ('if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + profile_icon(current_person, :icon, false) + ')"' if logged_in?),
-                                 :onblur => ('if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"' if logged_in?),
+                                 :onfocus => ("if(this.value==this.title){this.value='';this.style.color='#000'};this.style.backgroundImage='url(" + profile_icon(current_person, :icon, false) + ")'" if logged_in?),
+                                 :onblur => ("if(this.value==''){this.value=this.title;this.style.color='#ccc'};this.style.backgroundImage='none'" if logged_in?),
                                  :value => _('Leave your comment') %>
         <%= hidden_field_tag 'scrap[scrap_id]', scrap.id %>
         <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
@@ -1,10 +0,0 @@
-<ul>
-  <li><%= (content_tag('strong', _('Title') + ': ') + article.title)  if article.title %> </li>
-  <li><%= (content_tag('strong', _('Type') + ': ') + article.class.short_description) %> </li>
-  <li>
-  <%= (content_tag('strong', _('Original content') + ': ') + link_to(article.name, article.url)) %> <br />
-    <%= content_tag('small', _('This link might be unavailable if the content is removed')) %>
-  </li>
-</ul>
-
-<%= article_to_html(article) %>
@@ -1,10 +0,0 @@
-<ul>
-  <li><%= (content_tag('strong', _('Title') + ': ') + comment.title)  if comment.title %> </li>
-  <li><%= content_tag('strong', _('Type') + ': ') + _('Comment') %> </li>
-  <li>
-    <%= (content_tag('strong', _('Original content') + ': ') + link_to(comment.title || url_for(comment.url), comment.url)) %> <br />
-    <%= content_tag('small', _('This link might be unavailable if the content is removed')) %>
-  </li>
-</ul>
-
-<p><%= article_to_html(comment) %></p>
@@ -1 +0,0 @@
-<%= _('Reported folder') + ': ' + link_to(article.name, article.url) %>
@@ -0,0 +1,10 @@
+<ul>
+  <li><%= (content_tag('strong', _('Title') + ': ') + article.title)  if article.title %> </li>
+  <li><%= (content_tag('strong', _('Type') + ': ') + article.class.short_description) %> </li>
+  <li>
+  <%= (content_tag('strong', _('Original content') + ': ') + link_to(article.name, article.url)) %> <br />
+    <%= content_tag('small', _('This link might be unavailable if the content is removed')) %>
+  </li>
+</ul>
+
+<%= article_to_html(article) %>
@@ -0,0 +1,10 @@
+<ul>
+  <li><%= (content_tag('strong', _('Title') + ': ') + comment.title)  if comment.title %> </li>
+  <li><%= content_tag('strong', _('Type') + ': ') + _('Comment') %> </li>
+  <li>
+    <%= (content_tag('strong', _('Original content') + ': ') + link_to(comment.title || url_for(comment.url), comment.url)) %> <br />
+    <%= content_tag('small', _('This link might be unavailable if the content is removed')) %>
+  </li>
+</ul>
+
+<p><%= article_to_html(comment) %></p>
@@ -0,0 +1 @@
+<%= _('Reported folder') + ': ' + link_to(article.name, article.url) %>
-<% extend MacrosHelper %>
-<%= javascript_include_tag 'tinymce/jscripts/tiny_mce/tiny_mce.js' %>
-<%= include_macro_js_files %>
-<script type="text/javascript">
-  var myplugins = "searchreplace,print,table,contextmenu,-macrosPlugin";
-  var first_line, second_line;
-  var mode = '<%= mode ||= false %>'
-  <% if mode %>
-    first_line = "fontsizeselect,bold,italic,underline,bullist,numlist,justifyleft,justifycenter,justifyright,link,unlink"
-    second_line = ""
-  <% else %>
-    first_line = "print,separator,copy,paste,separator,undo,redo,separator,search,replace,separator,forecolor,fontsizeselect,formatselect"
-    second_line = "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,link,unlink,image,table,separator,cleanup,code,macros"
-    <% macros_with_buttons.each do |macro| %>
-      second_line += ',<%=macro.identifier %>'
-    <% end %>
-  <% end %>
-
-  if (tinymce.isIE) {
-    // the paste plugin is only useful in Internet Explorer
-    myplugins = "paste," + myplugins;
-  }
+<%
+extend TinymceHelper
+mode ||= false
+%>
  
+<%= tinymce_js %>
+<script type="text/javascript">
 tinymce.create('tinymce.plugins.MacrosPlugin', {
   createControl: function(n, cm) {
     switch (n) {
@@ -49,56 +33,21 @@ tinymce.create(&#39;tinymce.plugins.MacrosPlugin&#39;, {
   }
 });
  
+function tinymce_macros_setup(editor) {
+  <% macros_with_buttons.each do |macro| %>
+    editor.addButton('<%= macro.identifier %>', {
+      title: <%= macro_title(macro).to_json %>,
+      onclick: <%= generate_macro_config_dialog(macro) %>,
+      image : '<%= macro.configuration[:icon_path]%>'
+    });
+  <% end %>
+}
+
 // Register plugin with a short name
 tinymce.PluginManager.add('macrosPlugin', tinymce.plugins.MacrosPlugin);
  
-tinyMCE.init({
-  mode : "textareas",
-  editor_selector : "mceEditor",
-  theme : "advanced",
-  relative_urls : false,
-  remove_script_host : false,
-  document_base_url : <%= environment.top_url.to_json %>,
-  plugins: myplugins,
-  theme_advanced_toolbar_location : "top",
-  theme_advanced_layout_manager: 'SimpleLayout',
-  theme_advanced_buttons1 : first_line,
-  theme_advanced_buttons2 : second_line,
-  theme_advanced_buttons3 : "",
-  theme_advanced_blockformats :"p,address,pre,h2,h3,h4,h5,h6",
-  paste_auto_cleanup_on_paste : true,
-  paste_insert_word_content_callback : "convertWord",
-  paste_use_dialog: false,
-  apply_source_formatting : true,
-  extended_valid_elements : "applet[style|archive|codebase|code|height|width],comment,iframe[src|style|allowtransparency|frameborder|width|height|scrolling],embed[title|src|type|height|width],audio[controls|autoplay],video[controls|autoplay],source[src|type]",
-  content_css: '/stylesheets/tinymce.css,<%= macro_css_files %>',
-  language: <%= tinymce_language.inspect %>,
-  entity_encoding: 'raw',
-  setup : function(ed) {
-    <% macros_with_buttons.each do |macro| %>
-           ed.addButton('<%= macro.identifier %>', {
-               title: <%= macro_title(macro).to_json %>,
-               onclick: <%= generate_macro_config_dialog(macro) %>,
-               image : '<%= macro.configuration[:icon_path]%>'
-             });
-    <% end %>
-  }
+jQuery(document).ready(function () {
+  <%= tinymce_init_js :mode => mode %>
 });
-
-function convertWord(type, content) {
-  switch (type) {
-    // Gets executed before the built in logic performes it's cleanups
-    case "before":
-      //content = content.toLowerCase(); // Some dummy logic
-      break;
-
-    // Gets executed after the built in logic performes it's cleanups
-    case "after":
-      content = content.replace(/<!--\s*-->/, '');
-      break;
-  }
-
-  return content;
-}
-
 </script>
+
@@ -0,0 +1,9 @@
+<%= _('Dear %s,') % @requestor %>
+
+<%= word_wrap(@message) %>
+
+<%= _('Greetings,') %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
@@ -1 +0,0 @@
-task_cancelled.text.erb
 \ No newline at end of file
@@ -1,9 +0,0 @@
-<%= _('Dear %s,') % @requestor %>
-
-<%= word_wrap(@message) %>
-
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
@@ -1 +0,0 @@
-task_cancelled.text.erb
 \ No newline at end of file
@@ -1 +0,0 @@
-task_cancelled.text.erb
 \ No newline at end of file
@@ -115,6 +115,12 @@ module Noosfero
       :key    => '_noosfero_session',
     }
  
+    config.time_zone = File.read('/etc/timezone').split("\n").first
+    config.active_record.default_timezone = :local
+
+    config.paths['db/migrate'] += Dir.glob "#{Rails.root}/{baseplugins,config/plugins}/*/db/migrate"
+    config.i18n.load_path += Dir.glob "#{Rails.root}/{baseplugins,config/plugins}/*/locales/*.{rb,yml}"
+
     Noosfero::Plugin.setup(config)
  
   end
 # necessary for I18n.default_locale to work
 require 'i18n/backend/fallbacks'
 I18n.backend.class.send :include, I18n::Backend::Fallbacks
-
+I18n.enforce_available_locales = false
 class IndexArticlesFilteredFields < ActiveRecord::Migration
   def self.up
     %w[articles article_versions].each do |table|
-      add_index table, [:path]
-      add_index table, [:path, :profile_id]
+      add_index table.to_sym, [:path]
+      add_index table.to_sym, [:path, :profile_id]
     end
     add_index :articles, [:type]
     add_index :articles, [:type, :parent_id]
@@ -2,7 +2,10 @@ class AddSpamCommentsCounterCacheToArticles &lt; ActiveRecord::Migration
   def self.up
     add_column :articles, :spam_comments_count, :integer, :default => 0
     add_column :article_versions, :spam_comments_count, :integer, :default => 0
-    execute "update articles set spam_comments_count = (select count(*) from comments where comments.source_id = articles.id and comments.source_type = 'Article' and comments.spam = 't');"
+
+    execute("SELECT comments.source_id as source_id, count(comments.id) as comments_count FROM comments LEFT OUTER JOIN articles ON articles.id = source_id WHERE comments.source_type = 'Article' AND comments.spam = 't' GROUP BY comments.source_id;").each do |data|
+      execute("UPDATE articles SET spam_comments_count = '#{data['comments_count']}' WHERE id = #{data['source_id']}")
+    end
   end
  
   def self.down
@@ -4,8 +4,10 @@ class CreateRealRelationBetweenArticleAndAuthor &lt; ActiveRecord::Migration
     add_column :article_versions, :author_id, :integer
  
     # Set article's author as the first version's last_changed_by_id.
-    execute "update articles set author_id = (select article_versions.last_changed_by_id from article_versions where article_versions.article_id = articles.id and article_versions.version = 1 limit 1)"
-  end
+    execute("UPDATE article_versions SET author_id = last_changed_by_id")
+
+    execute("UPDATE articles SET author_id = article_versions.author_id FROM article_versions WHERE article_versions.article_id = articles.id AND article_versions.version = 1")
+ end
  
   def self.down
     remove_column :articles, :author_id
 class FixYamlEncoding < ActiveRecord::Migration
   def self.up
-    fix_encoding(Block, 'settings')
-    fix_encoding(Product, 'data')
-    fix_encoding(Environment, 'settings')
-    fix_encoding(Profile, 'data')
-    fix_encoding(ActionTracker::Record, 'params')
-    fix_encoding(Article, 'setting')
-    fix_encoding(Task, 'data')
+    ActiveRecord::Base.transaction do
+      fix_encoding(Environment, 'settings')
+      fix_encoding(Profile, 'data')
+      fix_encoding(Product, 'data')
+      fix_encoding(ActionTracker::Record, 'params')
+      fix_encoding(Article, 'setting')
+      fix_encoding(Task, 'data')
+      fix_encoding(Block, 'settings')
+    end
   end
  
   def self.down
@@ -16,15 +18,34 @@ class FixYamlEncoding &lt; ActiveRecord::Migration
   private
  
   def self.fix_encoding(model, param)
-    result = model.find(:all, :conditions => "#{param} LIKE '%!binary%'")
+    result = model.all
     puts "Fixing #{result.count} rows of #{model} (#{param})"
-    result.each {|r| r.update_column(param, deep_fix(r.send(param)).to_yaml)}
+    result.each do |r|
+      begin
+        yaml = r.send(param)
+        # if deserialization failed then a string is returned
+        if yaml.is_a? String
+          yaml.gsub! ': `', ': '
+          yaml = YAML.load yaml
+        end
+        r.update_column param, deep_fix(yaml).to_yaml
+      rescue => e
+        puts "FAILED #{r.inspect}"
+        puts e.message
+      end
+    end
   end
  
   def self.deep_fix(hash)
     hash.each do |value|
-      value.force_encoding('UTF-8') if value.is_a?(String) && !value.frozen? && value.encoding == Encoding::ASCII_8BIT
       deep_fix(value) if value.respond_to?(:each)
+      if value.is_a? String and not value.frozen?
+        if value.encoding == Encoding::ASCII_8BIT
+          value.force_encoding "utf-8"
+        else
+          value.encode!("iso-8859-1").force_encoding("utf-8")
+        end
+      end
     end
   end
  
 class AddIndexToBlogPostsSort < ActiveRecord::Migration
   def self.up
      %w[articles article_versions].each do |table|
-      add_index table, [:published_at, :id]
+      add_index table.to_sym, [:published_at, :id]
     end
  end
  
   def self.down
      %w[articles article_versions].each do |table|
-      remove_index table, [:published_at, :id]
+      remove_index table.to_sym, [:published_at, :id]
     end
   end
 end
@@ -1,3 +0,0 @@
----
-BUNDLE_WITHOUT: test:cucumber
-
+noosfero (1.0~rc4) wheezy-test; urgency=low
+
+  * Fourth release candidate
+
+ -- Antonio Terceiro <vagrant@wheezy-base>  Wed, 19 Nov 2014 10:31:16 -0300
+
 noosfero (1.0~rc3) wheezy-test; urgency=low
  
   * Third release candidate to Noosfero 1.0
@@ -22,6 +28,12 @@ noosfero (0.99.0~rc20140618202455) wheezy-test; urgency=low
  
  -- Rodrigo Souto <rodrigo@colivre.coop.br>  Wed, 18 Jun 2014 20:25:01 +0000
  
+noosfero (0.47.5) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Thu, 23 Oct 2014 02:24:14 +0000
+
 noosfero (0.47.4) unstable; urgency=low
  
   * Bugfixes and performance optimizations
@@ -51,6 +51,7 @@ Depends:
  ruby-hpricot,
  ruby-nokogiri,
  ruby-acts-as-taggable-on,
+ ruby-progressbar,
  ruby-prototype-rails,
  ruby-rails-autolink,
  memcached,
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+sed -e '/^group\s*:\(test\|cucumber\)/,/^end/ d' Gemfile
@@ -7,9 +7,6 @@ util                              usr/share/noosfero
 Rakefile                          usr/share/noosfero
 vendor                            usr/share/noosfero
  
-Gemfile                           usr/share/noosfero
-debian/bundle/config              usr/share/noosfero/.bundle
-
 config/application.rb             usr/share/noosfero/config
 config/boot.rb                    usr/share/noosfero/config
 config/environment.rb             usr/share/noosfero/config
@@ -15,4 +15,4 @@ var/lib/noosfero-data/public/thumbnails             usr/share/noosfero/public/th
 usr/share/noosfero/public/designs/themes/noosfero   usr/share/noosfero/public/designs/themes/default
 usr/share/noosfero/public/designs/icons/tango       usr/share/noosfero/public/designs/icons/default
 usr/share/noosfero/script/noosfero-plugins          usr/sbin/noosfero-plugins
-usr/share/noosfero/Gemfile.lock                     /dev/null
+/dev/null                                           usr/share/noosfero/Gemfile.lock
@@ -20,6 +20,10 @@ override_dh_link:
 		dh_link usr/lib/noosfero/dbinstall usr/share/dbconfig-common/scripts/noosfero/install/$$db; \
 	done
  
+override_dh_auto_install:
+	dh_auto_install
+	debian/filter-gemfile > $(CURDIR)/debian/noosfero/usr/share/noosfero/Gemfile
+
 override_dh_installinit:
 	dh_installinit -pnoosfero --onlyscripts
  
@@ -6,7 +6,14 @@ C{
 /*
  * Accept-language header normalization
  *
- * Cosimo, 21/01/2010
+ * - Parses client Accept-Language HTTP header
+ * - Tries to find the best match with the supported languages
+ * - Writes the best match as req.http.X-Varnish-Accept-Language
+ *
+ * First version: Cosimo, 21/Jan/2010
+ * Last update:   Cosimo, 03/Nov/2011
+ *
+ * http://github.com/cosimo/varnish-accept-language
  *
  */
  
@@ -16,11 +23,12 @@ C{
 #include <string.h>
  
 #define DEFAULT_LANGUAGE "en"
-#define SUPPORTED_LANGUAGES ":de:fr:es:ru:pt:hy:en:"
+#define SUPPORTED_LANGUAGES ":de:eo:es:fr:hy:it:pt:ru:"
  
 #define vcl_string char
-#define LANG_LIST_SIZE 16 
-#define LANG_MAXLEN 16
+#define LANG_LIST_SIZE 16
+#define HDR_MAXLEN 256
+#define LANG_MAXLEN 8
 #define RETURN_LANG(x) { \
     strncpy(lang, x, LANG_MAXLEN); \
     return; \
@@ -64,9 +72,8 @@ int is_supported(vcl_string *lang) {
     strncat(match_str, lang, LANG_MAXLEN);
     strncat(match_str, ":\0", 2);
  
-    if (strstr(supported_languages, match_str)) {
+    if (strstr(supported_languages, match_str))
         is_supported = 1;
-    }
  
     return is_supported;
 }
@@ -90,6 +97,7 @@ void select_language(const vcl_string *incoming_header, char *lang) {
     vcl_string *lang_tok = NULL;
     vcl_string root_lang[3];
     vcl_string *header;
+    vcl_string header_copy[HDR_MAXLEN];
     vcl_string *pos = NULL;
     vcl_string *q_spec = NULL;
     unsigned int curr_lang = 0, i = 0;
@@ -106,7 +114,7 @@ void select_language(const vcl_string *incoming_header, char *lang) {
         RETURN_DEFAULT_LANG;
  
     /* Tokenize Accept-Language */
-    header = (vcl_string *) incoming_header;
+    header = strncpy(header_copy, incoming_header, sizeof(header_copy));
  
     while ((lang_tok = strtok_r(header, " ,", &pos))) {
  
@@ -137,7 +145,8 @@ void select_language(const vcl_string *incoming_header, char *lang) {
         header = NULL;
  
         /* Break out if stored max no. of languages */
-        if (curr_lang >= LANG_MAXLEN) break;
+        if (curr_lang >= LANG_LIST_SIZE)
+            break;
     }
  
     /* Sort by priority */
@@ -157,12 +166,11 @@ void vcl_rewrite_accept_language(const struct sess *sp) {
     vcl_string *in_hdr;
     vcl_string lang[LANG_MAXLEN];
  
-    memset(lang, 0, LANG_MAXLEN);
-
     /* Get Accept-Language header from client */
     in_hdr = VRT_GetHdr(sp, HDR_REQ, "\020Accept-Language:");
  
     /* Normalize and filter out by list of supported languages */
+    memset(lang, 0, sizeof(lang));
     select_language(in_hdr, lang);
  
     /* By default, use a different header name: don't mess with backend logic */
@@ -191,3 +199,4 @@ sub vcl_fetch {
     set beresp.http.Vary = "X-Varnish-Accept-Language";
   }
 }
+
@@ -1,36 +0,0 @@
-Feature: change organization name
-  As an organization's admin
-  I want to change it's name
-  In order to keep it's name consistent
-
-  Scenario: changing community's name
-    Given the following communities
-      | identifier | name |
-      | sample-community | Sample Community |
-    And the following users
-      | login | 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 follow "Community Info and settings"
-    And I fill in "Name" with "New Sample Community"
-    When I press "Save"
-    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
-      | identifier | name |
-      | sample-enterprise | Sample Enterprise |
-    And the following users
-      | login | 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 follow "Enterprise Info and settings"
-    And I fill in "Name" with "New Sample Enterprise"
-    When I press "Save"
-    Then I should be on sample-enterprise's control panel
-    And I should see "New Sample Enterprise" within "title"
@@ -1,145 +0,0 @@
-Feature: chat
-  As a Noosfero user
-  I want to chat with my friends
-
-  Background:
-    Given the following users
-      | login | name |
-      | tame | Tame |
-      | mariasilva | Maria Silva |
-      | josesilva  | Jose Silva  |
-    And "tame" is online in chat
-    And "mariasilva" is online in chat
-    And "josesilva" is online in chat
-    And "tame" is friend of "mariasilva"
-    And "tame" is friend of "josesilva"
-
-  @selenium
-  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" within "#user"
-
-  @selenium
-  Scenario: provide the chat online users content
-    Given feature "xmpp_chat" is enabled on environment
-    And I am logged in as "tame"
-    Then I should see "Friends in chat "
-
-  @selenium
-  Scenario: provide the chat online users list
-    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 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" 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" within "#user"
-
-  @selenium
-  Scenario: not provide the chat online users list when environment not support that
-    Given I am logged in as "tame"
-    Then I should not see "Friends in chat "
-
-  Scenario: block access to chat when environment not support that
-    Given I am logged in as "tame"
-    When I go to chat
-    Then I should see "There is no such page"
-
-  Scenario: block access to chat for guest users
-    Given feature "xmpp_chat" is enabled on environment
-    When I go to chat
-    Then I should be on login page
-
-  @selenium
-  Scenario: open chat in a new window
-    Given feature "xmpp_chat" is enabled on environment
-    And I am logged in as "tame"
-    When I follow "Open chat"
-    And I select window "noosfero_chat"
-    Then I should see "Chat - Colivre.net - Friends online (0)"
-
-  @selenium
-  Scenario: open chat with an online user in a new window
-    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 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)"
-
-  @selenium
-  Scenario: chat starts disconnected by default
-    Given feature "xmpp_chat" is enabled on environment
-    And I am logged in as "tame"
-    When I follow "Open chat"
-    And I select window "noosfero_chat"
-    Then I should see "Offline" within "a"
-
-  @selenium
-  Scenario: view options to change my chat status through menu
-    Given feature "xmpp_chat" is enabled on environment
-    And I am logged in as "tame"
-    And I follow "Open chat"
-    When I select window "noosfero_chat"
-    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 "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
-    Given the following communities
-      | identifier | name |
-      | autoramas | Autoramas |
-    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"
-
-  @selenium
-  Scenario: not see link to open chatroom of a community if not a member
-    Given the following communities
-      | identifier | name |
-      | 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" within "a"
-
-  @selenium
-  Scenario: not see link to open chatroom of a community if xmpp_chat disabled
-    Given the following communities
-      | identifier | name |
-      | 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" within "a"
-
-  @selenium
-  Scenario: open chatroom of a community in a new window
-    Given feature "xmpp_chat" is enabled on environment
-    And the following communities
-      | identifier | name |
-      | autoramas | Autoramas |
-    And "Tame" is a member of "Autoramas"
-    And I am logged in as "tame"
-    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)"
@@ -27,44 +27,3 @@ Feature: edit profile
     And I press "Save"
     Then I should not see "Birth date is invalid"
     And I should not see "Birth date is mandatory"
-
-  @selenium
-  Scenario: Alert about url change
-    Given the following community
-      | identifier | name | owner |
-      | o-rappa | O Rappa | joao  |
-    And feature "enable_organization_url_change" is enabled on environment
-    And I go to o-rappa's control panel
-    When I follow "Community Info and settings"
-    Then I should not see "WARNING" within "#identifier-change-confirmation"
-    And I fill in "Address" with "banda-o-rappa"
-    When I leave the "#profile_data_identifier" field
-    Then I should see "WARNING" within "#identifier-change-confirmation"
-
-  @selenium
-  Scenario: Confirm url change
-    Given the following community
-      | identifier | name | owner |
-      | o-rappa | O Rappa | joao  |
-    And feature "enable_organization_url_change" is enabled on environment
-    And I go to o-rappa's control panel
-    And I follow "Community Info and settings"
-    And I fill in "Address" with "banda-o-rappa"
-    When I leave the "#profile_data_identifier" field
-    Then I should see "WARNING" within "#identifier-change-confirmation"
-    When I follow "Yes"
-    Then I should not see "WARNING" within "#identifier-change-confirmation"
-
-  @selenium
-  Scenario: Cancel url change
-    Given the following community
-      | identifier | name | owner |
-      | o-rappa | O Rappa | joao  |
-    And feature "enable_organization_url_change" is enabled on environment
-    And I go to o-rappa's control panel
-    And I follow "Community Info and settings"
-    And I fill in "Address" with "banda-o-rappa"
-    When I leave the "#profile_data_identifier" field
-    Then I should see "WARNING" within "#identifier-change-confirmation"
-    When I follow "No"
-    Then I should not see "WARNING" within "#identifier-change-confirmation"
@@ -1,86 +0,0 @@
-Feature: gallery_navigation
-  As a noosfero user
-  I want to navigate over image gallery
-
-  Background:
-    Given the following users
-      | login       |
-      | marciopunk  |
-    And the following galleries
-      | owner      | name          |
-      | marciopunk | my-gallery    |
-      | marciopunk | other-gallery |
-    And the following files
-      | owner      | file          | mime       | parent        |
-      | marciopunk | rails.png     | image/png  | my-gallery    |
-      | marciopunk | rails.png     | image/png  | other-gallery |
-      | marciopunk | other-pic.jpg | image/jpeg | my-gallery    |
-
-  Scenario: provide link to go to next image
-    Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    Then I should see "Next »"
-
-  @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 »"
-    Then I should see "rails.png" within ".title"
-
-  Scenario: not link to next when in last image
-    When I am on /marciopunk/my-gallery/rails.png?view=true
-    Then I should see "« Previous" within ".gallery-navigation a"
-    And I should not see "Next »" within ".gallery-navigation a"
-
-  Scenario: provide link to go to previous image
-    Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    Then I should see "« Previous"
-
-  @selenium
-  Scenario: view previous image when follow previous link
-    Given I am on /marciopunk/my-gallery/rails.png?view=true
-    When I follow "« Previous"
-    Then I should see "other-pic.jpg" within ".title"
-
-  Scenario: not link to previous when in first image
-    When I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    Then I should see "Next »" within ".gallery-navigation a"
-    And I should not see "« Previous" within ".gallery-navigation a"
-
-  Scenario: display number of current and total of images
-    Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    Then I should see "image 1 of 2" within ".gallery-navigation"
-
-  Scenario: increment current number when follow next
-    Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    Then I should see "image 1 of 2" within ".gallery-navigation"
-    When I follow "Next »"
-    Then I should see "image 2 of 2" within ".gallery-navigation"
-
-  Scenario: decrement current number when follow next
-    Given I am on /marciopunk/my-gallery/rails.png?view=true
-    Then I should see "image 2 of 2" within ".gallery-navigation"
-    When I follow "« Previous"
-    Then I should see "image 1 of 2" within ".gallery-navigation"
-
-  Scenario: provide button to go back to gallery
-    Given I am on /marciopunk/my-gallery/rails.png?view=true
-    Then I should see "Go back to my-gallery"
-    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 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"
-    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"
@@ -1,44 +0,0 @@
-Feature: Edit Highlight Block
-  As a user
-  I want to edit the highlight block
-
-  Background:
-    Given I am on the homepage
-    And the following users
-      | login       | name         |
-      | jose        | Jose Silva   |
-    And I am logged in as "jose"
-
-  @selenium
-  Scenario: Add new highlight
-    Given I follow "Control panel"
-    And I follow "Edit sideboxes"
-    And I follow "Add a block"
-    And I choose "Highlights"
-    And I press "Add"
-    And I follow "Edit" within ".highlights-block"#Need to hover the mouse on the box
-    And I follow "New highlight"
-    And I fill in "block_images__address" with "/"
-    And I fill in "block_images__position" with "0"
-    And I fill in "block_images__title" with "test highlights"
-    And I press "Save"
-    And I follow "Edit" within ".highlights-block"
-    Then I should see "Title"
-
-  @selenium-fixme
-  Scenario: Remove one saved highlight
-    Given I follow "Control panel"
-    And I follow "Edit sideboxes"
-    And I follow "Add a block"
-    And I choose "Highlights"
-    And I press "Add"
-    And I follow "Edit" within ".highlights-block"
-    And I follow "New highlight"
-    And I fill in "block_images__address" with "/"
-    And I fill in "block_images__position" with "0"
-    And I fill in "block_images__title" with "test highlights"#Need to hover the mouse on the box
-    And I press "Save"
-    And I follow "Edit" within ".highlights-block"
-    And I follow "" within ".delete-highlight"
-    And I confirm the browser dialog
-    Then I should not see "Title"
 \ No newline at end of file
@@ -1,69 +0,0 @@
-Feature: HTTP caching
-
-  As a sysdamin
-  I want Noosfero to provide appropriate cache headers
-  So that Varnish can serve content from the cache, everything works faster and everyone is happy
-
-  Background:
-    Given the following user
-      | login | name |
-      | joao | João Silva |
-
-  Scenario: home page, default configuration
-    When I go to the homepage
-    Then the response should be valid for 5 minutes
-    And the cache should be public
-
-  Scenario: home page, custom configuration
-    Given the following environment configuration
-      | home_cache_in_minutes | 10 |
-    When I go to the homepage
-    Then the response should be valid for 10 minutes
-
-  Scenario: search results, default configuration
-    Given I am on the search page
-    When I fill in "query" with "anything"
-    And I press "Search"
-    Then the response should be valid for 15 minutes
-
-  Scenario: search results, custom configuration
-    Given the following environment configuration
-      | general_cache_in_minutes | 90 |
-    When I go to the search page
-    And I fill in "query" with "anything"
-    And I press "Search"
-    Then the response should be valid for 90 minutes
-
-  Scenario: profile pages, default configuaration
-    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 joao's homepage
-    Then the response should be valid for 90 minutes
-
-  Scenario: account controller should not be cached at all
-    When I go to /account/login
-    Then there must be no cache at all
-
-  Scenario: profile administration
-    Given I am logged in as "joao"
-    When I go to joao's control panel
-    Then there must be no cache at all
-
-  Scenario: environment administration
-    Given I am logged in as admin
-    When I go to /admin
-    Then there must be no cache at all
-
-  Scenario: logged in user in the homepage
-    Given I am logged in as "joao"
-    When I go to the homepage
-    Then there must be no cache at all
-
-  Scenario: logged in user in a profile page
-    Given I am logged in as "joao"
-    When I go to /joao
-    Then there must be no cache at all
@@ -1,247 +0,0 @@
-Feature: manage inputs
-  As an enterprise owner
-  I want to manage my product's inputs
-
-  Background:
-    Given the following users
-      | login | name |
-      | joaosilva | Joao Silva |
-    And the following enterprises
-      | identifier | owner | name | enabled |
-      | redemoinho | joaosilva | Rede Moinho | true |
-    Given the following product_category
-      | name  |
-      | Music |
-    And the following product_categories
-      | name | parent  |
-      | Rock | music   |
-      | CD Player | music   |
-    And the following product
-      | owner      | category | name       |
-      | redemoinho | rock     | Abbey Road |
-    And feature "products_for_enterprises" is enabled on environment
-    And the following units
-      | singular | plural |
-      | Meter    | Meters |
-      | Litre    | Litres |
-
-  @selenium
-  Scenario: add first input to a product
-    Given I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Abbey Road
-    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 »" 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"
-
-  @selenium
-  Scenario: add input to a product that already has inputs
-    Given the following input
-      | product    | category |
-      | Abbey Road | music    |
-    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 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 »" 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"
-
-  @selenium
-  Scenario: cancel addition of a product input
-    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 I should see "Cancel" within "#categories_selection_actionbar"
-    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"
-
-  Scenario: show input name and link to add details
-    Given the following input
-      | product | category |
-      | Abbey Road | music |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Abbey Road
-    And I follow "Inputs and raw material"
-    Then I should see "Music" within ".input-name"
-    And I should see "Click here to add price and the amount used"
-
-  Scenario: Not show input edit button when dont have details yet
-    Given the following input
-      | product | category |
-      | Abbey Road | music |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Abbey Road
-    And I follow "Inputs and raw material"
-    Then I should not see "Edit" within ".input-item"
-
-  Scenario: Show button to edit input
-    Given the following input
-      | product    | category | price_per_unit |
-      | Abbey Road | music    | 10.0           |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Abbey Road
-    And I follow "Inputs and raw material"
-    Then I should see "Edit" within ".input-item"
-
-  @selenium-fixme
-  Scenario: Order inputs by position
-    Given the following product_categories
-      | name  |
-      | Instrumental |
-    And the following inputs
-      | product    | category     | position |
-      | Abbey Road | Instrumental | 2        |
-      | Abbey Road | Rock         | 1        |
-      | Abbey Road | CD Player    | 3        |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Abbey Road
-    And I follow "Inputs"
-    Then I should see "Rock" above of "Instrumental"
-    And I should see "Instrumental" above of "CD Player"
-
-  @selenium
-  Scenario: Save price of input
-    Given the following input
-      | product    | category |
-      | Abbey Road | music    |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Abbey Road
-    And I follow "Inputs"
-    Then I should see "Music"
-    When I follow "Click here to add price and the amount used"
-    And I should see "Price"
-    And I fill in "Price" with "10.50"
-    And I press "Save"
-    Then I should not see "Save"
-
-  @selenium
-  Scenario: Update label of input price with selected unit
-    Given the following input
-      | product | category |
-      | Abbey Road | music |
-    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 I should not see "Price by Meter ($)"
-    When I select "Meter" from "input_unit_id" within ".edit_input"
-    Then I should see "Price by Meter ($)"
-
-  @selenium
-  Scenario: Save all price details of input
-    Given the following input
-      | product | category |
-      | Abbey Road | music |
-    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 I fill in "Amount used" with "2.5"
-    And I fill in "Price" with "11.50"
-    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"
-    And I should not see "$ 11.50"
-
-  @selenium
-  Scenario: Save and then edit price details of input
-    Given the following input
-      | product | category |
-      | Abbey Road | music |
-    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 I fill in "Amount used" with "2.5"
-    And I fill in "Price" with "11.50"
-    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" from "input_unit_id" within ".edit_input"
-    And I press "Save"
-    Then I should see "3"
-    And I should see "Litre"
-
-  @selenium
-  Scenario: Cancel edition of a input
-    Given the following input
-      | product | category |
-      | Abbey Road | music |
-    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"
-    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 follow "Cancel" within ".edit_input"
-    Then I should see "Click here to add price and the amount used"
-
-  @selenium
-  Scenario: Cancel edition of an input then edit again
-    Given the following input
-      | product | category | price_per_unit | unit |
-      | Abbey Road | music | 10.0           | Meter |
-    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 "Edit" within ".input-details"
-    And I should see "Cancel" within ".edit_input"
-    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"
-
-  @selenium
-  Scenario: remove input
-    Given the following input
-      | product    | category |
-      | Abbey Road | rock     |
-    And I am logged in as "joaosilva"
-    And I go to Rede Moinho's page of product Abbey Road
-    And I follow "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 the browser dialog
-    Then I should see "Add the inputs or raw material used by this product"
-
-  @selenium-fixme
-  Scenario: Order input list
-    Given the following product_category
-      | name  |
-      | Movie |
-    And the following product
-      | owner | category | name |
-      | redemoinho | Movie | Ramones |
-    And the following inputs
-      | product | category |
-      | Ramones | Rock |
-      | Ramones | Music |
-      | Ramones | CD Player |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Ramones
-    And I follow "Inputs"
-    Then I should see "Rock" above of "Music"
-    And I should see "Music" above of "CD Player"
-    When I drag "Rock" to "Music"
-    Then I should see "Music" above of "Rock"
-    And I should see "Rock" above of "CD Player"
-    When I follow "Back to the product listing"
-    And I go to Rede Moinho's page of product Ramones
-    Then I should see "Music" above of "Rock"
-    And I should see "Rock" above of "CD Player"
@@ -1,179 +0,0 @@
-Feature: manage product price details
-  As an enterprise owner
-  I want to manage the details of product's price
-
-  Background:
-    Given the following users
-      | login | name |
-      | joaosilva | Joao Silva |
-    And the following enterprises
-      | identifier | owner | name | enabled |
-      | redemoinho | joaosilva | Rede Moinho | true |
-    Given the following product_category
-      | name  |
-      | Music |
-    And the following product_categories
-      | name | parent  |
-      | Rock | music   |
-      | CD Player | music   |
-    And the following product
-      | owner      | category | name       | price |
-      | redemoinho | rock     | Abbey Road | 80.0  |
-    And feature "products_for_enterprises" is enabled on environment
-    And the following inputs
-      | product    | category  | price_per_unit | amount_used |
-      | Abbey Road | Rock      | 10.0           | 2           |
-      | Abbey Road | CD Player | 20.0           | 2           |
-    And the following production cost
-      | name  | owner       |
-      | Taxes | environment |
-    And I am logged in as "joaosilva"
-
-  @selenium
-  Scenario: list total value of inputs as 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"
-    Then I should see "Inputs"
-    And I should see "60.0" within ".inputs-cost"
-
-  @selenium
-  Scenario: return to product after save
-    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 press "Save"
-    Then I should be on Rede Moinho's page of product Abbey Road
-
-  @selenium
-  Scenario: add first item on 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 "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 press "Save"
-    Then I should not see "Save"
-    And I should see "Describe here the cost of production"
-
-  @selenium
-  Scenario: edit a production cost
-    Given the following production cost
-      | name  | owner       |
-      | Energy | environment |
-    When 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 "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" 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"
-
-  Scenario: not display price composition if product does not have input
-    Given the following product
-      | owner      | category | name             |
-      | redemoinho | rock     | Yellow Submarine |
-    And the following user
-      | login      | name        |
-      | mariasouza | Maria Souza |
-    And I am logged in as "mariasouza"
-    When I go to Rede Moinho's page of product Yellow Submarine
-    Then I should not see "Price composition"
-
-  Scenario: not display price composition if price is not fully described
-    Given I am not logged in
-    And I go to Rede Moinho's page of product Abbey Road
-    Then I should not see "Price composition"
-
-   @selenium
-   Scenario: display price details if price is fully described
-     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 "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"
-
-  @selenium
-  Scenario: create a new cost clicking on select
-    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 fill in "$" with "10.00"
-    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"
-
-  @selenium
-  Scenario: add created cost on new-cost-fields
-    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
-    Then I should see "Energy" within "#display-product-price-details"
-
-  @selenium
-  Scenario: remove price detail
-    Given the following price detail
-      | product    | production_cost | price |
-      | Abbey Road | Taxes           | 20.0  |
-    And 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 should see "Taxes" within "#manage-product-details-form"
-    When I follow "Remove" within "#manage-product-details-form"
-    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"
-
-  Scenario: display progressbar
-    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"
-    Then I should see "$ 60.00 of $ 80.00" within "#progressbar-text"
-
-  @selenium
-  Scenario: update value on progressbar after addition of new cost
-    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"
-    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
-    Then I should see "$ 70.00 of $ 80.00" within "#progressbar-text"
-
-  @selenium
-  Scenario: update value on progressbar after editing an input
-    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"
-    Then I should see "$ 60.00 of $ 80.00" within "#progressbar-text"
-    When I follow "Inputs"
-    And I follow "Edit" within ".input-details"
-    And I fill in "Price" with "23.31"
-    And I press "Save"
-    Then I follow "Price composition"
-    And I should see "$ 86.62 of $ 80.00" within "#progressbar-text"
@@ -1,520 +0,0 @@
-Feature: manage products
-  As an enterprise owner
-  I want to manage my products
-
-  Background:
-    Given the following users
-      | login | name |
-      | joaosilva | Joao Silva |
-    And the following enterprises
-      | identifier | owner | name | enabled |
-      | redemoinho | joaosilva | Rede Moinho | true |
-    And feature "products_for_enterprises" is enabled on environment
-
-  Scenario: display "create new product" button
-    Given I am logged in as "joaosilva"
-    And I am on redemoinho's control panel
-    When I follow "Manage Products/Services"
-    Then I should see "New product or service"
-
-  Scenario: paginate public listing products and services
-    Given the following product_category
-      | name |
-      | Bicycle |
-    And the following products
-      | owner      | category | name   | description | created_at          |
-      | redemoinho | bicycle  | Bike A | bicycle 1   | 2014-04-01 01:00:00 |
-      | redemoinho | bicycle  | Bike B | bicycle 2   | 2014-04-01 02:00:00 |
-      | redemoinho | bicycle  | Bike C | bicycle 3   | 2014-04-01 03:00:00 |
-      | redemoinho | bicycle  | Bike D | bicycle 4   | 2014-04-01 04:00:00 |
-      | redemoinho | bicycle  | Bike E | bicycle 5   | 2014-04-01 05:00:00 |
-      | redemoinho | bicycle  | Bike F | bicycle 6   | 2014-04-01 06:00:00 |
-      | redemoinho | bicycle  | Bike G | bicycle 7   | 2014-04-01 07:00:00 |
-      | redemoinho | bicycle  | Bike H | bicycle 8   | 2014-04-01 08:00:00 |
-      | redemoinho | bicycle  | Bike I | bicycle 9   | 2014-04-01 09:00:00 |
-      | redemoinho | bicycle  | Bike J | bicycle 10  | 2014-04-01 10:00:00 |
-      | redemoinho | bicycle  | Bike K | bicycle 11  | 2014-04-01 11:00:00 |
-    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"
-    And I should see "Bike D" within "#product-list"
-    And I should see "Bike E" within "#product-list"
-    And I should see "Bike F" within "#product-list"
-    And I should not see "Bike G" within "#product-list"
-    And I should not see "Bike H" within "#product-list"
-    And I should not see "Bike I" within "#product-list"
-    And I should not see "Bike J" within "#product-list"
-    And I should not see "Bike K" within "#product-list"
-    When I follow "Next"
-    Then I should see "Bike G" within "#product-list"
-    Then I should see "Bike H" within "#product-list"
-    Then I should see "Bike I" within "#product-list"
-    Then I should see "Bike J" within "#product-list"
-    Then I should see "Bike K" within "#product-list"
-
-  Scenario: listing products and services
-    Given I am logged in as "joaosilva"
-    And I am on redemoinho's control panel
-    And I follow "Manage Products/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 redemoinho's control panel
-    And I follow "Manage Products/Services"
-    When I follow "New product or service"
-    Then I should see "Back to the product listing" link
-
-  Scenario: see toplevel categories
-    Given the following product_categories
-      | name |
-      | Products |
-      | Services |
-    Given I am logged in as "joaosilva"
-    And I go to redemoinho's new product page
-    Then I should see "Products"
-    And I should see "Service"
-
-  @selenium
-  Scenario: select a toplevel category and see subcategories
-    Given the following product_categories
-      | name |
-      | Products level0 |
-    And the following product_categories
-      | name | parent |
-      | Computers level1 | products-level0 |
-      | DVDs level1 | products-level0 |
-    Given I am logged in as "joaosilva"
-    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"
-
-  @selenium
-  Scenario: hide subcategories when select other toplevel category
-    Given the following product_categories
-      | name |
-      | Products level0 |
-      | Services level0 |
-    And the following product_categories
-      | name | parent |
-      | Computers level1 | products-level0 |
-      | Software development level1 | services-level0 |
-    Given I am logged in as "joaosilva"
-    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/
-
-  @selenium
-  Scenario: show hierarchy of categories
-    Given the following product_categories
-      | name |
-      | Products |
-    And the following product_category
-      | name | parent |
-      | Computers | products |
-    Given I am logged in as "joaosilva"
-    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
-  Scenario: show links in hierarchy of categories and not link current category
-    Given the following product_category
-      | name |
-      | Toplevel Product Categories |
-    Given the following product_category
-      | name | parent |
-      | Category Level 1 | toplevel-product-categories |
-    Given I am logged in as "joaosilva"
-    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
-
-  @selenium
-  Scenario: save button come initialy disabled
-    Given the following product_category
-      | name |
-      | Only for test |
-    And I am logged in as "joaosilva"
-    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
-    Given I am logged in as "joaosilva"
-    And the following product_category
-      | name |
-      | Browsers (accept categories) |
-    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
-    Given the following product_category
-      | name | accept_products |
-      | Browsers | false |
-    Given I am logged in as "joaosilva"
-    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
-    Given the following product_category
-      | name |
-      | Bicycle |
-    Given I am logged in as "joaosilva"
-    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"
-    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"
-
-  Scenario: a user with permission can see edit links
-    Given the following product_category
-      | name |
-      | Bicycle |
-    And the following products
-      | owner      | category | name | description |
-      | redemoinho | bicycle  | Bike | Red bicycle |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Bike
-    Then I should see "Change category"
-    And I should see "Edit name"
-    And I should see "Edit description"
-    And I should see "Change image"
-
-  Scenario: an allowed user will see a different button when has no description
-    Given the following product_category
-      | name |
-      | Bicycle |
-    And the following products
-      | owner      | category | name |
-      | redemoinho | bicycle  | Bike |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Bike
-    Then I should see "Change category"
-    And I should see "Edit name"
-    And I should see "Add some description to your product"
-    And I should see "Add price and other basic information"
-    And I should see "Change image"
-
-  Scenario: an allowed user will see a different button when has no basic info
-    Given the following product_category
-      | name |
-      | Bicycle |
-    And the following products
-      | owner      | category | name |
-      | redemoinho | bicycle  | Bike |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Bike
-    Then I should see "Change category"
-    And I should see "Edit name"
-    And I should see "Add price and other basic information"
-    And I should see "Change image"
-
-  Scenario: a not logged user cannot see edit links
-    Given I am not logged in
-    And the following product_category
-      | name |
-      | Bicycle |
-    And the following products
-      | owner      | category | name | description |
-      | redemoinho | bicycle  | Bike | Red bicycle |
-    When I go to Rede Moinho's page of product Bike
-    Then I should not see "Change category"
-    And I should not see "Edit name"
-    And I should not see "Edit description"
-    And I should not see "Edit basic information"
-    And I should not see "Change image"
-
-  Scenario: a not allowed user cannot see edit links
-    Given the following users
-      | login       | name         |
-      | mariasantos | Maria Santos |
-    And the following product_category
-      | name    |
-      | Bicycle |
-    And the following products
-      | owner      | category | name | description |
-      | redemoinho | bicycle  | Bike | Red bicycle |
-    And I am logged in as "mariasantos"
-    When I go to Rede Moinho's page of product Bike
-    Then I should not see "Change category"
-    And I should not see "Edit name"
-    And I should not see "Edit description"
-    And I should not see "Edit basic information"
-    And I should not see "Change image"
-
-  @selenium
-  Scenario: edit name of a product
-    Given the following product_category
-      | name    |
-      | Bicycle |
-    And the following products
-      | owner      | category | name |
-      | redemoinho | bicycle  | Bike |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Bike
-    And I follow "Edit name"
-    And I fill in "Red bicycle" for "product_name"
-    And I press "Save"
-    Then I should see "Red bicycle"
-    And I should be on Rede Moinho's page of product Red bicycle
-
-  @selenium
-  Scenario: cancel edition of a product name
-    Given the following product_category
-      | name |
-      | Bicycle |
-    And the following products
-      | owner      | category | name |
-      | redemoinho | bicycle  | Bike |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Bike
-    And I follow "Edit name"
-    When I follow "Cancel"
-    Then I should see "Bike"
-
-  @selenium
-  Scenario: edit category of a product
-    Given the following product_category
-      | name |
-      | Eletronics |
-    And the following product_categories
-      | name | parent |
-      | Computers | eletronics |
-      | DVDs      | eletronics |
-    And the following products
-      | owner      | category   | name       |
-      | redemoinho | computers  | Generic pc |
-    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 »" from "category_id" within "#categories_container_level0"
-    Then I select "DVDs" from "category_id" within "#categories_container_level1"
-    And I press "Save and continue"
-    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
-    Given the following product_category
-      | name |
-      | Eletronics |
-    And the following product_categories
-      | name | parent |
-      | Computers | eletronics |
-      | DVDs      | eletronics |
-    And the following products
-      | owner      | category   | name       |
-      | redemoinho | computers  | Generic pc |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Generic pc
-    And I follow "Change category"
-    When I follow "Back to product"
-    Then I should see "Eletronics → Computers"
-
-
-  @selenium
-  Scenario: edit image of a product
-    Given the following product_category
-      | name |
-      | Eletronics |
-    And the following product_categories
-      | name | parent |
-      | Computers | eletronics |
-      | DVDs      | eletronics |
-    And the following products
-      | owner      | category   | name       |
-      | redemoinho | computers  | Generic pc |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Generic pc
-    And I follow "Change image"
-    When I follow "Cancel"
-    Then I should be on Rede Moinho's page of product Generic pc
-
- # FIXME Not working because of tinyMCE plus selenium
- # @selenium
- # Scenario: edit description of a product
- #   Given the following product_category
- #     | name    |
- #     | Bicycle |
- #   And the following products
- #     | owner      | category | name | description       |
- #     | redemoinho | bicycle  | Bike | A new red bicycle |
- #   And I am logged in as "joaosilva"
- #   When I go to Rede Moinho's page of product Bike
- #   Then I should see "A new red bicycle"
- #   And I follow "Edit basic information"
- #   And I type in tinyMCE field "Description" the text "An used red bicycle"
- #   And I press "Save"
- #   Then I should not see "A new red bicycle"
- #   And I should see "An used red bicycle"
- #   And I should be on Rede Moinho's page of product Bike
-
-  @selenium
-  Scenario: cancel edition of a product description
-    Given the following product_category
-      | name |
-      | Bicycle |
-    And the following products
-      | owner      | category | name | description       |
-      | redemoinho | bicycle  | Bike | A new red bicycle |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Bike
-    Then I should see "A new red bicycle"
-    And I follow "Edit description"
-    When I follow "Cancel"
-    Then I should see "A new red bicycle"
-    And I should be on Rede Moinho's page of product Bike
-
-  @selenium
-  Scenario: Edit product category and save without select any category
-    Given the following product_category
-      | name |
-      | Eletronics |
-    And the following product_category
-      | name | parent |
-      | Computers | eletronics |
-    And the following products
-      | owner      | category   | name       |
-      | redemoinho | computers  | Generic pc |
-    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 press "Save and continue"
-    Then I should not see "Product category can't be blank"
-    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
-  Scenario: Scroll categories selection to right when editing
-    Given the following product_category
-      | name |
-      | Eletronics |
-    And the following product_category
-      | name | parent |
-      | Quantum Computers | eletronics |
-    And the following product_category
-      | name | parent |
-      | Laptops from Mars | Quantum Computers |
-    And the following product_category
-      | name | parent |
-      | Netbook from Venus | Laptops from Mars |
-    And the following product_category
-      | name | parent |
-      | Nanonote nanotech with long name | Netbook from Venus |
-    And the following products
-      | owner      | category   | name       |
-      | redemoinho | Nanonote nanotech with long name | Generic pc |
-    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 "Netbook from Venus" should be visible within "#categories_container_wrapper"
-
-  @selenium
-  Scenario: Truncate long category name in selection of category
-    Given the following product_category
-      | name |
-      | Super Quantum Computers with teraflops |
-      | Nanonote nanotech with long long name |
-    And the following product_category
-      | name | parent |
-      | Netbook Quantum | Super Quantum Computers with teraflops |
-    And I am logged in as "joaosilva"
-    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... »"
-
-  @selenium
-  Scenario: Edit unit of a product together your name
-    Given the following product_category
-      | name    |
-      | Bicycle |
-    And the following products
-      | owner      | category | name |
-      | redemoinho | bicycle  | Bike |
-    And the following units
-      | singular | plural |
-      | Kilo     | Kilos  |
-    And I am logged in as "joaosilva"
-    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" from "product_unit_id" within "#product-name-form"
-    And I press "Save"
-    Then I should see "Red bicycle - kilo"
-
-  @selenium
-  Scenario: Show info about unavailable product
-    Given the following product_category
-      | name    |
-      | Bicycle |
-    And the following products
-      | owner      | category | name |
-      | redemoinho | bicycle  | Bike |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Bike
-    And I follow "Add price and other basic information"
-    And I fill in "10" for "product_price"
-    And I choose "No"
-    And I press "Save"
-    Then I should see "Product not available!"
-
-  @selenium
-  Scenario: Add and remove some qualifiers
-    Given the following product_category
-      | name    |
-      | Bicycle |
-    And the following products
-      | owner      | category | name |
-      | redemoinho | bicycle  | Bike |
-    And the following qualifiers
-      | name |
-      | Organic |
-    And the following certifiers
-      | name | qualifiers |
-      | Colivre | Organic |
-    And I am logged in as "joaosilva"
-    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" 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
-  Scenario: Show checkbox to mark product as highlight
-    Given the following product_category
-      | name    |
-      | Bicycle |
-    And the following products
-      | owner      | category | name |
-      | redemoinho | bicycle  | Bike |
-    And I am logged in as "joaosilva"
-    When I go to Rede Moinho's page of product Bike
-    And I follow "Add price and other basic information"
-    Then I should see "Highlight this product?"
-    And I check "Highlight this product?"
@@ -1,79 +0,0 @@
-Feature: my_network_block
-  As a blog owner
-  I want to see a summary of my network
-
-  Background:
-    Given the following users
-      | login     | name       |
-      | joaosilva | Joao Silva |
-    And the following blocks
-      | owner     | type           |
-      | joaosilva | MyNetworkBlock |
-      | joaosilva | FriendsBlock   |
-    And the following communities
-      | identifier       | name              | public_profile |
-      | public-community | Public Community  | true           |
-    And plugin FriendsBlock is enabled on environment
-
-  @selenium
-  Scenario: display how many public/private communities I am member
-    Given I am logged in as "joaosilva"
-    And the following communities
-      | identifier              | name                   | owner     | public_profile |
-      | other-public-community  | Other Public Community | joaosilva | true           |
-      | private-community       | Private Community      | joaosilva | false          |
-    And I am on joaosilva's homepage
-    And I should see "2 communities"
-    When I go to public-community's homepage
-    And I follow "Join"
-    And I go to joaosilva's homepage
-    Then I should see "3 communities"
-
-  @selenium
-  Scenario: not display how many invisible communities I am member
-    Given I am logged in as "joaosilva"
-    And the following communities
-      | identifier            | name                  | owner     | visible |
-      | visible-community     | Visible Community     | joaosilva | true    |
-      | not-visible-community | Not Visible Community | joaosilva | false   |
-    And I am on joaosilva's homepage
-    And I should see "One community"
-    When I go to public-community's homepage
-    And I follow "Join"
-    And I go to joaosilva's homepage
-    Then I should see "2 communities"
-
-  Scenario: display how many public/private friends I have
-    Given the following users
-      | login      | name        | public_profile |
-      | mariasilva | Maria Silva | true           |
-      | josesilva  | Jose Silva  | false          |
-    And the following blocks
-      | owner      | type         |
-      | mariasilva | FriendsBlock |
-      | josesilva  | FriendsBlock |
-    And "joaosilva" is friend of "mariasilva"
-    And I am logged in as "joaosilva"
-    And I am on joaosilva's homepage
-    Then I should see "1 friend"
-    And "joaosilva" is friend of "josesilva"
-    When I go to joaosilva's homepage
-    Then I should see "2 friends"
-
-  Scenario: not display how many invisible friends I have
-    Given the following users
-      | login      | name        |
-      | mariasilva | Maria Silva |
-      | josesilva  | Jose Silva  |
-    And the following blocks
-      | owner      | type         |
-      | mariasilva | FriendsBlock |
-      | josesilva  | FriendsBlock |
-    And "josesilva" is invisible
-    And "joaosilva" is friend of "mariasilva"
-    And I am logged in as "joaosilva"
-    When I go to joaosilva's homepage
-    Then I should see "1 friend"
-    And "joaosilva" is friend of "josesilva"
-    When I go to joaosilva's homepage
-    Then I should see "1 friend"
@@ -1,20 +0,0 @@
-Feature: profile tags
-  As a Noosfero user
-  I want to to view content tagged
-  So that I can follow the subjects I care about
-
-  Background:
-    Given the following users
-      | login    |
-      | terceiro |
-    And the following articles
-      | owner    | name   | body           | tag_list   |
-      | terceiro | text 1 | text 1 content | tag1, tag2 |
-      | terceiro | text 2 | text 2 content | tag1, tag3 |
-
-  Scenario: tag feed
-    When I go to terceiro's profile
-    And I follow "tag1"
-    And I follow "Feed for this tag"
-    Then I should see "text 1"
-    And I should see "text 2"
@@ -1,40 +0,0 @@
-Feature: session and cookies handling
-
-  As a Noosfero system administrator
-  I want Noosfero to manage well it usage of sessions and cookies
-  So that we can use HTTP caching effectively
-
-  @fixme
-  Scenario: home page, logged in
-    Given the following users
-      | login     |
-      | joaosilva |
-    When I am logged in as "joaosilva"
-    And I go to the homepage
-    Then there must be a cookie "_noosfero_session"
-
-  Scenario: home page, not logged in
-    When I go to the homepage
-    Then there must be no cookies
-
-  @fixme
-  Scenario: user_data, not logged in
-    When I make a AJAX request to the user data path
-    Then there must be no cookies
-
-  @fixme
-  Scenario: user_data, logged in
-    Given I am logged in as admin
-    When I make a AJAX request to the user data path
-    Then there must be a cookie "_noosfero_session"
-
-  # FIXME for some reason I could not test this scenario, although manual tests
-  # indicate this works!
-  # Scenario: logout
-  #   Given the following users
-  #     | login |
-  #     | joao |
-  #   When I am logged in as "joao"
-  #   And I log off
-  #   And I go to the homepage
-  #   Then there must be no cookies
@@ -278,28 +278,6 @@ Feature: signup
     Then "José da Silva" should be a member of "Free Software"
  
   @selenium
-  Scenario: join community on direct signup
-    Given the following users
-      | login | name |
-      | mariasilva | Maria Silva |
-    And the following communities
-       | name           | identifier    | owner      |
-       | Free Software  | freesoftware  | mariasilva |
-    And feature "skip_new_user_email_confirmation" is enabled on environment
-    And I am on /freesoftware
-    When I follow "Join"
-    And I follow "New user"
-    And I fill in the following within ".no-boxes":
-      | e-Mail                | josesilva@example.com |
-      | Username              | josesilva             |
-      | Password              | secret                |
-      | Password confirmation | secret                |
-      | Full name             | José da Silva         |
-    And wait for the captcha signup time
-    And I press "Create my account"
-    Then "José da Silva" should be a member of "Free Software"
-
-  @selenium
   Scenario: user registration is moderated by admin
     Given feature "admin_must_approve_new_users" is enabled on environment
     And feature "skip_new_user_email_confirmation" is disabled on environment
@@ -349,4 +327,4 @@ Feature: signup
     And I fill in "Username / Email" with "teste"
     And I fill in "Password" with "123456"
     And I press "Log in"
-    Then I should not see "teste"
 \ No newline at end of file
+    Then I should not see "teste"
@@ -1,21 +0,0 @@
-Then /^the response should be valid for (.+) minutes$/ do |n|
-  page.response_headers['Cache-Control'].split(/,\s*/).should include("max-age=#{n.to_i * 60}")
-end
-
-Then /^the cache should be public/ do
-  page.response_headers['Cache-Control'].split(/,\s*/).should include("public")
-end
-
-Then /^there must be no cache at all$/ do
-  parts = page.response_headers['Cache-Control'].split(/,\s*/)
-  parts.should include('must-revalidate')
-  parts.should include('max-age=0')
-end
-
-Then 'there must be no cookies' do
-  cookies.to_hash.should == {}
-end
-
-Then /^there must be a cookie "(.+)"$/ do |cookie_name|
-  cookies.keys.should include(cookie_name)
-end
@@ -692,11 +692,6 @@ Given /^the cache is turned (on|off)$/ do |state|
   ActionController::Base.perform_caching = (state == 'on')
 end
  
-When /^I make a AJAX request to (.*)$/ do |page|
-  header 'X-Requested-With', 'XMLHttpRequest'
-  visit(path_to(page))
-end
-
 Given /^the environment is configured to (.*) after login$/ do |option|
   redirection = case option
     when 'stay on the same page'
@@ -3,6 +3,10 @@
 require 'fast_gettext'
 module Noosfero
  
+  def self.root(default = nil)
+    ENV.fetch('RAILS_RELATIVE_URL_ROOT', default)
+  end
+
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
     pattern = disjunction.blank? ? '' : ('(' + disjunction + ')')
@@ -12,6 +12,12 @@ class Noosfero::Plugin
  
     attr_writer :should_load
  
+    # Called for each ActiveRecord class with parents
+    # See http://apidock.com/rails/ActiveRecord/ModelSchema/ClassMethods/full_table_name_prefix
+    def table_name_prefix
+      @table_name_prefix ||= "#{name.to_s.underscore}_"
+    end
+
     def should_load
       @should_load.nil? && true || @boot
     end
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.0~rc3'
+  VERSION = '1.0~rc4'
 end
@@ -0,0 +1,48 @@
+namespace :ci do
+
+  desc 'Continuous integration smoke test'
+  task :smoke do
+
+    current_branch = `git rev-parse --abbrev-ref HEAD`.strip
+    from = ENV['PREV_HEAD'] || "origin/#{current_branch}"
+    to = ENV['HEAD'] || current_branch
+    changed_files = `git diff --name-only #{from}..#{to}`.split.select do |f|
+      File.exist?(f) && f.split(File::SEPARATOR).first != 'vendor'
+    end
+
+    changed_plugin_files = changed_files.select do |f|
+      f.split(File::SEPARATOR).first == 'plugins'
+    end
+    changed_plugins = changed_plugin_files.map do |f|
+      f.split(File::SEPARATOR)[1]
+    end.uniq
+
+    changed_files -= changed_plugin_files
+
+    # explicitly changed tests
+    tests = changed_files.select { |f| f =~ /test\/.*_test\.rb$/ }
+    features = changed_files.select { |f| f =~ /\.feature$/ }
+
+    # match changed code files to their respective tests
+    changed_files.each do |f|
+      if f =~ /^(app|lib)\//
+        basename = File.basename(f, '.rb')
+        Dir.glob("test/**/#{basename}_test.rb").each do |t|
+          tests << t unless tests.include?(t)
+        end
+      end
+    end
+
+    sh 'testrb', '-Itest', *tests unless tests.empty?
+    sh 'cucumber', *features unless features.empty?
+    sh 'xvfb-run', 'cucumber', '-p', 'selenium', *features unless features.empty?
+
+    changed_plugins.each do |plugin|
+      task = "test:noosfero_plugins:#{plugin}"
+      puts "Running #{task}"
+      Rake::Task[task].execute
+    end
+
+  end
+
+end
@@ -6,17 +6,6 @@ namespace :noosfero do
  
     plugin_migration_dirs = Dir.glob(Rails.root.join('{baseplugins,config/plugins}', '*', 'db', 'migrate'))
  
-    task :load_config do
-      dirs = Dir.glob("{baseplugins,config/plugins}/*").uniq do |dir|
-        File.basename(dir)
-      end.map do |dir|
-        File.join(dir, 'db/migrate')
-      end
-      dirs.each do |dir|
-        ActiveRecord::Migrator.migrations_paths << dir
-      end
-    end
-
     task :migrate do
       plugin_migration_dirs.each do |path|
         ActiveRecord::Migrator.migrate(path, ENV["VERSION"] ?
@@ -26,5 +15,3 @@ namespace :noosfero do
   end
 end
  
-task 'db:migrate'     => 'noosfero:plugins:load_config'
-task 'db:schema:load' => 'noosfero:plugins:load_config'
+@broken_plugins = %w[
+  anti_spam
+  bsc
+  comment_classification
+  ldap
+  send_email
+  shopping_cart
+  solr
+  tolerance_time
+]
+
 @all_plugins = Dir.glob('plugins/*').map { |f| File.basename(f) } - ['template']
 @all_plugins.sort!
 @all_tasks = [:units, :functionals, :integration, :cucumber, :selenium]
@@ -104,7 +115,7 @@ def run_test(name, files)
 end
  
 def run_testrb(files)
-  sh 'testrb', '-Itest', *files
+  sh 'testrb', '-I.:test', *files
 end
  
 def run_cucumber(profile, files)
@@ -167,6 +178,7 @@ def test_sequence(plugins, tasks)
     end
   end
   rollback_plugins_state
+  yield(failed) if block_given?
   fail 'There are broken tests to be fixed!' if fail_flag
 end
  
@@ -195,13 +207,39 @@ namespace :test do
     @all_tasks.each do |taskname|
       desc "Run #{taskname} tests for all plugins"
       task taskname do
-        test_sequence(@all_plugins, taskname)
+        test_sequence(@all_plugins - @broken_plugins, taskname)
       end
     end
   end
  
   desc "Run all tests for all plugins"
   task :noosfero_plugins do
-    test_sequence(@all_plugins, @all_tasks)
+    test_sequence(@all_plugins - @broken_plugins, @all_tasks) do |failed|
+      plugins_status_report(failed)
+    end
   end
 end
+
+def plugins_status_report(failed)
+  w = @all_plugins.map { |s| s.size }.max
+
+  puts
+  printf ('=' * (w + 21)) + "\n"
+  puts 'Plugins status report'
+  printf ('=' * (w + 21)) + "\n"
+  printf "%-#{w}s %s\n", "Plugin", "Status"
+  printf ('-' * w) + ' ' + ('-' * 20) + "\n"
+
+  @all_plugins.each do |plugin|
+    if @broken_plugins.include?(plugin)
+      status = "SKIP"
+    elsif !failed[plugin] || failed[plugin].empty?
+      status = "PASS"
+    else
+      status = "FAIL: #{failed[plugin].join(', ')}"
+    end
+    printf "%-#{w}s %s\n", plugin, status
+  end
+  printf ('=' * (w + 21)) + "\n"
+  puts
+end
@@ -222,7 +222,7 @@ EOF
       puts "I: please upload the package manually!"
     end
  
-    rm_f "rm tmp/pending-release"
+    rm_f "tmp/pending-release"
   end
  
   desc 'Build Debian packages'
@@ -9,7 +9,7 @@ module WhiteListFilter
       unless iframe =~ /src=['"].*src=['"]/
         trusted_sites.each do |trusted_site|
           re_dom = trusted_site.gsub('.', '\.')
-          if iframe =~ /src=["']https?:\/\/(www\.)?#{re_dom}\//
+          if iframe =~ /src=["'](https?:)?\/\/(www\.)?#{re_dom}\//
             result = iframe
           end
         end
@@ -8,5 +8,5 @@ page.replace_html &quot;comment-count-#{@group_id}&quot;, @comments_count
 if @no_more_pages
   page.replace_html "comments_list_group_#{@group_id}_more", ""
 else
-  page.replace_html "comments_list_group_#{@group_id}_more", link_to_remote(_('More'), :url => { :profile => profile.identifier, :controller => 'comment_group_plugin_profile', :action => 'view_comments', :group_id => @group_id, :article_id => @article_id, :group_comment_page => @group_comment_page + 1}, :loaded => visual_effect(:highlight, "comments_list_group_#{@group_id}"), :method => :post, :complete => "loadCompleted(#{@group_id})")
+  page.replace_html "comments_list_group_#{@group_id}_more", link_to_remote(_('More'), :url => { :profile => profile.identifier, :controller => 'comment_group_plugin_profile', :action => 'view_comments', :group_id => @group_id, :article_id => @article_id, :group_comment_page => @group_comment_page + 1}, :method => :get)
 end
@@ -0,0 +1,83 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class ProfileController
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+  def rescue_action(e)
+    raise e
+  end
+end
+
+class ProfileControllerTest < ActionController::TestCase
+
+  def setup
+    @user = create_user('testinguser').person
+    login_as(@user.identifier)
+
+    @community = fast_create(Community, :environment_id => Environment.default)
+    @community.add_member @user
+    @community.add_admin @user
+
+    @environment = @community.environment
+    @environment.enabled_plugins = ['CommunityBlock']
+    @environment.save!
+
+    CommunityBlock.delete_all
+    @box1 = create(Box, :owner => @community)
+    @community.boxes = [@box1]
+
+    @block = CommunityBlock.new
+    @block.box = @box1
+    @block.save!
+
+    @community.blocks<<@block
+    @community.save!
+  end
+
+  should 'display community-block' do
+    get :index, :profile => @community.identifier
+    assert_tag :div, :attributes => {:class => 'community-block-logo'}
+    assert_tag :div, :attributes => {:class => 'community-block-info'}
+    assert_tag :div, :attributes => {:class => 'community-block-title'}
+    assert_tag :div, :attributes => {:class => 'community-block-description'}
+  end
+
+  should 'display *leave* button when the user is logged in and is a member of the community' do
+    get :index, :profile => @community.identifier
+    assert_tag :span, :attributes => {:class => 'community-block-button icon-remove'}
+  end
+
+  should 'display *send email to administrators* button when the user is logged in and is a member of the community' do
+    get :index, :profile => @community.identifier
+    assert_match /\{&quot;Send an e-mail&quot;:\{&quot;href&quot;:&quot;\/contact\/#{@community.identifier}\/new&quot;\}\}/, @response.body
+  end
+
+  should 'display *report* button when the user is logged in and is a member of the community' do
+    get :index, :profile => @community.identifier
+    assert_match /\{&quot;Report abuse&quot;:\{&quot;href&quot;:&quot;\/profile\/#{@community.identifier}\/report_abuse&quot;\}\}/, @response.body
+  end
+
+  should 'display *join* button when the user is logged in and is not a member of the community' do
+    @community.remove_member @user
+    get :index, :profile => @community.identifier
+    assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
+  end
+
+  should 'display *control panel* link option when the user is logged in and is community admin' do
+    get :index, :profile => @community.identifier
+    assert_match /\{&quot;Control panel&quot;:\{&quot;href&quot;:&quot;\/myprofile\/#{@community.identifier}&quot;\}\}/, @response.body
+  end
+
+  should 'display *join* button when the user is not logged in' do
+    logout
+    get :index, :profile => @community.identifier
+    assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
+  end
+
+  should 'not display *arrow* button when the user is not logged in' do
+    logout
+    get :index, :profile => @community.identifier
+    assert_no_tag :span, :attributes => {:class => 'community-block-button icon-arrow'}
+  end
+
+end
@@ -1,87 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-# Re-raise errors caught by the controller.
-class ProfileController
-  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
-  def rescue_action(e)
-    raise e
-  end
-end
-
-class ProfileControllerTest < ActionController::TestCase
-
-  def setup
-    @controller = ProfileController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
-    @user = create_user('testinguser').person
-    login_as(@user.identifier)
-
-    @community = fast_create(Community, :environment_id => Environment.default)
-    @community.add_member @user
-    @community.add_admin @user
-
-    @environment = @community.environment
-    @environment.enabled_plugins = ['CommunityBlock']
-    @environment.save!
-
-    CommunityBlock.delete_all
-    @box1 = create(Box, :owner => @community)
-    @community.boxes = [@box1]
-
-    @block = CommunityBlock.new
-    @block.box = @box1
-    @block.save!
-
-    @community.blocks<<@block
-    @community.save!
-  end
-
-  should 'display community-block' do
-    get :index, :profile => @community.identifier
-    assert_tag :div, :attributes => {:class => 'community-block-logo'}
-    assert_tag :div, :attributes => {:class => 'community-block-info'}
-    assert_tag :div, :attributes => {:class => 'community-block-title'}
-    assert_tag :div, :attributes => {:class => 'community-block-description'}
-  end
-
-  should 'display *leave* button when the user is logged in and is a member of the community' do
-    get :index, :profile => @community.identifier
-    assert_tag :span, :attributes => {:class => 'community-block-button icon-remove'}
-  end
-
-  should 'display *send email to administrators* button when the user is logged in and is a member of the community' do
-    get :index, :profile => @community.identifier
-    assert_match /\{&quot;Send an e-mail&quot;:\{&quot;href&quot;:&quot;\/contact\/#{@community.identifier}\/new&quot;\}\}/, @response.body
-  end
-
-  should 'display *report* button when the user is logged in and is a member of the community' do
-    get :index, :profile => @community.identifier
-    assert_match /\{&quot;Report abuse&quot;:\{&quot;href&quot;:&quot;\/profile\/#{@community.identifier}\/report_abuse&quot;\}\}/, @response.body
-  end
-
-  should 'display *join* button when the user is logged in and is not a member of the community' do
-    @community.remove_member @user
-    get :index, :profile => @community.identifier
-    assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
-  end
-
-  should 'display *control panel* link option when the user is logged in and is community admin' do
-    get :index, :profile => @community.identifier
-    assert_match /\{&quot;Control panel&quot;:\{&quot;href&quot;:&quot;\/myprofile\/#{@community.identifier}&quot;\}\}/, @response.body
-  end
-
-  should 'display *join* button when the user is not logged in' do
-    logout
-    get :index, :profile => @community.identifier
-    assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
-  end
-
-  should 'not display *arrow* button when the user is not logged in' do
-    logout
-    get :index, :profile => @community.identifier
-    assert_no_tag :span, :attributes => {:class => 'community-block-button icon-arrow'}
-  end
-
-end
@@ -23,7 +23,7 @@
       <%= link_to(
             content_tag('span','',:class => 'community-block-button icon-arrow'),
             '#',
-            :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false;",
+            :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false;",
             :class => 'simplemenu-trigger') %>
  
       <% end %>
@@ -32,11 +32,11 @@
         <% if profile.members.include?(user) || profile.already_request_membership?(user) %>
             <%= link_to(
                   content_tag('span', '', :class => 'community-block-button icon-remove'),
-                  profile.leave_url) %>
+                  profile.leave_url, :class => 'join-community') %>
         <% else %>
             <%= link_to(
                   content_tag('span', '', :class => 'community-block-button icon-add'),
-                  profile.join_url) %>
+                  profile.join_url, :class => 'join-community') %>
         <% end %>
       <% else %>
         <%= link_to(
@@ -101,9 +101,6 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'render tracks in track list block' do
     @block = CommunityTrackPlugin::TrackListBlock.create!(:box => @profile.boxes.last)
     get :view_page, @step.url
-    file = File.open('result.html', 'w+')
-    file.write(@response.body)
-    file.close
     assert_tag :tag => 'div', :attributes => { :class => "item category_#{@track.category_name}" }, :descendant => { :tag => 'div', :attributes => { :class => 'steps' }, :descendant => { :tag => 'span', :attributes => { :class => "step #{@block.status_class(@step)}" } } }
   end
  
@@ -6,10 +6,13 @@ class CommunityTrackPluginTest &lt; ActiveSupport::TestCase
     @plugin = CommunityTrackPlugin.new
     @profile = fast_create(Community)
     @params = {}
-    @plugin.stubs(:context).returns(self)
+    @context = mock
+    @context.stubs(:profile).returns(@profile)
+    @context.stubs(:params).returns(@params)
+    @plugin.stubs(:context).returns(@context)
   end
  
-  attr_reader :profile, :params
+  attr_reader :profile, :params, :context
  
   should 'has name' do
     assert CommunityTrackPlugin.plugin_name
@@ -28,37 +31,37 @@ class CommunityTrackPluginTest &lt; ActiveSupport::TestCase
   end
  
   should 'do not return Track as a content type if profile is not a community' do
-    @profile = Organization.new
+    context.stubs(:profile).returns(Organization.new)
     assert_not_includes @plugin.content_types, CommunityTrackPlugin::Track
   end
  
   should 'do not return Track as a content type if there is a parent' do
-    parent = fast_create(Blog, :profile_id => @profile.id)
-    @params[:parent_id] = parent.id
+    parent = fast_create(Blog, :profile_id => profile.id)
+    params[:parent_id] = parent.id
     assert_not_includes @plugin.content_types, CommunityTrackPlugin::Track
   end
  
   should 'return Step as a content type if parent is a Track' do
-    parent = fast_create(CommunityTrackPlugin::Track, :profile_id => @profile.id)
-    @params[:parent_id] = parent.id
+    parent = fast_create(CommunityTrackPlugin::Track, :profile_id => profile.id)
+    params[:parent_id] = parent.id
     assert_includes @plugin.content_types, CommunityTrackPlugin::Step
   end
  
   should 'do not return Step as a content type if parent is not a Track' do
-    parent = fast_create(Blog, :profile_id => @profile.id)
-    @params[:parent_id] = parent.id
+    parent = fast_create(Blog, :profile_id => profile.id)
+    params[:parent_id] = parent.id
     assert_not_includes @plugin.content_types, CommunityTrackPlugin::Step
   end
  
   should 'return Track and Step as a content type if context has no params' do
-    parent = fast_create(Blog, :profile_id => @profile.id)
-    expects(:respond_to?).with(:params).returns(false)
+    parent = fast_create(Blog, :profile_id => profile.id)
+    context.expects(:respond_to?).with(:params).returns(false)
     assert_equivalent [CommunityTrackPlugin::Step, CommunityTrackPlugin::Track], @plugin.content_types
   end
  
   should 'return Track and Step as a content type if params is nil' do
-    parent = fast_create(Blog, :profile_id => @profile.id)
-    @params = nil
+    parent = fast_create(Blog, :profile_id => profile.id)
+    context.stubs(:params).returns(nil)
     assert_equivalent [CommunityTrackPlugin::Step, CommunityTrackPlugin::Track], @plugin.content_types
   end
  
@@ -38,9 +38,11 @@ class ContainerBlockPlugin::ContainerBlock &lt; Block
   end
  
   def create_box
-    container_box = Box.create!(:owner => owner)
-    container_box.update_attribute(:position, nil)
+    container_box = Box.new(:owner => owner)
+    container_box.save!
     settings[:container_box_id] = container_box.id
+    copy_blocks unless @blocks_to_copy.blank?
+    container_box.update_attribute(:position, nil)
     save!
   end
  
@@ -71,4 +73,23 @@ class ContainerBlockPlugin::ContainerBlock &lt; Block
     end
   end
  
+  def copy_from_with_container(block)
+    copy_from_without_container(block)
+    children_settings = block.children_settings
+    @blocks_to_copy = block.blocks
+  end
+
+  alias_method_chain :copy_from, :container
+
+  def copy_blocks
+    new_children_settings = {}
+    @blocks_to_copy.map do |child|
+      new_block = child.class.new(:title => child[:title])
+      new_block.copy_from(child)
+      container_box.blocks << new_block
+      new_children_settings[new_block.id] = children_settings[child.id] if children_settings[child.id]
+    end
+    settings[:children_settings] = new_children_settings
+  end
+
 end
@@ -0,0 +1,47 @@
+require 'test_helper'
+
+class ProfileTest < ActiveSupport::TestCase
+
+  should 'not lose position values for boxes when the template has a container block' do
+    template = fast_create(Profile)
+    template.boxes = [Box.new, Box.new]
+    template.boxes[0].blocks << ContainerBlockPlugin::ContainerBlock.new
+    template.boxes[1].blocks << Block.new
+    template.is_template = true
+    template.save!
+
+    p = Profile.new
+    p.identifier = 'profile-with-template'
+    p.name = p.identifier
+    p.template = template.reload
+    p.save!
+
+    assert_equivalent p.reload.boxes.map(&:position), template.reload.boxes.map(&:position)
+  end
+
+  should 'copy contents of a container block that belongs to the template' do
+    template = fast_create(Profile)
+    template.boxes = [Box.new]
+    template.boxes[0].blocks << ContainerBlockPlugin::ContainerBlock.new
+    template.is_template = true
+    template.save!
+
+    container = template.blocks.first
+    container.container_box.blocks << Block.new
+    container.container_box.blocks << Block.new
+    container.settings[:children_settings] = {}
+    container.settings[:children_settings][container.blocks.last.id] = 999
+    container.save!
+
+    p = Profile.new
+    p.identifier = 'another-profile-with-template'
+    p.name = p.identifier
+    p.template = template.reload
+    p.save!
+
+    container_copy = p.blocks.first
+    assert_equal({container_copy.blocks.last.id => 999}, container_copy.children_settings)
+    assert_equal container.blocks.size, p.blocks.first.blocks.size
+  end
+
+end
@@ -23,7 +23,7 @@ class CustomFormsPluginMyprofileController &lt; MyProfileController
  
     respond_to do |format|
       if @form.save
-        flash[:notice] = _("Custom form #{@form.name} was successfully created.")
+        flash[:notice] = _("Custom form %s was successfully created.") % @form.name
         format.html { redirect_to(:action=>'index') }
       else
         format.html { render :action => 'new' }
@@ -43,7 +43,7 @@ class CustomFormsPluginMyprofileController &lt; MyProfileController
  
     respond_to do |format|
       if @form.save
-        flash[:notice] = _("Custom form #{@form.name} was successfully updated.")
+        flash[:notice] = _("Custom form %s was successfully updated.") % @form.name
         format.html { redirect_to(:action=>'index') }
       else
         session['notice'] = _('Form could not be updated')
@@ -226,7 +226,7 @@ class CustomFormsPluginMyprofileControllerTest &lt; ActionController::TestCase
   end
  
   should 'list pending submissions for a form' do
-    person = fast_create(Person)
+    person = create_user('john').person
     form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software', :for_admission => true)
     task = CustomFormsPlugin::AdmissionSurvey.create!(:form_id => form.id, :target => person, :requestor => profile)
  
@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + &#39;/../../../../../test/test_helper&#39;
 class CustomFormsPlugin::AdmissionSurveyTest < ActiveSupport::TestCase
   should 'add member to community on perform' do
     profile = fast_create(Community)
-    person = fast_create(Person)
+    person = create_user('john').person
     form = CustomFormsPlugin::Form.create!(:name => 'Simple Form', :profile => profile)
     task = CustomFormsPlugin::AdmissionSurvey.create!(:form_id => form.id, :target => person, :requestor => profile)
  
@@ -244,7 +244,7 @@ class CustomFormsPlugin::FormTest &lt; ActiveSupport::TestCase
  
   should 'cancel survey tasks after removing a form' do
     profile = fast_create(Profile)
-    person = fast_create(Person)
+    person = create_user('john').person
  
     form1 = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => profile)
     form2 = CustomFormsPlugin::Form.create!(:name => 'Operation System', :profile => profile)
@@ -13,7 +13,7 @@ class CustomFormsPlugin::MembershipSurveyTest &lt; ActiveSupport::TestCase
  
   should 'create submission with answers on perform' do
     profile = fast_create(Profile)
-    person = fast_create(Person)
+    person = create_user('john').person
     form = CustomFormsPlugin::Form.create!(:name => 'Simple Form', :profile => profile)
     field = CustomFormsPlugin::Field.create!(:name => 'Name', :form => form)
     task = CustomFormsPlugin::MembershipSurvey.create!(:form_id => form.id, :submission => {field.id.to_s => 'Jack'}, :target => person, :requestor => profile)
@@ -31,7 +31,7 @@ class CustomFormsPlugin::MembershipSurveyTest &lt; ActiveSupport::TestCase
  
   should 'have a scope that retrieves all tasks requested by profile' do
     profile = fast_create(Profile)
-    person = fast_create(Person)
+    person = create_user('john').person
     form = CustomFormsPlugin::Form.create!(:name => 'Simple Form', :profile => profile)
     task1 = CustomFormsPlugin::MembershipSurvey.create!(:form_id => form.id, :target => person, :requestor => profile)
     task2 = CustomFormsPlugin::MembershipSurvey.create!(:form_id => form.id, :target => person, :requestor => fast_create(Profile))
@@ -5,7 +5,7 @@ class RoleAssignmentsTest &lt; ActiveSupport::TestCase
     environment = Environment.default
     environment.enable_plugin(CustomFormsPlugin)
     organization = fast_create(Organization)
-    person = fast_create(Person)
+    person = create_user('john').person
     f1 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 1', :on_membership => true)
     f2 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 2', :on_membership => true)
     f3 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 3', :on_membership => false)
@@ -19,7 +19,7 @@ class RoleAssignmentsTest &lt; ActiveSupport::TestCase
     environment = Environment.default
     environment.enable_plugin(CustomFormsPlugin)
     organization = fast_create(Organization)
-    person = fast_create(Person)
+    person = create_user('john').person
     form = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form', :on_membership => true, :access => 'associated')
  
     assert_difference 'CustomFormsPlugin::MembershipSurvey.count', 1 do
@@ -31,7 +31,7 @@ class RoleAssignmentsTest &lt; ActiveSupport::TestCase
     environment = Environment.default
     environment.enable_plugin(CustomFormsPlugin)
     organization = fast_create(Organization)
-    person = fast_create(Person)
+    person = create_user('john').person
     form1 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 1', :on_membership => true)
     organization.add_member(person)
  
@@ -59,7 +59,7 @@ class RoleAssignmentsTest &lt; ActiveSupport::TestCase
     environment = Environment.default
     environment.enable_plugin(CustomFormsPlugin)
     organization = fast_create(Organization)
-    person = fast_create(Person)
+    person = create_user('john').person
     f1 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 1', :for_admission => true)
     f2 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 2', :for_admission => true)
     f3 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 3', :for_admission => false)
@@ -1,10 +0,0 @@
-begin
-  gem "net-ldap", '=0.3.1'
-rescue Gem::LoadError => exception
-  system "gem install --user-install net-ldap -v 0.3.1"
-end
-
-puts "WARNING: This plugin is not setting up a ldap test server automatically.
-Some tests may not be running. If you want to fully test this plugin, please
-setup the ldap test server and make the proper configurations on
-fixtures/ldap.yml.\n\n"
@@ -47,4 +47,8 @@ class MembersBlock &lt; PeopleBlockBase
     }
   end
  
+  def self.expire_on
+    {:profile => [:role_assignment]}
+  end
+
 end
 require File.dirname(__FILE__) + '/../test_helper'
  
-class FriendsBlockTest < ActiveSupport::TestCase
+class FriendsBlockTest < ActionView::TestCase
  
   should 'inherit from Block' do
     assert_kind_of Block, FriendsBlock.new
@@ -8,6 +8,7 @@ class FriendsBlockTest &lt; ActiveSupport::TestCase
  
  
   should 'declare its default title' do
+    FriendsBlock.any_instance.expects(:profile_count).returns(0)
     assert_not_equal Block.new.default_title, FriendsBlock.new.default_title
   end
  
@@ -60,7 +61,7 @@ class FriendsBlockTest &lt; ActiveSupport::TestCase
  
  
   should 'prioritize profiles with image by default' do
-    assert FriendsBlock.new.prioritize_people_with_image
+    assert FriendsBlock.new.prioritize_profiles_with_image
   end
  
  
@@ -98,10 +99,10 @@ class FriendsBlockTest &lt; ActiveSupport::TestCase
     block = FriendsBlock.new
     block.expects(:owner).returns(person1).at_least_once
  
-    expects(:_).with('View all').returns('View all')
-    expects(:link_to).with('View all', :profile => 'mytestperson', :controller => 'profile', :action => 'friends').returns('link-to-friends')
-
-    assert_equal 'link-to-friends', instance_eval(&block.footer)
+    instance_eval(&block.footer)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestperson/friends]'
+    end
   end
  
  
 require File.dirname(__FILE__) + '/../test_helper'
  
-class MembersBlockTest < ActiveSupport::TestCase
+class MembersBlockTest < ActionView::TestCase
  
   should 'inherit from Block' do
     assert_kind_of Block, MembersBlock.new
@@ -60,7 +60,7 @@ class MembersBlockTest &lt; ActiveSupport::TestCase
  
  
   should 'prioritize profiles with image by default' do
-    assert MembersBlock.new.prioritize_people_with_image
+    assert MembersBlock.new.prioritize_profiles_with_image
   end
  
  
@@ -145,10 +145,10 @@ class MembersBlockTest &lt; ActiveSupport::TestCase
     block.box = profile.boxes.first
     block.save!
  
-    expects(:_).with('View all').returns('View all')
-    expects(:link_to).with('View all' , :profile => 'mytestuser', :controller => 'people_block_plugin_profile', :action => 'members', :role_key => block.visible_role).returns('link-to-members')
-
-    assert_equal 'link-to-members', instance_eval(&block.footer)
+    instance_eval(&block.footer)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestuser/plugin/people_block/members]'
+    end
   end
  
   should 'provide link to members page with a selected role' do
@@ -158,10 +158,10 @@ class MembersBlockTest &lt; ActiveSupport::TestCase
     block.visible_role = 'profile_member'
     block.save!
  
-    expects(:_).with('View all').returns('View all')
-    expects(:link_to).with('View all' , :profile => 'mytestuser', :controller => 'people_block_plugin_profile', :action => 'members', :role_key => block.visible_role).returns('link-to-members')
-
-    assert_equal 'link-to-members', instance_eval(&block.footer)
+    instance_eval(&block.footer)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestuser/plugin/people_block/members?role_key=profile_member]'
+    end
   end
  
   should 'provide a role to be displayed (and default to nil)' do
...	...	@@ -198,6 +198,7 @@ Martín Olivera <molivera@solar.org.ar>
198	198	Moises Machado <moises@colivre.coop.br>
199	199	Naíla Alves <naila@colivre.coop.br>
200	200	Nanda Lopes <nanda.listas+psl@gmail.com>
	201	+Parley Martins <parleypachecomartins@gmail.com>
201	202	Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
202	203	Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
203	204	Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
...	...
...	...	@@ -18,6 +18,7 @@ gem 'rake', :require => false
18	18	gem 'rest-client', '~> 1.6.7'
19	19	gem 'exception_notification', '~> 4.0.1'
20	20	gem 'gettext', '~> 2.2.1', :require => false, :group => :development
	21	+gem 'locale', '~> 2.0.5'
21	22
22	23	# FIXME list here all actual dependencies (i.e. the ones in debian/control),
23	24	# with their GEM names (not the Debian package names)
...	...	@@ -40,8 +41,9 @@ group :cucumber do
40	41	gem 'selenium-webdriver', '~> 2.39.0'
41	42	end
42	43
43		-# include plugin gemfiles
44		-Dir.glob(File.join('config', 'plugins', '*')).each do \|plugin\|
45		- plugin_gemfile = File.join(plugin, 'Gemfile')
46		- eval File.read(plugin_gemfile) if File.exists?(plugin_gemfile)
	44	+# include gemfiles from enabled plugins
	45	+# plugins in baseplugins/ are not included on purpose. They should not have any
	46	+# dependencies.
	47	+Dir.glob('config/plugins/*/Gemfile').each do \|gemfile\|
	48	+ eval File.read(gemfile)
47	49	end
...	...
...	...	@@ -186,8 +186,8 @@ Apache instalation
186	186
187	187	# apt-get install apache2
188	188
189		-Apache configuration
190		---------------------
	189	+Configuration - noosfero at /
	190	+-----------------------------
191	191
192	192	First you have to enable the following some apache modules:
193	193
...	...	@@ -257,6 +257,62 @@ Now restart your apache server (as root):
257	257
258	258	# invoke-rc.d apache2 restart
259	259
	260	+Configuration - noosfero at a /subdirectory
	261	+-------------------------------------------
	262	+
	263	+This section describes how to configure noosfero at a subdirectory, what is
	264	+specially useful when you want Noosfero to share a domain name with other
	265	+applications. For example you can host noosfero at yourdomain.com/social, a
	266	+webmail application at yourdomain.com/webmail, and have a static HTML website
	267	+at yourdomain.com/.
	268	+
	269	+NOTE: Some plugins might not work well with this setting. Before deploying
	270	+this setting, make sure you test that everything you need works properly with
	271	+it.
	272	+
	273	+The configuration is similar to the main configuration instructions, except for
	274	+the following points. In the description below, replace '/subdirectory' with
	275	+the actual subdirectory you want.
	276	+
	277	+1) add a `prefix: /subdirectory` line to your thin configuration file (thin.yml).
	278	+
	279	+1.1) remember to restart the noosfero application server whenever you make
	280	+changes to that configuration file.
	281	+
	282	+ # service noosfero restart
	283	+
	284	+2) add a line saying `export RAILS_RELATIVE_URL_ROOT=/subdirectory` to
	285	+/etc/default/noosfero (you can create it with just this line if it does not
	286	+exist already).
	287	+
	288	+3) You should add the following apache configuration to an existing virtual
	289	+host (plus the `<Proxy balancer://noosfero>` section as displayed above):
	290	+
	291	+```
	292	+Alias /subdirectory /path/to/noosfero/public
	293	+<Directory "/path/to/noosfero/public">
	294	+ Options FollowSymLinks
	295	+ AllowOverride None
	296	+ Order Allow,Deny
	297	+ Allow from all
	298	+
	299	+ Include /path/to/noosfero/etc/noosfero/apache/cache.conf
	300	+
	301	+ RewriteEngine On
	302	+ RewriteBase /subdirectory
	303	+ # Rewrite index to check for static index.html
	304	+ RewriteRule ^$ index.html [QSA]
	305	+ # Rewrite to check for Rails cached page
	306	+ RewriteRule ^([^.]+)$ $1.html [QSA]
	307	+ RewriteCond %{REQUEST_FILENAME} !-f
	308	+ RewriteRule ^(.*)$ http://localhost:3000%{REQUEST_URI} [P,QSA,L]
	309	+</Directory>
	310	+```
	311	+
	312	+3.1) remember to reload the apache server whenever any apache configuration
	313	+file changes.
	314	+
	315	+ # sudo service apache2 reload
260	316
261	317	Enabling exception notifications
262	318	================================
...	...
...	...	@@ -193,7 +193,7 @@ class AccountController < ApplicationController
193	193	else
194	194	@change_password.errors[:base] << _('Could not find any user with %s equal to "%s".') % [fields_label, params[:value]]
195	195	end
196		- rescue ActiveRecord::RecordInvald
	196	+ rescue ActiveRecord::RecordInvalid
197	197	@change_password.errors[:base] << _('Could not perform password recovery for the user.')
198	198	end
199	199	end
...	...
...	...	@@ -126,7 +126,7 @@ class ContentViewerController < ApplicationController
126	126	elsif !@page.display_to?(user)
127	127	if !profile.public?
128	128	private_profile_partial_parameters
129		- render :template => 'profile/_private_profile', :status => 403
	129	+ render :template => 'profile/_private_profile', :status => 403, :formats => [:html]
130	130	allowed = false
131	131	else #if !profile.visible?
132	132	render_access_denied
...	...
...	...	@@ -17,7 +17,11 @@ class ProfileController < PublicController
17	17	end
18	18	@tags = profile.article_tags
19	19	unless profile.display_info_to?(user)
20		- profile.visible? ? private_profile : invisible_profile
	20	+ if profile.visible?
	21	+ private_profile
	22	+ else
	23	+ invisible_profile
	24	+ end
21	25	end
22	26	end
23	27
...	...	@@ -315,7 +319,7 @@ class ProfileController < PublicController
315	319	abuse_report = AbuseReport.new(params[:abuse_report])
316	320	if !params[:content_type].blank?
317	321	article = params[:content_type].constantize.find(params[:content_id])
318		- abuse_report.content = instance_eval(&article.reported_version)
	322	+ abuse_report.content = article_reported_version(article)
319	323	end
320	324
321	325	user.register_report(abuse_report, profile)
...	...	@@ -394,6 +398,7 @@ class ProfileController < PublicController
394	398
395	399	def private_profile
396	400	private_profile_partial_parameters
	401	+ render :action => 'index', :status => 403
397	402	end
398	403
399	404	def invisible_profile
...	...
...	...	@@ -90,10 +90,14 @@ class SearchController < PublicController
90	90	end
91	91
92	92	def events
93		- year = (params[:year] ? params[:year].to_i : Date.today.year)
94		- month = (params[:month] ? params[:month].to_i : Date.today.month)
95		- day = (params[:day] ? params[:day].to_i : Date.today.day)
96		- @date = build_date(year, month, day)
	93	+ if params[:year].blank? && params[:year].blank? && params[:day].blank?
	94	+ @date = Date.today
	95	+ else
	96	+ year = (params[:year] ? params[:year].to_i : Date.today.year)
	97	+ month = (params[:month] ? params[:month].to_i : Date.today.month)
	98	+ day = (params[:day] ? params[:day].to_i : 1)
	99	+ @date = build_date(year, month, day)
	100	+ end
97	101	date_range = (@date - 1.month).at_beginning_of_month..(@date + 1.month).at_end_of_month
98	102
99	103	@events = []
...	...
...	...	@@ -304,7 +304,7 @@ module ApplicationHelper
304	304	def partial_for_class(klass, prefix=nil, suffix=nil)
305	305	raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
306	306	name = klass.name.underscore
307		- controller.view_paths.reverse_each do \|view_path\|
	307	+ controller.view_paths.each do \|view_path\|
308	308	partial = partial_for_class_in_view_path(klass, view_path, prefix, suffix)
309	309	return partial if partial
310	310	end
...	...	@@ -1377,7 +1377,7 @@ module ApplicationHelper
1377	1377	# are old things that do not support it we are keeping this hot spot.
1378	1378	html = @plugins.pipeline(:parse_content, html, source).first
1379	1379	end
1380		- html
	1380	+ html && html.html_safe
1381	1381	end
1382	1382
1383	1383	def convert_macro(html, source)
...	...
...	...	@@ -3,6 +3,12 @@ module ArticleHelper
3	3	include PrototypeHelper
4	4	include TokenHelper
5	5
	6	+ def article_reported_version(article)
	7	+ search_path = Rails.root.join('app', 'views', 'shared', 'reported_versions')
	8	+ partial_path = File.join('shared', 'reported_versions', 'profile', partial_for_class_in_view_path(article.class, search_path))
	9	+ render_to_string(:partial => partial_path, :locals => {:article => article})
	10	+ end
	11	+
6	12	def custom_options_for_article(article, tokenized_children)
7	13	@article = article
8	14
...	...
1	1	module ProfileHelper
2	2
3		- def display_field(title, profile, field, force = false)
	3	+ COMMON_CATEGORIES = ActiveSupport::OrderedHash.new
	4	+ COMMON_CATEGORIES[:content] = [:blogs, :image_galleries, :events, :article_tags]
	5	+ COMMON_CATEGORIES[:interests] = [:interests]
	6	+ COMMON_CATEGORIES[:general] = nil
	7	+
	8	+ PERSON_CATEGORIES = ActiveSupport::OrderedHash.new
	9	+ PERSON_CATEGORIES[:basic_information] = [:nickname, :sex, :birth_date, :location, :privacy_setting, :created_at]
	10	+ PERSON_CATEGORIES[:contact] = [:contact_phone, :cell_phone, :comercial_phone, :contact_information, :email, :personal_website, :jabber_id]
	11	+ PERSON_CATEGORIES[:location] = [:address, :address_reference, :zip_code, :city, :state, :district, :country, :nationality]
	12	+ PERSON_CATEGORIES[:work] = [:organization, :organization_website, :professional_activity]
	13	+ PERSON_CATEGORIES[:study] = [:schooling, :formation, :area_of_study]
	14	+ PERSON_CATEGORIES[:network] = [:friends, :communities, :enterprises]
	15	+ PERSON_CATEGORIES.merge!(COMMON_CATEGORIES)
	16	+
	17	+ ORGANIZATION_CATEGORIES = ActiveSupport::OrderedHash.new
	18	+ ORGANIZATION_CATEGORIES[:basic_information] = [:display_name, :created_at, :foundation_year, :type, :language, :members_count, :location, :address_reference, :historic_and_current_context, :admins]
	19	+ ORGANIZATION_CATEGORIES[:contact] = [:contact_person, :contact_phone, :contact_email, :organization_website, :jabber_id]
	20	+ ORGANIZATION_CATEGORIES[:economic] = [:business_name, :acronym, :economic_activity, :legal_form, :products, :activities_short_description, :management_information]
	21	+ ORGANIZATION_CATEGORIES.merge!(COMMON_CATEGORIES)
	22	+
	23	+ CATEGORY_MAP = ActiveSupport::OrderedHash.new
	24	+ CATEGORY_MAP[:person] = PERSON_CATEGORIES
	25	+ CATEGORY_MAP[:organization] = ORGANIZATION_CATEGORIES
	26	+
	27	+ FORCE = {
	28	+ :person => [:privacy_setting],
	29	+ :organization => [:privacy_setting, :location],
	30	+ }
	31	+
	32	+ MULTIPLE = {
	33	+ :person => [:blogs, :image_galleries, :interests],
	34	+ :organization => [:blogs, :image_galleries, :interests],
	35	+ }
	36	+
	37	+ CUSTOM_LABELS = {
	38	+ :zip_code => _('ZIP code'),
	39	+ :email => _('e-Mail'),
	40	+ :jabber_id => _('Jabber'),
	41	+ :birth_date => _('Date of birth'),
	42	+ :created_at => _('Profile created at'),
	43	+ :members_count => _('Members'),
	44	+ :privacy_setting => _('Privacy setting'),
	45	+ :article_tags => _('Tags')
	46	+ }
	47	+
	48	+ EXCEPTION = {
	49	+ :person => [:image, :preferred_domain, :description, :tag_list],
	50	+ :organization => [:image, :preferred_domain, :description, :tag_list, :address, :zip_code, :city, :state, :country, :district]
	51	+ }
	52	+
	53	+ def general_fields
	54	+ categorized_fields = CATEGORY_MAP[kind].values.flatten
	55	+ profile.class.fields.map(&:to_sym) - categorized_fields - EXCEPTION[kind]
	56	+ end
	57	+
	58	+ def kind
	59	+ if profile.kind_of?(Person)
	60	+ :person
	61	+ else
	62	+ :organization
	63	+ end
	64	+ end
	65	+
	66	+ def title(field, entry = nil)
	67	+ return self.send("#{field}_custom_title", entry) if MULTIPLE[kind].include?(field) && entry.present?
	68	+ CUSTOM_LABELS[field.to_sym] \|\| _(field.to_s.humanize)
	69	+ end
	70	+
	71	+ def display_field(field)
	72	+ force = FORCE[kind].include?(field)
	73	+ multiple = MULTIPLE[kind].include?(field)
4	74	unless force \|\| profile.may_display_field_to?(field, user)
5	75	return ''
6	76	end
7		- value = profile.send(field)
8		- if !value.blank?
9		- if block_given?
10		- value = yield(value)
11		- end
12		- content_tag('tr', content_tag('td', title, :class => 'field-name') + content_tag('td', value))
	77	+ value = begin profile.send(field) rescue nil end
	78	+ return '' if value.blank?
	79	+ if value.kind_of?(Hash)
	80	+ content = self.send("treat_#{field}", value)
	81	+ content_tag('tr', content_tag('td', title(field), :class => 'field-name') + content_tag('td', content))
13	82	else
14		- ''
	83	+ entries = multiple ? value : [] << value
	84	+ entries.map do \|entry\|
	85	+ content = self.send("treat_#{field}", entry)
	86	+ unless content.blank?
	87	+ content_tag('tr', content_tag('td', title(field, entry), :class => 'field-name') + content_tag('td', content))
	88	+ end
	89	+ end.join("\n")
15	90	end
16	91	end
17	92
18		- def display_contact(profile)
19		- fields = []
20		- fields << display_field(_('Address:'), profile, :address).html_safe
21		- fields << display_field(_('ZIP code:'), profile, :zip_code).html_safe
22		- fields << display_field(_('Contact phone:'), profile, :contact_phone).html_safe
23		- fields << display_field(_('e-Mail:'), profile, :email) { \|email\| link_to_email(email) }.html_safe
24		- fields << display_field(_('Personal website:'), profile, :personal_website).html_safe
25		- fields << display_field(_('Jabber:'), profile, :jabber_id).html_safe
26		- if fields.reject!(&:blank?).empty?
27		- ''
28		- else
29		- content_tag('tr', content_tag('th', _('Contact'), { :colspan => 2 })) + fields.join.html_safe
	93	+ def treat_email(email)
	94	+ link_to_email(email)
	95	+ end
	96	+
	97	+ def treat_organization_website(url)
	98	+ link_to(url, url)
	99	+ end
	100	+
	101	+ def treat_sex(gender)
	102	+ { 'male' => _('Male'), 'female' => _('Female') }[gender]
	103	+ end
	104	+
	105	+ def treat_date(date)
	106	+ show_date(date.to_date)
	107	+ end
	108	+ alias :treat_birth_date :treat_date
	109	+ alias :treat_created_at :treat_date
	110	+
	111	+ def treat_friends(friends)
	112	+ link_to friends.count, :controller => 'profile', :action => 'friends'
	113	+ end
	114	+
	115	+ def treat_communities(communities)
	116	+ link_to communities.count, :controller => "profile", :action => 'communities'
	117	+ end
	118	+
	119	+ def treat_enterprises(enterprises)
	120	+ if environment.disabled?('disable_asset_enterprises')
	121	+ link_to enterprises.count, :controller => "profile", :action => 'enterprises'
	122	+ end
	123	+ end
	124	+
	125	+ def treat_members_count(count)
	126	+ link_to count, :controller => 'profile', :action => 'members'
	127	+ end
	128	+
	129	+ def treat_products(products)
	130	+ if profile.kind_of?(Enterprise) && profile.environment.enabled?('products_for_enterprises')
	131	+ link_to _('Products/Services'), :controller => 'catalog', :action => 'index'
30	132	end
31	133	end
32	134
33		- def display_work_info(profile)
34		- organization = display_field(_('Organization:'), profile, :organization)
35		- organization_site = display_field(_('Organization website:'), profile, :organization_website) { \|url\| link_to(url, url) }
36		- if organization.blank? && organization_site.blank?
37		- ''
	135	+ def treat_admins(admins)
	136	+ profile.admins.map { \|admin\| link_to(admin.short_name, admin.url)}.join(', ')
	137	+ end
	138	+
	139	+ def treat_blogs(blog)
	140	+ link_to(n_('One post', '%{num} posts', blog.posts.published.count) % { :num => blog.posts.published.count }, blog.url)
	141	+ end
	142	+
	143	+ def treat_image_galleries(gallery)
	144	+ link_to(n_('One picture', '%{num} pictures', gallery.images.published.count) % { :num => gallery.images.published.count }, gallery.url)
	145	+ end
	146	+
	147	+ def treat_events(events)
	148	+ link_to events.published.count, :controller => 'events', :action => 'events'
	149	+ end
	150	+
	151	+ def treat_article_tags(tags)
	152	+ tag_cloud @tags, :id, { :action => 'tags' }, :max_size => 18, :min_size => 10
	153	+ end
	154	+
	155	+ def treat_interests(interest)
	156	+ link_to interest.name, :controller => 'search', :action => 'category_index', :category_path => interest.explode_path
	157	+ end
	158	+
	159	+ def article_custom_title(article)
	160	+ article.name
	161	+ end
	162	+ alias :blogs_custom_title :article_custom_title
	163	+ alias :image_galleries_custom_title :article_custom_title
	164	+
	165	+ def interests_custom_title(interest)
	166	+ ''
	167	+ end
	168	+
	169	+ def method_missing(method, *args, &block)
	170	+ if method.to_s =~ /^treat_(.+)$/
	171	+ args[0]
	172	+ elsif method.to_s =~ /^display_(.+)$/ && CATEGORY_MAP[kind].has_key?($1.to_sym)
	173	+ category = $1.to_sym
	174	+ fields = category == :general ? general_fields : CATEGORY_MAP[kind][category]
	175	+ contents = []
	176	+
	177	+ fields.each do \|field\|
	178	+ contents << display_field(field).html_safe
	179	+ end
	180	+
	181	+ contents = contents.delete_if(&:blank?)
	182	+
	183	+ unless contents.empty?
	184	+ content_tag('tr', content_tag('th', title(category), { :colspan => 2 })) + contents.join.html_safe
	185	+ else
	186	+ ''
	187	+ end
38	188	else
39		- content_tag('tr', content_tag('th', _('Work'), { :colspan => 2 })) + organization + organization_site
	189	+ super
40	190	end
41	191	end
42	192
...	...