Merge branch 'master' of gitlab.com:noosfero/noosfero

Evandro Junior
2 parents 256e490d 99b738b5
Showing 94 changed files with 1352 additions and 426 deletions Show diff stats
INSTALL.chat.md
app/controllers/admin/admin_panel_controller.rb
app/controllers/admin/organizations_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/tinymce_helper.rb
app/helpers/users_helper.rb
app/mailers/task_mailer.rb
app/models/article.rb
app/models/block.rb
app/models/environment.rb
app/models/forum.rb
app/models/profile.rb
app/models/suggest_article.rb
app/models/task.rb
app/views/admin_panel/index.html.erb
-XMPP/Chat Setup
-===============
+Automatic XMPP/Chat Setup
+=========================
+
+Since Noosfero 1.2, the XMPP/Chat can be installed via `noosfero-chat` Debian
+package. So you don't need to follow the manual instructions here if you
+already have it installed on your system.
+
+But if you are going to install the `noosfero-chat` package on a system that
+already has `noosfero` older 1.2 installed then you need to check if apache's
+configuration file `/etc/apache2/sites-available/noosfero` has this line below:
+
+     Include /usr/share/noosfero/util/chat/apache/xmpp.conf
+
+Manual XMPP/Chat Setup
+======================
 The samples of config file to configure a XMPP/BOSH server with ejabberd,
 postgresql and apache2 can be found at util/chat directory.
@@ -8,7 +21,7 @@ This setup supposes that you are using Noosfero installed via Debian package
 in a production environment.
 Steps
-=====
+-----
 This is a step-by-step guide to get a XMPP service working, in a Debian system.
@@ -144,15 +157,8 @@ You should see a page with a message like that:
 ## 9. Test chat session
