Merge branch 'master' into AI2694-network_activity_email

Joenio Costa
2 parents 127a5cd0 67fdc2f1
Showing 27 changed files with 547 additions and 93 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/public/account_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/layout_helper.rb
app/models/environment.rb
app/models/forum.rb
app/models/user.rb
app/views/content_viewer/_addthis.rhtml
app/views/content_viewer/_article_toolbar.rhtml
app/views/content_viewer/view_page.rhtml
app/views/features/index.rhtml
app/views/layouts/application-ng.rhtml
app/views/user/mailer/activation_code.rhtml
db/migrate/20140205191914_add_redirection_after_signup_to_environment.rb
db/migrate/20140312184749_add_return_to_to_users.rb
db/schema.rb
features/forum.feature
features/signup.feature
@@ -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
@@ -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
@@ -889,12 +889,11 @@ module ApplicationHelper
  
   def page_title
     (@page ? @page.title + ' - ' : '') +
-    (profile ? profile.short_name + ' - ' : '') +
     (@topic ? @topic.title + ' - ' : '') +
     (@section ? @section.title + ' - ' : '') +
     (@toc ? _('Online Manual') + ' - ' : '') +
     (@controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
-    environment.name +
+    (profile ? profile.short_name : environment.name) +
     (@category ? " - #{@category.full_name}" : '')
   end
  
@@ -49,8 +49,14 @@ module ArticleHelper
         'div',
         check_box(:article, :display_versions) +
         content_tag('label', _('I want this article to display a link to older versions'), :for => 'article_display_versions')
-      ) : '')
+      ) : '') +
  
+      (article.forum? && article.profile.community? ?
+      content_tag(
+        'div',
+        check_box(:article, :allows_members_to_create_topics) +
+        content_tag('label', _('Allow members to create topics'), :for => 'article_allows_members_to_create_topics')
+        ) : '')
     )
   end
  
@@ -52,15 +52,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
  
@@ -145,6 +145,18 @@ class Environment &lt; ActiveRecord::Base
   end
   validates_inclusion_of :redirection_after_login, :in => Environment.login_redirection_options.keys, :allow_nil => true
  
+  def self.signup_redirection_options
+    {
+      'keep_on_same_page' => _('Stays on the same page the user was before signup.'),
+      'site_homepage' => _('Redirects the user to the environment homepage.'),
+      'user_profile_page' => _('Redirects the user to his profile page.'),
+      'user_homepage' => _('Redirects the user to his homepage.'),
+      'user_control_panel' => _('Redirects the user to his control panel.')
+    }
+  end
+  validates_inclusion_of :redirection_after_signup, :in => Environment.signup_redirection_options.keys, :allow_nil => true
+
+
   # #################################################
   # Relationships and applied behaviour
   # #################################################
@@ -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
@@ -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)
@@ -93,7 +94,7 @@ class User &lt; ActiveRecord::Base
       self.person.save!
     end
   end
-  
+
   has_one :person, :dependent => :destroy
   belongs_to :environment
  
@@ -183,7 +184,7 @@ class User &lt; ActiveRecord::Base
     encryption_methods[sym] = block
   end
  
-  # the encryption method used for this instance 
+  # the encryption method used for this instance
   def encryption_method
     (password_type || User.system_encryption_method).to_sym
   end
@@ -226,7 +227,7 @@ class User &lt; ActiveRecord::Base
   end
  
   def remember_token?
-    remember_token_expires_at && Time.now.utc < remember_token_expires_at 
+    remember_token_expires_at && Time.now.utc < remember_token_expires_at
   end
  
   # These create and unset the fields required for remembering users between browser closes
@@ -255,7 +256,7 @@ class User &lt; ActiveRecord::Base
     raise IncorrectPassword unless self.authenticated?(current)
     self.force_change_password!(new, confirmation)
   end
-  
+
   # Changes the password of a user without asking for the old password. This
   # method is intended to be used by the "I forgot my password", and must be
   # used with care.
@@ -326,7 +327,7 @@ class User &lt; ActiveRecord::Base
   end
  
   protected
-    # before filter 
+    # before filter
     def encrypt_password
       return if password.blank?
       self.salt ||= Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record?
@@ -0,0 +1,8 @@
+<div id="addThis">
+  <script type="text/javascript">
+    addthis_pub = '<%= escape_javascript( NOOSFERO_CONF['addthis_pub'] ) %>';
+    addthis_logo = '<%= escape_javascript( NOOSFERO_CONF['addthis_logo'] ) %>';
+    addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>';
+  </script>
+  <a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><%= addthis_image_tag %></a>
+</div>
@@ -26,7 +26,7 @@
       <%= expirable_button @page, :spread, content, url if url %>
     <% end %>
  
