Merge branch 'production' of gitlab.com:participa/noosfero into production

Leandro Santos
2 parents 7bc9af73 aa514668
Showing 60 changed files with 906 additions and 220 deletions Show diff stats
Gemfile
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/helpers/tinymce_helper.rb
app/models/article.rb
app/models/environment.rb
app/models/forum.rb
app/models/suggest_article.rb
app/models/task.rb
app/views/cms/_forum.html.erb
app/views/content_viewer/_article_toolbar.html.erb
app/views/content_viewer/_article_toolbar.html.erb.orig
app/views/profile_editor/_pending_tasks.html.erb
app/views/tasks/_task.html.erb
app/views/tasks/index.html.erb
config/noosfero.yml.dist
db/migrate/20150513213939_update_topic_creation_configuration.rb
@@ -57,4 +57,4 @@ eval(File.read(&#39;config/Gemfile&#39;), binding) rescue nil
 # dependencies.
 Dir.glob('config/plugins/*/Gemfile').each do |gemfile|
   eval File.read(gemfile)
 -end
+end
 \ No newline at end of file
-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
+    @filter_responsible = params[:filter_responsible]
     @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')
+    @tasks = @tasks.where(:responsible_id => @filter_responsible.to_i != -1 ? @filter_responsible : nil) if @filter_responsible.present?
+    @tasks = @tasks.paginate(:per_page => Task.per_page, :page => params[:page])
+
     @failed = params ? params[:failed] : {}
+
+    @responsible_candidates = profile.members.by_role(profile.roles.reject {|r| !r.has_permission?('perform_task')})
   end
   def processed
     @tasks = Task.to(profile).without_spam.closed.sort_by(&:created_at)
   end
+  def change_responsible
+    task = profile.tasks.find(params[:task_id])
+
+    if task.responsible.present? && task.responsible.id != params[:old_responsible_id].to_i
+      return render :json => {:notice => _('Task already assigned!'), :success => false, :current_responsible => task.responsible.id}
+    end
+
+    responsible = profile.members.find(params[:responsible_id]) if params[:responsible_id].present?
+    task.responsible = responsible
+    task.save!
+    render :json => {:notice => _('Task responsible successfully updated!'), :success => true, :new_responsible => {:id => responsible.present? ? responsible.id : nil}}
+  end
+
   VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]
   def close
     failed = {}
+    save = false
     if params[:tasks]
       params[:tasks].each do |id, value|
         decision = value[:decision]
-        if request.post? && VALID_DECISIONS.include?(decision) && id && decision != 'skip'
+
+        if value[:task].is_a?(Hash) && value[:task][:tag_list]
+
           task = profile.find_in_all_tasks(id)
-          begin
-            task.update_attributes(value[:task])
-            task.send(decision)
-          rescue Exception => ex
-            message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
-            failed[ex.message] ? failed[ex.message] << message : failed[ex.message] = [message]
+          task.tag_list = value[:task][:tag_list]
+          value[:task].delete('tag_list')
+
+          save = true
+        end
+
+        if request.post?
+          if VALID_DECISIONS.include?(decision) && id && decision != 'skip'
+            task ||= profile.find_in_all_tasks(id)
+            begin
+              task.update_attributes(value[:task])
+              task.send(decision)
+            rescue Exception => ex
+              message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
+              failed[ex.message] ? failed[ex.message] << message : failed[ex.message] = [message]
+            end
+          elsif save
+            task.save!
           end
         end
       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',
@@ -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
@@ -508,13 +508,13 @@ class Article &lt; ActiveRecord::Base
   scope :display_filter, lambda {|user, profile|
     return published if (user.nil? && profile && profile.public?)
-    return [] if user.nil? || profile.nil? || (profile && !profile.public? && !user.follows?(profile))
+    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 ? AND profile_id = ?)", true, user.id, user.id,
         profile.nil? ?  false : user.has_permission?(:view_private_content, profile),
-        true, user.follows?(profile), profile.id
+        true, user.follows?(profile), (profile.nil? ? nil : profile.id)
       ]
     )
   }
@@ -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
@@ -339,6 +339,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
@@ -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
@@ -12,6 +12,7 @@
 class Task < ActiveRecord::Base
   acts_as_having_settings :field => :data
+  acts_as_ordered_taggable
   module Status
     # the status of tasks just created
@@ -33,6 +34,7 @@ class Task &lt; ActiveRecord::Base
   belongs_to :requestor, :class_name => 'Profile', :foreign_key => :requestor_id
   belongs_to :target, :foreign_key => :target_id, :polymorphic => true
