Merge remote-tracking branch 'origin' into stable

Conflicts: app/views/content_viewer/view_page.rhtml app/views/profile_editor/index.rhtml debian/changelog lib/noosfero.rb plugins/comment_group/test/functional/comment_group_plugin_profile_controller_test.rb

Merge remote-tracking branch 'origin' into stable
Conflicts: app/views/content_viewer/view_page.rhtml app/views/profile_editor/index.rhtml debian/changelog lib/noosfero.rb plugins/comment_group/test/functional/comment_group_plugin_profile_controller_test.rb
Rodrigo Souto
2 parents 62d3dca2 24066ab3
Showing 411 changed files with 25827 additions and 10014 deletions Show diff stats
AUTHORS
INSTALL.md
README.md
app/controllers/admin/environment_design_controller.rb
app/controllers/admin/environment_themes_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/my_profile/profile_members_controller.rb
app/controllers/my_profile/profile_themes_controller.rb
app/controllers/my_profile/themes_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/catalog_controller.rb
app/controllers/public/comment_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/profile_controller.rb
app/controllers/public/search_controller.rb
app/controllers/themes_controller.rb
app/helpers/application_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>
@@ -155,6 +162,7 @@ João M. M. Silva + Rafael Manzo &lt;jaodsilv@linux.ime.usp.br&gt;
 João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
 Joenio Costa <joenio@colivre.coop.br>
 Josef Spillner <josef.spillner@tu-dresden.de>
+Junior Silva <junior@bajor.localhost.localdomain>
 Junior Silva <juniorsilva1001@gmail.com>
 Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
 Junior Silva <juniorsilva@colivre.coop.br>
@@ -202,6 +210,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>
@@ -110,7 +110,7 @@ Setup Noosfero log and tmp directories:
     # cd /var/lib/noosfero/current
     # ./etc/init.d/noosfero setup
-Now it's time to setup the database. In this example we are using PostgreSQL, so if you are planning to use a different database this steps won't apply.
+Now it's time to setup the database. In this example we are using PostgreSQL, so if you are planning to use a different database this steps won't apply. Pay special attention to the default collation defined on your setup by the environment variable LC_COLLATE because it might interfere in some sorting operations on your database. For more information checkout `man locale`.
     # apt-get install postgresql libpgsql-ruby
     # su postgres -c 'createuser noosfero -S -d -R'
