Merge commit 'refs/merge-requests/248' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/248 Conflicts: app/models/person.rb app/views/catalog/index.rhtml public/stylesheets/application.css test/functional/catalog_controller_test.rb

Merge commit 'refs/merge-requests/248' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/248 Conflicts: app/models/person.rb app/views/catalog/index.rhtml public/stylesheets/application.css test/functional/catalog_controller_test.rb
Rodrigo Souto
2 parents 70890398 c90b8e63
Showing 223 changed files with 74020 additions and 62087 deletions Show diff stats
app/controllers/admin/admin_panel_controller.rb
app/controllers/application_controller.rb
app/controllers/box_organizer_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/my_profile/profile_members_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/not_found_controller.rb
app/controllers/public/profile_controller.rb
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/boxes_helper.rb
app/helpers/colorbox_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/display_helper.rb
app/helpers/folder_helper.rb
app/helpers/forms_helper.rb
app/helpers/language_helper.rb
@@ -8,6 +8,9 @@ class AdminPanelController &lt; AdminController
  
   def site_info
     if request.post?
+      if params[:environment][:languages]
+        params[:environment][:languages] = params[:environment][:languages].map {|lang, value| lang if value=='true'}.compact
+      end
       if @environment.update_attributes(params[:environment])
         session[:notice] = _('Environment settings updated')
         redirect_to :action => 'index'
@@ -42,9 +42,9 @@ class ApplicationController &lt; ActionController::Base
  
   before_filter :set_locale
   def set_locale
-    FastGettext.available_locales = Noosfero.available_locales
-    FastGettext.default_locale = Noosfero.default_locale
-    FastGettext.locale = (params[:lang] || session[:lang] || Noosfero.default_locale || request.env['HTTP_ACCEPT_LANGUAGE'] || 'en')
+    FastGettext.available_locales = environment.available_locales
+    FastGettext.default_locale = environment.default_locale
+    FastGettext.locale = (params[:lang] || session[:lang] || environment.default_locale || request.env['HTTP_ACCEPT_LANGUAGE'] || 'en')
     I18n.locale = FastGettext.locale
     if params[:lang]
       session[:lang] = params[:lang]
@@ -68,7 +68,8 @@ class BoxOrganizerController &lt; ApplicationController
         raise ArgumentError.new("Type %s is not allowed. Go away." % type)
       end
     else
-      @block_types = available_blocks
+      @center_block_types = Box.acceptable_center_blocks & available_blocks
+      @side_block_types = Box.acceptable_side_blocks & available_blocks
       @boxes = boxes_holder.boxes
       render :action => 'add_block', :layout => false
     end
@@ -116,11 +116,11 @@ class CmsController &lt; MyProfileController
       @parent_id = parent.id
     end
  
-    translations if @article.translatable?
-
     @article.profile = profile
     @article.last_changed_by = user
  
+    translations if @article.translatable?
+
     continue = params[:continue]
     if request.post?
       if @article.save
@@ -149,7 +149,6 @@ class CmsController &lt; MyProfileController
     @uploaded_files = []
     @article = @parent = check_parent(params[:parent_id])
     @target = @parent ? ('/%s/%s' % [profile.identifier, @parent.full_name]) : '/%s' % profile.identifier
-    @folders = Folder.find(:all, :conditions => { :profile_id => profile })
     if @article
       record_coming
     end
@@ -345,7 +344,7 @@ class CmsController &lt; MyProfileController
   end
  
   def translations
-    @locales = Noosfero.locales.invert.reject { |name, lang| !@article.possible_translations.include?(lang) }
+    @locales = environment.locales.invert.reject { |name, lang| !@article.possible_translations.include?(lang) }
     @selected_locale = @article.language || FastGettext.locale
   end
  
@@ -5,7 +5,7 @@ class ProfileDesignController &lt; BoxOrganizerController
   protect 'edit_profile_design', :profile
  
   def available_blocks
-    blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock ]
+    blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock, HighlightsBlock ]
  
     # blocks exclusive for organizations
     if profile.has_members?
@@ -14,6 +14,7 @@ class ProfileEditorController &lt; MyProfileController
     @profile_data = profile
     @possible_domains = profile.possible_domains
     if request.post?
+      params[:profile_data][:fields_privacy] ||= {} if profile.person? && params[:profile_data].is_a?(Hash)
       begin
         Profile.transaction do
         Image.transaction do
@@ -156,18 +156,4 @@ class ProfileMembersController &lt; MyProfileController
     end
   end
  
-  def send_mail
-    @mailing = profile.mailings.build(params[:mailing])
-    if request.post?
-      @mailing.locale = locale
-      @mailing.person = user
-      if @mailing.save
-        session[:notice] = _('The e-mails are being sent')
-        redirect_to :action => 'index'
-      else
-        session[:notice] = _('Could not create the e-mail')
-      end
-    end
-  end
-
 end
@@ -25,11 +25,13 @@ class AccountController &lt; ApplicationController
  
   # action to perform login to the application
   def login
-    @user = User.new
-    @person = @user.build_person
     store_location(request.referer) unless session[:return_to]
     return unless request.post?
-    self.current_user = User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
+
+    self.current_user = plugins_alternative_authentication
+
+    self.current_user ||= User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
+
     if logged_in?
       if params[:remember_me] == "1"
         self.current_user.remember_me
@@ -41,7 +43,6 @@ class AccountController &lt; ApplicationController
       end
     else
       session[:notice] = _('Incorrect username or password') if redirect?
-      redirect_to :back if redirect?
     end
   end
  
@@ -56,6 +57,11 @@ class AccountController &lt; ApplicationController
  
   # action to register an user to the application
   def signup
+    if @plugins.dispatch(:allow_user_registration).include?(false)
+      redirect_back_or_default(:controller => 'home')
+      session[:notice] = _("This environment doesn't allow user registration.")
+    end
+
     @invitation_code = params[:invitation_code]
     begin
       if params[:user]
@@ -125,6 +131,10 @@ class AccountController &lt; ApplicationController
   #
   # Posts back.
   def forgot_password
+    if @plugins.dispatch(:allow_password_recovery).include?(false)
+      redirect_back_or_default(:controller => 'home')
+      session[:notice] = _("This environment doesn't allow password recovery.")
+    end
     @change_password = ChangePassword.new(params[:change_password])
  
     if request.post?
@@ -303,10 +313,27 @@ class AccountController &lt; ApplicationController
   end
  
   def go_to_initial_page
-    if environment == current_user.environment
-      redirect_back_or_default(user.admin_url)
+    if environment.enabled?('allow_change_of_redirection_after_login')
+      case user.preferred_login_redirection
+        when 'keep_on_same_page'
+          redirect_back_or_default(user.admin_url)
+        when 'site_homepage'
+          redirect_to :controller => :home
+        when 'user_profile_page'
+          redirect_to user.public_profile_url
+        when 'user_homepage'
+          redirect_to user.url
+        when 'user_control_panel'
+          redirect_to user.admin_url
+      else
+        redirect_back_or_default(user.admin_url)
+      end
     else
-      redirect_back_or_default(:controller => 'home')
+      if environment == current_user.environment
+        redirect_back_or_default(user.admin_url)
+      else
+        redirect_back_or_default(:controller => 'home')
+      end
     end
   end
  
@@ -316,4 +343,13 @@ class AccountController &lt; ApplicationController
     end
   end
  
+  def plugins_alternative_authentication
+    user = nil
+    @plugins.each do |plugin|
+      user = plugin.alternative_authentication
+      break unless user.nil?
+    end
+    user
+  end
+
 end
@@ -2,4 +2,8 @@ class NotFoundController &lt; ApplicationController
   def index
     render_not_found
   end
+
+  def nothing
+    render :nothing => true, :status => 404
+  end
 end
@@ -2,11 +2,13 @@ class ProfileController &lt; PublicController
  
   needs_profile
   before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
-  before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse]
-  before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity]
+  before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse, :send_mail]
+  before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail]
  
   helper TagsHelper
  
+  protect 'send_mail_to_members', :profile, :only => [:send_mail]
+
   def index
     @network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) : []
     if logged_in? && current_person.follows?(@profile)
@@ -49,36 +51,36 @@ class ProfileController &lt; PublicController
  
   def communities
     if is_cache_expired?(profile.communities_cache_key(params))
-      @communities = profile.communities.paginate(:per_page => per_page, :page => params[:npage])
+      @communities = profile.communities.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage])
     end
   end
  
   def enterprises
-    @enterprises = profile.enterprises
+    @enterprises = profile.enterprises.includes(relations_to_include)
   end
  
   def friends
     if is_cache_expired?(profile.friends_cache_key(params))
-      @friends = profile.friends.paginate(:per_page => per_page, :page => params[:npage])
+      @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage])
     end
   end
  
   def members
     if is_cache_expired?(profile.members_cache_key(params))
-      @members = profile.members.paginate(:per_page => members_per_page, :page => params[:npage])
+      @members = profile.members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
     end
   end
  
   def fans
-    @fans = profile.fans
+    @fans = profile.fans.includes(relations_to_include)
   end
  
   def favorite_enterprises
-    @favorite_enterprises = profile.favorite_enterprises
+    @favorite_enterprises = profile.favorite_enterprises.includes(relations_to_include)
   end
  
   def sitemap
-    @articles = profile.top_level_articles
+    @articles = profile.top_level_articles.includes([:profile, :parent])
   end
  
   def join
@@ -327,6 +329,20 @@ class ProfileController &lt; PublicController
     end
   end
  
+  def send_mail
+    @mailing = profile.mailings.build(params[:mailing])
+    if request.post?
+      @mailing.locale = locale
+      @mailing.person = user
+      if @mailing.save
+        session[:notice] = _('The e-mails are being sent')
+        redirect_to_previous_location
+      else
+        session[:notice] = _('Could not create the e-mail')
+      end
+    end
+  end
+
   protected
  
   def check_access_to_profile
@@ -378,4 +394,8 @@ class ProfileController &lt; PublicController
     @can_edit_profile ||= user && user.has_permission?('edit_profile', profile)
   end
   helper_method :can_edit_profile
+
+  def relations_to_include
+    [:image, :domains, :preferred_domain, :environment]
+  end
 end
@@ -46,7 +46,7 @@ class SearchController &lt; PublicController
     if !@empty_query
       full_text_search ['public:true']
     else
-      @results[@asset] = @environment.people.visible.send(@filter).paginate(paginate_options)
+      @results[@asset] = visible_profiles(Person).send(@filter).paginate(paginate_options)
     end
   end
  
@@ -76,7 +76,7 @@ class SearchController &lt; PublicController
       full_text_search ['public:true']
     else
       @filter_title = _('Enterprises from network')
-      @results[@asset] = @environment.enterprises.visible.paginate(paginate_options)
+      @results[@asset] = visible_profiles(Enterprise, [{:products => :product_category}]).paginate(paginate_options)
     end
   end
  
@@ -84,7 +84,7 @@ class SearchController &lt; PublicController
     if !@empty_query
       full_text_search ['public:true']
     else
-      @results[@asset] = @environment.communities.visible.send(@filter).paginate(paginate_options)
+      @results[@asset] = visible_profiles(Community).send(@filter).paginate(paginate_options)
     end
   end
  
@@ -310,4 +310,12 @@ class SearchController &lt; PublicController
     @all_facets = ret[:all_facets]
   end
  
+  private
+
+  def visible_profiles(klass, *extra_relations)
+    relations = [:image, :domains, :environment, :preferred_domain]
+    relations += extra_relations
+    @environment.send(klass.name.underscore.pluralize).visible.includes(relations)
+  end
+
 end
@@ -265,9 +265,9 @@ module ApplicationHelper
  
   VIEW_EXTENSIONS = %w[.rhtml .html.erb]
  
-  def partial_for_class_in_view_path(klass, view_path)
+  def partial_for_class_in_view_path(klass, view_path, suffix = nil)
     return nil if klass.nil?
-    name = klass.name.underscore
+    name = [klass.name.underscore, suffix].compact.map(&:to_s).join('_')
  
     search_name = String.new(name)
     if search_name.include?("/")
@@ -282,31 +282,20 @@ module ApplicationHelper
       return name if File.exists?(File.join(path))
     end
  
-    partial_for_class_in_view_path(klass.superclass, view_path)
+    partial_for_class_in_view_path(klass.superclass, view_path, suffix)
   end
  
-  def partial_for_class(klass)
+  def partial_for_class(klass, suffix=nil)
     raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
     name = klass.name.underscore
     @controller.view_paths.each do |view_path|
-      partial = partial_for_class_in_view_path(klass, view_path)
+      partial = partial_for_class_in_view_path(klass, view_path, suffix)
       return partial if partial
     end
  
     raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
   end
  
-  def partial_for_task_class(klass, action)
-    raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
-
-    name = "#{klass.name.underscore}_#{action.to_s}"
-    VIEW_EXTENSIONS.each do |ext|
-      return name if File.exists?(File.join(RAILS_ROOT, 'app', 'views', params[:controller], '_'+name+ext))
-    end
-
-    partial_for_task_class(klass.superclass, action)
-  end
-
   def view_for_profile_actions(klass)
     raise ArgumentError, 'No profile actions view for this class.' if klass.nil?
  
@@ -664,19 +653,6 @@ module ApplicationHelper
     content_tag('div', result)
   end
  
-  def select_folder(label, object, method, collection, html_options = {}, js_options = {})
-    root = profile ? profile.identifier : _("root")
-    labelled_form_field(label, select(object, method,
-                                      collection.map {|f| [ root + '/' + f.full_name, f.id ]},
-                                      {:include_blank => root}, html_options.merge(js_options)))
-  end
-
-  def select_profile_folder(label, object, method, profile, html_options = {}, js_options = {})
-    labelled_form_field(label, select(object, method,
-                                      profile.folders.map {|f| [ profile.identifier + '/' + f.full_name, f.id ]},
-                                      {:include_blank => profile.identifier}, html_options.merge(js_options)))
-  end
-
   def theme_option(opt = nil)
     conf = RAILS_ROOT.to_s() +
            '/public' + theme_path +
@@ -877,7 +853,7 @@ module ApplicationHelper
       end
     else
       if profile.active_fields.include?(name)
-        result = field_html
+        result = content_tag('div', field_html + profile_field_privacy_selector(profile, name), :class => 'field-with-privacy-selector')
       end
     end
  
@@ -892,6 +868,11 @@ module ApplicationHelper
     result
   end
  
+  def profile_field_privacy_selector(profile, name)
+    return '' unless profile.public?
+    content_tag('div', labelled_check_box(_('Public'), 'profile_data[fields_privacy]['+name+']', 'public', profile.public_fields.include?(name)), :class => 'field-privacy-selector')
+  end
+
   def template_stylesheet_path
     if profile.nil?
       "/designs/templates/#{environment.layout_template}/stylesheets/style.css"
@@ -2,14 +2,19 @@ module ArticleHelper
  
   def custom_options_for_article(article)
     @article = article