-Open Noosfero console and execute:
-
->> environment = Environment.default
->> user = Person['guest']
->> password = user.user.crypted_password
->> login = user.jid
->> RubyBOSH.initialize_session(login, password, "http://#{environment.default_hostname}/http-bind", :wait => 30, :hold => 1, :window => 5
-
-If you have luck, should see something like that:
+Run `./script/noosfero-test-chat-session`. If you have luck, should see
+something like that:
 Ruby-BOSH - SEND
 <body window="5" rid="60265" xmlns="http://jabber.org/protocol/httpbind" xmlns:xmpp="urn:xmpp:xbosh" to="vagrant-debian-squeeze.vagrantup.com" wait="30" xmpp:version="1.0" hold="1"/>
@@ -71,22 +71,4 @@ class AdminPanelController &lt; AdminController
       end
     end
   end
-
-  def manage_organizations_status
-    scope = environment.organizations
-    @filter = params[:filter] || 'any'
-    @title = "Organization profiles"
-    @title = @title+" - "+@filter if @filter != 'any'
-
-    if @filter == 'enabled'
-      scope = scope.visible
-    elsif @filter == 'disabled'
-      scope = scope.disabled
-    end
-
-    scope = scope.order('name ASC')
-
-    @q = params[:q]
-    @collection = find_by_contents(:organizations, environment, scope, @q, {:per_page => 10, :page => params[:npage]})[:results]
-  end
 end
@@ -0,0 +1,66 @@
+class OrganizationsController < AdminController
+
+  protect 'manage_environment_organizations', :environment
+
+  def index
+    @filter = params[:filter] || 'any'
+    @title = _('Organization profiles')
+    @type = params[:type] || "any"
+    @types_filter = [[_('All'), 'any'], [_('Community'), 'Community'], [_('Enterprise'), 'Enterprise']]
+    @types_filter = @types_filter | @plugins.dispatch(:organization_types_filter_options)
+
+    scope = @plugins.dispatch_first(:filter_manage_organization_scope, @type)
+    if scope.blank?
+      scope = environment.organizations
+      scope = scope.where(:type => @type) if @type != 'any'
+    end
+
+    if @filter == 'enabled'
+      scope = scope.visible
+    elsif @filter == 'disabled'
+      scope = scope.disabled
+    end
+
+    scope = scope.order('name ASC')
+
+    @q = params[:q]
+    @collection = find_by_contents(:organizations, environment, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
+  end
+
+  def activate
+    organization = environment.organizations.find(params[:id])
+    if organization.enable
+      render :text => (_('%s enabled') % organization.name).to_json
+    else
+      render :text => (_('%s could not be enabled') % organization.name).to_json
+    end
+  end
+
+  def deactivate
+    organization = environment.organizations.find(params[:id])
+    if organization.disable
+      render :text => (_('%s disabled') % organization.name).to_json
+    else
+      render :text => (_('%s could not be disable') % organization.name).to_json
+    end
+  end
+
+  def destroy
+    if request.post?
+      organization = environment.organizations.find(params[:id])
+      if organization && organization.destroy
+        render :text => (_('%s removed') % organization.name).to_json
+      else
+        render :text => (_('%s could not be removed') % organization.name).to_json
+      end
+    else
+      render :nothing => true
+    end
+  end
+
+  private
+
+  def per_page
+    10
+  end
+end
@@ -143,7 +143,14 @@ class CmsController &lt; MyProfileController
     klass = @type.constantize
     article_data = environment.enabled?('articles_dont_accept_comments_by_default') ? { :accept_comments => false } : {}
     article_data.merge!(params[:article]) if params[:article]
-    @article = klass.new(article_data)
+    article_data.merge!(:profile => profile) if profile
+
+    @article = if params[:clone]
+      current_article = profile.articles.find(params[:id])
+      current_article.copy_without_save
+    else
+      klass.new(article_data)
+    end
     parent = check_parent(params[:parent_id])
     if parent
@@ -220,7 +227,7 @@ class CmsController &lt; MyProfileController
       if @errors.any?
         render :action => 'upload_files', :parent_id => @parent_id
       else
-        session[:notice] = _('File(s) successfully uploaded') 
+        session[:notice] = _('File(s) successfully uploaded')
         if @back_to
           redirect_to @back_to
         elsif @parent
 class TasksController < MyProfileController
   protect 'perform_task', :profile
-  
+
   def index
-    @filter = params[:filter_type].blank? ? nil : params[:filter_type]
+    @filter_type = params[:filter_type].presence
+    @filter_text = params[:filter_text].presence
     @task_types = Task.pending_types_for(profile)
-    @tasks = Task.to(profile).without_spam.pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
+    @tasks = Task.pending_all(profile, @filter_type, @filter_text).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
     @failed = params ? params[:failed] : {}
   end
@@ -13,7 +13,7 @@ class ContentViewerController &lt; ApplicationController
     @version = params[:version].to_i
     if path.blank?
-      @page = profile.home_page 
+      @page = profile.home_page
       return if redirected_to_profile_index
     else
       @page = profile.articles.find_by_path(path)
@@ -121,21 +121,23 @@ class ContentViewerController &lt; ApplicationController
   helper_method :pass_without_comment_captcha?
   def allow_access_to_page(path)
-    allowed = true
     if @page.nil? # page not found, give error
       render_not_found(path)
-      allowed = false
-    elsif !@page.display_to?(user)
-      if !profile.public?
+      return false
+    end
+
+    unless @page.display_to?(user)
+      if !profile.visible? || profile.secret? || (user && user.follows?(profile))
+        render_access_denied
+      else #!profile.public?
         private_profile_partial_parameters
         render :template => 'profile/_private_profile', :status => 403, :formats => [:html]
-        allowed = false
-      else #if !profile.visible?
-        render_access_denied
-        allowed = false
       end
+
+      return false
     end
-    allowed
+
+    return true
   end
   def user_is_a_bot?
@@ -180,7 +182,7 @@ class ContentViewerController &lt; ApplicationController
     if @page.forum? && @page.has_terms_of_use && terms_accepted == "true"
       @page.add_agreed_user(user)
     end
-  end 
+  end
   def is_a_forum_topic? (page)
     return (!@page.parent.nil? && @page.parent.forum?)
@@ -3,7 +3,7 @@ class PublicController &lt; ApplicationController
   def allow_access_to_page
     unless profile.display_info_to?(user)
-      if profile.visible?
+      if profile.visible? && !profile.secret
         private_profile
       else
         invisible_profile
@@ -931,6 +931,19 @@ module ApplicationHelper
     article_helper.cms_label_for_edit
   end
+  def label_for_clone_article(article)
+    translated_types = {
+      Folder => _('Folder'),
+      Blog => _('Blog'),
+      Event => _('Event'),
+      Forum => _('Forum')
+    }
+
+    translated_type = translated_types[article.class] || _('Article')
+
+    _('Clone %s') % translated_type
+  end
+
   def add_rss_feed_to_head(title, url)
     content_for :feeds do
       tag(:link, :rel => 'alternate', :type => 'application/rss+xml', :title => title, :href => url_for(url))
@@ -1498,4 +1511,26 @@ module ApplicationHelper
     text_field(object_name, method, options.merge(:class => 'colorpicker_field'))
   end
+  def fullscreen_buttons(itemId)
+    content="
+      <script>fullscreenPageLoad('#{itemId}')</script>
+    "
+    content+=content_tag('a', content_tag('span',_("Full screen")),
+    { :id=>"fullscreen-btn",
+      :onClick=>"toggle_fullwidth('#{itemId}')",
+      :class=>"button with-text icon-fullscreen",
+      :href=>"#",
+      :title=>_("Go to full screen mode")
+    })
+
+    content+=content_tag('a', content_tag('span',_("Exit full screen")),
+    { :style=>"display: none;",
+      :id=>"exit-fullscreen-btn",
+      :onClick=>"toggle_fullwidth('#{itemId}')",
+      :class=>"button with-text icon-fullscreen",
+      :href=>"#",
+      :title=>_("Exit full screen mode")
+    })
+  end
+
 end
@@ -12,6 +12,7 @@ module ArticleHelper
     @article = article
     visibility_options(@article, tokenized_children) +
+    topic_creation(@article) +
     content_tag('h4', _('Options')) +
     content_tag('div',
       (article.profile.has_members? ?
@@ -55,14 +56,7 @@ 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
@@ -81,6 +75,22 @@ module ArticleHelper
     )
   end
+  def topic_creation(article)
+    return '' unless article.forum?
+
+    general_options = Forum::TopicCreation.general_options(article)
+    slider_options = {:id => 'topic-creation-slider'}
+    slider_options = general_options.keys.inject(slider_options) do |result, option|
+      result.merge!({'data-'+option => general_options[option]})
+    end
+
+    content_tag('h4', _('Topic creation')) +
+    content_tag( 'small', _('Who will be able to create new topics on this forum?')) +
+    content_tag('div', '', slider_options) +
+    hidden_field_tag('article[topic_creation]', article.topic_creation) +
+    javascript_include_tag('topic-creation-config')
+  end
+
   def privacity_exceptions(article, tokenized_children)
     content_tag('div',
       content_tag('div',
@@ -20,7 +20,7 @@ module TinymceHelper
       :image_advtab => true,
       :language => tinymce_language
-    options[:toolbar1] = "insertfile undo redo | copy paste | bold italic underline | styleselect fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image"
+    options[:toolbar1] = "fullscreen | insertfile undo redo | copy paste | bold italic underline | styleselect fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image"
     if options[:mode] == 'simple'
       options[:menubar] = false
     else
@@ -14,7 +14,7 @@ module UsersHelper
     select_field = select_tag(:filter, options, :onchange => onchange)
     content_tag('div',
       content_tag('strong', _('Filter')) + ': ' + select_field,
-      :class => "environment-users-customize-search"
+      :class => "environment-profiles-customize-search"
     )
   end
@@ -5,7 +5,7 @@ class TaskMailer &lt; ActionMailer::Base
     @target = task.target.name
     @environment = task.environment.name
     @url = generate_environment_url(task, :controller => 'home')
-    url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.tasks_url)
+    url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.tasks_url.merge(:script_name => Noosfero.root('/')))
     @tasks_url = url_for_tasks_list
     mail(
@@ -56,7 +56,7 @@ class TaskMailer &lt; ActionMailer::Base
   end
   def generate_environment_url(task, url = {})
-    url_for(Noosfero.url_options.merge(:host => task.environment.default_hostname).merge(url))
+    url_for(Noosfero.url_options.merge(:host => task.environment.default_hostname).merge(url).merge(:script_name => Noosfero.root('/')))
   end
 end
@@ -25,6 +25,16 @@ class Article &lt; ActiveRecord::Base
     :display => %w[full]
   }
+  def initialize(*params)
+    super
+
+    if !params.blank? && params.first.has_key?(:profile)
+      profile = params.first[:profile]
+      self.published = false unless profile.public?
+    end
+
+  end
+
   def self.default_search_display
     'full'
   end
@@ -491,11 +501,11 @@ class Article &lt; ActiveRecord::Base
     return [] if user.nil? || (profile && !profile.public? && !user.follows?(profile))
     where(
       [
-       "published = ? OR last_changed_by_id = ? OR profile_id = ? OR ? 
-        OR  (show_to_followers = ? AND ?)", true, user.id, user.id, 
+       "published = ? OR last_changed_by_id = ? OR profile_id = ? OR ?
+        OR  (show_to_followers = ? AND ? AND profile_id = ?)", true, user.id, user.id,
         profile.nil? ?  false : user.has_permission?(:view_private_content, profile),
-        true, user.follows?(profile)
-      ] 
+        true, user.follows?(profile), (profile.nil? ? nil : profile.id)
+      ]
     )
   }
@@ -509,7 +519,7 @@ class Article &lt; ActiveRecord::Base
   def display_to?(user = nil)
     if published?
-      profile.display_info_to?(user)
+      (profile.secret? || !profile.visible?) ? profile.display_info_to?(user) : true
     else
       if !user
         false
@@ -567,25 +577,24 @@ class Article &lt; ActiveRecord::Base
     profile.visible? && profile.public? && published?
   end
-
-  def copy(options = {})
+  def copy_without_save(options = {})
     attrs = attributes.reject! { |key, value| ATTRIBUTES_NOT_COPIED.include?(key.to_sym) }
     attrs.merge!(options)
     object = self.class.new
     attrs.each do |key, value|
       object.send(key.to_s+'=', value)
     end
+    object
+  end
+
+  def copy(options = {})
+    object = copy_without_save(options)
     object.save
     object
   end
   def copy!(options = {})
-    attrs = attributes.reject! { |key, value| ATTRIBUTES_NOT_COPIED.include?(key.to_sym) }
-    attrs.merge!(options)
-    object = self.class.new
-    attrs.each do |key, value|
-      object.send(key.to_s+'=', value)
-    end
+    object = copy_without_save(options)
     object.save!
     object
   end
@@ -2,7 +2,7 @@ class Block &lt; ActiveRecord::Base
   attr_accessible :title, :display, :limit, :box_id, :posts_per_page,
                   :visualization_format, :language, :display_user,
-                  :box, :edit_modes, :move_modes
+                  :box, :edit_modes, :move_modes, :mirror
   # to be able to generate HTML
   include ActionView::Helpers::UrlHelper
@@ -15,11 +15,23 @@ class Block &lt; ActiveRecord::Base
   acts_as_list :scope => :box
   belongs_to :box
+  belongs_to :mirror_block, :class_name => "Block"
+  has_many :observers, :class_name => "Block", :foreign_key => "mirror_block_id"
   acts_as_having_settings
   scope :enabled, :conditions => { :enabled => true }
+  after_save do |block|
+    if block.owner.kind_of?(Profile) && block.owner.is_template? && block.mirror?
+      block.observers.each do |observer|
+        observer.copy_from(block)
+        observer.title = block.title
+        observer.save
+      end
+    end
+  end
+
   def embedable?
     false
   end
@@ -269,6 +281,10 @@ class Block &lt; ActiveRecord::Base
     self.position = block.position
   end
+  def add_observer(block)
+    self.observers << block
+  end
+
   private
   def home_page_path
@@ -29,6 +29,7 @@ class Environment &lt; ActiveRecord::Base
     'manage_environment_roles' => N_('Manage environment roles'),
     'manage_environment_validators' => N_('Manage environment validators'),
     'manage_environment_users' => N_('Manage environment users'),
+    'manage_environment_organizations' => N_('Manage environment organizations'),
     'manage_environment_templates' => N_('Manage environment templates'),
     'manage_environment_licenses' => N_('Manage environment licenses'),
     'manage_environment_trusted_sites' => N_('Manage environment trusted sites'),
@@ -339,6 +340,16 @@ class Environment &lt; ActiveRecord::Base
     self.save!
   end
+  def enable_all_plugins
+    Noosfero::Plugin.available_plugin_names.each do |plugin|
+      plugin_name = plugin.to_s + "Plugin"
+      unless self.enabled_plugins.include?(plugin_name)
+        self.enabled_plugins += [plugin_name]
+      end
+    end
+    self.save!
+  end
+
   # Disables a feature identified by its name
   def disable(feature, must_save=true)
     self.settings["#{feature}_enabled".to_sym] = false
@@ -3,11 +3,11 @@ class Forum &lt; Folder
   acts_as_having_posts :order => 'updated_at DESC'
   include PostsLimit
-  attr_accessible :has_terms_of_use, :terms_of_use, :allows_members_to_create_topics
+  attr_accessible :has_terms_of_use, :terms_of_use, :topic_creation
   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
+  settings_items :topic_creation, :type => :string, :default => 'self'
   has_and_belongs_to_many :users_with_agreement, :class_name => 'Person', :join_table => 'terms_forum_people'
   before_save do |forum|
@@ -33,6 +33,23 @@ class Forum &lt; Folder
     _('An internet forum, also called message board, where discussions can be held.')
   end
+  module TopicCreation
+    BASE = ActiveSupport::OrderedHash.new
+    BASE['users'] = _('Logged users')
+
+    PERSON = ActiveSupport::OrderedHash.new
+    PERSON['self'] = _('Me')
+    PERSON['related'] = _('Friends')
+
+    GROUP = ActiveSupport::OrderedHash.new
+    GROUP['self'] = _('Administrators')
+    GROUP['related'] = _('Members')
+
+    def self.general_options(forum)
+      forum.profile.person? ? PERSON.merge(BASE) : GROUP.merge(BASE)
+    end
+  end
+
   include ActionView::Helpers::TagHelper
   def to_html(options = {})
     proc do
@@ -69,11 +86,17 @@ 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
+  def can_create_topic?(user)
+    return true if user == profile || profile.admins.include?(user) || profile.environment.admins.include?(user)
+    case topic_creation
+    when 'related'
+      profile.person? ? profile.friends.include?(user) : profile.members.include?(user)
+    when 'users'
+      user.present?
+    end
   end
   def allow_create?(user)
-    super || can_create_topic?(user, profile)
+    super || can_create_topic?(user)
   end
 end
@@ -392,6 +392,9 @@ class Profile &lt; ActiveRecord::Base
         new_block = block.class.new(:title => block[:title])
         new_block.copy_from(block)
         new_box.blocks << new_block
+        if block.mirror?
+          block.add_observer(new_block)
+        end
       end
     end
   end
@@ -957,11 +960,19 @@ private :generate_url, :url_options
     self.save
   end
+  def disabled?
+    !visible
+  end
+
   def enable
     self.visible = true
     self.save
   end
+  def enabled?
+    visible
+  end
+
   def control_panel_settings_button
     {:title => _('Edit Profile'), :icon => 'edit-profile'}
   end
@@ -25,7 +25,7 @@ class SuggestArticle &lt; Task
   def article_object
     if @article_object.nil?
-      @article_object = article_type.new(article.merge({:profile => target}).except(:type))
+      @article_object = article_type.new(article.merge(target.present? ? {:profile => target} : {}).except(:type))
       if requestor.present?
         @article_object.author = requestor
       else
@@ -239,6 +239,10 @@ class Task &lt; ActiveRecord::Base
   scope :opened, :conditions => { :status =>  [Task::Status::ACTIVE, Task::Status::HIDDEN] }
   scope :of, lambda { |type| conditions = type ? "type LIKE '#{type}'" : "1=1"; {:conditions =>  [conditions]} }
   scope :order_by, lambda { |attribute, ord| {:order => "#{attribute} #{ord}"} }
+  scope :like, lambda { |field, value| where("LOWER(#{field}) LIKE ?", "%#{value.downcase}%") if value}
+  scope :pending_all, lambda { |profile, filter_type, filter_text|
+    self.to(profile).without_spam.pending.of(filter_type).like('data', filter_text)
+  }
   scope :to, lambda { |profile|
     environment_condition = nil
@@ -18,9 +18,9 @@
 <table>
   <tr><td><%= link_to _('User roles'), :controller => 'role' %></td></tr>
   <tr><td><%= link_to _('Users'), :controller => 'users' %></td></tr>
+  <tr><td><%= link_to _('Organizations'), :controller => 'organizations' %></td></tr>
   <tr><td><%= link_to _('Profile templates'), :controller => 'templates' %></td></tr>
   <tr><td><%= link_to _('Fields'), :controller => 'features', :action => 'manage_fields' %></td></tr>
-  <tr><td><%= link_to _('Manage organizations status'), :action => 'manage_organizations_status' %></td></tr>
 </table>
@@ -1,69 +0,0 @@
-<h1><%= _('Manage organizations') %></h1>
-
-<%= form_tag( { :action => 'manage_organizations_status' }, :method => 'get', :class => 'users-search' ) do %>
-
-  <div class="search-field">
-    <span class="formfield">
-      <%= text_field_tag 'q', @q, :title => _("Find profiles"), :style=>"width:85%" %>
-    </span>
-
-    <%= submit_button(:search, _('Search')) %>
-  </div>
-
-  <div class="environment-users-results-header">
-    <div id='environment-users-filter-title'><%= @title %></div>
-
-    <div id="environment-users-filter-filter">
-      <strong><%= _("Filter by: ") %></strong>
-
-      <select id="profile_filter_select">
-        <%= options_for_select([['Any', 'any'],["Disabled profiles", "disabled"], ["Enabled profiles", "enabled"]], @filter) %>
-      </select>
-    </div>
-    <div style="clear: both"></div>
-  </div>
-
-  <table>
-    <colgroup>
-      <col width="80%">
-      <col width="20%">
-    </colgroup>
-
-    <tr>
-      <th><%= _('Member') %></th>
-      <th><%= _('Actions') %></th>
-    </tr>
-
-    <% @collection.each do |p| %>
-      <tr title="<%= p.name %>">
-        <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
-
-        <td class='actions'>
-          <div class="members-buttons-cell">
-            <% if p.visible %>
-              <%= button_without_text :'deactivate-user', _('Deactivate'), {:controller => "profile_editor", :action => 'deactivate_profile', :profile => p.identifier, :id => p.id}, :confirm => _("Do you want to deactivate this profile ?") %>
-            <% else %>
-              <%= button_without_text :'activate-user', _('Activate'), {:controller => "profile_editor", :action => 'activate_profile', :profile => p.identifier, :id => p.id}, :confirm => _("Do you want to activate this profile ?") %>
-            <% end %>
-              <%= button_without_text :'delete', _('Remove'), {:controller => "profile_editor", :action => 'destroy_profile', :profile => p.identifier, :id => p.id, :return_to => "/admin/admin_panel/manage_organizations_status"}, :method => :post, :confirm => _("Do you want to deactivate this profile ?") %>
-         </div>
-        </td>
-      </tr>
-    <% end %>
-  </table>
-
-<% end %>
-
-<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
-
-<% button_bar do %>
-  <%= button :back, _('Back'), :controller => 'admin_panel' %>
-<% end %>
-
-<script type="text/javascript">
-  jQuery(document).ready(function(){
-    jQuery("#profile_filter_select").change(function(){
-      document.location.href = '/admin/admin_panel/manage_organizations_status?filter='+this.value;
-    });
-  });
-</script>
 \ No newline at end of file
-<div class='join-leave-button'>
+<div class='join-leave-button require-login-popup'>
   <% if logged_in? %>
     <% if profile.members.include?(user) %>
       <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
@@ -25,6 +25,11 @@
       </div>
       <div class="move-modes">
         <%= labelled_form_field _('Move options:'), select_tag('block[move_modes]', options_from_collection_for_select(@block.move_block_options, :first, :last, @block.move_modes)) %>
+    <% end %>
+
+    <% if @block.owner.kind_of?(Profile) && @block.owner.is_template? %>
+      <div class="mirror_block">
+        <%= labelled_check_box(_("Mirror"), "block[mirror]", value = "1", checked = @block.mirror) %>
       </div>
     <% end %>
@@ -2,6 +2,8 @@
 <h1><%= _('My Forum') %></h1>
+<%= required_fields_message %>
+
 <%= render :file => 'shared/tiny_mce' %>
 <%= required f.text_field(:name, :size => '64', :maxlength => 150, :onchange => "updateUrlField(this, 'article_slug')") %>
 <div<%= user && " class='logged-in'" %>>
   <div id="article-actions">
+    <%= fullscreen_buttons('#article') %>
     <% if @page.allow_edit?(user) && !remove_content_button(:edit, @page) %>
       <% content = content_tag('span', label_for_edit_article(@page)) %>
@@ -29,6 +30,10 @@
       <% end %>
       <%= modal_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) unless remove_content_button(:new, @page) %>
+
+      <% content = content_tag('span', label_for_clone_article(@page)) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'new', :id => @page.id, :clone => true, :type => @page.class }) %>
+      <%= expirable_button @page, :clone, content, url %>
     <% end %>
     <% if @page.accept_uploads? && @page.allow_create?(user) %>