+  belongs_to :responsible, :class_name => 'Person', :foreign_key => :responsible_id
   validates_uniqueness_of :code, :on => :create
   validates_presence_of :code
@@ -239,9 +241,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|
@@ -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)) %>
       <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }) %>
       <%= expirable_button @page, :edit, content, url %>
     <% end %>
-    
+
     <% if @page != profile.home_page && !@page.has_posts?  && @page.allow_delete?(user) && !remove_content_button(:delete, @page)%>
       <% content = content_tag( 'span', _('Delete') ) %>
       <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page.id}) %>
@@ -28,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) %>
@@ -50,6 +56,7 @@
     <% end %>
     <%= report_abuse(profile, :link, @page) %>
+
   </div>
   <div id="article-header">
     <% if @page.blog? and !@page.image.nil? %>
@@ -0,0 +1,69 @@
+<div<%= user && " class='logged-in'" %>>
+  <div id="article-actions">
+<<<<<<< HEAD
+    <%= fullscreen_buttons('#article') %>
+=======
+
+    <%= fullscreen_buttons('#article') %>
+
+>>>>>>> master
+    <% if @page.allow_edit?(user) && !remove_content_button(:edit, @page) %>
+      <% content = content_tag('span', label_for_edit_article(@page)) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }) %>
+      <%= expirable_button @page, :edit, content, url %>
+    <% end %>
+    
+    <% if @page != profile.home_page && !@page.has_posts?  && @page.allow_delete?(user) && !remove_content_button(:delete, @page)%>
+      <% content = content_tag( 'span', _('Delete') ) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page.id}) %>
+      <% options = {:method => :post, :confirm => delete_article_message(@page)} %>
+      <%= expirable_button @page, :delete, content, url, options %>
+    <% end %>
+
+    <% if @page.allow_spread?(user) && !remove_content_button(:spread, @page) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %>
+      <%= expirable_button @page, :spread, content_tag( 'span', _('Spread this') ), url, {:class => 'colorbox'} if url %>
+    <% end %>
+
+    <% if !@page.gallery? && (@page.allow_create?(user) || (@page.parent && @page.parent.allow_create?(user))) %>
+      <% if @page.translatable? && !@page.native_translation.language.blank? && !remove_content_button(:locale, @page) %>
+        <% content = _('Add translation') %>
+        <% parent_id = (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)) %>
+        <% url = profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => parent_id, :type => @page.type, :article => { :translation_of_id => @page.native_translation.id })%>
+        <%= expirable_button @page, :locale, content, url %>
+      <% 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) %>
+    <% end %>
+
+    <% if @page.accept_uploads? && @page.allow_create?(user) %>
+      <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) unless remove_content_button(:upload, @page)%>
+    <% end %>
+
+    <% if !@page.allow_create?(user) && profile.organization? && (@page.blog? || @page.parent && @page.parent.blog?) && !remove_content_button(:suggest, @page) %>
+      <% content = content_tag( 'span', _('Suggest an article') ) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}) %>
+      <% options = {:id => 'suggest-article-link'} %>
+      <%= expirable_button @page, :suggest, content, url, options %>
+    <% end %>
+
+    <% if @page.display_versions? %>
+      <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
+    <% end %>
+
+    <% plugins_toolbar_actions_for_article(@page).each do |plugin_button| %>
+      <%= button plugin_button[:icon], plugin_button[:title], plugin_button[:url], plugin_button[:html_options] %>
+    <% end %>
+
+    <%= report_abuse(profile, :link, @page) %>
+  </div>
+  <div id="article-header">
+    <% if @page.blog? and !@page.image.nil? %>
+      <div class="blog-cover"><%= image_tag(@page.image.public_filename())%></div>
+    <% end %>
+    <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
+    <%= @plugins.dispatch(:article_header_extra_contents, @page).collect { |content| instance_exec(&content) }.join("") %>
+    <%= article_title(@page, :no_link => true) %>
+    <%= article_translations(@page) %>
+  </div>
+</div>
@@ -4,7 +4,7 @@
   <div class='pending-tasks'>
     <h2><%= _('You have pending requests') %></h2>
     <ul>
-      <%= @pending_tasks.map {|task| content_tag('li', task_information(task))}.join %>
+      <%= @pending_tasks.take(10).map {|task| content_tag('li', task_information(task))}.join %>
     </ul>
     <%= button(:todo, _('Process requests'), :controller => 'tasks', :action => 'index') %>
   </div>