+    content_tag('h4', _('Visibility')) +
+    content_tag('div',
+      content_tag('div',
+        radio_button(:article, :published, true) +
+          content_tag('label', _('Public (visible to other people)'), :for => 'article_published_true')
+           ) +
+      content_tag('div',
+        radio_button(:article, :published, false) +
+          content_tag('label', _('Private'), :for => 'article_published_false')
+       )
+     ) +
     content_tag('h4', _('Options')) +
     content_tag('div',
-      content_tag(
-        'div',
-        check_box(:article, :published) +
-        content_tag('label', _('This article must be published (visible to other people)'), :for => 'article_published')
-      ) +
-
       (article.profile.has_members? ?
       content_tag(
         'div',
@@ -66,7 +66,7 @@ module BoxesHelper
  
   def display_box_content(box, main_content)
     context = { :article => @page, :request_path => request.path, :locale => locale }
-    box_decorator.select_blocks(box.blocks, context).map { |item| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
+    box_decorator.select_blocks(box.blocks.includes(:box), context).map { |item| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
   end
  
   def select_blocks(arr, context)
@@ -162,9 +162,6 @@ module BoxesHelper
   #
   # +box+ is always needed
   def block_target(box, block = nil)
-    # FIXME hardcoded
-    return '' if box.position == 1
-
     id =
       if block.nil?
         "end-of-box-#{box.id}"
@@ -172,14 +169,11 @@ module BoxesHelper
         "before-block-#{block.id}"
       end
  
-    content_tag('div', '&nbsp;', :id => id, :class => 'block-target' ) + drop_receiving_element(id, :url => { :action => 'move_block', :target => id }, :accept => 'block', :hoverclass => 'block-target-hover')
+    content_tag('div', '&nbsp;', :id => id, :class => 'block-target' ) + drop_receiving_element(id, :url => { :action => 'move_block', :target => id }, :accept => box.acceptable_blocks, :hoverclass => 'block-target-hover')
   end
  
   # makes the given block draggable so it can be moved away.
   def block_handle(block)
-    # FIXME hardcoded
-    return '' if block.box.position == 1
-
     draggable_element("block-#{block.id}", :revert => true)
   end
  
@@ -211,7 +205,7 @@ module BoxesHelper
     end
  
     if block.editable?
-      buttons << lightbox_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
+      buttons << colorbox_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
     end
  
     if !block.main?
@@ -8,6 +8,10 @@ module ColorboxHelper
     button(type, label, url, colorbox_options(options))
   end
  
+  def colorbox_icon_button(type, label, url, options = {})
+    icon_button(type, label, url, colorbox_options(options))
+  end
+
   # options must be an HTML options hash as passed to link_to etc.
   #
   # returns a new hash with colorbox class added. Keeps existing classes.
@@ -42,7 +42,7 @@ module ContentViewerHelper
   def article_translations(article)
     unless article.native_translation.translations.empty?
       links = (article.native_translation.translations + [article.native_translation]).map do |translation|
-        { Noosfero.locales[translation.language] => { :href => url_for(translation.url) } }
+        { article.environment.locales[translation.language] => { :href => url_for(translation.url) } }
       end
       content_tag(:div, link_to(_('Translations'), '#',
                                 :onclick => "toggleSubmenu(this, '#{_('Translations')}', #{links.to_json}); return false",
@@ -8,6 +8,14 @@ module DisplayHelper
             opts
   end
  
+  def themed_path(file)
+    if File.exists?(File.join(Rails.root, 'public', theme_path, file))
+      File.join(theme_path, file)
+    else
+      file
+    end
+  end
+
   def image_link_to_product(product, opts={})
     return _('No product') unless product
     target = product_path(product)
@@ -58,18 +58,18 @@ module FolderHelper
  
   def custom_options_for_article(article)
     @article = article
-    content_tag('h4', _('Options')) +
+    content_tag('h4', _('Visibility')) +
+    content_tag('div',
+      content_tag('div',
+        radio_button(:article, :published, true) +
+          content_tag('label', _('Public (visible to other people)'), :for => 'article_published_true')
+           ) +
+      content_tag('div',
+        radio_button(:article, :published, false) +
+          content_tag('label', _('Private'), :for => 'article_published_false')
+       )
+     ) +
     content_tag('div',
-      content_tag(
-        'div',
-        check_box(:article, :published) +
-        content_tag('label', _('This article must be published (visible to other people)'), :for => 'article_published')
-      ) + (article.can_display_hits? ?
-      content_tag(
-        'div',
-        check_box(:article, :display_hits) +
-        content_tag('label', _('I want this article to display the number of hits it received'), :for => 'article_display_hits')
-      ) : '') +
       hidden_field_tag('article[accept_comments]', 0)
     )
   end
@@ -123,6 +123,170 @@ module FormsHelper
     options_for_select.join("\n")
   end
  
+  def balanced_table(items, per_row=3)
+    items = items.map {|item| content_tag('td', item, :style => 'border: none; background: transparent;')}
+    rows = []
+    row = []
+    counter = 0
+    items.each do |item|
+      counter += 1
+      row << item
+      if counter % per_row == 0
+        rows << content_tag('tr', row.join("\n"))
+        counter = 0
+        row = []
+      end
+    end
+    rows << content_tag('tr', row.join("\n"))
+
+    content_tag('table',rows.join("\n"))
+  end
+
+  def date_field(name, value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
+    datepicker_options[:disabled] ||= false
+    datepicker_options[:alt_field] ||= ''
+    datepicker_options[:alt_format] ||= ''
+    datepicker_options[:append_text] ||= ''
+    datepicker_options[:auto_size] ||= false
+    datepicker_options[:button_image] ||= ''
+    datepicker_options[:button_image_only] ||=  false
+    datepicker_options[:button_text] ||= '...'
+    datepicker_options[:calculate_week] ||= 'jQuery.datepicker.iso8601Week'
+    datepicker_options[:change_month] ||= false
+    datepicker_options[:change_year] ||= false
+    datepicker_options[:close_text] ||= _('Done')
+    datepicker_options[:constrain_input] ||= true
+    datepicker_options[:current_text] ||= _('Today')
+    datepicker_options[:date_format] ||= 'mm/dd/yy'
+    datepicker_options[:day_names] ||= [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')]
+    datepicker_options[:day_names_min] ||= [_('Su'), _('Mo'), _('Tu'), _('We'), _('Th'), _('Fr'), _('Sa')]
+    datepicker_options[:day_names_short] ||= [_('Sun'), _('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'), _('Sat')]
+    datepicker_options[:default_date] ||= nil
+    datepicker_options[:duration] ||= 'normal'
+    datepicker_options[:first_day] ||= 0
+    datepicker_options[:goto_current] ||= false
+    datepicker_options[:hide_if_no_prev_next] ||= false
+    datepicker_options[:is_rtl] ||= false
+    datepicker_options[:max_date] ||= nil
+    datepicker_options[:min_date] ||= nil
+    datepicker_options[:month_names] ||= [_('January'), _('February'), _('March'), _('April'), _('May'), _('June'), _('July'), _('August'), _('September'), _('October'), _('November'), _('December')]
+    datepicker_options[:month_names_short] ||= [_('Jan'), _('Feb'), _('Mar'), _('Apr'), _('May'), _('Jun'), _('Jul'), _('Aug'), _('Sep'), _('Oct'), _('Nov'), _('Dec')]
+    datepicker_options[:navigation_as_date_format] ||= false
+    datepicker_options[:next_text] ||= _('Next')
+    datepicker_options[:number_of_months] ||= 1
+    datepicker_options[:prev_text] ||= _('Prev')
+    datepicker_options[:select_other_months] ||= false
+    datepicker_options[:short_year_cutoff] ||= '+10'
+    datepicker_options[:show_button_panel] ||= false
+    datepicker_options[:show_current_at_pos] ||= 0
+    datepicker_options[:show_month_after_year] ||= false
+    datepicker_options[:show_on] ||= 'focus'
+    datepicker_options[:show_options] ||= {}
+    datepicker_options[:show_other_months] ||= false
+    datepicker_options[:show_week] ||= false
+    datepicker_options[:step_months] ||= 1
+    datepicker_options[:week_header] ||= _('Wk')
+    datepicker_options[:year_range] ||= 'c-10:c+10'
+    datepicker_options[:year_suffix] ||= ''
+
+    element_id = html_options[:id] || 'datepicker-date'
+    value = value.strftime(format) if value.present?
+    method = datepicker_options[:time] ? 'datetimepicker' : 'datepicker'
+    result = text_field_tag(name, value, html_options)
+    result +=
+    "
+    <script type='text/javascript'>
+      jQuery('##{element_id}').#{method}({
+        disabled: #{datepicker_options[:disabled].to_json},
+        altField: #{datepicker_options[:alt_field].to_json},
+        altFormat: #{datepicker_options[:alt_format].to_json},
+        appendText: #{datepicker_options[:append_text].to_json},
+        autoSize: #{datepicker_options[:auto_size].to_json},
+        buttonImage: #{datepicker_options[:button_image].to_json},
+        buttonImageOnly: #{datepicker_options[:button_image_only].to_json},
+        buttonText: #{datepicker_options[:button_text].to_json},
+        calculateWeek: #{datepicker_options[:calculate_week].to_json},
+        changeMonth: #{datepicker_options[:change_month].to_json},
+        changeYear: #{datepicker_options[:change_year].to_json},
+        closeText: #{datepicker_options[:close_text].to_json},
+        constrainInput: #{datepicker_options[:constrain_input].to_json},
+        currentText: #{datepicker_options[:current_text].to_json},
+        dateFormat: #{datepicker_options[:date_format].to_json},
+        dayNames: #{datepicker_options[:day_names].to_json},
+        dayNamesMin: #{datepicker_options[:day_names_min].to_json},
+        dayNamesShort: #{datepicker_options[:day_names_short].to_json},
+        defaultDate: #{datepicker_options[:default_date].to_json},
+        duration: #{datepicker_options[:duration].to_json},
+        firstDay: #{datepicker_options[:first_day].to_json},
+        gotoCurrent: #{datepicker_options[:goto_current].to_json},
+        hideIfNoPrevNext: #{datepicker_options[:hide_if_no_prev_next].to_json},
+        isRTL: #{datepicker_options[:is_rtl].to_json},
+        maxDate: #{datepicker_options[:max_date].to_json},
+        minDate: #{datepicker_options[:min_date].to_json},
+        monthNames: #{datepicker_options[:month_names].to_json},
+        monthNamesShort: #{datepicker_options[:month_names_short].to_json},
+        navigationAsDateFormat: #{datepicker_options[:navigation_as_date_format].to_json},
+        nextText: #{datepicker_options[:next_text].to_json},
+        numberOfMonths: #{datepicker_options[:number_of_months].to_json},
+        prevText: #{datepicker_options[:prev_text].to_json},
+        selectOtherMonths: #{datepicker_options[:select_other_months].to_json},
+        shortYearCutoff: #{datepicker_options[:short_year_cutoff].to_json},
+        showButtonPanel: #{datepicker_options[:show_button_panel].to_json},
+        showCurrentAtPos: #{datepicker_options[:show_current_at_pos].to_json},
+        showMonthAfterYear: #{datepicker_options[:show_month_after_year].to_json},
+        showOn: #{datepicker_options[:show_on].to_json},
+        showOptions: #{datepicker_options[:show_options].to_json},
+        showOtherMonths: #{datepicker_options[:show_other_months].to_json},
+        showWeek: #{datepicker_options[:show_week].to_json},
+        stepMonths: #{datepicker_options[:step_months].to_json},
+        weekHeader: #{datepicker_options[:week_header].to_json},
+        yearRange: #{datepicker_options[:year_range].to_json},
+        yearSuffix: #{datepicker_options[:year_suffix].to_json}
+      })
+    </script>
+    "
+    result
+  end
+
+  def date_range_field(from_name, to_name, from_value, to_value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
+    from_id = html_options[:from_id] || 'datepicker-from-date'
+    to_id = html_options[:to_id] || 'datepicker-to-date'
+    return _('From') +' '+ date_field(from_name, from_value, format, datepicker_options, html_options.merge({:id => from_id})) +
+    ' ' + _('until') +' '+ date_field(to_name, to_value, format, datepicker_options, html_options.merge({:id => to_id}))
+  end
+
+  def select_folder(label_text, field_id, collection, default_value=nil, html_options = {}, js_options = {})
+    root = profile ? profile.identifier : _("root")
+    labelled_form_field(
+      label_text,
+      select_tag(
+        field_id,
+        options_for_select(
+          [[root, '']] +
+          collection.collect {|f| [ root + '/' +  f.full_name, f.id ] },
+          default_value
+        ),
+        html_options.merge(js_options)
+      )
+    )
+  end
+
+  def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {})
+    result = labelled_form_field(
+      label_text,
+      select_tag(
+        field_id,
+        options_for_select(
+          [[profile.identifier, '']] +
+          profile.folders.collect {|f| [ profile.identifier + '/' +  f.full_name, f.id ] },
+          default_value
+        ),
+        html_options.merge(js_options)
+      )
+    )
+    return result
+  end
+
 protected
   def self.next_id_number
     if defined? @@id_num
@@ -13,18 +13,19 @@ module LanguageHelper
  
   alias :calendar_date_select_language :tinymce_language
  
-  def language_chooser(options = {})
+  def language_chooser(environment, options = {})
+    return if environment.locales.size < 2
     current = language
     separator = options[:separator] || ' &mdash; '
  
     if options[:element] == 'dropdown'
       select_tag('lang', 
-        options_for_select(Noosfero.locales.map{|code,name| [name, code]}, current),
+        options_for_select(environment.locales.map{|code,name| [name, code]}, current),
         :onchange => "document.location.href= #{url_for(params.merge(:lang => 'LANGUAGE')).inspect}.replace(/LANGUAGE/, this.value) ;",
         :help => _('The language you choose here is the language used for options, buttons, etc. It does not affect the language of the content created by other users.')
       )
     else
-      languages = Noosfero.locales.map do |code,name|
+      languages = environment.locales.map do |code,name|
         if code == current
           content_tag('strong', name)
         else
@@ -145,4 +145,12 @@ module ProfileEditorHelper
     link_to title, url, :class => 'control-panel-%s' % icon
   end
  
+  def unchangeable_privacy_field(profile)
+    if profile.public?
+      labelled_check_box(_('Public'), '', '', true, :disabled => true, :title => _('This field must be public'), :class => 'disabled')
+    else
+      ''
+    end
+  end
+
 end
 module ProfileHelper
  
   def display_field(title, profile, field, force = false)
-    if !force && !profile.active_fields.include?(field.to_s)
+    if (!force && !profile.active_fields.include?(field.to_s)) ||
+       (profile.active_fields.include?(field.to_s) && !profile.public_fields.include?(field.to_s) && (!user || (user != profile && !user.is_a_friend?(profile))))
       return ''
     end
     value = profile.send(field)
@@ -15,4 +16,26 @@ module ProfileHelper
     end
   end
  
+  def display_contact(profile)
+    address = display_field(_('Address:'), profile, :address)
+    zip = display_field(_('ZIP code:'), profile, :zip_code)
+    phone = display_field(_('Contact phone:'), profile, :contact_phone)
+    email = display_field(_('e-Mail:'), profile, :email) { |email| link_to_email(email) }
+    if address.blank? && zip.blank? && phone.blank? && email.blank?
+      ''
+    else
+      content_tag('tr', content_tag('th', _('Contact'), { :colspan => 2 })) + address + zip + phone + email
+    end
+  end
+
+  def display_work_info(profile)
+    organization = display_field(_('Organization:'), profile, :organization)
+    organization_site = display_field(_('Organization website:'), profile, :organization_website) { |url| link_to(url, url) }
+    if organization.blank? && organization_site.blank?
+      ''
+    else
+      content_tag('tr', content_tag('th', _('Work'), { :colspan => 2 })) + organization + organization_site
+    end
+  end
+
 end
@@ -79,6 +79,25 @@ class Article &lt; ActiveRecord::Base
   validate :native_translation_must_have_language
   validate :translation_must_have_language
  
+  validate :no_self_reference
+  validate :no_cyclical_reference, :if => 'parent_id.present?'
+
+  def no_self_reference
+    errors.add(:parent_id, _('self-reference is not allowed.')) if id && parent_id == id
+  end
+
+  def no_cyclical_reference
+    current_parent = Article.find(parent_id)
+    while current_parent
+      if current_parent == self
+        errors.add(:parent_id, _('cyclical reference is not allowed.'))
+        break
+      end
+      current_parent = current_parent.parent
+    end
+  end
+
+
   def is_trackable?
     self.published? && self.notifiable? && self.advertise? && self.profile.public_profile
   end
@@ -154,6 +173,12 @@ class Article &lt; ActiveRecord::Base
     article.advertise = true
   end
  
+  before_save do |article|
+    article.parent = article.parent_id ? Article.find(article.parent_id) : nil
+    parent_path = article.parent ? article.parent.path : nil
+    article.path = [parent_path, article.slug].compact.join('/')
+  end
+
   # retrieves all articles belonging to the given +profile+ that are not
   # sub-articles of any other article.
   named_scope :top_level_for, lambda { |profile|
@@ -179,37 +204,23 @@ class Article &lt; ActiveRecord::Base
   end
  
   named_scope :more_popular, :order => 'hits DESC'
-
-  # retrieves the latest +limit+ articles, sorted from the most recent to the
-  # oldest.
-  #
-  # Only includes articles where advertise == true
-  def self.recent(limit = nil, extra_conditions = {})
-    # FIXME this method is a horrible hack
-    options = { :page => 1, :per_page => limit,
-                :conditions => [
-                  "advertise = ? AND
-                  published = ? AND
-                  profiles.visible = ? AND
-                  profiles.public_profile = ? AND
-                  ((articles.type != ? and articles.type != ? and articles.type != ?) OR articles.type is NULL)", true, true, true, true, 'UploadedFile', 'RssFeed', 'Blog'
-                ],
-                :include => 'profile',
-                :order => 'articles.published_at desc, articles.id desc'
-              }
-    if ( scoped_methods && scoped_methods.last &&
-         scoped_methods.last[:find] &&
-         scoped_methods.last[:find][:joins] &&
-         scoped_methods.last[:find][:joins].index('profiles') )
-      options.delete(:include)
-    end
-    if extra_conditions == {}
-      self.paginate(options)
-    else
-      with_scope :find => {:conditions => extra_conditions} do
-        self.paginate(options)
-      end
+  named_scope :relevant_as_recent, :conditions => ["(articles.type != 'UploadedFile' and articles.type != 'RssFeed' and articles.type != 'Blog') OR articles.type is NULL"]
+
+  def self.recent(limit = nil, extra_conditions = {}, pagination = true)
+    result = scoped({:conditions => extra_conditions}).
+      public.
+      relevant_as_recent.
+      limit(limit).
+      order(['articles.published_at desc', 'articles.id desc'])
+
+    if !( scoped_methods && scoped_methods.last &&
+        scoped_methods.last[:find] &&
+        scoped_methods.last[:find][:joins] &&
+        scoped_methods.last[:find][:joins].index('profiles') )
+      result = result.includes(:profile)
     end
+
+    pagination ? result.paginate({:page => 1, :per_page => limit}) : result
   end
  
   # produces the HTML code that is to be displayed as this article's contents.
@@ -325,14 +336,14 @@ class Article &lt; ActiveRecord::Base
   end
  
   def possible_translations
-    possibilities = Noosfero.locales.keys - self.native_translation.translations(:select => :language).map(&:language) - [self.native_translation.language]
+    possibilities = environment.locales.keys - self.native_translation.translations(:select => :language).map(&:language) - [self.native_translation.language]
     possibilities << self.language unless self.language_changed?
     possibilities
   end
  
   def known_language
     unless self.language.blank?
-      errors.add(:language, N_('Language not supported by Noosfero')) unless Noosfero.locales.key?(self.language)
+      errors.add(:language, N_('Language not supported by the environment.')) unless environment.locales.key?(self.language)
     end
   end
  
@@ -665,7 +676,7 @@ class Article &lt; ActiveRecord::Base
     self.categories.collect(&:name)
   end
  
-  delegate :region, :region_id, :environment, :environment_id, :to => :profile
+  delegate :region, :region_id, :environment, :environment_id, :to => :profile, :allow_nil => true
   def name_sortable # give a different name for solr
     name
   end
@@ -7,6 +7,8 @@ class Block &lt; ActiveRecord::Base
   # Block-specific stuff
   include BlockHelper
  
+  delegate :environment, :to => :box, :allow_nil => true
+
   acts_as_list :scope => :box
   belongs_to :box
  
@@ -2,4 +2,80 @@ class Box &lt; ActiveRecord::Base
   belongs_to :owner, :polymorphic => true
   acts_as_list :scope => 'owner_id = #{owner_id} and owner_type = \'#{owner_type}\''
   has_many :blocks, :dependent => :destroy, :order => 'position'
+
+  def environment
+    owner ? (owner.kind_of?(Environment) ? owner : owner.environment) : nil
+  end
+
+  def acceptable_blocks
+    to_css_class_name central?  ? Box.acceptable_center_blocks : Box.acceptable_side_blocks
+  end
+
+  def central?
+    position == 1
+  end
+
+  def self.acceptable_center_blocks
+    [ ArticleBlock,
+      BlogArchivesBlock,
+      CategoriesBlock,
+      CommunitiesBlock,
+      EnterprisesBlock,
+      EnvironmentStatisticsBlock,
+      FansBlock,
+      FavoriteEnterprisesBlock,
+      FeedReaderBlock,
+      FriendsBlock,
+      HighlightsBlock,
+      LinkListBlock,
+      LoginBlock,
+      MainBlock,
+      MembersBlock,
+      MyNetworkBlock,
+      PeopleBlock,
+      ProfileImageBlock,
+      RawHTMLBlock,
+      RecentDocumentsBlock,
+      SellersSearchBlock,
+      TagsBlock ]
+  end
+
+  def self.acceptable_side_blocks
+    [ ArticleBlock,
+      BlogArchivesBlock,
+      CategoriesBlock,
+      CommunitiesBlock,
+      DisabledEnterpriseMessageBlock,
+      EnterprisesBlock,
+      EnvironmentStatisticsBlock,
+      FansBlock,
+      FavoriteEnterprisesBlock,
+      FeaturedProductsBlock,
+      FeedReaderBlock,
+      FriendsBlock,
+      HighlightsBlock,
+      LinkListBlock,
+      LocationBlock,
+      LoginBlock,
+      MembersBlock,
+      MyNetworkBlock,
+      PeopleBlock,
+      ProductsBlock,
+      ProfileImageBlock,
+      ProfileInfoBlock,
+      ProfileSearchBlock,
+      RawHTMLBlock,
+      RecentDocumentsBlock,
+      SellersSearchBlock,
+      SlideshowBlock,
+      TagsBlock
+    ]
+  end
+
+  private
+
+  def to_css_class_name(blocks)
+    blocks.map{ |block| block.to_s.underscore.tr('_', '-') }
+  end
+
 end
@@ -7,7 +7,7 @@ class ChangePassword &lt; Task
     when :login:
       _('Username')
     when :email
-      _('e-Mail')
+      _('e-mail')
     when :password
       _('Password')
     when :password_confirmation
@@ -20,9 +20,7 @@ class ChangePassword &lt; Task
   ###################################################
   # validations for creating a ChangePassword task 
  
-  validates_presence_of :login, :email, :environment_id, :on => :create
-
-  validates_presence_of :requestor_id
+  validates_presence_of :login, :email, :environment_id, :on => :create, :message => _('must be filled in')
  
   validates_format_of :email, :on => :create, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |obj| !obj.email.blank? })
  
@@ -30,10 +28,10 @@ class ChangePassword &lt; Task
     unless data.login.blank? || data.email.blank?
       user = User.find_by_login_and_environment_id(data.login, data.environment_id)
       if user.nil? 
-        data.errors.add(:login, _('%{fn} is not a valid username.').fix_i18n)
+        data.errors.add(:login, _('is invalid or user does not exists.'))
       else
         if user.email != data.email
-          data.errors.add(:email)
+          data.errors.add(:email, _('does not match the username you filled in'))
         end
       end
     end
@@ -17,7 +17,7 @@ class Enterprise &lt; Organization
   after_save_reindex [:products], :with => :delayed_job
   extra_data_for_index :product_categories
   def product_categories
-    products.map{|p| p.category_full_name}.compact
+    products.includes(:product_category).map{|p| p.category_full_name}.compact
   end
  
   N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code')
@@ -123,10 +123,23 @@ class Environment &lt; ActiveRecord::Base
       'xmpp_chat' => _('XMPP/Jabber based chat'),
       'show_zoom_button_on_article_images' => _('Show a zoom link on all article images'),
       'captcha_for_logged_users' => _('Ask captcha when a logged user comments too'),
-      'skip_new_user_email_confirmation' => _('Skip e-mail confirmation for new users')
+      'skip_new_user_email_confirmation' => _('Skip e-mail confirmation for new users'),
+      'send_welcome_email_to_new_users' => _('Send welcome e-mail to new users'),
+      'allow_change_of_redirection_after_login' => _('Allow users to set the page to redirect after login')
     }
   end
  
+  def self.login_redirection_options
+    {
+      'keep_on_same_page' => _('Stays on the same page the user was before login.'),
+      'site_homepage' => _('Redirects the user to the environment homepage.'),
+      'user_profile_page' => _('Redirects the user to his profile page.'),
+      'user_homepage' => _('Redirects the user to his homepage.'),
+      'user_control_panel' => _('Redirects the user to his control panel.')
+    }
+  end
+  validates_inclusion_of :redirection_after_login, :in => Environment.login_redirection_options.keys, :allow_nil => true
+
   # #################################################
   # Relationships and applied behaviour
   # #################################################
@@ -530,6 +543,31 @@ class Environment &lt; ActiveRecord::Base
     signup_fields
   end
  
+  serialize :signup_welcome_text, Hash
+  def signup_welcome_text
+    self[:signup_welcome_text] ||= {}
+  end
+
+  def signup_welcome_text_subject
+    self.signup_welcome_text[:subject]
+  end
+
+  def signup_welcome_text_subject=(subject)
+    self.signup_welcome_text[:subject] = subject
+  end
+
+  def signup_welcome_text_body
+    self.signup_welcome_text[:body]
+  end
+
+  def signup_welcome_text_body=(body)
+    self.signup_welcome_text[:body] = body
+  end
+
+  def has_signup_welcome_text?
+    signup_welcome_text && !signup_welcome_text_body.blank?
+  end
+
   # #################################################
   # Validations
   # #################################################
@@ -591,8 +629,8 @@ class Environment &lt; ActiveRecord::Base
   end
  
   has_many :articles, :through => :profiles
-  def recent_documents(limit = 10)
-    self.articles.recent(limit)
+  def recent_documents(limit = 10, options = {}, pagination = true)
+    self.articles.recent(limit, options, pagination)
   end
  
   has_many :events, :through => :profiles, :source => :articles, :class_name => 'Event'
@@ -766,4 +804,53 @@ class Environment &lt; ActiveRecord::Base
   def image_galleries
     portal_community ? portal_community.image_galleries : []
   end
+
+  serialize :languages
+
+  before_validation do |environment|
+    environment.default_language = nil if environment.default_language.blank?
+  end
+
+  validate :default_language_available
+  validate :languages_available
+
+  def locales
+    if languages.present?
+      languages.inject({}) {|r, l| r.merge({l => Noosfero.locales[l]})}
+    else
+      Noosfero.locales
+    end
+  end
+
+  def default_locale
+    default_language || Noosfero.default_locale
+  end
+
+  def available_locales
+    locales_list = locales.keys
+    # move English to the beginning
+    if locales_list.include?('en')
+      locales_list = ['en'] + (locales_list - ['en']).sort
+    end
+    locales_list
+  end
+
+  private
+
+  def default_language_available
+    if default_language.present? && !available_locales.include?(default_language)
+      errors.add(:default_language, _('is not available.'))
+    end
+  end
+
+  def languages_available
+    if languages.present?
+      languages.each do |language|
+        if !Noosfero.available_locales.include?(language)
+          errors.add(:languages, _('have unsupported languages.'))
+          break
+        end
+      end
+    end
+  end
 end
@@ -19,9 +19,15 @@ class ExternalFeed &lt; ActiveRecord::Base
     article.valid?
   end
  
+  def address=(new_address)
+    self.fetched_at = nil unless address == new_address
+    super(new_address)
+  end
+
   def clear
     # do nothing
   end
+
   def finish_fetch
     if self.only_once && self.update_errors.zero?
       self.enabled = false
@@ -71,10 +71,7 @@ class Person &lt; Profile
     Friendship.find(:all, :conditions => { :friend_id => person.id}).each { |friendship| friendship.destroy }
   end
  
-  after_destroy :destroy_user
-  def destroy_user
-    self.user.destroy if self.user
-  end
+  belongs_to :user, :dependent => :delete
  
   def can_control_scrap?(scrap)
     begin
@@ -183,7 +180,8 @@ class Person &lt; Profile
   include MaybeAddHttp
  
   def active_fields
-    environment ? environment.active_person_fields : []
+    fields = environment ? environment.active_person_fields : []
+    fields << 'email'
   end
  
   def required_fields
@@ -253,7 +251,7 @@ class Person &lt; Profile
  
   def is_admin?(environment = nil)
     environment ||= self.environment
-    role_assignments.select { |ra| ra.resource == environment }.map{|ra|ra.role.permissions}.any? do |ps|
+    role_assignments.includes([:role, :resource]).select { |ra| ra.resource == environment }.map{|ra|ra.role.permissions}.any? do |ps|
       ps.any? do |p|
         ActiveRecord::Base::PERMISSIONS['Environment'].keys.include?(p)
       end
@@ -461,6 +459,10 @@ class Person &lt; Profile
     Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.user_id = #{self.id} and action_tracker.verb != 'leave_scrap_to_self' and action_tracker.verb != 'add_member_in_community' ORDER BY updated_at DESC")
   end
  
+  def public_fields
+    self.fields_privacy.nil? ? self.active_fields : self.fields_privacy.reject{ |k, v| v != 'public' }.keys.map(&:to_s)
+  end
+
   protected
  
   def followed_by?(profile)
@@ -57,6 +57,7 @@ class Profile &lt; ActiveRecord::Base
     'view_private_content' => N_('View private content'),
     'publish_content'      => N_('Publish content'),
     'invite_members'       => N_('Invite members'),
+    'send_mail_to_members' => N_('Send e-Mail to members'),
   }
  
   acts_as_accessible
@@ -147,6 +148,7 @@ class Profile &lt; ActiveRecord::Base
   settings_items :redirect_l10n, :type => :boolean, :default => false
   settings_items :public_content, :type => :boolean, :default => true
   settings_items :description
+  settings_items :fields_privacy, :type => :hash, :default => {}
  
   validates_length_of :description, :maximum => 550, :allow_nil => true
  
@@ -402,8 +404,8 @@ class Profile &lt; ActiveRecord::Base
   #
   # +limit+ is the maximum number of documents to be returned. It defaults to
   # 10.
-  def recent_documents(limit = 10, options = {})
-    self.articles.recent(limit, options)
+  def recent_documents(limit = 10, options = {}, pagination = true)
+    self.articles.recent(limit, options, pagination)
   end
  
   def last_articles(limit = 10, options = {})
@@ -879,6 +881,15 @@ private :generate_url, :url_options
     []
   end
  
+  # field => privacy (e.g.: "address" => "public")
+  def fields_privacy
+    self.data[:fields_privacy]
+  end
+
+  def public_fields
+    self.active_fields
+  end
+
   private
   def self.f_categories_label_proc(environment)
     ids = environment.top_level_category_as_facet_ids
@@ -975,4 +986,8 @@ private :generate_url, :url_options
     end
   end
  
+  validates_inclusion_of :redirection_after_login, :in => Environment.login_redirection_options.keys, :allow_nil => true
+  def preferred_login_redirection
+    redirection_after_login.blank? ? environment.redirection_after_login : redirection_after_login
+  end
 end
@@ -14,12 +14,13 @@ class ProfileListBlock &lt; Block
  
   def profile_list
     result = nil
+    visible_profiles = profiles.visible.includes([:image,:domains,:preferred_domain,:environment])
     if !prioritize_profiles_with_image
-      result = profiles.visible.all(:limit => limit, :order => 'updated_at DESC').sort_by{ rand }
-    elsif profiles.visible.with_image.count >= limit
-      result = profiles.visible.with_image.all(:limit => limit * 5, :order => 'updated_at DESC').sort_by{ rand }
+      result = visible_profiles.all(:limit => limit, :order => 'updated_at DESC').sort_by{ rand }
+    elsif visible_profiles.with_image.count >= limit
+      result = visible_profiles.with_image.all(:limit => limit * 5, :order => 'updated_at DESC').sort_by{ rand }
     else
-      result = profiles.visible.with_image.sort_by{ rand } + profiles.visible.without_image.all(:limit => limit * 5, :order => 'updated_at DESC').sort_by{ rand }
+      result = visible_profiles.with_image.sort_by{ rand } + visible_profiles.without_image.all(:limit => limit * 5, :order => 'updated_at DESC').sort_by{ rand }
     end
     result.slice(0..limit-1)
   end
@@ -16,11 +16,9 @@ class RecentDocumentsBlock &lt; Block
  
   include ActionController::UrlWriter
   def content(args={})
-    docs = self.limit.nil? ? owner.recent_documents : owner.recent_documents(self.limit)
-
+    docs = self.limit.nil? ? owner.recent_documents(nil, {}, false) : owner.recent_documents(self.limit, {}, false)
     block_title(title) +
     content_tag('ul', docs.map {|item| content_tag('li', link_to(h(item.title), item.url))}.join("\n"))
-
   end
  
   def footer
@@ -31,7 +31,7 @@ class Task &lt; ActiveRecord::Base
     end
   end
  
-  belongs_to :requestor, :class_name => 'Person', :foreign_key => :requestor_id
+  belongs_to :requestor, :class_name => 'Profile', :foreign_key => :requestor_id
   belongs_to :target, :foreign_key => :target_id, :polymorphic => true
  
   validates_uniqueness_of :code, :on => :create
@@ -30,7 +30,7 @@ class User &lt; ActiveRecord::Base
  
   after_create do |user|
     user.person ||= Person.new
-    user.person.attributes = user.person_data.merge(:identifier => user.login, :user_id => user.id, :environment_id => user.environment_id)
+    user.person.attributes = user.person_data.merge(:identifier => user.login, :user => user, :environment_id => user.environment_id)
     user.person.name ||= user.login
     user.person.visible = false unless user.activated?
     user.person.save!
@@ -73,6 +73,18 @@ class User &lt; ActiveRecord::Base
         :environment => user.environment.name,
         :url => user.environment.top_url
     end
+
+    def signup_welcome_email(user)
+      email_body = user.environment.signup_welcome_text_body.gsub('{user_name}', user.name)
+      email_subject = user.environment.signup_welcome_text_subject
+
+      content_type 'text/html'
+      recipients user.email
+
+      from "#{user.environment.name} <#{user.environment.contact_email}>"
+      subject email_subject.blank? ? _("Welcome to environment %s") % [user.environment.name] : email_subject
+      body email_body
+    end
   end
  
   def signup!
@@ -88,13 +100,13 @@ class User &lt; ActiveRecord::Base
   attr_protected :activated_at
  
   # Virtual attribute for the unencrypted password
-  attr_accessor :password
+  attr_accessor :password, :name
  
   validates_presence_of     :login, :email
   validates_format_of       :login, :with => Profile::IDENTIFIER_FORMAT, :if => (lambda {|user| !user.login.blank?})
   validates_presence_of     :password,                   :if => :password_required?
-  validates_presence_of     :password_confirmation,      :if => :password_required?, :if => (lambda {|user| !user.password.blank?})
-  validates_length_of       :password, :within => 4..40, :if => :password_required?, :if => (lambda {|user| !user.password.blank?})
+  validates_presence_of     :password_confirmation,      :if => :password_required?
+  validates_length_of       :password, :within => 4..40, :if => :password_required?
   validates_confirmation_of :password,                   :if => :password_required?
   validates_length_of       :login,    :within => 2..40, :if => (lambda {|user| !user.login.blank?})
   validates_length_of       :email,    :within => 3..100, :if => (lambda {|user| !user.email.blank?})
@@ -117,7 +129,17 @@ class User &lt; ActiveRecord::Base
     self.activated_at = Time.now.utc
     self.activation_code = nil
     self.person.visible = true
-    self.person.save! && self.save!
+    begin
+      self.person.save! && self.save!
+    rescue Exception => exception
+      logger.error(exception.to_s)
+      false
+    else
+      if environment.enabled?('send_welcome_email_to_new_users') && environment.has_signup_welcome_text?
+        User::Mailer.delay.deliver_signup_welcome_email(self)
+      end
+      true
+    end
   end
  
   def activated?
@@ -228,7 +250,12 @@ class User &lt; ActiveRecord::Base
   end
  
   def name
-    person ? person.name : login
+    name = (self[:name] || login)
+    person.nil? ? name : (person.name || name)
+  end
+
+  def name= name
+   self[:name] = name
   end
  
   def enable_email!
@@ -274,6 +301,11 @@ class User &lt; ActiveRecord::Base
     15 # in minutes
   end
  
+
+  def not_require_password!
+    @is_password_required = false
+  end
+
   protected
     # before filter 
     def encrypt_password
@@ -282,9 +314,13 @@ class User &lt; ActiveRecord::Base
       self.password_type ||= User.system_encryption_method.to_s
       self.crypted_password = encrypt(password)
     end
-    
+
     def password_required?
-      crypted_password.blank? || !password.blank?
+      (crypted_password.blank? || !password.blank?) && is_password_required?
+    end
+
+    def is_password_required?
+      @is_password_required.nil? ? true : @is_password_required
     end
  
     def make_activation_code
@@ -10,17 +10,24 @@ class ArticleSweeper &lt; ActiveRecord::Observer
     expire_caches(article)
   end
  
+  def before_update(article)
+    if article.parent_id_change
+      Article.find(article.parent_id_was).touch if article.parent_id_was
+    end
+  end
+
 protected
  
   def expire_caches(article)
-    article.hierarchy.each { |a| a.touch if a != article }
+    return if !article.environment
+    article.hierarchy(true).each { |a| a.touch if a != article }
     blocks = article.profile.blocks
     blocks += article.profile.environment.blocks if article.profile.environment
     blocks = blocks.select{|b|[RecentDocumentsBlock, BlogArchivesBlock].any?{|c| b.kind_of?(c)}}
     BlockSweeper.expire_blocks(blocks)
     env = article.profile.environment
     if env && (env.portal_community == article.profile)
-      Noosfero.locales.keys.each do |locale|
+      article.environment.locales.keys.each do |locale|
         expire_fragment(env.portal_news_cache_key(locale))
       end
     end
@@ -7,10 +7,11 @@ class BlockSweeper &lt; ActiveRecord::Observer
  
     # Expire block's all languages cache
     def expire_block(block)
+      return if !block.environment
       regex = '-[a-z]*$'
       clean_ck = block.cache_key.gsub(/#{regex}/,'')
  
-      Noosfero.locales.keys.each do |locale|
+      block.environment.locales.keys.each do |locale|
         expire_timeout_fragment("#{clean_ck}-#{locale}")
       end
     end
 <h1><%= _('Forgot your password?') %></h1>
  
-<%= error_messages_for :change_password %>
+<%= error_messages_for :change_password, :header_message => _('Instructions to password recovery could not be sent'), :message => nil %>
  
 <% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %>
  
@@ -13,6 +13,8 @@
  
      <%= f.password_field :password %>
  
+     <%= @plugins.dispatch(:login_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
+
      <% button_bar do %>
        <%= submit_button( 'login', _('Log in') )%>
        <% if is_thickbox %>
@@ -23,8 +25,13 @@
 <% end %>
  
 <% button_bar do %>
-  <%= button :add, _("New user"), :controller => 'account', :action => 'signup' %>
-  <%= button :help, _("I forgot my password!"), :controller => 'account', :action => 'forgot_password' %>
+  <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
+    <%= button :add, _("New user"), :controller => 'account', :action => 'signup' %>
+  <% end %>
+
+  <% unless @plugins.dispatch(:allow_password_recovery).include?(false) %>
+    <%= button :help, _("I forgot my password!"), :controller => 'account', :action => 'forgot_password' %>
+  <% end %>
 <% end %>
  
 </div><!-- end class="login-box" -->
@@ -9,25 +9,30 @@
   @user ||= User.new
 %>
  
-    <% labelled_form_for :user, @user,
-       :url => login_url do |f| %>
+    <% labelled_form_for :user, @user, :url => login_url do |f| %>
  
-         <%= f.text_field :login, :onchange => 'this.value = convToValidLogin( this.value )' %>
+      <%= f.text_field :login, :onchange => 'this.value = convToValidLogin( this.value )' %>
  
-         <%= f.password_field :password %>
+      <%= f.password_field :password %>
+
+      <%= @plugins.dispatch(:login_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
  
       <% button_bar do %>
         <%= submit_button( 'login', _('Log in') )%>
-        <%= link_to content_tag( 'span', _('New user') ),
-            { :controller => 'account', :action => 'signup' },
-            :class => 'button with-text icon-add' %>
+        <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
+          <%= link_to content_tag( 'span', _('New user') ),
+              { :controller => 'account', :action => 'signup' },
+              :class => 'button with-text icon-add' %>
+        <% end %>
       <% end %>
  
     <% end %>
  
-    <p class="forgot-passwd">
-      <%= link_to _("I forgot my password!"), :controller => 'account', :action => 'forgot_password' %>
-    </p>
+    <% unless @plugins.dispatch(:allow_password_recovery).include?(false) %>
+      <p class="forgot-passwd">
+        <%= link_to _("I forgot my password!"), :controller => 'account', :action => 'forgot_password' %>
+      </p>
+    <% end %>
  
     </div>
  
@@ -0,0 +1,7 @@
+<div class='description'>
+  <%= _('This text will be sent to new users if the feature "Send welcome e-mail to new users" is enabled on environment.') %><br/><br/>
+  <%= _('Including %s on body, it will be replaced by the real name of the e-mail recipient.') % content_tag('code', '{user_name}') %>
+</div>
+
+<%= labelled_form_field(_('Subject'), text_field(:environment, :signup_welcome_text_subject, :style => 'width:100%')) %>
+<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_text_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
 <%= required labelled_form_field(_('Site name'), text_field(:environment, :name)) %>
+<%= labelled_form_field(_('Contact email'), text_field(:environment, :contact_email)) %>
+<% themes_options = Theme.system_themes.map {|theme| [theme.name, theme.id] }.sort %>
+<%= labelled_form_field(_('Theme'), select(:environment, :theme, options_for_select(themes_options, environment.theme))) %>
 <%= required f.text_field(:reports_lower_bound, :size => 3) %>
+<%= labelled_form_field(_('Default language'), select(:environment, :default_language, environment.locales.invert, { :selected => environment.default_locale, :include_blank => true })) %>
+<%= label_tag :languages, _('Available languages') %>
+<br />
+
+<%
+  fields = Noosfero.locales.map do |value, name|
+    labelled_check_box(name, "environment[languages][#{value}]", true, environment.available_locales.include?(value))
+  end
+%>
+<%= balanced_table(fields)%>
+
+<br />
 <%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%', :class => 'mceEditor') %>
@@ -10,6 +10,8 @@
     :content => (render :partial => 'site_info', :locals => {:f => f})} %>
   <% tabs << {:title => _('Terms of use'), :id => 'terms-of-use',
     :content => (render :partial => 'terms_of_use', :locals => {:f => f})} %>
+  <% tabs << {:title => _('Signup welcome text'), :id => 'signup-welcome-text',
+    :content => (render :partial => 'signup_welcome_text', :locals => {:f => f})} %>
   <%= render_tabs(tabs) %>
   <% button_bar do %>
     <%= submit_button(:save, _('Save'), :cancel => {:action => 'index'}) %>
@@ -32,7 +32,7 @@
         { :profile => profile.identifier,
           :controller => 'contact',
           :action => 'new' },
-        :class => 'button with-text icon-menu-mail' %>
+        {:class => 'button with-text icon-menu-mail', :title => _('Send an e-mail to the administrators')} %>
       </li>
     <% end %>
  
@@ -0,0 +1,10 @@
+<% block_types.in_groups_of(2) do |block1, block2| %>
+  <div style='float: left; width: 48%; padding-top: 2px;'>
+    <%= labelled_radio_button(block1.description, :type, block1.name) %>
+  </div>
+  <% if block2 %>
+    <div style='float: left; width: 48%; padding-top: 2px;'>
+      <%= labelled_radio_button(block2.description, :type, block2.name) %>
+    </div>
+  <% end %>
+<% end %>
 <strong><%= _('Highlights') %></strong>
-<div id='edit-highlights-block'>
+<div id='edit-highlights-block' style='width:450px'>
 <table id='highlights' class='noborder'>
   <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th><th><%= _('Title') %></th></tr>
   <% for image in @block.images do %>
 <strong><%= _('Links') %></strong>
-<div id='edit-link-list-block'>
+<div id='edit-link-list-block' style='width:450px'>
 <table id='links' class='noborder'>
   <tr><th><%= _('Icon') %></th><th><%= _('Name') %></th><th><%= _('Address') %></th></tr>
   <% for link in @block.links do %>
-<%= labelled_form_field(_('HTML code'), text_area(:block, :html, :style => 'width: 100%', :rows => 15)) %>
+<%= labelled_form_field(_('HTML code'), text_area(:block, :html, :style => 'width: 90%', :rows => 15)) %>
-<% form_tag do %>
-
-  <p><%= _('In what area do you want to put your new block?') %></p>
-
-  <%# FIXME hardcoded stuff %>
-  <%= select_tag('box_id', options_for_select(@boxes.select { |item| item.position != 1 }.map {|item| [ _("Area %d") % item.position, item.id]})) %>
-  
-  <p><%= _('Select the type of block you want to add to your page.') %></p>
-  
-  <% @block_types.in_groups_of(2) do |block1, block2| %>
-    <div style='float: left; width: 48%; padding-top: 2px;'>
-      <%= radio_button_tag('type', block1.name) %>
-      <%= label_tag "type_#{block1.name.downcase}", block1.description %>
+<div style='height:350px'>
+  <% form_tag do %>
+
+    <p><%= _('In what area do you want to put your new block?') %></p>
+
+    <% @boxes.each do |box| %>
+      <%= labelled_radio_button(_("Area %d") % box.position, :box_id, box.id, box.central?, { :class => 'box-position', 'data-position' => box.position })  %>
+    <% end %>
+
+    <script type="text/javascript">
+      (function ($) {
+        $(document).ready(function () {
+          $(".box-position").live('change', function () {
+            if ($(this).attr('data-position') == '1') {
+              $('#center-block-types').show();
+              $('#side-block-types').hide();
+            } else {
+              $('#center-block-types').hide();
+              $('#side-block-types').show();
+            };
+          });
+      })})(jQuery);
+    </script>
+
+    <p><%= _('Select the type of block you want to add to your page.') %></p>
+
+    <div id='center-block-types'>
+      <%= render :partial => 'block_types', :locals => { :block_types => @center_block_types } %>
     </div>
-    <% if block2 %>
-      <div style='float: left; width: 48%; padding-top: 2px;'>
-        <%= radio_button_tag('type', block2.name) %>
-        <%= label_tag "type_#{block2.name.downcase}", block2.description %>
-      </div>
+
+    <div id='side-block-types' style='display:none'>
+      <%= render :partial => 'block_types', :locals => { :block_types => @side_block_types } %>
+    </div>
+
+    <br style='clear: both'/>
+
+    <% button_bar do %>
+      <%= submit_button(:add, _("Add")) %>
+      <%= colorbox_close_button(_('Close')) %>
     <% end %>
-  <% end %>
-  <br style='clear: both'/>
-  
-  <% button_bar do %>
-    <%= submit_button(:add, _("Add")) %>
-    <%= lightbox_close_button(_('Close')) %>
-  <% end %>
  
-<% end %>
+  <% end %>
+</div>
-<h2><%= _('Editing block') %></h2>
+<div style='width: 500px;'>
+  <h2><%= _('Editing block') %></h2>
  
-<% form_tag(:action => 'save', :id => @block.id) do %>
+  <% form_tag(:action => 'save', :id => @block.id) do %>
  
-  <%= labelled_form_field(_('Custom title for this block: '), text_field(:block, :title, :maxlength => 20)) %>
+    <%= labelled_form_field(_('Custom title for this block: '), text_field(:block, :title, :maxlength => 20)) %>
  
-  <%= render :partial => partial_for_class(@block.class) %>
+    <%= render :partial => partial_for_class(@block.class) %>
  
-  <%= labelled_form_field _('Display this block:'), '' %>
-  <div style='margin-left: 10px'>
-    <%= radio_button(:block, :display, 'always') %>
-    <%= label_tag('block_display_always', _('In all pages')) %>
-    <br/>
-    <%= radio_button(:block, :display, 'home_page_only') %>
-    <%= label_tag('block_display_home_page_only', _('Only in the homepage')) %>
-    <br/>
-    <%= radio_button(:block, :display, 'except_home_page') %>
-    <%= label_tag('block_display_except_home_page', _('In all pages, except in the homepage')) %>
-    <br/>
-    <%= radio_button(:block, :display, 'never') %>
-    <%= label_tag('block_display_never', _("Don't display")) %>
-  </div>
+    <%= labelled_form_field _('Display this block:'), '' %>
+    <div style='margin-left: 10px'>
+      <%= radio_button(:block, :display, 'always') %>
+      <%= label_tag('block_display_always', _('In all pages')) %>
+      <br/>
+      <%= radio_button(:block, :display, 'home_page_only') %>
+      <%= label_tag('block_display_home_page_only', _('Only in the homepage')) %>
+      <br/>
+      <%= radio_button(:block, :display, 'except_home_page') %>
+      <%= label_tag('block_display_except_home_page', _('In all pages, except in the homepage')) %>
+      <br/>
+      <%= radio_button(:block, :display, 'never') %>
+      <%= label_tag('block_display_never', _("Don't display")) %>
+    </div>
  
-  <%= labelled_form_field(_('Show for:'), select(:block, :language, [ [ _('all languages'), 'all']] + Noosfero.locales.map {|key, value| [value, key]} )) %>
+    <%= labelled_form_field(_('Show for:'), select(:block, :language, [ [ _('all languages'), 'all']] + environment.locales.map {|key, value| [value, key]} )) %>
  
-  <% button_bar do %>
-    <%= submit_button(:save, _('Save')) %>
-    <%= lightbox_close_button(_('Cancel')) %>
-  <% end %>
+    <% button_bar do %>
+      <%= submit_button(:save, _('Save')) %>
+      <%= colorbox_close_button(_('Cancel')) %>
+    <% end %>
  
-<% end %>
+  <% end %>
+</div>
 <h1><%= _('Editing sideboxes')%></h1>
  
 <% button_bar do %>
-  <%= lightbox_button('add', _('Add a block'), { :action => 'add_block' }) %> 
+  <%= colorbox_button('add', _('Add a block'), { :action => 'add_block' }) %>
   <%= button(:back, _('Back to control panel'), :controller => (profile.nil? ? 'admin_panel': 'profile_editor')) %>
 <% end %>
@@ -30,6 +30,9 @@
     <li class="product <%= status.join(' ') %>">
       <ul>
         <li class="product-image-link">
+          <% if product.highlighted? %>
+            <%= link_to image_tag(themed_path('/images/star.png'), :class => 'star', :alt => _('Highlighted product')), product_path(product) %>
+          <% end %>
           <% if product.image %>
             <div class="zoomable-image">
               <%= link_to_product product, :class => 'product-big', :style => "background-image: url(#{product.default_image(:big)})" %>
@@ -62,7 +62,7 @@
  
 <% f.fields_for 'feed', @article.feed do |feed| %>
   <%= labelled_form_field(_('Limit of posts in RSS Feed'), feed.select(:limit, [5, 10, 20, 50])) %>
-  <%= labelled_form_field(_('Include in RSS Feed only posts from language:'), feed.select(:language, [[_('All'),  nil ]] + Noosfero.locales.map { |k,v| [v, k]})) %>
+  <%= labelled_form_field(_('Include in RSS Feed only posts from language:'), feed.select(:language, [[_('All'),  nil ]] + environment.locales.map { |k,v| [v, k]})) %>
 <% end %>
  
 <% f.fields_for 'external_feed_builder', @article.external_feed do |efeed| %>
+<%= select_profile_folder(_('Parent folder:'), 'article[parent_id]', profile, @article.parent_id) %>
 <%= labelled_form_field(_('License'), select(:article, :license_id, options_for_select_with_title([[_('None'), nil]] + profile.environment.licenses.map {|license| [license.name, license.id]}, @article.license ? @article.license.id : nil))) %>
@@ -6,7 +6,7 @@
  
 <%= required labelled_form_field(_('Limit of articles'), text_field(:article, :limit)) %>
  
-<%= labelled_form_field(_('Include in RSS Feed only posts from language:'), f.select(:language, [[_('All'),  nil ]] + Noosfero.locales.map { |k,v| [v, k]})) %>
+<%= labelled_form_field(_('Include in RSS Feed only posts from language:'), f.select(:language, [[_('All'),  nil ]] + environment.locales.map { |k,v| [v, k]})) %>
  
 <%= labelled_form_field(_('Use as item description:'), select(:article, :feed_item_description, [ [ _('Article abstract'), 'abstract'], [ _('Article body'), 'body']])) %>
  
@@ -9,8 +9,7 @@
     <div id='media-upload-form'>
       <% form_tag({ :action => 'media_upload' }, :multipart => true) do %>
         <div class='formfield'>
-          <%# TODO duplicated from partial upload_file_form %>
-          <%= labelled_form_field(_('Choose folder to upload files:'), select_tag('parent_id', options_for_select([[profile.identifier, '']] + profile.folders.collect {|f| [ profile.identifier + '/' +  f.full_name, f.id ] }))) %>
+          <%= select_profile_folder(_('Choose folder to upload files:'), :parent_id, profile) %>
         </div>
         <p><%= file_field_tag('file1') %></p>
         <p><%= file_field_tag('file2') %></p>
 <% if @parent %>
   <%= hidden_field_tag('parent_id', @parent.id) %>
 <% else %>
-  <%= labelled_form_field(_('Choose folder to upload files:'), select_tag('parent_id', options_for_select([[profile.identifier, '']] + @folders.collect {|f| [ profile.identifier + '/' +  f.full_name, f.id ] }))) %>
+  <%= select_profile_folder(_('Choose folder to upload files:'), :parent_id, profile) %>
 <% end %>
  
 <div id='uploaded_files'>
 <%= labelled_form_field(_('Title'), text_field(:article, :title, :maxlength => 60)) %>
+
+<%= render :partial => 'general_fields' %>
+
 <%= labelled_form_field(_('Description'), text_area(:article, :abstract, :rows => 3, :cols => 64)) %>
 <% if @article.image? %>
   <%= f.text_field(:external_link, :size => 64) %>
-<h1><%= _('Send an e-mail to %s') % profile.name %></h1>
+<% if profile.person? %>
+  <h1><%= _('Send an e-mail to %s') % profile.name %></h1>
+<% else %>
+  <h1><%= _('Send an e-mail to administrators') %></h1>
  
-<%= error_messages_for 'contact' %>
+  <div class='tooltip'><%= _("The e-mail will be sent to the administrators of '%s'") % profile.name %></div>
+<% end %>
  
+<%= error_messages_for 'contact' %>
  
 <% labelled_form_for :contact, @contact do |f| %>
   <%= hidden_field_tag(:confirm, 'false') %>
@@ -26,17 +26,12 @@ Check all the features you want to enable for your environment, uncheck all the 
  
 <h2><%= _('Configure features') %></h2>
  
-<table>
-  <tr>
-    <th><%= _('Option') %></th>
-    <th><%= _('Choice') %></th>
-  </tr>
-  <tr>
-    <td><%= _('Organization Approval Method') %></td>
-    <td><%= select_organization_approval_method('environment', 'organization_approval_method') %></td>
-  </tr>
-</table>
-
+<h3><%= _('Page to redirect after login') %></h3>
+  <%=  select 'environment', 'redirection_after_login', Environment.login_redirection_options.map{|key,value|[value,key]} %>
+<hr/>
+<h3><%= _('Organization Approval Method') %></h3>
+  <%= select_organization_approval_method('environment', 'organization_approval_method') %>
+<hr/>
  
 <div>
   <% button_bar do %>
@@ -2,7 +2,8 @@
 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
 'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
-'add-and-join', 'report-abuse', 'catalog', 'manage-products', :cache => 'cache-general' %>
+'add-and-join', 'report-abuse', 'catalog', 'manage-products',
+'jquery-ui-timepicker-addon', :cache => 'cache-general' %>
  
 <% language = FastGettext.locale %>
 <% %w{messages methods}.each do |type| %>
@@ -56,10 +56,18 @@
             <%= usermenu_logged_in %>
           </span>
           <span class='not-logged-in' style='display: none'>
-              <%= _("<span class='login'>%s</span> <span class='or'>or</span> <span class='signup'>%s</span>") % [thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login'), link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup') ] %>
+
+              <%= _("<span class='login'>%s</span>") % thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
+              <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_eval(&content) }.join("") %>
+
               <div id='inlineLoginBox' style='display: none;'>
                 <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
               </div>
+
+              <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
+              <%= _("<span class='or'>or</span> <span class='signup'>%s</span>") % link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup')%>
+              <% end %>
+
           </span>
           <form action="/search" class="search_form" method="get" class="clean">
             <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />
@@ -80,7 +80,7 @@
         </div><!-- id='navigation_bar' -->
  
         <div id="language-selector">
-           <%= language_chooser(:element => 'dropdown') %>
+           <%= language_chooser(environment, :element => 'dropdown') %>
         </div>
  
         <div id="user_box">
-
-<script type="text/javascript">
-  jQuery( function() {
-    var parent_selector = '.profile-wall-description, .profile-activity-description, .profile-network-description';
-    var child_selector = '.icon-delete, .icon-reply';
-    jQuery(parent_selector).live('mouseover', function () { jQuery(this).find(child_selector).css('visibility', 'visible'); });
-    jQuery(parent_selector).live('mouseout', function () { jQuery(this).find(child_selector).css('visibility', 'hidden'); });
-  });
-</script>
-
 <% unless @action %>
   <% cache_timeout(profile.cache_key + '-profile-general-info', 4.hours) do %>
     <tr>
@@ -13,31 +13,16 @@
     <td><%= show_date(profile.created_at) %></td>
   </tr>
  
-  <% if profile == user || profile.friends.include?(user) %>
-    <tr>
-      <th colspan='2'><%= _('Contact')%></th>
-    </tr>
-    <%= display_field(_('Address:'), profile, :address) %>
-    <%= display_field(_('ZIP code:'), profile, :zip_code) %>
-    <%= display_field(_('Contact phone:'), profile, :contact_phone) %>
-    <%= display_field(_('e-Mail:'), profile, :email, true) { |email| link_to_email(email) } %>
-  <% end %>
+  <%= display_contact profile %>
  
   <% cache_timeout(profile.relationships_cache_key, 4.hours) do %>
-    <% if !(profile.organization.blank? && profile.organization_website.blank?) && (profile.active_fields.include?('organization') || profile.active_fields.include?('organization_website')) %>
-      <tr>
-        <th colspan='2'><%= _('Work')%></th>
-      </tr>
-    <% end %>
-    <%= display_field(_('Organization:'), profile, :organization) %>
-    <%= display_field(_('Organization website:'), profile, :organization_website) { |url| link_to(url, url) }%>
-
+    <%= display_work_info profile %>
  
     <% if !environment.enabled?('disable_asset_enterprises') && !profile.enterprises.empty? %>
       <tr>
         <th colspan='2'><%= __('Enterprises') %></th>
       </tr>
-      <% profile.enterprises.each do |item| %>
+      <% profile.enterprises.includes(:environment,:domains, :preferred_domain).each do |item| %>
         <tr>
           <td></td>
           <td><%= button 'menu-enterprise', item.name, item.url %></td>
@@ -59,6 +44,6 @@
  
     <%= render :partial => 'common' %>
  
-  </table>
-<% end %>
+  <% end %>
+</table>
  
@@ -16,8 +16,13 @@
  
 <% button_bar do %>
   <%= button :back, _('Go back'), { :controller => 'profile' } %>
-  <% if profile.community? and user and user.has_permission?(:invite_members, profile) %>
-    <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'select_address_book' %>
+  <% if profile.community? and user %>
+    <% if user.has_permission?(:invite_members, profile) %>
+      <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'select_address_book' %>
+    <% end %>
+    <% if user.has_permission?(:send_mail_to_members, profile) %>
+      <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
+    <% end %>
   <% end %>
 <% end %>
  
@@ -0,0 +1,14 @@
+<h1><%= h profile.short_name(50) %></h1>
+
+<h2><%= _('Send e-mail to members') %></h2>
+
+<%= error_messages_for :mailing %>
+
+<%= render :file => 'shared/tiny_mce' %>
+
+<% 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, :class => 'mceEditor')) %>
+  <%= submit_button(:send, _('Send')) %>
+  <%= button :cancel, _('Cancel e-mail'), :back %>
+<% end %>
@@ -2,9 +2,19 @@
  
   <%= required_fields_message %>
  
-  <%= required f.text_field(:name) %>
+  <div class="field-with-privacy-selector">
+    <%= required f.text_field(:name) %>
+    <div class="field-privacy-selector">
+      <%= unchangeable_privacy_field @profile %>
+    </div>
+  </div>
  
-  <%= required f.text_field(:email) %>
+  <div class="field-with-privacy-selector">
+    <%= required f.text_field(:email) %>
+    <div class="field-privacy-selector">
+      <%= profile_field_privacy_selector @profile, 'email' %>
+    </div>
+  </div>
  
   <%= @plugins.dispatch(:profile_info_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
  
@@ -61,11 +61,3 @@
 <%= optional_field(@person, 'professional_activity', f.text_field(:professional_activity, :rel => _('Professional activity'))) %>
 <%= optional_field(@person, 'organization', f.text_field(:organization, :rel => _('Organization'))) %>
 <%= optional_field(@person, 'organization_website', f.text_field(:organization_website, :rel => _('Organization website'))) %>
-
-<% optional_field(@person, 'image') do %>
-  <div id="profile_choose_picture">
-    <% f.fields_for :image_builder, @person.image do |i| %>
-      <%= file_field_or_thumbnail(_('Image:'), @person.image, i) %><span class="person_image_maxsize"><%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %></span>
-    <% end %>
-  </div>
-<% end %>
@@ -12,73 +12,37 @@
  
   <%= render :partial => partial_for_class(@profile.class), :locals => { :f => f } %>
  
-  <% unless @profile.person? && @environment.active_person_fields.include?('image') %>
-  <div id="profile_change_picture">
+  <div id="profile_change_picture_title">
     <h2><%= _('Change picture') %></h2>
+    <span><%= unchangeable_privacy_field @profile %></span>
+  </div>
+  <div id="profile_change_picture">
     <% f.fields_for :image_builder, @profile.image do |i| %>
       <%= file_field_or_thumbnail(_('Image:'), @profile.image, i) %><%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
     <% end %>
   </div>
-  <% end %>
  
   <h2><%= _('Privacy options') %></h2>
  
   <% if profile.person? %>
-  <table>
-    <tr>
-      <th style='text-align: right;'>
-        <%= _('This profile is:') %>
-      </th>
-      <th>
-        <%= radio_button 'profile_data', 'public_profile', 'true' %>
-        <label for="profile_data_public_profile_true"><u><%= _('Public') %></u></label>
-      </th>
-      <th style='padding: 2px 10px 2px 2px;'>
-        <%= radio_button 'profile_data', 'public_profile', 'false' %>
-        <label for="profile_data_public_profile_false"><u><%= _('Private') %></u></label>
-      </th>
-    </tr>
-    <tr>
-      <td> <%= _('Activate Intranet access (restricted area only for me)') %> </td><td><%= _('Yes') %></td><td><%= _('Yes') %></td>
-    </tr>
-    <tr>
-      <td> <%= _('Include my contact in directory of people') %> </td><td><%= _('Yes') %></td><td><%= _('Yes') %></td>
-    </tr>
-    <tr>
-      <td> <%= _('Show my contents to all internet users') %> </td><td><%= _('Yes') %></td><td><%= _('No') %></td>
-    </tr>
-    <tr>
-      <td> <%= _('Show my contents to my friends (person)') %> </td><td><%= _('Yes') %></td><td><%= _('Yes') %></td>
-    </tr>
-  </table>
+    <div>
+      <%= labelled_radio_button _('Public &mdash; show my contents to all internet users'), 'profile_data[public_profile]', true, @profile.public_profile? %>
+    </div>
+    <div>
+      <%= labelled_radio_button _('Private &mdash; show my contents only to friends'), 'profile_data[public_profile]', false, !@profile.public_profile? %>
+    </div>
   <% else %>
-  <table>
-    <tr>
-      <th style='text-align: right;'>
-        <%= _('This profile is:') %>
-      </th>
-      <th>
-        <%= radio_button 'profile_data', 'public_profile', 'true' %>
-        <label for="profile_data_public_profile_true"><u><%= _('Public') %></u></label>
-      </th>
-      <th style='padding: 2px 10px 2px 2px;'>
-        <%= radio_button 'profile_data', 'public_profile', 'false' %>
-        <label for="profile_data_public_profile_false"><u><%= _('Private') %></u></label>
-      </th>
-    </tr>
-    <tr>
-      <td> <%= _('Activate Intranet access (restricted area only for members)') %> </td><td><%= _('Yes') %></td><td><%= _('Yes') %></td>
-    </tr>
-    <tr>
-      <td> <%= _('Include this group directory of groups') %> </td><td><%= _('Yes') %></td><td><%= _('Yes') %></td>
-    </tr>
-    <tr>
-      <td> <%= _('Show content of this group to all internet users') %> </td><td><%= _('Yes') %></td><td><%= _('No') %></td>
-    </tr>
-    <tr>
-      <td> <%= _('Show content of this group to members') %> </td><td><%= _('Yes') %></td><td><%= _('Yes') %></td>
-    </tr>
-  </table>
+    <div>
+      <%= labelled_radio_button _('Public &mdash; show content of this group to all internet users'), 'profile_data[public_profile]', true, @profile.public_profile? %>
+    </div>
+    <div>
+      <%= labelled_radio_button _('Private &mdash; show content of this group only to members'), 'profile_data[public_profile]', false, !@profile.public_profile? %>
+    </div>
+  <% end %>
+
+  <% if environment.enabled?('allow_change_of_redirection_after_login') %>
+    <h2><%= _('Page to redirect after login') %></h2>
+    <%=  select 'profile_data', 'redirection_after_login', Environment.login_redirection_options.map{|key,value|[value,key]}, { :selected => @profile.preferred_login_redirection} %>
   <% end %>
  
   <h2><%= _('Translations') %></h2>
@@ -4,7 +4,9 @@
   <% if profile.community? and user.has_permission?(:invite_members, profile) %>
     <%= button :search, _('Invite your friends to join %s') % profile.short_name, :controller => 'invite', :action => 'select_address_book' %>
   <% end %>
-  <%= button :send, _('Send e-mail to members'), :action => 'send_mail' %>
+  <% if profile.community? and user.has_permission?(:send_mail_to_members, profile) %>
+    <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
+  <% end %>
   <% @plugins.dispatch(:manage_members_extra_buttons).each do |plugin_button| %>
     <%= button plugin_button[:icon], plugin_button[:title], plugin_button[:url] %>
   <% end %>
@@ -1,14 +0,0 @@
-<h1><%= h profile.short_name(50) %></h1>
-
-<h2><%= _('Send e-mail to members') %></h2>
-
-<%= error_messages_for :mailing %>
-
-<%= render :file => 'shared/tiny_mce' %>
-
-<% 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, :class => 'mceEditor')) %>
-  <%= submit_button(:send, _('Send')) %>
-  <%= button :cancel, _('Cancel e-mail'), :action => 'index' %>
-<% end %>
 <% extra_content = @plugins.dispatch(:asset_product_extras, product, product.enterprise).collect { |content| instance_eval(&content) } %>
 <% extra_properties = @plugins.dispatch(:asset_product_properties, product)%>
  
-<li class="search-product-item">
+<li class="search-product-item <%= 'highlighted' if product.highlighted? %>">
  
   <div class="search-product-item-first-column">
     <%= render :partial => 'search/image', :object => product %>
 <%= render :file => 'shared/tiny_mce' %>
  
 <%= labelled_form_field(_('Name for publishing'), f.text_field(:name)) %>
-<%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task]", 'article_parent_id', task.target) %>
+<%= 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)) %>
  
 <% tiny = task.article && task.article.tiny_mce? ? {:tiny_mce => true} : {} %>
