Merge branch 'rails235' into AI3031-community_track_embed_block

Conflicts: test/unit/block_test.rb

Merge branch 'rails235' into AI3031-community_track_embed_block
Conflicts: test/unit/block_test.rb
Joenio Costa
2 parents 1249505f 4bceb5e5
Showing 230 changed files with 4737 additions and 681 deletions Show diff stats
AUTHORS
app/controllers/admin/environment_design_controller.rb
app/controllers/admin/users_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/public/account_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/events_controller.rb
app/controllers/public/profile_controller.rb
app/controllers/public/search_controller.rb
app/controllers/themes_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/boxes_helper.rb
app/helpers/cache_counter_helper.rb
app/helpers/categories_helper.rb
app/helpers/comment_helper.rb
app/helpers/content_viewer_helper.rb
@@ -7,6 +7,7 @@ Developers
 ==========
 Alan Freihof Tygel <alantygel@gmail.com>
+alcampelo <alcampelo@alcampelo.(none)>
 Alessandro Palmeira <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
@@ -38,6 +39,7 @@ Alessandro Palmeira + João M. M. Silva &lt;alessandro.palmeira@gmail.com&gt;
 Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
+Ana Losnak <analosnak@gmail.com>
 Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
 Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
 Antonio Terceiro <terceiro@colivre.coop.br>
@@ -85,6 +87,7 @@ Daniel Alves + Rafael Manzo &lt;rr.manzo@gmail.com&gt;
 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
 Daniel Bucher <daniel.bucher88@gmail.com>
 Daniel Cunha <daniel@colivre.coop.br>
+David Carlos <ddavidcarlos1392@gmail.com>
 diegoamc <diegoamc90@gmail.com>
 Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
 Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
@@ -114,12 +117,16 @@ Diego Martinez &lt;diegoamc90@gmail.com&gt;
 Diego Martinez <diego@diego-K55A.(none)>
 Diego + Renan <renanteruoc@gmail.com>
 Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
+Fabio Teixeira <fabio1079@gmail.com>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
 Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
 Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
 Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
 Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
+Gabriela Navarro <navarro1703@gmail.com>
 Grazieno Pellegrino <grazieno@gmail.com>
+Gust <darksshades@hotmail.com>
+Hugo Melo <hugo@riseup.net>
 Isaac Canan <isaac@intelletto.com.br>
 Italo Valcy <italo@dcc.ufba.br>
 Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
@@ -202,6 +209,7 @@ Renan Teruo + Diego Araujo &lt;renanteruoc@gmail.com&gt;
 Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
 Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
 Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
+Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
 Rodrigo Souto <diguliu@gmail.com>
 Rodrigo Souto <rodrigo@colivre.coop.br>
 Ronny Kursawe <kursawe.ronny@googlemail.com>
@@ -3,6 +3,8 @@ class EnvironmentDesignController &lt; BoxOrganizerController
   protect 'edit_environment_design', :environment
   def available_blocks
+    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+    #      the Noosfero core soon, see ActionItem3045
     @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
     @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
   end
@@ -45,6 +45,20 @@ class UsersController &lt; AdminController
     redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
   end
+
+  def destroy_user
+    if request.post?
+      person = environment.people.find_by_id(params[:id])
+      if person && person.destroy
+        session[:notice] = _('The profile was deleted.')
+      else
+        session[:notice] = _('Could not remove profile')
+      end
+    end
+    redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
+  end
+
+
   def download
     respond_to do |format|
       format.html
@@ -80,6 +80,22 @@ class BoxOrganizerController &lt; ApplicationController
     render :action => 'edit', :layout => false
   end
+  def search_autocomplete
+    if request.xhr? and params[:query]
+      search = params[:query]
+      path_list = if boxes_holder.is_a?(Environment) && boxes_holder.enabled?('use_portal_community') && boxes_holder.portal_community
+        boxes_holder.portal_community.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { |content| "/{portal}/"+content.path }
+      elsif boxes_holder.is_a?(Profile)
+        boxes_holder.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { |content| "/{profile}/"+content.path }
+      else
+        []
+      end
+      render :json => path_list.to_json
+    else
+      redirect_to "/"
+    end
+  end
+
   def save
     @block = boxes_holder.blocks.find(params[:id])
     @block.update_attributes(params[:block])
@@ -99,6 +115,12 @@ class BoxOrganizerController &lt; ApplicationController
     end
   end
+  def clone_block
+    block = Block.find(params[:id])
+    block.duplicate
+    redirect_to :action => 'index'
+  end
+
   protected :boxes_editor?
 end
@@ -24,10 +24,16 @@ class CmsController &lt; MyProfileController
     (user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile)))
   end
-  protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish, :upload_files] do |c, user, profile|
+  protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish, :upload_files, :new] do |c, user, profile|
     user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile))
   end
+  protect_if :only => :new do |c, user, profile|
+    article = profile.articles.find_by_id(c.params[:parent_id])
+    (!article.nil? && (article.allow_create?(user) || article.parent.allow_create?(user))) ||
+    (user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile)))
+  end
+
   protect_if :only => [:destroy, :publish] do |c, user, profile|
     profile.articles.find(c.params[:id]).allow_post_content?(user)
   end
@@ -221,11 +227,10 @@ class CmsController &lt; MyProfileController
   def update_categories
     @object = params[:id] ? @profile.articles.find(params[:id]) : Article.new
+    @categories = @toplevel_categories = environment.top_level_categories
     if params[:category_id]
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
-    else
-      @categories = environment.top_level_categories.select{|i| !i.children.empty?}
     end
     render :partial => 'shared/select_categories', :locals => {:object_name => 'article', :multiple => true}, :layout => false
   end
@@ -55,10 +55,4 @@ class ProfileDesignController &lt; BoxOrganizerController
     blocks
   end
-  def clone
-    block = Block.find(params[:id])
-    block.duplicate
-    redirect_to :action => 'index'
-  end
-
 end
@@ -55,11 +55,10 @@ class ProfileEditorController &lt; MyProfileController
   def update_categories
     @object = profile
+    @categories = @toplevel_categories = environment.top_level_categories
     if params[:category_id]
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
-    else
-      @categories = environment.top_level_categories.select{|i| !i.children.empty?}
     end
     render :partial => 'shared/select_categories', :locals => {:object_name => 'profile_data', :multiple => true}, :layout => false
   end
@@ -69,6 +69,8 @@ class AccountController &lt; ApplicationController
       session[:notice] = _("This environment doesn't allow user registration.")
     end
+    store_location(request.referer) unless params[:return_to] or session[:return_to]
+
     @block_bot = !!session[:may_be_a_bot]
     @invitation_code = params[:invitation_code]
     begin
@@ -77,6 +79,7 @@ class AccountController &lt; ApplicationController
       @user.environment = environment
       @terms_of_use = environment.terms_of_use
       @user.person_data = params[:profile_data]
+      @user.return_to = session[:return_to]
       @person = Person.new(params[:profile_data])
       @person.environment = @user.environment
       if request.post?
@@ -98,7 +101,7 @@ class AccountController &lt; ApplicationController
           end
           if @user.activated?
             self.current_user = @user
-            redirect_to '/'
+            go_to_signup_initial_page
           else
             @register_pending = true
           end
@@ -368,32 +371,29 @@ class AccountController &lt; ApplicationController
   end
   def go_to_initial_page
+    if params[:redirection]
+      session[:return_to] = @user.return_to
+      @user.return_to = nil
+      @user.save
+    end
+
     if params[:return_to]
       redirect_to params[:return_to]
     elsif 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
+      check_redirection_options(user, user.preferred_login_redirection, user.admin_url)
     else
       if environment == current_user.environment
-        redirect_back_or_default(user.admin_url)
+        check_redirection_options(user, environment.redirection_after_login, user.admin_url)
       else
         redirect_back_or_default(:controller => 'home')
       end
     end
   end
+  def go_to_signup_initial_page
+    check_redirection_options(user, user.environment.redirection_after_signup, user.url)
+  end
+
   def redirect_if_logged_in
     if logged_in?
       go_to_initial_page
@@ -409,4 +409,22 @@ class AccountController &lt; ApplicationController
     user
   end
+  protected
+
+  def check_redirection_options(user, condition, default)
+    case condition
+      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(default)
+    end
+  end
 end
@@ -111,6 +111,15 @@ class ContentViewerController &lt; ApplicationController
     @comments = @plugins.filter(:unavailable_comments, @comments)
     @comments_count = @comments.count
     @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
+    @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
+
+    if request.xhr? and params[:comment_order]
+      if @comment_order == 'newest'
+        @comments = @comments.reverse
+      end
+
+      return render :partial => 'comment/comment', :collection => @comments
+    end
     if params[:slideshow]
       render :action => 'slideshow', :layout => 'slideshow'
@@ -7,11 +7,11 @@ class EventsController &lt; PublicController
     @date = build_date(params[:year], params[:month], params[:day])
     if !params[:year] && !params[:month] && !params[:day]
-      @events = profile.events.next_events_from_month(@date)
+      @events = profile.events.next_events_from_month(@date).paginate(:per_page => per_page, :page => params[:page])
     end
     if params[:year] || params[:month]
-      @events = profile.events.by_month(@date)
+      @events = profile.events.by_month(@date).paginate(:per_page => per_page, :page => params[:page])
     end
     events_in_range = profile.events.by_range((@date - 1.month).at_beginning_of_month .. (@date + 1.month).at_end_of_month)
@@ -29,4 +29,7 @@ class EventsController &lt; PublicController
   include EventsHelper
+  def per_page
+    20
+  end
 end
@@ -304,14 +304,6 @@ class ProfileController &lt; PublicController
     end
   end
-  def profile_info
-    begin
-      @block = profile.blocks.find(params[:block_id])
-    rescue
-      render :text => _('Profile information could not be loaded')
-    end
-  end
-
   def report_abuse
     @abuse_report = AbuseReport.new
     render :layout => false
@@ -99,14 +99,14 @@ class SearchController &lt; PublicController
     @events = []
     if params[:day] || !params[:year] && !params[:month]
       @events = @category ?
-        environment.events.by_day(@date).in_category(Category.find(@category_id)) :
-        environment.events.by_day(@date)
+        environment.events.by_day(@date).in_category(Category.find(@category_id)).paginate(:per_page => per_page, :page => params[:page]) :
+        environment.events.by_day(@date).paginate(:per_page => per_page, :page => params[:page])
     end
     if params[:year] || params[:month]
       @events = @category ?
-        environment.events.by_month(@date).in_category(Category.find(@category_id)) :
-        environment.events.by_month(@date)
+        environment.events.by_month(@date).in_category(Category.find(@category_id)).paginate(:per_page => per_page, :page => params[:page]) :
+        environment.events.by_month(@date).paginate(:per_page => per_page, :page => params[:page])
     end
     @scope = date_range && params[:action] == 'events' ? environment.events.by_range(date_range) : environment.events
@@ -139,7 +139,7 @@ class SearchController &lt; PublicController
   def events_by_day
     @date = build_date(params[:year], params[:month], params[:day])
-    @events = environment.events.by_day(@date)
+    @events = environment.events.by_day(@date).paginate(:per_page => per_page, :page => params[:page])
     render :partial => 'events/events'
   end
@@ -224,4 +224,8 @@ class SearchController &lt; PublicController
     @environment.send(klass.name.underscore.pluralize).visible.includes(relations)
   end
+  def per_page
+    20
+  end
+
 end
@@ -12,7 +12,7 @@ class ThemesController &lt; ApplicationController
   def index
     @environment = environment
-    @themes = environment.themes + Theme.approved_themes(target)
+    @themes = (environment.themes + Theme.approved_themes(target)).sort_by { |t| t.name }
     @current_theme = target.theme
@@ -608,49 +608,18 @@ module ApplicationHelper
   end
   attr_reader :environment
+
   def select_categories(object_name, title=nil, title_size=4)
     return nil if environment.enabled?(:disable_categories)
     if title.nil?
       title = _('Categories')
     end