+[![Code Climate](https://codeclimate.com/github/Noosfero/noosfero.png)](https://codeclimate.com/github/Noosfero/noosfero)
+
 Noosfero - a web-based social platform
 ======================================
@@ -30,4 +32,4 @@ Authorship and copyright information is available in the files listed below.
     --------------------  -----------------------------------------
     AUTHORS.md            list of authors (updated at each release)
     COPYRIGHT             Copyright statement for the project
 -    COPYING               Full text of the project license
+    COPYING               Full text of the project license
 \ No newline at end of file
@@ -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
@@ -0,0 +1,11 @@
+class EnvironmentThemesController < ThemesController
+
+  protect 'edit_appearance', :environment
+  
+  no_design_blocks
+
+  def target
+    @target = environment
+  end
+
+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
@@ -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
@@ -68,6 +74,9 @@ class CmsController &lt; MyProfileController
   def edit
     @success_back_to = params[:success_back_to]
     @article = profile.articles.find(params[:id])
+    version = params[:version]
+    @article.revert_to(version) if version
+
     @parent_id = params[:parent_id]
     @type = params[:type] || @article.class.to_s
     translations if @article.translatable?
@@ -202,7 +211,7 @@ class CmsController &lt; MyProfileController
       @article.destroy
       session[:notice] = _("\"#{@article.name}\" was removed.")
       referer = ActionController::Routing::Routes.recognize_path URI.parse(request.referer).path rescue nil
-      if referer and referer[:controller] == 'cms'
+      if referer and referer[:controller] == 'cms' and referer[:action] != 'edit'
         redirect_to referer
       elsif @article.parent
         redirect_to @article.parent.url
@@ -218,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
@@ -32,6 +32,7 @@ class ProfileDesignController &lt; BoxOrganizerController
     if profile.enterprise?
       blocks << DisabledEnterpriseMessageBlock
       blocks << HighlightsBlock
+      blocks << ProductCategoriesBlock
       blocks << FeaturedProductsBlock
       blocks << FansBlock
       blocks += plugins.dispatch(:extra_blocks, :type => Enterprise)
@@ -54,4 +55,10 @@ 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
@@ -2,7 +2,7 @@ class ProfileMembersController &lt; MyProfileController
   protect 'manage_memberships', :profile
   def index
-    @members = profile.members
+    @members = profile.members_by_name
     @member_role = environment.roles.find_by_name('member')
   end
@@ -0,0 +1,75 @@
+class ProfileThemesController < ThemesController
+
+  needs_profile
+
+  protect 'edit_appearance', :profile
+
+  no_design_blocks
+
+  def target
+    @target = profile
+  end
+
+  def new
+    if !request.xhr?
+      id = params[:name] ? params[:name].to_slug : 'my-theme'
+      t = Theme.new(id, :name => params[:name], :owner => profile, :public => false)
+      t.save
+      redirect_to :action => 'index'
+    else
+      render :action => 'new', :layout => false
+    end
+  end
+
+  def edit
+    @theme = profile.find_theme(params[:id])
+    @css_files = @theme.css_files
+    @image_files = @theme.image_files
+  end
+
+  def add_css
+    @theme = profile.find_theme(params[:id])
+    if request.xhr?
+      render :action => 'add_css', :layout => false
+    else
+      @theme.add_css(params[:css])
+      redirect_to :action => 'edit', :id => @theme.id
+    end
+  end
+
+  def css_editor
+    @theme = profile.find_theme(params[:id])
+    @css = params[:css]
+
+    @code = @theme.read_css(@css)
+    render :action => 'css_editor', :layout => false
+  end
+
+  post_only :update_css
+  def update_css
+    @theme = profile.find_theme(params[:id])
+    @theme.update_css(params[:css], params[:csscode])
+    redirect_to :action => 'edit', :id => @theme.id
+  end
+
+  def add_image
+    @theme = profile.find_theme(params[:id])
+    if request.xhr?
+      render :action => 'add_image', :layout => false
+    else
+      @theme.add_image(params[:image].original_filename, params[:image].read)
+      redirect_to :action => 'edit', :id => @theme.id
+    end
+  end
+
+  def start_test
+    session[:theme] = params[:id]
+    redirect_to :controller => 'content_viewer', :profile => profile.identifier, :action => 'view_page'
+  end
+
+  def stop_test
+    session[:theme] = nil
+    redirect_to :action => 'index'
+  end
+
+end
@@ -1,91 +0,0 @@
-class ThemesController < MyProfileController
-
-  protect 'edit_appearance', :profile
-  no_design_blocks
-
-  def set
-    profile.update_theme(params[:id])
-    redirect_to :action => 'index'
-  end
-
-  def unset
-    profile.update_theme(nil)
-    redirect_to :action => 'index'
-  end
-
-  def index
-    @themes = (profile.environment.themes + Theme.approved_themes(profile)).uniq_by{ |t| t.id }.sort_by{ |t| t.name }
-    @current_theme = profile.theme
-
-    @layout_templates = LayoutTemplate.all
-    @current_template = profile.layout_template
-  end
-
-  def new
-    if !request.xhr?
-      id = params[:name] ? params[:name].to_slug : 'my-theme'
-      t = Theme.new(id, :name => params[:name], :owner => profile, :public => false)
-      t.save
-      redirect_to :action => 'index'
-    else
-      render :action => 'new', :layout => false
-    end
-  end
-
-  def edit
-    @theme = profile.find_theme(params[:id])
-    @css_files = @theme.css_files
-    @image_files = @theme.image_files
-  end
-
-  def add_css
-    @theme = profile.find_theme(params[:id])
-    if request.xhr?
-      render :action => 'add_css', :layout => false
-    else
-      @theme.add_css(params[:css])
-      redirect_to :action => 'edit', :id => @theme.id
-    end
-  end
-
-  def css_editor
-    @theme = profile.find_theme(params[:id])
-    @css = params[:css]
-
-    @code = @theme.read_css(@css)
-    render :action => 'css_editor', :layout => false
-  end
-
-  post_only :update_css
-  def update_css
-    @theme = profile.find_theme(params[:id])
-    @theme.update_css(params[:css], params[:csscode])
-    redirect_to :action => 'edit', :id => @theme.id
-  end
-
-  def add_image
-    @theme = profile.find_theme(params[:id])
-    if request.xhr?
-      render :action => 'add_image', :layout => false
-    else
-      @theme.add_image(params[:image].original_filename, params[:image].read)
-      redirect_to :action => 'edit', :id => @theme.id
-    end
-  end
-
-  def start_test
-    session[:theme] = params[:id]
-    redirect_to :controller => 'content_viewer', :profile => profile.identifier, :action => 'view_page'
-  end
-
-  def stop_test
-    session[:theme] = nil
-    redirect_to :action => 'index'
-  end
-
-  def set_layout_template
-    profile.update_layout_template(params[:id])
-    redirect_to :action => 'index'
-  end
-
-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
 class CatalogController < PublicController
   needs_profile
-  no_design_blocks
   before_filter :check_enterprise_and_environment
@@ -71,7 +71,9 @@ class CommentController &lt; ApplicationController
       return
     end
-    @comment.save
+    if @comment.save
+      @plugins.dispatch(:process_extra_comment_params, [@comment,params])
+    end
     respond_to do |format|
       format.js do
@@ -113,6 +115,8 @@ class CommentController &lt; ApplicationController
   def update
     if @comment.update_attributes(params[:comment])
+      @plugins.dispatch(:process_extra_comment_params, [@comment,params])
+
       respond_to do |format|
         format.js do
           comment_to_render = @comment.comment_root
+require 'diffy'
+
 class ContentViewerController < ApplicationController
   needs_profile
@@ -7,6 +9,7 @@ class ContentViewerController &lt; ApplicationController
   def view_page
     path = params[:page].join('/')
+    @version = params[:version].to_i
     if path.blank?
       @page = profile.home_page
@@ -25,27 +28,15 @@ class ContentViewerController &lt; ApplicationController
       end
     end
-    if !@page.nil? && !@page.display_to?(user)
-      if !profile.public?
-        private_profile_partial_parameters
-        render :template => 'profile/_private_profile.rhtml', :status => 403
-      else #if !profile.visible?
-        message = _('You are not allowed to view this content.')
-        message += ' ' + _('You can contact the owner of this profile to request access then.')
-        render_access_denied(message)
-      end
-      return
-    end
+    return unless allow_access_to_page(path)
-    # page not found, give error
-    if @page.nil?
-      render_not_found(@path)
-      return
-    end
-
-    if request.xhr? && params[:toolbar]
-      render :partial => 'article_toolbar'
-      return
+    if @version > 0
+      return render_access_denied unless @page.display_versions?
+      @versioned_article = @page.versions.find_by_version(@version)
+      if @versioned_article && @page.versions.latest.version != @versioned_article.version
+        render :template => 'content_viewer/versioned_article.rhtml'
+        return
+      end
     end
     redirect_to_translation if @page.profile.redirect_l10n
@@ -128,6 +119,21 @@ class ContentViewerController &lt; ApplicationController
     end
   end
+  def versions_diff
+    path = params[:page].join('/')
+    @page = profile.articles.find_by_path(path)
+    @v1, @v2 = @page.versions.find_by_version(params[:v1]), @page.versions.find_by_version(params[:v2])
+  end
+
+  def article_versions
+    path = params[:page].join('/')
+    @page = profile.articles.find_by_path(path)
+    return unless allow_access_to_page(path)
+
+    render_access_denied unless @page.display_versions?
+    @versions = @page.versions.paginate(:per_page => per_page, :page => params[:npage])
+  end
+
   protected
   def per_page
@@ -158,6 +164,24 @@ class ContentViewerController &lt; ApplicationController
   end
   helper_method :pass_without_comment_captcha?
+  def allow_access_to_page(path)
+    allowed = true
+    if @page.nil? # page not found, give error
+      render_not_found(path)
+      allowed = false
+    elsif !@page.display_to?(user)
+      if !profile.public?
+        private_profile_partial_parameters
+        render :template => 'profile/_private_profile.rhtml', :status => 403
+        allowed = false
+      else #if !profile.visible?
+        render_access_denied
+        allowed = false
+      end
+    end
+    allowed
+  end
+
   def user_is_a_bot?
     user_agent= request.env["HTTP_USER_AGENT"]
     user_agent.blank? ||
@@ -166,5 +190,4 @@ class ContentViewerController &lt; ApplicationController
     user_agent.match(/crawler/) ||
     user_agent.match(/\(.*https?:\/\/.*\)/)
   end
-
 end
@@ -67,7 +67,7 @@ class ProfileController &lt; PublicController
   def members
     if is_cache_expired?(profile.members_cache_key(params))
-      @members = profile.members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
+      @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
     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
@@ -80,7 +80,7 @@ class SearchController &lt; PublicController
   end
   def enterprises
-    @scope = visible_profiles(Enterprise, [{:products => :product_category}])
+    @scope = visible_profiles(Enterprise)
     full_text_search
   end
@@ -0,0 +1,42 @@
+class ThemesController < ApplicationController
+
+  before_filter :login_required
+
+  no_design_blocks
+
+  # attr_reader :target
+
+  def target
+    @target
+  end
+
+  def index
+    @environment = environment
+    @themes = (environment.themes + Theme.approved_themes(target)).sort_by { |t| t.name }
+
+    @current_theme = target.theme
+
+    @layout_templates = LayoutTemplate.all
+    @current_template = target.layout_template
+  end
+
+  def set
+    target.update_theme(params[:id])
+    redirect_to :action => 'index'
+  end
+
+  def unset
+    if target.kind_of?(Environment)
+      target.update_theme('default')
+    else
+      target.update_theme(nil)
+    end
+    redirect_to :action => 'index'
+  end
+
+  def set_layout_template
+    target.update_layout_template(params[:id])
+    redirect_to :action => 'index'
+  end
+
+end
@@ -42,6 +42,8 @@ module ApplicationHelper
   include TokenHelper
+  include CatalogHelper
+
   def locale
     (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   end
@@ -512,24 +514,25 @@ module ApplicationHelper
   def profile_cat_icons( profile )
     if profile.class == Enterprise
-      icons = profile.product_categories.map{ |c| c.size > 1 ? c[1] : nil }.
-        compact.uniq.map do |c|
-          cat_name = c.gsub( /[-_\s,.;'"]+/, '_' )
-          cat_icon = "/images/icons-cat/#{cat_name}.png"
-          if ! File.exists? RAILS_ROOT.to_s() + '/public/' + cat_icon
-            cat_icon = '/images/icons-cat/undefined.png'
-          end
-          content_tag('span',
-            content_tag( 'span', c ),
-            :title => c,
-            :class => 'product-cat-icon cat_icon_' + cat_name,
-            :style => "background-image:url(#{cat_icon})"
-          )
-        end.join("\n").html_safe
-        content_tag('div',
-          content_tag( 'span', _('Principal Product Categories'), :class => 'header' ) +"\n"+ icons,
-          :class => 'product-category-icons'
+      icons = profile.product_categories.unique_by_level(2).limit(3).map do |c|
+        filtered_category = c.filtered_category.blank? ? c.path.split('/').last : c.filtered_category
+        category_title = filtered_category.split(/[-_\s,.;'"]+/).map(&:capitalize).join(' ')
+        category_name = category_title.gsub(' ', '_' )
+        category_icon = "/images/icons-cat/#{category_name}.png"
+        if ! File.exists? RAILS_ROOT.to_s() + '/public/' + category_icon
+          category_icon = '/images/icons-cat/undefined.png'
+        end
+        content_tag('span',
+          content_tag( 'span', category_title ),
+          :title => category_title,
+          :class => 'product-cat-icon cat_icon_' + category_name,
+          :style => "background-image:url(#{category_icon})"
         )
+      end.join("\n").html_safe
+      content_tag('div',
+        content_tag( 'span', _('Principal Product Categories'), :class => 'header' ) +"\n"+ icons,
+        :class => 'product-category-icons'
+      )
     else
       ''
     end
@@ -606,49 +609,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)
@@ -918,12 +890,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
@@ -1178,6 +1149,7 @@ module ApplicationHelper
   #FIXME Use time_ago_in_words instead of this method if you're using Rails 2.2+
   def time_ago_as_sentence(from_time, include_seconds = false)
     to_time = Time.now
+    from_time = Time.parse(from_time.to_s)
     from_time = from_time.to_time if from_time.respond_to?(:to_time)
     to_time = to_time.to_time if to_time.respond_to?(:to_time)
     distance_in_minutes = (((to_time - from_time).abs)/60).round
@@ -1402,4 +1374,8 @@ module ApplicationHelper
     content.nil? ? '' : content.id.to_s
   end
+  def display_article_versions(article, version = nil)
+    content_tag('ul', article.versions.map {|v| link_to("r#{v.version}", @page.url.merge(:version => v.version))})
+  end
+
 end
@@ -28,7 +28,7 @@ module ArticleHelper
         'div',
         check_box(:article, :notify_comments) +
         content_tag('label', _('I want to receive a notification of each comment written by e-mail'), :for => 'article_notify_comments') +
-        observe_field(:article_accept_comments, :function => "$('article_notify_comments').disabled = ! $('article_accept_comments').checked;$('article_moderate_comments').disabled = ! $('article_accept_comments').checked") 
+        observe_field(:article_accept_comments, :function => "$('article_notify_comments').disabled = ! $('article_accept_comments').checked;$('article_moderate_comments').disabled = ! $('article_accept_comments').checked")
       ) +
       content_tag(
@@ -42,7 +42,21 @@ module ArticleHelper
         'div',
         check_box(:article, :display_hits) +
         content_tag('label', _('I want this article to display the number of hits it received'), :for => 'article_display_hits')
-      ) : '')
+      ) : '') +
+
+      (article.can_display_versions? ?
+      content_tag(
+        '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 }
+    context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params }
     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,6 +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' })
     end
     if block.respond_to?(:help)
@@ -9,7 +9,11 @@ module CatalogHelper
       @categories = ProductCategory.on_level(params[:level]).order(:name)
     end
-    @products = profile.products.from_category(@category).paginate(:order => 'available desc, highlighted desc, name asc', :per_page => 9, :page => options[:page])
+    @products = profile.products.from_category(@category).paginate(
+      :order => 'available desc, highlighted desc, name asc',
+      :per_page => @profile.products_per_catalog_page,
+      :page => options[:page]
+    )
   end
   def breadcrumb(category)
@@ -20,20 +24,24 @@ module CatalogHelper
     content_tag('div', all_items.join(' &rarr; '), :id => 'breadcrumb')
   end
-  def category_link(category, sub = false)
+  def category_link(category)
     count = profile.products.from_category(category).count
     name = truncate(category.name, :length => 22 - count.to_s.size)
-    link_name = sub ? name : content_tag('strong', name)
-    link = link_to(link_name, {:controller => :catalog, :action => 'index', :level => category.id}, :title => category.name)
-    content_tag('li', "#{link} (#{count})") if count > 0
+    link = link_to(name, {:controller => 'catalog', :action => 'index', :level => category.id}, :title => category.name)
+    content_tag('div', "#{link} <span class=\"count\">#{count}</span>") if count > 0
   end
-  def category_sub_links(category)
+  def category_with_sub_list(category)
+    content_tag 'li', "#{category_link(category)}\n#{sub_category_list(category)}"
+  end
+
+  def sub_category_list(category)
     sub_categories = []
     category.children.order(:name).each do |sub_category|
-      sub_categories << category_link(sub_category, true)
+      cat_link = category_link sub_category
+      sub_categories << content_tag('li', cat_link) unless cat_link.nil?
     end
-    content_tag('ul', sub_categories) if sub_categories.size > 1
+    content_tag('ul', sub_categories) if sub_categories.size > 0
   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
@@ -21,10 +21,19 @@ 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)
-    content_tag(:li, link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger comment-trigger', :url => url), :class=> 'vcard') unless links.empty?
+    links_submenu = links.select{|link| link[:action_bar].blank?}
+    links_action_bar = links - links_submenu
+    links_submenu = links_submenu.collect {|link| link.slice(:link)}
+    render :partial => 'comment/comment_actions', :locals => {:links_submenu => links_submenu, :links_action_bar => links_action_bar, :url => url, :comment => comment}
   end
   private
@@ -51,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
@@ -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
@@ -16,14 +16,17 @@ module ProfileHelper
   end
   def display_contact(profile)
-    address = display_field(_('Address:'), profile, :address)
-    zip = display_field(_('ZIP code:'), profile, :zip_code)
-    phone = display_field(_('Contact phone:'), profile, :contact_phone)
-    email = display_field(_('e-Mail:'), profile, :email) { |email| link_to_email(email) }
-    if address.blank? && zip.blank? && phone.blank? && email.blank?
+    fields = []
+    fields << display_field(_('Address:'), profile, :address).html_safe
+    fields << display_field(_('ZIP code:'), profile, :zip_code).html_safe
+    fields << display_field(_('Contact phone:'), profile, :contact_phone).html_safe
+    fields << display_field(_('e-Mail:'), profile, :email) { |email| link_to_email(email) }.html_safe
+    fields << display_field(_('Personal website:'), profile, :personal_website).html_safe
+    fields << display_field(_('Jabber:'), profile, :jabber_id).html_safe
+    if fields.reject!(&:blank?).empty?
       ''
     else
-      content_tag('tr', content_tag('th', _('Contact'), { :colspan => 2 })) + address + zip + phone + email
+      content_tag('tr', content_tag('th', _('Contact'), { :colspan => 2 })) + fields.join.html_safe
     end
   end
@@ -201,6 +201,7 @@ class Article &lt; ActiveRecord::Base
   acts_as_filesystem
   acts_as_versioned
+  self.non_versioned_columns << 'setting'
   def comment_data
     comments.map {|item| [item.title, item.body].join(' ') }.join(' ')
@@ -604,25 +605,49 @@ class Article &lt; ActiveRecord::Base
     false
   end
-  def author
-    if versions.empty?
-      last_changed_by
-    else
-      author_id = versions.first.last_changed_by_id
+  settings_items :display_versions, :type => :boolean, :default => false
+
+  def can_display_versions?
+    false
+  end
+
+  def display_versions?
+    can_display_versions? && display_versions
+  end
+
+  def author(version_number = nil)
+    if version_number
+      version = versions.find_by_version(version_number)
+      author_id = version.last_changed_by_id if version
       Person.exists?(author_id) ? Person.find(author_id) : nil
+    else
+      if versions.empty?
+        last_changed_by
+      else
+        author_id = versions.first.last_changed_by_id
+        Person.exists?(author_id) ? Person.find(author_id) : nil
+      end
     end
   end
-  def author_name
-    author ? author.name : (setting[:author_name] || _('Unknown'))
+  def author_name(version_number = nil)
+    person = author(version_number)
+    person ? person.name : (setting[:author_name] || _('Unknown'))
   end
-  def author_url
-    author ? author.url : nil
+  def author_url(version_number = nil)
+    person = author(version_number)
+    person ? person.url : nil
   end
-  def author_id
-    author ? author.id : nil
+  def author_id(version_number = nil)
+    person = author(version_number)
+    person ? person.id : nil
+  end
+
+  def version_license(version_number = nil)
+    return license if version_number.nil?
+    profile.environment.licenses.find_by_id(versions.find_by_version(version_number).license_id)
   end
   alias :active_record_cache_key :cache_key
@@ -631,7 +656,9 @@ class Article &lt; ActiveRecord::Base
       (allow_post_content?(the_profile) ? "-owner" : '') +
       (params[:npage] ? "-npage-#{params[:npage]}" : '') +
       (params[:year] ? "-year-#{params[:year]}" : '') +
-      (params[:month] ? "-month-#{params[:month]}" : '')
+      (params[:month] ? "-month-#{params[:month]}" : '') +
+      (params[:version] ? "-version-#{params[:version]}" : '')
+
   end
   def first_paragraph
@@ -23,30 +23,41 @@ class Block &lt; ActiveRecord::Base
   # * <tt>:article</tt>: the article being viewed currently
   # * <tt>:language</tt>: in which language the block will be displayed
   def visible?(context = nil)
-    if display == 'never'
-      return false
-    end
+    return false if display == 'never'
+
     if context
-      if language != 'all' && language != context[:locale]
-        return false
-      end
-      if display == 'home_page_only'
-        if context[:article]
-          return context[:article] == owner.home_page
-        else
-          return context[:request_path] == '/'
-        end
-      elsif display == 'except_home_page'
-        if context[:article]
-          return context[:article] != owner.home_page
-        else
-          return context[:request_path] != '/' + (owner.kind_of?(Profile) ? owner.identifier : '')
-        end
+      return false if language != 'all' && language != context[:locale]
+
+      begin
+        return self.send("display_#{display}", context)
+      rescue NoMethodError => exception
+        raise "Display '#{display}' is not a valid value."
       end
     end
+
     true
   end
+  def display_always(context)
+    true
+  end
+
+  def display_home_page_only(context)
+    if context[:article]
+      return context[:article] == owner.home_page
+    else
+      return context[:request_path] == '/'
+    end
+  end
+
+  def display_except_home_page(context)
+    if context[:article]
+      return context[:article] != owner.home_page
+    else
+      return context[:request_path] != '/' + (owner.kind_of?(Profile) ? owner.identifier : '')
+    end
+  end
+
   # The condition for displaying a block. It can assume the following values:
   #
   # * <tt>'always'</tt>: the block is always displayed
@@ -168,4 +179,14 @@ class Block &lt; ActiveRecord::Base
     DISPLAY_OPTIONS[option]
   end
+  def duplicate
+    duplicated_block = self.clone
+    duplicated_block.display = 'never'
+    duplicated_block.created_at = nil
+    duplicated_block.updated_at = nil
+    duplicated_block.save!
+    duplicated_block.insert_at(self.position + 1)
+    duplicated_block
+  end
+
 end
@@ -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,
@@ -66,6 +70,7 @@ class Box &lt; ActiveRecord::Base
       MyNetworkBlock,
       PeopleBlock,
       ProductsBlock,
+      ProductCategoriesBlock,
       ProfileImageBlock,
       ProfileInfoBlock,
       ProfileSearchBlock,
@@ -10,19 +10,20 @@ class Enterprise &lt; Organization
   N_('Enterprise')
-  has_many :products, :dependent => :destroy, :order => 'name ASC'
+  has_many :products, :foreign_key => :profile_id, :dependent => :destroy, :order => 'name ASC'
   has_many :inputs, :through => :products
   has_many :production_costs, :as => :owner
   has_and_belongs_to_many :fans, :class_name => 'Person', :join_table => 'favorite_enteprises_people'
   def product_categories
-    products.includes(:product_category).map{|p| p.category_full_name}.compact
+    ProductCategory.by_enterprise(self)
   end
   N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code')
   settings_items :organization_website, :historic_and_current_context, :activities_short_description, :zip_code, :city, :state, :country
+  settings_items :products_per_catalog_page, :type => :integer, :default => 6
   extend SetProfileRegionFromCityState::ClassMethods
   set_profile_region_from_city_state
@@ -135,8 +136,11 @@ class Enterprise &lt; Organization
     ]
     blocks = [
       [MainBlock.new],
-      [ProfileImageBlock.new, LinkListBlock.new(:links => links)],
-      []
+      [ ProfileImageBlock.new,
+        LinkListBlock.new(:links => links),
+        ProductCategoriesBlock.new
+      ],
+      [LocationBlock.new]
     ]
     if environment.enabled?('products_for_enterprises')
       blocks[2].unshift ProductsBlock.new
@@ -26,7 +26,8 @@ class Environment &lt; ActiveRecord::Base
     'manage_environment_users' => N_('Manage environment users'),
     'manage_environment_templates' => N_('Manage environment templates'),
     'manage_environment_licenses' => N_('Manage environment licenses'),
-    'manage_environment_trusted_sites' => N_('Manage environment trusted sites')
+    'manage_environment_trusted_sites' => N_('Manage environment trusted sites'),
+    'edit_appearance'      => N_('Edit appearance'),
   }
   module Roles
@@ -144,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
   # #################################################
@@ -160,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
@@ -680,6 +695,16 @@ class Environment &lt; ActiveRecord::Base
     end
   end
+  def update_theme(theme)
+    self.theme = theme
+    self.save!
+  end
+
+  def update_layout_template(template)
+    self.layout_template = template
+    self.save!
+  end
+
   before_create do |env|
     env.settings[:themes] ||= %w[
       aluminium
@@ -695,7 +720,8 @@ class Environment &lt; ActiveRecord::Base
   end
   def community_template
-    Community.find_by_id settings[:community_template_id]
+    template = Community.find_by_id settings[:community_template_id]
+    template if template && template.is_template
   end
   def community_template=(value)
@@ -703,7 +729,8 @@ class Environment &lt; ActiveRecord::Base
   end
   def person_template
-    Person.find_by_id settings[:person_template_id]
+    template = Person.find_by_id settings[:person_template_id]
+    template if template && template.is_template
   end
   def person_template=(value)
@@ -711,7 +738,8 @@ class Environment &lt; ActiveRecord::Base
   end
   def enterprise_template
-    Enterprise.find_by_id settings[:enterprise_template_id]
+    template = Enterprise.find_by_id settings[:enterprise_template_id]
+    template if template && template.is_template
   end
   def enterprise_template=(value)
@@ -719,7 +747,8 @@ class Environment &lt; ActiveRecord::Base
   end
   def inactive_enterprise_template
-    Enterprise.find_by_id settings[:inactive_enterprise_template_id]
+    template = Enterprise.find_by_id settings[:inactive_enterprise_template_id]
+    template if template && template.is_template
   end
   def inactive_enterprise_template=(value)
@@ -801,7 +830,7 @@ class Environment &lt; ActiveRecord::Base
   end
   def highlighted_products_with_image(options = {})
-    Product.find(:all, {:conditions => {:highlighted => true, :enterprise_id => self.enterprises.find(:all, :select => :id) }, :joins => :image}.merge(options))
+    Product.find(:all, {:conditions => {:highlighted => true, :profile_id => self.enterprises.find(:all, :select => :id) }, :joins => :image}.merge(options))
   end
   settings_items :home_cache_in_minutes, :type => :integer, :default => 5
+# 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
@@ -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
@@ -63,7 +63,7 @@ class LinkListBlock &lt; Block
   def link_html(link)
     klass = 'icon-' + link[:icon] if link[:icon]
     sanitize_link(
-      link_to(link[:name], expand_address(link[:address]), :target => link[:target], :class => klass)
+      link_to(link[:name], expand_address(link[:address]), :target => link[:target], :class => klass, :title => link[:title])
     )
   end
@@ -43,7 +43,12 @@ class Person &lt; Profile
   alias_method_chain :has_permission?, :plugins
   def memberships
-    Profile.memberships_of(self)
+    scopes = []
+    plugins_scopes = plugins.dispatch_scopes(:person_memberships, self)
+    scopes = plugins_scopes unless plugins_scopes.first.blank?
+    scopes << Profile.memberships_of(self)
+    return scopes.first if scopes.size == 1
+    ScopeTool.union *scopes
   end
    def memberships_by_role(role)
@@ -129,32 +134,34 @@ class Person &lt; Profile
   end
   FIELDS = %w[
+  description
+  image
   preferred_domain
   nickname
   sex
-  address
-  zip_code
-  city
-  state
-  country
-  nationality
   birth_date
+  nationality
+  country
+  state
+  city
+  district
+  zip_code
+  address
+  address_reference
   cell_phone
   comercial_phone
+  personal_website
+  jabber_id
   schooling
+  formation
+  custom_formation
+  area_of_study
+  custom_area_of_study
   professional_activity
   organization
   organization_website
-  area_of_study
-  custom_area_of_study
-  formation
-  custom_formation
   contact_phone
   contact_information
-  description
-  image
-  district
-  address_reference
   ]
   validates_multiparameter_assignments
@@ -483,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
@@ -15,7 +15,11 @@ class Product &lt; ActiveRecord::Base
     'full'
   end
-  belongs_to :enterprise
+  belongs_to :enterprise, :foreign_key => :profile_id, :class_name => 'Profile'
+  belongs_to :profile
+  alias_method :enterprise=, :profile=
+  alias_method :enterprise, :profile
+
   has_one :region, :through => :enterprise
   validates_presence_of :enterprise
@@ -29,7 +33,10 @@ class Product &lt; ActiveRecord::Base
   has_many :qualifiers, :through => :product_qualifiers
   has_many :certifiers, :through => :product_qualifiers
-  validates_uniqueness_of :name, :scope => :enterprise_id, :allow_nil => true
+  acts_as_having_settings :field => :data
+
+  validates_uniqueness_of :name, :scope => :profile_id, :allow_nil => true, :if => :validate_uniqueness_of_column_name?
+
   validates_presence_of :product_category_id
   validates_associated :product_category
@@ -81,10 +88,6 @@ class Product &lt; ActiveRecord::Base
     image ? image.public_filename(size) : '/images/icons-app/product-default-pic-%s.png' % size
   end
-  def category_full_name
-    product_category ? product_category.full_name.split('/') : nil
-  end
-
   acts_as_having_image
   def save_image
@@ -234,4 +237,10 @@ class Product &lt; ActiveRecord::Base
   delegate :enabled, :region, :region_id, :environment, :environment_id, :to => :enterprise
+  protected
+
+  def validate_uniqueness_of_column_name?
+    true
+  end
+
 end
@@ -0,0 +1,50 @@
+class ProductCategoriesBlock < Block
+
+  def self.description
+    _('Product category menu')
+  end
+
+  # the title of the block. Probably will be overriden in subclasses.
+  def default_title
+    _('Catalog')
+  end
+
+  def help
+    _('Helps to filter the products catalog.')
+  end
+
+  def content(args={})
+    profile = owner
+    lambda do
+      if @categories.nil? or @categories.length == 0
+        categories = ProductCategory.on_level().order(:name)
+        if @categories and @categories.length == 0
+          notice = _('There are no sub-categories for %s') % @category.name
+        end
+      else
+        categories = @categories
+      end
+      render :file => 'blocks/product_categories',
+             :locals => {
+               :profile => profile,
+               :categories => categories,
+               :notice => notice
+             }
+    end
+  end
+
+  DISPLAY_OPTIONS['catalog_only'] = __('Only on the catalog')
+
+  def display
+    settings[:display].nil? ? 'catalog_only' : super
+  end
+
+  def display_catalog_only(context)
+    context[:params][:controller] == 'catalog'
+  end
+
+  def visible?(*args)
+    box.environment.enabled?('products_for_enterprises') ? super(*args) : false
+  end
+
+end
@@ -3,6 +3,15 @@ class ProductCategory &lt; Category
   has_many :products
   has_many :inputs
+  named_scope :unique, :select => 'DISTINCT ON (path) categories.*'
+  named_scope :by_enterprise, lambda { |enterprise| {
+    :joins => :products,
+    :conditions => ['products.profile_id = ?', enterprise.id]
+  }}
+  named_scope :unique_by_level, lambda { |level| {
+    :select => "DISTINCT ON (filtered_category) split_part(path, '/', #{level}) AS filtered_category, categories.*"
+  }}
+
   def all_products
     Product.find(:all, :conditions => { :product_category_id => (all_children << self).map(&:id) })
   end
@@ -84,7 +84,12 @@ class Profile &lt; ActiveRecord::Base
   def members
     scopes = plugins.dispatch_scopes(:organization_members, self)
     scopes << Person.members_of(self)
-    scopes.size == 1 ? scopes.first : Person.or_scope(scopes)
+    return scopes.first if scopes.size == 1
+    ScopeTool.union *scopes
+  end
+
+  def members_by_name
+    members.order(:name)
   end
   class << self
@@ -17,4 +17,7 @@ class TextArticle &lt; Article
     end
   end
+  def can_display_versions?
+    true
+  end
 end
@@ -71,7 +71,8 @@ class User &lt; ActiveRecord::Base
       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)
@@ -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)
@@ -6,6 +6,7 @@
   <tr><td><%= link_to _('Environment settings'), :action => 'site_info' %></td></tr>
   <tr><td><%= link_to _('Features'), :controller => 'features' %></td></tr>
   <tr><td><%= link_to _('Plugins'), :controller => 'plugins' %></td></tr>
+  <tr><td><%= link_to _('Appearance'), :controller =>'environment_themes' %></td></tr>
   <tr><td><%= link_to _('Sideboxes'), :controller => 'environment_design'%></td></tr>
   <tr><td><%= link_to _('Homepage'), :action => 'set_portal_community' %></td></tr>
   <tr><td><%= link_to _('Licenses'), :controller =>'licenses' %></td></tr>
@@ -0,0 +1,9 @@
+<%= link_to _('Catalog start'), profile.catalog_url, :class=>'catalog-home-link' %>
+<ul class="catalog-categories-list">
+  <% categories.each do |category| %>
+    <%= category_with_sub_list(category) %>
+  <% end %>
+</ul>
+<% if notice %>
+  <div class="catalog-categories-notice"><%= notice %></div>
+<% end %>
@@ -16,11 +16,13 @@
   <p><%= h block.owner.short_name %></p>
 <% end %>
-<div style="text-align: center; font-size: 75%; clear: both" id="profile-admin-url-<%= block.id %>"></div>
-
-<div class="profile-info-options" id="profile-info-options-<%= block.id %>"></div>
+<% if !user.nil? and user.has_permission?('edit_profile', profile) %>
+  <div class='admin-link'>
+    <%= link_to _('Control panel'), block.owner.admin_url %>
+  </div>
+<% end %>
+<div class="profile-info-options">
+  <%= render :file => view_for_profile_actions(block.owner.class) %>
+</div>
 </div><!-- end class="vcard" -->
-<script type="text/javascript">
-  <%= remote_function :url => { :controller => 'profile', :profile => profile.identifier, :action => 'profile_info', :block_id => block.id } %>
-</script>
@@ -14,13 +14,15 @@
   </div>
 </div>
-<ul class="profile-info-data" id="profile-info-data-<%= block.id %>">
+<ul class="profile-info-data">
   <li><%= link_to __('Homepage'), block.owner.url, :class => 'url' %></li>
   <li><%= link_to _('View profile'), block.owner.public_profile_url %></li>
   <% if block.owner.enterprise? && block.owner.environment.enabled?('products_for_enterprises') %>
     <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
   <% end %>
-  <li id="profile-admin-url-<%= block.id %>"></li>
+  <% if !user.nil? and user.has_permission?('edit_profile', profile) %>
+    <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>
   <% end %>
@@ -37,9 +39,8 @@
 </div>
 <% end %>
-<div class="profile-info-options" id="profile-info-options-<%= block.id %>"></div>
+<div class="profile-info-options">
+  <%= render :file => view_for_profile_actions(block.owner.class) %>
+</div>
 </div><!-- end class="vcard" -->
-<script type="text/javascript">
-  <%= remote_function :url => { :controller => 'profile', :profile => profile.identifier, :action => 'profile_info', :block_id => block.id } %>
-</script>
 <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><%= _('Target') %></th></tr>
+  <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>
-        <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
-      </td>
-    </tr>
+  <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>
 </div>
@@ -22,8 +25,8 @@
       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', select_tag('block[links][][target]',
-options_for_select(LinkListBlock::TARGET_OPTIONS, '_self')))
+      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')))
     ) +
     javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
 end %>
 <% extra_content = [] %>
 <% extra_content_list = [] %>