@@ -6,7 +6,7 @@
 <%= labelled_form_field(_('Source'), f.text_field(:source_name)) %>
 <%= labelled_form_field(_("Source URL"), f.text_field(:source)) %>
  
-<%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task]", 'article_parent_id', task.target) %>
+<%= 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)) %>
  
 <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :f => f, :abstract_method => 'article_abstract', :body_method => 'article_body', :lead_id => task.id} %>
@@ -50,13 +50,13 @@
   <% fields_for "tasks[#{task.id}][task]", task do |f| %>
     <% if task.accept_details %>
       <div id="on-accept-information-<%=task.id%>" style="display: none">
-        <%= render :partial => partial_for_task_class(task.class, :accept_details), :locals => {:task => task, :f => f} %>
+        <%= render :partial => partial_for_class(task.class, :accept_details), :locals => {:task => task, :f => f} %>
       </div>
     <% end %>
  
     <% if task.reject_details %>
       <div id="on-reject-information-<%=task.id%>" style="display: none">
-        <%= render :partial => partial_for_task_class(task.class, :reject_details), :locals => {:task => task, :f => f} %>
+        <%= render :partial => partial_for_class(task.class, :reject_details), :locals => {:task => task, :f => f} %>
       </div>
     <% end %>
   <% end %>
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  </head>
+  <body>
+    <p><%= word_wrap @body %></p>
+  </body>
+</html>
@@ -19,16 +19,17 @@ ActionController::Routing::Routes.draw do |map|
  
   # -- just remember to delete public/index.html.
   # You can have the root of your site routed by hooking up ''
