Merge branch 'rails3' into rails3_stable

Conflicts: app/models/environment.rb

Merge branch 'rails3' into rails3_stable
Conflicts: app/models/environment.rb
Victor Costa
2 parents 9168ef76 1a36a52c
Showing 25 changed files with 211 additions and 724 deletions Show diff stats
app/controllers/admin/admin_panel_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/profile_controller.rb
app/models/categories_block.rb
app/models/environment.rb
app/models/user.rb
app/views/account/signup.html.erb
app/views/admin_panel/_signup_welcome_screen.html.erb
app/views/admin_panel/site_info.html.erb
app/views/content_viewer/_article_toolbar.html.erb
app/views/user/mailer/activation_code.html.erb
features/categories_block.feature
features/edit_profile.feature
features/login.feature
features/profile_domain.feature
features/publish_article.feature
features/signup.feature
features/step_definitions/web_steps.rb
lib/noosfero/plugin.rb.orig
plugins/comment_group/lib/comment_group_plugin/macros/allow_comment.rb
@@ -7,6 +7,7 @@ class AdminPanelController &lt; AdminController
   end
  
   def site_info
+    @no_design_blocks = true
     if request.post?
       if params[:environment][:languages]
         params[:environment][:languages] = params[:environment][:languages].map {|lang, value| lang if value=='true'}.compact
@@ -17,6 +17,8 @@ class AccountController &lt; ApplicationController
     @user = User.find_by_activation_code(params[:activation_code]) if params[:activation_code]
     if @user and @user.activate
       @message = _("Your account has been activated, now you can log in!")
+      check_redirection
+      session[:join] = params[:join] unless params[:join].blank?
       render :action => 'login', :userlogin => @user.login
     else
       session[:notice] = _("It looks like you're trying to activate an account. Perhaps have already activated this account?")
@@ -35,6 +37,7 @@ class AccountController &lt; ApplicationController
     self.current_user ||= User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
  
     if logged_in?
+      check_join_in_community(self.current_user)
       if params[:remember_me] == "1"
         self.current_user.remember_me
         cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }
@@ -91,6 +94,7 @@ class AccountController &lt; ApplicationController
           if session[:may_be_a_bot]
             return false unless verify_recaptcha :model=>@user, :message=>_('Captcha (the human test)')
           end
+          @user.community_to_join = session[:join]
           @user.signup!
           owner_role = Role.find_by_name('owner')
           @user.person.affiliate(@user.person, [owner_role]) if owner_role
@@ -101,6 +105,7 @@ class AccountController &lt; ApplicationController
           end
           if @user.activated?
             self.current_user = @user
+            check_join_in_community(@user)
             go_to_signup_initial_page
           else
             @register_pending = true
@@ -388,12 +393,6 @@ 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')
@@ -444,4 +443,19 @@ class AccountController &lt; ApplicationController
       redirect_back_or_default(default)
     end
   end
+
+  def check_redirection
+    unless params[:redirection].blank?
+      session[:return_to] = @user.return_to
+      @user.update_attributes(:return_to => nil)
+    end
+  end
+
+  def check_join_in_community(user)
+    profile_to_join = session[:join]
+    unless profile_to_join.blank?
+     environment.profiles.find_by_identifier(profile_to_join).add_member(user.person)
+     session.delete(:join)
+    end
+  end
 end
@@ -3,7 +3,7 @@ class ProfileController &lt; PublicController
   needs_profile
   before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
   before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse, :send_mail]
-  before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail]
+  before_filter :login_required, :only => [:add, :join, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail]
  
   helper TagsHelper
  
@@ -97,21 +97,12 @@ class ProfileController &lt; PublicController
   end
  
   def join_not_logged
-    if request.post?
-      profile.add_member(user)
-      session[:notice] = _('%s administrator still needs to accept you as member.') % profile.name if profile.closed?
-      redirect_to_previous_location
+    session[:join] = profile.identifier
+
+    if user
+      redirect_to :controller => 'profile', :action => 'join'
     else
-      if user.memberships.include?(profile)
-        session[:notice] = _('You are already a member of %s.') % profile.name
-        redirect_to profile.url
-        return
-      end
-      if request.xhr?
-        render :layout => false
-      else
-        redirect_to profile.url
-      end
+      redirect_to :controller => '/account', :action => 'login'
     end
   end
  
@@ -8,6 +8,8 @@ class CategoriesBlock &lt; Block
  
   settings_items :category_types, :type => Array, :default => []
  
+  attr_accessible :category_types
+
   def self.description
     _("Categories Menu")
   end
@@ -3,7 +3,7 @@
 # domains.
 class Environment < ActiveRecord::Base
  
-  attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :enabled_blocks, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound
+  attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :enabled_blocks, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound, :noreply_email, :signup_welcome_screen_body
  
   has_many :users
  
@@ -300,6 +300,12 @@ class Environment &lt; ActiveRecord::Base
   settings_items :access_control_allow_origin, :type => Array, :default => []
   settings_items :access_control_allow_methods, :type => String
  
+  settings_items :signup_welcome_screen_body, :type => String
+
+  def has_custom_welcome_screen?
+    settings[:signup_welcome_screen_body].present?
+  end
+
   def news_amount_by_folder=(amount)
     settings[:news_amount_by_folder] = amount.to_i
   end
@@ -64,6 +64,9 @@ class User &lt; ActiveRecord::Base
     self.person.preferred_domain && self.person.preferred_domain.name || self.environment.default_hostname(true)
   end
  
+  # virtual attribute used to stash which community to join on signup or login
+  attr_accessor :community_to_join
+
   class Mailer < ActionMailer::Base
     def activation_email_notify(user)
       user_email = "#{user.login}@#{user.email_domain}"
@@ -86,7 +89,8 @@ class User &lt; ActiveRecord::Base
         :activation_code => user.activation_code,
         :environment => user.environment.name,
         :url => user.environment.top_url,
-        :redirection => (true if user.return_to)
+        :redirection => (true if user.return_to),
+        :join => (user.community_to_join if user.community_to_join)
     end
  
     def signup_welcome_email(user)
 <% if @register_pending %>
