Merge branch 'master' into production

Conflicts: app/controllers/my_profile/tasks_controller.rb app/models/task.rb test/functional/tasks_controller_test.rb

Merge branch 'master' into production
Conflicts: app/controllers/my_profile/tasks_controller.rb app/models/task.rb test/functional/tasks_controller_test.rb
Victor Costa
2 parents 431bb618 78331cae
Showing 37 changed files with 439 additions and 178 deletions Show diff stats
INSTALL.chat.md
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/models/article.rb
app/models/forum.rb
app/models/suggest_article.rb
app/models/task.rb
app/views/content_viewer/_article_toolbar.html.erb
app/views/tasks/index.html.erb
db/migrate/20150513213939_update_topic_creation_configuration.rb
db/schema.rb
debian/apache2/conf.d/noosfero-chat
debian/changelog
debian/control
debian/default/noosfero-chat
debian/noosfero-chat.install
debian/noosfero-chat.postinst
debian/noosfero-runner
-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"/>
@@ -137,7 +137,13 @@ class CmsController &lt; MyProfileController
     article_data = environment.enabled?('articles_dont_accept_comments_by_default') ? { :accept_comments => false } : {}
     article_data.merge!(params[:article]) if params[:article]
     article_data.merge!(:profile => profile) if profile
-    @article = klass.new(article_data)
+
+    @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
 class TasksController < MyProfileController
   protect 'perform_task', :profile
-  
+
   def index
-    @filter_type = params[:filter_type] = params[:filter_type].blank? ? nil : params[:filter_type]
-    @filter_text = params[:filter_text].blank? ? nil : params[:filter_text]
+    @filter_type = params[:filter_type].presence
+    @filter_text = params[:filter_text].presence
     @task_types = Task.pending_types_for(profile)
-    @tasks = Task.pending_all(profile,params).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
@@ -941,6 +941,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))
@@ -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',
@@ -587,25 +587,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
@@ -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
@@ -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,9 +239,9 @@ 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, ->(field,value) { where("LOWER(#{field}) LIKE ?", "%#{value.downcase}%") if value}
-  scope :pending_all, ->(profile, params){
-    self.to(profile).without_spam.pending.of(params[:filter_type]).like('data', params[:filter_text])
+  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|
@@ -30,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) %>
@@ -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>
@@ -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 => 20150423144533) do
+ActiveRecord::Schema.define(:version => 20150513213939) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -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
@@ -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"
@@ -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
@@ -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);
+  }
+});
+
@@ -6238,6 +6238,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 {
@@ -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"
@@ -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
@@ -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])
@@ -428,13 +428,13 @@ class TasksControllerTest &lt; ActionController::TestCase
     t2 = CleanHouse.create!(:requestor => requestor, :target => profile)
     t3 = FeedDog.create!(:requestor => requestor, :target => profile)
-    post :index, :filter_type => t1.type, :filter_text => 'test'
+    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
-    post :index
+    get :index
     assert_includes assigns(:tasks), t1
     assert_includes assigns(:tasks), t2
@@ -1009,6 +1009,14 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     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
@@ -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
 # 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
	@@ -941,6 +941,19 @@ module ApplicationHelper		@@ -941,6 +941,19 @@ module ApplicationHelper
941	article_helper.cms_label_for_edit	941	article_helper.cms_label_for_edit
942	end	942	end
943		943
		944	+ def label_for_clone_article(article)
		945	+ translated_types = {
		946	+ Folder => _('Folder'),
		947	+ Blog => _('Blog'),
		948	+ Event => _('Event'),
		949	+ Forum => _('Forum')
		950	+ }
		951	+
		952	+ translated_type = translated_types[article.class] \|\| _('Article')
		953	+
		954	+ _('Clone %s') % translated_type
		955	+ end
		956	+
944	def add_rss_feed_to_head(title, url)	957	def add_rss_feed_to_head(title, url)
945	content_for :feeds do	958	content_for :feeds do
946	tag(:link, :rel => 'alternate', :type => 'application/rss+xml', :title => title, :href => url_for(url))	959	tag(:link, :rel => 'alternate', :type => 'application/rss+xml', :title => title, :href => url_for(url))
	@@ -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
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class UpdateTopicCreationConfiguration < ActiveRecord::Migration
	2	+ def up
	3	+ Forum.where("setting LIKE '%:allows_members_to_create_topics: true%'").find_each do \|forum\|
	4	+ forum.setting.delete(:allows_members_to_create_topics)
	5	+ forum.setting.merge!(:topic_creation => 'related')
	6	+ forum.save
	7	+ end
	8	+ end
	9	+
	10	+ def down
	11	+ say "this migration can't be reverted"
	12	+ end
	13	+end
	@@ -11,7 +11,7 @@		@@ -11,7 +11,7 @@