+  map.root :controller => "home", :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
   map.connect '', :controller => "home", :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
   map.home 'site/:action', :controller => 'home'
  
-  map.connect 'images/*stuff', :controller => 'not_found', :action => 'index'
-  map.connect 'stylesheets/*stuff', :controller => 'not_found', :action => 'index'
-  map.connect 'designs/*stuff', :controller => 'not_found', :action => 'index'
-  map.connect 'articles/*stuff', :controller => 'not_found', :action => 'index'
-  map.connect 'javascripts/*stuff', :controller => 'not_found', :action => 'index'
-  map.connect 'thumbnails/*stuff', :controller => 'not_found', :action => 'index'
-  map.connect 'user_themes/*stuff', :controller => 'not_found', :action => 'index'
+  map.connect 'images/*stuff', :controller => 'not_found', :action => 'nothing'
+  map.connect 'stylesheets/*stuff', :controller => 'not_found', :action => 'nothing'
+  map.connect 'designs/*stuff', :controller => 'not_found', :action => 'nothing'
+  map.connect 'articles/*stuff', :controller => 'not_found', :action => 'nothing'
+  map.connect 'javascripts/*stuff', :controller => 'not_found', :action => 'nothing'
+  map.connect 'thumbnails/*stuff', :controller => 'not_found', :action => 'nothing'
+  map.connect 'user_themes/*stuff', :controller => 'not_found', :action => 'nothing'
  
   # online documentation
   map.doc         'doc', :controller => 'doc', :action => 'index'