-<div id='thanks-for-signing'>
-  <h1><%= _("Welcome to %s!") % environment.name %></h1>
-  <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
-  <p><%= _("Firstly, some tips for getting started:") %></p>
-  <h4><%= _("Confirm your account!") %></h4>
-  <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p>
-  <p><%= _("You won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
-  <h4><%= _("What to do next?") %></h4>
-  <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
-  <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
-  <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
-  <p><%= _("Start exploring and have fun!") %></p>
-</div>
+  <div id='thanks-for-signing'>
+    <% if environment.has_custom_welcome_screen? %>
+      <%= environment.settings[:signup_welcome_screen_body].html_safe %>
+    <% else %>
+        <h1><%= _("Welcome to %s!") % environment.name %></h1>
+        <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
+        <p><%= _("Firstly, some tips for getting started:") %></p>
+        <h4><%= _("Confirm your account!") %></h4>
+        <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p>
+        <p><%= _("You won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
+        <h4><%= _("What to do next?") %></h4>
+        <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
+        <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
+        <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
+        <p><%= _("Start exploring and have fun!") %></p>
+    <% end %>
+  </div>
 <% else %>
   <h1><%= _('Sign up for %s!') % environment.name %></h1>
   <%= render :partial => 'signup_form' %>
@@ -0,0 +1,5 @@
+<div class='description'>
+  <%= _('This text will be showed as a welcome message to users after signup') %><br/><br/>
+</div>
+
+<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
@@ -12,6 +12,8 @@
     :content => (render :partial => 'terms_of_use', :locals => {:f => f})} %>
   <% tabs << {:title => _('Signup welcome text'), :id => 'signup-welcome-text',
     :content => (render :partial => 'signup_welcome_text', :locals => {:f => f})} %>
+  <% tabs << {:title => _('Signup welcome message'), :id => 'signup-welcome-message',
+    :content => (render :partial => 'signup_welcome_screen', :locals => {:f => f}) }%>
   <%= render_tabs(tabs) %>
   <% button_bar do %>
     <%= submit_button(:save, _('Save'), :cancel => {:action => 'index'}) %>
@@ -10,7 +10,7 @@
  
     <% if @page != profile.home_page && !@page.has_posts?  && @page.allow_delete?(user) && !remove_content_button(:delete)%>
       <% content = content_tag( 'span', _('Delete') ) %>
-      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page}) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page.id}) %>
       <% options = {:method => :post, :confirm => delete_article_message(@page)} %>
       <%= expirable_button @page, :delete, content, url, options %>
     <% end %>
@@ -19,9 +19,9 @@
       <% content = content_tag( 'span', _('Spread this') ) %>
       <% url = nil %>
       <% if profile.kind_of?(Person) %>
-        <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }) %>
+        <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %>
       <% elsif profile.kind_of?(Community) && environment.portal_community %>
-        <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }) %>
+        <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page.id }) %>
       <% end %>
       <%= expirable_button @page, :spread, content, url if url %>
     <% end %>
 <%= _('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, :redirection => @redirection) }) %>
+<%= 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, :join => @join) }) %>
  
 <%= _("Greetings,") %>
  
@@ -28,7 +28,8 @@ Feature: categories_block
  
   @selenium
   Scenario: List just product categories
-    Given I follow "Edit" within ".categories-block"
+    Given display ".button-bar"
+    And I follow "Edit" within ".categories-block"
     And I check "Product"
     When I press "Save"
     Then I should see "Food"
@@ -39,7 +40,8 @@ Feature: categories_block
  
   @selenium
   Scenario: Show submenu if it exists
-    Given I follow "Edit" within ".categories-block"
+    Given display ".button-bar"
+    And I follow "Edit" within ".categories-block"
     And I check "Product"
     And I press "Save"
     Then I should see "Food"
@@ -56,7 +58,8 @@ Feature: categories_block
  
   @selenium
   Scenario: Show only one submenu per time
-    Given I follow "Edit" within ".categories-block"
+    Given display ".button-bar"
+    And I follow "Edit" within ".categories-block"
     And I check "Product"
     And I press "Save"
     Then I should see "Book"
@@ -66,14 +69,16 @@ Feature: categories_block
  
   @selenium
   Scenario: List just general categories
-    Given I follow "Edit" within ".categories-block"
+    Given display ".button-bar"
+    And I follow "Edit" within ".categories-block"
     And I check "Generic category"
     When I press "Save"
     Then I should see "Wood"
  
   @selenium
   Scenario: List just regions
-    Given I follow "Edit" within ".categories-block"
+    Given display ".button-bar"
+    And I follow "Edit" within ".categories-block"
     And I check "Region"
     When I press "Save"
     Then I should see "Bahia"
@@ -12,7 +12,7 @@ Feature: edit profile
       | birth_date |
     When I go to joao's control panel
     And I follow "Edit Profile"
-    And I select "1980-11-15" from "profile_data_birth_date"
+    And I fill in "Birth date" with "1980-11-15"
     And I press "Save"
     Then I should not see "Birth date is invalid"
     And I should not see "Birth date is mandatory"
@@ -23,7 +23,7 @@ Feature: edit profile
       | birth_date |
     When I go to joao's control panel
     And I follow "Edit Profile"
-    And I select "1980-11-15" from "profile_data_birth_date"
+    And I fill in "Birth date" with "1980-11-15"
     And I press "Save"
     Then I should not see "Birth date is invalid"
     And I should not see "Birth date is mandatory"
@@ -207,3 +207,18 @@ Feature: login
       | Password | 123456 |
     When I press "Log in"
     Then I should be on joaosilva's control panel
+
+  Scenario: join community on login
+    Given the following users
+      | login | name |
+      | mariasilva | Maria Silva |
+    And the following communities
+       | name           | identifier    | owner     |
+       | Free Software  | freesoftware  | mariasilva |
+    And I am on /freesoftware
+    When I follow "Join"
+    And I fill in the following:
+      | Username / Email | joaosilva |
+      | Password | 123456 |
+    And I press "Log in"
+    Then "Joao Silva" should be a member of "Free Software"
@@ -9,11 +9,11 @@ Feature: domain for profile
       | joaosilva | Joao Silva |
     And the following communities
       | identifier       | name             | domain    |
-      | sample-community | Sample Community | localhost |
+      | sample-community | Sample Community | 127.0.0.1 |
     And the following blocks
       | owner            | type              |
       | joaosilva        | ProfileInfoBlock  |
-    And the environment domain is "127.0.0.1"
+    And the environment domain is "localhost"
     And "Joao Silva" is environment admin
     And "Joao Silva" is admin of "Sample Community"
  
@@ -29,8 +29,7 @@ Feature: domain for profile
   @selenium
   Scenario: access user control panel
     Given I am logged in as "joaosilva"
-    When I go to the homepage
-    And I follow "joaosilva"
+    When I follow "joaosilva"
     And I go to sample-community's homepage
     And I follow "Login"
     And I fill in "joaosilva" for "Username"