-    object = instance_variable_get("@#{object_name}")
-
-    result = content_tag 'h'+title_size.to_s(), title
-    result << javascript_tag( 'function open_close_cat( link ) {
-      var div = link.parentNode.getElementsByTagName("div")[0];
-      var end = function(){
-        if ( div.style.display == "none" ) {
-          this.link.className="button icon-button icon-down"
-        } else {
-          this.link.className="button icon-button icon-up-red"
-        }
-      }
-      Effect.toggle( div, "slide", { link:link, div:div, afterFinish:end } )
-    }')
-    environment.top_level_categories.select{|i| !i.children.empty?}.each do |toplevel|
-      next unless object.accept_category?(toplevel)
-      # FIXME
-      ([toplevel] + toplevel.children_for_menu).each do |cat|
-        if cat.top_level?
-          result << '<div class="categorie_box">'.html_safe
-          result << icon_button( :down, _('open'), '#', :onclick => 'open_close_cat(this); return false' )
-          result << content_tag('h5', toplevel.name)
-          result << '<div style="display:none"><ul class="categories">'.html_safe
-        else
-          checkbox_id = "#{object_name}_#{cat.full_name.downcase.gsub(/\s+|\//, '_')}"
-          result << content_tag('li', labelled_check_box(
-                      cat.full_name_without_leading(1, " &rarr; "),
-                      "#{object_name}[category_ids][]", cat.id,
-                      object.category_ids.include?(cat.id), :id => checkbox_id,
-                      :onchange => 'this.parentNode.className=(this.checked?"cat_checked":"")' ),
-                    :class => ( object.category_ids.include?(cat.id) ? 'cat_checked' : '' ) ) + "\n"
-        end
-      end
-      result << '</ul></div></div>'.html_safe
-    end
+    @object = instance_variable_get("@#{object_name}")
+    @categories = environment.top_level_categories
-    content_tag('div', result)
+    @current_categories = environment.top_level_categories.select{|i| !i.children.empty?}
+    render :partial => 'shared/select_categories_top', :locals => {:object_name => object_name, :title => title, :title_size => title_size, :multiple => true, :categories_selected => @object.categories }, :layout => false
   end
   def theme_option(opt = nil)
@@ -920,12 +889,11 @@ module ApplicationHelper
   def page_title
     (@page ? @page.title + ' - ' : '') +
-    (profile ? profile.short_name + ' - ' : '') +
     (@topic ? @topic.title + ' - ' : '') +
     (@section ? @section.title + ' - ' : '') +
     (@toc ? _('Online Manual') + ' - ' : '') +
     (@controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
-    environment.name +
+    (profile ? profile.short_name : environment.name) +
     (@category ? " - #{@category.full_name}" : '')
   end
@@ -49,8 +49,14 @@ module ArticleHelper
         'div',
         check_box(:article, :display_versions) +
         content_tag('label', _('I want this article to display a link to older versions'), :for => 'article_display_versions')
-      ) : '')
+      ) : '') +
+      (article.forum? && article.profile.community? ?
+      content_tag(
+        'div',
+        check_box(:article, :allows_members_to_create_topics) +
+        content_tag('label', _('Allow members to create topics'), :for => 'article_allows_members_to_create_topics')
+        ) : '')
     )
   end
@@ -65,7 +65,7 @@ module BoxesHelper
   end
   def display_box_content(box, main_content)
-    context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params }
+    context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params, :user => user }
     box_decorator.select_blocks(box.blocks.includes(:box), context).map { |item| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
   end
@@ -212,7 +212,7 @@ module BoxesHelper
     if !block.main?
       buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
-      buttons << icon_button(:clone, _('Clone'), { :action => 'clone', :id => block.id }, { :method => 'post' })
+      buttons << icon_button(:clone, _('Clone'), { :action => 'clone_block', :id => block.id }, { :method => 'post' })
     end
     if block.respond_to?(:help)
@@ -0,0 +1,7 @@
+module CacheCounterHelper
+  def update_cache_counter(name, object, value)
+    if object.present?
+      object.class.update_counters(object.id, name => value)
+    end
+  end
+end
@@ -48,4 +48,12 @@ module CategoriesHelper
     labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))
   end
+  #FIXME make this test
+  def selected_category_link(cat)
+    content_tag('div', button_to_function_without_text(:remove, _('Remove'), nil) {|page| page["selected-category-#{cat.id}"].remove} +
+      link_to_function(cat.full_name(' &rarr; '), nil, :id => "remove-selected-category-#{cat.id}-button", :class => 'select-subcategory-link') {|page| page["selected-category-#{cat.id}"].remove},
+      :class => 'selected-category'
+    )
+  end
+
 end
@@ -2,7 +2,6 @@ module CommentHelper
   def article_title(article, args = {})
     title = article.title
-    title = article.display_title if article.kind_of?(UploadedFile) && article.image?
     title = content_tag('h1', h(title), :class => 'title')
     if article.belongs_to_blog?
       unless args[:no_link]
@@ -22,6 +21,12 @@ module CommentHelper
     title
   end
+  def comment_extra_contents(comment)
+    @plugins.dispatch(:comment_extra_contents, comment).collect do |extra_content|
+      extra_content.kind_of?(Proc) ? self.instance_eval(&extra_content) : extra_content
+    end.join('\n')
+  end
+
   def comment_actions(comment)
     url = url_for(:profile => profile.identifier, :controller => :comment, :action => :check_actions, :id => comment.id)
     links = links_for_comment_actions(comment)
@@ -14,8 +14,7 @@ module ContentViewerHelper
   end
   def article_title(article, args = {})
-    title = article.display_title if article.kind_of?(UploadedFile) && article.image?
-    title = article.title if title.blank?
+    title = article.title
     title = content_tag('h1', h(title), :class => 'title')
     if article.belongs_to_blog? || article.belongs_to_forum?
       unless args[:no_link]
@@ -52,15 +51,6 @@ module ContentViewerHelper
     end
   end
-  def addthis_facebook_url(article)
-    "http://www.facebook.com/sharer.php?s=100&p[title]=%{title}&p[summary]=%{summary}&p[url]=%{url}&p[images][0]=%{image}" % {
-      :title => CGI.escape(article.title),
-      :url => CGI.escape(url_for(article.url)),
-      :summary => CGI.escape(truncate(strip_tags(article.body.to_s), :length => 300)),
-      :image => CGI.escape(article.body_images_paths.first.to_s)
-    }
-  end
-
   def addthis_image_tag
     if File.exists?(File.join(Rails.root, 'public', theme_path, 'images', 'addthis.gif'))
       image_tag(File.join(theme_path, 'images', 'addthis.gif'), :border => 0, :alt => '')
@@ -90,5 +90,8 @@ module LayoutHelper
     end
   end
+  def meta_description_tag(article=nil)
+    article ? truncate(strip_tags(article.body.to_s), :length => 200) : environment.name
+  end
 end
@@ -20,14 +20,16 @@ module MacrosHelper
         jQuery('<div>'+#{macro_configuration_dialog(macro).to_json}+'</div>').dialog({
           title: #{macro_title(macro).to_json},
           modal: true,
-          buttons: [
-            {text: #{_('Ok').to_json}, click: function(){
+          buttons: {
+            #{_('Ok').to_json}: function(){
               tinyMCE.activeEditor.execCommand('mceInsertContent', false,
               (function(dialog){ #{macro_generator(macro)} })(this));
               jQuery(this).dialog('close');
-            }},
-            {text: #{_('Cancel').to_json}, click: function(){jQuery(this).dialog('close');}}
-          ]
+            },
+            #{_('Cancel').to_json}: function(){
+              jQuery(this).dialog('close');
+            }
+          }
         });
       }"
     end
@@ -57,7 +59,11 @@ module MacrosHelper
   def macro_generator(macro)
     if macro.configuration[:generator]
-      macro.configuration[:generator]
+      if macro.configuration[:generator].respond_to?(:call)
+        macro.configuration[:generator].call(macro)
+      else
+        macro.configuration[:generator]
+      end
     else
       macro_default_generator(macro)
     end
@@ -66,8 +72,7 @@ module MacrosHelper
   def macro_default_generator(macro)
     code = "var params = {};"
-    configuration = macro_configuration(macro)
-    configuration[:params].map do |field|
+    macro.configuration[:params].map do |field|
       code += "params.#{field[:name]} = jQuery('*[name=#{field[:name]}]', dialog).val();"
     end
     code + "
@@ -0,0 +1,15 @@
+module PersonNotifierHelper
+
+  include ApplicationHelper
+
+  private
+
+  def path_to_image(source)
+    top_url + source
+  end
+
+  def top_url
+    top_url = @profile.environment ? @profile.environment.top_url : ''
+  end
+
+end
@@ -27,7 +27,7 @@ module TokenHelper
         hintText: #{options[:hint_text].to_json},
         noResultsText: #{options[:no_results_text].to_json},
         searchingText: #{options[:searching_text].to_json},
-        searchDelay: #{options[:serach_delay].to_json},
+        searchDelay: #{options[:search_delay].to_json},
         preventDuplicates: #{options[:prevent_duplicates].to_json},
         backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
         queryParam: #{name.to_json},
@@ -30,11 +30,13 @@ class Block &lt; ActiveRecord::Base
   #
   # * <tt>:article</tt>: the article being viewed currently
   # * <tt>:language</tt>: in which language the block will be displayed
+  # * <tt>:user</tt>: the logged user
   def visible?(context = nil)
     return false if display == 'never'
     if context
       return false if language != 'all' && language != context[:locale]
+      return false unless display_to_user?(context[:user])
       begin
         return self.send("display_#{display}", context)
@@ -46,6 +48,10 @@ class Block &lt; ActiveRecord::Base
     true
   end
+  def display_to_user?(user)
+    display_user == 'all' || (user.nil? && display_user == 'not_logged') || (user && display_user == 'logged')
+  end
+
   def display_always(context)
     true
   end
@@ -76,6 +82,14 @@ class Block &lt; ActiveRecord::Base
   #   the homepage of its owner.
   settings_items :display, :type => :string, :default => 'always'
+
+  # The condition for displaying a block to users. It can assume the following values:
+  #
+  # * <tt>'all'</tt>: the block is always displayed
+  # * <tt>'logged'</tt>: the block is displayed to logged users only
+  # * <tt>'not_logged'</tt>: the block is displayed only to not logged users
+  settings_items :display_user, :type => :string, :default => 'all'
+
   # The block can be configured to be displayed in all languages or in just one language. It can assume any locale of the environment:
   #
   # * <tt>'all'</tt>: the block is always displayed
@@ -149,7 +163,7 @@ class Block &lt; ActiveRecord::Base
   end
   alias :active_record_cache_key :cache_key
-  def cache_key(language='en')
+  def cache_key(language='en', user=nil)
     active_record_cache_key+'-'+language
   end
@@ -179,12 +193,20 @@ class Block &lt; ActiveRecord::Base
     'never'            => __('Don\'t display'),
   }
-  def display_options
+  def display_options_available
     DISPLAY_OPTIONS.keys
   end
-  def display_option_label(option)
-    DISPLAY_OPTIONS[option]
+  def display_options
+    DISPLAY_OPTIONS.slice(*display_options_available)
+  end
+
+  def display_user_options
+    @display_user_options ||= {
+      'all'            => __('All users'),
+      'logged'         => __('Logged'),
+      'not_logged'     => __('Not logged'),
+    }
   end
   def duplicate
@@ -26,6 +26,8 @@ class Box &lt; ActiveRecord::Base
       CategoriesBlock,
       CommunitiesBlock,
       EnterprisesBlock,
+      # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+      #      the Noosfero core soon, see ActionItem3045
       EnvironmentStatisticsBlock,
       FansBlock,
       FavoriteEnterprisesBlock,
@@ -52,6 +54,8 @@ class Box &lt; ActiveRecord::Base
       CommunitiesBlock,
       DisabledEnterpriseMessageBlock,
       EnterprisesBlock,
+      # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+      #      the Noosfero core soon, see ActionItem3045
       EnvironmentStatisticsBlock,
       FansBlock,
       FavoriteEnterprisesBlock,
@@ -172,7 +172,7 @@ class Comment &lt; ActiveRecord::Base
     def mail(comment)
       profile = comment.article.profile
       recipients comment.notification_emails