@@ -0,0 +1,11 @@
+class AddLanguagesAndDefaultLanguageToEnvironment < ActiveRecord::Migration
+  def self.up
+    add_column :environments, :languages, :string
+    add_column :environments, :default_language, :string
+  end
+
+  def self.down
+    remove_column :environments, :languages
+    remove_column :environments, :default_language
+  end
+end
@@ -0,0 +1,23 @@
+class AddPermissionForSendMailToMembersToAdminAndModeratorRoles < ActiveRecord::Migration
+  def self.up
+    Environment.all.map(&:id).each do |id|
+      role = Profile::Roles.admin(id)
+      role.permissions += ['send_mail_to_members']
+      role.save!
+      role = Profile::Roles.moderator(id)
+      role.permissions += ['send_mail_to_members']
+      role.save!
+    end
+  end
+
+  def self.down
+    Environment.all.map(&:id).each do |id|
+      role = Profile::Roles.admin(id)
+      role.permissions -= ['send_mail_to_members']
+      role.save!
+      role = Profile::Roles.moderator(id)
+      role.permissions -= ['send_mail_to_members']
+      role.save!
+    end
+  end
+end
@@ -0,0 +1,9 @@
+class AddRedirectionAfterLoginToEnvironment < ActiveRecord::Migration
+  def self.up
+    add_column :environments, :redirection_after_login, :string, :default => 'keep_on_same_page'
+  end
+
+  def self.down
+    remove_column :environments, :redirection_after_login
+  end
+end
@@ -0,0 +1,9 @@
+class AddRedirectionAfterLoginToProfiles < ActiveRecord::Migration
+  def self.up
+    add_column :profiles, :redirection_after_login, :string
+  end
+
+  def self.down
+    remove_column :profiles, :redirection_after_login
+  end
+end
@@ -0,0 +1,9 @@
+class AddSignupWelcomeText < ActiveRecord::Migration
+  def self.up
+    add_column :environments, :signup_welcome_text, :text
+  end
+
+  def self.down
+    remove_column :environments, :signup_welcome_text
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20120825185219) do
+ActiveRecord::Schema.define(:version => 20121008185303) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -261,6 +261,10 @@ ActiveRecord::Schema.define(:version =&gt; 20120825185219) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "reports_lower_bound",          :default => 0,         :null => false
+    t.string   "redirection_after_login",      :default => "keep_on_same_page"
+    t.text     "signup_welcome_text"
+    t.string   "languages"
+    t.string   "default_language"
   end
  
   create_table "external_feeds", :force => true do |t|
