Merge branch 'master' into rails-2.3.5

Conflicts: test/unit/image_gallery_test.rb

Merge branch 'master' into rails-2.3.5
Conflicts: test/unit/image_gallery_test.rb
Joenio Costa
2 parents 16848cc8 909c8e7f
Showing 159 changed files with 4983 additions and 3835 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/controllers/public/browse_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/lightbox_helper.rb
app/helpers/manage_products_helper.rb
app/helpers/profile_editor_helper.rb
app/helpers/search_helper.rb
app/models/article.rb
app/models/blog.rb
app/models/blog_archives_block.rb
app/models/certifier.rb
app/models/change_password.rb
app/models/enterprise_activation.rb
app/models/environment.rb
app/models/folder.rb
@@ -40,6 +40,9 @@ class CmsController &lt; MyProfileController
     if profile.enterprise?
       articles << EnterpriseHomepage
     end
+    if @parent && @parent.blog?
+      articles -= Article.folder_types.map(&:constantize)
+    end
     articles
   end
@@ -100,6 +103,7 @@ class CmsController &lt; MyProfileController
     # user must choose an article type first
+    @parent = profile.articles.find(params[:parent_id]) if params && params[:parent_id]
     record_coming
     @type = params[:type]
     if @type.blank?
@@ -156,7 +160,7 @@ class CmsController &lt; MyProfileController
     profile.home_page = @article
     profile.save(false)
     session[:notice] = _('"%s" configured as home page.') % @article.name
-    redirect_to :action => 'view', :id => @article.id
+    redirect_to (request.referer || profile.url)
   end
   def upload_files
@@ -22,11 +22,12 @@ class ProfileEditorController &lt; MyProfileController
           end
         end
         end
-      rescue
+      rescue Exception => ex
         if profile.identifier.blank?
           profile.identifier = params[:profile]
         end
         session[:notice] = _('Cannot update profile')
+        logger.error ex.to_s
       end
     end
   end
@@ -16,16 +16,18 @@ class TasksController &lt; MyProfileController
   def close
     failed = {}
-    params[:tasks].each do |id, value|
-      decision = value[:decision]
-      if request.post? && VALID_DECISIONS.include?(decision) && id && decision != 'skip'
-        task = profile.find_in_all_tasks(id)
-        task.update_attributes!(value[:task])
-        begin
-          task.send(decision)
-        rescue Exception => ex
-          message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
-          failed[ex.clean_message] ? failed[ex.clean_message] << message : failed[ex.clean_message] = [message]
+    if params[:tasks]
+      params[:tasks].each do |id, value|
+        decision = value[:decision]
+        if request.post? && VALID_DECISIONS.include?(decision) && id && decision != 'skip'
+          task = profile.find_in_all_tasks(id)
+          begin
+            task.update_attributes(value[:task])
+            task.send(decision)
+          rescue Exception => ex
+            message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
+            failed[ex.clean_message] ? failed[ex.clean_message] << message : failed[ex.clean_message] = [message]
+          end
         end
       end
     end
@@ -8,17 +8,20 @@ class BrowseController &lt; PublicController
     more_popular
   )
+  def per_page
+    27
+  end
+
   def people
     @filter = filter
     @title = self.filter_description(params[:action] + '_' + @filter )
     @results = @environment.people.visible.send(@filter)
-    if params[:query].blank?
-      @results = @results.paginate(:per_page => 27, :page => params[:page])
-    else
-      @results = @results.find_by_contents(params[:query]).paginate(:per_page => 27, :page => params[:page])
+    if !params[:query].blank?
+      @results = @results.find_by_contents(params[:query])
     end
+    @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
   end
   def communities
@@ -27,11 +30,10 @@ class BrowseController &lt; PublicController
     @results = @environment.communities.visible.send(@filter)
-    if params[:query].blank?
-      @results = @results.paginate(:per_page => 27, :page => params[:page])
-    else
-      @results = @results.find_by_contents(params[:query]).paginate(:per_page => 27, :page => params[:page])
+    if !params[:query].blank?
+      @results = @results.find_by_contents(params[:query])
     end
+    @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
   end
   protected
@@ -43,6 +43,11 @@ class ContentViewerController &lt; ApplicationController
       return
     end
+    if request.xhr? && params[:toolbar]
+      render :partial => 'article_toolbar'
+      return
+    end
+
     redirect_to_translation
     # At this point the page will be showed
@@ -79,11 +84,11 @@ class ContentViewerController &lt; ApplicationController
         @page.posts
       end
-      posts = posts.native_translations if @page.blog? && @page.display_posts_in_current_language?
+      if @page.blog? && @page.display_posts_in_current_language?
+        posts = posts.native_translations.all(Article.display_filter(user, profile)).map{ |p| p.get_translation_to(FastGettext.locale) }.compact
+      end
       @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile)))
-
-      @posts.map!{ |p| p.get_translation_to(FastGettext.locale) } if @page.blog? && @page.display_posts_in_current_language?
     end
     if @page.folder? && @page.gallery?
@@ -105,6 +105,8 @@ class ProfileController &lt; PublicController
       end
       if request.xhr?
         render :layout => false
+      else
+        redirect_to profile.url
       end
     end
   end
@@ -213,6 +215,14 @@ class ProfileController &lt; PublicController
     end
   end
+  def profile_info
+    begin
+      @block = profile.blocks.find(params[:block_id])
+    rescue
+      render :text => _('Profile information could not be loaded')
+    end
+  end
+
   protected
   def check_access_to_profile