11	#	11	#
12	# It's strongly recommended to check this file into your version control system.	12	# It's strongly recommended to check this file into your version control system.
13		13
14	-ActiveRecord::Schema.define(:version => 20150423144533) do	14	+ActiveRecord::Schema.define(:version => 20150513213939) do
15		15
16	create_table "abuse_reports", :force => true do \|t\|	16	create_table "abuse_reports", :force => true do \|t\|
17	t.integer "reporter_id"	17	t.integer "reporter_id"
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+<IfModule mpm_worker_module>
	2	+ StartServers 8
	3	+ MinSpareThreads 25
	4	+ MaxSpareThreads 75
	5	+ ThreadLimit 128
	6	+ ThreadsPerChild 128
	7	+ MaxClients 2048
	8	+ MaxRequestsPerChild 0
	9	+</IfModule>
	@@ -85,3 +85,14 @@ Description: free web-based platform for social networks (apache frontend)		@@ -85,3 +85,14 @@ Description: free web-based platform for social networks (apache frontend)
85	.	85	.
86	This package contains the configuration files needed to run Noosfero with the	86	This package contains the configuration files needed to run Noosfero with the
87	Apache HTTPD server as frontend.	87	Apache HTTPD server as frontend.
		88	+
		89	+Package: noosfero-chat
		90	+Architecture: all
		91	+Depends: noosfero (>= 1.2), ejabberd, odbc-postgresql, pidgin-data
		92	+Description: free web-based platform for social networks (ejabberd based chat)
		93	+ Noosfero is a web platform for social and solidarity economy networks with
		94	+ blog, e-Porfolios, CMS, RSS, thematic discussion, events agenda and collective
		95	+ inteligence for solidarity economy in the same system.
		96	+ .
		97	+ This package contains the configuration files needed to run Noosfero with the
		98	+ Ejabberd XMPP chat server.
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+debian/default/noosfero-chat etc/default
	2	+util/chat/ejabberd.cfg etc/ejabberd
	3	+debian/update-noosfero-odbc usr/sbin
	4	+etc/security/limits.d/noosfero-chat.conf etc/security/limits.d
	5	+etc/pam.d/noosfero-chat etc/pam.d
	6	+debian/apache2/conf.d/noosfero-chat etc/apache2/conf.d
@@ -0,0 +1,50 @@		@@ -0,0 +1,50 @@
	1	+#!/bin/bash
	2	+
	3	+set -e
	4	+
	5	+. /usr/share/debconf/confmodule
	6	+
	7	+echo -n "Fetching noosfero domain ..."
	8	+domain=$(noosfero-runner 'puts Environment.default.default_hostname(true)')
	9	+echo " [domain = $domain]"
	10	+
	11	+ejabberd_config='/etc/ejabberd/ejabberd.cfg'
	12	+if test -f $ejabberd_config; then
	13	+ sed -i "s/acl, \([^,]\), {user, \([^,]\), [^}]*/acl, \1, {user, \2, \"$domain\"/" /etc/ejabberd/ejabberd.cfg
	14	+ sed -i "s/hosts, \[[^]]/hosts, [\"$domain\"/" /etc/ejabberd/ejabberd.cfg
	15	+fi
	16	+
	17	+echo -n 'Fetching noosfero database name ...'
	18	+noosfero_database=$(noosfero-runner 'puts Environment.connection_config[:database]')
	19	+echo " [database = $noosfero_database]"
	20	+
	21	+echo 'Creating ejabberd schema ...'
	22	+. /etc/default/noosfero
	23	+noosfero_user="$NOOSFERO_USER"
	24	+su - postgres -c "psql -c 'GRANT CREATE ON DATABASE $noosfero_database TO $noosfero_user;' > /dev/null"
	25	+su - $noosfero_user -c 'rails dbconsole production < /usr/share/noosfero/util/chat/postgresql/ejabberd.sql > /dev/null'
	26	+
	27	+if which update-noosfero-odbc > /dev/null ; then
	28	+ update-noosfero-odbc
	29	+fi
	30	+
	31	+ejabberd_default='/etc/default/ejabberd'
	32	+noosfero_chat_default='/etc/default/noosfero-chat'
	33	+if test -f $ejabberd_default; then
	34	+ if ! cat $ejabberd_default \| grep "^\. $noosfero_chat_default" > /dev/null ; then
	35	+ echo 'Extending ejabberd defaults with noosfero-chat defaults ...'
	36	+ echo ". $noosfero_chat_default" >> $ejabberd_default
	37	+ fi
	38	+fi
	39	+
	40	+a2enmod proxy_http
	41	+
	42	+invoke-rc.d ejabberd restart
	43	+invoke-rc.d noosfero restart
	44	+invoke-rc.d apache2 restart
	45	+
	46	+# stop debconf to avoid the problem with infinite hanging, cfe
	47	+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=295477
	48	+db_stop
	49	+
	50	+#DEBHELPER#
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+#!/bin/sh
	2	+
	3	+set -e
	4	+
	5	+environment="$2"
	6	+test -z "$environment" && environment=production
	7	+
	8	+su - noosfero -c "rails runner -e $environment '$1'"
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+#!/bin/sh
	2	+
	3	+set -e
	4	+
	5	+# automatically update configuration, but if package noosfero is also installed
	6	+if test -x /usr/share/noosfero/script/odbcconf; then
	7	+ config_file="/etc/odbc.ini"
	8	+ if test -e "$config_file"; then
	9	+ echo "Overwriting $config_file ..."
	10	+ fi
	11	+ /usr/share/noosfero/script/odbcconf > "$config_file"
	12	+
	13	+ echo 'Noosfero ODBC configuration updated.'
	14	+fi