@@ -438,6 +442,7 @@ ActiveRecord::Schema.define(:version =&gt; 20120825185219) do
     t.string   "national_region_code"
     t.boolean  "is_template",                        :default => false
     t.integer  "template_id"
+    t.string   "redirection_after_login"
   end
  
   add_index "profiles", ["environment_id"], :name => "index_profiles_on_environment_id"
@@ -4,6 +4,12 @@ noosfero (0.39.0~1) UNRELEASED; urgency=low
  
  -- Antonio Terceiro <terceiro@debian.org>  Thu, 30 Aug 2012 14:55:10 -0300
  
+noosfero (0.38.3) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Wed, 07 Nov 2012 20:25:51 -0200
+
 noosfero (0.38.2) unstable; urgency=low
  
   * Bugfixes release
@@ -9,7 +9,8 @@ Feature: login
       | joaosilva | Joao Silva |
  
   Scenario: login from portal homepage
-    Given I am not logged in
+    Given feature "allow_change_of_redirection_after_login" is disabled on environment
+    And I am not logged in
     And I go to the homepage
     And I fill in the following:
       | Username | joaosilva |
@@ -19,7 +20,8 @@ Feature: login
     And I should be logged in as "joaosilva"
  
   Scenario: login from some profile page
-    Given I am not logged in
+    Given feature "allow_change_of_redirection_after_login" is disabled on environment
+    And I am not logged in
     And the following users
       | login | name |
       | mariasilva | Maria Silva |
@@ -35,7 +37,8 @@ Feature: login
     Then I should be on Maria Silva's homepage
  
   Scenario: view my control panel
-    Given I am not logged in
+    Given feature "allow_change_of_redirection_after_login" is disabled on environment
+    And I am not logged in
     And I go to Joao Silva's control panel
     And I should be on login page
     And I fill in the following:
@@ -48,3 +51,146 @@ Feature: login
     Given I am logged in as "joaosilva"
     And I go to login page
     Then I should be on Joao Silva's control panel