@@ -1190,16 +1190,18 @@ module ApplicationHelper
       stylesheet_link_tag('fancybox') +
       javascript_include_tag('jquery.fancybox-1.3.4.pack') +
       javascript_tag("jQuery(function($) {
-        $('#article .article-body img').each( function(index) {
-          var original = original_image_dimensions($(this).attr('src'));
-          if ($(this).width() < original['width'] || $(this).height() < original['height']) {
-            $(this).wrap('<div class=\"zoomable-image\" />');
-            $(this).parent('.zoomable-image').attr('style', $(this).attr('style'));
-            $(this).attr('style', '');
-            $(this).after(\'<a href=\"' + $(this).attr('src') + '\" class=\"zoomify-image\"><span class=\"zoomify-text\">%s</span></a>');
-          }
+        $(window).load( function() {
+          $('#article .article-body img').each( function(index) {
+            var original = original_image_dimensions($(this).attr('src'));
+            if ($(this).width() < original['width'] || $(this).height() < original['height']) {
+              $(this).wrap('<div class=\"zoomable-image\" />');
+              $(this).parent('.zoomable-image').attr('style', $(this).attr('style'));
+              $(this).attr('style', '');
+              $(this).after(\'<a href=\"' + $(this).attr('src') + '\" class=\"zoomify-image\"><span class=\"zoomify-text\">%s</span></a>');
+            }
+          });
+          $('.zoomify-image').fancybox();
         });
-        $('.zoomify-image').fancybox();
       });" % _('Zoom in'))
     end
   end
@@ -20,19 +20,18 @@ module ContentViewerHelper
       unless args[:no_link]
         title = content_tag('h1', link_to(article.name, article.url), :class => 'title')
       end
-      comments = args[:no_comments] ? '' : (("- %s") % link_to_comments(article))
+      comments = ''
+      unless args[:no_comments] || !article.accept_comments
+        comments = ("- %s") % link_to_comments(article)
+      end
       title << content_tag('span', _("%s, by %s %s") % [show_date(article.published_at), link_to(article.author_name, article.author.url), comments], :class => 'created-at')
     end
     title
   end
   def link_to_comments(article, args = {})
-    link_to( number_of_comments(article), article.url.merge(:anchor => 'comments_list') )
-  end
-
-  def image_label(image)
-    text = image.abstract || image.title
-    text && (text.first(40) + (text.size > 40 ? '…' : ''))
+    return '' unless article.accept_comments?
+    link_to(number_of_comments(article), article.url.merge(:anchor => 'comments_list') )
   end
   def article_translations(article)
@@ -32,4 +32,8 @@ module LightboxHelper
     request.xhr?
   end
+  def lightbox_remote_button(type, label, url, options = {})
+    button(type, label, url, lightbox_options(options, 'remote-lbOn'))
+  end
+
 end
@@ -217,10 +217,10 @@ module ManageProductsHelper
   end
   def qualifiers_for_select
-    [[_('Select...'), nil]] + environment.qualifiers.map{ |c| [c.name, c.id] }
+    [[_('Select...'), nil]] + environment.qualifiers.sort.map{ |c| [c.name, c.id] }
   end
   def certifiers_for_select(qualifier)
-    [[_('Self declared'), nil]] + qualifier.certifiers.map{ |c| [c.name, c.id] }
+    [[_('Self declared'), nil]] + qualifier.certifiers.sort.map{ |c| [c.name, c.id] }
   end
   def select_qualifiers(product, selected = nil)
     select_tag('selected_qualifier', options_for_select(qualifiers_for_select, selected),
@@ -242,8 +242,7 @@ module ManageProductsHelper
   end
   def select_unit(object)
-    selected = object.unit.nil? ? '' : object.unit
-    select(object.class.name.downcase, 'unit', Product::UNITS.map{|unit| [_(unit[0]), unit[0]]}, {:selected => selected, :include_blank => _('Select the unit')})
+    collection_select(object.class.name.downcase, :unit_id, environment.units, :id, :singular, {:include_blank => _('Select the unit')})
   end
   def input_icon(input)
@@ -263,14 +262,13 @@ module ManageProductsHelper
     if product_unit.blank?
        _('Amount used in this product or service')
     else
-       _('Amount used by %s of this product or service') % _(product_unit)
+       _('Amount used by %s of this product or service') % product_unit.singular.downcase
     end
   end
   def display_unit(input)
     input_amount_used = content_tag('span', input.formatted_amount, :class => 'input-amount-used')
     return input_amount_used if input.unit.blank?
-    units = Product::UNITS.find {|unit| unit[0] == input.unit}
-    n_('1 %{singular_unit}', '%{num} %{plural_unit}', input.amount_used.to_f) % { :num => input_amount_used, :singular_unit => content_tag('span', units[0], :class => 'input-unit'), :plural_unit => content_tag('span', units[1], :class => 'input-unit') }
+    n_('1 %{singular_unit}', '%{num} %{plural_unit}', input.amount_used.to_f) % { :num => input_amount_used, :singular_unit => content_tag('span', input.unit.singular, :class => 'input-unit'), :plural_unit => content_tag('span', input.unit.plural, :class => 'input-unit') }
   end
 end
@@ -18,7 +18,7 @@ module ProfileEditorHelper
     N_('Science Politics'),
     N_('Accounting and Actuarial Science'),
     N_('Morphologic Sciences'),
-    N_('Computation'),
+    N_('Computer Science'),
     N_('Rural Development'),
     N_('Law'),
     N_('Ecology'),
@@ -65,7 +65,7 @@ module SearchHelper
       data << content_tag('strong', _('Address: ')) + profile.address + '<br/>'
     end
     unless profile.products.empty?
-      data << content_tag('strong', _('Products/Services: ')) + profile.products.map{|i| link_to(i.name, :controller => 'catalog', :profile => profile.identifier, :action => 'show', :id => i)}.join(', ') + '<br/>'
+      data << content_tag('strong', _('Products/Services: ')) + profile.products.map{|i| link_to(i.name, :controller => 'manage_products', :profile => profile.identifier, :action => 'show', :id => i.id)}.join(', ') + '<br/>'
     end
     if profile.respond_to?(:distance) and !profile.distance.nil?
       data << content_tag('strong', _('Distance: ')) + "%.2f%" % profile.distance + '<br/>'
@@ -319,12 +319,12 @@ class Article &lt; ActiveRecord::Base
   end
   def get_translation_to(locale)
-    if self.language.nil? || self.language == locale
+    if self.language.nil? || self.language.blank? || self.language == locale
       self
     elsif self.native_translation.language == locale
       self.native_translation
     else
-      self.native_translation.translations.first(:conditions => { :language => locale }) || self
+      self.native_translation.translations.first(:conditions => { :language => locale })
     end
   end
@@ -339,8 +339,13 @@ class Article &lt; ActiveRecord::Base
     end
   end
+  def self.folder_types
+    ['Folder', 'Blog', 'Forum', 'Gallery']
+  end
+
   named_scope :published, :conditions => { :published => true }
-  named_scope :folders, :conditions => { :type => ['Folder', 'Blog', 'Forum', 'Gallery'] }
+  named_scope :folders, :conditions => { :type => folder_types}
+  named_scope :no_folders, :conditions => ['type NOT IN (?)', folder_types]
   named_scope :galleries, :conditions => { :type => 'Gallery' }
   named_scope :images, :conditions => { :is_image => true }
@@ -412,6 +417,7 @@ class Article &lt; ActiveRecord::Base
     :profile_id,
     :parent_id,
     :path,
+    :slug,
     :updated_at,
     :created_at,
     :last_changed_by_id,
@@ -499,6 +505,10 @@ class Article &lt; ActiveRecord::Base
     false
   end
+  def accept_uploads?
+    self.parent && self.parent.accept_uploads?
+  end
+
   private
   def sanitize_tag_list
@@ -2,6 +2,13 @@ class Blog &lt; Folder
   acts_as_having_posts
+  #FIXME This should be used until there is a migration to fix all blogs that
+  # already have folders inside them
+  def posts_with_no_folders
+    posts_without_no_folders.no_folders
+  end
+  alias_method_chain :posts, :no_folders
+
   def self.short_description
     _('Blog')
   end
@@ -17,7 +17,7 @@ class BlogArchivesBlock &lt; Block
   settings_items :blog_id, Integer
   def blog
-    blog_id ? owner.blogs.find(blog_id) : owner.blog
+    blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog
   end
   def content
@@ -11,4 +11,9 @@ class Certifier &lt; ActiveRecord::Base
   def link
     self[:link] || ''
   end
+
+  def <=>(b)
+    self.name.downcase.transliterate <=> b.name.downcase.transliterate
+  end
+
 end
@@ -68,6 +68,10 @@ class ChangePassword &lt; Task
     user.force_change_password!(self.password, self.password_confirmation)
   end
+  def target_notification_description
+    _('%{requestor} wants to change its password.') % {:requestor => requestor.name}
+  end
+
   # overriding messages
   def task_cancelled_message
@@ -35,4 +35,8 @@ class EnterpriseActivation &lt; Task
     {:type => :profile_image, :profile => requestor, :url => requestor.url}
   end
+  def target_notification_description
+    _('%{requestor} wants to activate enterprise %{enterprise}.') % {:requestor => requestor.name, :enterprise => enterprise.name}
+  end
+
 end
@@ -93,7 +93,6 @@ class Environment &lt; ActiveRecord::Base
       'enterprise_registration' => __('Enterprise registration'),
       'enterprise_activation' => __('Enable activation of enterprises'),
-      'wysiwyg_editor_for_environment_home' => _('Use WYSIWYG editor to edit environment home page'),
       'media_panel' => _('Media panel in WYSIWYG editor'),
       'select_preferred_domain' => _('Select preferred domains per profile'),
       'use_portal_community' => _('Use the portal as news source for front page'),
@@ -162,6 +161,8 @@ class Environment &lt; ActiveRecord::Base
   acts_as_accessible
+  has_many :units, :order => 'position'
+
   def superior_intances
     [self, nil]
   end
@@ -271,7 +272,6 @@ class Environment &lt; ActiveRecord::Base
       organizations_are_moderated_by_default
       show_balloon_with_profile_links_when_clicked
       use_portal_community
-      wysiwyg_editor_for_environment_home
     ).each do |feature|
       enable(feature)
     end
 class Folder < Article
+  validate :not_belong_to_blog
+
+  def not_belong_to_blog
+    errors.add(:parent, "A folder should not belong to a blog.") if parent && parent.blog?
+  end
+
   acts_as_having_settings :field => :setting
   xss_terminate :only => [ :body ], :with => 'white_list', :on => 'validation'
@@ -47,4 +53,9 @@ class Folder &lt; Article
                     :foreign_key => 'parent_id',
                     :order => 'articles.type, articles.name',
                     :conditions => ["articles.type = 'UploadedFile' and articles.content_type in (?) or articles.type in ('Folder','Gallery')", UploadedFile.content_types]
+
+  def accept_uploads?
+    !self.has_posts? || self.gallery?
+  end
+
 end
@@ -1,11 +0,0 @@
-class ImageGallery < Article
-
-  def self.short_description
-    _('Image gallery')
-  end
-
-  def self.description
-    _('A collection of photos, logos or other kinds of images.')
-  end
-
-end
@@ -7,6 +7,8 @@ class Input &lt; ActiveRecord::Base
   acts_as_list :scope => :product
+  belongs_to :unit
+
   include FloatHelper
   def price_per_unit=(value)
@@ -23,6 +23,10 @@ class InviteFriend &lt; Invitation
     {:type => :profile_image, :profile => requestor, :url => requestor.url}
   end
+  def target_notification_description
+    _('%{requestor} wants to be your friend.') % {:requestor => requestor.name}
+  end
+
   def permission
     :manage_friends
   end
@@ -35,6 +35,10 @@ class InviteMember &lt; Invitation
     {:type => :profile_image, :profile => community, :url => community.url}
   end
+  def target_notification_description
+    _('%{requestor} invited you to join %{community}.') % {:requestor => requestor.name, :community => community.name}
+  end
+
   def expanded_message
     super.gsub /<community>/, community.name
   end
@@ -21,6 +21,19 @@ class Organization &lt; Profile
   has_many :mailings, :class_name => 'OrganizationMailing', :foreign_key => :source_id, :as => 'source'
+  named_scope :more_popular,
+    :select => "#{Profile.qualified_column_names}, count(resource_id) as total",
+    :group => Profile.qualified_column_names,
+    :joins => "LEFT OUTER JOIN role_assignments ON profiles.id = role_assignments.resource_id",
+    :order => "total DESC"
+
+  named_scope :more_active,
+    :select => "#{Profile.qualified_column_names}, count(action_tracker.id) as total",
+    :joins => "LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.target_id",
+    :group => Profile.qualified_column_names,
+    :order => 'total DESC',
+    :conditions => ['action_tracker.created_at >= ? OR action_tracker.id IS NULL', ActionTracker::Record::RECENT_DELAY.days.ago]
+
   def validation_methodology
     self.validation_info ? self.validation_info.validation_methodology : nil
   end
@@ -22,10 +22,17 @@ class Person &lt; Profile
   has_many :scraps_sent, :class_name => 'Scrap', :foreign_key => :sender_id, :dependent => :destroy
   named_scope :more_popular,
-       :select => "#{Profile.qualified_column_names}, count(friend_id) as total",
-       :group => Profile.qualified_column_names,
-       :joins => :friendships,
-       :order => "total DESC"
+      :select => "#{Profile.qualified_column_names}, count(friend_id) as total",
+      :group => Profile.qualified_column_names,
+      :joins => "LEFT OUTER JOIN friendships on profiles.id = friendships.person_id",
+      :order => "total DESC"
+
+  named_scope :more_active,
+    :select => "#{Profile.qualified_column_names}, count(action_tracker.id) as total",
+    :joins => "LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.user_id",
+    :group => Profile.qualified_column_names,
+    :order => 'total DESC',
+    :conditions => ['action_tracker.created_at >= ? OR action_tracker.id IS NULL', ActionTracker::Record::RECENT_DELAY.days.ago]
   after_destroy do |person|
     Friendship.find(:all, :conditions => { :friend_id => person.id}).each { |friendship| friendship.destroy }
@@ -149,7 +156,7 @@ class Person &lt; Profile
   N_('Schooling status')
   settings_items :schooling_status
-  N_('Formation'); N_('Custom formation'); N_('Custom area of study');
+  N_('Education'); N_('Custom education'); N_('Custom area of study');
   settings_items :formation, :custom_formation, :custom_area_of_study
   N_('Contact information'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code')
@@ -42,14 +42,9 @@ class Product &lt; ActiveRecord::Base
   acts_as_mappable
-  include FloatHelper
+  belongs_to :unit
-  UNITS = [
-    [N_('unit'), _('units')],
-    [N_('litre'), _('litres')],
-    [N_('kilo'), _('kilos')],
-    [N_('meter'), _('meters')],
-  ]
+  include FloatHelper
   include WhiteListFilter
   filter_iframes :description, :whitelist => lambda { enterprise && enterprise.environment && enterprise.environment.trusted_sites_for_iframe }
@@ -151,7 +146,7 @@ class Product &lt; ActiveRecord::Base
   end
   def name_with_unit
-    unit.blank? ? name : "#{name} - #{_(unit)}"
+    unit.blank? ? name : "#{name} - #{unit.name.downcase}"
   end
 end
@@ -78,18 +78,11 @@ class Profile &lt; ActiveRecord::Base
   end
   named_scope :visible, :conditions => { :visible => true }
+  # Subclasses must override these methods
+  named_scope :more_popular
+  named_scope :more_active
+
   named_scope :more_recent, :order => "created_at DESC"
-  named_scope :more_popular,
-       :select => "#{Profile.qualified_column_names}, count(resource_id) as total",
-       :group => Profile.qualified_column_names,
-       :joins => :role_assignments,
-       :order => "total DESC"
-  named_scope :more_active,
-       :select => "#{Profile.qualified_column_names}, count(articles.id) as total, sum(articles.comments_count) as total_comments",
-       :joins => :articles,
-       :group => Profile.qualified_column_names,
-       :order => "total DESC, total_comments DESC",
-       :conditions => ["articles.created_at BETWEEN ? AND ?", 7.days.ago, DateTime.now]
   acts_as_trackable :dependent => :destroy
@@ -152,6 +145,7 @@ class Profile &lt; ActiveRecord::Base
   assets
   doc
   chat
+  plugin
   ]
   belongs_to :user
@@ -778,18 +772,27 @@ private :generate_url, :url_options
     _("Since: ")
   end
+  def recent_actions
+    tracked_actions.recent
+  end
+
+  def recent_notifications
+    tracked_notifications.recent
+  end
+
   def more_active_label
-    amount = self.articles.count
+    amount = recent_actions.count
+    amount += recent_notifications.count if organization?
     {
-      0 => _('none'),
-      1 => _('one article')
-    }[amount] || _("%s articles") % amount
+      0 => _('no activity'),
+      1 => _('one activity')
+    }[amount] || _("%s activities") % amount
   end
   def more_popular_label
     amount = self.members_count
     {
-      0 => _('none'),
+      0 => _('no members'),
       1 => _('one member')
     }[amount] || _("%s members") % amount
   end
@@ -8,4 +8,10 @@ class Qualifier &lt; ActiveRecord::Base
   validates_presence_of :environment_id
   validates_presence_of :name
+  has_many :product_qualifiers, :dependent => :destroy
+
+  def <=>(b)
+    self.name.downcase.transliterate <=> b.name.downcase.transliterate
+  end
+
 end
@@ -32,7 +32,7 @@ class TaskMailer &lt; ActionMailer::Base
     recipients task.friend_email
     from self.class.generate_from(task)
-    subject '[%s] %s' % [ task.requestor.environment.name, task.information ]
+    subject '[%s] %s' % [ task.requestor.environment.name, task.target_notification_description ]
     body :message => msg
   end
@@ -52,7 +52,7 @@ class TaskMailer &lt; ActionMailer::Base
     recipients task.requestor.notification_emails
     from self.class.generate_from(task)
-    subject '[%s] %s' % [task.requestor.environment.name, task.information]
+    subject '[%s] %s' % [task.requestor.environment.name, task.target_notification_description]
     body :requestor => task.requestor.name,
       :message => text,
       :environment => task.requestor.environment.name,
@@ -0,0 +1,17 @@
+class Unit < ActiveRecord::Base
+
+  validates_presence_of :singular
+  validates_presence_of :plural
+
+  belongs_to :environment
+  validates_presence_of :environment_id
+  acts_as_list :scope => :environment
+
+  def name
+    self.singular
+  end
+  def name=(value)
+    self.singular = value
+  end
+
+end
@@ -9,6 +9,8 @@ class UploadedFile &lt; Article
   include ShortFilename
   settings_items :title, :type => 'string'
+  xss_terminate :only => [ :title ]
+
   def title_with_default
     title_without_default || short_filename(name, 60)
   end
@@ -28,6 +30,10 @@ class UploadedFile &lt; Article
     title.blank? ? name : title
   end
+  def first_paragraph
+    ''
+  end
+
   def self.max_size
     UploadedFile.attachment_options[:max_size]
   end
@@ -48,7 +54,7 @@ class UploadedFile &lt; Article
   def self.icon_name(article = nil)
     if article
-      article.image? ? article.public_filename(:icon) : article.mime_type.gsub(/[\/+.]/, '-')
+      article.image? ? article.public_filename(:icon) : (article.mime_type ? article.mime_type.gsub(/[\/+.]/, '-') : 'upload-file')
     else
       'upload-file'
     end
 <h2><%= _('Site info') %></h2>
-<% if @environment.enabled?('wysiwyg_editor_for_environment_home') %>
-  <%= render :file => 'shared/tiny_mce' %>
-<% end %>
+<%= render :file => 'shared/tiny_mce' %>
 <% labelled_form_for :environment, @environment do |f| %>
   <%= labelled_form_field(_('Site name'), text_field(:environment, :name)) %>
-  <%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%') %>
+  <%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%', :class => 'mceEditor') %>
   <% button_bar do %>
     <%= submit_button(:save, _('Save')) %>
@@ -14,14 +14,11 @@
   <p><%= h block.owner.short_name %></p>
 <% end %>
-<% if !user.nil? and user.has_permission?('edit_profile', profile) %>
-  <div style='text-align: center; font-size: 75%; clear: both'>
-    <%= link_to _('Control panel'), :controller => 'profile_editor' %>
-  </div>
-<% end %>
+<div style="text-align: center; font-size: 75%; clear: both" id="profile-admin-url-<%= block.id %>"></div>
-<div class="profile-info-options">
-  <%= render :file => 'blocks/profile_info_actions/' + block.owner.class.name.underscore %>
-</div>
+<div class="profile-info-options" id="profile-info-options-<%= block.id %>"></div>
 </div><!-- end class="vcard" -->
+<script type="text/javascript">
+  <%= remote_function :url => { :controller => 'profile', :action => 'profile_info', :block_id => block.id } %>
+</script>
@@ -14,15 +14,13 @@
   </div>
 </div>
-<ul class="profile-info-data">
+<ul class="profile-info-data" id="profile-info-data-<%= block.id %>">
   <li><%= link_to __('Homepage'), block.owner.url, :class => 'url' %></li>
   <li><%= link_to _('View profile'), block.owner.public_profile_url %></li>
   <% if block.owner.enterprise? && !block.owner.environment.enabled?('disable_products_for_enterprises') %>
     <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
   <% end %>