-    <% if !@page.gallery? && @page.allow_create?(user) %>
+    <% if !@page.gallery? && (@page.allow_create?(user) || (@page.parent && @page.parent.allow_create?(user))) %>
       <% if @page.translatable? && !@page.native_translation.language.blank? && !remove_content_button(:locale) %>
         <% content = _('Add translation') %>
         <% parent_id = (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)) %>
@@ -43,21 +43,7 @@
 <%= render :partial => 'shared/disabled_enterprise' %>
  
 <% if NOOSFERO_CONF['addthis_enabled'] %>
-<div id="addThis">
-<script type="text/javascript">
-  addthis_pub = '<%= escape_javascript( NOOSFERO_CONF['addthis_pub'] ) %>';
-  addthis_logo = '<%= escape_javascript( NOOSFERO_CONF['addthis_logo'] ) %>';
-  addthis_config = {
-    services_custom: {
-      name: 'Facebook',
-      url: '<%= addthis_facebook_url(@page) %>',
-      icon: 'http://cache.addthiscdn.com/icons/v1/thumbs/facebook.gif'
-    }
-  };
-  addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>';
-</script>
-<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><%= addthis_image_tag %></a>
-</div>
+  <%= render :partial => 'addthis' %>
 <% end %>
  
 <% cache(@page.cache_key(params, user, language)) do %>
@@ -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/>
@@ -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 %>
 <%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
  
-<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code) }) %>
+<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection) }) %>
  
 <%= _("Greetings,") %>
  
@@ -0,0 +1,9 @@
+class AddRedirectionAfterSignupToEnvironment < ActiveRecord::Migration
+  def self.up
+    add_column :environments, :redirection_after_signup, :string, :default => 'keep_on_same_page'
+  end
+
+  def self.down
+    remove_column :environments, :redirection_after_signup
+  end
+end
@@ -0,0 +1,9 @@
+class AddReturnToToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :return_to, :string
+  end
+
+  def self.down
+    remove_column :users, :return_to, :string
+  end
+end
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# This file is auto-generated from the current state of the database. Instead of editing this file,
 # please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
 #
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20140108132730) do
+ActiveRecord::Schema.define(:version => 20140312184749) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -282,6 +282,7 @@ ActiveRecord::Schema.define(:version =&gt; 20140108132730) do
     t.text     "signup_welcome_text"
     t.string   "languages"
     t.string   "default_language"
+    t.string   "redirection_after_signup",     :default => "keep_on_same_page"
   end
  
   create_table "external_feeds", :force => true do |t|
@@ -619,6 +620,7 @@ ActiveRecord::Schema.define(:version =&gt; 20140108132730) do
     t.datetime "chat_status_at"
     t.string   "activation_code",           :limit => 40
     t.datetime "activated_at"
+    t.string   "return_to"
   end
  
   create_table "validation_infos", :force => true do |t|
@@ -166,3 +166,121 @@ Feature: forum
        | Post one | joaosilva | Hi all | Hi all |
    When I go to /joaosilva/forum
    Then I should see "Joao" linking to "http://localhost/joaosilva"