+
+  Scenario: stay on the same page after login if this is the environment default
+    Given feature "allow_change_of_redirection_after_login" is enabled on environment
+    And I am not logged in
+    And the environment is configured to stay on the same page after login
+    And the following users
+      | login | name |
+      | mariasilva | Maria Silva |
+    And the following articles
+      | owner      | name         | homepage |
+      | mariasilva | my home page | true |
+    And I go to Maria Silva's homepage
+    And I follow "Login"
+    And I fill in the following:
+      | Username | joaosilva |
+      | Password | 123456 |
+    When I press "Log in"
+    Then I should be on Maria Silva's homepage
+
+  Scenario: go to site homepage if this is the environment default
+    Given feature "allow_change_of_redirection_after_login" is enabled on environment
+    And I am not logged in
+    And the environment is configured to redirect to site homepage after login
+    And I go to Joao Silva's homepage
+    And I follow "Login"
+    And I fill in the following:
+      | Username | joaosilva |
+      | Password | 123456 |
+    When I press "Log in"
+    Then I should be on the homepage
+
+  Scenario: go to user profile after login if this is the environment default
+    Given feature "allow_change_of_redirection_after_login" is enabled on environment
+    And I am not logged in
+    And the environment is configured to redirect to user profile page after login
+    And I go to the homepage
+    And I follow "Login"
+    And I fill in the following:
+      | Username | joaosilva |
+      | Password | 123456 |
+    When I press "Log in"
+    Then I should be on Joao Silva's profile
+
+  Scenario: go to profile homepage after login if this is the environment default
+    Given the following articles
+      | owner     | name           | body               | homepage |
+      | joaosilva | Sample Article | This is an article | true     |
+    And feature "allow_change_of_redirection_after_login" is enabled on environment
+    And I am not logged in
+    And the environment is configured to redirect to profile homepage after login
+    And I go to the homepage
+    And I follow "Login"
+    And I fill in the following:
+      | Username | joaosilva |
+      | Password | 123456 |
+    When I press "Log in"
+    Then I should be on Joao Silva's homepage
+
+  Scenario: go to profile control panel after login if this is the environment default
+    Given feature "allow_change_of_redirection_after_login" is enabled on environment
+    And I am not logged in
+    And the environment is configured to redirect to profile control panel after login
+    And I go to the homepage
+    And I follow "Login"
+    And I fill in the following:
+      | Username | joaosilva |
+      | Password | 123456 |
+    When I press "Log in"
+    Then I should be on Joao Silva's control panel
+
+  Scenario: stay on the same page after login if this is the profile default
+    Given feature "allow_change_of_redirection_after_login" is enabled on environment
+    And I am not logged in
+    And the environment is configured to redirect to site homepage after login
+    And the profile joaosilva is configured to stay on the same page after login
+    And the following users
+      | login | name |
+      | mariasilva | Maria Silva |
+    And the following articles
+      | owner      | name         | homepage |
+      | mariasilva | my home page | true |
+    And I go to Maria Silva's homepage
+    And I follow "Login"
+    And I fill in the following:
+      | Username | joaosilva |
+      | Password | 123456 |
+    When I press "Log in"
+    Then I should be on Maria Silva's homepage
+
+  Scenario: go to site homepage if this is the profile default
+    Given feature "allow_change_of_redirection_after_login" is enabled on environment
+    And I am not logged in
+    And the environment is configured to stay on the same page after login
+    And the profile joaosilva is configured to redirect to site homepage after login
+    And I go to Joao Silva's homepage
+    And I follow "Login"
+    And I fill in the following:
+      | Username | joaosilva |
+      | Password | 123456 |
+    When I press "Log in"
+    Then I should be on the homepage
+
+  Scenario: go to user profile after login if this is the profile default
+    Given feature "allow_change_of_redirection_after_login" is enabled on environment
+    And I am not logged in
+    And the environment is configured to stay on the same page after login
+    And the profile joaosilva is configured to redirect to user profile page after login
+    And I go to the homepage
+    And I follow "Login"
+    And I fill in the following:
+      | Username | joaosilva |
+      | Password | 123456 |
+    When I press "Log in"
+    Then I should be on Joao Silva's profile
+
+  Scenario: go to profile homepage after login if this is the profile default
+    Given the following articles
+      | owner     | name           | body               | homepage |
+      | joaosilva | Sample Article | This is an article | true     |
+    And feature "allow_change_of_redirection_after_login" is enabled on environment
+    And I am not logged in
+    And the environment is configured to stay on the same page after login
+    And the profile joaosilva is configured to redirect to profile homepage after login
+    And I go to the homepage
+    And I follow "Login"
+    And I fill in the following:
+      | Username | joaosilva |
+      | Password | 123456 |
+    When I press "Log in"
+    Then I should be on Joao Silva's homepage
+
+  Scenario: go to profile control panel after login if this is the profile default
+    Given feature "allow_change_of_redirection_after_login" is enabled on environment
+    And I am not logged in
+    And the environment is configured to stay on the same page after login
+    And the profile joaosilva is configured to redirect to profile control panel after login
+    And I go to the homepage
+    And I follow "Login"
+    And I fill in the following:
+      | Username | joaosilva |
+      | Password | 123456 |
+    When I press "Log in"
+    Then I should be on Joao Silva's control panel
 Feature: send emails to organization members
-  As a organization administrator
+  As a organization administrator or moderator
   I want to send email to all members
  
   Background:
     Given the following users
       | login | name |
       | joaosilva | Joao Silva |
+      | jose | Jose Silva |
+      | manoel | Manoel Silva |
     And the following communities
       | identifier | name |
       | sample-community | Sample Community |
     And "Joao Silva" is admin of "Sample Community"
+    And "Jose Silva" is moderator of "Sample Community"
+    And "Manoel Silva" is a member of "Sample Community"
  
   Scenario: Cant access if not logged in
     Given I am not logged in
-    When I go to /myprofile/sample-community/profile_members/send_mail
+    When I go to /profile/sample-community/send_mail
     Then I should be on login page
  
   Scenario: Cant access as normal user
@@ -21,7 +25,7 @@ Feature: send emails to organization members
       | login |
       | josesilva |
     And I am logged in as "josesilva"
-    When I go to /myprofile/sample-community/profile_members/send_mail
+    When I go to /profile/sample-community/send_mail
     Then I should see "Access denied"
  
   Scenario: Send e-mail to members
@@ -39,7 +43,7 @@ Feature: send emails to organization members
     And I follow "Send e-mail to members"
     And I fill in "body" with "We have some news"
     When I press "Send"
-    Then I should be on /myprofile/sample-community/profile_members/send_mail
+    Then I should be on /profile/sample-community/send_mail
  
   Scenario: Not send e-mail to members if body is blank
     Given I am logged in as "joaosilva"
@@ -47,7 +51,7 @@ Feature: send emails to organization members
     And I follow "Send e-mail to members"
     And I fill in "Subject" with "Hello, user!"
     When I press "Send"
-    Then I should be on /myprofile/sample-community/profile_members/send_mail
+    Then I should be on /profile/sample-community/send_mail
  
   Scenario: Cancel creation of mailing
     Given I am logged in as "joaosilva"
@@ -55,3 +59,34 @@ Feature: send emails to organization members
     And I follow "Send e-mail to members"
     When I follow "Cancel e-mail"
     Then I should be on Sample Community's members management
+
+  Scenario: Cant access if has no send_mail_to_members permission
+    Given I am logged in as "manoel"
+    When I go to /profile/sample-community/send_mail
+    Then I should see "Access denied"
+
+  Scenario: Show button "Send e-Mail to members" of community to an moderator
+    Given I am logged in as "jose"
+    When I go to Sample Community's members page
+    Then I should see "Send e-mail to members" link
+
+  Scenario: Not show button "Send e-Mail to members" if user has no right permission
+    Given I am logged in as "manoel"
+    When I go to Sample Community's members page
+    Then I should not see "Send e-mail to members" link
+
+  Scenario: Redirect back to profile members page after send mail
+    Given I am logged in as "jose"
+    When I go to Sample Community's members page
+    And I follow "Send e-mail to members"
+    And I fill in "Subject" with "Hello, member!"
+    And I fill in "body" with "We have some news"
+    When I press "Send"
+    Then I should be on Sample Community's members page
+
+  Scenario: Back to profile members page after cancel creation of mailing
+    Given I am logged in as "jose"
+    And I go to Sample Community's members page
+    And I follow "Send e-mail to members"
+    When I follow "Cancel e-mail"
+    Then I should be on Sample Community's members page
@@ -355,6 +355,12 @@ Given /^&quot;(.+)&quot; is admin of &quot;(.+)&quot;$/ do |person, organization|
   org.add_admin(user)
 end
  
+Given /^"(.+)" is moderator of "(.+)"$/ do |person, organization|
+  org = Profile.find_by_name(organization)
+  user = Profile.find_by_name(person)
+  org.add_moderator(user)
+end
+
 Then /^"(.+)" should be admin of "(.+)"$/ do |person, organization|
   org = Organization.find_by_name(organization)
   user = Person.find_by_name(person)
@@ -706,3 +712,39 @@ When /^I make a AJAX request to (.*)$/ do |page|
   header 'X-Requested-With', 'XMLHttpRequest'
   visit(path_to(page))
 end
+
+Given /^the environment is configured to (.*) after login$/ do |option|
+  redirection = case option
+    when 'stay on the same page'
+      'keep_on_same_page'
+    when 'redirect to site homepage'
+      'site_homepage'
+    when 'redirect to user profile page'
+      'user_profile_page'
+    when 'redirect to profile homepage'
+      'user_homepage'
+    when 'redirect to profile control panel'
+      'user_control_panel'
+  end
+  environment = Environment.default
+  environment.redirection_after_login = redirection
+  environment.save
+end
+
+Given /^the profile (.*) is configured to (.*) after login$/ do |profile, option|
+  redirection = case option
+    when 'stay on the same page'
+      'keep_on_same_page'
+    when 'redirect to site homepage'
+      'site_homepage'
+    when 'redirect to user profile page'
+      'user_profile_page'
+    when 'redirect to profile homepage'
+      'user_homepage'
+    when 'redirect to profile control panel'
+      'user_control_panel'
+  end
+  profile = Profile.find_by_identifier(profile)
+  profile.redirection_after_login = redirection
+  profile.save
+end
@@ -108,6 +108,9 @@ module NavigationHelpers
     when /the user data path/
       '/account/user_data'
  
+    when /^(.+)'s members page/
+      '/profile/%s/members' % Profile.find_by_name($1).identifier
+
     # Add more mappings here.
     # Here is a more fancy example:
     #
@@ -18,7 +18,7 @@ module ActsAsHavingBoxes
       @blocks = nil
     end
     if @blocks.nil?
-      @blocks = boxes.inject([]) do |acc,obj|
+      @blocks = boxes.includes(:blocks).inject([]) do |acc,obj|
         acc.concat(obj.blocks)
       end
       @blocks.send(:extend, BlockArray)
@@ -320,6 +320,37 @@ class Noosfero::Plugin
     nil
   end
  
+  # -> Add an alternative authentication method.
+  # Your plugin have to make the access control and return the logged user.
+  # returns = User
+  def alternative_authentication
+    nil
+  end
+
+  # -> Adds adicional link to make the user authentication
+  # returns = lambda block that creates html code
+  def alternative_authentication_link
+    nil
+  end
+
+  # -> Allow or not user registration
+  # returns = boolean
+  def allow_user_registration
+    true
+  end
+
+  # -> Allow or not password recovery by users
+  # returns = boolean
+  def allow_password_recovery
+    true
+  end
+
+  # -> Adds fields to the login form
+  # returns = lambda block that creates html code
+  def login_extra_contents
+    nil
+  end
+
   def method_missing(method, *args, &block)
     # This is a generic hotspot for all controllers on Noosfero.
     # If any plugin wants to define filters to run on any controller, the name of
@@ -0,0 +1,147 @@
+class CustomFormsPluginMyprofileController < MyProfileController
+
+  protect 'post_content', :profile
+  def index
+    @forms = CustomFormsPlugin::Form.from(profile)
+  end
+
+  def create
+    @form = CustomFormsPlugin::Form.new(:profile => profile)
+    @fields = []
+    @empty_field = CustomFormsPlugin::Field.new
+    if request.post?
+      begin
+        @form.update_attributes!(params[:form])
+        params[:fields] = format_kind(params[:fields])
+        params[:fields] = format_choices(params[:fields])
+        params[:fields] = set_form_id(params[:fields], @form.id)
+        create_fields(new_fields(params))
+        session['notice'] = _('Form created')
+        redirect_to :action => 'index'
+      rescue Exception => exception
+        logger.error(exception.to_s)
+        session['notice'] = _('Form could not be created')
+      end
+    end
+  end
+
+  def edit
+    @form = CustomFormsPlugin::Form.find(params[:id])
+    @fields = @form.fields
+    @empty_field = CustomFormsPlugin::TextField.new
+    if request.post?
+      begin
+        @form.update_attributes!(params[:form])
+        params[:fields] = format_kind(params[:fields])
+        params[:fields] = format_choices(params[:fields])
+        remove_fields(params, @form)
+        create_fields(new_fields(params))
+        update_fields(edited_fields(params))
+        session['notice'] = _('Form updated')
+        redirect_to :action => 'index'
+      rescue Exception => exception
+        logger.error(exception.to_s)
+        session['notice'] = _('Form could not be updated')
+      end
+    end
+  end
+
+  def remove
+    @form = CustomFormsPlugin::Form.find(params[:id])
+    begin
+      @form.destroy
+      session[:notice] = _('Form removed')
+    rescue
+      session[:notice] = _('Form could not be removed')
+    end
+    redirect_to :action => 'index'
+  end
+
+  def submissions
+    @form = CustomFormsPlugin::Form.find(params[:id])
+    @submissions = @form.submissions
+  end
+
+  def show_submission
+    @submission = CustomFormsPlugin::Submission.find(params[:id])
+    @form = @submission.form
+  end
+
+  private
+
+  def new_fields(params)
+    result = params[:fields].map {|id, hash| hash.has_key?(:real_id) ? nil : hash}.compact
+    result.delete_if {|field| field[:name].blank?}
+    result
+  end
+
+  def edited_fields(params)
+    params[:fields].map {|id, hash| hash.has_key?(:real_id) ? hash : nil}.compact
+  end
+
+  def create_fields(fields)
+    fields.each do |field|
+      case field[:type]
+      when 'text_field'
+        CustomFormsPlugin::TextField.create!(field)
+      when 'select_field'
+        CustomFormsPlugin::SelectField.create!(field)
+      else
+        CustomFormsPlugin::Field.create!(field)
+      end
+    end
+  end
+
+  def update_fields(fields)
+    fields.each do |field_attrs|
+      field = CustomFormsPlugin::Field.find(field_attrs.delete(:real_id))
+      field.attributes = field_attrs
+      field.save! if field.changed?
+    end
+  end
+
+  def format_kind(fields)
+    fields.each do |id, field|
+      next if field[:kind].blank?
+      kind = field.delete(:kind)
+      case kind
+      when 'radio'
+        field[:list] = false
+        field[:multiple] = false
+      when 'check_box'
+        field[:list] = false
+        field[:multiple] = true
+      when 'select'
+        field[:list] = true
+        field[:multiple] = false
+      when 'multiple_select'
+        field[:list] = true
+        field[:multiple] = true
+      end
+    end
+    fields
+  end
+
+  def format_choices(fields)
+    fields.each do |id, field|
+      next if !field.has_key?(:choices)
+      field[:choices] = field[:choices].map {|key, value| value}.inject({}) do |result, choice| 
+        hash = (choice[:name].blank? || choice[:value].blank?) ? {} : {choice[:name] => choice[:value]}
+        result.merge!(hash)
+      end
+    end
+    fields
+  end
+
+  def remove_fields(params, form)
+    present_fields = params[:fields].map{|id, value| value}.collect {|field| field[:real_id]}.compact
+    form.fields.each {|field| field.destroy if !present_fields.include?(field.id.to_s) }
+  end
+
+  def set_form_id(fields, form_id)
+    fields.each do |id, field|
+      field[:form_id] = form_id
+    end
+    fields
+  end
+end
@@ -0,0 +1,45 @@
+class CustomFormsPluginProfileController < ProfileController
+
+  before_filter :has_access, :show
+
+  def show
+    @form = CustomFormsPlugin::Form.find(params[:id])
+    if user
+      @submission ||= CustomFormsPlugin::Submission.find_by_form_id_and_profile_id(@form.id,user.id)
+      @submission ||= CustomFormsPlugin::Submission.new(:form_id => @form.id, :profile_id => user.id)
+    else
+      @submission ||= CustomFormsPlugin::Submission.new(:form_id => @form.id)
+    end
+    if request.post?
+      begin
+        extend(CustomFormsPlugin::Helper)
+        answers = build_answers(params[:submission], @form)
+        failed_answers = answers.select {|answer| !answer.valid? }
+        if failed_answers.empty?
+          if !user
+            @submission.author_name = params[:author_name]
+            @submission.author_email = params[:author_email]
+          end
+          @submission.save!
+          answers.map {|answer| answer.submission = @submission; answer.save!}
+        else
+          @submission.valid?
+          failed_answers.each do |answer|
+            @submission.errors.add(answer.field.name.to_sym, answer.errors[answer.field.slug.to_sym])
+          end
+        end
+        session[:notice] = _('Submission saved')
+        redirect_to :action => 'show'
+      rescue
+        session[:notice] = _('Submission could not be saved')
+      end
+    end
+  end
+
+  private
+
+  def has_access
+    form = CustomFormsPlugin::Form.find(params[:id])
+    render_access_denied if !form.accessible_to(user)
+  end
+end
@@ -0,0 +1,20 @@
+class CreateCustomFormsPluginForms < ActiveRecord::Migration
+  def self.up
+    create_table :custom_forms_plugin_forms do |t|
+      t.string :name
+      t.string :slug
+      t.text :description
+      t.references :profile
+      t.datetime :begining
+      t.datetime :ending
+      t.boolean :report_submissions, :default => false
+      t.boolean :on_membership, :default => false
+      t.string :access
+      t.timestamps
+    end 
+  end
+
+  def self.down
+    drop_table :custom_forms_plugin_forms
+  end
+end
@@ -0,0 +1,21 @@
+class CreateCustomFormsPluginFields < ActiveRecord::Migration
+  def self.up
+    create_table :custom_forms_plugin_fields do |t|
+      t.string :name
+      t.string :slug
+      t.string :type
+      t.string :default_value
+      t.string :choices
+      t.float  :minimum
+      t.float  :maximum
+      t.references :form
+      t.boolean :mandatory, :default => false
+      t.boolean :multiple
+      t.boolean :list
+    end
+  end
+
+  def self.down
+    drop_table :custom_forms_plugin_fields
+  end
+end
@@ -0,0 +1,13 @@
+class CreateCustomFormsPluginAnswers < ActiveRecord::Migration
+  def self.up
+    create_table :custom_forms_plugin_answers do |t|
+      t.text :value
+      t.references :field
+      t.references :submission
+    end
+  end
+
+  def self.down
+    drop_table :custom_forms_plugin_answers
+  end
+end
@@ -0,0 +1,15 @@
+class CreateCustomFormsPluginSubmissions < ActiveRecord::Migration
+  def self.up
+    create_table :custom_forms_plugin_submissions do |t|
+      t.string :author_name
+      t.string :author_email
+      t.references :profile
+      t.references :form
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :custom_forms_plugin_submissions
+  end
+end
@@ -0,0 +1,21 @@
+require 'ext/role_assignment_trigger'
+
+class CustomFormsPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Custom Forms"
+  end
+
+  def self.plugin_description
+    _("Enables the creation of forms.")
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def control_panel_buttons
+    {:title => _('Manage Forms'), :icon => 'custom-forms', :url => {:controller => 'custom_forms_plugin_myprofile'}}
+  end
+
+end
@@ -0,0 +1,14 @@
+class CustomFormsPlugin::Answer < Noosfero::Plugin::ActiveRecord
+  belongs_to :field, :class_name => 'CustomFormsPlugin::Field'
+  belongs_to :submission, :class_name => 'CustomFormsPlugin::Submission'
+
+  validates_presence_of :field
+  validate :value_mandatory, :if => 'field.present?'
+
+  def value_mandatory
+    if field.mandatory && value.blank?
+      errors.add(field.slug.to_sym, _("is mandatory.").fix_i18n)
+    end
+  end
+end
+
@@ -0,0 +1,16 @@
+class CustomFormsPlugin::Field < ActiveRecord::Base
+  set_table_name :custom_forms_plugin_fields
+
+  validates_presence_of :form, :name
+  validates_uniqueness_of :slug, :scope => :form_id
+
+  belongs_to :form, :class_name => 'CustomFormsPlugin::Form', :dependent => :destroy
+  has_many :answers, :class_name => 'CustomFormsPlugin::Answer'
+
+  serialize :choices, Hash
+
+  before_validation do |field|
+    field.slug = field.name.to_slug if field.name.present?
+  end
+end
+
...	...	@@ -8,6 +8,9 @@ class AdminPanelController < AdminController
8	8
9	9	def site_info
10	10	if request.post?
	11	+ if params[:environment][:languages]
	12	+ params[:environment][:languages] = params[:environment][:languages].map {\|lang, value\| lang if value=='true'}.compact
	13	+ end