-  <% if !user.nil? and user.has_permission?('edit_profile', profile) %>
-    <li><%= link_to _('Control panel'), block.owner.admin_url %></li>
-  <% end %>
+  <li id="profile-admin-url-<%= block.id %>"></li>
   <% if profile.person? %>
     <li><%= _('Since %{year}/%{month}') % { :year => block.owner.created_at.year, :month => block.owner.created_at.month } %></li>
   <% end %>
@@ -39,8 +37,9 @@
 </div>
 <% end %>
-<div class="profile-info-options">
-  <%= render :file => 'blocks/profile_info_actions/' + block.owner.class.name.underscore %>
-</div>
+<div class="profile-info-options" id="profile-info-options-<%= block.id %>"></div>
 </div><!-- end class="vcard" -->
+<script type="text/javascript">
+  <%= remote_function :url => { :controller => 'profile', :action => 'profile_info', :block_id => block.id } %>
+</script>
 <div id='edit-profile-list-block'>
   <%= labelled_form_field _('Limit of items'), text_field(:block, :limit, :size => 3) %>
-  <%= labelled_form_field _('Prioritize profiles with image'), check_box(:block, :prioritize_profiles_with_image) %>
+  <%= check_box(:block, :prioritize_profiles_with_image) %>
+  <label for="block_prioritize_profiles_with_image"><%= _('Prioritize profiles with image') %></label>
 </div>
 <%= display_products_list @profile, @products %>
-<%= will_paginate @products %>
+<%= pagination_links @products %>
@@ -56,7 +56,7 @@
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, [5, 10, 20, 50, 100])) %>
-<%= labelled_check_box(_("Try listing only translated posts"), 'article[display_posts_in_current_language]', '1', @article.display_posts_in_current_language?) %>
+<%= labelled_check_box(_("List only translated posts"), 'article[display_posts_in_current_language]', '1', @article.display_posts_in_current_language?) %>
 <% f.fields_for 'feed', @article.feed do |feed| %>
   <%= labelled_form_field(_('Limit of posts in RSS Feed'), feed.select(:limit, [5, 10, 20, 50])) %>
@@ -15,5 +15,4 @@
 <%= labelled_form_field(_('Address:'), text_field(:article, :address)) %>
-<%= labelled_form_field(_('Information about the event:'), text_area(:article, :body, :cols => 64, :class => 'mceEditor')) %>
-
+<%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :body_label => 'Information about the event:'} %>
@@ -5,17 +5,4 @@
 <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64')) %>
 <%= render :partial => 'translatable' %>
-
-<br style="clear: both;"/>
-<%= button :add, _("Lead"), '#', :id => "lead-button", :style => "margin-left: 0px;" %>
-<em><%= _('Used when a short version of your text is needed.') %></em>
-
-<div id="article-lead">
-  <%= labelled_form_field(_('Lead'), text_area(:article, 'abstract', :cols => 64, :rows => 10)) %>
-</div>
-<div style="margin-top: 10px;">
-  <%= labelled_form_field(_('Text'), text_area(:article, 'body', :cols => 64, :rows => 30)) %>
-</div>
-
-<%= javascript_include_tag 'article'%>
-
+<%= render :partial => 'shared/lead_and_body' %>
@@ -12,18 +12,5 @@
   <% end %>
   <%= render :partial => 'translatable' %>
-
-  <br style="clear: both;"/>
-  <%= button :add, _("Lead"), '#', :id => "lead-button", :style => "margin-left: 0px;" %>
-  <em><%= _('Used when a short version of your text is needed.') %></em>
-
-  <div id="article-lead">
-    <%= labelled_form_field(_('Lead'), text_area(:article, 'abstract', :style => 'width: 100%; height: 200px;', :class => 'mceEditor')) %>
-  </div>
-  <div style="margin-top: 10px;">
-    <%= labelled_form_field(_('Text'), text_area(:article, 'body', :style => 'width:100%; height: 500px;', :class => 'mceEditor')) %>
-  </div>
-
+  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true} %>
 </div>
-
-<%= javascript_include_tag 'article' %>
@@ -16,16 +16,7 @@
   <%= required labelled_form_field(_('Email'), text_field(:task, 'email')) %>
-  <br style="clear: both;"/>
-  <%= button :add, _("Lead"), '#', :id => "lead-button", :style => "margin-left: 0px;" %>
-  <em><%= _('Used when a short version of your text is needed.') %></em>
-
-  <div id="article-lead">
-    <%= labelled_form_field(_('Lead'), text_area(:task , 'article_abstract', :style => 'width: 100%; height: 200px;', :class => 'mceEditor')) %>
-  </div>
-  <div style="margin-top: 10px;">
-    <%= labelled_form_field(_('Text'), text_area(:task, 'article_body', :style => 'width:100%; height: 500px;', :class => 'mceEditor')) %>
-  </div>
+  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :object => :task, :abstract_method => 'article_abstract', :body_method => 'article_body'} %>
   <div id="captcha">
     <%= labelled_form_field(_("What is the result of '%s = ?'") % @task.captcha.task, text_field(:task, 'captcha_solution')) %>
@@ -39,5 +30,3 @@
     <%= button :cancel, _('Cancel'), @back_to %>
   <% end %>
 <% end %>
-
-<%= javascript_include_tag 'article' %>
@@ -0,0 +1,51 @@
+<div<%= " class='logged-in'" if user %>>
+  <% if @page.allow_post_content?(user) || @page.allow_publish_content?(user) %>
+    <div id="article-actions">
+      <% if @page.allow_post_content?(user) %>
+        <%= link_to content_tag( 'span', label_for_edit_article(@page) ),
+            profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }),
+            :class => 'button with-text icon-edit' %>
+        <% if !(profile.kind_of?(Enterprise) && environment.enabled?('disable_cms')) %>
+          <% if @page != profile.home_page && !@page.has_posts? %>
+            <%= link_to content_tag( 'span', _('Delete') ),
+              profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page }),
+              :class => 'button with-text icon-delete' %>
+          <% end %>
+          <% if !environment.enabled?('disable_cms') && !@page.folder? %>
+            <% if profile.kind_of?(Person) %>
+              <%= link_to content_tag( 'span', _('Spread this') ),
+                  profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }),
+                  :class => 'button with-text icon-spread' %>
+            <% elsif profile.kind_of?(Community) && environment.portal_community %>
+              <%= link_to content_tag( 'span', _('Spread this') ),
+                  profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }),
+                  :class => 'button with-text icon-spread' %>
+            <% end %>
+          <% end %>
+        <% end %>
+      <% end %>
+      <% if !(profile.kind_of?(Enterprise) && environment.enabled?('disable_cms')) %>
+        <% if !@page.gallery? %>
+          <%= link_to _('Add translation'),
+              profile.admin_url.merge(:controller => 'cms', :action => 'new',
+                                      :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)),
+                                      :type => @page.type, :article => { :translation_of_id => @page.native_translation.id }),
+              :class => 'button with-text icon-locale' if @page.translatable? && !@page.native_translation.language.blank? %>
+          <%= lightbox_remote_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) %>
+        <% end %>
+      <% end %>
+      <% if @page.accept_uploads? %>
+        <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) %>
+      <% end %>
+    </div>
+  <% elsif profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) %>
+    <div id="article-actions">
+      <%= link_to content_tag( 'span', _('Suggest an article') ), profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}), :id => 'suggest-article-link', :class => 'button with-text icon-new' %>
+    </div>
+  <% end %>
+  <div id="article-header">
+    <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
+    <%= article_title(@page, :no_link => true) %>
+    <%= article_translations(@page) %>
+  </div>
+</div>
 <% if uploaded_file.image? %>
-  <%= link_to content_tag(:span, uploaded_file.display_title), uploaded_file.view_url, :class => 'image', :style => 'background-image: url(%s)'% uploaded_file.public_filename(:thumb) %>
-  <span><%= image_label(uploaded_file) %></span>
+  <%= link_to '',
+        uploaded_file.view_url,
+        :class => 'image',
+        :style => 'background-image: url(%s)'% uploaded_file.public_filename(:thumb)
+  %>
+  <span><%=h uploaded_file.title %></span>
 <% else %>
   <%= render :partial => 'article', :object => uploaded_file %>
 <% end %>
@@ -10,11 +10,11 @@
   <% end %>
     <ul>
       <% @images.each do |a| %>
-        <% content_tag('li', :title => a.abstract, :class => 'image-gallery-item' ) do %>
+        <% content_tag('li', :title => a.title, :class => 'image-gallery-item' ) do %>
           <%= render :partial => partial_for_class(a.class), :object => a %>
         <% end %>
       <% end %>
     </ul>
   <br style="clear:both" />
-  <%= will_paginate @images, :param_name => 'npage' %>
+  <%= pagination_links @images, :param_name => 'npage' %>
 </div>
@@ -6,62 +6,11 @@
 <div id="article" class="<%= @page.css_class_name %>">
+<div id="article-toolbar"></div>
-<div<%= " class='logged-in'" if user %>>
-  <% if @page.allow_post_content?(user) || @page.allow_publish_content?(user) %>
-    <div id="article-actions">
-      <% if @page.allow_post_content?(user) %>
-        <%= link_to content_tag( 'span', label_for_edit_article(@page) ),
-            profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }),
-            :class => 'button with-text icon-edit' %>
-        <% if !(profile.kind_of?(Enterprise) && environment.enabled?('disable_cms')) %>
-          <% if @page != profile.home_page && !@page.has_posts? %>
-            <%= link_to content_tag( 'span', _('Delete') ),
-              profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page }),
-              :class => 'button with-text icon-delete' %>
-          <% end %>
-          <% if !environment.enabled?('disable_cms') && !@page.folder? %>
-            <% if profile.kind_of?(Person) %>
-              <%= link_to content_tag( 'span', _('Spread this') ),
-                  profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }),
-                  :class => 'button with-text icon-spread' %>
-            <% elsif profile.kind_of?(Community) && environment.portal_community %>
-              <%= link_to content_tag( 'span', _('Spread this') ),
-                  profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }),
-                  :class => 'button with-text icon-spread' %>
-            <% end %>
-          <% end %>
-        <% end %>
-      <% end %>
-      <% if !(profile.kind_of?(Enterprise) && environment.enabled?('disable_cms')) %>
-        <% if !@page.gallery? %>
-          <%= link_to _('Add translation'),
-              profile.admin_url.merge(:controller => 'cms', :action => 'new',
-                                      :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)),
-                                      :type => @page.type, :article => { :translation_of_id => @page.native_translation.id }),
-              :class => 'button with-text icon-locale' if @page.translatable? && !@page.native_translation.language.blank? %>
-          <%= lightbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) %>
-        <% end %>
-        <% if (@page.folder? && !@page.has_posts?) || (@page.parent && @page.parent.folder? && !@page.parent.has_posts?) %>
-          <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) %>
-        <% end %>
-      <% end %>
-      <% if profile.kind_of?(Enterprise) && @page.gallery? %>
-        <%= button('upload-file', _('Upload files'), :controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent)) %>
-      <% end %>
-    </div>
-  <% else %>
-    <% if profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) %>
-      <%= link_to content_tag( 'span', _('Suggest an article') ), profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}), :id => 'suggest-article-link', :class => 'button with-text icon-new' %>
-    <% end %>
-  <% end %>
-  <div id="article-header">
-    <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
-    <%= article_title(@page, :no_link => true) %>
-    <%= article_translations(@page) %>
-  </div>
-</div>
-
+<script type="text/javascript">
+  <%= remote_function :update => "article-toolbar", :url => @page.url.merge({ :toolbar => true, :only_path => true }), :complete => "$$('#article-toolbar .remote-lbOn').each(function(link) { new lightbox(link); }); jQuery('#article-toolbar .simplemenu-trigger').click(function(e) { e.stopPropagation(); })" %>
+</script>
 <% if !@page.tags.empty? %>
   <div id="article-tags">
@@ -84,6 +33,18 @@
 <%= render :partial => 'shared/disabled_enterprise' %>
+<% if NOOSFERO_CONF['addthis_enabled'] %>
+<div id="addThis">
+<script type="text/javascript">
+  addthis_brand = '<%= escape_javascript( @environment.name ) %>';
+  addthis_pub = '<%= escape_javascript( NOOSFERO_CONF['addthis_pub'] ) %>';
+  addthis_logo = '<%= escape_javascript( NOOSFERO_CONF['addthis_logo'] ) %>';
+  addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>';
+</script>
+<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><img src="/images/bt-bookmark.gif" width="53" height="16" border="0" alt="" /></a><script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script>
+</div>
+<% end %>
+
 <% cache(@page.cache_key(params, user)) do %>
   <div class="<%="article-body article-body-" + @page.css_class_name %>">
     <% options = @page.image? ? {:gallery_view => true} : {} %>
@@ -101,18 +62,6 @@
 <%= display_source_info(@page) %>
-<% if NOOSFERO_CONF['addthis_enabled'] %>
-<div id="addThis">
-<script type="text/javascript">
-  addthis_brand = '<%= escape_javascript( @environment.name ) %>';
-  addthis_pub = '<%= escape_javascript( NOOSFERO_CONF['addthis_pub'] ) %>';
-  addthis_logo = '<%= escape_javascript( NOOSFERO_CONF['addthis_logo'] ) %>';
-  addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>';
-</script>
-<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><img src="/images/bt-bookmark.gif" width="53" height="16" border="0" alt="" /></a><script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script>
-</div>
-<% end %>
-
 <div class="comments" id="comments_list">
   <% if @page.accept_comments? %>
   <h3 <%= 'class="no-comments-yet"' if @comments.size == 0 %>>