+
+   @selenium
+   Scenario: community member should be able to see the discussion topic button
+    Given the following community
+      | identifier       | name             | owner     |
+      | sample-community | Sample Community | joaosilva |
+    And the following forums
+      | owner            | name  |
+      | sample-community | Forum |
+    And the following users
+      | login      | name       |
+      | mariasilva | Maria Silva|
+    And "Maria Silva" is a member of "Sample Community"
+    And I am logged in as "joaosilva"
+    When I go to /sample-community/forum
+    And I follow "Configure forum"
+    And I check "Allow member to create topics"
+    And I press "Save"
+    And I am logged in as "mariasilva"
+    And I go to /sample-community/forum
+    Then I should see "New discussion topic"
+
+   @selenium
+   Scenario: a non community member should not be able to see the discussion topic button
+    Given the following community
+      | identifier       | name             | owner     |
+      | sample-community | Sample Community | joaosilva |
+    And the following forums
+      | owner            | name  |
+      | sample-community | Forum |
+    And the following users
+      | login      | name       |
+      | mariasilva | Maria Silva|
+    And I am logged in as "joaosilva"
+    When I go to /sample-community/forum
+    And I follow "Configure forum"
+    And I check "Allow member to create topics"
+    And I press "Save"
+    And I am logged in as "mariasilva"
+    And I go to /sample-community/forum
+    Then I should not see "New discussion topic"
+
+   @selenium
+   Scenario: community member should not be able to see the discussion topic button
+    Given the following community
+      | identifier       | name             | owner     |
+      | sample-community | Sample Community | joaosilva |
+    And the following forums
+      | owner            | name  |
+      | sample-community | Forum |
+    And the following users
+      | login      | name       |
+      | mariasilva | Maria Silva|
+    And "Maria Silva" is a member of "Sample Community"
+    And I am logged in as "joaosilva"
+    When I go to /sample-community/forum
+    And I follow "Configure forum"
+    And I uncheck "Allow member to create topics"
+    And I press "Save"
+    And I am logged in as "mariasilva"
+    And I go to /sample-community/forum
+    Then I should not see "New discussion topic"
+
+   @selenium
+   Scenario: community member should be able to create a topic with the discussion topic button
+    Given the following community
+      | identifier       | name             | owner     |
+      | sample-community | Sample Community | joaosilva |
+    And the following forums
+      | owner            | name  |
+      | sample-community | Forum |
+    And the following users
+      | login      | name       |
+      | mariasilva | Maria Silva|
+    And "Maria Silva" is a member of "Sample Community"
+    And I am logged in as "joaosilva"
+    When I go to /sample-community/forum
+    And I follow "Configure forum"
+    And I check "Allow member to create topics"
+    And I press "Save"
+    And I am logged in as "mariasilva"
+    And I go to /sample-community/forum
+    And I follow "New discussion topic"
+    And I follow "Text article with visual editor"
+    And I fill in "Title" with "Test"
+    And I press "Save"
+    Then I should see "Test"
+
+   @selenium
+   Scenario: community member should be able to create a topic on a topic page
+    Given the following community
+      | identifier       | name             | owner     |
+      | sample-community | Sample Community | joaosilva |
+    And the following forums
+      | owner            | name  |
+      | sample-community | Forum |
+    And the following users
+      | login      | name       |
+      | mariasilva | Maria Silva|
+    And "Maria Silva" is a member of "Sample Community"
+    And I am logged in as "joaosilva"
+    When I go to /sample-community/forum
+    And I follow "Configure forum"
+    And I check "Allow member to create topics"
+    And I press "Save"
+    And I am logged in as "mariasilva"
+    And I go to /sample-community/forum
+    And I follow "New discussion topic"
+    And I follow "Text article with visual editor"
+    And I fill in "Title" with "Test"
+    And I press "Save"
+    And I go to /sample-community/forum/test
+    And I follow "New discussion topic"
+    And I follow "Text article with visual editor"
+    And I fill in "Title" with "Test inside the topic page"
+    And I press "Save"
+    And I go to /sample-community/forum
+    Then I should see "Test inside the topic page"
 \ No newline at end of file
@@ -3,7 +3,7 @@ Feature: signup
   I want to sign up to the site
   So I can have fun using its features
  
-@selenium
+  @selenium
   Scenario: successfull registration
     Given I am on the homepage
     When I follow "Login"
@@ -60,3 +60,183 @@ Feature: signup
     And I fill in "Name" with ""
     When I press "Save"
     Then I should see "Name can't be blank"
+
+  @selenium
+  Scenario: user should stay on same page after signup
+    Given the environment is configured to stay on the same page after signup
+    And feature "skip_new_user_email_confirmation" is enabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    Then I should be on /search/people
+
+  @selenium
+  Scenario: user should go to his homepage after signup
+    Given the environment is configured to redirect to profile homepage after signup
+    And feature "skip_new_user_email_confirmation" is enabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    Then I should be on josesilva's profile
+
+  @selenium
+  Scenario: user should go to his control panel after signup
+    Given the environment is configured to redirect to profile control panel after signup
+    And feature "skip_new_user_email_confirmation" is enabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    Then I should be on josesilva's control panel
+
+  @selenium
+  Scenario: user should go to his profile page after signup
+    Given the environment is configured to redirect to user profile page after signup
+    And feature "skip_new_user_email_confirmation" is enabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    Then I should be on josesilva's profile
+
+  @selenium
+  Scenario: user should go to the environment's homepage after signup
+    Given the environment is configured to redirect to site homepage after signup
+    And feature "skip_new_user_email_confirmation" is enabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    Then I should be on the homepage
+
+  @selenium
+  Scenario: user should stay on same page after following confirmation link
+    Given the environment is configured to stay on the same page after login
+    And feature "skip_new_user_email_confirmation" is disabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    And I go to josesilva's confirmation URL
+    And I fill in "Username" with "josesilva"
+    And I fill in "Password" with "secret"
+    And I press "Log in"
+    Then I should be on /search/people
+
+  @selenium
+  Scenario: user should go to his homepage after following confirmation link
+    Given the environment is configured to redirect to profile homepage after login
+    And feature "skip_new_user_email_confirmation" is disabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    And I go to josesilva's confirmation URL
+    And I fill in "Username" with "josesilva"
+    And I fill in "Password" with "secret"
+    And I press "Log in"
+    Then I should be on /profile/josesilva
+
+  @selenium
+  Scenario: user should go to his control panel after following confirmation link
+    Given the environment is configured to redirect to profile control panel after login
+    And feature "skip_new_user_email_confirmation" is disabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    And I go to josesilva's confirmation URL
+    And I fill in "Username" with "josesilva"
+    And I fill in "Password" with "secret"
+    And I press "Log in"
+    Then I should be on /myprofile/josesilva
+
+  @selenium
+  Scenario: user should go to his profile page after following confirmation link
+    Given the environment is configured to redirect to user profile page after login
+    And feature "skip_new_user_email_confirmation" is disabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    And I go to josesilva's confirmation URL
+    And I fill in "Username" with "josesilva"
+    And I fill in "Password" with "secret"
+    And I press "Log in"
+    Then I should be on /profile/josesilva
+
+  @selenium
+  Scenario: user should go to the environment homepage after following confirmation link
+    Given the environment is configured to redirect to site homepage after login
+    And feature "skip_new_user_email_confirmation" is disabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    And I go to josesilva's confirmation URL
+    And I fill in "Username" with "josesilva"
+    And I fill in "Password" with "secret"
+    And I press "Log in"
+    Then I should be on the homepage
@@ -738,6 +738,24 @@ Given /^the profile (.*) is configured to (.*) after login$/ do |profile, option
   profile.save
 end
  