@@ -2,6 +2,16 @@
   <%= render :partial => 'task_icon', :locals => {:task => task} %>
+  <% if profile.organization? && @responsible_candidates.present? %>
+    <div class="task_responsible">
+      <span class="label"><%= _('Assign to:') %></span>
+      <span>
+        <% change_responsible_url = url_for :action => :change_responsible, :controller => :tasks %>
+        <%= select_tag "tasks[#{task.id}][responsible]", options_from_collection_for_select(@responsible_candidates, :id, :name, task.responsible.present? ? task.responsible.id : nil), :include_blank => true, :onchange => "change_task_responsible(this);", 'data-old-responsible' => task.responsible.present? ? task.responsible.id : nil, 'data-task' => task.id, 'data-url' => change_responsible_url %>
+      </span>
+    </div>
+  <% end %>
+
   <div class="task_decisions">
     <%=
         labelled_radio_button(_("Accept"), "tasks[#{task.id}][decision]", 'finish', task.default_decision == 'accept',
@@ -22,6 +32,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">
@@ -40,6 +52,13 @@
         <%= render :partial => partial_for_class(task.class, nil, :reject_details), :locals => {:task => task, :f => f} %>
       </div>
     <% end %>
+
+    <div class="formfieldline">
+      <div class="formfield tag-list-fields">
+        <%= labelled_text_field(_('Tags'),"tasks[#{task.id}][task][tag_list]", task.tag_list.to_s, :size => 36, :class => 'tag-list') %>
+      </div>
+    </div>
+
   <% end %>
 </div><!-- class="task_box" -->
@@ -21,11 +21,27 @@
   </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>
+      <%= labelled_select(_('Assigned to')+': ', :filter_responsible, :id, :name, @filter_responsible, [OpenStruct.new(:name => _('All'), :id => nil), OpenStruct.new(:name => _('Unassigned'), :id => -1)] + @responsible_candidates) %>
+    </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,19 +54,24 @@
     <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>
     </ul>
+    <script>
+      jQuery('.tag-list').inputosaurus({
+        autoCompleteSource: <%= "'/myprofile/#{profile.identifier}/cms/search_tags'," %>
+        activateFinalResult : true
+      })
+    </script>
+
     <%= pagination_links(@tasks)%>
     <% button_bar do %>
@@ -11,7 +11,14 @@ development:
   max_upload_size: 5MB
   hours_until_user_activation_check: 72
   exclude_profile_identifier_pattern: index(\..*)?|home(\..*)?
+  api_recaptcha_site_key:      '6LdsWAcTAAAAAChTUUD6yu9fCDhdIZzNd7F53zf-'
+  api_recaptcha_private_key:   '6LdsWAcTAAAAAB6maB_HalVyCc4asDAxPxloIMvY'
+  api_recaptcha_verify_uri:    'https://www.google.com/recaptcha/api/siteverify'  
 test:
 production:
+  api_recaptcha_site_key:      '6LcLPAcTAAAAAKsd0bxY_TArhD_A7OL19SRCW7_i'
+  api_recaptcha_private_key:   '6LcLPAcTAAAAAE36SN1M2w1I7Hn8upwXYZ_YQZ5-'
+  api_recaptcha_verify_uri:    'https://www.google.com/recaptcha/api/siteverify'
+  
 \ No newline at end of file
@@ -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
@@ -0,0 +1,7 @@
+class AddResponsibleToTask < ActiveRecord::Migration
+
+  def change
+    add_column :tasks, :responsible_id, :integer
+  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"
@@ -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"
 require 'grape'
 #require 'rack/contrib'
+
 Dir["#{Rails.root}/lib/noosfero/api/*.rb"].each {|file| require file unless file =~ /api\.rb/}
 module Noosfero
   module API
     class API < Grape::API
       use Rack::JSONP
-
-      logger = Logger.new(File.join(Rails.root, 'log', "#{ENV['RAILS_ENV'] || 'production'}_api.log"))
-      logger.formatter = GrapeLogging::Formatters::Default.new
-      use RequestLogger, { logger: logger }
-
-      rescue_from :all do |e|
-        logger.error e
+      
+      @@NOOSFERO_CONF = nil
+      
+      def self.NOOSFERO_CONF
+        if @@NOOSFERO_CONF 
+          @@NOOSFERO_CONF
+        else
+          file = Rails.root.join('config', 'noosfero.yml')
+          @@NOOSFERO_CONF = File.exists?(file) ? YAML.load_file(file)[Rails.env] || {} : {}
+        end    
       end
       before { setup_multitenancy }
@@ -22,9 +26,9 @@ module Noosfero
       prefix "api"
       format :json
       content_type :txt, "text/plain"
-  
+      
       helpers APIHelpers
-  
+
       mount V1::Articles
       mount V1::Comments
       mount V1::Users
@@ -33,7 +37,7 @@ module Noosfero
       mount V1::Enterprises
       mount V1::Categories
       mount Session
-  
+
       # hook point which allow plugins to add Grape::API extensions to API::API
       #finds for plugins which has api mount points classes defined (the class should extends Grape::API)
       @plugins = Noosfero::Plugin.all.map { |p| p.constantize }
@@ -102,7 +102,21 @@ module Noosfero
         end
         attrs
       end
-      
+
+      def verify_recaptcha_v2(remote_ip, g_recaptcha_response, private_key, api_recaptcha_verify_uri)
+        verify_hash = {
+          "secret"    => private_key,
+          "remoteip"  => remote_ip,
+          "response"  => g_recaptcha_response
+        }
+        uri = URI(api_recaptcha_verify_uri)
+        https = Net::HTTP.new(uri.host, uri.port)
+        https.use_ssl = true
+        request = Net::HTTP::Post.new(uri.path)
+        request.set_form_data(verify_hash)
+        JSON.parse(https.request(request).body)
+      end
+  
       ##########################################
       #              error helpers             #
       ##########################################
@@ -7,10 +7,10 @@ module Noosfero
       def parameters(response, duration)
         {
           path: request.path,
-          params: request.params.except('password'),
+          params: request.params.to_hash.except('password'),
           method: request.request_method,
           total: (duration * 1000).round(2),
-          db: request.env[:db_duration].round(2),
+          db: @db_duration.round(2),
         }
       end
     end
+require "uri"
+
 module Noosfero
   module API
-  
+
     class Session < Grape::API
-  
+
       # Login to get token
       #
       # Parameters:
@@ -13,13 +15,13 @@ module Noosfero
       #  POST http://localhost:3000/api/v1/login?login=adminuser&password=admin
       post "/login" do
         user ||= User.authenticate(params[:login], params[:password], environment)
-  
+
         return unauthorized! unless user
         user.generate_private_token!
         @current_user = user
         present user, :with => Entities::UserLogin
       end
-  
+
       # Create user.
       #
       # Parameters:
@@ -37,16 +39,20 @@ module Noosfero
         unique_attributes! User, [:email, :login]
         attrs = attributes_for_keys [:email, :login, :password]
         attrs[:password_confirmation] = attrs[:password]
-        user = User.new(attrs)
-        if user.save
+        remote_ip = (request.respond_to?(:remote_ip) && request.remote_ip) || (env && env['REMOTE_ADDR'])
+        private_key = API.NOOSFERO_CONF['api_recaptcha_private_key']
+        api_recaptcha_verify_uri = API.NOOSFERO_CONF['api_recaptcha_verify_uri']
+        captcha_result = verify_recaptcha_v2(remote_ip, params['g-recaptcha-response'], private_key, api_recaptcha_verify_uri)
+        user = User.new(attrs)  
+        if captcha_result["success"] and user.save! 
           user.activate
           user.generate_private_token!
           present user, :with => Entities::UserLogin
         else
-          something_wrong!
+          message = user.errors.to_json
+          render_api_error!(message, 400)
         end
       end
-  
     end
   end
 end
@@ -34,8 +34,8 @@ module Noosfero
             # FIXME verify allowed values
             render_api_error!('Vote value not allowed', 400) unless [-1, 1].include?(value)
             article = find_article(environment.articles, params[:id])
-            Vote.create!(:voteable => article, :voter => nil, :vote => value)
-            {:vote => true}
+            vote = Vote.new(:voteable => article, :voter => current_person, :vote => value)
+            {:vote => vote.save}
           end
           get ':id/children' do
@@ -731,7 +731,7 @@ class Noosfero::Plugin
   def content_actions
     #FIXME 'new' and 'upload' only works for content_remove. It should work for
     #content_expire too.
-    %w[edit delete spread locale suggest home new upload undo]
+    %w[edit delete spread locale suggest home new upload undo clone]
   end
 end
@@ -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
@@ -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
@@ -115,6 +115,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) }
@@ -1217,3 +1217,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);
+    }
+  });
+}
+
@@ -63,3 +63,19 @@
 })(jQuery)