-<h1><%= _('Products/Services') %></h1>
-
-<% if @categories %>
-  <%= breadcrumb(@category) if params[:level] %>
-
-  <div class='l-sidebar-left-bar'>
-    <ul>
-      <%= content_tag('li', link_to(_('Homepage'), profile.url), :class => 'catalog-categories-link') %>
-      <%= content_tag('li', link_to(_('Catalog start'), profile.catalog_url), :class => 'catalog-categories-link') %>
-      <% if @categories.present? %>
-        <% @categories.each do |category| %>
-          <%= category_link(category) %>
-          <%= category_sub_links(category) %>
-        <% end %>
-      <% elsif @category.present? %>
-        <%= content_tag('li', _('There are no sub-categories for %s') % @category.name, :id => 'catalog-categories-notice') %>
-      <% else %>
-        <%= content_tag('li', _('There are no categories available.'), :id => 'catalog-categories-notice') %>
-      <% end %>
-    </ul>
+<div id="product-catalog">
+<% if !user.nil? && ( user.is_admin?(profile.environment) || user.is_admin?(profile) ) %>
+  <div class="product-catalog-ctrl">
+    <%= button :product, _('Manage Products/Services'), :controller => 'manage_products' %>
   </div>
 <% end %>
-<ul id="product-list" class="<%="l-sidebar-left-content" if @categories %>">
+<h1><%= _('Products/Services') %></h1>
+
+<%= breadcrumb(@category) if params[:level] %>
+
+<ul id="product-list">
   <% @products.each do |product| %>
     <% extra_content = @plugins.dispatch(:catalog_item_extras, product).collect { |content| instance_eval(&content) } %>
     <% extra_content_list = @plugins.dispatch(:catalog_list_item_extras, product).collect { |content| instance_eval(&content) } %>