+Given /^the environment is configured to (.*) after signup$/ do |option|
+  redirection = case option
+    when 'stay on the same page'
+      'keep_on_same_page'
+    when 'redirect to site homepage'
+      'site_homepage'
+    when 'redirect to user profile page'
+      'user_profile_page'
+    when 'redirect to profile homepage'
+      'user_homepage'
+    when 'redirect to profile control panel'
+      'user_control_panel'
+  end
+  environment = Environment.default
+  environment.redirection_after_signup = redirection
+  environment.save
+end
+
 When /^wait for the captcha signup time$/ do
   environment = Environment.default
   sleep environment.min_signup_delay + 1
@@ -111,6 +111,10 @@ module NavigationHelpers
     when /the user data path/
       '/account/user_data'
  
+    when /^(.+)'s confirmation URL/
+      user = User[$1]
+      "/account/activate?activation_code=#{user.activation_code}&redirection=" + (user.return_to.nil? ? 'false' : 'true')
+
     when /^(.+)'s members page/
       '/profile/%s/members' % profile_identifier($1)
  
@@ -263,7 +263,7 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     assert_no_tag :tag => 'a', :content => /Category 2/
   end
  
-  should 'show name of article as title of page' do
+  should 'show name of article as title of page without environment' do
     p = create_user('test_user').person
     a = p.articles.create!(:name => 'test article')
  
@@ -271,17 +271,22 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     @controller.instance_variable_set('@page', a)
  
     get :index
-    assert_tag 'title', :content => 'test article - ' + p.name + ' - ' + p.environment.name
+    assert_tag 'title', :content => 'test article - ' + p.name
   end
  
-  should 'diplay name of profile in the title' do
+  should 'diplay name of profile in the title without environment' do
     p = create_user('test_user').person
     p.name = 'Some Test User'
     p.save!
     @controller.instance_variable_set('@profile', p)
  
     get :index, :profile => p.identifier
-    assert_tag 'title', :content => p.name + ' - ' + p.environment.name
+    assert_tag 'title', :content => p.name
+  end
+
+  should 'display environment name in title when profile and page are not defined' do
+    get :index
+    assert_tag 'title', :content => assigns(:environment).name
   end
  
   should 'display menu links for my environment when logged in other environment' do
@@ -324,7 +329,8 @@ class ApplicationControllerTest &lt; ActionController::TestCase
   end
  
   should 'set html lang as the article language if an article is present and has a language' do
-    a = fast_create(Article, :name => 'test article', :language => 'fr')
+    p = create_user('test_user').person
+    a = fast_create(Article, :name => 'test article', :language => 'fr', :profile_id => p.id )
     @controller.instance_variable_set('@page', a)
     FastGettext.stubs(:locale).returns('es')
     get :index
@@ -338,7 +344,9 @@ class ApplicationControllerTest &lt; ActionController::TestCase
   end
  
   should 'set html lang as locale if page has no language' do
-    a = fast_create(Article, :name => 'test article', :language => nil)
+    p = create_user('test_user').person
+    a = fast_create(Article, :name => 'test article', :language => nil, :profile_id => p.id )
+
     @controller.instance_variable_set('@page', a)
     FastGettext.stubs(:locale).returns('es')
     get :index