+function change_task_responsible(el) {
+  jQuery.post($(el).data('url'), {task_id: $(el).data('task'),
+                    responsible_id: $(el).val(),
+                    old_responsible_id: $(el).data('old-responsible')}, function(data) {
+    if (data.success) {
+      $(el).effect("highlight");
+      $(el).data('old-responsible', data.new_responsible.id);
+    } else {
+      $(el).effect("highlight", {color: 'red'});
+    }
+    if (data.notice) {
+      display_notice(data.notice);
+    }
+  });
+}
+
@@ -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 {
@@ -17,6 +17,11 @@
   font-size: 120%;
 }
+.task_date {
+  color: gray;
+  font-size: 12px;
+}
+
 .task_icon {
   float: left;
   margin-right: 10px;
@@ -44,3 +49,27 @@
   text-decoration: underline;
   font-weight: bold;
 }
+
+.task_responsible {
+  text-align: right;
+}
+
+/* Task tags list */
+
+.formfieldline label {
+  font-weight: bold;
+  margin: 0 5px 0 10px;
+}
+
+.formfieldline .inputosaurus-container {
+  vertical-align: middle;
+}
+
+.tag-list-fields input {
+  background-color: #fff !important;
+}
+
+.formfield.tag-list-fields .ui-autocomplete-loading {
+  background: url('/images/loading-small.gif') right center no-repeat !important;
+  background-color: #fff !important;
+}
@@ -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])
@@ -80,6 +80,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)
@@ -428,13 +434,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
@@ -458,4 +464,82 @@ class TasksControllerTest &lt; ActionController::TestCase
     post :index, :page => 2
     assert_equal [t4], assigns(:tasks)
   end