@@ -26,7 +26,7 @@
   </head>
   <body id='chat'>
     <div id='title-bar'>
-      <h1 class='title'><%= _("%s - Friends online (<span id='friends-online'>%d</span>)") % [h(page_title), 0] %></h1>
+      <h1 class='title'><%= _("%s - Friends in chat (<span id='friends-online'>%d</span>)") % [h(page_title), 0] %></h1>
     </div>
     <div id='buddy-list'>
       <div id='environment-logo'>
@@ -6,7 +6,7 @@
                    :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'description'},
                    :html => {:id => 'product-description-form', :method => 'post'}) do |f| %>
-  <%= labelled_form_field(_('Description:'), f.text_area(:description, :rows => 15, :style => 'width: 90%;')) %>
+  <%= labelled_form_field(_('Description:'), f.text_area(:description, :rows => 15, :style => 'width: 90%;', :class => 'mceEditor')) %>
   <% button_bar do %>
     <%= submit_button :save, _('Save') %>
     <%= cancel_edit_product_link(@product, 'description') %>
@@ -5,7 +5,7 @@
   <%= display_form_field( _('Name:'), f.text_field(:name) ) %>
   <%= display_form_field( _('Price:'), f.text_field(:price) ) %>
-  <%= display_form_field( _('Description:'), f.text_area(:description, :rows => 10) ) %>
+  <%= display_form_field( _('Description:'), f.text_area(:description, :rows => 10, :class => 'mceEditor') ) %>
   <%= labelled_form_field(f.check_box(:highlighted) + _('Highlight this product'),'') %>
   <% f.fields_for :image_builder, @product.image do |i| %>
     <%= file_field_or_thumbnail(_('Image:'), @product.image, i) %>
@@ -22,7 +22,7 @@
   <% end %>
 </table>
-<%= will_paginate @products %>
+<%= pagination_links @products %>
 <% button_bar do %>
   <%= button :add, _('New product or service'), :action => 'new' %>
@@ -0,0 +1,6 @@
+if !user.nil? and user.has_permission?('edit_profile', profile)
+  page.replace_html "profile-admin-url-#{@block.id}", link_to(_('Control panel'), @block.owner.admin_url)
+else
+  page.hide "profile-admin-url-#{@block.id}"
+end
+page.replace_html "profile-info-options-#{@block.id}", :file => 'blocks/profile_info_actions/' + @block.owner.class.name.underscore
@@ -44,7 +44,7 @@
   }
 </script>
-<%= optional_field(@person, 'formation', select_area(_('Formation'), 'profile_data', 'formation', {:class => 'type-select-full-line'})) %>
+<%= optional_field(@person, 'formation', select_area(_('Education'), 'profile_data', 'formation', {:class => 'type-select-full-line'})) %>
 <span id='profile_data_custom_formation_span' <%= "style='display:none'" if ! ['Others', nil].include?(@person.formation) %> >
   <%= optional_field(@person, 'custom_formation', f.text_field(:custom_formation)) %>
@@ -21,9 +21,9 @@
       </div>
     <% end %>
     <h2><%= _('Content for header ') %></h2>
-    <%= text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;') %>
+    <%= text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
     <h2><%= _('Content for footer') %></h2>
-    <%= text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;') %>
+    <%= text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
     <% button_bar do %>
       <%= submit_button(:save, _('Save')) %>
       <%= button(:cancel, _('Cancel'), :action => 'index') %>
@@ -8,7 +8,7 @@
 <% form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
-  <%= labelled_form_field(_('Body:'), f.text_area(:body)) %>
+  <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
   <%= submit_button(:send, _('Send')) %>
   <%= button :cancel, _('Cancel e-mail'), :action => 'index' %>
 <% end %>
-<li>
-  <strong><%= link_to(event.title, event.url, :class => icon_for_article(event)) %></strong>
+<li class="<%= icon_for_article(event) %>">
+  <strong><%= link_to(event.title, event.url) %></strong>
   <div class="item_meta">
     <%= show_period(event.start_date, event.end_date) %>
   </div>
@@ -23,6 +23,6 @@
 </div><!-- class="has_cat_list" -->
 <% end %>
-<%= will_paginate @results[:products] %>
+<%= pagination_links @results[:products] %>
 <br style="clear:both" />
@@ -0,0 +1,29 @@
+<% object ||= :article %>
+<% abstract_label ||= 'Lead' %>
+<% abstract_method ||= :abstract %>
+<% body_label ||= 'Text' %>
+<% body_method ||= :body %>
+<% editor_type = defined?(tiny_mce) && tiny_mce ? 'mceEditor' : '' %>
+<% lead_id ||= 0%>
+<% f ||= false%>
+
+<br style="clear: both;"/>
+<%= button :add, _("Lead"), '#', :class => "lead-button", :article_id => "#article-lead-"+lead_id.to_s, :style => "margin-left: 0px;" %>
+<em><%= _('Used when a short version of your text is needed.') %></em>
+
+<div class='article-lead' id="article-lead-<%=lead_id.to_s%>">
+  <% if f %>
+    <%= labelled_form_field(_(abstract_label), f.text_area(abstract_method, :style => 'width: 98%; height: 200px;', :class => editor_type)) %>
+  <% else %>
+    <%= labelled_form_field(_(abstract_label), text_area(object, abstract_method, :style => 'width: 98%; height: 200px;', :class => editor_type)) %>
+  <% end %>
+</div>
+<div style="margin-top: 10px;">
+  <% if f %>
+    <%= labelled_form_field(_(body_label), f.text_area(body_method, :style => 'width: 98%; height: 400px;', :class => editor_type)) %>
+  <% else %>
+    <%= labelled_form_field(_(body_label), text_area(object, body_method, :style => 'width: 98%; height: 400px;', :class => editor_type)) %>
+  <% end %>
+</div>
+
+<%= javascript_include_tag 'article'%>
 <%= optional_field(profile, 'display_name', f.text_field(:display_name)) %>
+<% if profile.enterprise? %>
+  <%= optional_field(profile, 'business_name', f.text_field(:business_name)) %>
+<% end %>
 <%= optional_field(profile, 'description', f.text_area(:description, :rows => 5)) %> <!-- , :maxlength => 10 -->
 <%= optional_field(profile, 'contact_person', f.text_field(:contact_person)) %>
 <%= optional_field(profile, 'contact_email', f.text_field(:contact_email)) %>
@@ -18,7 +21,6 @@
 <% end %>
 <% if profile.enterprise? %>
-  <%= optional_field(profile, 'business_name', f.text_field(:business_name)) %>
   <%= optional_field(profile, 'organization_website', f.text_field(:organization_website)) %>
   <%= optional_field(profile, 'historic_and_current_context', f.text_area(:historic_and_current_context, :rows => 5)) %>
   <%= optional_field(profile, 'activities_short_description', f.text_area(:activities_short_description, :rows => 5)) %>
@@ -21,7 +21,6 @@ tinyMCE.init({
         theme : "advanced",
         relative_urls : false,
         remove_script_host : true,
-        document_base_url : <%= environment.top_url.to_json %>,
         plugins: myplugins,
         theme_advanced_toolbar_location : "top",
         theme_advanced_layout_manager: 'SimpleLayout',
@@ -4,21 +4,8 @@
 <%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task]", 'article_parent_id', task.target) %>
 <%= labelled_form_field(_('Highlight this article'), f.check_box(:highlighted)) %>
-<div>
-  <% if task.article && task.article.tiny_mce? %>
-    <%= labelled_form_field(_('Lead'), f.text_area(:abstract, :style => 'width: 482px; height: 200px;', :class => 'mceEditor')) %>
-  <% else %>
-    <%= labelled_form_field(_('Lead'), f.text_area(:abstract, :style => 'width: 482px; height: 200px;')) %>
-  <% end %>
-</div>
-<em><%= _('Used when a short version your text is needed.') %></em>
+<% tiny = task.article && task.article.tiny_mce? ? {:tiny_mce => true} : {} %>
+<%= render :partial => 'shared/lead_and_body', :locals => {:lead_id => task.id, :f => f}.merge(tiny)%>
-<div style="margin-top: 10px;">
-  <% if task.article && task.article.tiny_mce? %>
-    <%= labelled_form_field(_('Text'), f.text_area(:body, :style => 'width:482px; height: 500px;', :class => 'mceEditor')) %>
-  <% else %>
-    <%= labelled_form_field(_('Text'), f.text_area(:body, :style => 'width:482px; height: 500px;')) %>
-  <% end %>
-</div>
 <%= labelled_form_field _('Comment for author'), f.text_field(:closing_statment, :style => 'width: 488px;') %>
@@ -9,11 +9,4 @@
 <%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task]", 'article_parent_id', task.target) %>
 <%= labelled_form_field(_('Highlight this article'), f.check_box(:highlighted)) %>
-<div>
-  <%= labelled_form_field(_('Lead'), f.text_area(:article_abstract, :style => 'width: 482px; height: 200px;', :class => 'mceEditor')) %>
-</div>
-<em><%= _('Used when a short version your text is needed.') %></em>
-
-<div style="margin-top: 10px;">
-  <%= labelled_form_field(_('Text'), f.text_area(:article_body, :style => 'width:482px; height: 500px;', :class => 'mceEditor')) %>
-</div>
+<%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :f => f, :abstract_method => 'article_abstract', :body_method => 'article_body', :lead_id => task.id} %>
@@ -6,7 +6,7 @@
 <% form_for :mailing, :url => {:action => 'send_mail'} do |f| %>
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
-  <%= labelled_form_field(_('Body:'), f.text_area(:body)) %>
+  <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
   <%= submit_button(:send, _('Send')) %>
   <%= button :cancel, _('Cancel e-mail'), :controller => 'users' %>
 <% end %>
 unless NOOSFERO_CONF['exception_recipients'].blank?
+  require 'noosfero.rb'
   require 'exception_notification.rb'
   ExceptionNotifier.sender_address = "noreply@#{Noosfero.default_hostname}"
   ExceptionNotifier.email_prefix = "[Noosfero ERROR] "
@@ -0,0 +1,26 @@
+class CreateUnitsAndAddReferenceToItAtProductsAndInputs < ActiveRecord::Migration
+  def self.up
+    create_table :units do |t|
+      t.string :singular,        :null => false
+      t.string :plural,          :null => false
+      t.integer :position
+      t.references :environment, :null => false
+    end
+    [:products, :inputs].each do |table_name|
+      change_table table_name do |t|
+        t.remove :unit
+        t.references :unit
+      end
+    end
+  end
+
+  def self.down
+    drop_table :units
+    [:products, :inputs].each do |table_name|
+      change_table table_name do |t|
+        t.string :unit
+        t.remove_references :unit
+      end
+    end
+  end
+end
@@ -0,0 +1,10 @@
+class RemoveActionTrackerRecordsWithNilUsers < ActiveRecord::Migration
+  # This migration is a copy of 20110127174236_remove_action_tracker_record_with_nil_users.rb
+  def self.up
+    ActionTracker::Record.all.map {|record| record.destroy if record.user.nil?}
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
@@ -0,0 +1,13 @@
+class ChangeCertifierDescriptionToText < ActiveRecord::Migration
+  def self.up
+    change_table :certifiers do |t|
+      t.change :description, :text, :limit => nil
+    end
+  end
+
+  def self.down
+    change_table :certifiers do |t|
+      t.change :description, :string
+    end
+  end
+end
@@ -0,0 +1,25 @@
+class MoveDataSerializedHashToSettingFieldForEvents < ActiveRecord::Migration
+  def self.up
+    select_all("SELECT id FROM articles WHERE type = 'Event' AND body LIKE '%:link:%'").each do |data|
+      article = Event.find(data['id'])
+      body = ''
+      begin
+        body = YAML.load(article.body)
+      rescue
+        # do nothing
+        next
+      end
+      if body.kind_of?(Hash)
+        settings = article.setting.merge(body)
+        body = ActiveRecord::Base.sanitize_sql_for_assignment(:body => settings[:description])
+        update("UPDATE articles set %s WHERE id = %d" % [body, article.id])
+        setting = ActiveRecord::Base.sanitize_sql_for_assignment(:setting => settings.to_yaml)
+        update("UPDATE articles set %s WHERE id = %d" % [setting, article.id])
+      end
+    end
+  end
+
+  def self.down
+    say "Nothing to undo"
+  end
+end
@@ -0,0 +1,13 @@
+class ChangeDiscountToDecimal < ActiveRecord::Migration
+  def self.up
+    change_table :products do |t|
+      t.change :discount, :decimal
+    end
+  end
+
+  def self.down
+    change_table :products do |t|
+      t.change :discount, :float
+    end
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20110215153624) do
+ActiveRecord::Schema.define(:version => 20110316171323) do
   create_table "action_tracker", :force => true do |t|
     t.integer  "user_id"
@@ -179,7 +179,7 @@ ActiveRecord::Schema.define(:version =&gt; 20110215153624) do
   create_table "certifiers", :force => true do |t|
     t.string   "name",           :null => false
-    t.string   "description"
+    t.text     "description"
     t.string   "link"
     t.integer  "environment_id"
     t.datetime "created_at"