@@ -0,0 +1,41 @@
+<div class='results'>
+  <table id='organizations-list'>
+    <colgroup>
+      <col width="60%">
+      <col width="20%">
+      <col width="20%">
+    </colgroup>
+
+    <tr>
+      <th><%= _('Profile') %></th>
+      <th><%= _('Actions') %></th>
+      <th><%= _('Type') %>
+
+      <%= select_tag(:type, options_for_select(@types_filter, @type)) %>
+      </th>
+    </tr>
+
+    <% @collection.each do |p| %>
+      <tr title="<%= p.name %>">
+        <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
+
+        <td class='actions'>
+          <div class="members-buttons-cell">
+            <% if p.visible %>
+              <%= button_without_text :'deactivate-user', _('Deactivate'), {:action => 'deactivate', :id => p.id}, :class => 'action', 'data-confirm' => _("Do you want to deactivate this organization?") %>
+            <% else %>
+              <%= button_without_text :'activate-user', _('Activate'), {:action => 'activate', :id => p.id}, :class => 'action', 'data-confirm' => _("Do you want to activate this organization?") %>
+            <% end %>
+            <%= button_without_text :'delete', _('Remove'), {:action => 'destroy', :id => p.id}, :class => 'action', 'data-method' => :post, 'data-confirm' => _("Do you want to destroy this organization?") %>
+         </div>
+        </td>
+
+        <td> <%= _("#{p.type}") %> </td>
+      </tr>
+    <% end %>
+  </table>
+
+  <div>
+    <%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
+  </div>
+</div>
@@ -0,0 +1,30 @@
+<h1><%= _('Organizations') %></h1>
+
+<%= form_tag( { :action => 'index' }, :method => 'get', :id => 'manage-profiles' ) do %>
+
+  <div class="search-field">
+    <span class="formfield">
+      <%= text_field_tag 'q', @q, :title => _('Find organizations'), :style=>"width:85%" %>
+    </span>
+
+    <%= submit_button(:search, _('Search')) %>
+  </div>
+
+  <div class="environment-profiles-results-header">
+    <div id='environment-profiles-filter-title'><%= @title %></div>
+
+    <div id="environment-profiles-filter-filter">
+      <strong><%= _("Filter by: ") %></strong>
+      <%= select_tag(:filter, options_for_select([[_('Any'), 'any'],[_('Disabled'), "disabled"], [_('Enabled') , "enabled"]], @filter)) %>
+    </div>
+    <div style="clear: both"></div>
+  </div>
+
+  <%= render :partial => 'results' %>
+
+  <% button_bar do %>
+    <%= button :back, _('Back'), :controller => 'admin_panel' %>
+  <% end %>
+<% end %>
+
+<%= javascript_include_tag 'manage-organizations' %>
@@ -0,0 +1 @@
+../../views/shared/admin/profiles/index.js.rb
 \ No newline at end of file
@@ -0,0 +1 @@
+jQuery('#manage-profiles .results').replaceWith('<%= escape_javascript(render 'results') %>');
@@ -22,6 +22,8 @@
     %>
   </div><!-- class="task_decisions" -->
+  <div class="task_date"><%= show_time(task.created_at) %></div>
+
   <%= render :partial => 'task_title', :locals => {:task => task} %>
   <div class="task_information">
@@ -21,11 +21,24 @@
   </div>
 <% end %>
+<%= form_tag '#', :method => 'get' do %>
+  <%= field_set_tag _('Filter'), :class => 'filter_fields' do %>
+    <p>
+      <%= labelled_select(_('Type of task')+': ', :filter_type, :first, :last, @filter_type,  type_collection, {:id => 'filter-type'}) %>
+    </p>
+    <p>
+      <%= labelled_text_field(_("Text filter")+': ', :filter_text, nil, {:id => 'filter-text',:value => @filter_text}) %>
+    </p>
+    <p>
+      <%= submit_button(:search, _('Search')) %>
+    </p>
+  <% end %>
+<% end %>
+
 <% if @tasks.empty? %>
   <p>
-    <%= labelled_select(_('Filter')+': ', :filter_type, :first, :last, @filter,  type_collection, :onchange => "document.location.href = '?filter_type='+this.value")%>
+    <em><%= _('No pending tasks for %s') % profile.name %></em>
   </p>
-  <em><%= _('No pending tasks for %s') % profile.name %></em>
 <% else %>
   <%= form_tag :action => 'close' do%>
     <% button_bar do %>
@@ -38,14 +51,12 @@
     <ul class='task-list'>
       <p>
-        <%= labelled_select(_('Filter')+': ', :filter_type, :first, :last, @filter,  type_collection, :onchange => "document.location.href = '?filter_type='+this.value") %>
-      </p>
-      <p>
       <%= labelled_select(_("Set all to: "), 'set-decisions', 'first', 'last', nil, [['',""],['accept',_("Accept")],['reject',_("Reject")],['skip',_("Skip")]], :id => "up-set-all-tasks-to") %>
       </p>
-      <% @tasks.each do |task| %>
-        <%= render :partial => 'task', :locals => { :task => task } %>
-      <% end %>
+
+      <div class="task_boxes">
+        <%= render :partial => 'task', :collection => @tasks %>
+      </div>
       <p>
       <%= labelled_select(_("Set all to: "), 'set-decisions', 'first', 'last', nil, [['',""],['accept',_("Accept")],['reject',_("Reject")],['skip',_("Skip")]], :id => "down-set-all-tasks-to") %>
       </p>
-<div class="environment-users-results-header">
-  <div id='environment-users-filter-title'><%= users_filter_title(@filter) %></div>
+<div class="environment-profiles-results-header">
+  <div id='environment-profiles-filter-title'><%= users_filter_title(@filter) %></div>
   <%= filter_selector(@filter) %>
   <div style="clear: both"></div>
 </div>
@@ -0,0 +1,19 @@
+class ChangeDefaultContentPrivacy < ActiveRecord::Migration
+  def up
+    update_sql('UPDATE articles SET published = (1>2), show_to_followers = (1=1)
+      FROM profiles WHERE articles.profile_id = profiles.id AND
+      NOT profiles.public_profile AND articles.published = (1=1)')
+
+    Block.select('blocks.*').joins("INNER JOIN boxes ON blocks.box_id = boxes.id
+      INNER JOIN profiles ON boxes.owner_id = profiles.id AND boxes.owner_type = 'Profile'").
+      where("NOT profiles.public_profile AND blocks.type != 'MainBlock'").find_each do |block|
+      block.display_user = 'followers'
+      block.save
+    end
+    change_column :articles, :show_to_followers, :boolean, :default => true
+  end
+
+  def down
+    say "this migration can't be reverted"
+  end
+end
@@ -0,0 +1,15 @@
+class AddMirrorToBlock < ActiveRecord::Migration
+  def up
+    change_table :blocks do |t|
+      t.boolean :mirror, :default => false
+      t.references :mirror_block
+      t.references :observers
+    end
+  end
+
+  def down
+    remove_column :blocks, :mirror
+    remove_column :blocks, :mirror_block_id
+    remove_column :blocks, :observers_id
+  end
+end
@@ -0,0 +1,13 @@
+class UpdateTopicCreationConfiguration < ActiveRecord::Migration
+  def up
+    Forum.where("setting LIKE '%:allows_members_to_create_topics: true%'").find_each do |forum|
+      forum.setting.delete(:allows_members_to_create_topics)
+      forum.setting.merge!(:topic_creation => 'related')
+      forum.save
+    end
+  end
+
+  def down
+     say "this migration can't be reverted"
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20150408231524) do
+ActiveRecord::Schema.define(:version => 20150513213939) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -150,7 +150,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150408231524) do
     t.integer  "spam_comments_count",  :default => 0
     t.integer  "author_id"
     t.integer  "created_by_id"
-    t.boolean  "show_to_followers",    :default => false
+    t.boolean  "show_to_followers",    :default => true
   end
   add_index "articles", ["comments_count"], :name => "index_articles_on_comments_count"
@@ -183,10 +183,13 @@ ActiveRecord::Schema.define(:version =&gt; 20150408231524) do
     t.string   "type"
     t.text     "settings"
     t.integer  "position"
-    t.boolean  "enabled",    :default => true
+    t.boolean  "enabled",         :default => true
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "fetched_at"
+    t.boolean  "mirror",          :default => false
+    t.integer  "mirror_block_id"
+    t.integer  "observers_id"
   end
   add_index "blocks", ["box_id"], :name => "index_blocks_on_box_id"
@@ -0,0 +1,14 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#
+#   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
+#   Mayor.create(name: 'Emanuel', city: cities.first)
+
+ENV['RAILS_ENV'] ||= 'development'
+
+# This is for plugins that wants to use seeds.rb
+# Check for example on the Foo plugin
+plugin_seed_dirs = Dir.glob(Rails.root.join('{baseplugins,config/plugins}', '*', 'db', 'seeds.rb'))
+plugin_seed_dirs.each { |path| load path }
@@ -0,0 +1,9 @@
+<IfModule mpm_worker_module>
+   StartServers          8
+   MinSpareThreads       25
+   MaxSpareThreads       75
+   ThreadLimit           128
+   ThreadsPerChild       128
+   MaxClients            2048
+   MaxRequestsPerChild   0
+</IfModule>
-noosfero (1.2~0) UNRELEASED; urgency=medium
+noosfero (1.2~1) UNRELEASED; urgency=medium
+  [ Antonio Terceiro ]
   * Temporary version in heavy development
- -- Antonio Terceiro <terceiro@debian.org>  Fri, 08 May 2015 16:08:18 -0300
+  [ Joenio Costa ]
+  * Build noosfero-chat package
+
+ -- Joenio Costa <joenio@colivre.coop.br>  Mon, 18 May 2015 14:32:21 -0300
 noosfero (1.1) wheezy; urgency=low
@@ -85,3 +85,14 @@ Description: free web-based platform for social networks (apache frontend)
  .
  This package contains the configuration files needed to run Noosfero with the
  Apache HTTPD server as frontend.
+
+Package: noosfero-chat
+Architecture: all
+Depends: noosfero (>= 1.2), ejabberd, odbc-postgresql, pidgin-data
+Description: free web-based platform for social networks (ejabberd based chat)
+ Noosfero is a web platform for social and solidarity economy networks with
+ blog, e-Porfolios, CMS, RSS, thematic discussion, events agenda and collective
+ inteligence for solidarity economy in the same system.
+ .
+ This package contains the configuration files needed to run Noosfero with the
+ Ejabberd XMPP chat server.
@@ -0,0 +1,2 @@
+POLL=true
+SMP=auto
@@ -0,0 +1,6 @@
+debian/default/noosfero-chat                etc/default
+util/chat/ejabberd.cfg                      etc/ejabberd
+debian/update-noosfero-odbc                 usr/sbin
+etc/security/limits.d/noosfero-chat.conf    etc/security/limits.d
+etc/pam.d/noosfero-chat                     etc/pam.d
+debian/apache2/conf.d/noosfero-chat         etc/apache2/conf.d
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+echo -n "Fetching noosfero domain ..."
+domain=$(noosfero-runner 'puts Environment.default.default_hostname(true)')
+echo " [domain = $domain]"
+
+ejabberd_config='/etc/ejabberd/ejabberd.cfg'
+if test -f $ejabberd_config; then
+  sed -i "s/acl, *\([^,]*\), *{user, *\([^,]*\), *[^}]*/acl, \1, {user, \2, \"$domain\"/" /etc/ejabberd/ejabberd.cfg
+  sed -i "s/hosts, *\[[^]]*/hosts, [\"$domain\"/" /etc/ejabberd/ejabberd.cfg
+fi
+
+echo -n 'Fetching noosfero database name ...'
+noosfero_database=$(noosfero-runner 'puts Environment.connection_config[:database]')
+echo " [database = $noosfero_database]"
+
+echo 'Creating ejabberd schema ...'
+. /etc/default/noosfero
+noosfero_user="$NOOSFERO_USER"
+su - postgres -c "psql -c 'GRANT CREATE ON DATABASE $noosfero_database TO $noosfero_user;' > /dev/null"
+su - $noosfero_user -c 'rails dbconsole production < /usr/share/noosfero/util/chat/postgresql/ejabberd.sql > /dev/null'
+
+if which update-noosfero-odbc > /dev/null ; then
+  update-noosfero-odbc
+fi
+
+ejabberd_default='/etc/default/ejabberd'
+noosfero_chat_default='/etc/default/noosfero-chat'
+if test -f $ejabberd_default; then
+  if ! cat $ejabberd_default | grep "^\. $noosfero_chat_default" > /dev/null ; then
+    echo 'Extending ejabberd defaults with noosfero-chat defaults ...'
+    echo ". $noosfero_chat_default" >> $ejabberd_default
+  fi
+fi
+
+a2enmod proxy_http
+
+invoke-rc.d ejabberd restart
+invoke-rc.d noosfero restart
+invoke-rc.d apache2  restart
+
+# stop debconf to avoid the problem with infinite hanging, cfe
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=295477
+db_stop
+
+#DEBHELPER#
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+environment="$2"
+test -z "$environment" && environment=production
+
+su - noosfero -c "rails runner -e $environment '$1'"
@@ -17,6 +17,7 @@ debian/dbupgrade                  usr/lib/noosfero
 debian/default/noosfero           etc/default
 debian/noosfero-check-dbconfig    usr/sbin
 debian/noosfero-console           usr/sbin
+debian/noosfero-runner            usr/sbin
 debian/noosfero.yml               etc/noosfero
 debian/thin.yml                   etc/noosfero
 doc                               usr/share/noosfero
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+# automatically update configuration, but if package noosfero is also installed
+if test -x /usr/share/noosfero/script/odbcconf; then
+  config_file="/etc/odbc.ini"
+  if test -e "$config_file"; then
+    echo "Overwriting $config_file ..."
+  fi
+  /usr/share/noosfero/script/odbcconf > "$config_file"
+
+  echo 'Noosfero ODBC configuration updated.'
+fi
@@ -0,0 +1 @@
+session required pam_limits.so
@@ -0,0 +1,2 @@
+ejabberd       hard    nofile  65536
+ejabberd       soft    nofile  65536
@@ -80,8 +80,8 @@ Feature: article versioning
   Scenario: deny access to specific version when disabled, private and not logged
     Given the article "Edited Article" is updated with