+
+  should 'filter tasks by responsible' do
+    Task.stubs(:per_page).returns(3)
+    requestor = fast_create(Person)
+    responsible = fast_create(Person)
+    t1 = Task.create!(:requestor => requestor, :target => profile, :responsible => responsible)
+    t2 = Task.create!(:requestor => requestor, :target => profile, :responsible => responsible)
+    t3 = Task.create!(:requestor => requestor, :target => profile)
+
+    get :index, :filter_responsible => responsible.id
+
+    assert_includes assigns(:tasks), t1
+    assert_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 'do not display responsible assignment if profile is not an organization' do
+    profile = create_user('personprofile').person
+    t1 = Task.create!(:requestor => profile, :target => profile)
+    @controller.stubs(:profile).returns(profile)
+    login_as profile.user.login
+    get :index
+
+    assert_select "#task-#{t1.id}"
+    assert_select '.task_responsible', 0
+  end
+
+  should 'display responsible assignment if profile is an organization' do
+    profile = fast_create(Community)
+    person1 = create_user('person1').person
+    person2 = create_user('person2').person
+    person3 = create_user('person3').person
+    profile.add_admin(person1)
+    profile.add_admin(person2)
+    profile.add_member(person3)
+    Task.create!(:requestor => person3, :target => profile)
+    @controller.stubs(:profile).returns(profile)
+
+    login_as person1.user.login
+    get :index
+    assert_equivalent [person1, person2], assigns(:responsible_candidates)
+    assert_select '.task_responsible'
+  end
+
+  should 'change task responsible' do
+    profile = fast_create(Community)
+    @controller.stubs(:profile).returns(profile)
+    person = create_user('person1').person
+    profile.add_admin(person)
+    task = Task.create!(:requestor => person, :target => profile)
+
+    assert_equal nil, task.responsible
+    login_as person.user.login
+    post :change_responsible, :task_id => task.id, :responsible_id => person.id
+    assert_equal person, task.reload.responsible
+  end
+
+  should 'not change task responsible if old responsible is not the current' do
+    profile = fast_create(Community)
+    @controller.stubs(:profile).returns(profile)
+    person1 = create_user('person1').person
+    person2 = create_user('person2').person
+    profile.add_admin(person1)
+    task = Task.create!(:requestor => person1, :target => profile, :responsible => person1)
+
+    login_as person1.user.login
+    post :change_responsible, :task_id => task.id, :responsible_id => person2.id, :old_responsible => nil
+    assert_equal person1, task.reload.responsible
+    json_response = ActiveSupport::JSON.decode(response.body)
+    assert !json_response['success']
+  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
@@ -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)
@@ -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
@@ -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
@@ -444,6 +444,14 @@ class TaskTest &lt; ActiveSupport::TestCase
     assert t1.ham?
   end