@@ -542,4 +550,18 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     assert_equal nil, @controller.application_controller_test_other_filter_plugin_filter_plugin
   end
  
+  should 'display meta tags for social media' do
+    get :index
+    assert_tag :tag => 'meta', :attributes => { :name => 'twitter:card', :value => 'summary' }
+    assert_tag :tag => 'meta', :attributes => { :name => 'twitter:title', :content => assigns(:environment).name }
+    assert_tag :tag => 'meta', :attributes => { :name => 'twitter:description', :content => assigns(:environment).name }
+    assert_no_tag :tag => 'meta', :attributes => { :name => 'twitter:image' }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:type', :content => 'website' }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:url', :content => assigns(:environment).top_url }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:title', :content => assigns(:environment).name }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:site_name', :content => assigns(:environment).name }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:description', :content => assigns(:environment).name }
+    assert_no_tag :tag => 'meta', :attributes => { :property => 'article:published_time' }
+    assert_no_tag :tag => 'meta', :attributes => { :property => 'og:image' }
+  end
 end
@@ -1369,4 +1369,28 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_match /this is a sample text file/, @response.body
   end
  
+  should 'add meta tags with article info' do
+    a = TinyMceArticle.create(:name => 'Article to be shared', :body => 'This article should be shared with all social networks', :profile => profile)
+
+    get :view_page, :profile => profile.identifier, :page => [ a.name.to_slug ]
+
+    assert_tag :tag => 'meta', :attributes => { :name => 'twitter:title', :content => /#{a.name} - #{a.profile.name}/ }
+    assert_tag :tag => 'meta', :attributes => { :name => 'twitter:description', :content => a.body }
+    assert_no_tag :tag => 'meta', :attributes => { :name => 'twitter:image' }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:type', :content => 'article' }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:url', :content => /\/#{profile.identifier}\/#{a.name.to_slug}/ }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:title', :content => /#{a.name} - #{a.profile.name}/ }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:site_name', :content => a.profile.name }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:description', :content => a.body }
+    assert_no_tag :tag => 'meta', :attributes => { :property => 'og:image' }
+  end
+
+  should 'add meta tags with article images' do
+    a = TinyMceArticle.create(:name => 'Article to be shared with images', :body => 'This article should be shared with all social networks <img src="/images/x.png" />', :profile => profile)
+
+    get :view_page, :profile => profile.identifier, :page => [ a.name.to_slug ]
+    assert_tag :tag => 'meta', :attributes => { :name => 'twitter:image', :content => /\/images\/x.png/ }
+    assert_tag :tag => 'meta', :attributes => { :property => 'og:image', :content => /\/images\/x.png/  }
+  end
+
 end
@@ -466,6 +466,22 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase
     assert_match(/Community nick/, page_title)
   end
  
+  should 'not display environment name if is a profile' do
+    stubs(:environment).returns(Environment.default)
+    @controller = ApplicationController.new
+
+    c = fast_create(Community, :name => 'Community for tests', :nickname => 'Community nick', :identifier => 'test_comm')
+    stubs(:profile).returns(c)
+    assert_equal c.short_name, page_title
+  end
+
+  should 'display only environment if no profile and page' do
+    stubs(:environment).returns(Environment.default)
+    @controller = ApplicationController.new
+
+    assert_equal Environment.default.name, page_title
+  end
+
   should 'gravatar default parameter' do
     profile = mock
     profile.stubs(:theme).returns('some-theme')
@@ -89,38 +89,6 @@ class ContentViewerHelperTest &lt; ActiveSupport::TestCase
     assert_no_match /feed/, result
   end
  
-  should 'generate facebook addthis url for article' do
-    Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
-    [TextileArticle, Blog, Folder, Gallery, UploadedFile, Forum, Event, TextArticle, TinyMceArticle].each do |model|
-      a = model.new(:name => 'Some title', :body => 'Some text here.', :profile => profile)
-      assert_equal "http://www.facebook.com/sharer.php?s=100&p[title]=Some+title&p[summary]=Some+text+here.&p[url]=http%3A%2F%2Fnoosfero.org%2Fblog_helper_test%2Fsome-title&p[images][0]=", addthis_facebook_url(a)
-    end
-  end
-
-  should 'generate facebook addthis url without body' do
-    Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
-    a = TinyMceArticle.new(:name => 'Test', :body => nil, :profile => profile)
-    assert_equal "http://www.facebook.com/sharer.php?s=100&p[title]=Test&p[summary]=&p[url]=http%3A%2F%2Fnoosfero.org%2Fblog_helper_test%2Ftest&p[images][0]=", addthis_facebook_url(a)
-  end
-
-  should 'generate facebook addthis url without tags in body' do
-    Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
-    a = TinyMceArticle.new(:name => 'Some title', :body => '<p>This <b class="bold">is</b> a test</p>', :profile => profile)
-    assert_equal "http://www.facebook.com/sharer.php?s=100&p[title]=Some+title&p[summary]=This+is+a+test&p[url]=http%3A%2F%2Fnoosfero.org%2Fblog_helper_test%2Fsome-title&p[images][0]=", addthis_facebook_url(a)
-  end
-
-  should 'generate facebook addthis url with truncated body' do
-    Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
-    a = TinyMceArticle.new(:name => 'Some title', :body => 'test' * 76, :profile => profile)
-    assert_equal "http://www.facebook.com/sharer.php?s=100&p[title]=Some+title&p[summary]=#{'test' * 74}t...&p[url]=http%3A%2F%2Fnoosfero.org%2Fblog_helper_test%2Fsome-title&p[images][0]=", addthis_facebook_url(a)
-  end
-
-  should 'generate facebook addthis url for tinymce article with images' do
-    Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
-    a = TinyMceArticle.new(:name => 'Some title', :body => '<p>This <b class="bold">is</b> a <img src="/images/x.png" />test</p>', :profile => profile)
-    assert_equal "http://www.facebook.com/sharer.php?s=100&p[title]=Some+title&p[summary]=This+is+a+test&p[url]=http%3A%2F%2Fnoosfero.org%2Fblog_helper_test%2Fsome-title&p[images][0]=http%3A%2F%2Fnoosfero.org%2Fimages%2Fx.png", addthis_facebook_url(a)
-  end
-
   should 'theme provides addthis custom icon' do
     stubs(:session).returns({:theme => 'base'})
     File.expects(:exists?).with(anything).returns(true)
@@ -1220,6 +1220,27 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     end
   end
  
+  should 'return a Hash on signup redirection options' do
+    assert_kind_of Hash, Environment.signup_redirection_options
+  end
+
+  should 'respond to redirection after signup' do
+    assert_respond_to Environment.new, :redirection_after_signup
+  end
+
+  should 'allow only environment signup redirection options' do
+    environment = fast_create(Environment)
+    environment.redirection_after_signup = 'invalid_option'
+    environment.save
+    assert environment.errors.invalid?(:redirection_after_signup)
+
+    Environment.signup_redirection_options.keys.each do |redirection|
+      environment.redirection_after_signup = redirection
+      environment.save
+      assert !environment.errors.invalid?(:redirection_after_signup)
+    end
+  end
+
   should 'respond to signup_welcome_text' do
     assert_respond_to Environment.new, :signup_welcome_text
   end
...	...	@@ -24,10 +24,16 @@ class CmsController < MyProfileController
24	24	(user && (user.has_permission?('post_content', profile) \|\| user.has_permission?('publish_content', profile)))
25	25	end
26	26
27		- protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish, :upload_files] do \|c, user, profile\|
	27	+ protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish, :upload_files, :new] do \|c, user, profile\|