-      | display_versions | published |
-      | false            | false     |
+      | display_versions | published | show_to_followers |
+      | false            | false     | false             |
     And I am not logged in
     And I go to /joaosilva/edited-article?version=1
     Then I should see "Access denied"
@@ -41,6 +41,7 @@ Feature: edit article
     When I follow "Folder"
     And I fill in "Title" with "My Folder"
     And I choose "article_published_false"
+    And I uncheck "article_show_to_followers"
     And I press "Save"
     And I log off
     And I go to /freesoftware/my-folder
@@ -87,6 +88,7 @@ Feature: edit article
     When I follow "Folder"
     And I fill in "Title" with "My Folder"
     And I choose "article_published_false"
+    And I uncheck "article_show_to_followers"
     Then I should see "Fill in the search field to add the exception users to see this content"
   @selenium
@@ -169,124 +169,3 @@ Feature: forum
        | Post one | joaosilva | Hi all | Hi all |
    When I go to /joaosilva/forum
    Then I should see "Joao Silva" within ".forum-post-last-answer"
-
-   @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 members 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 members 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 members 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 members 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 should see "Text article with visual editor"
-    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 members 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 should see "Text article with visual editor"
-    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 should see "Text article with visual editor"
-    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"
@@ -33,7 +33,7 @@ Feature: Use a secret community
   Scenario: Non members shouldn't see secret communit's content
     Given I am logged in as "maria"
     And I go to mycommunity's homepage
-    And I should see "Access denied"
+    And I should see "Oops ... you cannot go ahead here"
     And I follow "Communities"
     Then I should not see "My Community"
@@ -0,0 +1,64 @@
+Feature: user template
+  As an user
+  I want to create templates with mirror blocks
+  In order to keep these blocks always updated
+
+  Background:
+    Given the following users
+      | login  | name       | is_template |
+      | person | person     | true        |
+    And the following blocks
+      | owner  | type          | mirror |
+      | person | ArticleBlock  | true   |
+      | person | RawHTMLBlock  | false  |
+    And I go to /account/signup
+    And I fill in "Username" with "mario"
+    And I fill in "Password" with "123456"
+    And I fill in "Password confirmation" with "123456"
+    And I fill in "e-Mail" with "mario@mario.com"
+    And I fill in "Full name" with "Mario"
+    And wait for the captcha signup time
+    And I press "Create my account"
+    And I am logged in as admin
+
+  @selenium
+  Scenario: The block Article name is changed
+    Given I am on person's control panel
+    And I follow "Edit sideboxes"
+    And display ".button-bar"
+    And I follow "Edit" within ".article-block"
+    And I fill in "Custom title for this block:" with "Mirror"
+    And I press "Save"
+    And I go to /profile/mario
+    Then I should see "Mirror"
+
+  @selenium
+  Scenario: The block LinkList is changed but the user's block doesnt change
+    Given I am on person's control panel
+    And I follow "Edit sideboxes"
+    And display ".button-bar"
+    And I follow "Edit" within ".raw-html-block"
+    And I fill in "Custom title for this block:" with "Raw HTML Block"
+    And I press "Save"
+    And I go to /profile/mario
+    Then I should not see "Raw HTML Block"
+
+  @selenium
+  Scenario: The block Article cannot move or modify
+    Given I am on person's control panel
+    And I follow "Edit sideboxes"
+    And display ".button-bar"
+    And I follow "Edit" within ".article-block"
+    And I select "Cannot be moved" from "Move options:"
+    And I select "Cannot be modified" from "Edit options:"
+    And I press "Save"
+    And I follow "Logout"
+    And Mario's account is activated
+    And I follow "Login"
+    And I fill in "Username / Email" with "mario"
+    And I fill in "Password" with "123456"
+    And I press "Log in"
+    And I go to /myprofile/mario
+    And I follow "Edit sideboxes"
+    And display ".button-bar"
+    Then I should not see "Edit" within ".article-block"
@@ -60,7 +60,11 @@ module AuthenticatedSystem
       if logged_in? && authorized?
         true
       else
-        access_denied
+        if params[:require_login_popup]
+          render :json => { :require_login_popup => true }
+        else
+          access_denied
+        end
       end
     end
@@ -299,6 +299,18 @@ class Noosfero::Plugin
     nil
   end
+  # -> Filters the types of organizations that are shown on manage organizations
+  # returns a scope filtered by the specified type
+  def filter_manage_organization_scope type
+    nil
+  end
+
+  # -> Add new options for manage organization filters
+  # returns an array of new options
+  # i.e [[_('Type'), 'type'], [_('Type2'), 'type2']]
+  def organization_types_filter_options
+    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
@@ -0,0 +1,9 @@
+namespace :noosfero do
+  namespace :plugins do
+    task :enable_all => :environment do
+      Environment.all.each do |env|
+        puts "Plugins Activated on #{env.name}" if env.enable_all_plugins
+      end
+    end
+  end
+end
@@ -0,0 +1,9 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#
+#   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
+#   Mayor.create(name: 'Emanuel', city: cities.first)
+
+FooPlugin::Bar.create()
@@ -0,0 +1,14 @@
+class RequireAuthToCommentPluginAdminController < AdminController
+
+  def index
+    settings = params[:settings]
+    settings ||= {}
+    @settings = Noosfero::Plugin::Settings.new(environment, RequireAuthToCommentPlugin, settings)
+    if request.post?
+      @settings.save!
+      session[:notice] = 'Settings succefully saved.'
+      redirect_to :action => 'index'
+    end
+  end
+
+end
@@ -21,11 +21,20 @@ class RequireAuthToCommentPlugin &lt; Noosfero::Plugin
   end
   def stylesheet?
-    true
+    !display_login_popup?
+  end
+
+  def display_login_popup?
+    settings = Noosfero::Plugin::Settings.new(context.environment, self.class)
+    settings.require_type == 'display_login_popup'
+  end
+
+  def self.require_type_default_setting
+    'hide_button'
   end
   def js_files
-    ['hide_comment_form.js', 'jquery.livequery.min.js']
+    ['hide_comment_form.js', 'jquery.livequery.min.js'] + (display_login_popup? ? ['comment_require_login.js'] : [])
   end
   def body_beginning
@@ -0,0 +1,8 @@
+(function($) {
+  $(window).bind('userDataLoaded', function(event, data) {
+    if (!data.login && $('meta[name="profile.allow_unauthenticated_comments"]').length <= 0) {
+      $('.display-comment-form').unbind();
+      $('.display-comment-form').addClass('require-login-popup');
+    }
+  });
+})(jQuery);
@@ -5,9 +5,10 @@ class RequireAuthToCommentPluginTest &lt; ActiveSupport::TestCase
   def setup
     @plugin = RequireAuthToCommentPlugin.new
     @comment = Comment.new
+    @environment = fast_create(Environment)
   end
-  attr_reader :plugin, :comment
+  attr_reader :plugin, :comment, :environment
   should 'reject comments for unauthenticated users' do
     plugin.context = logged_in(false)
@@ -29,6 +30,35 @@ class RequireAuthToCommentPluginTest &lt; ActiveSupport::TestCase
     assert !comment.rejected?
   end
+  should 'the default require type setting be hide_button' do
+    assert_equal 'hide_button', plugin.class.require_type_default_setting
+  end
+
+  should 'display_login_popup? be false by default' do
+    context = mock();
+    context.expects(:environment).returns(environment)
+    plugin.expects(:context).returns(context)
+    assert !plugin.display_login_popup?
+  end
+
+  should 'display_login_popup? be true if require_type is defined as display_login_popup' do
+    context = mock();
+    context.expects(:environment).returns(environment)
+    environment[:settings] = {:require_auth_to_comment_plugin => {:require_type => "display_login_popup"}}
+    plugin.expects(:context).returns(context)
+    assert plugin.display_login_popup?
+  end
+
+  should 'not display stylesheet if login popup is active' do
+    plugin.expects(:display_login_popup?).returns(true)
+    assert !plugin.stylesheet?
+  end
+
+  should 'display stylesheet if login popup is inactive' do
+    plugin.expects(:display_login_popup?).returns(false)
+    assert plugin.stylesheet?
+  end
+
   protected
   def logged_in(boolean)
@@ -0,0 +1,20 @@
+<h1><%= _('Require auth to comment Settings')%></h1>
+
+<%= form_for(:settings) do |f| %>
+
+  <div class="require-type">
+    <strong>
+      <div class="hide-button">
+        <%= radio_button(:settings, :require_type, 'hide_button') %> <%= _('Hide button') %>
+      </div>
+      <div class="display-login-popup">
+        <%= radio_button(:settings, :require_type, 'display_login_popup') %> <%= _('Display login popup') %>
+      </div>
+    </strong>
+  </div>
+
+  <% button_bar do %>
+    <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
+  <% end %>
+
+<% end %>
@@ -56,9 +56,18 @@ class ToleranceTimePlugin &lt; Noosfero::Plugin
   end
   def content_expire_edit(content)
+    content_expire_for(content, _('editing'))
+  end
+
+  def content_expire_clone(content)
+    content_expire_for(content, _('cloning'))
+  end
+
+  private
+
+  def content_expire_for(content, action)
     if ToleranceTimePlugin.expired?(content)
-      _('The tolerance time for editing this content is over.')
+      _('The tolerance time for %s this content is over.') % action
     end
   end
-
 end
 .vote-actions {
-  position: absolute;
   top: 40px;
   right: 0px;
 }
@@ -5,7 +5,7 @@ reload_url = url_for(:controller =&gt; &#39;vote_plugin_profile&#39;, :profile =&gt; profile.i
 <span id="vote_<%= model %>_<%= target.id %>_<%= vote %>" data-reload_url=<%= reload_url %> class="vote-action action <%= action %>-action">
-  <%= link_to_remote content_tag(:span, count, :class=>'like-action-counter') + content_tag(:span, '', :class=>"action-icon #{action}"), :url => url, :html => {:class => "#{active ? 'like-action-active':''} #{user ? '':'disabled'}"} %>
+  <%= link_to content_tag(:span, count, :class=>'like-action-counter') + content_tag(:span, '', :class=>"action-icon #{action}"), url, :class => "#{active ? 'like-action-active':''} #{user ? '':'disabled'} require-login-popup" %>
   <% if !voters.blank? %>
     <span class="vote-detail">
@@ -114,6 +114,7 @@
 .icon-set-admin-role          { background-image: url(mod/16x16/apps/user.png) }
 .icon-reset-admin-role        { background-image: url(../../../images/icons-app/person-icon.png) }
 .icon-clock                   { background-image: url(Tango/16x16/actions/appointment.png) }
+.icon-fullscreen              { background-image: url(Tango/16x16/actions/view-fullscreen.png) }
 /******************LARGE ICONS********************/
 .image-gallery-item .folder  { background-image: url(mod/96x96/places/folder.png) }
@@ -27,6 +27,7 @@
 *= require manage-products.js
 *= require catalog.js
 *= require autogrow.js
+*= require require_login.js
 */
 // scope for noosfero stuff
@@ -1164,3 +1165,35 @@ function add_new_file_fields() {
 }
 window.isHidden = function isHidden() { return (typeof(document.hidden) != 'undefined') ? document.hidden : !document.hasFocus() };
+
+function $_GET(id){
+    var a = new RegExp(id+"=([^&#=]*)");
+    return decodeURIComponent(a.exec(window.location.search)[1]);
+}
+
+var fullwidth=false;
+function toggle_fullwidth(itemId){
+  if(fullwidth){
+    jQuery(itemId).removeClass("fullwidth");
+    jQuery("#fullscreen-btn").show()
+    jQuery("#exit-fullscreen-btn").hide()
+    fullwidth = false;
+  }
+  else{
+    jQuery(itemId).addClass("fullwidth");
+    jQuery("#exit-fullscreen-btn").show()
+    jQuery("#fullscreen-btn").hide()
+    fullwidth = true;
+  }
+  jQuery(window).trigger("toggleFullwidth", fullwidth);
+}
+
+function fullscreenPageLoad(itemId){
+  jQuery(document).ready(function(){
+
+    if ($_GET('fullscreen') == 1){
+      toggle_fullwidth(itemId);
+    }
+  });
+}
+
@@ -0,0 +1,49 @@
+(function($) {
+  // Pagination
+  $('#manage-profiles').on('click', '.pagination a', function () {
+    $.ajax({
+      url: this.href,
+      beforeSend: function(){$('#manage-profiles .results').addClass('fetching')},
+      complete: function() {$('#manage-profiles .results').removeClass('fetching')},
+      dataType: 'script'
+    })
+    return false;
+  });
+
+  // Actions
+  $('#manage-profiles').on('click', '.action', function () {
+    if(confirm($(this).data('confirm'))) {
+      $.ajax({
+        url: this.href,
+        method: $(this).data('method') || 'get',
+        dataType: 'script',
+        success: function(data){
+          if(data)
+            display_notice(JSON.parse(data));
+         },
+         error: function(xhr, textStatus, message){
+           display_notice(message);
+         }
+      });
+      $('#manage-profiles').submit();
+    }
+    return false;
+  });
+
+  // Sorting and Views
+  $('#manage-profiles select').live('change', function(){
+    $('#manage-profiles').submit();
+  });
+
+  // Form Ajax submission
+  $('#manage-profiles').submit(function () {
+    $.ajax({
+      url: this.action,
+      data: $(this).serialize(),
+      beforeSend: function(){$('#manage-profiles .results').addClass('fetching')},
+      complete: function() {$('#manage-profiles .results').removeClass('fetching')},
+      dataType: 'script'
+    })
+    return false;
+  });
+})(jQuery);
@@ -0,0 +1,25 @@
+(function($) {
+  $(window).bind('userDataLoaded', function(event, data) {
+    $(".require-login-popup").live('click', function(){
+      clicked = $(this);
+      url = clicked.attr("href");
+      if(url!=undefined && url!='' && url!='#') {
+        if(!data.login) {
+          url = $.param.querystring(url, "require_login_popup=true");
+        }
+        loading_for_button(this);
+        $.post(url, function(data){
+          if(data.require_login_popup) {
+            $('#link_login').click(); //TODO see a better way to show login popup
+          }
+        }).complete(function() {
+          clicked.css("cursor","");
+          $(".small-loading").remove();
+        });
+      } else {
+        $('#link_login').click();
+      }
+      return false;
+    });
+  });
+})(jQuery);
@@ -0,0 +1,30 @@
+var values_map = {2: 'self', 1: 'related', 0: 'users'};
+var keys_map = {};
+Object.keys(values_map).forEach(function(value){
+  keys_map[values_map[value]] = value;
+});
+var s =  jQuery('#topic-creation-slider');
+
+function setValue(event, ui){
+  jQuery('#article_topic_creation').val(values_map[ui.value]);
+}
+
+s.slider({
+  orientation: 'vertical',
+  min: 0,
+  max: 2,
+  step: 1,
+  value: keys_map[jQuery('#article_topic_creation').val()],
+  range: 'max',
+  change: setValue
+}).each(function() {
+  var opt = jQuery(this).data()['ui-slider'].options;
+  var vals = opt.max - opt.min;
+
+  for (var i = 0; i <= vals; i++) {
+    var n = vals - i;
+    var el = jQuery('<label>' + s.data(values_map[i]) + '</label>').css('top', ((n/vals*100) - 7 - n) + '%');
+    s.append(el);
+  }
+});
+
@@ -4763,7 +4763,7 @@ h1#agenda-title {
   float: right;
 }