+  should 'be able to assign a responsible to a task' do
+    person = fast_create(Person)
+    task = fast_create(Task)
+    task.responsible = person
+    task.save!
+    assert_equal person, task.responsible
+  end
+
   protected
   def sample_user
 # 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
	@@ -57,4 +57,4 @@ eval(File.read('config/Gemfile'), binding) rescue nil		@@ -57,4 +57,4 @@ eval(File.read('config/Gemfile'), binding) rescue nil
57	# dependencies.	57	# dependencies.
58	Dir.glob('config/plugins/*/Gemfile').each do \|gemfile\|	58	Dir.glob('config/plugins/*/Gemfile').each do \|gemfile\|
59	eval File.read(gemfile)	59	eval File.read(gemfile)
60	-end	60	-end
		61	+end
61	\ No newline at end of file	62	\ No newline at end of file
1	class TasksController < MyProfileController	1	class TasksController < MyProfileController
2		2
3	protect 'perform_task', :profile	3	protect 'perform_task', :profile
4	-	4	+
5	def index	5	def index
6	- @filter_type = params[:filter_type] = params[:filter_type].blank? ? nil : params[:filter_type]
7	- @filter_text = params[:filter_text].blank? ? nil : params[:filter_text]	6	+ @filter_type = params[:filter_type].presence
		7	+ @filter_text = params[:filter_text].presence
		8	+ @filter_responsible = params[:filter_responsible]
8	@task_types = Task.pending_types_for(profile)	9	@task_types = Task.pending_types_for(profile)
9	- @tasks = Task.pending_all(profile,params).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])	10	+
		11	+ @tasks = Task.pending_all(profile, @filter_type, @filter_text).order_by('created_at', 'asc')
		12	+ @tasks = @tasks.where(:responsible_id => @filter_responsible.to_i != -1 ? @filter_responsible : nil) if @filter_responsible.present?
		13	+ @tasks = @tasks.paginate(:per_page => Task.per_page, :page => params[:page])
		14	+
10	@failed = params ? params[:failed] : {}	15	@failed = params ? params[:failed] : {}
		16	+
		17	+ @responsible_candidates = profile.members.by_role(profile.roles.reject {\|r\| !r.has_permission?('perform_task')})
11	end	18	end
12		19
13	def processed	20	def processed
14	@tasks = Task.to(profile).without_spam.closed.sort_by(&:created_at)	21	@tasks = Task.to(profile).without_spam.closed.sort_by(&:created_at)
15	end	22	end
16		23
		24	+ def change_responsible
		25	+ task = profile.tasks.find(params[:task_id])
		26	+
		27	+ if task.responsible.present? && task.responsible.id != params[:old_responsible_id].to_i
		28	+ return render :json => {:notice => _('Task already assigned!'), :success => false, :current_responsible => task.responsible.id}
		29	+ end
		30	+
		31	+ responsible = profile.members.find(params[:responsible_id]) if params[:responsible_id].present?
		32	+ task.responsible = responsible
		33	+ task.save!
		34	+ render :json => {:notice => _('Task responsible successfully updated!'), :success => true, :new_responsible => {:id => responsible.present? ? responsible.id : nil}}
		35	+ end
		36	+
17	VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]	37	VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]
18		38
19	def close	39	def close
20	failed = {}	40	failed = {}
		41	+ save = false
21		42
22	if params[:tasks]	43	if params[:tasks]
23	params[:tasks].each do \|id, value\|	44	params[:tasks].each do \|id, value\|
24	decision = value[:decision]	45	decision = value[:decision]
25	- if request.post? && VALID_DECISIONS.include?(decision) && id && decision != 'skip'	46	+
		47	+ if value[:task].is_a?(Hash) && value[:task][:tag_list]
		48	+
26	task = profile.find_in_all_tasks(id)	49	task = profile.find_in_all_tasks(id)
27	- begin
28	- task.update_attributes(value[:task])
29	- task.send(decision)
30	- rescue Exception => ex
31	- message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
32	- failed[ex.message] ? failed[ex.message] << message : failed[ex.message] = [message]	50	+ task.tag_list = value[:task][:tag_list]
		51	+ value[:task].delete('tag_list')
		52	+
		53	+ save = true
		54	+ end
		55	+
		56	+ if request.post?
		57	+ if VALID_DECISIONS.include?(decision) && id && decision != 'skip'
		58	+ task \|\|= profile.find_in_all_tasks(id)
		59	+ begin
		60	+ task.update_attributes(value[:task])
		61	+ task.send(decision)
		62	+ rescue Exception => ex
		63	+ message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
		64	+ failed[ex.message] ? failed[ex.message] << message : failed[ex.message] = [message]
		65	+ end
		66	+ elsif save
		67	+ task.save!