11	14	if @environment.update_attributes(params[:environment])
12	15	session[:notice] = _('Environment settings updated')
13	16	redirect_to :action => 'index'
...	...
...	...	@@ -42,9 +42,9 @@ class ApplicationController < ActionController::Base
42	42
43	43	before_filter :set_locale
44	44	def set_locale
45		- FastGettext.available_locales = Noosfero.available_locales
46		- FastGettext.default_locale = Noosfero.default_locale
47		- FastGettext.locale = (params[:lang] \|\| session[:lang] \|\| Noosfero.default_locale \|\| request.env['HTTP_ACCEPT_LANGUAGE'] \|\| 'en')
	45	+ FastGettext.available_locales = environment.available_locales
	46	+ FastGettext.default_locale = environment.default_locale
	47	+ FastGettext.locale = (params[:lang] \|\| session[:lang] \|\| environment.default_locale \|\| request.env['HTTP_ACCEPT_LANGUAGE'] \|\| 'en')
48	48	I18n.locale = FastGettext.locale
49	49	if params[:lang]
50	50	session[:lang] = params[:lang]
...	...
...	...	@@ -68,7 +68,8 @@ class BoxOrganizerController < ApplicationController
68	68	raise ArgumentError.new("Type %s is not allowed. Go away." % type)
69	69	end
70	70	else
71		- @block_types = available_blocks
	71	+ @center_block_types = Box.acceptable_center_blocks & available_blocks
	72	+ @side_block_types = Box.acceptable_side_blocks & available_blocks
72	73	@boxes = boxes_holder.boxes
73	74	render :action => 'add_block', :layout => false
74	75	end
...	...
...	...	@@ -116,11 +116,11 @@ class CmsController < MyProfileController
116	116	@parent_id = parent.id
117	117	end
118	118
119		- translations if @article.translatable?
120		-
121	119	@article.profile = profile
122	120	@article.last_changed_by = user
123	121
	122	+ translations if @article.translatable?
	123	+
124	124	continue = params[:continue]
125	125	if request.post?
126	126	if @article.save
...	...	@@ -149,7 +149,6 @@ class CmsController < MyProfileController
149	149	@uploaded_files = []
150	150	@article = @parent = check_parent(params[:parent_id])
151	151	@target = @parent ? ('/%s/%s' % [profile.identifier, @parent.full_name]) : '/%s' % profile.identifier
152		- @folders = Folder.find(:all, :conditions => { :profile_id => profile })
153	152	if @article
154	153	record_coming
155	154	end
...	...	@@ -345,7 +344,7 @@ class CmsController < MyProfileController
345	344	end
346	345
347	346	def translations
348		- @locales = Noosfero.locales.invert.reject { \|name, lang\| !@article.possible_translations.include?(lang) }
	347	+ @locales = environment.locales.invert.reject { \|name, lang\| !@article.possible_translations.include?(lang) }
349	348	@selected_locale = @article.language \|\| FastGettext.locale
350	349	end
351	350
...	...
...	...	@@ -5,7 +5,7 @@ class ProfileDesignController < BoxOrganizerController
5	5	protect 'edit_profile_design', :profile
6	6
7	7	def available_blocks
8		- blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock ]
	8	+ blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock, HighlightsBlock ]
9	9
10	10	# blocks exclusive for organizations
11	11	if profile.has_members?
...	...
...	...	@@ -14,6 +14,7 @@ class ProfileEditorController < MyProfileController
14	14	@profile_data = profile
15	15	@possible_domains = profile.possible_domains
16	16	if request.post?
	17	+ params[:profile_data][:fields_privacy] \|\|= {} if profile.person? && params[:profile_data].is_a?(Hash)
17	18	begin
18	19	Profile.transaction do
19	20	Image.transaction do
...	...
...	...	@@ -156,18 +156,4 @@ class ProfileMembersController < MyProfileController
156	156	end
157	157	end
158	158
159		- def send_mail
160		- @mailing = profile.mailings.build(params[:mailing])
161		- if request.post?
162		- @mailing.locale = locale
163		- @mailing.person = user
164		- if @mailing.save
165		- session[:notice] = _('The e-mails are being sent')
166		- redirect_to :action => 'index'
167		- else
168		- session[:notice] = _('Could not create the e-mail')
169		- end
170		- end
171		- end
172		-
173	159	end
...	...
...	...	@@ -25,11 +25,13 @@ class AccountController < ApplicationController
25	25
26	26	# action to perform login to the application
27	27	def login
28		- @user = User.new
29		- @person = @user.build_person
30	28	store_location(request.referer) unless session[:return_to]
31	29	return unless request.post?
32		- self.current_user = User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
	30	+
	31	+ self.current_user = plugins_alternative_authentication
	32	+
	33	+ self.current_user \|\|= User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
	34	+
33	35	if logged_in?
34	36	if params[:remember_me] == "1"
35	37	self.current_user.remember_me
...	...	@@ -41,7 +43,6 @@ class AccountController < ApplicationController
41	43	end
42	44	else
43	45	session[:notice] = _('Incorrect username or password') if redirect?
44		- redirect_to :back if redirect?
45	46	end
46	47	end
47	48
...	...	@@ -56,6 +57,11 @@ class AccountController < ApplicationController
56	57
57	58	# action to register an user to the application
58	59	def signup
	60	+ if @plugins.dispatch(:allow_user_registration).include?(false)
	61	+ redirect_back_or_default(:controller => 'home')
	62	+ session[:notice] = _("This environment doesn't allow user registration.")
	63	+ end
	64	+
59	65	@invitation_code = params[:invitation_code]
60	66	begin
61	67	if params[:user]
...	...	@@ -125,6 +131,10 @@ class AccountController < ApplicationController
125	131	#
126	132	# Posts back.
127	133	def forgot_password
	134	+ if @plugins.dispatch(:allow_password_recovery).include?(false)
	135	+ redirect_back_or_default(:controller => 'home')
	136	+ session[:notice] = _("This environment doesn't allow password recovery.")
	137	+ end
128	138	@change_password = ChangePassword.new(params[:change_password])
129	139
130	140	if request.post?
...	...	@@ -303,10 +313,27 @@ class AccountController < ApplicationController
303	313	end
304	314
305	315	def go_to_initial_page
306		- if environment == current_user.environment
307		- redirect_back_or_default(user.admin_url)
	316	+ if environment.enabled?('allow_change_of_redirection_after_login')
	317	+ case user.preferred_login_redirection
	318	+ when 'keep_on_same_page'
	319	+ redirect_back_or_default(user.admin_url)
	320	+ when 'site_homepage'
	321	+ redirect_to :controller => :home
	322	+ when 'user_profile_page'
	323	+ redirect_to user.public_profile_url
	324	+ when 'user_homepage'
	325	+ redirect_to user.url
	326	+ when 'user_control_panel'
	327	+ redirect_to user.admin_url
	328	+ else
	329	+ redirect_back_or_default(user.admin_url)
	330	+ end
308	331	else
309		- redirect_back_or_default(:controller => 'home')
	332	+ if environment == current_user.environment
	333	+ redirect_back_or_default(user.admin_url)
	334	+ else
	335	+ redirect_back_or_default(:controller => 'home')
	336	+ end
310	337	end
311	338	end
312	339
...	...	@@ -316,4 +343,13 @@ class AccountController < ApplicationController
316	343	end
317	344	end
318	345
	346	+ def plugins_alternative_authentication
	347	+ user = nil
	348	+ @plugins.each do \|plugin\|
	349	+ user = plugin.alternative_authentication
	350	+ break unless user.nil?
	351	+ end
	352	+ user
	353	+ end
	354	+
319	355	end
...	...
...	...	@@ -2,4 +2,8 @@ class NotFoundController < ApplicationController
2	2	def index
3	3	render_not_found
4	4	end
	5	+
	6	+ def nothing
	7	+ render :nothing => true, :status => 404
	8	+ end
5	9	end
...	...
...	...	@@ -2,11 +2,13 @@ class ProfileController < PublicController
2	2
3	3	needs_profile
4	4	before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
5		- before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse]
6		- before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity]
	5	+ before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse, :send_mail]
	6	+ before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail]
7	7
8	8	helper TagsHelper
9	9
	10	+ protect 'send_mail_to_members', :profile, :only => [:send_mail]
	11	+
10	12	def index
11	13	@network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) : []
12	14	if logged_in? && current_person.follows?(@profile)
...	...	@@ -49,36 +51,36 @@ class ProfileController < PublicController
49	51
50	52	def communities
51	53	if is_cache_expired?(profile.communities_cache_key(params))
52		- @communities = profile.communities.paginate(:per_page => per_page, :page => params[:npage])
	54	+ @communities = profile.communities.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage])
53	55	end
54	56	end
55	57
56	58	def enterprises
57		- @enterprises = profile.enterprises
	59	+ @enterprises = profile.enterprises.includes(relations_to_include)
58	60	end
59	61
60	62	def friends
61	63	if is_cache_expired?(profile.friends_cache_key(params))
62		- @friends = profile.friends.paginate(:per_page => per_page, :page => params[:npage])
	64	+ @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage])
63	65	end
64	66	end
65	67
66	68	def members
67	69	if is_cache_expired?(profile.members_cache_key(params))
68		- @members = profile.members.paginate(:per_page => members_per_page, :page => params[:npage])
	70	+ @members = profile.members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
69	71	end
70	72	end
71	73
72	74	def fans
73		- @fans = profile.fans
	75	+ @fans = profile.fans.includes(relations_to_include)
74	76	end
75	77
76	78	def favorite_enterprises
77		- @favorite_enterprises = profile.favorite_enterprises
	79	+ @favorite_enterprises = profile.favorite_enterprises.includes(relations_to_include)
78	80	end
79	81
80	82	def sitemap
81		- @articles = profile.top_level_articles
	83	+ @articles = profile.top_level_articles.includes([:profile, :parent])
82	84	end
83	85
84	86	def join
...	...	@@ -327,6 +329,20 @@ class ProfileController < PublicController
327	329	end
328	330	end
329	331
	332	+ def send_mail
	333	+ @mailing = profile.mailings.build(params[:mailing])
	334	+ if request.post?
	335	+ @mailing.locale = locale
	336	+ @mailing.person = user
	337	+ if @mailing.save
	338	+ session[:notice] = _('The e-mails are being sent')
	339	+ redirect_to_previous_location
	340	+ else
	341	+ session[:notice] = _('Could not create the e-mail')
	342	+ end
	343	+ end
	344	+ end
	345	+
330	346	protected
331	347
332	348	def check_access_to_profile
...	...	@@ -378,4 +394,8 @@ class ProfileController < PublicController
378	394	@can_edit_profile \|\|= user && user.has_permission?('edit_profile', profile)
379	395	end
380	396	helper_method :can_edit_profile
	397	+
	398	+ def relations_to_include
	399	+ [:image, :domains, :preferred_domain, :environment]
	400	+ end
381	401	end
...	...