-      from "#{profile.environment.name} <#{profile.environment.contact_email}>"
+      from "#{profile.environment.name} <#{profile.environment.noreply_email}>"
       subject _("[%s] you got a new comment!") % [profile.environment.name]
       body :recipient => profile.nickname || profile.name,
         :sender => comment.author_name,
@@ -187,7 +187,7 @@ class Comment &lt; ActiveRecord::Base
     def mail_to_followers(comment, emails)
       profile = comment.article.profile
       bcc emails
-      from "#{profile.environment.name} <#{profile.environment.contact_email}>"
+      from "#{profile.environment.name} <#{profile.environment.noreply_email}>"
       subject _("[%s] %s commented on a content of %s") % [profile.environment.name, comment.author_name, profile.short_name]
       body :recipient => profile.nickname || profile.name,
         :sender => comment.author_name,
@@ -26,7 +26,7 @@ class Contact &lt; ActiveRecord::Base #WithoutTable
       content_type 'text/html'
       emails = contact.dest.notification_emails
       recipients emails
-      from "#{contact.name} <#{contact.dest.environment.contact_email}>"
+      from "#{contact.name} <#{contact.dest.environment.noreply_email}>"
       reply_to contact.email
       if contact.sender
         headers 'X-Noosfero-Sender' => contact.sender.identifier
@@ -145,6 +145,18 @@ class Environment &lt; ActiveRecord::Base
   end
   validates_inclusion_of :redirection_after_login, :in => Environment.login_redirection_options.keys, :allow_nil => true
+  def self.signup_redirection_options
+    {
+      'keep_on_same_page' => _('Stays on the same page the user was before signup.'),
+      '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_signup, :in => Environment.signup_redirection_options.keys, :allow_nil => true
+
+
   # #################################################
   # Relationships and applied behaviour
   # #################################################
@@ -161,6 +173,8 @@ class Environment &lt; ActiveRecord::Base
     # "left" area
     env.boxes[1].blocks << LoginBlock.new
+    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+    #      the Noosfero core soon, see ActionItem3045
     env.boxes[1].blocks << EnvironmentStatisticsBlock.new
     env.boxes[1].blocks << RecentDocumentsBlock.new
@@ -592,7 +606,7 @@ class Environment &lt; ActiveRecord::Base
   # only one environment can be the default one
   validates_uniqueness_of :is_default, :if => (lambda do |environment| environment.is_default? end), :message => N_('Only one Virtual Community can be the default one')
-  validates_format_of :contact_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |record| ! record.contact_email.blank? })
+  validates_format_of :contact_email, :noreply_email, :with => Noosfero::Constants::EMAIL_FORMAT, :allow_blank => true
   xss_terminate :only => [ :message_for_disabled_enterprise ], :with => 'white_list', :on => 'validation'
@@ -779,7 +793,7 @@ class Environment &lt; ActiveRecord::Base
   end
   def notification_emails
-    [contact_email.blank? ? nil : contact_email].compact + admins.map(&:email)
+    [noreply_email.blank? ? nil : noreply_email].compact + admins.map(&:email)
   end
   after_create :create_templates
+# TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+#      the Noosfero core soon, see ActionItem3045
+
 class EnvironmentStatisticsBlock < Block
   def self.description
-    _('Environment stastistics')
+    _('Environment stastistics (DEPRECATED)')
   end
   def default_title
@@ -38,15 +38,12 @@ class Event &lt; Article
   named_scope :next_events_from_month, lambda { |date|
     date_temp = date.strftime("%Y-%m-%d")
     { :conditions => ["start_date >= ?","#{date_temp}"],
-      :limit => 10,
       :order => 'start_date ASC'
     }
   }
   named_scope :by_month, lambda { |date|
-    date_temp = date.strftime("%Y-%m")
     { :conditions => ["EXTRACT(YEAR FROM start_date) = ? AND EXTRACT(MONTH FROM start_date) = ?",date.year,date.month],
-      :limit => 10,
       :order => 'start_date ASC'
     }
   }
@@ -5,6 +5,7 @@ class Forum &lt; Folder
   settings_items :terms_of_use, :type => :string, :default => ""
   settings_items :has_terms_of_use, :type => :boolean, :default => false
+  settings_items :allows_members_to_create_topics, :type => :boolean, :default => false
   has_and_belongs_to_many :users_with_agreement, :class_name => 'Person', :join_table => 'terms_forum_people'
   before_save do |forum|
@@ -66,4 +67,11 @@ class Forum &lt; Folder
     self.users_with_agreement.exists? user
   end
+  def can_create_topic?(user, profile)
+    return profile.community? && profile.members.include?(user) && self.allows_members_to_create_topics
+  end
+
+  def allow_create?(user)
+    super || can_create_topic?(user, profile)
+  end
 end
 class Friendship < ActiveRecord::Base
   track_actions :new_friendship, :after_create, :keep_params => ["friend.name", "friend.url", "friend.profile_custom_icon"], :custom_user => :person
-  
+
+  extend CacheCounterHelper
+
   belongs_to :person, :foreign_key => :person_id
   belongs_to :friend, :class_name => 'Person', :foreign_key => 'friend_id'
+
+  after_create do |friendship|
+    update_cache_counter(:friends_count, friendship.person, 1)
+    update_cache_counter(:friends_count, friendship.friend, 1)
+  end
+
+  after_destroy do |friendship|
+    update_cache_counter(:friends_count, friendship.person, -1)
+    update_cache_counter(:friends_count, friendship.friend, -1)
+  end
 end
@@ -16,15 +16,15 @@ class LayoutTemplate
   end
   def name
-    @config['name']
+    _ @config['name']
   end
   def title
-    @config['title']
+    _ @config['title']
   end
   def description
-    @config['description']
+    _ @config['description']
   end
   def number_of_boxes
@@ -70,6 +70,8 @@ class LinkListBlock &lt; Block
   def expand_address(address)
     add = if owner.respond_to?(:identifier)
       address.gsub('{profile}', owner.identifier)
+    elsif owner.is_a?(Environment) && owner.enabled?('use_portal_community') && owner.portal_community
+      address.gsub('{portal}', owner.portal_community.identifier)
     else
       address
     end
@@ -17,7 +17,7 @@ class Mailing &lt; ActiveRecord::Base
   end
   def generate_from
-    "#{source.name} <#{source.contact_email}>"
+    "#{source.name} <#{if source.is_a? Environment then source.noreply_email else source.contact_email end}>"
   end
   def generate_subject
@@ -24,7 +24,7 @@ class MainBlock &lt; Block
     false
   end
-  def display_options
+  def display_options_available
     ['always', 'except_home_page']
   end
@@ -36,4 +36,15 @@ class MembersBlock &lt; ProfileListBlock
     }
   end
+  def cache_key(language='en', user=nil)
+    logged = ''
+    if user
+      logged += '-logged-in'
+      if user.is_member_of? self.owner
+        logged += '-member'
+      end
+    end
+    super + logged
+  end
+
 end
@@ -26,18 +26,7 @@ class Organization &lt; Profile
   has_many :mailings, :class_name => 'OrganizationMailing', :foreign_key => :source_id, :as => 'source'
-  named_scope :more_popular,
-    :select => "#{Profile.qualified_column_names}, count(resource_id) as total",
-    :group => Profile.qualified_column_names,
-    :joins => "LEFT OUTER JOIN role_assignments ON profiles.id = role_assignments.resource_id",
-    :order => "total DESC"
-
-  named_scope :more_active,
-    :select => "#{Profile.qualified_column_names}, count(action_tracker.id) as total",
-    :joins => "LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.target_id",
-    :group => Profile.qualified_column_names,
-    :order => 'total DESC',
-    :conditions => ['action_tracker.created_at >= ? OR action_tracker.id IS NULL', ActionTracker::Record::RECENT_DELAY.days.ago]
+  named_scope :more_popular, :order => 'members_count DESC'
   def validation_methodology
     self.validation_info ? self.validation_info.validation_methodology : nil
 class OrganizationMailing < Mailing
   def generate_from
-    "#{person.name} <#{source.environment.contact_email}>"
+    "#{person.name} <#{source.environment.noreply_email}>"
   end
   def recipients(offset=0, limit=100)
@@ -2,7 +2,7 @@ class PendingTaskNotifier &lt; ActionMailer::Base
   def notification(person)
     recipients person.email
-    from "#{person.environment.name} <#{person.environment.contact_email}>"
+    from "#{person.environment.name} <#{person.environment.noreply_email}>"
     subject _("[%s] Pending tasks") % person.environment.name
     body :person => person,
       :tasks => person.tasks.pending,
@@ -71,18 +71,7 @@ class Person &lt; Profile
   has_and_belongs_to_many :acepted_forums, :class_name => 'Forum', :join_table => 'terms_forum_people'
   has_and_belongs_to_many :articles_with_access, :class_name => 'Article', :join_table => 'article_privacy_exceptions'
-  named_scope :more_popular,
-      :select => "#{Profile.qualified_column_names}, count(friend_id) as total",
-      :group => Profile.qualified_column_names,
-      :joins => "LEFT OUTER JOIN friendships on profiles.id = friendships.person_id",
-      :order => "total DESC"
-
-  named_scope :more_active,
-    :select => "#{Profile.qualified_column_names}, count(action_tracker.id) as total",
-    :joins => "LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.user_id",
-    :group => Profile.qualified_column_names,
-    :order => 'total DESC',
-    :conditions => ['action_tracker.created_at >= ? OR action_tracker.id IS NULL', ActionTracker::Record::RECENT_DELAY.days.ago]
+  named_scope :more_popular, :order => 'friends_count DESC'
   named_scope :abusers, :joins => :abuse_complaints, :conditions => ['tasks.status = 3'], :select => 'DISTINCT profiles.*'
   named_scope :non_abusers, :joins => "LEFT JOIN tasks ON profiles.id = tasks.requestor_id AND tasks.type='AbuseComplaint'", :conditions => ["tasks.status != 3 OR tasks.id is NULL"], :select => "DISTINCT profiles.*"
@@ -501,6 +490,17 @@ class Person &lt; Profile
     gravatar_profile_image_url(self.email, :size=>20, :d => gravatar_default)
   end
+  settings_items :last_notification, :type => DateTime
+  settings_items :notification_time, :type => :integer, :default => 0
+
+  def notifier
+    @notifier ||= PersonNotifier.new(self)
+  end
+
+  after_update do |person|
+    person.notifier.reschedule_next_notification_mail
+  end
+
   protected
   def followed_by?(profile)
@@ -0,0 +1,89 @@
+class PersonNotifier
+
+  def initialize(person)
+    @person = person
+  end
+
+  def self.schedule_all_next_notification_mail
+    Delayed::Job.enqueue(NotifyAllJob.new) unless NotifyAllJob.exists?
+  end
+
+  def schedule_next_notification_mail
+    dispatch_notification_mail if !NotifyJob.exists?(@person.id)
+  end
+
+  def dispatch_notification_mail
+    Delayed::Job.enqueue(NotifyJob.new(@person.id), nil, @person.notification_time.hours.from_now) if @person.notification_time>0
+  end
+
+  def reschedule_next_notification_mail
+    return nil unless @person.setting_changed?(:notification_time) || @person.setting_changed?(:last_notification)
+    NotifyJob.find(@person.id).delete_all
+    schedule_next_notification_mail
+  end
+
+  def notify
+    if @person.notification_time && @person.notification_time > 0
+      from = @person.last_notification || DateTime.now - @person.notification_time.hours
+      notifications = @person.tracked_notifications.find(:all, :conditions => ["created_at > ?", from])
+      Noosfero.with_locale @person.environment.default_language do
+        Mailer::deliver_content_summary(@person, notifications) unless notifications.empty?
+      end
+      @person.settings[:last_notification] = DateTime.now
+      @person.save!
+    end
+  end
+
+  class NotifyAllJob
+    def self.exists?
+      Delayed::Job.where(:handler => "--- !ruby/object:PersonNotifier::NotifyAllJob {}\n\n").count > 0
+    end
+
+    def perform
+      Person.find_each {|person| person.notifier.schedule_next_notification_mail }
+    end
+  end
+
+  class NotifyJob < Struct.new(:person_id)
+
+    def self.exists?(person_id)
+      !find(person_id).empty?
+    end
+
+    def self.find(person_id)
+      Delayed::Job.where(:handler => "--- !ruby/struct:PersonNotifier::NotifyJob \nperson_id: #{person_id}\n")
+    end
+
+    def perform
+      Person.find(person_id).notifier.notify
+    end
+
+    def on_permanent_failure
+      person = Person.find(person_id)
+      person.notifier.dispatch_notification_mail
+    end
+
+  end
+
+  class Mailer < ActionMailer::Base
+
+    add_template_helper(PersonNotifierHelper)
+
+    def session
+      {:theme => nil}
+    end
+
+    def content_summary(person, notifications)
+      @current_theme = 'default'
+      @profile = person
+      recipients person.email
+      from "#{@profile.environment.name} <#{@profile.environment.contact_email}>"
+      subject _("[%s] Network Activity") % [@profile.environment.name]
+      body :recipient => @profile.nickname || @profile.name,
+        :environment => @profile.environment.name,
+        :url => @profile.environment.top_url,
+        :notifications => notifications
+      content_type "text/html"
+    end
+  end
+end
@@ -92,10 +92,6 @@ class Profile &lt; ActiveRecord::Base
     members.order(:name)
   end