28	28	user && (user.has_permission?('post_content', profile) \|\| user.has_permission?('publish_content', profile))
29	29	end
30	30
	31	+ protect_if :only => :new do \|c, user, profile\|
	32	+ article = profile.articles.find_by_id(c.params[:parent_id])
	33	+ (!article.nil? && (article.allow_create?(user) \|\| article.parent.allow_create?(user))) \|\|
	34	+ (user && (user.has_permission?('post_content', profile) \|\| user.has_permission?('publish_content', profile)))
	35	+ end
	36	+
31	37	protect_if :only => [:destroy, :publish] do \|c, user, profile\|
32	38	profile.articles.find(c.params[:id]).allow_post_content?(user)
33	39	end
...	...
...	...	@@ -69,6 +69,8 @@ class AccountController < ApplicationController
69	69	session[:notice] = _("This environment doesn't allow user registration.")
70	70	end
71	71
	72	+ store_location(request.referer) unless params[:return_to] or session[:return_to]
	73	+
72	74	@block_bot = !!session[:may_be_a_bot]
73	75	@invitation_code = params[:invitation_code]
74	76	begin
...	...	@@ -77,6 +79,7 @@ class AccountController < ApplicationController
77	79	@user.environment = environment
78	80	@terms_of_use = environment.terms_of_use
79	81	@user.person_data = params[:profile_data]
	82	+ @user.return_to = session[:return_to]
80	83	@person = Person.new(params[:profile_data])
81	84	@person.environment = @user.environment
82	85	if request.post?
...	...	@@ -98,7 +101,7 @@ class AccountController < ApplicationController
98	101	end
99	102	if @user.activated?
100	103	self.current_user = @user
101		- redirect_to '/'
	104	+ go_to_signup_initial_page