33	end	68	end
34	end	69	end
35	end	70	end
	@@ -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))
	@@ -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
	@@ -339,6 +339,16 @@ class Environment < ActiveRecord::Base		@@ -339,6 +339,16 @@ class Environment < ActiveRecord::Base
339	self.save!	339	self.save!
340	end	340	end
341		341
		342	+ def enable_all_plugins
		343	+ Noosfero::Plugin.available_plugin_names.each do \|plugin\|
		344	+ plugin_name = plugin.to_s + "Plugin"
		345	+ unless self.enabled_plugins.include?(plugin_name)
		346	+ self.enabled_plugins += [plugin_name]
		347	+ end
		348	+ end
		349	+ self.save!
		350	+ end
		351	+
342	# Disables a feature identified by its name	352	# Disables a feature identified by its name
343	def disable(feature, must_save=true)	353	def disable(feature, must_save=true)
344	self.settings["#{feature}_enabled".to_sym] = false	354	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
	@@ -2,6 +2,8 @@		@@ -2,6 +2,8 @@
2		2
3	<h1><%= _('My Forum') %></h1>	3	<h1><%= _('My Forum') %></h1>
4		4
		5	+<%= required_fields_message %>
		6	+
5	<%= render :file => 'shared/tiny_mce' %>	7	<%= render :file => 'shared/tiny_mce' %>
6		8
7	<%= required f.text_field(:name, :size => '64', :maxlength => 150, :onchange => "updateUrlField(this, 'article_slug')") %>	9	<%= required f.text_field(:name, :size => '64', :maxlength => 150, :onchange => "updateUrlField(this, 'article_slug')") %>
@@ -0,0 +1,69 @@		@@ -0,0 +1,69 @@
	1	+<div<%= user && " class='logged-in'" %>>
	2	+ <div id="article-actions">
	3	+<<<<<<< HEAD
	4	+ <%= fullscreen_buttons('#article') %>
	5	+=======
	6	+
	7	+ <%= fullscreen_buttons('#article') %>
	8	+
	9	+>>>>>>> master
	10	+ <% if @page.allow_edit?(user) && !remove_content_button(:edit, @page) %>
	11	+ <% content = content_tag('span', label_for_edit_article(@page)) %>
	12	+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }) %>
	13	+ <%= expirable_button @page, :edit, content, url %>
	14	+ <% end %>
	15	+
	16	+ <% if @page != profile.home_page && !@page.has_posts? && @page.allow_delete?(user) && !remove_content_button(:delete, @page)%>
	17	+ <% content = content_tag( 'span', _('Delete') ) %>
	18	+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page.id}) %>
	19	+ <% options = {:method => :post, :confirm => delete_article_message(@page)} %>
	20	+ <%= expirable_button @page, :delete, content, url, options %>
	21	+ <% end %>
	22	+
	23	+ <% if @page.allow_spread?(user) && !remove_content_button(:spread, @page) %>
	24	+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %>
	25	+ <%= expirable_button @page, :spread, content_tag( 'span', _('Spread this') ), url, {:class => 'colorbox'} if url %>
	26	+ <% end %>
	27	+
	28	+ <% if !@page.gallery? && (@page.allow_create?(user) \|\| (@page.parent && @page.parent.allow_create?(user))) %>
	29	+ <% if @page.translatable? && !@page.native_translation.language.blank? && !remove_content_button(:locale, @page) %>
	30	+ <% content = _('Add translation') %>
	31	+ <% parent_id = (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)) %>
	32	+ <% url = profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => parent_id, :type => @page.type, :article => { :translation_of_id => @page.native_translation.id })%>
	33	+ <%= expirable_button @page, :locale, content, url %>
	34	+ <% end %>
	35	+
	36	+ <%= 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) %>
	37	+ <% end %>
	38	+
	39	+ <% if @page.accept_uploads? && @page.allow_create?(user) %>
	40	+ <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) unless remove_content_button(:upload, @page)%>
	41	+ <% end %>
	42	+
	43	+ <% if !@page.allow_create?(user) && profile.organization? && (@page.blog? \|\| @page.parent && @page.parent.blog?) && !remove_content_button(:suggest, @page) %>
	44	+ <% content = content_tag( 'span', _('Suggest an article') ) %>
	45	+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}) %>
	46	+ <% options = {:id => 'suggest-article-link'} %>
	47	+ <%= expirable_button @page, :suggest, content, url, options %>
	48	+ <% end %>
	49	+
	50	+ <% if @page.display_versions? %>
	51	+ <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
	52	+ <% end %>
	53	+
	54	+ <% plugins_toolbar_actions_for_article(@page).each do \|plugin_button\| %>
	55	+ <%= button plugin_button[:icon], plugin_button[:title], plugin_button[:url], plugin_button[:html_options] %>
	56	+ <% end %>
	57	+
	58	+ <%= report_abuse(profile, :link, @page) %>
	59	+ </div>
	60	+ <div id="article-header">
	61	+ <% if @page.blog? and !@page.image.nil? %>
	62	+ <div class="blog-cover"><%= image_tag(@page.image.public_filename())%></div>
	63	+ <% end %>
	64	+ <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
	65	+ <%= @plugins.dispatch(:article_header_extra_contents, @page).collect { \|content\| instance_exec(&content) }.join("") %>
	66	+ <%= article_title(@page, :no_link => true) %>
	67	+ <%= article_translations(@page) %>
	68	+ </div>
	69	+</div>
	@@ -4,7 +4,7 @@		@@ -4,7 +4,7 @@