-  def members_count
-    members.count
-  end
-
   class << self
     def count_with_distinct(*args)
       options = args.last || {}
@@ -118,10 +114,11 @@ class Profile &lt; ActiveRecord::Base
   named_scope :visible, :conditions => { :visible => true }
   named_scope :public, :conditions => { :visible => true, :public_profile => true }
-  # Subclasses must override these methods
+
+  # Subclasses must override this method
   named_scope :more_popular
-  named_scope :more_active
+  named_scope :more_active,  :order => 'activities_count DESC'
   named_scope :more_recent, :order => "created_at DESC"
   acts_as_trackable :dependent => :destroy
@@ -616,10 +613,10 @@ private :generate_url, :url_options
   # Adds a person as member of this Profile.
   def add_member(person)
     if self.has_members?
-      if self.closed? && members_count > 0
+      if self.closed? && members.count > 0
         AddMember.create!(:person => person, :organization => self) unless self.already_request_membership?(person)
       else
-        self.affiliate(person, Profile::Roles.admin(environment.id)) if members_count == 0
+        self.affiliate(person, Profile::Roles.admin(environment.id)) if members.count == 0
         self.affiliate(person, Profile::Roles.member(environment.id))
       end
     else
@@ -14,7 +14,7 @@ class Scrap &lt; ActiveRecord::Base
   named_scope :not_replies, :conditions => {:scrap_id => nil}
-  track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target 
+  track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target
   track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender == s.receiver}
@@ -59,7 +59,7 @@ class Scrap &lt; ActiveRecord::Base
       sender, receiver = scrap.sender, scrap.receiver
       recipients receiver.email
-      from "#{sender.environment.name} <#{sender.environment.contact_email}>"
+      from "#{sender.environment.name} <#{sender.environment.noreply_email}>"
       subject _("[%s] You received a scrap!") % [sender.environment.name]
       body :recipient => receiver.name,
         :sender => sender.name,
@@ -60,7 +60,7 @@ class TaskMailer &lt; ActionMailer::Base
   end
   def self.generate_from(task)
-    "#{task.environment.name} <#{task.environment.contact_email}>"
+    "#{task.environment.name} <#{task.environment.noreply_email}>"
   end
   def generate_environment_url(task, url = {})
@@ -42,17 +42,25 @@ class Theme
     end
     def approved_themes(owner)
-      Dir.glob(File.join(system_themes_dir, '*')).select do |item|
-        if File.exists?( File.join(item, 'theme.yml') )
-          config = YAML.load_file(File.join(item, 'theme.yml'))
-          (config['owner_type'] == owner.class.base_class.name) &&
-          (config['owner_id'] == owner.id) || config['public']
+      Dir.glob(File.join(system_themes_dir, '*')).map do |item|
+        next unless File.exists? File.join(item, 'theme.yml')
+        id = File.basename item
+        config = YAML.load_file File.join(item, 'theme.yml')
+
+        approved = config['public']
+        unless approved
+          begin
+            approved = owner.kind_of?(config['owner_type'].constantize)
+          rescue
+          end
+          approved &&= config['owner_id'] == owner.id if config['owner_id'].present?
         end
-      end.map do |desc|
-        new(File.basename(desc))
+
+        [id, config] if approved
+      end.compact.map do |id, config|
+        new id, config
       end
     end
-
   end
   class DuplicatedIdentifier < Exception; end
@@ -12,15 +12,12 @@ class UploadedFile &lt; Article
   include ShortFilename
-  settings_items :title, :type => 'string'
-  xss_terminate :only => [ :title ]
-
-  def title_with_default
-    title_without_default || short_filename(name, 60)
+  def title
+    if self.name.present? then self.name else self.filename end
+  end
+  def title= value
+    self.name = value
   end
-  alias_method_chain :title, :default
-
-  validates_size_of :title, :maximum => 60, :if => (lambda { |file| !file.title.blank? })
   sanitize_filename
@@ -32,10 +29,6 @@ class UploadedFile &lt; Article
     self.image? ? self.full_filename(:display).gsub(File.join(RAILS_ROOT, 'public'), '') : nil
   end
-  def display_title
-    title.blank? ? name : title
-  end
-
   def first_paragraph
     ''
   end
@@ -109,7 +102,7 @@ class UploadedFile &lt; Article
   alias :orig_set_filename :filename=
   def filename=(value)
     orig_set_filename(value)
-    self.name = self.filename
+    self.name ||= self.filename
   end
   def download_headers
@@ -54,7 +54,7 @@ class User &lt; ActiveRecord::Base
     def activation_email_notify(user)
       user_email = "#{user.login}@#{user.email_domain}"
       recipients user_email
-      from "#{user.environment.name} <#{user.environment.contact_email}>"
+      from "#{user.environment.name} <#{user.environment.noreply_email}>"
       subject _("[%{environment}] Welcome to %{environment} mail!") % { :environment => user.environment.name }
       body :name => user.name,
         :email => user_email,
@@ -66,12 +66,13 @@ class User &lt; ActiveRecord::Base
     def activation_code(user)
       recipients user.email
-      from "#{user.environment.name} <#{user.environment.contact_email}>"
+      from "#{user.environment.name} <#{user.environment.noreply_email}>"
       subject _("[%s] Activate your account") % [user.environment.name]
       body :recipient => user.name,
         :activation_code => user.activation_code,
         :environment => user.environment.name,
-        :url => user.environment.top_url
+        :url => user.environment.top_url,
+        :redirection => (true if user.return_to)
     end
     def signup_welcome_email(user)
@@ -81,7 +82,7 @@ class User &lt; ActiveRecord::Base
       content_type 'text/html'
       recipients user.email
-      from "#{user.environment.name} <#{user.environment.contact_email}>"
+      from "#{user.environment.name} <#{user.environment.noreply_email}>"
       subject email_subject.blank? ? _("Welcome to environment %s") % [user.environment.name] : email_subject
       body email_body
     end
@@ -93,7 +94,7 @@ class User &lt; ActiveRecord::Base
       self.person.save!
     end
   end
-  
+
   has_one :person, :dependent => :destroy
   belongs_to :environment
@@ -183,7 +184,7 @@ class User &lt; ActiveRecord::Base
     encryption_methods[sym] = block
   end
-  # the encryption method used for this instance 
+  # the encryption method used for this instance
   def encryption_method
     (password_type || User.system_encryption_method).to_sym
   end
@@ -226,7 +227,7 @@ class User &lt; ActiveRecord::Base
   end
   def remember_token?
-    remember_token_expires_at && Time.now.utc < remember_token_expires_at 
+    remember_token_expires_at && Time.now.utc < remember_token_expires_at
   end
   # These create and unset the fields required for remembering users between browser closes
@@ -255,7 +256,7 @@ class User &lt; ActiveRecord::Base
     raise IncorrectPassword unless self.authenticated?(current)
     self.force_change_password!(new, confirmation)
   end
-  
+
   # Changes the password of a user without asking for the old password. This
   # method is intended to be used by the "I forgot my password", and must be
   # used with care.
@@ -326,7 +327,7 @@ class User &lt; ActiveRecord::Base
   end
   protected
-    # before filter 
+    # before filter
     def encrypt_password
       return if password.blank?
       self.salt ||= Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record?
@@ -8,6 +8,8 @@ class ProfileSweeper # &lt; ActiveRecord::Observer
   end
   def after_create(profile)
+    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+    #      the Noosfero core soon, see ActionItem3045
     expire_statistics_block_cache(profile)
   end
@@ -29,6 +31,8 @@ protected
     expire_blogs(profile) if profile.organization?
   end
+  # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
+  #      the Noosfero core soon, see ActionItem3045
   def expire_statistics_block_cache(profile)
     blocks = profile.environment.blocks.select { |b| b.kind_of?(EnvironmentStatisticsBlock) }
     BlockSweeper.expire_blocks(blocks)
@@ -7,6 +7,8 @@
 <% @profile_data = @person %>
+<%= javascript_include_tag('sign_up_password_rate') %>
+
 <%= error_messages_for :user, :person, :header_message => _('The account could not be created') %>
 <% labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form', :honeypot => true } do |f| %>
@@ -52,7 +54,20 @@
   <div id='signup-password'>
     <%= required f.password_field(:password, :id => 'user_pw') %>
     <%= content_tag(:small,_('Choose a password that you can remember easily. It must have at least 4 characters.'), :id => 'password-balloon') %>
-    <div id='fake-check'><p>&nbsp;</p></div>
+    <div id='password-rate'>
+      <p><span class="invalid hidden" id='result-short'>
+        <%=_('Short') %>
+      </span></p>
+      <p><span class="invalid hidden" id='result-bad'>
+        <%=_('Bad') %>
+      </span></p>
+      <p><span class="invalid hidden" id='result-good'>
+        <%=_('Good') %>
+      </span></p>
+      <p><span class="invalid hidden" id='result-strong'>
+        <%=_('Strong') %>
+      </span></p>
+    </div>
   </div>
   <div id='signup-password-confirmation'>
@@ -182,4 +197,5 @@ jQuery(function($) {
     else $(this).addClass('validated');
   });
 });
+
 </script>
 <%= required labelled_form_field(_('Site name'), text_field(:environment, :name)) %>
 <%= labelled_form_field(_('Contact email'), text_field(:environment, :contact_email)) %>