-#environment-users-search form {
+#environment-profiles-search form {
   padding: 10px;
   margin-bottom: 15px;
   background-color: #E6E6E6;
@@ -4771,14 +4771,14 @@ h1#agenda-title {
   -webkit-border-radius: 5px;
 }
-.environment-users-results-header {
+.environment-profiles-results-header {
   font-size: 0.9em;
   padding: 6px 0px 0px 0px;
   margin:0 0 5px 0;
   border-bottom: 2px dotted #999;
   text-align: right;
 }
-#environment-users-filter-title {
+#environment-profiles-filter-title {
   font-weight: bold;
   font-size: 130%;
   line-height: 35px;
@@ -6239,6 +6239,20 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
 .forum-posts .pagination {
   margin-top: 20px;
 }
+
+#topic-creation-slider{
+  margin-top: 15px;
+}
+
+#topic-creation-slider .ui-slider-range {
+  background: #73D216;
+}
+
+#topic-creation-slider label {
+  left: 20px;
+  position: absolute;
+  width: 200px;
+}
 /* Task */
 #user a#pending-tasks-count {
@@ -6971,3 +6985,19 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
 body .ui-widget-overlay {
   background: #000;
 }
+
+.fullwidth{
+  position: fixed !important;
+  left: 0 !important;
+  top: 0 !important;
+  background: white !important;
+  width: 97% !important;
+  width: 100% !important;
+  z-index: 999 !important;
+  padding: 2em !important;
+  bottom:0 !important;
+  overflow: auto !important;
+  -webkit-box-sizing: border-box !important;
+  -moz-box-sizing: border-box !important;
+  box-sizing: border-box !important;
+}
@@ -17,6 +17,11 @@
   font-size: 120%;
 }