@@ -132,10 +120,11 @@
       </ul>
     </li>
   <% end %>
-</ul>
+</ul><!-- end id="product-list" -->
 <%= pagination_links @products, :params => {:controller => :catalog, :action => :index, :profile => profile.identifier} %>
 <%= add_zoom_to_images %>
 <br style="clear:both"/>
+</div><!-- end id="product-catalog" -->
@@ -40,6 +40,7 @@
   <% button_bar do %>
     <%= submit_button :save, _('Save') %>
+
     <% if @back_to %>
       <%= button :cancel, _('Cancel'), @back_to %>
     <% elsif @parent_id || @article.parent %>
@@ -47,6 +48,11 @@
     <% else %>
       <%= button :cancel, _('Cancel'), :action => 'index' %>
     <% end %>
+
+    <% unless @article.new_record? %>
+      <%= button :delete, _('Delete'), {:controller => :cms, :action => :destroy, :id => @article},
+        :method => :post, :confirm => delete_article_message(@article) %>
+    <% end %>
   <% end %>
 <% end %>
 </div>
@@ -32,19 +32,7 @@
     <div class="comment-details">
       <div class="comment-header">
-        <ul>
-          <div class="comment-actions">
-            <%= comment_actions(comment) %>
-          </div>
-        </ul>
-      <% unless comment.spam? %>
-        <%= link_to_function '',
-          "var f = add_comment_reply_form(this, %s); f.find('comment_title, textarea').val(''); return false" % comment.id,
-          :class => 'comment-footer comment-footer-link comment-footer-hide comment-actions-reply button',
-          :id => 'comment-reply-to-' + comment.id.to_s,
-          :title => _('Reply')
-        %>
-      <% end %>
+        <%= comment_actions(comment) %>
       </div>
       <div class="comment-created-at">