102	105	else
103	106	@register_pending = true
104	107	end
...	...	@@ -368,32 +371,29 @@ class AccountController < ApplicationController
368	371	end
369	372
370	373	def go_to_initial_page
	374	+ if params[:redirection]
	375	+ session[:return_to] = @user.return_to
	376	+ @user.return_to = nil
	377	+ @user.save
	378	+ end
	379	+
371	380	if params[:return_to]
372	381	redirect_to params[:return_to]
373	382	elsif environment.enabled?('allow_change_of_redirection_after_login')
374		- case user.preferred_login_redirection
375		- when 'keep_on_same_page'
376		- redirect_back_or_default(user.admin_url)
377		- when 'site_homepage'
378		- redirect_to :controller => :home
379		- when 'user_profile_page'
380		- redirect_to user.public_profile_url
381		- when 'user_homepage'
382		- redirect_to user.url
383		- when 'user_control_panel'
384		- redirect_to user.admin_url
385		- else
386		- redirect_back_or_default(user.admin_url)
387		- end
	383	+ check_redirection_options(user, user.preferred_login_redirection, user.admin_url)
388	384	else
389	385	if environment == current_user.environment
390		- redirect_back_or_default(user.admin_url)
	386	+ check_redirection_options(user, environment.redirection_after_login, user.admin_url)
391	387	else
392	388	redirect_back_or_default(:controller => 'home')
393	389	end
394	390	end
395	391	end
396	392
	393	+ def go_to_signup_initial_page
	394	+ check_redirection_options(user, user.environment.redirection_after_signup, user.url)
	395	+ end
	396	+
397	397	def redirect_if_logged_in
398	398	if logged_in?
399	399	go_to_initial_page
...	...	@@ -409,4 +409,22 @@ class AccountController < ApplicationController
409	409	user
410	410	end
411	411
	412	+ protected
	413	+
	414	+ def check_redirection_options(user, condition, default)
	415	+ case condition
	416	+ when 'keep_on_same_page'
	417	+ redirect_back_or_default(user.admin_url)
	418	+ when 'site_homepage'
	419	+ redirect_to :controller => :home
	420	+ when 'user_profile_page'
	421	+ redirect_to user.public_profile_url
	422	+ when 'user_homepage'
	423	+ redirect_to user.url
	424	+ when 'user_control_panel'
	425	+ redirect_to user.admin_url
	426	+ else
	427	+ redirect_back_or_default(default)
	428	+ end
	429	+ end
412	430	end
...	...
...	...	@@ -889,12 +889,11 @@ module ApplicationHelper
889	889
890	890	def page_title
891	891	(@page ? @page.title + ' - ' : '') +
892		- (profile ? profile.short_name + ' - ' : '') +
893	892	(@topic ? @topic.title + ' - ' : '') +
894	893	(@section ? @section.title + ' - ' : '') +
895	894	(@toc ? _('Online Manual') + ' - ' : '') +
896	895	(@controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
897		- environment.name +
	896	+ (profile ? profile.short_name : environment.name) +
898	897	(@category ? " - #{@category.full_name}" : '')
899	898	end
900	899
...	...
...	...	@@ -49,8 +49,14 @@ module ArticleHelper
49	49	'div',
50	50	check_box(:article, :display_versions) +
51	51	content_tag('label', _('I want this article to display a link to older versions'), :for => 'article_display_versions')
52		- ) : '')
	52	+ ) : '') +
53	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	+ ) : '')
54	60	)
55	61	end
56	62
...	...
...	...	@@ -52,15 +52,6 @@ module ContentViewerHelper
52	52	end
53	53	end
54	54
55		- def addthis_facebook_url(article)
56		- "http://www.facebook.com/sharer.php?s=100&p[title]=%{title}&p[summary]=%{summary}&p[url]=%{url}&p[images][0]=%{image}" % {
57		- :title => CGI.escape(article.title),
58		- :url => CGI.escape(url_for(article.url)),
59		- :summary => CGI.escape(truncate(strip_tags(article.body.to_s), :length => 300)),
60		- :image => CGI.escape(article.body_images_paths.first.to_s)
61		- }
62		- end
63		-
64	55	def addthis_image_tag
65	56	if File.exists?(File.join(Rails.root, 'public', theme_path, 'images', 'addthis.gif'))
66	57	image_tag(File.join(theme_path, 'images', 'addthis.gif'), :border => 0, :alt => '')
...	...
...	...	@@ -90,5 +90,8 @@ module LayoutHelper
90	90	end
91	91	end
92	92
	93	+ def meta_description_tag(article=nil)
	94	+ article ? truncate(strip_tags(article.body.to_s), :length => 200) : environment.name
	95	+ end