+<%= labelled_form_field(_('No reply email'), text_field(:environment, :noreply_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) %>
 <div class="vcard">
-<p><%= block.title %></p>
+<% if block.title.present? %>
+  <p><%= block.title %></p>
+<% end %>
 <div class="profile-big-image">
   <div class="profile-big-image-inner1">
@@ -16,7 +18,7 @@
 <% if !user.nil? and user.has_permission?('edit_profile', profile) %>
   <div class='admin-link'>
-    <%= link_to _('Control panel'), :controller => 'profile_editor' %>
+    <%= link_to _('Control panel'), block.owner.admin_url %>
   </div>
 <% end %>
@@ -21,7 +21,7 @@
     <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
   <% end %>
   <% if !user.nil? and user.has_permission?('edit_profile', profile) %>
-    <li><%= link_to _('Control panel'), :controller => 'profile_editor' %></li>
+    <li><%= link_to _('Control panel'), block.owner.admin_url %></li>
   <% end %>
   <% if profile.person? %>
     <li><%= _('Since %{year}/%{month}') % { :year => block.owner.created_at.year, :month => block.owner.created_at.month } %></li>
@@ -40,7 +40,7 @@
 <% end %>
 <div class="profile-info-options">
-  <%= render :file => view_for_profile_actions(@block.owner.class) %>
+  <%= render :file => view_for_profile_actions(block.owner.class) %>
 </div>
 </div><!-- end class="vcard" -->
+<%= javascript_include_tag "edit-link-list.js" %>
+
 <strong><%= _('Links') %></strong>
 <div id='edit-link-list-block'>
-<table id='links' class='noborder'>
-  <tr>
-    <th><%= _('Icon') %></th>
-    <th><%= _('Name') %></th>
-    <th><%= _('Address') %></th>
-    <th><%= _('Title') %></th>
-    <th><%= _('Target') %></th>
-  </tr>
-  <% for link in @block.links do %>
-  <tr>
-    <td><%= icon_selector(link['icon']) %></td>
-    <td><%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %></td>
-    <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %></td>
-    <td><%= text_field_tag 'block[links][][title]', link[:title], :class => 'link-title' %></td>
-    <td><%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %></td>
-  </tr>
-  <% end %>
-</table>
+  <ul class='link-list-header'>
+    <li class='link-list-icon'><%= _('Icon') %></li>
+    <li class='link-list-name'><%= _('Name') %></li>
+    <li class='link-list-address'><%= _('Address') %></li>
+    <li class='link-list-target'><%= _('Target') %></li>
+  </ul>
+  <ul id="dropable-link-list">
+    <% for link in @block.links do %>
+      <li>
+        <ul class="link-list-row">
+          <li>
+            <%= icon_selector(link['icon']) %>
+          </li>
+          <li>
+            <%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %>
+          </li>
+          <li>
+            <%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %>
+          </li>
+          <li>
+            <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
+          </li>
+          <li>
+            <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row") %>
+          </li>
+        </ul>
+      </li>
+    <% end %>
+  </ul>
+  <input type="hidden" id="page_url" value="<%=url_for(:action=>'search_autocomplete')%>" />
 </div>
 <%= link_to_function(_('New link'), nil, :class => 'button icon-add with-text') do |page|
-    page.insert_html :bottom, 'links', content_tag('tr',
-      content_tag('td', icon_selector('ok')) +
-      content_tag('td', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
-      content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'link-address'), :class => 'cel-address') +
-      content_tag('td', text_field_tag('block[links][][title]', '', :class => 'link-title')) +
-      content_tag('td', select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, '_self')))
+    page.insert_html :bottom, 'dropable-link-list', content_tag('li',
+      content_tag('ul',
+        content_tag('li', icon_selector('ok')) +
+        content_tag('li', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
+        content_tag('li', text_field_tag('block[links][][address]', nil, :class => 'link-address')) +
+        content_tag('li', select_tag('block[links][][target]',
+        options_for_select(LinkListBlock::TARGET_OPTIONS, '_self'))) +
+        content_tag('li', button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row")),
+      :class=>"link-list-row new_link_row")
     ) +
-    javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
+    javascript_tag("new_link_action()")
 end %>
@@ -7,13 +7,14 @@
     <%= render :partial => partial_for_class(@block.class) %>
-    <%= labelled_form_field _('Display this block:'), '' %>
-    <div style='margin-left: 10px'>
-      <% @block.display_options.each do |option| %>
-        <%= radio_button(:block, :display, option) %>
-        <%= label_tag("block_display_#{option}", _(@block.display_option_label(option))) %>
-        <br/>
-      <% end %>
+    <div class="display">
+      <%= labelled_form_field _('Display this block:'),
+        select_tag('block[display]', options_from_collection_for_select(@block.display_options, :first, :last, @block.display))
+      %>
+    </div>
+    <div class="display_user">
+      <%= labelled_form_field _('Display to users:'), '' %>
+      <%= select_tag('block[display_user]', options_from_collection_for_select(@block.display_user_options, :first, :last, @block.display_user)) %>
     </div>
     <%= labelled_form_field(_('Show for:'), select(:block, :language, [ [ _('all languages'), 'all']] + environment.locales.map {|key, value| [value, key]} )) %>
@@ -0,0 +1,8 @@
+<div id="addThis">
+  <script type="text/javascript">
+    addthis_pub = '<%= escape_javascript( NOOSFERO_CONF['addthis_pub'] ) %>';
+    addthis_logo = '<%= escape_javascript( NOOSFERO_CONF['addthis_logo'] ) %>';
+    addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>';
+  </script>
+  <a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><%= addthis_image_tag %></a>
+</div>
@@ -26,7 +26,7 @@
       <%= expirable_button @page, :spread, content, url if url %>
     <% end %>
-    <% if !@page.gallery? && @page.allow_create?(user) %>
+    <% if !@page.gallery? && (@page.allow_create?(user) || (@page.parent && @page.parent.allow_create?(user))) %>
       <% if @page.translatable? && !@page.native_translation.language.blank? && !remove_content_button(:locale) %>
         <% content = _('Add translation') %>
         <% parent_id = (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)) %>
@@ -43,21 +43,7 @@
 <%= render :partial => 'shared/disabled_enterprise' %>
 <% if NOOSFERO_CONF['addthis_enabled'] %>
-<div id="addThis">
-<script type="text/javascript">
-  addthis_pub = '<%= escape_javascript( NOOSFERO_CONF['addthis_pub'] ) %>';
-  addthis_logo = '<%= escape_javascript( NOOSFERO_CONF['addthis_logo'] ) %>';
-  addthis_config = {
-    services_custom: {
-      name: 'Facebook',
-      url: '<%= addthis_facebook_url(@page) %>',
-      icon: 'http://cache.addthiscdn.com/icons/v1/thumbs/facebook.gif'
-    }
-  };
-  addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>';
-</script>
-<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><%= addthis_image_tag %></a>
-</div>
+  <%= render :partial => 'addthis' %>
 <% end %>
 <% cache(@page.cache_key(params, user, language)) do %>
@@ -84,6 +70,8 @@
 <%= display_source_info(@page) %>
+<%= @plugins.dispatch(:article_extra_contents, @page).collect { |content| instance_eval(&content) }.join("") %>
+
 <div class="comments" id="comments_list">
   <% if @page.accept_comments? || @comments_count > 0 %>
@@ -92,8 +80,26 @@
     </h3>
   <% end %>
-  <% if @page.accept_comments? && @comments.count > 1 %>
+  <% if @page.accept_comments? && @comments_count > 1 %>
     <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button', :onclick => "jQuery('#page-comment-form .display-comment-form').first().click();") %>
+
+    <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier)) %>
+    <%= javascript_include_tag "comment_order.js" %>
+    <div class="comment-order">
+      <% form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %>
+        <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <% if @page.accept_comments? and @comments.count > 1 %>
+    <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier)) %>
+    <%= javascript_include_tag "comment_order.js" %>
+    <div class="comment-order">
+      <% form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %>
+        <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %>
+      <% end %>
+    </div>
   <% end %>
   <ul class="article-comments-list">
-<%= list_events(@date, @events) %>
 \ No newline at end of file
+<%= list_events(@date, @events) %>
+
+<%= pagination_links @events, :param_name => 'page' %>
-<h2><%= __('Manage community fields') %></h2>
-
 <% labelled_form_for(:environment, @environment, :url => {:action => 'manage_community_fields'}) do |f| %>
 <table id='community_fields_conf'>
@@ -9,21 +7,37 @@
     <th><%= _('Required') %></th>
     <th><%= _('Display on creation?') %></th>
   </tr>
+
+  <tr class='manage-fields-batch-actions'>
+    <td>
+      <%= _("Check/Uncheck All")%>
+    </td>
+    <td>
+      <input type="checkbox" id="community_active" />
+    </td>
+    <td>
+      <input type="checkbox" id="community_required" />
+    </td>
+    <td>
+      <input type="checkbox" id="community_signup" />
+    </td>
+  </tr>
+
   <% @community_fields.each do |field| %>
   <tr>
     <td><label for="community_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
     <td>
       <%= hidden_field_tag  "community_fields[#{field}][active]", false %>