@@ -55,6 +43,7 @@
         <p/>
         <%= txt2html comment.body %>
       </div>
+      <%= @plugins.dispatch(:comment_extra_contents, local_assigns).collect { |content| instance_eval(&content) }.join("") %>
     </div>
     <div class="comment_reply post_comment_box closed" id="comment_reply_to_<%= comment.id %>">
@@ -0,0 +1,22 @@
+<ul>
+  <% if !links_submenu.empty? %>
+    <div class="comment-actions">
+      <li class="vcard">
+        <%= link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{links_submenu.to_json}); return false", :class => 'menu-submenu-trigger comment-trigger', :url => url) %>
+      </li>
+    </div>
+  <% end %>
+</ul>
+<div class="comments-action-bar">
+  <% unless comment.spam? %>
+    <%= link_to_function '',
+      "var f = add_comment_reply_form(this, %s); f.find('comment_title, textarea').val(''); return false" % comment.id,
+      :class => 'comment-footer comment-footer-link comment-footer-hide comment-actions-reply button',
+      :id => 'comment-reply-to-' + comment.id.to_s,
+      :title => _('Reply')
+    %>
+  <% end %>
+  <% links_action_bar.collect do |link| %>
+    <%= link[:link] %>
+  <% end %>
+</div>
@@ -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)) %>
@@ -48,6 +48,10 @@
       <%= expirable_button @page, :suggest, content, url, options %>
     <% end %>
+    <% if @page.display_versions? %>
+      <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
+    <% end %>
+
     <%= report_abuse(profile, :link, @page) %>
   </div>
@@ -56,6 +60,7 @@
       <div class="blog-cover"><%= image_tag(@page.image.public_filename())%></div>
     <% end %>
     <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
+    <%= @plugins.dispatch(:article_header_extra_contents, @page).collect { |content| instance_eval(&content) }.join("") %>
     <%= article_title(@page, :no_link => true) %>
     <%= article_translations(@page) %>
   </div>
@@ -0,0 +1,58 @@
+<div class="article-versions">
+  <%= button(:back, _('Go back to latest version'), {:action => 'view_page'}) %>
+</div>
+
+<%= article_title(@page, :no_link => true) %>
+
+<p><%= _('This is the list of all versions of this content. Select a version to see it and then revert to it.') %>.</p>
+
+<% form_tag({:controller => 'content_viewer', :action => 'versions_diff', :profile => profile.identifier, :page => @page.path.split('/')}, :method => 'get') do %>
+  <ul id="article-versions">
+    <% @versions.each do |v| %>
+      <li>
+        <%= radio_button_tag 'v1', v.version, false, :onclick => 'versionInputClicked(this)' %>
+        <%= radio_button_tag 'v2', v.version, false, :onclick => 'versionInputClicked(this)' %>
+        <%= link_to(_("Version #{v.version}"), @page.url.merge(:version => v.version)) %>
+        <%= @page.version == v.version ? _('(current)') : '' %>
+        <span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url(v.version))} %></span>
+        <span class='updated-on'><%= show_time(v.updated_at) %></span>
+      </li>
+    <% end %>
+  </ul>
+
+<script>
+  function versionInputClicked(input) {
+    var selectedColumn = input.name;
+    var sisterColumn = (selectedColumn == 'v1') ? 'v2' : 'v1';
+    var li = input.parentNode;
+    var checkedBrotherLi = jQuery('#article-versions input[name=' + sisterColumn + ']:checked').parent()[0];
+    updateColumn(selectedColumn, li);
+    updateColumn(sisterColumn, checkedBrotherLi);
+  }
+
+  function updateColumn(selectedColumn, startLi){
+    var sisterColumn = (selectedColumn == 'v1') ? 'v2' : 'v1';
+    var walkMethod = (selectedColumn == 'v1') ? 'prev' : 'next';
+    var li = startLi;
+    var foundCheckedBrother = false;
+    while(li = jQuery(li)[walkMethod]()[0]) {
+      li.className = '';
+      if (!foundCheckedBrother){
+        li.className = 'selected';
+        foundCheckedBrother = jQuery('input[name=' + sisterColumn + ']', li)[0].checked;
+      }
+      jQuery('input[name=' + selectedColumn + ']', li)[0].disabled = foundCheckedBrother;
+    }
+  }
+
+  var penultVersion = jQuery('#article-versions input[name=v1]')[1];
+  var lastVersion = jQuery('#article-versions input[name=v2]')[0];
+  jQuery('#article-versions input').attr('disabled', false);
+  if (penultVersion && lastVersion) {
+    penultVersion.checked = lastVersion.checked = true;
+    lastVersion.onclick();
+  }
+</script>
+  <%= submit_button(:clock, _('Show differences between selected versions')) %>
+<% end %>
+<%= pagination_links @versions, :param_name => 'npage' %>
@@ -0,0 +1,53 @@
+<div class="article-versions">
+  <%= button(:back, _('Back to the versions'), {:action => 'article_versions'}) %>
+</div>
+
+<div id="article" class="<%= @page.css_class_name %>">
+
+  <div id="article-actions">
+    <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
+
+    <% if @page.allow_edit?(user) && !remove_content_button(:undo) %>
+      <% content = content_tag('span', _('Revert to this version')) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id, :version => @version }) %>
+      <%= expirable_button @page, :undo, content, url, :id => 'article-revert-version-link' %>
+    <% end %>
+
+    <%= button(:forward, _('Go to latest version'), {:action => 'view_page'}) %>
+</div>
+  <div id="article-header">
+    <h1 class='title'><%= @versioned_article.name %></h1>
+    <%= _("Version %{version} - %{author} on %{date}") % {:version => @version, :author => @page.author_name(@version), :date => show_time(@versioned_article.updated_at) } %>
+  </div>
+
+  <p id="no-current-version">
+    <%= _('This is not the latest version of this content.') %>
+  </p>
+</div>
+
+  <% version_license = @page.version_license(@version) %>
+  <%# This seemingly doubled verification exists because the article-sub-header
+      div must appear only if at least one content inside it will appear.
+      Although we have only one content now, we might have others in the future.
+      So we're keeping it like that to avoid mistakes. %>
+  <% if version_license.present? %>
+    <div id='article-sub-header'>
+      <% if version_license.present? %>
+        <div id="article-license">
+          <%= _('Licensed under %s') % (version_license.url.present? ? link_to(version_license.name, version_license.url, :target => '_blank') : version_license.name) %>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+
+  <% cache(@page.cache_key(params, user, language)) do %>
+    <div class="<%="article-body article-body-" + @page.css_class_name %>">
+      <%= @versioned_article.body %>
+      <br style="clear:both" />
+    </div> <!-- end class="article-body" -->
+  <% end %>
+
+  <%= display_source_info(@page) %>
+
+</div><!-- end id="article" -->
+<%= add_zoom_to_article_images %>
@@ -0,0 +1,16 @@
+<div class="article-versions">
+<%= button(:back, _('Back to the versions'), {:action => 'article_versions'}) %>
+</div>
+
+<h1><%= _('Changes on "%s"') % @page.title %></h1>
+
+<p> <%= _('Changes from %s &rarr; %s') % [show_time(@v1.updated_at), show_time(@v2.updated_at)] %> </p>
+
+<% diffContent = Diffy::Diff.new(@v1.body, @v2.body, :context => 1) %>
+<% if diffContent.to_s(:text).blank? %>
+  <p id="article-versions-no-diff">
+    <%= _('These versions range have no differences.')%>
+  </p>
+<% else %>
+  <%= diffContent.to_s(:html) %>
+<% end %>
@@ -15,16 +15,14 @@
 </script>
 <% if @page.parent && !@page.parent.path.blank? %>