93	96	end
94	97
...	...
...	...	@@ -145,6 +145,18 @@ class Environment < ActiveRecord::Base
145	145	end
146	146	validates_inclusion_of :redirection_after_login, :in => Environment.login_redirection_options.keys, :allow_nil => true
147	147
	148	+ def self.signup_redirection_options
	149	+ {
	150	+ 'keep_on_same_page' => _('Stays on the same page the user was before signup.'),
	151	+ 'site_homepage' => _('Redirects the user to the environment homepage.'),
	152	+ 'user_profile_page' => _('Redirects the user to his profile page.'),
	153	+ 'user_homepage' => _('Redirects the user to his homepage.'),
	154	+ 'user_control_panel' => _('Redirects the user to his control panel.')
	155	+ }
	156	+ end
	157	+ validates_inclusion_of :redirection_after_signup, :in => Environment.signup_redirection_options.keys, :allow_nil => true
	158	+
	159	+
148	160	# #################################################
149	161	# Relationships and applied behaviour
150	162	# #################################################
...	...
...	...	@@ -5,6 +5,7 @@ class Forum < Folder
5	5
6	6	settings_items :terms_of_use, :type => :string, :default => ""
7	7	settings_items :has_terms_of_use, :type => :boolean, :default => false
	8	+ settings_items :allows_members_to_create_topics, :type => :boolean, :default => false
8	9	has_and_belongs_to_many :users_with_agreement, :class_name => 'Person', :join_table => 'terms_forum_people'
9	10
10	11	before_save do \|forum\|
...	...	@@ -66,4 +67,11 @@ class Forum < Folder
66	67	self.users_with_agreement.exists? user
67	68	end
68	69
	70	+ def can_create_topic?(user, profile)
	71	+ return profile.community? && profile.members.include?(user) && self.allows_members_to_create_topics
	72	+ end
	73	+
	74	+ def allow_create?(user)
	75	+ super \|\| can_create_topic?(user, profile)
	76	+ end
69	77	end
...	...
...	...	@@ -71,7 +71,8 @@ class User < ActiveRecord::Base
71	71	body :recipient => user.name,
72	72	:activation_code => user.activation_code,
73	73	:environment => user.environment.name,
74		- :url => user.environment.top_url
	74	+ :url => user.environment.top_url,
	75	+ :redirection => (true if user.return_to)
75	76	end
76	77
77	78	def signup_welcome_email(user)
...	...	@@ -93,7 +94,7 @@ class User < ActiveRecord::Base
93	94	self.person.save!
94	95	end
95	96	end
96		-
	97	+
97	98	has_one :person, :dependent => :destroy
98	99	belongs_to :environment
99	100
...	...	@@ -183,7 +184,7 @@ class User < ActiveRecord::Base
183	184	encryption_methods[sym] = block
184	185	end
185	186
186		- # the encryption method used for this instance
	187	+ # the encryption method used for this instance
187	188	def encryption_method
188	189	(password_type \|\| User.system_encryption_method).to_sym
189	190	end
...	...	@@ -226,7 +227,7 @@ class User < ActiveRecord::Base
226	227	end
227	228
228	229	def remember_token?
229		- remember_token_expires_at && Time.now.utc < remember_token_expires_at
	230	+ remember_token_expires_at && Time.now.utc < remember_token_expires_at
230	231	end
231	232
232	233	# These create and unset the fields required for remembering users between browser closes
...	...	@@ -255,7 +256,7 @@ class User < ActiveRecord::Base
255	256	raise IncorrectPassword unless self.authenticated?(current)
256	257	self.force_change_password!(new, confirmation)
257	258	end
258		-
	259	+
259	260	# Changes the password of a user without asking for the old password. This
260	261	# method is intended to be used by the "I forgot my password", and must be
261	262	# used with care.
...	...	@@ -326,7 +327,7 @@ class User < ActiveRecord::Base
326	327	end
327	328
328	329	protected
329		- # before filter
	330	+ # before filter
330	331	def encrypt_password
331	332	return if password.blank?
332	333	self.salt \|\|= Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record?
...	...
...	...	@@ -0,0 +1,8 @@
	1	+<div id="addThis">
	2	+ <script type="text/javascript">
	3	+ addthis_pub = '<%= escape_javascript( NOOSFERO_CONF['addthis_pub'] ) %>';
	4	+ addthis_logo = '<%= escape_javascript( NOOSFERO_CONF['addthis_logo'] ) %>';
	5	+ addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>';
	6	+ </script>
	7	+ <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>
	8	+</div>
...	...