@@ -39,18 +38,13 @@ Feature: domain for profile
     And I follow "Control panel" within "div#user"
     Then I should see "Joao Silva" within "span.control-panel-title"
  
-  # Looking for page title is problematic on selenium since it considers the
-  # title to be invibible. Checkout some information about this:
-  #   * https://github.com/jnicklas/capybara/issues/863
-  #   * https://github.com/jnicklas/capybara/pull/953
   @selenium
   Scenario: access user page
     Given I am logged in as "joaosilva"
-    When I go to the homepage
-    And I follow "joaosilva"
+    When I follow "joaosilva"
     Then I should be on joaosilva's profile
     And I should see "Joao Silva" within any "h1"
-    #And the page title should be "Joao Silva"
+    And the page title should be "Joao Silva"
  
   Scenario: access community by domain
     Given I go to the search communities page
@@ -64,7 +58,7 @@ Feature: domain for profile
     Given I am on sample-community's homepage
     When I go to /something-that-does-not-exist
     And I follow "Go to the home page"
-    Then the page title should be "Sample Community - Colivre.net"
+    Then the page title should be "Sample Community"
  
   Scenario: Go to environment homepage after clicking on home button on not found page
     Given I am on the homepage
@@ -72,8 +66,3 @@ Feature: domain for profile
     And I follow "Go to the home page"
     Then I should be on the homepage
     And the page title should be "Colivre.net"
-
-  @selenium
-  Scenario: Compose link to administration with environment domain
-    Given I am logged in as "joaosilva"
-    Then I should see "Administration" linking to "http://127.0.0.1.*/admin"
@@ -56,6 +56,7 @@ Feature: publish article
     And I am on mariasilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
+    And I should see "Text article with Textile markup language"
     And I follow "Text article with Textile markup language"
     And I fill in the following:
       | Title | Sample Article |
@@ -250,3 +250,51 @@ Feature: signup
     And I fill in "Password" with "secret"
     And I press "Log in"
     Then I should be on the homepage