@@ -289,11 +289,11 @@ ActiveRecord::Schema.define(:version =&gt; 20110215153624) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "position"
-    t.string   "unit"
     t.decimal  "price_per_unit"
     t.decimal  "amount_used"
     t.boolean  "relevant_to_price",          :default => true
     t.boolean  "is_from_solidarity_economy", :default => false
+    t.integer  "unit_id"
   end
   create_table "mailing_sents", :force => true do |t|
@@ -345,10 +345,10 @@ ActiveRecord::Schema.define(:version =&gt; 20110215153624) do
     t.datetime "updated_at"
     t.float    "lat"
     t.float    "lng"
-    t.string   "unit"
-    t.float    "discount"
+    t.decimal  "discount"
     t.boolean  "available",           :default => true
     t.boolean  "highlighted"
+    t.integer  "unit_id"
   end
   add_index "products", ["enterprise_id"], :name => "index_products_on_enterprise_id"
@@ -469,6 +469,13 @@ ActiveRecord::Schema.define(:version =&gt; 20110215153624) do
     t.string  "thumbnail"
   end
+  create_table "units", :force => true do |t|
+    t.string  "singular",       :null => false
+    t.string  "plural",         :null => false
+    t.integer "position"
+    t.integer "environment_id", :null => false
+  end
+
   create_table "users", :force => true do |t|
     t.string   "login"
     t.string   "email"