-<div id="article-parent">
-  <%= button(:back, _('Go back to %s') % @page.parent.short_title, @page.parent.url) %>
-</div>
+  <div id="article-parent">
+    <%= button(:back, _('Go back to %s') % @page.parent.short_title, @page.parent.url) %>
+  </div>
 <% end %>
-<div id="article-toolbar"></div>
-
-<script type="text/javascript">
-  <%= remote_function :update => "article-toolbar", :url => @page.url.merge({ :toolbar => true, :only_path => true }) %>
-</script>
+<div id="article-toolbar">
+  <%= render :partial => 'article_toolbar' %>
+</div>
 <% if @page.display_hits? || @page.license.present? %>
   <div id='article-sub-header'>
@@ -42,32 +40,10 @@
   </div>
 <% end %>
-<% if !@page.tags.empty? %>
-  <div id="article-tags">
-    <%= _("This article's tags:") %>
-    <%= @page.tags.map { |t| link_to(t, :controller => 'profile', :profile => @profile.identifier, :action => 'tags', :id => t.name ) }.join("\n") %>
-  </div>
-<% end %>
-
-
 <%= 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="https://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 %>
@@ -85,8 +61,17 @@
 </div>
 <% end %>
+<% if !@page.tags.empty? %>
+  <div id="article-tags">
+    <%= _("This article's tags:") %>
+    <%= @page.tags.map { |t| link_to(t, :controller => 'profile', :profile => @profile.identifier, :action => 'tags', :id => t.name ) }.join("\n") %>
+  </div>
+<% end %>
+
 <%= 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 %>
@@ -0,0 +1,8 @@
+<%= render :partial => 'themes/select_template' %>
+<%= render :partial => 'themes/select_theme' %>
+
+<br style="clear:both" />
+
+<% button_bar do %>
+  <%= button(:back, _('Back'), :controller => 'admin_panel', :action => 'index') %>
+<% end %>
-<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/>
@@ -4,7 +4,7 @@
 <div class='profile-activity-description profile-activity-article-<%= activity.target.class.icon_name %>'>
   <p class='profile-activity-text'>
     <%= link_to activity.user.short_name(20), activity.user.url %>