-      <%= check_box_tag "community_fields[#{field}][active]", true, environment.custom_community_field(field, 'active'), :onclick => "$('community_fields[#{field}][required]').disabled=$('community_fields[#{field}][signup]').disabled=!this.checked;" %>
+      <%= check_box_tag "community_fields[#{field}][active]", true, environment.custom_community_field(field, 'active'), :onclick => "active_action(this, 'community_fields[#{field}][required]', 'community_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "community_fields[#{field}][required]", false %>
-      <%= check_box_tag "community_fields[#{field}][required]", true, environment.custom_community_field(field, 'required'), :onclick => "if(this.checked) $('community_fields[#{field}][signup]').checked = true;" %>
+      <%= check_box_tag "community_fields[#{field}][required]", true, environment.custom_community_field(field, 'required'), :onclick => "required_action('community_fields[#{field}][active]','community_fields[#{field}][required]', 'community_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "community_fields[#{field}][signup]", false %>
-      <%= check_box_tag "community_fields[#{field}][signup]", true, environment.custom_community_field(field, 'signup'), :onclick => "if(!this.checked) $('community_fields[#{field}][required]').checked = false;" %>
+      <%= check_box_tag "community_fields[#{field}][signup]", true, environment.custom_community_field(field, 'signup'), :onclick => "signup_action('community_fields[#{field}][active]','community_fields[#{field}][required]', 'community_fields[#{field}][signup]')" %>
     </td>
   </tr>
@@ -31,18 +45,18 @@
 </table>
 <script type='text/javascript'>
-  var trs = $$('#community_fields_conf tr');
+  var trs = jQuery('#community_fields_conf tr');
   var tr, td2;
-  for ( var i=0; tr=trs[i]; i++ ) {
+  for ( var i=2; tr=trs[i]; i++ ) {
     if ( td2 = tr.getElementsByTagName('td')[1] ) {
-      td2.getElementsByTagName('input')[0].onclick();
+      td2.getElementsByTagName('input')[1].onclick();
     }
   }
 </script>
 <div>
   <% button_bar do %>
-    <%= submit_button('save', _('Save changes')) %>
+    <%= submit_button('save', _('Save changes'), :id=>"save_community_fields") %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
 </div>
-<h2><%= __('Manage enterprise fields') %></h2>
-
 <% labelled_form_for(:environment, @environment, :url => {:action => 'manage_enterprise_fields'}) do |f| %>
 <table id='enterprise_fields_conf'>
@@ -9,21 +7,37 @@
     <th><%= _('Required') %></th>
     <th><%= _('Display on registration?') %></th>
   </tr>
+
+  <tr class='manage-fields-batch-actions'>
+    <td>
+      <%= _("Check/Uncheck All")%>
+    </td>
+    <td>
+      <input type="checkbox" id="enterprise_active" />
+    </td>
+    <td>
+      <input type="checkbox" id="enterprise_required" />
+    </td>
+    <td>
+      <input type="checkbox" id="enterprise_signup" />
+    </td>
+  </tr>
+
   <% @enterprise_fields.each do |field| %>
   <tr>
     <td><label for="enterprise_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
     <td>
       <%= hidden_field_tag  "enterprise_fields[#{field}][active]", false %>
-      <%= check_box_tag "enterprise_fields[#{field}][active]", true, environment.custom_enterprise_field(field, 'active'), :onclick => "$('enterprise_fields[#{field}][required]').disabled=$('enterprise_fields[#{field}][signup]').disabled=!this.checked;" %>
+      <%= check_box_tag "enterprise_fields[#{field}][active]", true, environment.custom_enterprise_field(field, 'active'), :onclick => "active_action(this, 'enterprise_fields[#{field}][required]', 'enterprise_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "enterprise_fields[#{field}][required]", false %>
-      <%= check_box_tag "enterprise_fields[#{field}][required]", true, environment.custom_enterprise_field(field, 'required'), :onclick => "if(this.checked) $('enterprise_fields[#{field}][signup]').checked = true;" %>
+      <%= check_box_tag "enterprise_fields[#{field}][required]", true, environment.custom_enterprise_field(field, 'required'), :onclick => "required_action('enterprise_fields[#{field}][active]','enterprise_fields[#{field}][required]', 'enterprise_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "enterprise_fields[#{field}][signup]", false %>
-      <%= check_box_tag "enterprise_fields[#{field}][signup]", true, environment.custom_enterprise_field(field, 'signup'), :onclick => "if(!this.checked) $('enterprise_fields[#{field}][required]').checked = false;" %>
+      <%= check_box_tag "enterprise_fields[#{field}][signup]", true, environment.custom_enterprise_field(field, 'signup'), :onclick => "signup_action('enterprise_fields[#{field}][active]','enterprise_fields[#{field}][required]', 'enterprise_fields[#{field}][signup]')" %>
     </td>
   </tr>
@@ -31,18 +45,18 @@
 </table>
 <script type='text/javascript'>
-  var trs = $$('#enterprise_fields_conf tr');
+  var trs = jQuery('#enterprise_fields_conf tr');
   var tr, td2;
-  for ( var i=0; tr=trs[i]; i++ ) {
+  for ( var i=2; tr=trs[i]; i++ ) {
     if ( td2 = tr.getElementsByTagName('td')[1] ) {
-      td2.getElementsByTagName('input')[0].onclick();
+      td2.getElementsByTagName('input')[1].onclick();
     }
   }
 </script>
 <div>
   <% button_bar do %>
-    <%= submit_button('save', _('Save changes')) %>
+    <%= submit_button('save', _('Save changes'), :id=>"save_enterprise_fields") %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
 </div>
-<h2><%= _('Manage person fields') %></h2>
-
 <% labelled_form_for(:environment, @environment, :url => {:action => 'manage_person_fields'}) do |f| %>
 <table id='person_fields_conf'>
@@ -9,31 +7,48 @@
     <th><%= _('Required') %></th>
     <th><%= _('Display on signup?') %></th>
   </tr>
+
+  <tr class='manage-fields-batch-actions'>
+    <td>
+      <%= _("Check/Uncheck All")%>
+    </td>
+    <td>
+      <input type="checkbox" id="person_active" />
+    </td>
+    <td>
+      <input type="checkbox" id="person_required" />
+    </td>
+    <td>
+      <input type="checkbox" id="person_signup" />
+    </td>
+  </tr>
+
   <% @person_fields.each do |field| %>
   <tr>
     <td><label for="person_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
     <td>
       <%= hidden_field_tag  "person_fields[#{field}][active]", false %>
-      <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "$('person_fields[#{field}][required]').disabled=$('person_fields[#{field}][signup]').disabled=!this.checked;" %>
+      <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "active_action(this, 'person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "person_fields[#{field}][required]", false %>
-      <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required'), :onclick => "if(this.checked) $('person_fields[#{field}][signup]').checked = true;" %>
+      <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required'), :onclick => "required_action('person_fields[#{field}][active]','person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "person_fields[#{field}][signup]", false %>
-      <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup'), :onclick => "if(!this.checked) $('person_fields[#{field}][required]').checked = false;" %>
+      <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup'), :onclick => "signup_action('person_fields[#{field}][active]','person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
     </td>
   </tr>
   <% end %>
 </table>
 <script type='text/javascript'>// <!--
-  var trs = $$('#person_fields_conf tr');
+  var trs = jQuery('#person_fields_conf tr');
+
   var tr, td2;
-  for ( var i=0; tr=trs[i]; i++ ) {
+  for ( var i=2; tr=trs[i]; i++ ) {
     if ( td2 = tr.getElementsByTagName('td')[1] ) {
-      td2.getElementsByTagName('input')[0].onclick();
+      td2.getElementsByTagName('input')[1].onclick();
     }
   }
   // -->
@@ -41,7 +56,7 @@
 <div>
   <% button_bar do %>
-    <%= submit_button('save', _('Save changes')) %>
+    <%= submit_button('save', _('Save changes'), :id=>"save_person_fields") %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
 </div>
@@ -26,9 +26,13 @@ Check all the features you want to enable for your environment, uncheck all the 
 <h2><%= _('Configure features') %></h2>
+<h3><%= _('Page to redirect after signup') %></h3>
+  <%=  select 'environment', 'redirection_after_signup', Environment.signup_redirection_options.map{|key,value|[value,key]} %>
+<hr/>
 <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/>
-<%= render :partial => 'manage_person_fields' %>
+<h1><%= _('Manage fields displayed for profiles') %></h1>
-<% if !environment.enabled?('disable_asset_enterprises') %>
-  <%= render :partial => 'manage_enterprise_fields' %>
+<% tabs = [] %>
+<% tabs << {:title => _("Person's fields"), :id => 'person-fields',
+  :content => (render :partial => 'manage_person_fields')} %>
+<% tabs << {:title => _("Community's fields"), :id => 'community-fields',
+  :content => (render :partial => 'manage_community_fields')} %>
+<% unless environment.enabled?('disable_asset_enterprises') %>
+  <% tabs << {:title => _("Enterprise's fields"), :id => 'enterprise-fields',
+  :content => (render :partial => 'manage_enterprise_fields')} %>
 <% end %>
-<%= render :partial => 'manage_community_fields' %>
+<%= render_tabs(tabs) %>
+
+<%= javascript_include_tag "manage-fields.js" %>
@@ -6,6 +6,27 @@
     <!--<meta http-equiv="refresh" content="1"/>-->
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta name="description" content="<%= @environment.name %>" />
+
+    <!-- Twitter Card -->
+    <meta name="twitter:card" value="summary">
+    <meta name="twitter:title" content="<%= h page_title %>">
+    <meta name="twitter:description" content="<%= meta_description_tag(@page) %>">
+
+    <!-- Open Graph -->
+    <meta property="og:type" content="<%= @page ? 'article' : 'website' %>">
+    <meta property="og:url" content="<%= @page ? url_for(@page.url) : @environment.top_url %>">
+    <meta property="og:title" content="<%= h page_title %>">
+    <meta property="og:site_name" content="<%= profile ? profile.name : @environment.name %>">
+    <meta property="og:description" content="<%= @page ? truncate(strip_tags(@page.body.to_s), :length => 200) : @environment.name %>">
+
+    <% if @page %>
+      <meta property="article:published_time" content="<%= show_date(@page.published_at) %>">
+      <% @page.body_images_paths.each do |img| %>
+        <meta name="twitter:image" content="<%= img.to_s %>">
+        <meta property="og:image" content="<%= img.to_s %>">
+      <% end %>
+    <% end %>
+
     <link rel="shortcut icon" href="<%= image_path(theme_favicon) %>" type="image/x-icon" />
     <%= noosfero_javascript %>
     <%= noosfero_stylesheets %>
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => { :activity => activity } %>
@@ -0,0 +1,33 @@
+<% Comment %>
+<% Profile %>
+<% Person %>
+
+<table style="background: #f0f0f1;border-bottom: 1px solid #d2d2d2 !important;border-top: 1px solid #fff;margin-bottom: 0;">
+<tr>
+  <td>
+  <% if comment.author %>
+    <%= link_to profile_image(comment.author, :minor),
+        comment.author_url,
+        :class => 'comment-picture',
+        :title => comment.author_name
+    %>
+  <% end %>
+  </td>
+  <td>
+      <%= comment.author.present? ? link_to(comment.author_name, comment.author.url, :style => "font-size: 12px; color: #333; font-weight: bold; text-decoration: none;") : content_tag('strong', comment.author_name) %>
+      <% unless comment.title.blank? %>
+        <span style="font-size: 12px;"><%= comment.title %></span><br/>
+      <% end %>
+      <span style="font-size: 10px;"><%= txt2html comment.body %></span><br/>
+      <span style="font-size: 8px; color: #444444"><%= time_ago_as_sentence(comment.created_at) %></span>
+  <br style="clear: both;" />
+
+  <% unless comment.replies.blank? %>
+  <ul class="comment-replies">
+    <% comment.replies.each do |reply| %>
+      <%= render :partial => 'comment', :locals => { :comment => reply } %>
+    <% end %>
+  </ul>
+  <% end %>
+  </td>
+</table>
@@ -0,0 +1,27 @@
+<table>
+<tr>
+  <td>
+    <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+  </td>
+  <td>
+    <p style="width:550px">
+    <span style="font-size: 14px;"><%= link_to activity.user.short_name(20), activity.user.url %></span>
+    <span style="font-size: 14px;"><%= _("has published on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url, :style => "color: #333; font-weight: bold; text-decoration: none;") if activity.target.profile.is_a?(Community) %></span>
+    <span style="font-size: 10px; color: #444444; float:right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+    </p>
+    <p>
+    <span style="font-size: 14px;"><%= link_to(activity.params['name'], activity.params['url'], :style => "color: #333; font-weight: bold; text-decoration: none;") %></span>
+    <br/>
+    <span title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-new<%= activity.target.class.icon_name %>'></span>
+    <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'], :length => 1000, :ommision => '...')).gsub(/(\xC2\xA0|\s)+/, ' ').gsub(/^\s+/, '') %>
+    </p>
+    <p><%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %></p>
+  </td>
+</tr>
+<tr>
+  <td></td>
+  <td>
+    <%= render :partial => 'profile_comments', :locals => { :activity => activity } %>
+  </td>
+</tr>
+</table>
@@ -0,0 +1,19 @@
+<table>
+<tr>
+  <td>
+    <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+  </td>
+  <td>
+    <p style="width:550px">
+      <span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>
+      <span style="font-size: 10px; color: #444444; float: right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+    </p>
+  </td>
+</tr>
+<tr>
+  <td></td>
+  <td>
+    <%= render :partial => 'profile_comments', :locals => { :activity => activity } %>
+  </td>
+</tr>
+</table>
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => { :activity => activity } %>
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => { :activity => activity } %>
@@ -0,0 +1 @@
+_leave_scrap.rhtml
 \ No newline at end of file
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => { :activity => activity } %>
@@ -0,0 +1,13 @@
+<% if activity.comments_count > 2 %>
+  <div style="font-size: 10px;">
+    <% if activity.params['url'].blank?  %>
+      <%= _("%s comments") % activity.comments_count %>
+    <% else %>
+      <%= link_to(_("View all %s comments") % activity.comments_count, activity.params['url']) %>
+    <% end %>
+  </div>
+<% else %>
+  <ul>
+    <%= render :partial => 'comment', :collection => activity.comments %>
+  </ul>
+<% end %>
@@ -0,0 +1 @@
+_leave_scrap.rhtml
 \ No newline at end of file
@@ -0,0 +1,15 @@
+<table>
+  <tr>
+    <td>
+      <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+    </td>
+    <td>
+      <p style="width:550px">
+        <span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>
+        <span style="font-size: 10px; color: #444444; float:right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+      </p>
+  </td>
+</tr>
+</table>
+<div title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-newgallery'></div>
+<br/>
@@ -0,0 +1,18 @@
+<h3><%= _("%s's network activity") % @profile.name %></h3>
+<br/>
+<div>
+<% @notifications.each do |activity| %>
+  <div style="border-left:none;border-right:none;border-top:1px solid #ccc;border-bottom:none;padding:10px;width:600px">
+    <%= render :partial => activity.verb, :locals => { :activity => activity } rescue "cannot render notification for #{activity.verb}" %>
+  </div>
+<% end %>
+</div>
+
+<div style="color:#444444;font-size:11px;">
+<p><%= _("Greetings,") %></p>
+<br/>
+<p>--</p>
+<p><%= _('%s team.') % @environment %></p>
+<p><%= url_for @url %></p>
+</div>
+<br/>
@@ -19,3 +19,8 @@
   <%= @plugins.dispatch(:profile_info_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
   <%= render :partial => 'person_form', :locals => {:f => f} %>
+
+  <h2><%= _('Notification options') %></h2>
+  <div>
+    <%= select_tag 'profile_data[notification_time]', options_for_select([[_('Disabled'), 0], [_('Hourly'), 1], [_('Half Day'), 12], [_('Daily'), 24]], @profile.notification_time) %>
+  </div>
-<div id="category-ajax-selector">
+<% extend CategoriesHelper %>
+
 <% if !@current_category.nil? %>
-  <h3 class="box-title"><%= _('Current category:') %></h3>
   <%= hidden_field_tag "#{object_name}[#{object_name}_category_id]", @current_category.id unless multiple %>
+  <%= hidden_field_tag "#{object_name}[category_ids][]", @current_category.id if multiple %>
+  <%= button_to_remote_without_text(:back, _('Back'),
+      { :update => "select-categories",
+        :url => { :action => 'update_categories', :id => @object },
+        :loaded => visual_effect(:highlight, "select-categories")
+      },
+      :id => 'cancel-category-button') %>
   <%
     categories = [@current_category]
     categories.push(@current_category) while @current_category = @current_category.parent
   %>
   <%= categories.compact.reverse.map{|i|
-    link_to_remote(i.name, 
+    link_to_remote(i.name,
       :update => "select-categories",
       :url => { :action => 'update_categories', :category_id => i.id, :id => @object },
       :loaded => visual_effect(:highlight, "select-categories"),
       :class => 'select-current-category-link')}.join(' &rarr; ')
   %>
-  <strong>
-  <%= button_to_function_without_text(:save, _('Save'), nil, :id => 'save-category-button') do |page|
-    page.insert_html :bottom, 'selected-categories', content_tag('li', categories.first.full_name +
+  <%= button_to_function_without_text(:add, _('Add'), nil, :id => 'save-category-button') do |page|
+    page.insert_html :bottom, 'selected-categories', content_tag('div',
       hidden_field_tag("#{object_name}[category_ids][]", categories.first.id) +
-      button_to_function_without_text(:cancel, _('Remove'), nil, :id => "remove-selected-category-#{categories.first.id}-button") {|page| page["selected-category-#{categories.first.id}"].remove}, :id => "selected-category-#{categories.first.id}")
+      selected_category_link(categories.first), :id => "selected-category-#{categories.first.id}")
+    page.replace_html 'select-categories', :partial => 'shared/select_subcategories',
+      :locals => {:object_name => object_name, :categories => @toplevel_categories}
   end if multiple %>
-  <%= button_to_remote_without_text(:cancel, _('Cancel'),
-      { :update => "select-categories",
-        :url => { :action => 'update_categories', :id => @object },
-        :loaded => visual_effect(:highlight, "select-categories")
-      },
-      :id => 'cancel-category-button') %>
-  </strong>
-<% else %>
-  <h3 class="box-title"><%= _('Select a category:') %></h3>
 <% end %>
-<% if !@categories.empty? %>
-  <h3><%= _('Categories:') %></h3>
-  <% @categories.select{|i| !@object.respond_to?(:accept_category?) || @object.accept_category?(i)}.each do |category| %>
-    <%= link_to_remote category.name,
-      { :update => "select-categories",
-        :url => { :action => "update_categories", :category_id => category.id, :id => @object},
-        :loaded => visual_effect(:highlight, "select-categories")
-      },
-      :class => 'select-subcategory-link',
-      :id => "select-category-#{category.id}-link"
-    %>
-  <% end %> &nbsp;
-<% end %>
+<div class="toplevel-categories">
+  <%= render :partial => 'shared/select_subcategories', :locals => {:object_name => object_name, :categories => @categories} %>
 </div>
@@ -0,0 +1,26 @@
+<% categories_selected ||= nil %>
+<% title ||= nil %>
+
+<% extend CategoriesHelper %>
+
+<%= content_tag "h#{title_size}", title, :class => "box-title" %>
+
+<%= hidden_field_tag "#{object_name}[category_ids][]", nil %>
+
+<div id="category-ajax-selector">
+<% unless categories_selected.nil? %>
+<div id="selected-categories">
+  <div class="label"><%= _('Selected categories:') %></div>
+  <% categories_selected.each do |cat| %>
+    <div id="selected-category-<%= cat.id %>">
+      <%= hidden_field_tag("#{object_name}[category_ids][]", cat.id) %>
+      <%= selected_category_link(cat) %>
+    </div>
+  <% end %>
+</div>
+<% end %>
+<div id="select-categories">
+  <%= render :partial => 'shared/select_categories', :locals => {:object_name => object_name, :multiple => true, :categories_selected => categories_selected }, :layout => false %>
+</div>
+
+</div>
@@ -0,0 +1,16 @@
+<% if !categories.nil? && !categories.empty? && !@object.nil? %>
+  <hr>
+  <div class="category-helper-label"><%= _('Click to select a category') %></div>
+
+  <% categories.select{|i| @object.accept_category?(i)}.each do |category| %>
+
+    <%= link_to_remote category.name,
+      { :update => "select-categories",
+        :url => { :action => "update_categories", :category_id => category.id, :id => @object},
+        :loaded => visual_effect(:highlight, "select-categories")
+      },
+      :class => 'select-subcategory-link',
+      :id => "select-category-#{category.id}-link"
+    %>
+  <% end %>
+<% end %>
 <% if block.cacheable? && use_cache %>
-  <% cache_timeout(block.cache_key(language), block.timeout) do %>
+  <% cache_timeout(block.cache_key(language, user), block.timeout) do %>
     <%= display_block_content(block, user, main_content) %>
   <% end %>
 <% else %>
@@ -12,7 +12,7 @@
           "/designs/templates/#{template.id}/thumbnail.png",
           :alt => _('The "%s" template')) +
         '<div class="opt-info">'.html_safe +
-        content_tag('strong', template.name, :class => 'name') +
+        content_tag('strong', template.name, :title => template.title, :class => 'name') +
         ' <br/> '.html_safe
         if @current_template == template.id  # selected
 <%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
-<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code) }) %>
+<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection) }) %>
 <%= _("Greetings,") %>
@@ -19,16 +19,17 @@
       <td class='actions'>
         <div class="members-buttons-cell">
           <% if p.is_admin? %>
-            <%= button_without_text :'reset-admin-role', _('Reset admin role'), :action => 'reset_admin_role', :id => p, :q => @q, :filter => @filter %>
+            <%= button_without_text :'reset-admin-role', _('Reset admin role'), {:action => 'reset_admin_role', :id => p, :q => @q}, :filter => @filter, :confirm => _("Do you want to reset this user as administrator?") %>
           <% else %>
-            <%= button_without_text :'set-admin-role', _('Set admin role'), :action => 'set_admin_role', :id => p, :q => @q, :filter => @filter %>
+            <%= button_without_text :'set-admin-role', _('Set admin role'), {:action => 'set_admin_role', :id => p, :q => @q}, :filter => @filter, :confirm => _("Do you want to set this user as administrator?") %>
           <% end %>
           <% if !p.user.activated? %>
-            <%= button_without_text :'activate-user', _('Activate user'), :action => 'activate', :id => p, :q => @q, :filter => @filter %>
+            <%= button_without_text :'activate-user', _('Activate user'), {:action => 'activate', :id => p, :q => @q}, :filter => @filter, :confirm => _("Do you want to activate this user?") %>
           <% else %>
-            <%= button_without_text :'deactivate-user', _('Deactivate user'), :action => 'deactivate', :id => p, :q => @q, :filter => @filter %>
+            <%= button_without_text :'deactivate-user', _('Deactivate user'), {:action => 'deactivate', :id => p, :q => @q}, :filter => @filter, :confirm => _("Do you want to deactivate this user?") %>
           <% end %>
-        </div>
+          <%= button_without_text :'delete', _('Remove'), {:action => :destroy_user, :id => p, :q => @q}, :method => :post, :filter => @filter, :confirm => _("Do you want to remove this user?") %>
+       </div>
       </td>
     </tr>
   <% end %>
@@ -0,0 +1,6 @@
+if Delayed::Backend::ActiveRecord::Job.table_exists?
+  job = Delayed::Backend::ActiveRecord::Job.all :conditions => ['handler LIKE ?', "%ActivitiesCounterCacheJob%"]
+  if job.blank?
+    Delayed::Backend::ActiveRecord::Job.enqueue(ActivitiesCounterCacheJob.new, -3)
+  end
+end
 Delayed::Worker.backend = :active_record
 Delayed::Worker.max_attempts = 2
-Delayed::Worker.max_run_time = 10.minutes
+
+# TODO This is consuming ton of space on development with a postgres connection
+# error on the jobs. This must be verified before going into production.
+# Logging jobs backtraces
+#class Delayed::Worker
+#  def handle_failed_job_with_loggin(job, error)
+#    handle_failed_job_without_loggin(job,error)
+#    Delayed::Worker.logger.error(error.message)
+#    Delayed::Worker.logger.error(error.backtrace.join("\n"))
+#  end
+#  alias_method_chain :handle_failed_job, :loggin
+#end
@@ -0,0 +1,2 @@
+require 'noosfero/role_assignment_ext'
+require 'noosfero/action_tracker_ext'
@@ -0,0 +1,3 @@
+if Delayed::Backend::ActiveRecord::Job.table_exists?
+  PersonNotifier.schedule_all_next_notification_mail
+end
@@ -0,0 +1,9 @@
+class AddRedirectionAfterSignupToEnvironment < ActiveRecord::Migration
+  def self.up
+    add_column :environments, :redirection_after_signup, :string, :default => 'keep_on_same_page'
+  end
+
+  def self.down
+    remove_column :environments, :redirection_after_signup
+  end
+end
@@ -0,0 +1,12 @@
+class MoveTitleVirtualFieldToNameInUploadedFile < ActiveRecord::Migration
+  def self.up
+    UploadedFile.find_each do |uploaded_file|
+      uploaded_file.name = uploaded_file.setting.delete :title
+      uploaded_file.send :update_without_callbacks
+    end
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
@@ -0,0 +1,16 @@
+class MoveContactEmailToNoreplyEmailAtEnvironment < ActiveRecord::Migration
+  def self.up
+    add_column :environments, :noreply_email, :string
+    Environment.reset_column_information
+
+    Environment.find_each do |environment|
+      environment.noreply_email = environment.contact_email
+      environment.contact_email = nil
+      environment.save!
+    end
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
@@ -0,0 +1,13 @@
+class AddIndexesForArticleSearch < ActiveRecord::Migration
+  def self.up
+    add_index :articles, :created_at
+    add_index :articles, :hits
+    add_index :articles, :comments_count
+  end
+
+  def self.down
+    remove_index :articles, :created_at
+    remove_index :articles, :hits
+    remove_index :articles, :comments_count
+  end
+end
@@ -0,0 +1,9 @@
+class AddIndexesForProfileSearch < ActiveRecord::Migration
+  def self.up
+    add_index :profiles, :created_at
+  end
+
+  def self.down
+    remove_index :profiles, :created_at
+  end
+end
@@ -0,0 +1,19 @@
+class CreateCacheCountsForProfiles < ActiveRecord::Migration
+  def self.up
+    add_column :profiles, :friends_count, :integer, :null => false, :default => 0
+    add_column :profiles, :members_count, :integer, :null => false,  :default => 0
+    add_column :profiles, :activities_count, :integer, :null => false,  :default => 0
+    add_index :profiles, :friends_count
+    add_index :profiles, :members_count
+    add_index :profiles, :activities_count
+  end
+
+  def self.down
+    remove_column :profiles, :friends_count
+    remove_column :profiles, :members_count
+    remove_column :profiles, :activities_count
+    remove_index :profiles, :friends_count
+    remove_index :profiles, :members_count
+    remove_index :profiles, :activities_count
+  end
+end
@@ -0,0 +1,12 @@
+class DefineInitialValueForProfilesFriendsCount < ActiveRecord::Migration
+  def self.up
+    friends_counts = execute("SELECT profiles.id, count(profiles.id) FROM profiles INNER JOIN friendships ON ( profiles.id = friendships.friend_id AND profiles.type = E'Person') GROUP BY profiles.id;")
+    friends_counts.each do |count|
+      execute("UPDATE profiles SET friends_count=#{count['count'].to_i} WHERE profiles.id=#{count['id']};")
+    end
+  end
+
+  def self.down
+      execute("UPDATE profiles SET friends_count=0;")
+  end
+end
@@ -0,0 +1,14 @@
+class DefineInitialValueForProfilesActivitiesCount < ActiveRecord::Migration
+  def self.up
+    person_activities_counts = execute("SELECT profiles.id, count(action_tracker.id) as count FROM profiles LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.user_id WHERE (action_tracker.created_at >= '#{30.days.ago.to_s(:db)}') AND ( (profiles.type = 'Person' ) ) GROUP BY profiles.id;")
+    organization_activities_counts = execute("SELECT profiles.id, count(action_tracker.id) as count FROM profiles LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.target_id WHERE (action_tracker.created_at >= '#{30.days.ago.to_s(:db)}') AND ( (profiles.type = 'Community' OR profiles.type = 'Enterprise' OR profiles.type = 'Organization' ) ) GROUP BY profiles.id;")
+    activities_counts = person_activities_counts.entries + organization_activities_counts.entries
+    activities_counts.each do |count|
+      execute("UPDATE profiles SET activities_count=#{count['count'].to_i} WHERE profiles.id=#{count['id']};")
+    end
+  end
+
+  def self.down
+    execute("UPDATE profiles SET activities_count=0;")
+  end
+end
@@ -0,0 +1,9 @@
+class AddReturnToToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :return_to, :string
+  end
+
+  def self.down
+    remove_column :users, :return_to, :string
+  end
+end
@@ -0,0 +1,12 @@
+class DefineInitialValueForProfilesMembersCount < ActiveRecord::Migration
+   def self.up
+    members_counts = execute("SELECT profiles.id, count(profiles.id) FROM profiles LEFT OUTER JOIN role_assignments ON profiles.id = role_assignments.resource_id WHERE (profiles.type = 'Organization' OR profiles.type = 'Community' OR profiles.type = 'Enterprise') GROUP BY profiles.id;")
+    members_counts.each do |count|
+      execute("UPDATE profiles SET members_count=#{count['count'].to_i} WHERE profiles.id=#{count['id']};")
+    end
+  end
+
+  def self.down
+      execute("UPDATE profiles SET members_count=0;")
+  end
+end
	@@ -45,6 +45,20 @@ class UsersController < AdminController		@@ -45,6 +45,20 @@ class UsersController < AdminController
45	redirect_to :action => :index, :q => params[:q], :filter => params[:filter]	45	redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
46	end	46	end
47		47
		48	+
		49	+ def destroy_user
		50	+ if request.post?
		51	+ person = environment.people.find_by_id(params[:id])
		52	+ if person && person.destroy
		53	+ session[:notice] = _('The profile was deleted.')
		54	+ else
		55	+ session[:notice] = _('Could not remove profile')
		56	+ end
		57	+ end
		58	+ redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
		59	+ end
		60	+
		61	+
48	def download	62	def download
49	respond_to do \|format\|	63	respond_to do \|format\|
50	format.html	64	format.html
	@@ -80,6 +80,22 @@ class BoxOrganizerController < ApplicationController		@@ -80,6 +80,22 @@ class BoxOrganizerController < ApplicationController
80	render :action => 'edit', :layout => false	80	render :action => 'edit', :layout => false
81	end	81	end
82		82
		83	+ def search_autocomplete
		84	+ if request.xhr? and params[:query]
		85	+ search = params[:query]
		86	+ path_list = if boxes_holder.is_a?(Environment) && boxes_holder.enabled?('use_portal_community') && boxes_holder.portal_community
		87	+ boxes_holder.portal_community.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { \|content\| "/{portal}/"+content.path }
		88	+ elsif boxes_holder.is_a?(Profile)
		89	+ boxes_holder.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { \|content\| "/{profile}/"+content.path }
		90	+ else
		91	+ []
		92	+ end
		93	+ render :json => path_list.to_json
		94	+ else
		95	+ redirect_to "/"
		96	+ end
		97	+ end
		98	+
83	def save	99	def save
84	@block = boxes_holder.blocks.find(params[:id])	100	@block = boxes_holder.blocks.find(params[:id])
85	@block.update_attributes(params[:block])	101	@block.update_attributes(params[:block])
	@@ -99,6 +115,12 @@ class BoxOrganizerController < ApplicationController		@@ -99,6 +115,12 @@ class BoxOrganizerController < ApplicationController
99	end	115	end
100	end	116	end
101		117
		118	+ def clone_block
		119	+ block = Block.find(params[:id])
		120	+ block.duplicate
		121	+ redirect_to :action => 'index'
		122	+ end
		123	+
102	protected :boxes_editor?	124	protected :boxes_editor?
103		125
104	end	126	end
	@@ -55,10 +55,4 @@ class ProfileDesignController < BoxOrganizerController		@@ -55,10 +55,4 @@ class ProfileDesignController < BoxOrganizerController
55	blocks	55	blocks
56	end	56	end
57		57
58	- def clone
59	- block = Block.find(params[:id])
60	- block.duplicate
61	- redirect_to :action => 'index'
62	- end
63	-
64	end	58	end
	@@ -111,6 +111,15 @@ class ContentViewerController < ApplicationController		@@ -111,6 +111,15 @@ class ContentViewerController < ApplicationController
111	@comments = @plugins.filter(:unavailable_comments, @comments)	111	@comments = @plugins.filter(:unavailable_comments, @comments)
112	@comments_count = @comments.count	112	@comments_count = @comments.count
113	@comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )	113	@comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
		114	+ @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
		115	+
		116	+ if request.xhr? and params[:comment_order]
		117	+ if @comment_order == 'newest'
		118	+ @comments = @comments.reverse
		119	+ end
		120	+
		121	+ return render :partial => 'comment/comment', :collection => @comments
		122	+ end
114		123
115	if params[:slideshow]	124	if params[:slideshow]
116	render :action => 'slideshow', :layout => 'slideshow'	125	render :action => 'slideshow', :layout => 'slideshow'
	@@ -304,14 +304,6 @@ class ProfileController < PublicController		@@ -304,14 +304,6 @@ class ProfileController < PublicController
304	end	304	end
305	end	305	end
306		306
307	- def profile_info
308	- begin
309	- @block = profile.blocks.find(params[:block_id])
310	- rescue
311	- render :text => _('Profile information could not be loaded')
312	- end
313	- end
314	-
315	def report_abuse	307	def report_abuse
316	@abuse_report = AbuseReport.new	308	@abuse_report = AbuseReport.new
317	render :layout => false	309	render :layout => false
	@@ -12,7 +12,7 @@ class ThemesController < ApplicationController		@@ -12,7 +12,7 @@ class ThemesController < ApplicationController
12		12
13	def index	13	def index
14	@environment = environment	14	@environment = environment
15	- @themes = environment.themes + Theme.approved_themes(target)	15	+ @themes = (environment.themes + Theme.approved_themes(target)).sort_by { \|t\| t.name }
16		16
17	@current_theme = target.theme	17	@current_theme = target.theme
18		18
	@@ -608,49 +608,18 @@ module ApplicationHelper		@@ -608,49 +608,18 @@ module ApplicationHelper
608	end	608	end
609		609
610	attr_reader :environment	610	attr_reader :environment
		611	+
611	def select_categories(object_name, title=nil, title_size=4)	612	def select_categories(object_name, title=nil, title_size=4)
612	return nil if environment.enabled?(:disable_categories)	613	return nil if environment.enabled?(:disable_categories)
613	if title.nil?	614	if title.nil?
614	title = _('Categories')	615	title = _('Categories')
615	end	616	end
616		617
617	- object = instance_variable_get("@#{object_name}")
618	-
619	- result = content_tag 'h'+title_size.to_s(), title
620	- result << javascript_tag( 'function open_close_cat( link ) {
621	- var div = link.parentNode.getElementsByTagName("div")[0];
622	- var end = function(){
623	- if ( div.style.display == "none" ) {
624	- this.link.className="button icon-button icon-down"
625	- } else {
626	- this.link.className="button icon-button icon-up-red"
627	- }
628	- }
629	- Effect.toggle( div, "slide", { link:link, div:div, afterFinish:end } )
630	- }')
631	- environment.top_level_categories.select{\|i\| !i.children.empty?}.each do \|toplevel\|
632	- next unless object.accept_category?(toplevel)
633	- # FIXME
634	- ([toplevel] + toplevel.children_for_menu).each do \|cat\|
635	- if cat.top_level?
636	- result << '<div class="categorie_box">'.html_safe
637	- result << icon_button( :down, _('open'), '#', :onclick => 'open_close_cat(this); return false' )
638	- result << content_tag('h5', toplevel.name)
639	- result << '<div style="display:none"><ul class="categories">'.html_safe
640	- else
641	- checkbox_id = "#{object_name}_#{cat.full_name.downcase.gsub(/\s+\|\//, '_')}"
642	- result << content_tag('li', labelled_check_box(
643	- cat.full_name_without_leading(1, " → "),
644	- "#{object_name}[category_ids][]", cat.id,
645	- object.category_ids.include?(cat.id), :id => checkbox_id,
646	- :onchange => 'this.parentNode.className=(this.checked?"cat_checked":"")' ),
647	- :class => ( object.category_ids.include?(cat.id) ? 'cat_checked' : '' ) ) + "\n"
648	- end
649	- end
650	- result << '</ul></div></div>'.html_safe
651	- end	618	+ @object = instance_variable_get("@#{object_name}")
		619	+ @categories = environment.top_level_categories
652		620
653	- content_tag('div', result)	621	+ @current_categories = environment.top_level_categories.select{\|i\| !i.children.empty?}
		622	+ render :partial => 'shared/select_categories_top', :locals => {:object_name => object_name, :title => title, :title_size => title_size, :multiple => true, :categories_selected => @object.categories }, :layout => false
654	end	623	end
655		624
656	def theme_option(opt = nil)	625	def theme_option(opt = nil)
	@@ -920,12 +889,11 @@ module ApplicationHelper		@@ -920,12 +889,11 @@ module ApplicationHelper
920		889
921	def page_title	890	def page_title
922	(@page ? @page.title + ' - ' : '') +	891	(@page ? @page.title + ' - ' : '') +
923	- (profile ? profile.short_name + ' - ' : '') +
924	(@topic ? @topic.title + ' - ' : '') +	892	(@topic ? @topic.title + ' - ' : '') +
925	(@section ? @section.title + ' - ' : '') +	893	(@section ? @section.title + ' - ' : '') +
926	(@toc ? _('Online Manual') + ' - ' : '') +	894	(@toc ? _('Online Manual') + ' - ' : '') +
927	(@controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +	895	(@controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
928	- environment.name +	896	+ (profile ? profile.short_name : environment.name) +
929	(@category ? " - #{@category.full_name}" : '')	897	(@category ? " - #{@category.full_name}" : '')
930	end	898	end
931		899
	@@ -65,7 +65,7 @@ module BoxesHelper		@@ -65,7 +65,7 @@ module BoxesHelper
65	end	65	end
66		66
67	def display_box_content(box, main_content)	67	def display_box_content(box, main_content)
68	- context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params }	68	+ context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params, :user => user }
69	box_decorator.select_blocks(box.blocks.includes(:box), context).map { \|item\| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)	69	box_decorator.select_blocks(box.blocks.includes(:box), context).map { \|item\| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
70	end	70	end
71		71
	@@ -212,7 +212,7 @@ module BoxesHelper		@@ -212,7 +212,7 @@ module BoxesHelper
212		212
213	if !block.main?	213	if !block.main?
214	buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})	214	buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
215	- buttons << icon_button(:clone, _('Clone'), { :action => 'clone', :id => block.id }, { :method => 'post' })	215	+ buttons << icon_button(:clone, _('Clone'), { :action => 'clone_block', :id => block.id }, { :method => 'post' })
216	end	216	end
217		217
218	if block.respond_to?(:help)	218	if block.respond_to?(:help)
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+module CacheCounterHelper
	2	+ def update_cache_counter(name, object, value)
	3	+ if object.present?
	4	+ object.class.update_counters(object.id, name => value)
	5	+ end
	6	+ end
	7	+end
	@@ -48,4 +48,12 @@ module CategoriesHelper		@@ -48,4 +48,12 @@ module CategoriesHelper
48	labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))	48	labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))
49	end	49	end
50		50
		51	+ #FIXME make this test
		52	+ def selected_category_link(cat)
		53	+ content_tag('div', button_to_function_without_text(:remove, _('Remove'), nil) {\|page\| page["selected-category-#{cat.id}"].remove} +
		54	+ link_to_function(cat.full_name(' → '), nil, :id => "remove-selected-category-#{cat.id}-button", :class => 'select-subcategory-link') {\|page\| page["selected-category-#{cat.id}"].remove},
		55	+ :class => 'selected-category'
		56	+ )
		57	+ end
		58	+
51	end	59	end