+noosfero (0.29.5) unstable; urgency=low
+
+  * Bugfix Version release. (Closes: AI#1961)
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Fri, 25 Mar 2011 16:45:27 -0300
+
+noosfero (0.29.4) unstable; urgency=low
+
+  * Bugfixes Version release. (Closes: AI#1938 AI#1943 AI#1928 AI#1929 AI#1932 AI#1946 AI#1909 AI#1947 AI#1935 AI#1930 AI#1936 AI#1926 AI#1922)
+
+ -- Joenio Costa <joenio@colivre.coop.br>  Thu, 24 Mar 2011 10:31:35 -0300
+
+noosfero (0.29.3) unstable; urgency=low
+
+  * Bugfixes Version release. (Closes: AI#1760 AI#1907 AI#1899 AI#1891 AI#1904 AI#1888 AI#1869 AI#1900 AI#1914)
+
+ -- Joenio Costa <joenio@colivre.coop.br>  Fri, 11 Mar 2011 13:12:43 -0300
+
+noosfero (0.29.2) unstable; urgency=low
+
+  * Bugfixes Version release. (Closes: AI#1922)
+
+ -- Joenio Costa <joenio@perl.org.br>  Wed, 02 Mar 2011 21:24:48 -0300
+
+noosfero (0.29.1) unstable; urgency=low
+
+  * Bugfixes Version release. (Closes: AI#1908)
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Tue, 01 Mar 2011 17:01:37 -0300
+
+noosfero (0.29.0) unstable; urgency=low
+
+  * Features Version release.
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Mon, 28 Feb 2011 17:58:38 -0300
+
+noosfero (0.28.6) unstable; urgency=low
+
+  * Bugfixes Version release. (Closes: AI#1874 AI#1890 AI#1893 AI#1871 AI#1884 AI#1892 AI#1882 AI#1883 AI#1896 AI#1875 AI#1895 AI#1879)
+
+ -- Joenio Costa <joenio@perl.org.br>  Sun, 27 Feb 2011 23:56:51 -0300
+
 noosfero (0.28.5) unstable; urgency=low
   * Bugfixes Version release. (Closes: AI#1867 AI#1866 AI#1870 AI#1854 AI#1851 AI#1810 AI#1889 AI#1868 AI#1855 AI#1887)
 Template: noosfero/initial_domain
 Type: string
-Description: Domain name for your noosfero site:
+Description: Domain name for your noosfero site
  Enter the domain name that will be used for your Noosfero site. This domain
  name will be automatically added to Noosfero's database. The Noosfero frontend
  packages (such as noosfero-apache) will also automatically configure proper
@@ -12,9 +12,10 @@ Description: Domain name for your noosfero site:
 Template: noosfero/email_setup_warning
 Type: note
 Description: Noosfero needs a working e-mail setup
- To function properly, Noosfero needs a working e-mail setup. This is used to
- send friendship request e-mails, recovering passwords, and other things.
+ Noosfero needs a working e-mail setup to work properly. This is used for
+ example to send friendship request e-mails, password recovering e-mail and
+ moderation requests notifications.
  .
  Basically, your local MTA needs to deliver e-mail to the internet. Please
  check /usr/share/doc/noosfero/README.Debian for detailed instructions on
- settings this up.
+ setting this up.
@@ -48,7 +48,7 @@ FERRET_PID_FILE=$NOOSFERO_DIR/tmp/pids/ferret.production.pid
 main_script() {
   cd $NOOSFERO_DIR
   if [ "$NOOSFERO_USER" != "$USER" ]; then
-    su $NOOSFERO_USER -c "./script/production $1"
+    su $NOOSFERO_USER -l -c "./script/production $1"
   else
     ./script/production $1
   fi
@@ -7,10 +7,10 @@ Feature: activate enterprise
     Given the following users
       | login | name |
       | joaosilva | Joao Silva |
+    And I am logged in as "joaosilva"
   Scenario: added an unexistent code
     Given feature "enterprise_activation" is enabled on environment
-    And I am logged in as "joaosilva"
     And I am on Joao Silva's control panel
     And I fill in "Enterprise activation code" with "abcde"
     When I press "Activate"
@@ -21,7 +21,6 @@ Feature: activate enterprise
     And the following enterprises
       | identifier | name | enabled |
       | products-factory | Products Factory | false |
-    And I am logged in as "joaosilva"
     And I am on Joao Silva's control panel
     And enterprise "Products Factory" is enabled
     And I fill in "Enterprise activation code" with code of "Products Factory"
@@ -33,7 +32,6 @@ Feature: activate enterprise
     And the following enterprises
       | identifier | name | enabled |
       | products-factory | Products Factory | false |
-    And I am logged in as "joaosilva"
     And I am on Joao Silva's control panel
     And I fill in "Enterprise activation code" with code of "Products Factory"
     When I press "Activate"
@@ -45,7 +43,6 @@ Feature: activate enterprise
     And the following enterprises
       | identifier | name | enabled | foundation_year |
       | services-provider | Services Provider | false | 2000 |
-    And I am logged in as "joaosilva"
     And I am on Joao Silva's control panel
     And I fill in "Enterprise activation code" with code of "Services Provider"
     And I press "Activate"
@@ -59,7 +56,6 @@ Feature: activate enterprise
     And the following enterprises
       | identifier | name | enabled | cnpj |
       | services-provider | Services Provider | false | 00000000000000 |
-    And I am logged in as "joaosilva"
     And I am on Joao Silva's control panel
     And I fill in "Enterprise activation code" with code of "Services Provider"
     And I press "Activate"
@@ -74,11 +70,10 @@ Feature: activate enterprise
     And the following enterprises
       | identifier | name | enabled | foundation_year |
       | services-provider | Services Provider | false | 2000 |
-    And I am logged in as "joaosilva"
-    And I am on Joao Silva's control panel
+    And I visit "Joao Silva's control panel" and wait
     And I fill in "Enterprise activation code" with code of "Services Provider"
-    And I press "Activate"
-    And I fill in "enterprise-activation-answer" with "2000"
+    And I press "Activate" and wait
+    And I fill in "What year your enterprise was founded? It must have 4 digits, eg 1990." with "2000"
     And I press "Continue"
     And I check "I read the terms of use and accepted them"
     When I press "Continue"
@@ -92,22 +87,21 @@ Feature: activate enterprise
     And feature "enterprise_activation" is enabled on environment
     And the following enterprises
       | identifier | name | enabled | foundation_year |
-      | services-provider | Services Provider | false | 2000 |
+      | services-provider-2 | Services Provider 2 | false | 2000 |
       | active-template | Active Template | false | 2000 |
     And "Active Template" is the active enterprise template
-    And "Services Provider" doesnt have "Active Template" as template
-    And I am logged in as "joaosilva"
-    And I am on Joao Silva's control panel
-    And I fill in "Enterprise activation code" with code of "Services Provider"
-    And I press "Activate"
-    And I fill in "enterprise-activation-answer" with "2000"
+    And "Services Provider 2" doesnt have "Active Template" as template
+    And I visit "Joao Silva's control panel" and wait
+    And I fill in "Enterprise activation code" with code of "Services Provider 2"
+    And I press "Activate" and wait
+    And I fill in "What year your enterprise was founded? It must have 4 digits, eg 1990." with "2000"
     And I press "Continue"
     And I check "I read the terms of use and accepted them"
     When I press "Continue"
-    Then I should see "Services Provider was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise"
-    And enterprise "Services Provider" should be enabled
-    And "Joao Silva" is admin of "Services Provider"
-    And "Services Provider" has "Active Template" as template
+    Then I should see "Services Provider 2 was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise"
+    And enterprise "Services Provider 2" should be enabled
+    And "Joao Silva" is admin of "Services Provider 2"
+    And "Services Provider 2" has "Active Template" as template
   @selenium
   Scenario: not replace template after enable an enterprise
@@ -115,20 +109,18 @@ Feature: activate enterprise
     And feature "enterprise_activation" is enabled on environment
     And the following enterprises
       | identifier | name | enabled | foundation_year |
-      | services-provider | Services Provider | false | 2000 |
+      | services-provider-3 | Services Provider 3 | false | 2000 |
       | active-template | Active Template | false | 2000 |
     And "Active Template" is the active enterprise template
-    And "Services Provider" doesnt have "Active Template" as template
-    And I am logged in as "joaosilva"
-    And I am on Joao Silva's control panel
-    And I fill in "Enterprise activation code" with code of "Services Provider"
-    And I press "Activate"
-    And I fill in "enterprise-activation-answer" with "2000"
+    And "Services Provider 3" doesnt have "Active Template" as template
+    When I visit "Joao Silva's control panel" and wait
+    And I fill in "Enterprise activation code" with code of "Services Provider 3"
+    And I press "Activate" and wait
+    And I fill in "What year your enterprise was founded? It must have 4 digits, eg 1990." with "2000"
     And I press "Continue"
     And I check "I read the terms of use and accepted them"
     When I press "Continue"
-    Then I should see "Services Provider was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise"
-    And enterprise "Services Provider" should be enabled
-    And "Joao Silva" is admin of "Services Provider"
-    And "Services Provider" doesnt have "Active Template" as template
-
+    Then I should see "Services Provider 3 was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise"
+    And enterprise "Services Provider 3" should be enabled
+    And "Joao Silva" is admin of "Services Provider 3"
+    And "Services Provider 3" doesnt have "Active Template" as template
@@ -14,10 +14,15 @@ Feature: manage categories
     Given I am logged in as admin
   @selenium
-  Scenario: admin user could create a category
+  Scenario: admin user could access new category
     Given I follow "Administration"
-    And I follow "Manage Categories"
-    And I follow "New category"
+    When I follow "Manage Categories"
+    And I follow "New category" and wait
+    Then I should be on /admin/categories/new
+
+  @selenium
+  Scenario: admin user could create a category
+    Given I visit "/admin/categories/new" and wait
     When I fill in "Name" with "Category 1"
     And I press "Save"
     Then I should see "Categories"
@@ -47,7 +52,8 @@ Feature: manage categories
     Given the following category
       | parent  | name     | display_in_menu |
       | Steak   | Pig      | true            |
-    And I follow "Administration"
+    And I am on the homepage
+    When I follow "Administration"
     And I follow "Manage Categories"
     Then I should see "Food Show"
     When I follow "Show"
@@ -18,18 +18,19 @@ Feature: approve article
     And "Maria Silva" is a member of "Sample Community"
     And "Joao Silva" is admin of "Sample Community"
+  @selenium
   Scenario: edit an article before approval
     Given I am logged in as "mariasilva"
     And I am on Maria Silva's homepage
-    And I follow "Spread"
+    When I follow "Spread" and wait
     And I check "Sample Community"
     And I press "Spread this"
-    When I am logged in as "joaosilva"
+    And I am logged in as "joaosilva"
     And I go to Sample Community's control panel
-    And I follow "Process requests"
+    And I follow "Process requests" and wait
     And I fill in "Text" with "This is an article edited"
     And I choose "Accept"
     And I press "Apply!"
     And I go to Sample Community's sitemap
-    When I follow "Sample Article"
+    And I follow "Sample Article"
     Then I should see "This is an article edited"
@@ -2,22 +2,18 @@ Feature: balloon
   I want to view a balloon when mouse clicks on profile trigger
   Background:
-    Given I am on the homepage
     Given the following users
-      | login | name |
+      | login     | name       |
       | joaosilva | Joao Silva |
     And the following communities
-      | identifier | name    |
-      | sample     | Sample  |
+      | identifier | name      |
+      | sample     | Sample    |
   @selenium
   Scenario: I should not see trigger if not enabled
-    Given the following blocks
-      | owner       | type        |
-      | environment | PeopleBlock |
-    And feature "show_balloon_with_profile_links_when_clicked" is disabled on environment
-    And I go to the homepage
-    Then I should not see "Friends"
+    Given feature "show_balloon_with_profile_links_when_clicked" is disabled on environment
+    When I go to /browse/people
+    Then I should not see "Profile links"
   @selenium
   Scenario: I should not see trigger by default
@@ -25,7 +21,7 @@ Feature: balloon
       | owner       | type        |
       | environment | PeopleBlock |
     And feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    And I go to the homepage
+    When I go to the homepage
     Then I should not see "Friends"
   @selenium
@@ -34,39 +30,33 @@ Feature: balloon
       | owner       | type        |
       | environment | PeopleBlock |
     And feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    And I go to the homepage
-    When I click ".menu-submenu-trigger"
-    Then I should see "Profile"
-    And I should see "Friends"
+    When I go to the homepage
+    And I follow "Profile links"
+    Then I should see "Friends"
   @selenium
   Scenario: I should see balloon when clicked on community block trigger
-    Given the following blocks
-      | owner       | type        |
-      | environment | CommunitiesBlock |
-    And feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    And I go to the homepage
-    When I click ".menu-submenu-trigger"
-    Then I should see "Profile"
-    And I should see "Members"
-    And I should see "Agenda"
+    Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
+    When I go to /browse/communities
+    And I follow "Profile links"
+    Then I should see "Members"
   @selenium
   Scenario: I should not see trigger if not enabled on page
     Given feature "show_balloon_with_profile_links_when_clicked" is disabled on environment
-    And I go to /assets/communities
-    Then I should not see "Members"
+    When I go to /assets/people
+    Then I should not see "Profile links"
   @selenium
   Scenario: I should not see trigger by default on page
     Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    And I go to /assets/communities
+    When I go to /assets/communities
     Then I should not see "Members"
   @selenium
   Scenario: I should see balloon when clicked on page trigger
     Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    And I go to /assets/communities
-    When I click ".menu-submenu-trigger"
+    When I go to /assets/communities
+    And I follow "Profile links"
     Then I should see "Members"
     And I should see "Agenda"
@@ -83,12 +83,13 @@ Feature: blog
     When I follow "Configure blog"
     Then I should be on edit "Blog One" by joaosilva
+  @selenium
   Scenario: configure blog when viewing it
     Given the following blogs
        | owner     | name     |
        | joaosilva | Blog One |
     And I go to /joaosilva/blog-one
-    When I follow "Configure blog"
+    When I follow "Configure blog" and wait
     Then I should be on edit "Blog One" by joaosilva
   Scenario: change address of blog
@@ -39,10 +39,9 @@ Feature: browse
     And I should see "Invite friends"
     And I should see "My friends"
-  @selenium
   Scenario: Browse people by query
     Given I go to /browse/people
-    When I fill in "query" with "Silva"
+    When I fill in "Silva" for "query"
     And I press "Search"
     Then I should see "Joao Silva"
     And I should see "Pedro Silva"
@@ -53,8 +52,8 @@ Feature: browse
   @selenium
   Scenario: Communities browse menu should add logged information
     Given I am logged in as "joaosilva"
-    And I am on the homepage
-    And I should not see "More Recent"
+    When I go to /joaosilva
+    Then I should not see "More Recent"
     And I should not see "More Active"
     And I should not see "More Popular"
     And I should not see "My communities"
@@ -76,14 +75,12 @@ Feature: browse
     And I should see "More Active"
     And I should see "More Popular"
-  @selenium
   Scenario: Browse communities by query
-    Given I go to /browse/communities
-    When I fill in "query" with "Silva"
+    When I go to /browse/communities
+    And I fill in "Silva" for "query"
     And I press "Search"
     Then I should see "Community Silva"
     And I should not see "Joao Silva"
     And I should not see "Pedro Silva"
     And I should not see "Paulo Neto"
     And I should not see "Community Neto"
-
@@ -61,12 +61,10 @@ Feature: categories_block
     And I follow "Edit" within ".categories-block"
     And I check "Product"
     And I press "Save"
-    Then I should see "Food"
-    And I should not see "Vegetarian"
-    And I should not see "Steak"
+    Then I should see "Book"
+    And I should not see "Literature"
     When I click ".category-link-expand category-root"
-    Then I should see "Vegetarian"
-    And I should see "Steak"
+    Then I should see "Literature"
   @selenium
   Scenario: List just general categories
@@ -43,6 +43,7 @@ Feature: chat
     Given I am on Tame's homepage
     Then I should not see "Open chat" link
+  @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 "Online friends "
@@ -63,7 +64,7 @@ Feature: chat
     And I am logged in as "tame"
     When I follow "Open chat"
     And I select window "noosfero_chat"
-    Then I should see "Chat - Colivre.net - Friends online (0)"
+    Then I should see "Chat - Colivre.net - Friends in chat (0)"
   @selenium
   Scenario: open chat with an online user in a new window
@@ -74,7 +75,7 @@ Feature: chat
     When I click "#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)"
+    Then I should see "Chat - Colivre.net - Friends in chat (0)"
   @selenium
   Scenario: chat starts disconnected by default
@@ -98,6 +99,7 @@ Feature: chat
     And the "#chat-busy" should be visible
     And the "#chat-disconnect" should be visible
+  @selenium
   Scenario: link to open chatroom of a community
     Given the following communities
       | identifier | name |
@@ -108,6 +110,7 @@ Feature: chat
     When I go to Autoramas's profile
     Then I should see "Enter chat room" link
+  @selenium
   Scenario: not see link to open chatroom of a community if not a member
     Given the following communities
       | identifier | name |
@@ -117,6 +120,7 @@ Feature: chat
     When I go to Autoramas's profile
     Then I should not see "Enter chat room" link
+  @selenium
   Scenario: not see link to open chatroom of a community if xmpp_chat disabled
     Given the following communities
       | identifier | name |
@@ -137,4 +141,4 @@ Feature: chat
     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)"
+    Then I should see "Chat - Colivre.net - Friends in chat (0)"
@@ -18,7 +18,7 @@ Feature: comment
   Scenario: not post a comment without javascript
     Given I am on /booking/article-to-comment
     And I fill in "Name" with "Joey Ramone"
-    And I fill in "e-Mail" with "joey@ramones.com"
+    And I fill in "e-mail" with "joey@ramones.com"
     And I fill in "Title" with "Hey ho, let's go!"
     And I fill in "Enter your comment" with "Hey ho, let's go!"
     When I press "Post comment"
@@ -28,7 +28,7 @@ Feature: comment
   Scenario: post a comment while not authenticated
     Given I am on /booking/article-to-comment
     And I fill in "Name" with "Joey Ramone"
-    And I fill in "e-Mail" with "joey@ramones.com"
+    And I fill in "e-mail" with "joey@ramones.com"
     And I fill in "Title" with "Hey ho, let's go!"
     And I fill in "Enter your comment" with "Hey ho, let's go!"
     When I press "Post comment"
@@ -67,7 +67,7 @@ Feature: comment
   Scenario: disable post comment button
     Given I am on /booking/article-to-comment
     And I fill in "Name" with "Joey Ramone"
-    And I fill in "e-Mail" with "joey@ramones.com"
+    And I fill in "e-mail" with "joey@ramones.com"
     And I fill in "Title" with "Hey ho, let's go!"
     And I fill in "Enter your comment" with "Hey ho, let's go!"
     When I press "Post comment"
@@ -12,16 +12,18 @@ In order to ask questions and solve problems
       | sample-community | Sample Community |
     And I am logged in as "joaosilva" 
+  @selenium
   Scenario: without states
     Given I am on Sample Community's homepage
-    When I follow "Send an e-mail"
+    When I follow "Send an e-mail" and wait
     Then I should not see "City and state"
+  @selenium
   Scenario: with states
     Given the following states
       | name  |
       | Bahia |
     And I am on Sample Community's homepage
-    When I follow "Send an e-mail"
+    When I follow "Send an e-mail" and wait
     Then I should see "City and state"
@@ -77,52 +77,57 @@ Feature: edit article
     Then I should see "My Article"
     And I should be on /joaosilva/my-article
+  @selenium
   Scenario: edit an article
     Given I am on Joao Silva's sitemap
-    And I follow "Save the whales"
-    And I follow "Edit"
+    When I follow "Save the whales" and wait
+    And I follow "Edit" and wait
     And I fill in "Title" with "My Article edited"
-    When I press "Save"
+    And I press "Save" and wait
     Then I should be on /joaosilva/my-article-edited
+  @selenium
   Scenario: cancel button back to article when edit
     Given I am on Joao Silva's sitemap
-    And I follow "Save the whales"
-    And I follow "Edit"
-    When I follow "Cancel" within ".main-block"
+    When I follow "Save the whales" and wait
+    And I follow "Edit" and wait
+    And I follow "Cancel" within ".main-block" and wait
     Then I should be on /joaosilva/save-the-whales
+  @selenium
   Scenario: create an article inside a folder
     Given I am on Joao Silva's control panel
-    And I follow "Manage Content"
+    When I follow "Manage Content"
     And I follow "New content"
-    And I follow "Folder"
+    And I follow "Folder" and wait
     And I fill in "Title" with "My Folder"
-    And I press "Save"
+    And I press "Save" and wait
     Then I should be on /joaosilva/my-folder
     When I follow "New article"
-    And I follow "Text article with visual editor"
+    And I follow "Text article with visual editor" and wait
     And I fill in "Title" with "My Article"
-    And I press "Save"
+    And I press "Save" and wait
     Then I should see "My Article"
     And I should be on /joaosilva/my-folder/my-article
+  @selenium
   Scenario: cancel button back to folder after giving up creating
     Given I am on Joao Silva's control panel
-    And I follow "Manage Content"
+    When I follow "Manage Content"
     And I follow "New content"
-    And I follow "Folder"
+    And I follow "Folder" and wait
     And I fill in "Title" with "My Folder"
-    And I press "Save"
+    And I press "Save" and wait
     Then I should be on /joaosilva/my-folder
     When I follow "New article"
-    And I follow "Text article with visual editor"
-    When I follow "Cancel" within ".no-boxes"
-    And I should be on /joaosilva/my-folder
+    And I follow "Text article with visual editor" and wait
+    And I follow "Cancel" within ".no-boxes" and wait
+    Then I should be on /joaosilva/my-folder
+  @selenium
   Scenario: save and continue
     Given I am on /joaosilva/save-the-whales
-    And I follow "Edit"
+    And I follow "Edit" and wait
     When I fill in "Text" with "new text"
     And I press "Save and continue"
     Then the "Text" field should contain "new text"
@@ -140,31 +145,33 @@ Feature: edit article
     And the "Title" field should contain "My new article"
     And the "Text" field should contain "text for the new article"
+  @selenium
   Scenario: add a translation to an article
     Given I am on Joao Silva's sitemap
     And I follow "Save the whales"
     Then I should not see "Add translation"
-    And I follow "Edit"
+    And I follow "Edit" and wait
     And I select "English" from "Language"
-    Then I press "Save"
-    And I follow "Add translation"
+    Then I press "Save" and wait
+    And I follow "Add translation" and wait
     And I fill in "Title" with "Mi neuvo artículo"
     And I select "Español" from "Language"
-    When I press "Save"
+    When I press "Save" and wait
     Then I should be on /joaosilva/mi-neuvo-articulo
     And I should see "Translations"
+  @selenium
   Scenario: not add a translation without a language
     Given the following articles
       | owner     | name               | language |
       | joaosilva | Article in English | en       |
     And I am on Joao Silva's sitemap
-    And I follow "Article in English"
-    And I follow "Add translation"
+    When I follow "Article in English" and wait
+    And I follow "Add translation" and wait
     And I fill in "Title" with "Article in Portuguese"
-    When I press "Save"
+    And I press "Save" and wait
     Then I should see "Language must be choosen"
-    And I select "Português" from "Language"
-    When I press "Save"
+    When I select "Português" from "Language"
+    And I press "Save" and wait
     Then I should not see "Language must be choosen"
     And I should be on /joaosilva/article-in-portuguese
@@ -14,9 +14,9 @@ Feature: edit_block_of_links
   @selenium
   Scenario: show the icon selector
-    And I follow "Edit sideboxes"
-    Given I follow "Edit" within ".link-list-block"
-    And I follow "New link"
-    And the ".icon-selector" should not be visible
+    Given I follow "Edit sideboxes"
+    And I follow "Edit" within ".link-list-block"
+    When I follow "New link"
+    Then the "css=div.icon-selector" should not be visible
     When I click ".icon"
-    Then the ".icon-selector" should be visible
+    Then the "css=div.icon-selector" should be visible
@@ -175,15 +175,16 @@ Feature: events
     When I am on /assets/events
     Then I should see "Colivre.net's events"
+  @selenium
   Scenario: published events should be listed in the agenda too
     Given the following community
       | identifier | name |
       | sample-community | Sample Community |
     And I am logged in as "josesilva"
     And "josesilva" is a member of "Sample Community"
-    And I am on josesilva's control panel
-    And I follow "Manage content"
-    And I follow "Another Conference"
+    And I go to josesilva's control panel
+    And I follow "Manage Content"
+    And I follow "Another Conference" and wait
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
@@ -206,3 +207,26 @@ Feature: events
     When I am on /profile/josesilva/events/2009/10/25
     Then I should see "Unpublished event"
     And I should see "25" link
+
+  Scenario: events have lead field
+    Given I am logged in as "josesilva"
+    And I am on josesilva's Event creation
+    Then I should see "Lead"
+
+  @selenium
+  Scenario: events lead should be shown on blogs with short format
+    Given I am logged in as "josesilva"
+    And I am on josesilva's control panel
+    And I follow "Configure blog" and wait
+    And I select "First paragraph" from "How to display posts:"
+    And I press "Save"
+    And I follow "New post"
+    And I follow "A calendar event" and wait
+    And I fill in "Title" with "Leaded event"
+    And I type "This is the abstract." in TinyMCE field "article_abstract"
+    And I type "This is the real text." in TinyMCE field "article_body"
+    And I press "Save"
+    When I am on josesilva's blog
+    Then I should see "Leaded event"
+    And I should see "This is the abstract."
+    And I should not see "This is the real text."
@@ -10,13 +10,14 @@ Feature: forum
     And "joaosilva" has no articles
     And I am logged in as "joaosilva"
+  @selenium
   Scenario: create a forum
-    Given I go to the Control panel
+    Given I am on Joao Silva's control panel
     And I follow "Manage Content"
     And I follow "New content"
-    When I follow "Forum"
+    When I follow "Forum" and wait
     And I fill in "Title" with "My Forum"
-    And I press "Save"
+    And I press "Save" and wait
     Then I should see "Configure forum"
   Scenario: redirect to forum after create forum from cms
@@ -60,12 +61,13 @@ Feature: forum
     When I follow "Cancel" within ".main-block"
     Then I should be on /myprofile/joaosilva/cms
+  @selenium
   Scenario: configure forum when viewing it
     Given the following forums
-       | owner     | name     |
+       | owner     | name      |
        | joaosilva | Forum One |
-    And I go to /joaosilva/forum-one
-    When I follow "Configure forum"
+    And I visit "/joaosilva/forum-one" and wait
+    When I follow "Configure forum" and wait
     Then I should be on edit "Forum One" by joaosilva
   Scenario: last topic update by unautenticated user should not link
@@ -7,20 +7,23 @@ Feature: gallery_navigation
       | login       |
       | marciopunk  |
     And the following galleries
-      | owner      | name       |
-      | marciopunk | my-gallery |
+      | owner      | name          |
+      | marciopunk | my-gallery    |
+      | marciopunk | other-gallery |
     And the following files
-      | owner      | file          | mime       | parent     |
-      | marciopunk | rails.png     | image/png  | my-gallery |
-      | marciopunk | other-pic.jpg | image/jpeg | my-gallery |
+      | 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 »"
+    When I follow "Next »" and wait
     Then I should see "rails.png" within ".title"
   Scenario: not link to next when in last image
@@ -32,9 +35,10 @@ Feature: gallery_navigation
     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"
+    When I follow "« Previous" and wait
     Then I should see "other-pic.jpg" within ".title"
   Scenario: not link to previous when in first image
@@ -64,11 +68,11 @@ Feature: gallery_navigation
     When I follow "Go back to my-gallery"
     Then I should be on /marciopunk/my-gallery
+  @selenium
   Scenario: image title in window title
     Given I am logged in as "marciopunk"
-    And I go to /marciopunk/my-gallery/rails.png?view=true
-    When I follow "Edit"
+    When I visit "/marciopunk/other-gallery/rails.png?view=true" and wait
+    And I follow "Edit" and wait
     And I fill in "Title" with "Rails is cool"
-    And I press "Save"
-    And I go to /marciopunk/my-gallery/rails.png?view=true
-    And The page title should contain "Rails is cool"
+    And I press "Save" and wait
+    Then The page title should contain "Rails is cool"
@@ -20,6 +20,10 @@ Feature: manage inputs
       | owner      | category | name       |
       | redemoinho | rock     | Abbey Road |
     And feature "disable_products_for_enterprises" is disabled on environment
+    And the following units
+      | singular | plural |
+      | Meter    | Meters |
+      | Litre    | Litres |
   @selenium
   Scenario: add first input to a product
@@ -53,8 +57,8 @@ Feature: manage inputs
     Given I am logged in as "joaosilva"
     When I go to Rede Moinho's page of product Abbey Road
     And I follow "Inputs"
-    And I follow "Add the inputs or raw material used by this product"
-    When I follow "Cancel"
+    And I follow "Add the inputs or raw material used by this product" and wait until "#input-category-form" is present
+    And I click "css=a.cancel-add-input"
     Then I should see "Abbey Road"
     And I should see "Add the inputs or raw material used by this product"
@@ -110,9 +114,9 @@ Feature: manage inputs
     And I am logged in as "joaosilva"
     When I go to Rede Moinho's page of product Abbey Road
     And I follow "Inputs"
-    And I should see "Music"
+    Then I should see "Music"
     When I follow "Click here to add price and the amount used"
-    And I should see "Price ($)"
+    And I should see "Price"
     And I fill in "Price" with "10.50"
     And I press "Save"
     Then I should not see "Save"
@@ -126,11 +130,9 @@ Feature: manage inputs
     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 "Price ($)"
-    And I should not see "Price by meter ($)"
-    When I select "meter"
-    Then I should see "Price by meter ($)"
-    And I should not see "Price ($)"
+    And I should not see "Price by Meter ($)"
+    When I select "Meter"
+    Then I should see "Price by Meter ($)"
   @selenium
   Scenario: Save all price details of input
@@ -143,10 +145,10 @@ Feature: manage inputs
     And I follow "Click here to add price and the amount used"
     And I fill in "Amount used" with "2.5"
     And I fill in "Price" with "11.50"
-    And I select "meter"
+    And I select "Meter"
     And I press "Save"
     Then I should see "2.5"
-    And I should see "meter"
+    And I should see "Meter"
     And I should not see "$ 11.50"
   @selenium
@@ -160,17 +162,17 @@ Feature: manage inputs
     And I follow "Click here to add price and the amount used"
     And I fill in "Amount used" with "2.5"
     And I fill in "Price" with "11.50"
-    And I select "meter"
+    And I select "Meter"
     And I press "Save"
     Then I should see "2.5"
-    And I should see "meter"
+    And I should see "Meter"
     When I follow "Edit" within ".input-details"
     And I fill in "Amount used" with "3.0"
     And I fill in "Price" with "23.31"
-    And I select "litre"
+    And I select "Litre"
     And I press "Save"
     Then I should see "3"
-    And I should see "litre"
+    And I should see "Litre"
   @selenium
   Scenario: Cancel edition of a input
@@ -180,19 +182,19 @@ Feature: manage inputs
     And I am logged in as "joaosilva"
     When I go to Rede Moinho's page of product Abbey Road
     And I follow "Inputs"
-    And I follow "Click here to add price and the amount used"
+    And I follow "Click here to add price and the amount used" and wait until ".input-details-form" is present
     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"
+    When I click "css=a.cancel-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           | 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"
@@ -200,7 +202,7 @@ Feature: manage inputs
     And I follow "Cancel"
     And I follow "Edit" within ".input-details"
     Then I should see "Amount used"
-    And I should see "Price by unit"
+    And I should see "Price by Meter"
   @selenium
   Scenario: remove input
@@ -213,6 +215,7 @@ Feature: manage inputs
     Then I should see "Rock"
     And I should not see "Add the inputs or raw material used by this product"
     When I follow "Remove"
+    And I confirm
     Then I should see "Add the inputs or raw material used by this product"
   @selenium
@@ -133,7 +133,7 @@ Feature: manage products
     And I am on Rede Moinho's control panel
     And I follow "Manage Products and Services"
     When I follow "New product or service"
-    And I select "Toplevel Product ... »" and wait for jquery
+    And I select "Toplevel Product Categories »" and wait for jquery
     And I select "Category Level 1" and wait for jquery
     Then I should see "Toplevel Product Categories" link
     And I should not see "Category Level 1" link
@@ -149,14 +149,14 @@ Feature: manage products
   @selenium
   Scenario: enable save button when select one category
-    Given the following product_category
+    Given I am logged in as "joaosilva"
+    And the following product_category
       | name |
       | Browsers (accept categories) |
-    Given I am logged in as "joaosilva"
     And I am on Rede Moinho's control panel
     And I follow "Manage Products and Services"
     When I follow "New product or service"
-    And I select "Browsers (accept ..." and wait for jquery
+    And I select "Browsers (accept categories)" and wait for jquery
     Then the "Save and continue" button should be enabled
   @selenium
@@ -290,7 +290,7 @@ Feature: manage products
     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 "product_name" with "Red bicycle"
+    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
@@ -453,7 +453,7 @@ Feature: manage products
       | Nanonote nanotech with long long name |
     And the following product_category
       | name | parent |
-      | Netbook Quantum | Super Quantum Computers |
+      | Netbook Quantum | Super Quantum Computers with teraflops |
     And I am logged in as "joaosilva"
     When I go to Rede Moinho's new product page
     Then I should see "Nanonote nanotech with long lo..."
@@ -467,11 +467,14 @@ Feature: manage products
     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 "product_name" with "Red bicycle"
-    And I select "kilo"
+    And I fill in "Red bicycle" for "product_name"
+    And I select "Kilo"
     And I press "Save"
     Then I should see "Red bicycle - kilo"
@@ -486,7 +489,7 @@ Feature: manage products
     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 "product_price" with "10"
+    And I fill in "10" for "product_price"
     And I choose "No"
     And I press "Save"
     Then I should see "Product not available!"
@@ -13,30 +13,32 @@ Feature: my_network_block
       | identifier       | name              | public_profile |
       | public-community | Public Community  | true           |
+  @selenium
   Scenario: display how many public/private communities I am member
-    Given the following communities
+    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 logged in as "joaosilva"
     And I am on Joao Silva's homepage
-    Then I should see "2 communities"
+    And I should see "2 communities"
     When I go to Public Community's homepage
     And I follow "Join"
-    When I go to Joao Silva's homepage
+    And I go to Joao Silva's homepage
     Then I should see "3 communities"
+  @selenium
   Scenario: not display how many invisible communities I am member
-    Given the following communities
+    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 logged in as "joaosilva"
     And I am on Joao Silva's homepage
-    Then I should see "One community"
+    And I should see "One community"
     When I go to Public Community's homepage
     And I follow "Join"
-    When I go to Joao Silva's homepage
+    And I go to Joao Silva's homepage
     Then I should see "2 communities"
   Scenario: display how many public/private friends I have
@@ -42,11 +42,12 @@ Feature: publish article
     Then I should see "Another name"
     And I should not see "Sample Article"
+  @selenium
   Scenario: getting an error message when publishing article with same name
     Given I am logged in as "joaosilva"
     And "Joao Silva" is a member of "Sample Community"
     And I am on Joao Silva's control panel
-    And I follow "Manage Content"
+    And I follow "Manage Content" and wait
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
@@ -56,11 +57,11 @@ Feature: publish article
     And I am on Maria Silva's control panel
     And I follow "Manage Content"
     And I follow "New content"
-    And I follow "Text article with Textile markup language"
+    And I follow "Text article with Textile markup language" and wait
     And I fill in the following:
       | Title | Sample Article |
       | Text | this is Maria's first published article |
-    And I press "Save"
+    And I press "Save" and wait
     And I follow "Spread"
     And I check "Sample Community"
     When I press "Spread this"
 When /^I should see "([^\"]+)" link$/ do |text|
-  response.should have_selector("a:contains('#{text}')")
+  if response.class.to_s == 'Webrat::SeleniumResponse'
+    response.selenium.is_element_present("css=a:contains('#{text}')")
+  else
+    response.should have_selector("a:contains('#{text}')")
+  end
 end
 When /^I should not see "([^\"]+)" link$/ do |text|
@@ -121,7 +121,8 @@ Given /^the following inputs?$/ do |table|
     data = item.dup
     product = Product.find_by_name(data.delete("product"))
     category = Category.find_by_slug(data.delete("category").to_slug)
-    input = Input.create!(data.merge(:product => product, :product_category => category))
+    unit = Unit.find_by_singular(data.delete("unit"))
+    input = Input.create!(data.merge(:product => product, :product_category => category, :unit => unit))
     input.update_attributes!(:position => data['position'])
   end
 end
@@ -293,7 +294,11 @@ Given /^(.+) is disabled$/ do |enterprise_name|
 end
 Then /^The page title should contain "(.*)"$/ do |text|
-  response.should have_selector("title:contains('#{text}')")
+  if response.class.to_s == 'Webrat::SeleniumResponse'
+    response.selenium.text('css=title').should include(text)
+  else
+    response.should have_selector("title:contains('#{text}')")
+  end
 end
 Given /^the mailbox is empty$/ do
@@ -369,4 +374,8 @@ Given /^someone suggested the following article to be published$/ do |table|
   end
 end
-
+Given /^the following units?$/ do |table|
+  table.hashes.each do |row|
+    Unit.create!(row.merge(:environment_id => 1))
+  end
+end
@@ -85,6 +85,24 @@ Then /^&quot;([^\&quot;]*)&quot; should be (left|right) aligned$/ do |element_class, align|
   response.selenium.get_xpath_count("//*[contains(@class,'#{element_class}') and contains(@style,'float: #{align}')]").to_i.should be(1)
 end
+When /^I confirm$/ do
+  selenium.get_confirmation
+end
+
+When /^I type "([^\"]*)" in TinyMCE field "([^\"]*)"$/ do |value, field_id|
+  response.selenium.type("dom=document.getElementById('#{field_id}_ifr').contentDocument.body", value)
+end
+
+When /^I answer the captcha$/ do
+  question = response.selenium.get_text("//label[@for='task_captcha_solution']").match(/What is the result of '(.+) = \?'/)[1]
+  answer = eval(question)
+  response.selenium.type("id=task_captcha_solution", answer)
+end
+
+When /^I refresh the page$/ do
+  response.selenium.refresh
+end
+
 #### Noosfero specific steps ####
 Then /^the select for category "([^\"]*)" should be visible$/ do |name|
@@ -16,20 +16,49 @@ When /^I go to (.+)$/ do |page_name|
   visit path_to(page_name)
 end
+When /^I visit "([^\"]*)" and wait$/ do |page_name|
+  visit path_to(page_name)
+  selenium.wait_for_page_to_load(10000)
+end
+
 When /^I press "([^\"]*)"$/ do |button|
   click_button(button)
 end
+When /^I press "([^\"]*)" and wait$/ do |button|
+  click_button(button)
+  selenium.wait_for_page_to_load(10000)
+end
+
 When /^I follow "([^\"]*)"$/ do |link|
   click_link(link)
 end
+When /^I follow "([^\"]*)" and wait$/ do |link|
+  click_link(link)
+  selenium.wait_for_page_to_load(10000)
+end
+
+When /^I follow "([^\"]*)" and wait until "([^\"]*)" is present$/ do |link, element|
+  click_link(link)
+  selenium.wait_for_element(string_to_element_locator(element))
+end
+
 When /^I follow "([^\"]*)" within "([^\"]*)"$/ do |link, parent|
   click_link_within(parent, link)
 end
+When /^I follow "([^\"]*)" within "([^\"]*)" and wait$/ do |link, parent|
+  click_link_within(parent, link)
+  selenium.wait_for_page_to_load(10000)
+end
+
 When /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |field, value|
-  fill_in(field, :with => value)
+  if response.class.to_s == 'Webrat::SeleniumResponse'
+    response.selenium.type("//*[@id=//label[contains(., '#{field}')]/@for]", value)
+  else
+    fill_in(field, :with => value)
+  end
 end
 When /^I fill in "([^\"]*)" for "([^\"]*)"$/ do |value, field|
@@ -54,7 +83,11 @@ When /^I fill in the following:$/ do |fields|
 end
 When /^I select "([^\"]*)" from "([^\"]*)"$/ do |value, field|
-  select(value, :from => field)
+  if response.class.to_s == 'Webrat::SeleniumResponse'
+    response.selenium.select("//*[@id=//label[contains(., '#{field}')]/@for]", value)
+  else
+    select(value, :from => field)
+  end
 end
 # Use this step in conjunction with Rail's datetime_select helper. For example:
@@ -173,7 +206,11 @@ Then /^I should not see \/([^\/]*)\/ within &quot;([^\&quot;]*)&quot;$/ do |regexp, selector|
 end
 Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
-  field_labeled(field).value.should =~ /#{value}/
+  if response.class.to_s == 'Webrat::SeleniumResponse'
+    response.selenium.get_value("//*[@id=//label[contains(., '#{field}')]/@for]").should match(value)
+  else
+    field_labeled(field).value.should =~ /#{value}/
+  end
 end
 Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, value|
@@ -189,7 +226,11 @@ Then /^the &quot;([^\&quot;]*)&quot; checkbox should not be checked$/ do |label|
 end
 Then /^I should be on (.+)$/ do |page_name|
-  URI.parse(current_url).path.should == path_to(page_name)
+  if response.class.to_s == 'Webrat::SeleniumResponse'
+    URI.parse(response.selenium.get_location).path.should == path_to(page_name)
+  else
+    URI.parse(current_url).path.should == path_to(page_name)
+  end
 end
 Then /^show me the page$/ do
@@ -21,3 +21,26 @@ Feature: suggest article
     And I follow "Process requests"
     And I should see "suggested the publication of the article"
     Then I should see "Highlight this article" within ".task_box"
+
+  @selenium
+  Scenario: an article is suggested and the admin approve it
+    Given I am on Sample Community's blog
+    And I follow "Suggest an article" and wait
+    And I fill in "Title" with "Suggestion"
+    And I fill in "Your name" with "Some Guy"
+    And I fill in "Email" with "someguy@somewhere.com"
+    And I type "This is my suggestion's lead" in TinyMCE field "task_article_abstract"
+    And I type "I like free software" in TinyMCE field "task_article_body"
+    And I answer the captcha
+    And I press "Save"
+    And I am logged in as "joaosilva"
+    And I go to Sample Community's control panel
+    When I follow "Process requests" and wait
+    Then I should see "suggested the publication of the article: Suggestion."
+    When I choose "Accept"
+    And I select "sample-community/Blog" from "Select the folder where the article must be published"
+    And I press "Apply!"
+    And I go to Sample Community's blog
+    And I refresh the page
+    Then I should see "Suggestion"
+    Then I should see "I like free software"
@@ -27,6 +27,12 @@ module NavigationHelpers
     when /^(.*)'s homepage$/
       '/%s' % Profile.find_by_name($1).identifier
+    when /^(.*)'s blog$/
+      '/%s/blog' % Profile.find_by_name($1).identifier
+
+    when /^(.*)'s (.+) creation$/
+      '/myprofile/%s/cms/new?type=%s' % [Profile.find_by_name($1).identifier,$2]
+
     when /^(.*)'s sitemap/
       '/profile/%s/sitemap' % Profile.find_by_name($1).identifier
 Webrat.configure do |config|
   config.mode = :selenium
+  config.application_environment = :cucumber
+  config.selenium_browser_startup_timeout = 30000
 end
 Cucumber::Rails::World.use_transactional_fixtures = false
@@ -0,0 +1,43 @@
+Feature: upload files
+  As a logged user
+  I want to upload files
+
+  Background:
+    Given the following users
+      | login | name |
+      | joaosilva | Joao Silva |
+    And I am logged in as "joaosilva"
+
+  @selenium
+  Scenario: provile links to upload files to community's gallery
+    Given the following communities
+      | identifier | name | owner |
+      | sample-community | Sample Community | joaosilva |
+    And the following galleries
+      | owner | name |
+      | sample-community | Gallery test |
+    And I go to Sample Community's profile
+    And I follow "0 pictures"
+    And I should see "Upload files"
+
+  @selenium
+  Scenario: provile links to upload files to enterprise's gallery
+    Given the following enterprises
+      | identifier | name | owner |
+      | sample-enterprise | Sample Enterprise | joaosilva |
+    And the following galleries
+      | owner | name |
+      | sample-enterprise | Gallery test |
+    And I go to Sample Enterprise's profile
+    And I follow "0 pictures"
+    And I should see "Upload files"
+
+  Scenario: not provile links to upload files on blogs
+    Given the following communities
+      | identifier | name | owner |
+      | sample-community | Sample Community | joaosilva |
+    And the following blogs
+      | owner | name |
+      | sample-community | Blog test |
+    And I go to Sample Community's blog
+    And I should not see "Upload files"
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.28.5'
+  VERSION = '0.29.5'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -66,7 +66,7 @@ module Noosfero
     if ENV['RAILS_ENV'] == 'development'
       development_url_options
     elsif ENV['RAILS_ENV'] == 'cucumber'
-      {:host => ''}
+      Webrat.configuration.mode == :rails ? { :host => '' } : { :port => Webrat.configuration.application_port }
     else
       {}
     end
@@ -76,7 +76,6 @@ module Noosfero
     @development_url_options || {}
   end
-
 end
 require 'noosfero/constants'
	@@ -32,4 +32,8 @@ module LightboxHelper		@@ -32,4 +32,8 @@ module LightboxHelper
32	request.xhr?	32	request.xhr?
33	end	33	end
34		34
		35	+ def lightbox_remote_button(type, label, url, options = {})
		36	+ button(type, label, url, lightbox_options(options, 'remote-lbOn'))
		37	+ end
		38	+
35	end	39	end
	@@ -18,7 +18,7 @@ module ProfileEditorHelper		@@ -18,7 +18,7 @@ module ProfileEditorHelper
18	N_('Science Politics'),	18	N_('Science Politics'),
19	N_('Accounting and Actuarial Science'),	19	N_('Accounting and Actuarial Science'),
20	N_('Morphologic Sciences'),	20	N_('Morphologic Sciences'),
21	- N_('Computation'),	21	+ N_('Computer Science'),
22	N_('Rural Development'),	22	N_('Rural Development'),
23	N_('Law'),	23	N_('Law'),
24	N_('Ecology'),	24	N_('Ecology'),
	@@ -65,7 +65,7 @@ module SearchHelper		@@ -65,7 +65,7 @@ module SearchHelper
65	data << content_tag('strong', _('Address: ')) + profile.address + '<br/>'	65	data << content_tag('strong', _('Address: ')) + profile.address + '<br/>'
66	end	66	end
67	unless profile.products.empty?	67	unless profile.products.empty?
68	- data << content_tag('strong', _('Products/Services: ')) + profile.products.map{\|i\| link_to(i.name, :controller => 'catalog', :profile => profile.identifier, :action => 'show', :id => i)}.join(', ') + '<br/>'	68	+ data << content_tag('strong', _('Products/Services: ')) + profile.products.map{\|i\| link_to(i.name, :controller => 'manage_products', :profile => profile.identifier, :action => 'show', :id => i.id)}.join(', ') + '<br/>'
69	end	69	end
70	if profile.respond_to?(:distance) and !profile.distance.nil?	70	if profile.respond_to?(:distance) and !profile.distance.nil?
71	data << content_tag('strong', _('Distance: ')) + "%.2f%" % profile.distance + '<br/>'	71	data << content_tag('strong', _('Distance: ')) + "%.2f%" % profile.distance + '<br/>'
	@@ -2,6 +2,13 @@ class Blog < Folder		@@ -2,6 +2,13 @@ class Blog < Folder
2		2
3	acts_as_having_posts	3	acts_as_having_posts
4		4
		5	+ #FIXME This should be used until there is a migration to fix all blogs that
		6	+ # already have folders inside them
		7	+ def posts_with_no_folders
		8	+ posts_without_no_folders.no_folders
		9	+ end
		10	+ alias_method_chain :posts, :no_folders
		11	+
5	def self.short_description	12	def self.short_description
6	_('Blog')	13	_('Blog')
7	end	14	end
	@@ -17,7 +17,7 @@ class BlogArchivesBlock < Block		@@ -17,7 +17,7 @@ class BlogArchivesBlock < Block
17	settings_items :blog_id, Integer	17	settings_items :blog_id, Integer
18		18
19	def blog	19	def blog
20	- blog_id ? owner.blogs.find(blog_id) : owner.blog	20	+ blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog
21	end	21	end
22		22
23	def content	23	def content
	@@ -11,4 +11,9 @@ class Certifier < ActiveRecord::Base		@@ -11,4 +11,9 @@ class Certifier < ActiveRecord::Base
11	def link	11	def link
12	self[:link] \|\| ''	12	self[:link] \|\| ''
13	end	13	end
		14	+
		15	+ def <=>(b)
		16	+ self.name.downcase.transliterate <=> b.name.downcase.transliterate
		17	+ end
		18	+
14	end	19	end
	@@ -35,4 +35,8 @@ class EnterpriseActivation < Task		@@ -35,4 +35,8 @@ class EnterpriseActivation < Task
35	{:type => :profile_image, :profile => requestor, :url => requestor.url}	35	{:type => :profile_image, :profile => requestor, :url => requestor.url}
36	end	36	end
37		37
		38	+ def target_notification_description
		39	+ _('%{requestor} wants to activate enterprise %{enterprise}.') % {:requestor => requestor.name, :enterprise => enterprise.name}
		40	+ end
		41	+
38	end	42	end
1	class Folder < Article	1	class Folder < Article
2		2
		3	+ validate :not_belong_to_blog
		4	+
		5	+ def not_belong_to_blog
		6	+ errors.add(:parent, "A folder should not belong to a blog.") if parent && parent.blog?
		7	+ end
		8	+
3	acts_as_having_settings :field => :setting	9	acts_as_having_settings :field => :setting
4		10
5	xss_terminate :only => [ :body ], :with => 'white_list', :on => 'validation'	11	xss_terminate :only => [ :body ], :with => 'white_list', :on => 'validation'
	@@ -47,4 +53,9 @@ class Folder < Article		@@ -47,4 +53,9 @@ class Folder < Article
47	:foreign_key => 'parent_id',	53	:foreign_key => 'parent_id',
48	:order => 'articles.type, articles.name',	54	:order => 'articles.type, articles.name',
49	:conditions => ["articles.type = 'UploadedFile' and articles.content_type in (?) or articles.type in ('Folder','Gallery')", UploadedFile.content_types]	55	:conditions => ["articles.type = 'UploadedFile' and articles.content_type in (?) or articles.type in ('Folder','Gallery')", UploadedFile.content_types]
		56	+
		57	+ def accept_uploads?
		58	+ !self.has_posts? \|\| self.gallery?
		59	+ end
		60	+
50	end	61	end
	@@ -1,11 +0,0 @@	@@ -1,11 +0,0 @@
1	-class ImageGallery < Article
2	-
3	- def self.short_description
4	- _('Image gallery')
5	- end
6	-
7	- def self.description
8	- _('A collection of photos, logos or other kinds of images.')
9	- end
10	-
11	-end
	@@ -7,6 +7,8 @@ class Input < ActiveRecord::Base		@@ -7,6 +7,8 @@ class Input < ActiveRecord::Base
7		7
8	acts_as_list :scope => :product	8	acts_as_list :scope => :product
9		9
		10	+ belongs_to :unit
		11	+
10	include FloatHelper	12	include FloatHelper
11		13
12	def price_per_unit=(value)	14	def price_per_unit=(value)