-    <%= _("on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url) if activity.target.profile.is_a?(Community) %>
+    <%= _("has published on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url) if activity.target.profile.is_a?(Community) %>
   </p>
   <div class='profile-activity-lead'>
     <div class='article-name'><%= link_to(activity.params['name'], activity.params['url']) %></div>
@@ -19,22 +19,21 @@
   <table class='profile'>
     <tr>
       <td colspan='2'>
-        <% plugins_tabs = @plugins.dispatch(:profile_tabs).
-          map { |tab| {:title => tab[:title], :id => tab[:id], :content => instance_eval(&tab[:content]), :start => tab[:title]} }%>
+        <% plugins_tabs = @plugins.dispatch(:profile_tabs).map { |tab| {:title => tab[:title], :id => tab[:id], :content => instance_eval(&tab[:content]), :start => tab[:title]} }%>
         <% tabs = plugins_tabs.select { |tab| tab[:start] } %>
         <% if @profile.organization? %>
-          <% tabs << {:title => _('Profile'), :id => 'organization-profile', :content => (render :partial => 'organization_profile')} %>
           <% if logged_in? && current_person.follows?(@profile) %>
             <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
           <% end %>
+          <% tabs << {:title => _('Profile'), :id => 'organization-profile', :content => (render :partial => 'organization_profile')} %>
         <% elsif @profile.person? %>
-          <% tabs << {:title => _('Profile'), :id => 'person-profile', :content => (render :partial => 'person_profile')} %>
           <% if logged_in? && current_person.follows?(@profile) %>
             <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
             <% tabs << {:title => _('Network'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
           <% end %>
+          <% tabs << {:title => _('Profile'), :id => 'person-profile', :content => (render :partial => 'person_profile')} %>
         <% end %>
         <% tabs += plugins_tabs.select { |tab| !tab[:start] } %>
@@ -1,6 +0,0 @@
-if !user.nil? and user.has_permission?('edit_profile', profile)
-  page.replace_html "profile-admin-url-#{@block.id}", link_to(_('Control panel'), @block.owner.admin_url)
-else
-  page.hide "profile-admin-url-#{@block.id}"
-end
-page.replace_html "profile-info-options-#{@block.id}", :file => view_for_profile_actions(@block.owner.class)
@@ -65,3 +65,8 @@
 <%= labelled_check_box(_('Enable "contact us"'), 'profile_data[enable_contact_us]', "1", @profile.enable_contact_us) if @profile.enterprise? %>
 <%= render :partial => 'moderation', :locals => { :profile => @profile } %>
+
+<% if profile.enterprise? && profile.environment.enabled?('products_for_enterprises') %>
+  <h2><%=_('Products/Services catalog')%></h2>
+  <%= labelled_form_field(_('Number of products/services displayed per page on catalog'), text_field(:profile_data, :products_per_catalog_page, :size => 3)) %>
+<% end %>
@@ -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>
@@ -13,6 +13,8 @@
 <%= optional_field(@person, 'contact_phone', labelled_form_field(_('Home phone'), text_field(:profile_data, :contact_phone, :rel => _('Contact phone')))) %>
 <%= optional_field(@person, 'cell_phone', f.text_field(:cell_phone, :rel => _('Cell phone'))) %>
 <%= optional_field(@person, 'comercial_phone', f.text_field(:comercial_phone, :rel => _('Comercial phone'))) %>
+<%= optional_field(@person, 'jabber_id', f.text_field(:jabber_id, :rel => _('Jabber'))) %>
+<%= optional_field(@person, 'personal_website', f.text_field(:personal_website, :rel => _('Personal website'))) %>
 <%= optional_field(@person, 'sex', f.radio_group(:profile_data, :sex, [ ['male',_('Male')], ['female',_('Female')] ])) %>
 <%= optional_field(@person, 'birth_date', labelled_form_field(_('Birth date'), '<div class="select-birth-date">' + pick_date(:profile_data, :birth_date, {:start_year => (Date.today.year - 100), :end_year => (Date.today.year - 5)}) + '</div>')) %>
 <%= optional_field(@person, 'nationality', f.text_field(:nationality, :rel => _('Nationality'))) %>
@@ -22,7 +22,7 @@
   <%= control_panel_button(_('Edit sideboxes'), 'blocks', :controller => 'profile_design', :action => 'index') %>
-  <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'themes', :action => 'index') %>
+  <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'profile_themes', :action => 'index') %>
   <%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>
-<% collection = @collection == :profile_admins ? profile.admins : profile.members %>
+<% collection = @collection == :profile_admins ? profile.admins : profile.members_by_name %>
 <% title = @title ? @title : _('Current members') %>
 <% remove_action = @remove_action ? @remove_action : {:action => 'unassociate'} %>
@@ -0,0 +1,11 @@
+<h2><%= _('Add a CSS file') %></h2>
+
+<% form_tag do %>
+  <%= labelled_form_field(_('File name'), text_field_tag('css')) %>
+
+  <% button_bar do %>
+    <%= submit_button(:add, _('Add')) %>
+    <%= lightbox_close_button(_('Cancel')) %>
+  <% end %>
+
+<% end %>
@@ -0,0 +1,6 @@
+<% form_tag({:action => 'add_image', :id => @theme.id}, :multipart => true) do %>
+  <%= labelled_form_field(_('Choose the image file'), file_field_tag(:image)) %>
+  <% button_bar do %>
+    <%= submit_button(:add, _('Add image')) %>
+  <% end %>
+<% end %>
@@ -0,0 +1,13 @@
+<h2><%= _('CSS code: "%s"') % @css %></h2>
+
+<% form_tag({:action => 'update_css', :id => @theme.id }, :name => 'csscode_form') do %>
+  <%= hidden_field_tag('css', @css) %>
+  <%= text_area_tag('csscode', @code, :id => "codepressWindow", :class => 'codepress css') %>
+  <% button_bar do %>
+    <%= submit_button(:save, _('Save')) %>
+  <% end %>
+<% end %>
+
+<!--<script type='text/javascript'>-->
+  <!--CodePress.run();-->
+<!--</script>-->
@@ -0,0 +1,41 @@
+<form>
+  <%# FIXME %>
+  <h1 id='theme-name'>
+    <%= _('Editing theme "%s"') % @theme.name %>
+    <%= button(:eyes, _('Preview this theme'), :action => 'start_test', :id => @theme.id) %>
+    <%= button(:back, _('Back'), :action => 'index') %>
+  </h1>
+</form>
+
+
+<div id='css-files-list'>
+  <h2><%= _('CSS files') %></h2>
+  <ul>
+    <% for css in @css_files %>
+      <li><%= link_to_remote(css, :url => { :action => 'css_editor', :id => @theme.id, :css => css }, :update => { :success => 'css-code' }) %></li>
+    <% end %>
+  </ul>
+  <% button_bar do %>
+    <%= lightbox_button(:add, _('New CSS'), :action => 'add_css', :id => @theme.id) %>
+  <% end %>
+</div>
+
+<div id='image-files-list'>
+  <h2><%= _('Images') %></h2>
+  <ul>
+    <% for image in @image_files %>
+      <li><%= image_tag("/user_themes/#{@theme.id}/images/#{image}") %></li>
+    <% end %> 
+  </ul>
+  <% button_bar do %>
+    <%= lightbox_button(:add, _('Add image'), :action => 'add_image', :id =>  @theme.id) %>
+  <% end %>
+</div>
+
+<div id='css-code'>
+  <center style='padding-top: 5em;'>
+    <em><%= _('Select a CSS file to edit') %></em>
+  </center>
+</div>
+
+<%# javascript_include_tag 'codepress/codepress' %>
@@ -0,0 +1,48 @@
+<%= render :partial => 'themes/select_template' %>
+<%= render :partial => 'themes/select_theme' %>
+
+<% if environment.enabled?('user_themes') %>
+  <div id="user-themes" class="list-options">
+
+  <h2><%= _('My themes') %></h2>
+
+  <% for themes in profile.themes.in_groups_of(3)  %>
+    <div class="list-group">
+      <% for theme in themes %><%=
+        if theme
+
+          selected = theme.id == @current_theme
+          sel_html = selected ?
+            content_tag('big', _('(current)') ) :
+            link_to(_('Use this theme'), :action => 'set', :id => theme.id)
+
+          content_tag( 'div',
+            image_tag(
+              '/images/icons-app/design-editor.png',
+              :alt => (_('The "%s" theme.') % theme.name)) +
+            '<div class="opt-info">' +
+              content_tag('strong', theme.name, :class => 'name') +
+              ' <br/> '+ sel_html +' <br/> ' +
+              link_to(_('Edit this theme'), :action => 'edit', :id => theme.id) +
+              ' <br/> ' +
+              link_to(_('Test this theme'), :action => 'start_test', :id => theme.id) +
+            '</div>',
+            :class => 'theme-opt list-opt' + (selected ? ' selected' : '')
+          )
+
+        end
+      %><% end %>
+    </div>
+  <% end %>
+
+  </div><!-- end id="user-themes" -->
+<% end %>
+
+<br style="clear:both" />
+
+<% button_bar do %>
+  <% if environment.enabled?('user_themes')  %>
+    <%= lightbox_button(:add, _('New theme ...'), :action => 'new') %>
+  <% end %>
+  <%= button(:back, _('Back'), :controller => 'profile_editor', :action => 'index') %>
+<% end %>
@@ -0,0 +1,10 @@
+<h2><%= _('Create new theme') %></h2>
+
+<% form_tag(:action => 'new') do %>
+
+  <%= labelled_form_field(_('Name of the new theme:'), text_field_tag(:name)) %>
+
+  <% button_bar do %>
+    <%= submit_button(:save, _('Create')) %>
+  <% end %>
+<% end %>
-<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 %>
@@ -6,8 +6,8 @@
   <p><small><em><%= _('You can move this window away to have a better visualization of specific parts of screen.') %></em></small></p>
   <% button_bar do %>
-    <%= button(:ok, _('Finished testing'), :controller => 'themes', :profile => theme_owner, :action => 'stop_test', :id => current_theme) %>
-    <%= button(:edit, _('Edit theme'), :controller => 'themes', :profile => theme_owner, :action => 'edit', :id => current_theme) %>
+    <%= button(:ok, _('Finished testing'), :controller => 'profile_themes', :profile => theme_owner, :action => 'stop_test', :id => current_theme) %>
+    <%= button(:edit, _('Edit theme'), :controller => 'profile_themes', :profile => theme_owner, :action => 'edit', :id => current_theme) %>
   <% end %>
 </div>
 <%= draggable_element('theme-test-panel') %>
@@ -0,0 +1,35 @@
+<h1><%= _('Editing Appearance') %></h1>
+
+<div id="template-options" class="list-options">
+
+<h2><%= _('Select template') %></h2>
+
+<% for templates in @layout_templates.in_groups_of(3) %>
+  <div class="list-group">
+    <% for template in templates %><%=
+      if template
+        base_content = image_tag(
+          "/designs/templates/#{template.id}/thumbnail.png",
+          :alt => _('The "%s" template')) +
+        '<div class="opt-info">'.html_safe +
+        content_tag('strong', template.name, :title => template.title, :class => 'name') +
+        ' <br/> '.html_safe
+
+        if @current_template == template.id  # selected
+          content_tag( 'div',
+            base_content + content_tag('big', _('(current)') ) +'</div>'.html_safe,
+            :class => 'template-opt list-opt selected')
+        else  # Not selected
+          link_to(
+            base_content +'</div>'.html_safe,
+            { :action => 'set_layout_template', :id => template.id },
+            :class => 'template-opt list-opt')
+        end
+
+      end
+    %><% end %>
+  </div>
+<% end %>
+
+</div><!-- end id="template-options" -->
+
@@ -0,0 +1,37 @@
+<% if !@themes.empty? %>
+<div id="theme-options" class="list-options">
+
+<h2><%= _('Select theme') %></h2>
+<%= button :home, _('Use the default theme'), { :action => 'unset'}, :method => 'post', :confirm => _('Are you sure you want to use the environment default theme?') %>
+
+<% for themes in @themes.in_groups_of(3) %>
+  <div class="list-group">
+    <% for theme in themes %><%=
+      if theme
+
+        base_content = image_tag(
+          "/designs/themes/#{theme.id}/preview.png",
+          :alt => (_('The "%s" theme.') % theme.name)) +
+        '<div class="opt-info">'.html_safe +
+        content_tag('strong', theme.name, :class => 'name') +
+        ' <br/> '.html_safe
+
+        if theme.id == @current_theme  # selected
+          content_tag( 'div',
+            base_content + content_tag('big', _('(current)') ) +'</div>'.html_safe,
+            :class => 'theme-opt list-opt selected')
+        else  # Not selected
+          link_to(
+            base_content + '</div>'.html_safe,
+            { :action => 'set', :id => theme.id },
+            :class => 'theme-opt list-opt')
+        end
+
+      end
+    %><% end %>
+  </div>
+<% end %>
+
+</div><!-- end id="theme-options" -->
+<% end %>
+
	@@ -110,7 +110,7 @@ Setup Noosfero log and tmp directories:		@@ -110,7 +110,7 @@ Setup Noosfero log and tmp directories:
110	# cd /var/lib/noosfero/current	110	# cd /var/lib/noosfero/current
111	# ./etc/init.d/noosfero setup	111	# ./etc/init.d/noosfero setup
112		112
113	-Now it's time to setup the database. In this example we are using PostgreSQL, so if you are planning to use a different database this steps won't apply.	113	+Now it's time to setup the database. In this example we are using PostgreSQL, so if you are planning to use a different database this steps won't apply. Pay special attention to the default collation defined on your setup by the environment variable LC_COLLATE because it might interfere in some sorting operations on your database. For more information checkout `man locale`.
114		114
115	# apt-get install postgresql libpgsql-ruby	115	# apt-get install postgresql libpgsql-ruby
116	# su postgres -c 'createuser noosfero -S -d -R'	116	# su postgres -c 'createuser noosfero -S -d -R'
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class EnvironmentThemesController < ThemesController
	2	+
	3	+ protect 'edit_appearance', :environment
	4	+
	5	+ no_design_blocks
	6	+
	7	+ def target
	8	+ @target = environment
	9	+ end
	10	+
	11	+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
	@@ -2,7 +2,7 @@ class ProfileMembersController < MyProfileController		@@ -2,7 +2,7 @@ class ProfileMembersController < MyProfileController
2	protect 'manage_memberships', :profile	2	protect 'manage_memberships', :profile
3		3
4	def index	4	def index
5	- @members = profile.members	5	+ @members = profile.members_by_name
6	@member_role = environment.roles.find_by_name('member')	6	@member_role = environment.roles.find_by_name('member')
7	end	7	end
8		8
@@ -0,0 +1,75 @@		@@ -0,0 +1,75 @@
	1	+class ProfileThemesController < ThemesController
	2	+
	3	+ needs_profile
	4	+
	5	+ protect 'edit_appearance', :profile
	6	+
	7	+ no_design_blocks
	8	+
	9	+ def target
	10	+ @target = profile
	11	+ end
	12	+
	13	+ def new
	14	+ if !request.xhr?
	15	+ id = params[:name] ? params[:name].to_slug : 'my-theme'
	16	+ t = Theme.new(id, :name => params[:name], :owner => profile, :public => false)
	17	+ t.save
	18	+ redirect_to :action => 'index'
	19	+ else
	20	+ render :action => 'new', :layout => false
	21	+ end
	22	+ end
	23	+
	24	+ def edit
	25	+ @theme = profile.find_theme(params[:id])
	26	+ @css_files = @theme.css_files
	27	+ @image_files = @theme.image_files
	28	+ end
	29	+
	30	+ def add_css
	31	+ @theme = profile.find_theme(params[:id])
	32	+ if request.xhr?
	33	+ render :action => 'add_css', :layout => false
	34	+ else
	35	+ @theme.add_css(params[:css])
	36	+ redirect_to :action => 'edit', :id => @theme.id
	37	+ end
	38	+ end
	39	+
	40	+ def css_editor
	41	+ @theme = profile.find_theme(params[:id])
	42	+ @css = params[:css]
	43	+
	44	+ @code = @theme.read_css(@css)
	45	+ render :action => 'css_editor', :layout => false
	46	+ end
	47	+
	48	+ post_only :update_css
	49	+ def update_css
	50	+ @theme = profile.find_theme(params[:id])
	51	+ @theme.update_css(params[:css], params[:csscode])
	52	+ redirect_to :action => 'edit', :id => @theme.id
	53	+ end
	54	+
	55	+ def add_image
	56	+ @theme = profile.find_theme(params[:id])
	57	+ if request.xhr?
	58	+ render :action => 'add_image', :layout => false
	59	+ else
	60	+ @theme.add_image(params[:image].original_filename, params[:image].read)
	61	+ redirect_to :action => 'edit', :id => @theme.id
	62	+ end
	63	+ end
	64	+
	65	+ def start_test
	66	+ session[:theme] = params[:id]
	67	+ redirect_to :controller => 'content_viewer', :profile => profile.identifier, :action => 'view_page'
	68	+ end
	69	+
	70	+ def stop_test
	71	+ session[:theme] = nil
	72	+ redirect_to :action => 'index'
	73	+ end
	74	+
	75	+end
	@@ -1,91 +0,0 @@	@@ -1,91 +0,0 @@
1	-class ThemesController < MyProfileController
2	-
3	- protect 'edit_appearance', :profile
4	- no_design_blocks
5	-
6	- def set
7	- profile.update_theme(params[:id])
8	- redirect_to :action => 'index'
9	- end
10	-
11	- def unset
12	- profile.update_theme(nil)
13	- redirect_to :action => 'index'
14	- end
15	-
16	- def index
17	- @themes = (profile.environment.themes + Theme.approved_themes(profile)).uniq_by{ \|t\| t.id }.sort_by{ \|t\| t.name }
18	- @current_theme = profile.theme
19	-
20	- @layout_templates = LayoutTemplate.all
21	- @current_template = profile.layout_template
22	- end
23	-
24	- def new
25	- if !request.xhr?
26	- id = params[:name] ? params[:name].to_slug : 'my-theme'
27	- t = Theme.new(id, :name => params[:name], :owner => profile, :public => false)
28	- t.save
29	- redirect_to :action => 'index'
30	- else
31	- render :action => 'new', :layout => false
32	- end
33	- end
34	-
35	- def edit
36	- @theme = profile.find_theme(params[:id])
37	- @css_files = @theme.css_files
38	- @image_files = @theme.image_files
39	- end
40	-
41	- def add_css
42	- @theme = profile.find_theme(params[:id])
43	- if request.xhr?
44	- render :action => 'add_css', :layout => false
45	- else
46	- @theme.add_css(params[:css])
47	- redirect_to :action => 'edit', :id => @theme.id
48	- end
49	- end
50	-
51	- def css_editor
52	- @theme = profile.find_theme(params[:id])
53	- @css = params[:css]
54	-
55	- @code = @theme.read_css(@css)
56	- render :action => 'css_editor', :layout => false
57	- end
58	-
59	- post_only :update_css
60	- def update_css
61	- @theme = profile.find_theme(params[:id])
62	- @theme.update_css(params[:css], params[:csscode])
63	- redirect_to :action => 'edit', :id => @theme.id
64	- end
65	-
66	- def add_image
67	- @theme = profile.find_theme(params[:id])
68	- if request.xhr?
69	- render :action => 'add_image', :layout => false
70	- else
71	- @theme.add_image(params[:image].original_filename, params[:image].read)
72	- redirect_to :action => 'edit', :id => @theme.id
73	- end
74	- end
75	-
76	- def start_test
77	- session[:theme] = params[:id]
78	- redirect_to :controller => 'content_viewer', :profile => profile.identifier, :action => 'view_page'
79	- end
80	-
81	- def stop_test
82	- session[:theme] = nil
83	- redirect_to :action => 'index'
84	- end
85	-
86	- def set_layout_template
87	- profile.update_layout_template(params[:id])
88	- redirect_to :action => 'index'
89	- end
90	-
91	-end
1	class CatalogController < PublicController	1	class CatalogController < PublicController
2	needs_profile	2	needs_profile
3	- no_design_blocks
4		3
5	before_filter :check_enterprise_and_environment	4	before_filter :check_enterprise_and_environment
6		5
	@@ -80,7 +80,7 @@ class SearchController < PublicController		@@ -80,7 +80,7 @@ class SearchController < PublicController
80	end	80	end
81		81
82	def enterprises	82	def enterprises
83	- @scope = visible_profiles(Enterprise, [{:products => :product_category}])	83	+ @scope = visible_profiles(Enterprise)
84	full_text_search	84	full_text_search
85	end	85	end
86		86
@@ -0,0 +1,42 @@		@@ -0,0 +1,42 @@
	1	+class ThemesController < ApplicationController
	2	+
	3	+ before_filter :login_required
	4	+
	5	+ no_design_blocks
	6	+
	7	+ # attr_reader :target
	8	+
	9	+ def target
	10	+ @target
	11	+ end
	12	+
	13	+ def index
	14	+ @environment = environment
	15	+ @themes = (environment.themes + Theme.approved_themes(target)).sort_by { \|t\| t.name }
	16	+
	17	+ @current_theme = target.theme
	18	+
	19	+ @layout_templates = LayoutTemplate.all
	20	+ @current_template = target.layout_template
	21	+ end
	22	+
	23	+ def set
	24	+ target.update_theme(params[:id])
	25	+ redirect_to :action => 'index'
	26	+ end
	27	+
	28	+ def unset
	29	+ if target.kind_of?(Environment)
	30	+ target.update_theme('default')
	31	+ else
	32	+ target.update_theme(nil)
	33	+ end
	34	+ redirect_to :action => 'index'
	35	+ end
	36	+
	37	+ def set_layout_template
	38	+ target.update_layout_template(params[:id])
	39	+ redirect_to :action => 'index'
	40	+ end
	41	+
	42	+end
	@@ -28,7 +28,7 @@ module ArticleHelper		@@ -28,7 +28,7 @@ module ArticleHelper
28	'div',	28	'div',
29	check_box(:article, :notify_comments) +	29	check_box(:article, :notify_comments) +
30	content_tag('label', _('I want to receive a notification of each comment written by e-mail'), :for => 'article_notify_comments') +	30	content_tag('label', _('I want to receive a notification of each comment written by e-mail'), :for => 'article_notify_comments') +
31	- observe_field(:article_accept_comments, :function => "$('article_notify_comments').disabled = ! $('article_accept_comments').checked;$('article_moderate_comments').disabled = ! $('article_accept_comments').checked")	31	+ observe_field(:article_accept_comments, :function => "$('article_notify_comments').disabled = ! $('article_accept_comments').checked;$('article_moderate_comments').disabled = ! $('article_accept_comments').checked")
32	) +	32	) +
33		33
34	content_tag(	34	content_tag(
	@@ -42,7 +42,21 @@ module ArticleHelper		@@ -42,7 +42,21 @@ module ArticleHelper
42	'div',	42	'div',
43	check_box(:article, :display_hits) +	43	check_box(:article, :display_hits) +
44	content_tag('label', _('I want this article to display the number of hits it received'), :for => 'article_display_hits')	44	content_tag('label', _('I want this article to display the number of hits it received'), :for => 'article_display_hits')
45	- ) : '')	45	+ ) : '') +
		46	+
		47	+ (article.can_display_versions? ?
		48	+ content_tag(
		49	+ 'div',
		50	+ check_box(:article, :display_versions) +
		51	+ content_tag('label', _('I want this article to display a link to older versions'), :for => 'article_display_versions')
		52	+ ) : '') +
		53	+
		54	+ (article.forum? && article.profile.community? ?
		55	+ content_tag(
		56	+ 'div',
		57	+ check_box(:article, :allows_members_to_create_topics) +
		58	+ content_tag('label', _('Allow members to create topics'), :for => 'article_allows_members_to_create_topics')
		59	+ ) : '')
46	)	60	)
47	end	61	end
48		62