4	<div class='pending-tasks'>	4	<div class='pending-tasks'>
5	<h2><%= _('You have pending requests') %></h2>	5	<h2><%= _('You have pending requests') %></h2>
6	<ul>	6	<ul>
7	- <%= @pending_tasks.map {\|task\| content_tag('li', task_information(task))}.join %>	7	+ <%= @pending_tasks.take(10).map {\|task\| content_tag('li', task_information(task))}.join %>
8	</ul>	8	</ul>
9	<%= button(:todo, _('Process requests'), :controller => 'tasks', :action => 'index') %>	9	<%= button(:todo, _('Process requests'), :controller => 'tasks', :action => 'index') %>
10	</div>	10	</div>
	@@ -2,6 +2,16 @@		@@ -2,6 +2,16 @@
2		2
3	<%= render :partial => 'task_icon', :locals => {:task => task} %>	3	<%= render :partial => 'task_icon', :locals => {:task => task} %>
4		4
		5	+ <% if profile.organization? && @responsible_candidates.present? %>
		6	+ <div class="task_responsible">
		7	+ <span class="label"><%= _('Assign to:') %></span>
		8	+ <span>
		9	+ <% change_responsible_url = url_for :action => :change_responsible, :controller => :tasks %>
		10	+ <%= select_tag "tasks[#{task.id}][responsible]", options_from_collection_for_select(@responsible_candidates, :id, :name, task.responsible.present? ? task.responsible.id : nil), :include_blank => true, :onchange => "change_task_responsible(this);", 'data-old-responsible' => task.responsible.present? ? task.responsible.id : nil, 'data-task' => task.id, 'data-url' => change_responsible_url %>
		11	+ </span>
		12	+ </div>
		13	+ <% end %>
		14	+
5	<div class="task_decisions">	15	<div class="task_decisions">
6	<%=	16	<%=
7	labelled_radio_button(_("Accept"), "tasks[#{task.id}][decision]", 'finish', task.default_decision == 'accept',	17	labelled_radio_button(_("Accept"), "tasks[#{task.id}][decision]", 'finish', task.default_decision == 'accept',
	@@ -22,6 +32,8 @@		@@ -22,6 +32,8 @@
22	%>	32	%>
23	</div><!-- class="task_decisions" -->	33	</div><!-- class="task_decisions" -->
24		34
		35	+ <div class="task_date"><%= show_time(task.created_at) %></div>
		36	+
25	<%= render :partial => 'task_title', :locals => {:task => task} %>	37	<%= render :partial => 'task_title', :locals => {:task => task} %>
26		38
27	<div class="task_information">	39	<div class="task_information">
	@@ -40,6 +52,13 @@		@@ -40,6 +52,13 @@
40	<%= render :partial => partial_for_class(task.class, nil, :reject_details), :locals => {:task => task, :f => f} %>	52	<%= render :partial => partial_for_class(task.class, nil, :reject_details), :locals => {:task => task, :f => f} %>
41	</div>	53	</div>
42	<% end %>	54	<% end %>
		55	+
		56	+ <div class="formfieldline">
		57	+ <div class="formfield tag-list-fields">
		58	+ <%= labelled_text_field(_('Tags'),"tasks[#{task.id}][task][tag_list]", task.tag_list.to_s, :size => 36, :class => 'tag-list') %>
		59	+ </div>
		60	+ </div>
		61	+
43	<% end %>	62	<% end %>
44		63
45	</div><!-- class="task_box" -->	64	</div><!-- class="task_box" -->