+
+  @selenium
+  Scenario: join community on signup
+    Given the following users
+      | login | name |
+      | mariasilva | Maria Silva |
+    And the following communities
+       | name           | identifier    | owner     |
+       | Free Software  | freesoftware  | mariasilva |
+    And feature "skip_new_user_email_confirmation" is disabled on environment
+    And I am on /freesoftware
+    When I follow "Join"
+    And I follow "New user"
+    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 "José da Silva" should be a member of "Free Software"
+
+  @selenium
+  Scenario: join community on direct signup
+    Given the following users
+      | login | name |
+      | mariasilva | Maria Silva |
+    And the following communities
+       | name           | identifier    | owner      |
+       | Free Software  | freesoftware  | mariasilva |
+    And feature "skip_new_user_email_confirmation" is enabled on environment
+    And I am on /freesoftware
+    When I follow "Join"
+    And I follow "New user"
+    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 "José da Silva" should be a member of "Free Software"
@@ -118,9 +118,9 @@ end
  
 Then /^(?:|I )should see "([^"]*)" within any "([^"]*)"?$/ do |text, selector|
   if page.respond_to? :should
-    page.should have_css(selector, :content => text)
+    page.should have_css(selector, :text => text)
   else
-    assert page.has_css?(selector, :content => text)
+    assert page.has_css?(selector, :text => text)
   end
 end
  
@@ -1,639 +0,0 @@
-require 'noosfero'
-
-class Noosfero::Plugin
-
-  attr_accessor :context
-
-  def initialize(context=nil)
-    self.context = context
-  end
-
-  class << self
-
-    attr_writer :should_load
-
-    def should_load
-      @should_load.nil? && true || @boot
-    end
-
-<<<<<<< HEAD
-    def initialize!
-      return if !should_load
-      enabled.each do |plugin_dir|
-        plugin_name = File.basename(plugin_dir)
-        plugin = load_plugin(plugin_name)
-        load_plugin_extensions(plugin_dir)
-        load_plugin_filters(plugin)
-      end
-    end
-
-    def setup(config)
-      return if !should_load
-      enabled.each do |dir|
-        setup_plugin(dir, config)
-=======
-    def init_system
-      available_plugins.each do |dir|
-        load_plugin dir
->>>>>>> rails235
-      end
-    end
-
-    def setup_plugin(dir, config)
-      plugin_name = File.basename(dir)
-
-      plugin_dependencies_ok = true
-      plugin_dependencies_file = File.join(dir, 'dependencies.rb')
-      if File.exists?(plugin_dependencies_file)
-        begin
-          require plugin_dependencies_file
-        rescue LoadError => ex
-          plugin_dependencies_ok = false
-          $stderr.puts "W: Noosfero plugin #{plugin_name} failed to load (#{ex})"
-        end
-      end
-
-      if plugin_dependencies_ok
-        %w[
-            controllers
-            controllers/public
-            controllers/profile
-            controllers/myprofile
-            controllers/admin
-        ].each do |folder|
-          config.autoload_paths << File.join(dir, folder)
-        end
-        [ config.autoload_paths, $:].each do |path|
-          path << File.join(dir, 'models')
-          path << File.join(dir, 'lib')
-          # load vendor/plugins
-          Dir.glob(File.join(dir, '/vendor/plugins/*')).each do |vendor_plugin|
-            path << "#{vendor_plugin}/lib" 
-            init = "#{vendor_plugin}/init.rb"
-            require init.gsub(/.rb$/, '') if File.file? init
-         end
-        end
-
-        # add view path
-        ActionController::Base.view_paths.unshift(File.join(dir, 'views'))
-      end
-    end
-
-    def load_plugin(plugin_name)
-      (plugin_name.to_s.camelize + 'Plugin').constantize
-    end
-
-    # This is a generic method that initialize any possible filter defined by a
-    # plugin to a specific controller
-    def load_plugin_filters(plugin)
-      plugin_methods = plugin.instance_methods.select {|m| m.to_s.end_with?('_filters')}
-      plugin_methods.each do |plugin_method|
-        controller_class = plugin_method.to_s.gsub('_filters', '').camelize.constantize
-        filters = plugin.new.send(plugin_method)
-        filters = [filters] if !filters.kind_of?(Array)
-
-        filters.each do |plugin_filter|
-          filter_method = (plugin.name.underscore.gsub('/','_') + '_' + plugin_filter[:method_name]).to_sym
-          controller_class.send(plugin_filter[:type], filter_method, (plugin_filter[:options] || {}))
-          controller_class.send(:define_method, filter_method) do
-            instance_eval(&plugin_filter[:block]) if environment.plugin_enabled?(plugin)
-          end
-        end
-      end
-    end
-
-    def load_plugin_extensions(dir)
-      Rails.configuration.to_prepare do
-        Dir[File.join(dir, 'lib', 'ext', '*.rb')].each {|file| require_dependency file }
-      end
-    end
-
-    def enabled
-      @enabled ||=
-        begin
-          plugins = Dir.glob(Rails.root.join('config', 'plugins', '*'))
-          if Rails.env.test? && !plugins.include?(Rails.root.join('config', 'plugins', 'foo'))
-            plugins << Rails.root.join('plugins', 'foo')
-          end
-          plugins.select do |entry|
-            File.directory?(entry)
-          end
-        end
-    end
-
-<<<<<<< HEAD
-
-    def all
-      @all ||= []
-=======
-    def available_plugins
-      unless @available_plugins
-        path = File.join(Rails.root, 'config', 'plugins', '*')
-        @available_plugins = Dir.glob(path).select{ |i| File.directory?(i) }
-        if Rails.env.test? && !@available_plugins.include?(File.join(Rails.root, 'config', 'plugins', 'foo'))
-          @available_plugins << File.join(Rails.root, 'plugins', 'foo')
-        end
-      end
-      @available_plugins
->>>>>>> rails235
-    end
-
-    def all
-      @all ||= available_plugins.map{ |dir| (File.basename(dir) + "_plugin").camelize }
-    end
-
-    def public_name
-      self.name.underscore.gsub('_plugin','')
-    end
-
-    def public_path(file = '')
-      File.join('/plugins', public_name, file)
-    end
-
-    def root_path
-      Rails.root.join('plugins', public_name)
-    end
-
-    def view_path
-      File.join(root_path,'views')
-    end
-
-    # Here the developer should specify the meta-informations that the plugin can
-    # inform.
-    def plugin_name
-      self.name.underscore.humanize
-    end
-    def plugin_description
-      _("No description informed.")
-    end
-
-    def admin_url
-      {:controller => "#{name.underscore}_admin", :action => 'index'}
-    end
-
-    def has_admin_url?
-      File.exists?(File.join(root_path, 'controllers', "#{name.underscore}_admin_controller.rb"))
-    end
-  end
-
-  def expanded_template(file_path, locals = {})
-    views_path = Rails.root.join('plugins', "#{self.class.public_name}", 'views')
-    ERB.new(File.read("#{views_path}/#{file_path}")).result(binding)
-  end
-
-  def extra_blocks(params = {})
-    return [] if self.class.extra_blocks.nil?
-    blocks = self.class.extra_blocks.map do |block, options|
-      type = options[:type]
-      type = type.is_a?(Array) ? type : [type].compact
-      type = type.map do |x|
-        x.is_a?(String) ? x.capitalize.constantize : x
-      end
-      raise "This is not a valid type" if !type.empty? && ![Person, Community, Enterprise, Environment].detect{|m| type.include?(m)}
-
-      position = options[:position]
-      position = position.is_a?(Array) ? position : [position].compact
-      position = position.map{|p| p.to_i}
-      raise "This is not a valid position" if !position.empty? && ![1,2,3].detect{|m| position.include?(m)}
-
-      if !type.empty? && (params[:type] != :all)
-        block = type.include?(params[:type]) ? block : nil
-      end
-
-      if !position.empty? && !params[:position].nil?
-        block = position.detect{ |p| [params[:position]].flatten.include?(p)} ? block : nil
-      end
-
-      block
-    end
-    blocks.compact!
-    blocks || []
-  end
-
-  def macros
-    self.class.constants.map do |constant_name|
-      self.class.const_get(constant_name)
-    end.select {|const| const.is_a?(Class) && const < Noosfero::Plugin::Macro}
-  end
-
-  # Here the developer may specify the events to which the plugins can
-  # register and must return true or false. The default value must be false.
-  # Must also explicitly define its returning variables.
-
-  # -> If true, noosfero will include plugin_dir/public/style.css into
-  # application
-  def stylesheet?
-    false
-  end
-
-  # -> Adds buttons to the control panel
-  # returns = { :title => title, :icon => icon, :url => url }
-  #   title = name that will be displayed.
-  #   icon  = css class name (for customized icons include them in a css file).
-  #   url   = url or route to which the button will redirect.
-  def control_panel_buttons
-    nil
-  end
-
-  # -> Customize profile block design and behavior
-  # (overwrites profile_image_link function)
-  # returns = lambda block that creates html code.
-  def profile_image_link(profile, size, tag, extra_info)
-    nil
-  end
-
-  # -> Adds tabs to the profile
-  # returns   = { :title => title, :id => id, :content => content, :start => start }
-  #   title   = name that will be displayed.
-  #   id      = div id.
-  #   content = lambda block that creates html code.
-  #   start   = boolean that specifies if the tab must come before noosfero tabs (optional).
-  def profile_tabs
-    nil
-  end
-
-  # -> Adds plugin-specific content types to CMS
-  # returns  = [ContentClass1, ContentClass2, ...]
-  def content_types
-    nil
-  end
-
-  # -> Adds content to calalog item
-  # returns = lambda block that creates html code
-  def catalog_item_extras(item)
-    nil
-  end
-
-  # -> Adds content to profile editor info and settings
-  # returns = lambda block that creates html code or raw rhtml/html.erb
-  def profile_editor_extras
-    nil
-  end
-
-  # -> Adds content to calalog list item
-  # returns = lambda block that creates html code
-  def catalog_list_item_extras(item)
-    nil
-  end
-
-  # -> Adds content to products info
-  # returns = lambda block that creates html code
-  def product_info_extras(product)
-    nil
-  end
-
-  # -> Adds content to products on asset list
-  # returns = lambda block that creates html code
-  def asset_product_extras(product)
-    nil
-  end
-
-  # -> Adds a property to the product on asset products
-  # returns = {:name => name, :content => content}
-  #   name = Name of the property
-  #   content = lambda block that creates an html
-  def asset_product_properties(product)
-    nil
-  end
-
-  # -> Adds content to the beginning of the page
-  # returns = lambda block that creates html code or raw rhtml/html.erb
-  def body_beginning
-    nil
-  end
-
-  # -> Adds content to the ending of the page head
-  # returns = lambda block that creates html code or raw rhtml/html.erb
-  def head_ending
-    nil
-  end
-
-  # -> Adds plugins' javascript files to application
-  # returns = ['example1.js', 'javascripts/example2.js', 'example3.js']
-  def js_files
-    []
-  end
-
-  # -> Adds stuff in user data hash
-  # returns = { :some_data => some_value, :another_data => another_value }
-  def user_data_extras
-    {}
-  end
-
-  # -> Parse and possibly make changes of content (article, block, etc) during HTML rendering
-  # returns = content as string after parser and changes
-  def parse_content(html, source)
-    [html, source]
-  end
-
-  # -> Adds links to the admin panel
-  # returns = {:title => title, :url => url}
-  #   title = name that will be displayed in the link
-  #   url   = url or route to which the link will redirect to.
-  def admin_panel_links
-    nil
-  end
-
-  # -> Adds buttons to manage members page
-  # returns = { :title => title, :icon => icon, :url => url }
-  #   title = name that will be displayed.
-  #   icon  = css class name (for customized icons include them in a css file).
-  #   url   = url or route to which the button will redirect.
-  def manage_members_extra_buttons
-    nil
-  end
-
-  # This method will be called just before a comment is saved to the database.
-  #
-  # It can modify the comment in several ways. In special, a plugin can call
-  # reject! on the comment and that will cause the comment to not be saved.
-  #
-  # example:
-  #
-  #   def filter_comment(comment)
-  #     if user_not_logged_in
-  #       comment.reject!
-  #     end
-  #   end
-  #
-  def filter_comment(comment)
-  end
-
-  # Define custom logic to filter loaded comments.
-  #
-  # Example:
-  #
-  #   def unavailable_comments(scope)
-  #     scope.without_spams
-  #   end
-  #
-  def unavailable_comments(scope)
-    scope
-  end
-
-  # -> Allows plugins to check weather object is a spam
-  def check_for_spam(object)
-  end
-
-  # -> Allows plugins to know when an object is marked as a spam
-  def marked_as_spam(object)
-  end
-
-  # -> Allows plugins to know when an object is marked as a ham
-  def marked_as_ham(object)
-  end
-
-  # Adds extra actions for comments
-  # returns = list of hashes or lambda block that creates a list of hashes
-  # example:
-  #
-  #   def comment_actions(comment)
-  #     [{:link => link_to_function(...)}]
-  #   end
-  #
-  def comment_actions(comment)
-    nil
-  end
-
-  # This method is called when the user click on comment actions menu.
-  # returns = list or lambda block that return ids of enabled menu items for comments
-  # example:
-  #
-  #   def check_comment_actions(comment)
-  #     ['#action1', '#action2']
-  #   end
-  #
-  def check_comment_actions(comment)
-    []
-  end
-
-  # -> Adds adicional content to article
-  # returns = lambda block that creates html code
-  def article_extra_contents(article)
-    nil
-  end
-
-  # -> Adds fields to the signup form
-  # returns = lambda block that creates html code
-  def signup_extra_contents
-    nil
-  end
-
-  # -> Adds adicional content to profile info
-  # returns = lambda block that creates html code
-  def profile_info_extra_contents
-    nil
-  end
-
-  # -> Removes the invite friend button from the friends controller
-  # returns = boolean
-  def remove_invite_friends_button
-    nil
-  end
-
-  # -> Extends organization list of members
-  # returns = An instance of ActiveRecord::NamedScope::Scope retrieved through
-  # Person.members_of method.
-  def organization_members(organization)
-    nil
-  end
-
-  # -> Extends person memberships list
-  # returns = An instance of ActiveRecord::NamedScope::Scope retrived through
-  # Person.memberships_of method.
-  def person_memberships(person)
-    nil
-  end
-
-  # -> Extends person permission access
-  # returns = boolean
-  def has_permission?(person, permission, target)
-    nil
-  end
-
-  # -> Adds hidden_fields to the new community view
-  # returns = {key => value}
-  def new_community_hidden_fields
-    nil
-  end
-
-  # -> Adds hidden_fields to the enterprise registration view
-  # returns = {key => value}
-  def enterprise_registration_hidden_fields
-    nil
-  end
-
-  # -> Add an alternative authentication method.
-  # Your plugin have to make the access control and return the logged user.
-  # returns = User
-  def alternative_authentication
-    nil
-  end
-
-  # -> Adds adicional link to make the user authentication
-  # returns = lambda block that creates html code
-  def alternative_authentication_link
-    nil
-  end
-
-  # -> Allow or not user registration
-  # returns = boolean
-  def allow_user_registration
-    true
-  end
-
-  # -> Allow or not password recovery by users
-  # returns = boolean
-  def allow_password_recovery
-    true
-  end
-
-  # -> Adds fields to the login form
-  # returns = lambda block that creates html code
-  def login_extra_contents
-    nil
-  end
-
-  # -> Adds adicional content to comment form
-  # returns = lambda block that creates html code
-  def comment_form_extra_contents(args)
-    nil
-  end
-
-  # -> Adds adicional content to article header
-  # returns = lambda block that creates html code
-  def article_header_extra_contents(article)
-    nil
-  end
-
-  # -> Adds adittional content to comment visualization
-  # returns = lambda block that creates html code
-  def comment_extra_contents(args)
-    nil
-  end
-
-  # This method is called when the user clicks to send a comment.
-  # A plugin can add new content to comment form and this method can process the params sent to avoid creating field on core tables.
-  # returns = params after processed by plugins
-  # example:
-  #
-  #   def process_extra_comment_params(params)
-  #     params.delete(:extra_field)
-  #   end
-  #
-  def process_extra_comment_params(params)
-    params
-  end
-
-  # -> Finds objects by their contents
-  # returns = {:results => [a, b, c, ...], ...}
-  # P.S.: The plugin might add other informations on the return hash for its
-  # own use in specific views
-  def find_by_contents(asset, scope, query, paginate_options={}, options={})
-  end
-
-  # -> Adds aditional fields for change_password
-  # returns = [{:field => 'field1', :name => 'field 1 name', :model => 'person'}, {...}]
-  def change_password_fields
-    nil
-  end
-
-  # -> Adds additional blocks to profiles and environments.
-  # Your plugin must implements a class method called 'extra_blocks'
-  # that returns a hash with the following syntax.
-  #    {
-  #      'block_name' =>
-  #        {
-  #          :type => 'for which holder the block will be available',
-  #          :position => 'where the block could be displayed'
-  #        }
-  #    }
-  #
-  # Where:
-  #
-  #   - block_name: Name of the new block added to the blocks list
-  #   - type: Might have some of the values
-  #      - 'environment' or Environment: If the block is available only for Environment models
-  #      - 'community' or Community: If the block is available only for Community models
-  #      - 'enterprise' or Enterprise: If the block is available only for Enterprise models
-  #      - 'person' or Person: If the block is available only for Person models
-  #      - nil: If no type parameter is passed the block will be available for all types
-  #   - position: Is the layout position of the block. It should be:
-  #      - '1' or 1: Area 1 of layout
-  #      - '2' or 2: Area 2 of layout
-  #      - '3' or 3: Area 3 of layout
-  #      - nil: If no position parameter is passed the block will be available for all positions
-  #
-  #      OBS: Area 1 is where stay the main content of layout. Areas 2 and 3 are the sides of layout.
-  #
-  # examples:
-  #
-  #   def self.extra_blocks(params)
-  #     {
-  #       #Display 'CustomBlock1' only for 'Person' on position '1'
-  #       CustomBlock1 => {:type => 'person', :position => '1' },
-  #
-  #       #Display 'CustomBlock2' only for 'Community' on position '2'
-  #       CustomBlock2 => {:type => Community, :position => '2' },
-  #
-  #       #Display 'CustomBlock3' only for 'Enterprise' on position '3'
-  #       CustomBlock3 => {:type => 'enterprise', :position => 3 },
-  #
-  #       #Display 'CustomBlock2' for 'Environment' and 'Person' on positions '1' and '3'
-  #       CustomBlock4 => {:type => ['environment', Person], :position => ['1','3'] },
-  #
-  #       #Display 'CustomBlock5' for all types and all positions
-  #       CustomBlock5 => {},
-  #     }
-  #   end
-  #
-  #   OBS: The default value is a empty hash.
-  def self.extra_blocks
-    {}
-  end
-
-  def method_missing(method, *args, &block)
-    # This is a generic hotspot for all controllers on Noosfero.
-    # If any plugin wants to define filters to run on any controller, the name of
-    # the hotspot must be in the following form: <underscored_controller_name>_filters.
-    # Example: for ProfileController the hotspot is profile_controller_filters
-    #
-    # -> Adds a filter to a controller
-    # returns = { :type => type,
-    #             :method_name => method_name,
-    #             :options => {:opt1 => opt1, :opt2 => opt2},
-    #             :block => Proc or lambda block}
-    #   type = 'before_filter' or 'after_filter'
-    #   method_name = The name of the filter
-    #   option = Filter options, like :only or :except
-    #   block = Block that the filter will call
-    if method.to_s =~ /^(.+)_controller_filters$/
-      []
-    # -> Removes the action button from the content
-    # returns = boolean
-    elsif method.to_s =~ /^content_remove_(#{content_actions.join('|')})$/
-      nil
-    # -> Expire the action button from the content
-    # returns = string with reason of expiration
-    elsif method.to_s =~ /^content_expire_(#{content_actions.join('|')})$/
-      nil
-    else
-      super
-    end
-  end
-
-  private
-
-  def content_actions
-    #FIXME 'new' and 'upload' only works for content_remove. It should work for
-    #content_expire too.
-    %w[edit delete spread locale suggest home new upload]
-  end
-
-end
-
-require 'noosfero/plugin/hot_spot'
-require 'noosfero/plugin/manager'
-require 'noosfero/plugin/active_record'
-require 'noosfero/plugin/mailer_base'
-require 'noosfero/plugin/settings'
@@ -16,6 +16,9 @@ class CommentGroupPlugin::AllowComment &lt; Noosfero::Plugin::Macro
     article = source
     count = article.group_comments.without_spam.in_group(group_id).count
  
-    proc {render :partial => 'comment_group_plugin_profile/comment_group', :locals => {:group_id => group_id, :article_id => article.id, :inner_html => inner_html, :count => count, :profile_identifier => article.profile.identifier }}
+    proc {
+      render :partial => 'comment_group_plugin_profile/comment_group',
+             :locals => {:group_id => group_id, :article_id => article.id, :inner_html => inner_html, :count => count, :profile_identifier => article.profile.identifier }
+    }
   end
 end
@@ -3,7 +3,6 @@
     <div style="float: left">
     <%= link_to_remote(image_tag("/plugins/comment_group/images/comments.gif"),
         :url => { :profile => profile_identifier, :controller => 'comment_group_plugin_profile', :action => 'view_comments', :group_id => group_id, :article_id => article_id},
-        :loaded => j(visual_effect(:highlight, "comments_list_group_#{group_id}")),
         :method => :post,
         :condition => "!toggleGroup(#{group_id})",
         :complete => "loadCompleted(#{group_id})")%>
 class VideoBlock < Block
  
+  attr_accessible :url, :width, :height
+  
   settings_items :url, :type => :string, :default => ""
   settings_items :width, :type => :integer, :default => 400
   settings_items :height, :type => :integer, :default => 315
@@ -73,6 +73,7 @@ class AdminPanelControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'textarea', :attributes => { :name => 'environment[terms_of_use]'}
     assert_tag :tag => 'input', :attributes => { :name => 'environment[signup_welcome_text_subject]'}
     assert_tag :tag => 'textarea', :attributes => { :name => 'environment[signup_welcome_text_body]'}
+    assert_tag :tag => 'textarea', :attributes => { :name => 'environment[signup_welcome_screen_body]'}
   end
  
   should 'display form for editing message for disabled enterprise' do
@@ -381,4 +382,13 @@ class AdminPanelControllerTest &lt; ActionController::TestCase
     assert_not_includes environment.languages, 'en'
   end
  
+  should 'save body of signup welcome screen' do
+    body = "This is my welcome body"
+    post :site_info, :environment => { :signup_welcome_screen_body => body }
+    assert_redirected_to :action => 'index'
+
+    assert_equal body, Environment.default.signup_welcome_screen_body
+    assert !Environment.default.signup_welcome_screen_body.blank?
+  end
+
 end
@@ -474,17 +474,23 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_equal "/profile/#{community.identifier}", @request.session[:previous_location]
   end
  
-  should 'redirect to location before login after join community' do
+  should 'redirect to login after user not logged asks to join a community' do
     community = Community.create!(:name => 'my test community')
  
-    @request.expects(:referer).returns("/profile/#{community.identifier}/to_go")
-    login_as(profile.identifier)
+    get :join_not_logged, :profile => community.identifier
  
-    post :join_not_logged, :profile => community.identifier
+    assert_equal community.identifier, @request.session[:join]
+    assert_redirected_to :controller => :account, :action => :login
+  end
  
-    assert_redirected_to "/profile/#{community.identifier}/to_go"
+  should 'redirect to join after user logged asks to join_not_logged a community' do
+    community = Community.create!(:name => 'my test community')
+
+    login_as(profile.identifier)
+    get :join_not_logged, :profile => community.identifier
  
-    assert_nil @request.session[:previous_location]
+    assert_equal community.identifier, @request.session[:join]
+    assert_redirected_to :controller => :profile, :action => :join
   end
  
   should 'show number of published events in index' do
@@ -1186,7 +1192,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     20.times {comment = fast_create(Comment, :source_id => article, :title => 'a comment', :body => 'lalala', :created_at => Time.now)}
     article.reload
     get :index, :profile => profile.identifier
-    assert_tag 'ul', :attributes => {:class => 'profile-wall-activities-comments'}, :children => {:count => 0 } 
+    assert_tag 'ul', :attributes => {:class => 'profile-wall-activities-comments'}, :children => {:count => 0 }
   end
  
   should "view more comments paginated" do
@@ -1212,7 +1218,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     20.times {fast_create(Scrap, :sender_id => profile.id, :receiver_id => profile.id, :scrap_id => scrap.id)}
     profile.reload
     get :index, :profile => profile.identifier
-    assert_tag 'ul', :attributes => {:class => 'profile-wall-activities-comments scrap-replies'}, :children => {:count => 0 } 
+    assert_tag 'ul', :attributes => {:class => 'profile-wall-activities-comments scrap-replies'}, :children => {:count => 0 }
   end
  
   should "view more replies paginated" do
@@ -1269,15 +1275,6 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'div', :content => /#{instance_eval(&plugin2.profile_tabs[:content])}/, :attributes => {:id => /#{plugin2.profile_tabs[:id]}/}
   end
  
-  should 'redirect to profile page when try to request join_not_logged via GET method' do
-    community = Community.create!(:name => 'my test community')
-    login_as(profile.identifier)
-    get :join_not_logged, :profile => community.identifier
-    assert_nothing_raised do
-      assert_redirected_to community.url
-    end
-  end
-
   should 'check different profile from the domain profile' do
     default = Environment.default
     default.domains.create!(:name => 'environment.com')
@@ -1382,4 +1382,32 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     environment.save!
     assert_equal ['en', 'pt'], environment.available_locales
   end
+
+  should 'not consider custom welcome screen text if not defined' do
+    env = Environment.default
+    assert !env.has_custom_welcome_screen?
+  end
+
+  should 'not consider custom welcome screen text if nil' do
+    env = Environment.default
+
+    env.signup_welcome_screen_body = nil
+    assert !env.has_custom_welcome_screen?
+  end
+
+  should 'consider signup welcome screen if body is defined' do
+    env = Environment.default
+    env.signup_welcome_screen_body  = 'Welcome to the environment'
+    assert env.has_custom_welcome_screen?
+  end
+
+  should 'store custom welcome screen body' do
+    environment = Environment.default
+
+    environment.signup_welcome_screen_body = 'Welcome to the environment'
+    environment.save
+    environment.reload
+
+    assert_equal 'Welcome to the environment', environment.signup_welcome_screen_body
+  end
 end
...	...	@@ -7,6 +7,7 @@ class AdminPanelController < AdminController
7	7	end
8	8
9	9	def site_info
	10	+ @no_design_blocks = true
10	11	if request.post?
11	12	if params[:environment][:languages]
12	13	params[:environment][:languages] = params[:environment][:languages].map {\|lang, value\| lang if value=='true'}.compact
...	...
...	...	@@ -17,6 +17,8 @@ class AccountController < ApplicationController
17	17	@user = User.find_by_activation_code(params[:activation_code]) if params[:activation_code]
18	18	if @user and @user.activate
19	19	@message = _("Your account has been activated, now you can log in!")
	20	+ check_redirection
	21	+ session[:join] = params[:join] unless params[:join].blank?
20	22	render :action => 'login', :userlogin => @user.login
21	23	else
22	24	session[:notice] = _("It looks like you're trying to activate an account. Perhaps have already activated this account?")
...	...	@@ -35,6 +37,7 @@ class AccountController < ApplicationController
35	37	self.current_user \|\|= User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
36	38
37	39	if logged_in?
	40	+ check_join_in_community(self.current_user)
38	41	if params[:remember_me] == "1"
39	42	self.current_user.remember_me
40	43	cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }
...	...	@@ -91,6 +94,7 @@ class AccountController < ApplicationController
91	94	if session[:may_be_a_bot]
92	95	return false unless verify_recaptcha :model=>@user, :message=>_('Captcha (the human test)')
93	96	end
	97	+ @user.community_to_join = session[:join]
94	98	@user.signup!
95	99	owner_role = Role.find_by_name('owner')
96	100	@user.person.affiliate(@user.person, [owner_role]) if owner_role
...	...	@@ -101,6 +105,7 @@ class AccountController < ApplicationController
101	105	end
102	106	if @user.activated?
103	107	self.current_user = @user
	108	+ check_join_in_community(@user)
104	109	go_to_signup_initial_page
105	110	else
106	111	@register_pending = true
...	...	@@ -388,12 +393,6 @@ class AccountController < ApplicationController
388	393	end
389	394
390	395	def go_to_initial_page
391		- if params[:redirection]
392		- session[:return_to] = @user.return_to
393		- @user.return_to = nil
394		- @user.save
395		- end
396		-
397	396	if params[:return_to]
398	397	redirect_to params[:return_to]
399	398	elsif environment.enabled?('allow_change_of_redirection_after_login')
...	...	@@ -444,4 +443,19 @@ class AccountController < ApplicationController
444	443	redirect_back_or_default(default)
445	444	end
446	445	end
	446	+
	447	+ def check_redirection
	448	+ unless params[:redirection].blank?
	449	+ session[:return_to] = @user.return_to
	450	+ @user.update_attributes(:return_to => nil)
	451	+ end
	452	+ end
	453	+
	454	+ def check_join_in_community(user)
	455	+ profile_to_join = session[:join]
	456	+ unless profile_to_join.blank?
	457	+ environment.profiles.find_by_identifier(profile_to_join).add_member(user.person)
	458	+ session.delete(:join)
	459	+ end
	460	+ end
447	461	end
...	...
...	...	@@ -3,7 +3,7 @@ class ProfileController < PublicController
3	3	needs_profile
4	4	before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
5	5	before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse, :send_mail]
6		- before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail]
	6	+ before_filter :login_required, :only => [:add, :join, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail]
7	7
8	8	helper TagsHelper
9	9
...	...	@@ -97,21 +97,12 @@ class ProfileController < PublicController
97	97	end
98	98
99	99	def join_not_logged
100		- if request.post?
101		- profile.add_member(user)
102		- session[:notice] = _('%s administrator still needs to accept you as member.') % profile.name if profile.closed?
103		- redirect_to_previous_location
	100	+ session[:join] = profile.identifier
	101	+
	102	+ if user
	103	+ redirect_to :controller => 'profile', :action => 'join'
104	104	else
105		- if user.memberships.include?(profile)
106		- session[:notice] = _('You are already a member of %s.') % profile.name
107		- redirect_to profile.url
108		- return
109		- end
110		- if request.xhr?
111		- render :layout => false
112		- else
113		- redirect_to profile.url
114		- end
	105	+ redirect_to :controller => '/account', :action => 'login'
115	106	end
116	107	end
117	108
...	...
...	...	@@ -8,6 +8,8 @@ class CategoriesBlock < Block
8	8
9	9	settings_items :category_types, :type => Array, :default => []
10	10
	11	+ attr_accessible :category_types
	12	+
11	13	def self.description
12	14	_("Categories Menu")
13	15	end
...	...
...	...	@@ -3,7 +3,7 @@
3	3	# domains.
4	4	class Environment < ActiveRecord::Base
5	5
6		- attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :enabled_blocks, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound
	6	+ attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :enabled_blocks, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound, :noreply_email, :signup_welcome_screen_body
7	7
8	8	has_many :users
9	9
...	...	@@ -300,6 +300,12 @@ class Environment < ActiveRecord::Base
300	300	settings_items :access_control_allow_origin, :type => Array, :default => []
301	301	settings_items :access_control_allow_methods, :type => String
302	302
	303	+ settings_items :signup_welcome_screen_body, :type => String
	304	+
	305	+ def has_custom_welcome_screen?
	306	+ settings[:signup_welcome_screen_body].present?
	307	+ end
	308	+
303	309	def news_amount_by_folder=(amount)
304	310	settings[:news_amount_by_folder] = amount.to_i
305	311	end
...	...
...	...	@@ -64,6 +64,9 @@ class User < ActiveRecord::Base
64	64	self.person.preferred_domain && self.person.preferred_domain.name \|\| self.environment.default_hostname(true)
65	65	end
66	66
	67	+ # virtual attribute used to stash which community to join on signup or login
	68	+ attr_accessor :community_to_join
	69	+
67	70	class Mailer < ActionMailer::Base
68	71	def activation_email_notify(user)
69	72	user_email = "#{user.login}@#{user.email_domain}"
...	...	@@ -86,7 +89,8 @@ class User < ActiveRecord::Base
86	89	:activation_code => user.activation_code,
87	90	:environment => user.environment.name,
88	91	:url => user.environment.top_url,
89		- :redirection => (true if user.return_to)
	92	+ :redirection => (true if user.return_to),
	93	+ :join => (user.community_to_join if user.community_to_join)
90	94	end
91	95
92	96	def signup_welcome_email(user)
...	...
1	1	<% if @register_pending %>
2		-<div id='thanks-for-signing'>
3		- <h1><%= _("Welcome to %s!") % environment.name %></h1>
4		- <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
5		- <p><%= _("Firstly, some tips for getting started:") %></p>
6		- <h4><%= _("Confirm your account!") %></h4>
7		- <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p>
8		- <p><%= _("You won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
9		- <h4><%= _("What to do next?") %></h4>
10		- <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
11		- <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
12		- <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
13		- <p><%= _("Start exploring and have fun!") %></p>
14		-</div>
	2	+ <div id='thanks-for-signing'>
	3	+ <% if environment.has_custom_welcome_screen? %>
	4	+ <%= environment.settings[:signup_welcome_screen_body].html_safe %>
	5	+ <% else %>
	6	+ <h1><%= _("Welcome to %s!") % environment.name %></h1>
	7	+ <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
	8	+ <p><%= _("Firstly, some tips for getting started:") %></p>
	9	+ <h4><%= _("Confirm your account!") %></h4>
	10	+ <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p>
	11	+ <p><%= _("You won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
	12	+ <h4><%= _("What to do next?") %></h4>
	13	+ <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
	14	+ <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
	15	+ <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
	16	+ <p><%= _("Start exploring and have fun!") %></p>
	17	+ <% end %>
	18	+ </div>
15	19	<% else %>
16	20	<h1><%= _('Sign up for %s!') % environment.name %></h1>
17	21	<%= render :partial => 'signup_form' %>
...	...
...	...	@@ -0,0 +1,5 @@
	1	+<div class='description'>
	2	+ <%= _('This text will be showed as a welcome message to users after signup') %><br/><br/>
	3	+</div>
	4	+
	5	+<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
...	...
...	...	@@ -12,6 +12,8 @@
12	12	:content => (render :partial => 'terms_of_use', :locals => {:f => f})} %>
13	13	<% tabs << {:title => _('Signup welcome text'), :id => 'signup-welcome-text',
14	14	:content => (render :partial => 'signup_welcome_text', :locals => {:f => f})} %>
	15	+ <% tabs << {:title => _('Signup welcome message'), :id => 'signup-welcome-message',
	16	+ :content => (render :partial => 'signup_welcome_screen', :locals => {:f => f}) }%>
15	17	<%= render_tabs(tabs) %>
16	18	<% button_bar do %>
17	19	<%= submit_button(:save, _('Save'), :cancel => {:action => 'index'}) %>
...	...
...	...	@@ -10,7 +10,7 @@
10	10
11	11	<% if @page != profile.home_page && !@page.has_posts? && @page.allow_delete?(user) && !remove_content_button(:delete)%>
12	12	<% content = content_tag( 'span', _('Delete') ) %>
13		- <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page}) %>
	13	+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page.id}) %>
14	14	<% options = {:method => :post, :confirm => delete_article_message(@page)} %>
15	15	<%= expirable_button @page, :delete, content, url, options %>
16	16	<% end %>
...	...	@@ -19,9 +19,9 @@
19	19	<% content = content_tag( 'span', _('Spread this') ) %>
20	20	<% url = nil %>
21	21	<% if profile.kind_of?(Person) %>
22		- <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }) %>
	22	+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %>
23	23	<% elsif profile.kind_of?(Community) && environment.portal_community %>
24		- <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }) %>
	24	+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page.id }) %>
25	25	<% end %>
26	26	<%= expirable_button @page, :spread, content, url if url %>
27	27	<% end %>
...	...