+.task_date {
+  color: gray;
+  font-size: 12px;
+}
+
 .task_icon {
   float: left;
   margin-right: 10px;
@@ -32,6 +32,7 @@ when &#39;virtualhosts&#39;
       puts "  #{server_directive} #{domain.name}"
       server_directive = 'ServerAlias'
     end
+    puts "  Include /usr/share/noosfero/util/chat/apache/xmpp.conf"
     puts "  Include /etc/noosfero/apache/virtualhost.conf"
     puts "</VirtualHost>"
   end
@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/environment'
+
+environment = Environment.default
+person = Person.first
+password = person.user.crypted_password
+login = person.jid
+
+begin
+  RubyBOSH.initialize_session(
+    login,
+    password,
+    "http://#{environment.default_hostname}/http-bind",
+    :wait => 30,
+    :hold => 1,
+    :window => 5
+  )
+rescue Exception => e
+  puts ""
+  puts "[ERROR] XMPP/Chat setup isn't working"
+  puts "-------------------------------------"
+  puts e.to_s
+  exit 1
+else
+  puts ""
+  puts "[OK] XMPP/Chat setup is working"
+  exit 0
+end
@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+require 'yaml'
+config = YAML.load_file(File.dirname(__FILE__) + '/../config/database.yml')['production']
+
+
+puts "[PostgreSQLEjabberdNoosfero]"
+puts "Description      = PostgreSQL Noosfero ejabberd database"
+puts "Driver           = PostgreSQL Unicode"
+puts "Trace            = No"
+puts "TraceFile        = /tmp/psqlodbc.log"
+puts "Database         = #{config['database']}"
+puts "Servername       = #{config['host'] || 'localhost'}"
+puts "UserName         = #{config['username']}"
+puts "Password         = #{config['password']}"
+puts "Port             = #{config['port'] || '5432'}"
+puts "ReadOnly         = No"
+puts "RowVersioning    = No"
+puts "ShowSystemTables = No"
+puts "ShowOidColumn    = No"
+puts "FakeOidIndex     = No"
+puts "ConnSettings     = SET search_path TO ejabberd"
@@ -65,7 +65,7 @@ module Noosfero::Factory
   ###### old stuff to be rearranged
   def create_admin_user(env)
     admin_user = User.find_by_login('adminuser') || create_user('adminuser', :email => 'adminuser@noosfero.org', :password => 'adminuser', :password_confirmation => 'adminuser', :environment => env)
-    admin_role = Role.find_by_name('admin_role') || Role.create!(:name => 'admin_role', :permissions => ['view_environment_admin_panel','edit_environment_features', 'edit_environment_design', 'manage_environment_categories', 'manage_environment_roles', 'manage_environment_trusted_sites', 'manage_environment_validators', 'manage_environment_users', 'manage_environment_templates', 'manage_environment_licenses', 'edit_appearance'])
+    admin_role = Role.find_by_name('admin_role') || Role.create!(:name => 'admin_role', :permissions => ['view_environment_admin_panel','edit_environment_features', 'edit_environment_design', 'manage_environment_categories', 'manage_environment_roles', 'manage_environment_trusted_sites', 'manage_environment_validators', 'manage_environment_users', 'manage_environment_organizations', 'manage_environment_templates', 'manage_environment_licenses', 'edit_appearance'])
     create(RoleAssignment, :accessor => admin_user.person, :role => admin_role, :resource => env) unless admin_user.person.role_assignments.map{|ra|[ra.role, ra.accessor, ra.resource]}.include?([admin_role, admin_user, env])
     admin_user.login
   end
@@ -35,6 +35,7 @@ four:
    - moderate_comments
    - perform_task
    - manage_environment_users
+   - manage_environment_organizations
    - manage_environment_templates
    - manage_environment_licenses
 profile_admin:
@@ -94,6 +95,7 @@ environment_administrator:
    - manage_environment_validators
    - moderate_comments
    - manage_environment_users
+   - manage_environment_organizations
    - edit_profile
    - destroy_profile
    - manage_environment_templates
@@ -17,12 +17,12 @@ class AdminPanelControllerTest &lt; ActionController::TestCase
   should 'manage the correct environment' do
     current = fast_create(Environment, :name => 'test environment', :is_default => false)
     current.domains.create!(:name => 'example.com')
-    
+
     @request.expects(:host).returns('example.com').at_least_once
     get :index
     assert_equal current, assigns(:environment)
   end
-  
+
   should 'link to site_info editing page' do
     get :index
     assert_tag :tag => 'a', :attributes => { :href => '/admin/admin_panel/site_info' }
@@ -379,36 +379,4 @@ class AdminPanelControllerTest &lt; ActionController::TestCase
     assert_equal body, Environment.default.signup_welcome_screen_body
     assert !Environment.default.signup_welcome_screen_body.blank?
   end
-
-  should 'show list to deactivate organizations' do
-    enabled_community = fast_create(Community, :environment_id => Environment.default, :name=>"enabled community")
-    disabled_community = fast_create(Community, :environment_id => Environment.default, :name=>"disabled community")
-    user = create_user('user')
-
-    disabled_community.disable
-
-    Environment.default.add_admin user.person
-    login_as('user')
-
-    get :manage_organizations_status, :filter=>"enabled"
-    assert_match(/Organization profiles - enabled/, @response.body)
-    assert_match(/enabled community/, @response.body)
-    assert_not_match(/disabled community/, @response.body)
-  end
-
-  should 'show list to activate organizations' do
-    enabled_community = fast_create(Community, :environment_id => Environment.default, :name=>"enabled community")
-    disabled_community = fast_create(Community, :environment_id => Environment.default, :name=>"disabled community")
-    user = create_user('user')
-
-    disabled_community.disable
-
-    Environment.default.add_admin user.person
-    login_as('user')
-
-    get :manage_organizations_status, :filter=>"disabled"
-    assert_match(/Organization profiles - disabled/, @response.body)
-    assert_not_match(/enabled community/, @response.body)
-    assert_match(/disabled community/, @response.body)
-  end
 end
@@ -1811,6 +1811,14 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_equal 'first version', assigns(:article).name
   end
+  should 'clone article with its content' do
+    article = profile.articles.create(:name => 'first version')
+
+    get :new, :profile => profile.identifier, :id => article.id, :clone => true, :type => 'TinyMceArticle'
+
+    assert_match article.name, @response.body
+  end
+
   should 'save article with content from older version' do
     article = profile.articles.create(:name => 'first version')
     article.name = 'second version'; article.save
@@ -131,7 +131,7 @@ class ContactControllerTest &lt; ActionController::TestCase
     post :new, :profile => community.identifier
     assert_response :forbidden
-    assert_template :private_profile
+    assert_template "profile/_private_profile"
   end
   should 'not show send e-mail page to non members of invisible community' do
@@ -257,22 +257,22 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   end
   should 'not give access to private articles if logged off' do
-    profile = Profile.create!(:name => 'test profile', :identifier => 'test_profile')
+    profile = Community.create!(:name => 'test profile', :identifier => 'test_profile')
     intranet = Folder.create!(:name => 'my_intranet', :profile => profile, :published => false)
     get :view_page, :profile => 'test_profile', :page => [ 'my-intranet' ]
-    assert_template 'access_denied'
+    assert_template "profile/_private_profile"
   end
   should 'not give access to private articles if logged in but not member' do
     login_as('testinguser')
-    profile = Profile.create!(:name => 'test profile', :identifier => 'test_profile')
+    profile = Community.create!(:name => 'test profile', :identifier => 'test_profile')
     intranet = Folder.create!(:name => 'my_intranet', :profile => profile, :published => false)
     get :view_page, :profile => 'test_profile', :page => [ 'my-intranet' ]
-    assert_template 'access_denied'
+    assert_template "profile/_private_profile"
   end
   should 'not give access to private articles if logged in and only member' do
@@ -1252,9 +1252,11 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'expire article actions button if any plugins says so' do
     class Plugin1 < Noosfero::Plugin
       def content_expire_edit(content); 'This button is expired.'; end
+      def content_expire_clone(content); 'This button is expired.'; end
     end
     class Plugin2 < Noosfero::Plugin
       def content_expire_edit(content); nil; end
+      def content_expire_clone(content); nil; end
     end
     Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
@@ -1428,7 +1430,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     article = TinyMceArticle.create(:name => 'Article to be shared with images',
                                     :body => 'This article should be shared with all social networks',
-                                    :profile => @profile,
+                                    :profile => community,
                                     :published => false,
                                     :show_to_followers => true)
     article.parent = blog
@@ -60,7 +60,7 @@ class EventsControllerTest &lt; ActionController::TestCase
     post :events, :profile => community.identifier
     assert_response :forbidden
-    assert_template :private_profile
+    assert_template "profile/_private_profile"
   end
   should 'not show events page to non members of invisible community' do
@@ -0,0 +1,116 @@
+require_relative "../test_helper"
+require 'organizations_controller'
+
+# Re-raise errors caught by the controller.
+class OrganizationsController; def rescue_action(e) raise e end; end
+
+class OrganizationsControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = OrganizationsController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    Environment.destroy_all
+    @environment = fast_create(Environment, :is_default => true)
+
+    admin_user = create_user_with_permission('adminuser', 'manage_environment_organizations', environment)
+    login_as('adminuser')
+  end
+
+  attr_accessor :environment
+
+  should 'not access without right permission' do
+    create_user('guest')
+    login_as 'guest'
+    get :index
+    assert_response 403 # forbidden
+  end
+
+  should 'grant access with right permission' do
+    get :index
+    assert_response :success
+  end
+
+  should 'show list to deactivate organizations' do
+    enabled_community = fast_create(Community, :environment_id => Environment.default, :name=>"enabled community")
+    disabled_community = fast_create(Community, :environment_id => Environment.default, :name=>"disabled community")
+    disabled_community.disable
+
+    get :index, :filter => 'enabled'
+
+    assert_match(/enabled community/, @response.body)
+    assert_not_match(/disabled community/, @response.body)
+  end
+
+  should 'show list to activate organizations' do
+    enabled_community = fast_create(Community, :environment_id => Environment.default, :name=>"enabled community")
+    disabled_community = fast_create(Community, :environment_id => Environment.default, :name=>"disabled community")
+    disabled_community.disable
+
+    get :index, :filter => 'disabled'
+
+    assert_not_match(/enabled community/, @response.body)
+    assert_match(/disabled community/, @response.body)
+  end
+
+  should 'show list only of enterprises' do
+    community = fast_create(Community, :environment_id => Environment.default, :name=>"Community Test")
+    enterprise = fast_create(Enterprise, :environment_id => Environment.default, :name=>"Enterprise Test")
+
+    get :index, :type => 'Enterprise'
+
+    assert_match(/Enterprise Test/, @response.body)
+    assert_not_match(/Community Test/, @response.body)
+  end
+
+  should 'show list only of communities' do
+    community = fast_create(Community, :environment_id => Environment.default, :name=>"Community Test")
+    enterprise = fast_create(Enterprise, :environment_id => Environment.default, :name=>"Enterprise Test")
+
+    get :index, :type => 'Community'
+
+    assert_not_match(/Enterprise Test/, @response.body)
+    assert_match(/Community Test/, @response.body)
+  end
+
+  should 'show list all organizations' do
+    community = fast_create(Community, :environment_id => Environment.default, :name=>"Community Test")
+    enterprise = fast_create(Enterprise, :environment_id => Environment.default, :name=>"Enterprise Test")
+
+    get :index, :type => 'any'
+
+    assert_match(/Enterprise Test/, @response.body)
+    assert_match(/Community Test/, @response.body)
+  end
+
+  should 'activate organization profile' do
+    organization = fast_create(Organization, :visible => false, :environment_id => environment.id)
+    assert organization.disabled?
+
+    get :activate, {:id => organization.id}
+    organization.reload
+
+    assert organization.enabled?
+  end
+
+  should 'deactivate organization profile' do
+    organization = fast_create(Organization, :visible => true, :environment_id => environment.id)
+    assert organization.enabled?
+
+    get :deactivate, {:id => organization.id}
+    organization.reload
+
+    assert organization.disabled?
+  end
+
+  should 'destroy organization profile' do
+    organization = fast_create(Organization, :environment_id => environment.id)
+
+    post :destroy, {:id => organization.id}
+
+    assert_raise ActiveRecord::RecordNotFound do
+      organization.reload
+    end
+  end
+end
@@ -1152,57 +1152,4 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     get :index, :profile => user.identifier
     assert_tag :tag => 'div', :descendant => { :tag => 'a', :content => 'Edit Header and Footer' }
   end
-
-  should 'deactivate organization profile' do
-    @request.env['HTTP_REFERER'] = 'http://localhost:3000/admin/admin_panel/manage_organizations_status'
-    user = create_user('user').person
-    Environment.default.add_admin user
-    login_as('user')
-
-    community = fast_create(Community)
-    assert_equal true, community.enable
-
-    get :index, :profile => community.identifier
-    get :deactivate_profile, {:profile => community.identifier, :id => community.id}
-    assert_equal @request.session[:notice], "The profile '#{community.name}' was deactivated."
-  end
-
-  should 'activate organization profile' do
-    @request.env['HTTP_REFERER'] = 'http://localhost:3000/admin/admin_panel/manage_organizations_status'
-    user = create_user('user').person
-    Environment.default.add_admin user
-    login_as('user')
-
-    community = fast_create(Community)
-    assert_equal true, community.disable
-
-    get :index, :profile => community.identifier
-    get :activate_profile, {:profile => community.identifier, :id => community.id}
-    assert_equal @request.session[:notice], "The profile '#{community.name}' was activated."
-  end
-
-  should 'not deactivate organization profile if user is not an admin' do
-    @request.env['HTTP_REFERER'] = 'http://localhost:3000/admin/admin_panel/manage_organizations_status'
-    user = create_user('user').person
-    login_as('user')
-
-    community = fast_create(Community)
-    get :index, :profile => community.identifier
-    get :deactivate_profile, {:profile => community.identifier, :id => community.id}
-    assert_not_equal @request.session[:notice], "The profile '#{community.name}' was disabled."
-  end
-
-  should 'destroy organization profile' do
-    @request.env['HTTP_REFERER'] = 'http://localhost:3000/admin/admin_panel/manage_organizations_status'
-    user = create_user('user').person
-    Environment.default.add_admin user
-    login_as('user')
-
-    community = fast_create(Community)
-    assert_equal true, community.enable
-
-    get :index, :profile => community.identifier
-    post :destroy_profile, {:profile => community.identifier, :id => community.id}
-    assert_equal @request.session[:notice], "The profile was deleted."
-  end
 end
@@ -5,7 +5,7 @@ class TasksController; def rescue_action(e) raise e end; end
 class TasksControllerTest < ActionController::TestCase
-  noosfero_test :profile => 'testuser' 
+  noosfero_test :profile => 'testuser'
   def setup
     @controller = TasksController.new
@@ -49,6 +49,12 @@ class TasksControllerTest &lt; ActionController::TestCase
     assert_kind_of Array, assigns(:tasks)
   end
+  should 'display task created_at' do
+    Task.create!(:requestor => fast_create(Person), :target => profile, :spam => false)
+    get :index
+    assert_select '.task_date'
+  end
+
   should 'list processed tasks without spam' do
     requestor = fast_create(Person)
     task_spam = create(Task, :status => Task::Status::FINISHED, :requestor => requestor, :target => profile, :spam => true)
@@ -388,6 +394,28 @@ class TasksControllerTest &lt; ActionController::TestCase
     assert_includes assigns(:tasks), t3
   end
+  should 'filter tasks by type and data content' do
+    class CleanHouse < Task; end
+    class FeedDog < Task; end
+    Task.stubs(:per_page).returns(3)
+    requestor = fast_create(Person)
+    t1 = CleanHouse.create!(:requestor => requestor, :target => profile, :data => {:name => 'Task Test'})
+    t2 = CleanHouse.create!(:requestor => requestor, :target => profile)
+    t3 = FeedDog.create!(:requestor => requestor, :target => profile)
+
+    get :index, :filter_type => t1.type, :filter_text => 'test'
+
+    assert_includes assigns(:tasks), t1
+    assert_not_includes assigns(:tasks), t2
+    assert_not_includes assigns(:tasks), t3
+
+    get :index
+
+    assert_includes assigns(:tasks), t1
+    assert_includes assigns(:tasks), t2
+    assert_includes assigns(:tasks), t3
+  end
+
   should 'return tasks ordered accordingly and limited by pages' do
     time = Time.now
     person = fast_create(Person)
@@ -85,7 +85,7 @@ class HttpCachingTest &lt; ActionController::IntegrationTest
   test 'private community content should not return cache headers' do
     community = create_private_community('the-community')
-    create(Article, profile_id: community.id, name: 'Test page')
+    create(Article, profile_id: community.id, name: 'Test page', published: false)
     get "/the-community/test-page"
     assert_response 403
@@ -139,4 +139,3 @@ class HttpCachingTest &lt; ActionController::IntegrationTest
   end
 end
-
@@ -1002,6 +1002,21 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_equal file, from_theme_include('atheme', 'afile')[:file] # exists? = true
   end
+  should 'enable fullscreen buttons' do
+    html = fullscreen_buttons("#article")
+    assert html.include?("<script>fullscreenPageLoad('#article')</script>")
+    assert html.include?("class=\"button with-text icon-fullscreen\"")
+    assert html.include?("onClick=\"toggle_fullwidth('#article')\"")
+  end
+
+  should "return the related class string" do
+    assert_equal "Clone Folder", label_for_clone_article(Folder.new)
+    assert_equal "Clone Blog", label_for_clone_article(Blog.new)
+    assert_equal "Clone Event", label_for_clone_article(Event.new)
+    assert_equal "Clone Forum", label_for_clone_article(Forum.new)
+    assert_equal "Clone Article", label_for_clone_article(TinyMceArticle.new)
+  end
+
   protected
   include NoosferoTestHelper
@@ -484,7 +484,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'say that member user can not see private article' do
     profile = fast_create(Profile, :name => 'test profile', :identifier => 'test_profile')
-    article = fast_create(Article, :name => 'test article', :profile_id => profile.id, :published => false)
+    article = fast_create(Article, :name => 'test article', :profile_id => profile.id, :published => false, :show_to_followers => false)
     person = create_user('test_user').person
     profile.affiliate(person, Profile::Roles.member(profile.environment.id))
@@ -509,15 +509,15 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert article.display_to?(person)
   end
-  should 'not show article to non member if article public but profile private' do
+  should 'show article to non member if article public but profile private' do
     profile = fast_create(Profile, :name => 'test profile', :identifier => 'test_profile', :public_profile => false)
     article = fast_create(Article, :name => 'test article', :profile_id => profile.id, :published => true)
     person1 = create_user('test_user1').person
     profile.affiliate(person1, Profile::Roles.member(profile.environment.id))
     person2 = create_user('test_user2').person
-    assert !article.display_to?(nil)
-    assert !article.display_to?(person2)
+    assert article.display_to?(nil)
+    assert article.display_to?(person2)
     assert article.display_to?(person1)
   end
@@ -543,7 +543,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'not allow friends of private person see the article' do
     person = create_user('test_user').person
-    article = create(Article, :name => 'test article', :profile => person, :published => false)
+    article = create(Article, :name => 'test article', :profile => person, :published => false, :show_to_followers => false)
     friend = create_user('test_friend').person
     person.add_friend(friend)
     person.save!
@@ -1686,7 +1686,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     a.allow_members_to_edit = true
     assert !a.allow_edit?(nil)
   end
- 
+
   should 'allow author to edit topic' do
     community = fast_create(Community)
     admin = fast_create(Person)
@@ -1905,7 +1905,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   end
   should 'display_filter display only public articles if there is no user' do
-    p = fast_create(Person) 
+    p = fast_create(Person)
     Article.delete_all
     a = fast_create(Article, :published => true, :profile_id => p.id)
     fast_create(Article, :published => false, :profile_id => p.id)
@@ -1915,7 +1915,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'display_filter display public articles for users' do
     user = create_user('someuser').person
-    p = fast_create(Person) 
+    p = fast_create(Person)
     user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
     Article.delete_all
     a = fast_create(Article, :published => true, :profile_id => p.id)
@@ -1926,7 +1926,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'display_filter display private article last changed by user' do
     user = create_user('someuser').person
-    p = fast_create(Person) 
+    p = fast_create(Person)
     user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
     Article.delete_all
     a = fast_create(Article, :published => false, :last_changed_by_id => user.id, :profile_id => p.id)
@@ -1938,7 +1938,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'display_filter display user private article of his own profile' do
     user = create_user('someuser').person
     user.stubs(:has_permission?).with(:view_private_content, user).returns(false)
-    p = fast_create(Person) 
+    p = fast_create(Person)
     Article.delete_all
     a = fast_create(Article, :published => false, :profile_id => user.id)
     fast_create(Article, :published => false, :profile_id => p.id)
@@ -1948,7 +1948,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'display_filter show profile private content if the user has view_private_content permission' do
     user = create_user('someuser').person
-    p = fast_create(Person) 
+    p = fast_create(Person)
     Article.delete_all
     user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
     a = fast_create(Article, :published => false, :profile_id => p.id)
@@ -1965,8 +1965,8 @@ class ArticleTest &lt; ActiveSupport::TestCase
     user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
     Article.delete_all
     a = fast_create(Article, :published => false, :show_to_followers => true, :profile_id => p.id)
-    fast_create(Article, :published => false, :profile_id => p.id)
-    fast_create(Article, :published => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :show_to_followers => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :show_to_followers => false, :profile_id => p.id)
     assert_equal [a], Article.display_filter(user, p)
   end
@@ -1977,8 +1977,8 @@ class ArticleTest &lt; ActiveSupport::TestCase
     user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
     Article.delete_all
     a = fast_create(Article, :published => false, :show_to_followers => true, :profile_id => p.id)
-    fast_create(Article, :published => false, :profile_id => p.id)
-    fast_create(Article, :published => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :show_to_followers => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :show_to_followers => false, :profile_id => p.id)
     assert_equal [a], Article.display_filter(user, p)
   end
@@ -2040,6 +2040,17 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal [], Article.display_filter(user, nil)
   end
+  should 'display_filter show person public content to non friends passing nil as profile parameter' do
+    user = create_user('someuser').person
+    p = fast_create(Person)
+    assert !p.is_a_friend?(user)
+    assert !user.is_admin?
+    Article.delete_all
+    a1 = fast_create(Article, :profile_id => p.id)
+    a2 = fast_create(Article)
+    assert_equivalent [a1,a2], Article.display_filter(user, nil)
+  end
+
   should 'display_filter do not show community private content to non members passing nil as profile parameter' do
     user = create_user('someuser').person
     p = fast_create(Community)
@@ -2049,6 +2060,16 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal [], Article.display_filter(user, nil)
   end
+  should 'display_filter show community public content to non members passing nil as profile parameter' do
+    user = create_user('someuser').person
+    p = fast_create(Community)
+    assert !user.is_member_of?(p)
+    Article.delete_all
+    a1 = fast_create(Article, :profile_id => p.id)
+    a2 = fast_create(Article)
+    assert_equivalent [a1,a2], Article.display_filter(user, nil)
+  end
+
   should 'display_filter show community public content of private community for user members' do
     user = create_user('someuser').person
     p = fast_create(Community, :public_profile => false)
@@ -2057,8 +2078,8 @@ class ArticleTest &lt; ActiveSupport::TestCase
     user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
     Article.delete_all
     a = fast_create(Article, :published => true, :profile_id => p.id)
-    fast_create(Article, :published => false, :profile_id => p.id)
-    fast_create(Article, :published => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :show_to_followers => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :show_to_followers => false, :profile_id => p.id)
     assert_equal [a], Article.display_filter(user, p)
   end
@@ -2088,7 +2109,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     a1 = fast_create(Article, :published => true, :profile_id => user.id)
     a2 = fast_create(Article, :published => true, :profile_id => p.id)
     fast_create(Article, :published => false, :profile_id => p.id)
-    assert_equivalent [a1,a2], Article.display_filter(user, nil)
+    assert_equivalent [a1,a2], Article.display_filter(nil, user)
   end
   should 'display_filter show person public content of private person profile for user friends' do
@@ -2099,8 +2120,8 @@ class ArticleTest &lt; ActiveSupport::TestCase
     user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
     Article.delete_all
     a = fast_create(Article, :published => true, :profile_id => p.id)
-    fast_create(Article, :published => false, :profile_id => p.id)
-    fast_create(Article, :published => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :show_to_followers => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :show_to_followers => false, :profile_id => p.id)
     assert_equal [a], Article.display_filter(user, p)
   end
@@ -2130,7 +2151,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     a1 = fast_create(Article, :published => true, :profile_id => user.id)
     a2 = fast_create(Article, :published => true, :profile_id => p.id)
     fast_create(Article, :published => false, :profile_id => p.id)
-    assert_equivalent [a1,a2], Article.display_filter(user, nil)
+    assert_equivalent [a1,a2], Article.display_filter(nil, user)
   end
 end
@@ -524,7 +524,7 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     p1= fast_create(Person, :is_template => true, :environment_id => e.id)
     p2 = fast_create(Person, :environment_id => e.id)
     p3 = fast_create(Person, :is_template => true, :environment_id => e.id)
-    assert_equivalent [p1,p3], e.person_templates    
+    assert_equivalent [p1,p3], e.person_templates
   end
   should 'person_templates return an empty array if there is no templates of person' do
@@ -532,7 +532,7 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     fast_create(Person, :environment_id => e.id)
     fast_create(Person, :environment_id => e.id)
-    assert_equivalent [], e.person_templates    
+    assert_equivalent [], e.person_templates
   end
   should 'person_default_template return the template defined as default' do
@@ -585,7 +585,7 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     c1= fast_create(Community, :is_template => true, :environment_id => e.id)
     c2 = fast_create(Community, :environment_id => e.id)
     c3 = fast_create(Community, :is_template => true, :environment_id => e.id)
-    assert_equivalent [c1,c3], e.community_templates    
+    assert_equivalent [c1,c3], e.community_templates
   end
   should 'community_templates return an empty array if there is no templates of community' do
@@ -646,7 +646,7 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     e1= fast_create(Enterprise, :is_template => true, :environment_id => env.id)
     e2 = fast_create(Enterprise, :environment_id => env.id)
     e3 = fast_create(Enterprise, :is_template => true, :environment_id => env.id)
-    assert_equivalent [e1,e3], env.enterprise_templates    
+    assert_equivalent [e1,e3], env.enterprise_templates
   end
   should 'enterprise_templates return an empty array if there is no templates of enterprise' do
@@ -654,7 +654,7 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     fast_create(Enterprise, :environment_id => env.id)
     fast_create(Enterprise, :environment_id => env.id)
-    assert_equivalent [], env.enterprise_templates    
+    assert_equivalent [], env.enterprise_templates
   end
   should 'enterprise_default_template return the template defined as default' do
@@ -1428,6 +1428,36 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     assert !environment.plugin_enabled?(Plugin)
   end
+  should 'activate on database all available plugins' do
+    plugins_enable = ["Statistics", "Foo", "PeopleBlock"]
+    Noosfero::Plugins.stubs(:available_plugin_names).returns(plugins_enable)
+    env1 = Environment.create(:name => "Test")
+    env2 = Environment.create(:name => "Test 2")
+
+    env1.enable_all_plugins
+    env2.enable_all_plugins
+
+    plugins = ["PeopleBlockPlugin", "StatisticsPlugin", "FooPlugin"]
+    plugins.each do |plugin|
+      assert env1.enabled_plugins.include?(plugin)
+      assert env2.enabled_plugins.include?(plugin)
+    end
+  end
+
+  should 'dont activate plugins that are not available' do
+    env1 = Environment.create(:name => "Test")
+    env2 = Environment.create(:name => "Test 2")
+
+    env1.enable_all_plugins
+    env2.enable_all_plugins
+
+    plugins = ["SomePlugin", "OtherPlugin", "ThirdPlugin"]
+    plugins.each do |plugin|
+      assert_equal false, env1.enabled_plugins.include?(plugin)
+      assert_equal false, env2.enabled_plugins.include?(plugin)
+    end
+  end
+
   should 'have production costs' do
     assert_respond_to Environment.default, :production_costs
   end
@@ -68,7 +68,7 @@ class FolderHelperTest &lt; ActionView::TestCase
     profile.public_profile = false
     profile.save!
     profile2 = create_user('Folder Viwer').person
-    folder = fast_create(Folder, :profile_id => profile.id)
+    folder = fast_create(Folder, :profile_id => profile.id, :published => false)
     article = fast_create(Article, {:parent_id => folder.id, :profile_id => profile.id})
     result = available_articles(folder.children, profile2)
@@ -174,4 +174,70 @@ class ForumTest &lt; ActiveSupport::TestCase
     assert_equal true, Forum.find(forum.id).agrees_with_terms?(person)
   end
+  should 'always allow topic creation to the person himself' do
+    person = fast_create(Person)
+    someone = fast_create(Person)
+    forum = Forum.new(:profile => person)
+
+    assert forum.can_create_topic?(person)
+    assert !forum.can_create_topic?(someone)
+  end
+
+  should 'always allow topic creation to profile admins' do
+    admin = fast_create(Person)
+    someone = fast_create(Person)
+    profile = fast_create(Profile)
+    admins = [admin]
+    profile.stubs(:admins).returns(admins)
+    forum = Forum.new(:profile => profile)
+
+    assert forum.can_create_topic?(admin)
+    assert !forum.can_create_topic?(someone)
+  end
+
+  should 'always allow topic creation to environment admins' do
+    admin = fast_create(Person)
+    someone = fast_create(Person)
+    profile = fast_create(Profile)
+    admins = [admin]
+    environment = profile.environment
+    environment.stubs(:admins).returns(admins)
+    forum = Forum.new(:profile => profile)
+
+    assert forum.can_create_topic?(admin)
+    assert !forum.can_create_topic?(someone)
+  end
+
+  should 'allow only person friends to create topics when topic_creation is related' do
+    person = fast_create(Person)
+    friend = fast_create(Person)
+    someone = fast_create(Person)
+    friends = [friend]
+    person.stubs(:friends).returns(friends)
+    forum = Forum.new(:profile => person, :topic_creation => 'related')
+
+    assert forum.can_create_topic?(friend)
+    assert !forum.can_create_topic?(someone)
+  end
+
+  should 'allow only group members to create topics when topic_creation is related' do
+    organization = fast_create(Organization)
+    member = fast_create(Person)
+    someone = fast_create(Person)
+    members = [member]
+    organization.stubs(:members).returns(members)
+    forum = Forum.new(:profile => organization, :topic_creation => 'related')
+
+    assert forum.can_create_topic?(member)
+    assert !forum.can_create_topic?(someone)
+  end
+
+  should 'allow every user to create topics when topic_creation is users' do
+    profile = fast_create(Profile)
+    user = fast_create(Person)
+    forum = Forum.new(:profile => profile, :topic_creation => 'users')
+
+    assert forum.can_create_topic?(user)
+    assert !forum.can_create_topic?(nil)
+  end
 end
@@ -1122,6 +1122,23 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_equal 'default title', p.boxes[0].blocks.first[:title]
   end
+  should 'have blocks observer on template when applying template with mirror' do
+    template = fast_create(Profile)
+    template.boxes.destroy_all
+    template.boxes << Box.new
+    b = Block.new(:title => 'default title', :mirror => true)
+    template.boxes[0].blocks << b
+
+    p = create(Profile)
+    assert !b[:title].blank?
+
+    p.copy_blocks_from(template)
+
+    assert_equal 'default title', p.boxes[0].blocks.first[:title]
+    assert_equal p.boxes[0].blocks.first, template.boxes[0].blocks.first.observers.first
+
+  end
+
   TMP_THEMES_DIR = Rails.root.join('test', 'tmp', 'profile_themes')
   should 'have themes' do
     Theme.stubs(:user_themes_dir).returns(TMP_THEMES_DIR)
@@ -119,7 +119,7 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
     assert_match(/#{task.target_notification_description}/, mail.subject)
     assert_equal "Hello friend name, my name invite you, please follow this link: http://example.com/account/signup?invitation_code=123456", mail.body.to_s
-    
+
     mail.deliver
     assert !ActionMailer::Base.deliveries.empty?
   end
@@ -135,6 +135,36 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
     assert_equal 'My name <email@example.com>', TaskMailer.generate_from(task)
   end
+  should 'return the email with the subdirectory defined' do
+    Noosfero.stubs(:root).returns('/subdir')
+
+    task = InviteFriend.new
+    task.expects(:code).returns('123456')
+
+    task.stubs(:message).returns('Hello <friend>, <user> invite you, please follow this link: <url>')
+    task.expects(:friend_email).returns('friend@exemple.com')
+    task.expects(:friend_name).returns('friend name').at_least_once
+
+    requestor = mock()
+    requestor.stubs(:name).returns('my name')
+    requestor.stubs(:public_profile_url).returns('requestor_path')
+
+    environment = mock()
+    environment.expects(:noreply_email).returns('sender@example.com')
+    environment.expects(:default_hostname).returns('example.com')
+    environment.expects(:name).returns('example').at_least_once
+
+    task.expects(:requestor).returns(requestor).at_least_once
+    task.expects(:person).returns(requestor).at_least_once
+    requestor.expects(:environment).returns(environment).at_least_once
+    task.expects(:environment).returns(environment).at_least_once
+
+    mail = TaskMailer.invitation_notification(task)
+
+    url_to_compare = "/subdir/account/signup"
+
+    assert_match(/#{url_to_compare}/, mail.body.to_s)
+  end
   private
     def read_fixture(action)
 # If your XMPP XMPP/BOSH isn't in localhost, change the config below to correct
 # point to address
+  RewriteEngine On
   RewriteRule /http-bind http://localhost:5280/http-bind [P,QSA,L]
   <Proxy http://localhost:5280/http-bind>
     Order Allow,Deny
	@@ -71,22 +71,4 @@ class AdminPanelController < AdminController		@@ -71,22 +71,4 @@ class AdminPanelController < AdminController
71	end	71	end
72	end	72	end
73	end	73	end
74	-
75	- def manage_organizations_status
76	- scope = environment.organizations
77	- @filter = params[:filter] \|\| 'any'
78	- @title = "Organization profiles"
79	- @title = @title+" - "+@filter if @filter != 'any'
80	-
81	- if @filter == 'enabled'
82	- scope = scope.visible
83	- elsif @filter == 'disabled'
84	- scope = scope.disabled
85	- end
86	-
87	- scope = scope.order('name ASC')
88	-
89	- @q = params[:q]
90	- @collection = find_by_contents(:organizations, environment, scope, @q, {:per_page => 10, :page => params[:npage]})[:results]
91	- end
92	end	74	end
@@ -0,0 +1,66 @@		@@ -0,0 +1,66 @@
	1	+class OrganizationsController < AdminController
	2	+
	3	+ protect 'manage_environment_organizations', :environment
	4	+
	5	+ def index
	6	+ @filter = params[:filter] \|\| 'any'
	7	+ @title = _('Organization profiles')
	8	+ @type = params[:type] \|\| "any"
	9	+ @types_filter = [[_('All'), 'any'], [_('Community'), 'Community'], [_('Enterprise'), 'Enterprise']]
	10	+ @types_filter = @types_filter \| @plugins.dispatch(:organization_types_filter_options)
	11	+
	12	+ scope = @plugins.dispatch_first(:filter_manage_organization_scope, @type)
	13	+ if scope.blank?
	14	+ scope = environment.organizations
	15	+ scope = scope.where(:type => @type) if @type != 'any'
	16	+ end
	17	+
	18	+ if @filter == 'enabled'
	19	+ scope = scope.visible
	20	+ elsif @filter == 'disabled'
	21	+ scope = scope.disabled
	22	+ end
	23	+
	24	+ scope = scope.order('name ASC')
	25	+
	26	+ @q = params[:q]
	27	+ @collection = find_by_contents(:organizations, environment, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
	28	+ end
	29	+
	30	+ def activate
	31	+ organization = environment.organizations.find(params[:id])
	32	+ if organization.enable
	33	+ render :text => (_('%s enabled') % organization.name).to_json
	34	+ else
	35	+ render :text => (_('%s could not be enabled') % organization.name).to_json
	36	+ end
	37	+ end
	38	+
	39	+ def deactivate
	40	+ organization = environment.organizations.find(params[:id])
	41	+ if organization.disable
	42	+ render :text => (_('%s disabled') % organization.name).to_json
	43	+ else
	44	+ render :text => (_('%s could not be disable') % organization.name).to_json
	45	+ end
	46	+ end
	47	+
	48	+ def destroy
	49	+ if request.post?
	50	+ organization = environment.organizations.find(params[:id])
	51	+ if organization && organization.destroy
	52	+ render :text => (_('%s removed') % organization.name).to_json
	53	+ else
	54	+ render :text => (_('%s could not be removed') % organization.name).to_json
	55	+ end
	56	+ else
	57	+ render :nothing => true
	58	+ end
	59	+ end
	60	+
	61	+ private
	62	+
	63	+ def per_page
	64	+ 10
	65	+ end
	66	+end
	@@ -3,7 +3,7 @@ class PublicController < ApplicationController		@@ -3,7 +3,7 @@ class PublicController < ApplicationController
3		3
4	def allow_access_to_page	4	def allow_access_to_page
5	unless profile.display_info_to?(user)	5	unless profile.display_info_to?(user)
6	- if profile.visible?	6	+ if profile.visible? && !profile.secret
7	private_profile	7	private_profile
8	else	8	else
9	invisible_profile	9	invisible_profile
	@@ -931,6 +931,19 @@ module ApplicationHelper		@@ -931,6 +931,19 @@ module ApplicationHelper
931	article_helper.cms_label_for_edit	931	article_helper.cms_label_for_edit
932	end	932	end
933		933
		934	+ def label_for_clone_article(article)
		935	+ translated_types = {
		936	+ Folder => _('Folder'),
		937	+ Blog => _('Blog'),
		938	+ Event => _('Event'),
		939	+ Forum => _('Forum')
		940	+ }
		941	+
		942	+ translated_type = translated_types[article.class] \|\| _('Article')
		943	+
		944	+ _('Clone %s') % translated_type
		945	+ end
		946	+
934	def add_rss_feed_to_head(title, url)	947	def add_rss_feed_to_head(title, url)
935	content_for :feeds do	948	content_for :feeds do
936	tag(:link, :rel => 'alternate', :type => 'application/rss+xml', :title => title, :href => url_for(url))	949	tag(:link, :rel => 'alternate', :type => 'application/rss+xml', :title => title, :href => url_for(url))
	@@ -1498,4 +1511,26 @@ module ApplicationHelper		@@ -1498,4 +1511,26 @@ module ApplicationHelper
1498	text_field(object_name, method, options.merge(:class => 'colorpicker_field'))	1511	text_field(object_name, method, options.merge(:class => 'colorpicker_field'))
1499	end	1512	end
1500		1513
		1514	+ def fullscreen_buttons(itemId)
		1515	+ content="
		1516	+ <script>fullscreenPageLoad('#{itemId}')</script>
		1517	+ "
		1518	+ content+=content_tag('a', content_tag('span',_("Full screen")),
		1519	+ { :id=>"fullscreen-btn",
		1520	+ :onClick=>"toggle_fullwidth('#{itemId}')",
		1521	+ :class=>"button with-text icon-fullscreen",
		1522	+ :href=>"#",
		1523	+ :title=>_("Go to full screen mode")
		1524	+ })
		1525	+
		1526	+ content+=content_tag('a', content_tag('span',_("Exit full screen")),
		1527	+ { :style=>"display: none;",
		1528	+ :id=>"exit-fullscreen-btn",
		1529	+ :onClick=>"toggle_fullwidth('#{itemId}')",
		1530	+ :class=>"button with-text icon-fullscreen",
		1531	+ :href=>"#",
		1532	+ :title=>_("Exit full screen mode")
		1533	+ })
		1534	+ end
		1535	+
1501	end	1536	end
	@@ -20,7 +20,7 @@ module TinymceHelper		@@ -20,7 +20,7 @@ module TinymceHelper
20	:image_advtab => true,	20	:image_advtab => true,
21	:language => tinymce_language	21	:language => tinymce_language
22		22
23	- options[:toolbar1] = "insertfile undo redo \| copy paste \| bold italic underline \| styleselect fontsizeselect \| forecolor backcolor \| alignleft aligncenter alignright alignjustify \| bullist numlist outdent indent \| link image"	23	+ options[:toolbar1] = "fullscreen \| insertfile undo redo \| copy paste \| bold italic underline \| styleselect fontsizeselect \| forecolor backcolor \| alignleft aligncenter alignright alignjustify \| bullist numlist outdent indent \| link image"
24	if options[:mode] == 'simple'	24	if options[:mode] == 'simple'
25	options[:menubar] = false	25	options[:menubar] = false
26	else	26	else
	@@ -14,7 +14,7 @@ module UsersHelper		@@ -14,7 +14,7 @@ module UsersHelper
14	select_field = select_tag(:filter, options, :onchange => onchange)	14	select_field = select_tag(:filter, options, :onchange => onchange)
15	content_tag('div',	15	content_tag('div',
16	content_tag('strong', _('Filter')) + ': ' + select_field,	16	content_tag('strong', _('Filter')) + ': ' + select_field,
17	- :class => "environment-users-customize-search"	17	+ :class => "environment-profiles-customize-search"
18	)	18	)
19	end	19	end
20		20
	@@ -5,7 +5,7 @@ class TaskMailer < ActionMailer::Base		@@ -5,7 +5,7 @@ class TaskMailer < ActionMailer::Base
5	@target = task.target.name	5	@target = task.target.name
6	@environment = task.environment.name	6	@environment = task.environment.name
7	@url = generate_environment_url(task, :controller => 'home')	7	@url = generate_environment_url(task, :controller => 'home')
8	- url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.tasks_url)	8	+ url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.tasks_url.merge(:script_name => Noosfero.root('/')))
9	@tasks_url = url_for_tasks_list	9	@tasks_url = url_for_tasks_list
10		10
11	mail(	11	mail(
	@@ -56,7 +56,7 @@ class TaskMailer < ActionMailer::Base		@@ -56,7 +56,7 @@ class TaskMailer < ActionMailer::Base
56	end	56	end
57		57
58	def generate_environment_url(task, url = {})	58	def generate_environment_url(task, url = {})
59	- url_for(Noosfero.url_options.merge(:host => task.environment.default_hostname).merge(url))	59	+ url_for(Noosfero.url_options.merge(:host => task.environment.default_hostname).merge(url).merge(:script_name => Noosfero.root('/')))
60	end	60	end
61		61
62	end	62	end
	@@ -29,6 +29,7 @@ class Environment < ActiveRecord::Base		@@ -29,6 +29,7 @@ class Environment < ActiveRecord::Base
29	'manage_environment_roles' => N_('Manage environment roles'),	29	'manage_environment_roles' => N_('Manage environment roles'),
30	'manage_environment_validators' => N_('Manage environment validators'),	30	'manage_environment_validators' => N_('Manage environment validators'),
31	'manage_environment_users' => N_('Manage environment users'),	31	'manage_environment_users' => N_('Manage environment users'),
		32	+ 'manage_environment_organizations' => N_('Manage environment organizations'),
32	'manage_environment_templates' => N_('Manage environment templates'),	33	'manage_environment_templates' => N_('Manage environment templates'),
33	'manage_environment_licenses' => N_('Manage environment licenses'),	34	'manage_environment_licenses' => N_('Manage environment licenses'),
34	'manage_environment_trusted_sites' => N_('Manage environment trusted sites'),	35	'manage_environment_trusted_sites' => N_('Manage environment trusted sites'),
	@@ -339,6 +340,16 @@ class Environment < ActiveRecord::Base		@@ -339,6 +340,16 @@ class Environment < ActiveRecord::Base
339	self.save!	340	self.save!
340	end	341	end
341		342
		343	+ def enable_all_plugins
		344	+ Noosfero::Plugin.available_plugin_names.each do \|plugin\|
		345	+ plugin_name = plugin.to_s + "Plugin"
		346	+ unless self.enabled_plugins.include?(plugin_name)
		347	+ self.enabled_plugins += [plugin_name]
		348	+ end
		349	+ end
		350	+ self.save!
		351	+ end
		352	+
342	# Disables a feature identified by its name	353	# Disables a feature identified by its name
343	def disable(feature, must_save=true)	354	def disable(feature, must_save=true)
344	self.settings["#{feature}_enabled".to_sym] = false	355	self.settings["#{feature}_enabled".to_sym] = false
	@@ -25,7 +25,7 @@ class SuggestArticle < Task		@@ -25,7 +25,7 @@ class SuggestArticle < Task
25		25
26	def article_object	26	def article_object
27	if @article_object.nil?	27	if @article_object.nil?
28	- @article_object = article_type.new(article.merge({:profile => target}).except(:type))	28	+ @article_object = article_type.new(article.merge(target.present? ? {:profile => target} : {}).except(:type))
29	if requestor.present?	29	if requestor.present?
30	@article_object.author = requestor	30	@article_object.author = requestor
31	else	31	else
	@@ -1,69 +0,0 @@		@@ -1,69 +0,0 @@
1	-<h1><%= _('Manage organizations') %></h1>
2	-
3	-<%= form_tag( { :action => 'manage_organizations_status' }, :method => 'get', :class => 'users-search' ) do %>
4	-
5	- <div class="search-field">
6	- <span class="formfield">
7	- <%= text_field_tag 'q', @q, :title => _("Find profiles"), :style=>"width:85%" %>
8	- </span>
9	-
10	- <%= submit_button(:search, _('Search')) %>
11	- </div>
12	-
13	- <div class="environment-users-results-header">
14	- <div id='environment-users-filter-title'><%= @title %></div>
15	-
16	- <div id="environment-users-filter-filter">
17	- <strong><%= _("Filter by: ") %></strong>
18	-
19	- <select id="profile_filter_select">
20	- <%= options_for_select([['Any', 'any'],["Disabled profiles", "disabled"], ["Enabled profiles", "enabled"]], @filter) %>
21	- </select>
22	- </div>
23	- <div style="clear: both"></div>
24	- </div>
25	-
26	- <table>
27	- <colgroup>
28	- <col width="80%">
29	- <col width="20%">
30	- </colgroup>
31	-
32	- <tr>
33	- <th><%= _('Member') %></th>
34	- <th><%= _('Actions') %></th>
35	- </tr>
36	-
37	- <% @collection.each do \|p\| %>
38	- <tr title="<%= p.name %>">
39	- <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
40	-
41	- <td class='actions'>
42	- <div class="members-buttons-cell">
43	- <% if p.visible %>
44	- <%= button_without_text :'deactivate-user', _('Deactivate'), {:controller => "profile_editor", :action => 'deactivate_profile', :profile => p.identifier, :id => p.id}, :confirm => _("Do you want to deactivate this profile ?") %>
45	- <% else %>
46	- <%= button_without_text :'activate-user', _('Activate'), {:controller => "profile_editor", :action => 'activate_profile', :profile => p.identifier, :id => p.id}, :confirm => _("Do you want to activate this profile ?") %>
47	- <% end %>
48	- <%= button_without_text :'delete', _('Remove'), {:controller => "profile_editor", :action => 'destroy_profile', :profile => p.identifier, :id => p.id, :return_to => "/admin/admin_panel/manage_organizations_status"}, :method => :post, :confirm => _("Do you want to deactivate this profile ?") %>
49	- </div>
50	- </td>
51	- </tr>
52	- <% end %>
53	- </table>
54	-
55	-<% end %>
56	-
57	-<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
58	-
59	-<% button_bar do %>
60	- <%= button :back, _('Back'), :controller => 'admin_panel' %>
61	-<% end %>
62	-
63	-<script type="text/javascript">
64	- jQuery(document).ready(function(){
65	- jQuery("#profile_filter_select").change(function(){
66	- document.location.href = '/admin/admin_panel/manage_organizations_status?filter='+this.value;
67	- });
68	- });
69	-</script>
70	\ No newline at end of file	0	\ No newline at end of file