Multitask

+ Multi-processing tasks. + Graciously show/hide functions with the smooth slide of + Jquery. ^^ + Using Unobtrusive Javascript. + Customized messages for each task type. + Button "Set all to approve/reject/skip". + Icons related to the task action. * Missing - Need to make selenium tests. (ActionItem1527)

Multitask
+ Multi-processing tasks. + Graciously show/hide functions with the smooth slide of + Jquery. ^^ + Using Unobtrusive Javascript. + Customized messages for each task type. + Button "Set all to approve/reject/skip". + Icons related to the task action. * Missing - Need to make selenium tests. (ActionItem1527)
Rodrigo Souto · Daniela Feitosa
1 parent 4456c409
Showing 69 changed files with 1528 additions and 513 deletions Show diff stats
app/controllers/my_profile/tasks_controller.rb
app/helpers/application_helper.rb
app/models/add_friend.rb
app/models/add_member.rb
app/models/approve_article.rb
app/models/change_password.rb
app/models/community.rb
app/models/create_community.rb
app/models/create_enterprise.rb
app/models/email_activation.rb
app/models/enterprise_activation.rb
app/models/invite_friend.rb
app/models/invite_member.rb
app/models/suggest_article.rb
app/models/task.rb
app/models/task_mailer.rb
app/models/ticket.rb
app/views/pending_task_notifier/notification.rhtml
app/views/profile_editor/_pending_tasks.rhtml
app/views/tasks/_add_friend.rhtml
@@ -4,26 +4,38 @@ class TasksController &lt; MyProfileController
   def index
     @tasks = profile.all_pending_tasks.sort_by(&:created_at)
+    @failed = params ? params[:failed] : {}
   end
   def processed
     @tasks = profile.all_finished_tasks.sort_by(&:created_at)
   end
-  VALID_DECISIONS = [ 'finish', 'cancel' ]
+  VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]
   def close
-    decision = params[:decision]
-    if request.post? && VALID_DECISIONS.include?(decision) && params[:id]
-      task = profile.find_in_all_tasks(params[:id])
-      task.update_attributes(params[:task])
-      begin
-        task.send(decision)
-      rescue Exception => ex
-        session[:notice] = ex.clean_message
+    failed = {}
+
+    params[:tasks].each do |id, value|
+      decision = value[:decision]
+      if request.post? && VALID_DECISIONS.include?(decision) && id && decision != 'skip'
+        task = profile.find_in_all_tasks(id)
+        task.update_attributes!(value[:task])
+        begin
+          task.send(decision)
+        rescue Exception => ex
+          message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
+          failed[ex.clean_message] ? failed[ex.clean_message] << message : failed[ex.clean_message] = [message]
+        end
       end
     end
-    redirect_to :action => 'index'
+
+    if failed.blank?
+      session[:notice] = _("All decisions were applied successfully.")
+    else
+      session[:notice] = _("Some tasks couldn't be applied.")
+    end
+    redirect_to params.merge!(:action => 'index', :failed => failed)
   end
   def new
@@ -279,6 +279,19 @@ module ApplicationHelper
     end
   end
+  def partial_for_task_class(klass, action)
+    if klass.nil?
+      raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
+    end
+
+    name = "#{klass.name.underscore}_#{action.to_s}"
+    if File.exists?(File.join(RAILS_ROOT, 'app', 'views', params[:controller], "_#{name}.rhtml"))
+      name
+    else
+      partial_for_task_class(klass.superclass, action)
+    end
+  end
+
   def user
     @controller.send(:user)
   end
@@ -621,7 +634,16 @@ module ApplicationHelper
   end
   def select_folder(label, object, method, collection, html_options = {}, js_options = {})
-    labelled_form_field(label, select(object, method, collection.map {|f| [ profile.identifier + '/' + f.full_name, f.id ] }, html_options.merge({:include_blank => "#{profile.identifier}"}), js_options))
+    root = profile ? profile.identifier : _("root")
+    labelled_form_field(label, select(object, method,
+                                      collection.map {|f| [ root + '/' + f.full_name, f.id ]},
+                                      {:include_blank => root}, html_options.merge(js_options)))
+  end
+
+  def select_profile_folder(label, object, method, profile, html_options = {}, js_options = {})
+    labelled_form_field(label, select(object, method,
+                                      profile.folders.map {|f| [ profile.identifier + '/' + f.full_name, f.id ]},
+                                      {:include_blank => profile.identifier}, html_options.merge(js_options)))
   end
   def theme_option(opt = nil)
@@ -1094,10 +1116,16 @@ module ApplicationHelper
   end
   def usermenu_logged_in
+    pending_tasks_count = ''
+    if user && user.all_pending_tasks.count > 0
+      pending_tasks_count = link_to(user.all_pending_tasks.count.to_s, '/myprofile/{login}/tasks', :id => 'pending-tasks-count')
+    end
+
     (_('Welcome, %s') % link_to('<i></i><strong>{login}</strong>', '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
     render_environment_features(:usermenu) +
     link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', { :controller => 'admin_panel', :action => 'index' }, :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
     link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +
+    pending_tasks_count +
     link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
   end
@@ -1164,4 +1192,13 @@ module ApplicationHelper
     content_tag(:div, _('Source: %s') % source_url, :id => 'article-source') unless source_url.nil?
   end
+  def task_information(task)
+    values = {}
+    values.merge!({:requestor => link_to(task.requestor.name, task.requestor.public_profile_url)}) if task.requestor
+    values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject
+    values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject
+    values.merge!(task.information[:variables]) if task.information[:variables]
+    task.information[:message] % values
+  end
+
 end
@@ -6,7 +6,7 @@ class AddFriend &lt; Task
   validates_uniqueness_of :target_id, :scope => [ :requestor_id ]
- validates_length_of :group_for_person, :group_for_friend, :maximum => 150, :allow_nil => true
+  validates_length_of :group_for_person, :group_for_friend, :maximum => 150, :allow_nil => true
   alias :person :requestor
   alias :person= :requestor=
@@ -19,17 +19,29 @@ class AddFriend &lt; Task
     requestor.add_friend(target, group_for_person)
   end
-  def description
-    _('%s wants to be your friend.') % requestor.name
-  end
-
   def permission
     :manage_friends
   end
   def target_notification_message
-    description + "\n\n" +
+    _('%{requestor} wants to be your friend.') % {:requestor => requestor.name} + "\n\n" +
     _('You need to login to %{system} in order to accept %{requestor} as your friend.') % { :system => target.environment.name, :requestor => requestor.name }
   end
+  def title
+    _("New friend")
+  end
+
+  def information
+    {:message => _('%{requestor} wants to be your friend.') }
+  end
+
+  def accept_details
+    true
+  end
+
+  def icon
+    {:type => :profile_image, :profile => requestor, :url => requestor.url}
+  end
+
 end
@@ -15,8 +15,20 @@ class AddMember &lt; Task
     target.affiliate(requestor, self.roles.select{|r| !r.to_i.zero? }.map{|i| Role.find(i)})
   end
-  def description
-    _('%s wants to be a member of "%s".') % [requestor.name, organization.name]
+  def title
+    _("New member")
+  end
+
+  def information
+    {:message => _('%{requestor} wants to be a member of this community.')}
+  end
+
+  def accept_details
+    true
+  end
+
+  def icon
+    {:type => :profile_image, :profile => requestor, :url => requestor.url}
   end
   def permission
@@ -24,7 +36,7 @@ class AddMember &lt; Task
   end
   def target_notification_message
-    description + "\n\n" +
+    _('%{requestor} wants to be a member of this community.') % {:requestor => requestor.name} + "\n\n" +
     _('You will need login to %{system} in order to accept or reject %{requestor} as a member of %{organization}.') % { :system => target.environment.name, :requestor => requestor.name, :organization => organization.name }
   end
@@ -3,10 +3,6 @@ class ApproveArticle &lt; Task
   validates_presence_of :requestor_id, :target_id
-  def description
-    _('%{author} wants to publish "%{article}" on %{community}') % { :author => requestor.name, :article => article_title, :community => target.name }
-  end
-
   def article_title
     article ? article.title : _('(The original text was removed)')
   end
@@ -24,7 +20,7 @@ class ApproveArticle &lt; Task
   end
   def name
-    data[:name].blank? ? article.name : data[:name]
+    data[:name].blank? ? (article ? article.name : _("Article removed.")) : data[:name]
   end
   def name= value
@@ -68,7 +64,7 @@ class ApproveArticle &lt; Task
   end
   def abstract
-    data[:abstract].blank? ? article.abstract : data[:abstract]
+    data[:abstract].blank? ? (article ? article.abstract : '') : data[:abstract]
   end
   def body= value
@@ -76,17 +72,63 @@ class ApproveArticle &lt; Task
   end
   def body
-    data[:body].blank? ? article.body : data[:body]
+    data[:body].blank? ? (article ? article.body : "") : data[:body]
   end
   def perform
      article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source)
   end
+  def title
+    _("New article")
+  end
+
+  def icon
+    result = {:type => :defined_image, :src => '/images/icons-app/article-minor.png', :name => name}
+    result.merge({:url => article.url}) if article
+    return result
+  end
+
+  def linked_subject
+    {:text => name, :url => article.url} if article
+  end
+
+  def information
+    if article
+      {:message => _('%{requestor} wants to publish the article: %{linked_subject}.')}
+    else
+      {:message => _("The article was removed.")}
+    end
+  end
+
+  def accept_details
+    true
+  end
+
+  def default_decision
+    if article
+      'skip'
+    else
+      'reject'
+    end
+  end
+
+  def accept_disabled?
+    article.blank?
+  end
+
   def target_notification_message
     return nil if target.organization? && !target.moderated_articles?
-    description + "\n\n" +
+    _('%{requestor} wants to publish the article: %{article}.') % {:requestor => requestor.name, :article => article.name} + "\n\n"
     _('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }
   end
+  def task_finished_message
+    if !closing_statment.blank?
+      _("Your request for publishing the article \"%{article}\" was approved. Here is the comment left by the admin who approved your article:\n\n%{comment} ") % {:article => name, :comment => closing_statment}
+    else
+      _('Your request for publishing the article "%{article}" was approved.') % {:article => name}
+    end
+  end
+
 end
@@ -61,6 +61,18 @@ class ChangePassword &lt; Task
     self[:data] = {}
   end
+  def title
+    _("Change password")
+  end
+
+  def information
+    {:message => _('%{requestor} wants to change its password.')}
+  end
+
+  def icon
+    {:type => :profile_image, :profile => requestor, :url => requestor.url}
+  end
+
   def perform
     user = self.requestor.user
     user.force_change_password!(self.password, self.password_confirmation)
@@ -87,10 +99,6 @@ class ChangePassword &lt; Task
     end
   end
-  def description
-    _('Password change request')
-  end
-
   def environment
     self.requestor.environment
   end
@@ -39,6 +39,10 @@ class Community &lt; Organization
     end
   end
+  def display_name
+    self.name
+  end
+
   def active_fields
     environment ? environment.active_community_fields : []
   end
@@ -48,16 +48,34 @@ class CreateCommunity &lt; Task
     community.add_admin(self.requestor)
   end
-  def description
-    _('%s wants to create community %s.') % [requestor.name, self.name]
+  def title
+    _("New community")
   end
-  def closing_statement
-    data[:closing_statement]
+  def icon
+    src = image ? image.public_filename(:minor) : '/images/icons-app/community-minor.png'
+    {:type => :defined_image, :src => src, :name => name}
   end
-  def closing_statement= value
-    data[:closing_statement] = value
+  def subject
+    name
+  end
+
+  def information
+    if description.blank?
+      { :message => _('%{requestor} wants to create community %{subject} with no description.') }
+    else
+      { :message => _('%{requestor} wants to create community %{subject} with this description:<p><em>%{description}</em></p>'),
+        :variables => {:description => description} }
+    end
+  end
+
+  def reject_details
+    true
+  end
+
+  def display_name
+    self.name
   end
   # tells if this request was rejected
@@ -71,7 +89,6 @@ class CreateCommunity &lt; Task
   end
   def target_notification_message
-    description + "\n\n" +
     _("User \"%{user}\" just requested to create community %{community}. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :user => self.requestor.name, :community => self.name }
   end
@@ -82,7 +99,7 @@ class CreateCommunity &lt; Task
   end
   def task_cancelled_message
-    _("Your request for registering community %{community} at %{environment} was not approved by the environment administrator. The following explanation was given: \n\n%{explanation}") % { :community => self.name, :environment => self.environment, :explanation => self.closing_statement }
+    _("Your request for registering community %{community} at %{environment} was not approved by the environment administrator. The following explanation was given: \n\n%{explanation}") % { :community => self.name, :environment => self.environment, :explanation => self.reject_explanation }
   end
   def task_finished_message
@@ -11,7 +11,7 @@ class CreateEnterprise &lt; Task
   N_('Economic activity')
   N_('Management information')
-  DATA_FIELDS = Enterprise.fields + %w[name identifier region_id reject_explanation]
+  DATA_FIELDS = Enterprise.fields + %w[name identifier region_id]
   serialize :data, Hash
   attr_protected :data
@@ -48,7 +48,6 @@ class CreateEnterprise &lt; Task
   # check for explanation when rejecting
   validates_presence_of :reject_explanation, :if => (lambda { |record| record.status == Task::Status::CANCELLED } )
-
   xss_terminate :only => [ :acronym, :address, :contact_person, :contact_phone, :economic_activity, :legal_form, :management_information, :name ], :on => 'validation'
   def validate
@@ -153,8 +152,24 @@ class CreateEnterprise &lt; Task
     enterprise.add_admin(enterprise.user.person)
   end
-  def description
-    __('Enterprise registration: "%s"') % self.name
+  def title
+    _("Enterprise registration")
+  end
+
+  def icon
+    {:type => :defined_image, :src => '/images/icons-app/enterprise-minor.png', :name => name}
+  end
+
+  def subject
+    name
+  end
+
+  def information
+    {:message => _('%{requestor} wants to create enterprise %{subject}.')}
+  end
+
+  def reject_details
+    true
   end
   def task_created_message
@@ -11,8 +11,20 @@ class EmailActivation &lt; Task
     end
   end
-  def description
-    _("'%{user} wants to activate email '%{email}'") % { :user => person.name, :email => person.email_addresses.join(', ') }
+  def title
+    _("Email activation")
+  end
+
+  def subject
+    person.email_addresses.join(', ')
+  end
+
+  def information
+    {:message => _("%{requestor} wants to activate the following email: %{subject}.")}
+  end
+
+  def icon
+    {:type => :profile_image, :profile => requestor, :url => requestor.url}
   end
   def perform
@@ -20,4 +20,20 @@ class EnterpriseActivation &lt; Task
     self.enterprise.enable(requestor)
   end
+  def title
+    _("Enterprise activation")
+  end
+
+  def linked_subject
+    {:text => target.name, :url => target.public_profile_url}
+  end
+
+  def information
+    {:message => _('%{requestor} wants to activate enterprise %{linked_subject}.')}
+  end
+
+  def icon
+    {:type => :profile_image, :profile => requestor, :url => requestor.url}
+  end
+
 end
@@ -7,8 +7,20 @@ class InviteFriend &lt; Invitation
     friend.add_friend(person, group_for_friend)
   end
-  def description
-    _('%s invited you to join %s') % [person.name, person.environment.name]
+  def title
+    _("New friend")
+  end
+
+  def information
+    {:message => _('%{requestor} wants to be your friend.')}
+  end
+
+  def accept_details
+    true
+  end
+
+  def icon
+    {:type => :profile_image, :profile => requestor, :url => requestor.url}
   end
   def permission
@@ -15,8 +15,24 @@ class InviteMember &lt; Invitation
     community.add_member(friend)
   end
-  def description
-    _('%s invited you to join the community %s') % [person.name, community.name]
+  def title
+    _("Community invitation")
+  end
+
+  def linked_subject
+    {:text => community.name, :url => community.public_profile_url}
+  end
+
+  def information
+    {:message => _('%{requestor} invited you to join %{linked_subject}.')}
+  end
+
+  def url
+    community.url
+  end
+
+  def icon
+    {:type => :profile_image, :profile => community, :url => community.url}
   end
   def expanded_message
@@ -7,10 +7,6 @@ class SuggestArticle &lt; Task
   validates_presence_of :target_id, :article_name, :email, :name, :article_body
-  def description
-    _('%{sender} suggested to publish "%{article}" on %{community}') % { :sender => sender, :article => article_name, :community => target.name }
-  end
-
   settings_items :email, :type => String
   settings_items :name, :type => String
   settings_items :article_name, :type => String
@@ -39,8 +35,30 @@ class SuggestArticle &lt; Task
     )
   end
+  def title
+    _("Article suggestion")
+  end
+
+  def subject
+    article_name
+  end
+
+  def information
+    { :message => _('%{sender} suggested the publication of the article: %{subject}.'),
+      :variables => {:sender => sender} }
+  end
+
+  def accept_details
+    true
+  end
+
+  def icon
+    result = {:type => :defined_image, :src => '/images/icons-app/article-minor.png', :name => article_name}
+  end
+
   def target_notification_message
-    description + "\n\n" +
+    _('%{sender} suggested the publication of the article: %{article}.') %
+    {:sender => sender, :article => article_name} + "\n\n" +
     _('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }
   end
@@ -11,6 +11,8 @@
 # will need to declare <ttserialize</tt> itself).
 class Task < ActiveRecord::Base
+  acts_as_having_settings :field => :data
+
   module Status
     # the status of tasks just created
     ACTIVE = 1
@@ -86,6 +88,14 @@ class Task &lt; ActiveRecord::Base
   def after_finish
   end
+  def reject_explanation=(reject_explanation='')
+    self.data[:reject_explanation] = reject_explanation
+  end
+
+  def reject_explanation
+    self.data[:reject_explanation]
+  end
+
   # this method cancels the task. At the end a message (as returned by
   # #cancel_message) is sent to the requestor with #notify_requestor.
   def cancel
@@ -101,13 +111,50 @@ class Task &lt; ActiveRecord::Base
     end
   end
+  # Here are the tasks customizable options.
-  # Returns the description of the task.
-  #
-  # This method +must+ be overriden in subclasses to return something
-  # meaningful for each kind of task  
-  def description
-    _('Generic task')
+  def title
+    _("Task")
+  end
+
+  def subject
+    nil
+  end
+
+  def linked_subject
+    nil
+  end
+
+  def information
+    {:message => _('%{requestor} sent you a task.')}
+  end
+
+  def accept_details
+    false
+  end
+
+  def reject_details
+    false
+  end
+
+  def icon
+    {:type => :defined_image, :src => "/images/icons-app/user-minor.png", :name => requestor.name, :url => requestor.url}
+  end
+
+  def default_decision
+    'skip'
+  end
+
+  def accept_disabled?
+    false
+  end
+
+  def reject_disabled?
+    false
+  end
+
+  def skip_disabled?
+    false
   end
   # The message that will be sent to the requestor of the task when the task is
@@ -17,7 +17,7 @@ class TaskMailer &lt; ActionMailer::Base
     url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.url.merge(:controller => 'tasks', :action => 'index'))
     from self.class.generate_from(task)
-    subject '[%s] %s' % [task.environment.name, task.description]
+    subject '[%s] %s' % [task.environment.name, task.information]
     body :target => task.target.name,
       :message => msg,
       :environment => task.environment.name,
@@ -32,7 +32,7 @@ class TaskMailer &lt; ActionMailer::Base
     recipients task.friend_email
     from self.class.generate_from(task)
-    subject '[%s] %s' % [ task.requestor.environment.name, task.description ]
+    subject '[%s] %s' % [ task.requestor.environment.name, task.information ]
     body :message => msg
   end
@@ -52,7 +52,7 @@ class TaskMailer &lt; ActionMailer::Base
     recipients task.requestor.notification_emails
     from self.class.generate_from(task)
-    subject '[%s] %s' % [task.requestor.environment.name, task.description]
+    subject '[%s] %s' % [task.requestor.environment.name, task.information]
     body :requestor => task.requestor.name,
       :message => text,
       :environment => task.requestor.environment.name,
 class Ticket < Task
   acts_as_having_settings :field => :data
-  settings_items :title, :description, :closing_statment
+  settings_items :title, :message
 end
@@ -11,7 +11,7 @@
 <% pending_tasks = @person.pending_tasks_for_organization(organization) %>
 <%= _("%s has %d pending task(s).") % [organization.name, pending_tasks.size] %>
-<%= pending_tasks.map{|i| " * #{i.description}"}.join("\n") %>
+<%= pending_tasks.map{|i| " * #{i.information}"}.join("\n") %>
 <%= _("Click in address below to process task(s):") %>
+<%= stylesheet_link_tag 'tasks' %>
+
 <% unless @pending_tasks.empty? %>
   <div class='pending-tasks'>
     <h2><%= _('You have pending requests') %></h2>
     <ul>
-      <%= @pending_tasks.map {|item| content_tag('li', item.description)} %>
+      <%= @pending_tasks.map {|task| content_tag('li', task_information(task))} %>
     </ul>
     <%= button(:todo, _('Process requests'), :controller => 'tasks', :action => 'index') %>
   </div>
@@ -1,40 +0,0 @@
-<h2><%= _('New friend')  %></h2>
-
-<%= link_to( profile_image(task.requestor, :minor, :border => 0), task.requestor.public_profile_url ) %>
-
-<%= _('%s wants to be your friend.') %
-    content_tag('strong', link_to( task.requestor.name, task.requestor.public_profile_url ) ) %>
-
-<% form_for('task', task, :url => { :action => 'close', :id => task.id } ) do |f| %>
-
-  <div>
-
-    <%= radio_button_tag(:decision, 'finish', true,
-        :id => "decision-finish-#{task.id}",
-        :onclick => "Element.show('group-for-friend-#{task.id}')") %>
-    <label for="<%= "decision-finish-#{task.id}" %>"><b><%= _('Accept') %></b></label>
-
-    &nbsp; &nbsp;
-
-    <%= radio_button_tag(:decision, 'cancel', false,
-        :id => "decision-cancel-#{task.id}",
-        :onclick => "Element.hide('group-for-friend-#{task.id}')") %>
-    <label for="<%= "decision-cancel-#{task.id}" %>"><b><%= _('Ignore') %></b></label>
-
-    <% content_tag('div', :id => "group-for-friend-#{task.id}", :class => "add-friend-tags") do %>
-      <%= _('Classify your new friend:') %>
-      <%= text_field_with_local_autocomplete("task[group_for_friend]",
-          profile.suggested_friend_groups,
-          {:id => "field-group-for-friend-#{task.id}", :maxlength => 150}) %>
-
-      <p class="friend-classify-suggestions">
-        <%= _('Suggestions: %s') % profile.suggested_friend_groups.join(', ') %>
-      </p>
-    <% end %>
-
-  </div>
-
-  <% button_bar do %>
-    <%= submit_button(:ok, _('Ok!')) %>
-  <% end %>
-<% end %>
@@ -0,0 +1,8 @@
+<%=_('Classify your new friend:') +
+text_field_with_local_autocomplete("tasks[#{task.id}][task][group_for_friend]",
+   task.target.suggested_friend_groups,
+     {:id => "field-group-for-friend-#{task.id}", :maxlength => 150})
+%>
+<p class="friend-classify-suggestions">
+  <%=_('Suggestions: %s') % task.target.suggested_friend_groups.join(', ') %>
+</p>
@@ -1,38 +0,0 @@
-<h2><%= _('New member')  %></h2>
-
-<%= link_to( profile_image(task.requestor, :minor, :border => 0), task.requestor.public_profile_url ) %>
-
-<%= _('%s wants to be a member of %s.') %
-    [content_tag('strong', link_to( task.requestor.name, task.requestor.public_profile_url ) ),
-    content_tag('strong', link_to( task.target.name, task.target.public_profile_url ) )] %>
-
-<% form_for('task', task, :url => { :action => 'close', :id => task.id } ) do |f| %>
-
-  <div>
-    <%= radio_button_tag(:decision, 'finish', true,
-        :id => "decision-finish-#{task.id}",
-        :onclick => "Element.show('group-for-friend-#{task.id}')") %>
-    <label for="<%= "decision-finish-#{task.id}" %>"><b><%= _('Accept') %></b></label>
-
-    &nbsp; &nbsp;
-
-    <%= radio_button_tag(:decision, 'cancel', false,
-        :id => "decision-cancel-#{task.id}",
-        :onclick => "Element.hide('group-for-friend-#{task.id}')") %>
-    <label for="<%= "decision-cancel-#{task.id}" %>"><b><%= _('Ignore') %></b></label>
-
-    <p class="member-classify-suggestions">
-      <%= _('Roles:') %> <br>
-      <% 
-        @roles = task.target.environment.roles.find(:all).select{ |r| r.has_kind?('Profile') }
-      %>
-      <% @roles.each do |r| %>
-        <%= labelled_check_box(r.name, 'task[roles][]', r.id, ( task.target.members.empty? ? true : ( r.id == Profile::Roles.member(r.environment.id).id ) ) ) %><br/>
-      <% end %>
-    </p>
-  </div>
-
-  <% button_bar do %>
-    <%= submit_button(:ok, _('Ok!')) %>
-  <% end %>
-<% end %>
@@ -0,0 +1,8 @@
+<%= content = _("Roles:")+"<br />"
+roles = Profile::Roles.organization_member_roles(task.target.environment.id)
+roles.each do |role|
+  content += labelled_check_box(role.name, "tasks[#{task.id}][roles][]", role.id, false)+"<br />"
+end
+content_tag('p', content, :class => 'member-classify-suggestion')
+%>
+
@@ -1,43 +0,0 @@
-<h2><%= _('New article')  %></h2>
-
-<% form_for('task', task, :url => { :action => 'close', :id => task.id } ) do |f| %>
-
-  <% if task.article.nil? %>
-    <%= _('%s wanted to publish some content, but this content was deleted and cannot be published anymore.') % content_tag('strong', link_to( task.requestor.name, task.requestor.public_profile_url ) ) %>
-    <%= hidden_field_tag(:decision, 'cancel') %>
-  <% else %>
-    <%= _('%s wants to publish content: %s.') %
-      [content_tag('strong', link_to( task.requestor.name, task.requestor.public_profile_url ) ),
-      content_tag('strong', link_to( task.article.name, task.article.url ) )] %>
-
-    <div>
-      <%= radio_button_tag(:decision, 'finish', true,
-        :id => "decision-finish-#{task.id}",
-        :onclick => "Element.show('group-for-friend-#{task.id}')") %>
-      <label for="<%= "decision-finish-#{task.id}" %>"><b><%= _('Accept') %></b></label>
-
-     &nbsp; &nbsp;
-
-      <%= radio_button_tag(:decision, 'cancel', false,
-          :id => "decision-cancel-#{task.id}",
-          :onclick => "Element.hide('group-for-friend-#{task.id}')") %>
-      <label for="<%= "decision-cancel-#{task.id}" %>"><b><%= _('Ignore') %></b></label>
-
-      <%= labelled_form_field _('Name for publishing'), f.text_field(:name, :style => 'width:80%;') %>
-
-      <%= select_folder(_('Select the folder where the article must be published'), 'task', 'article_parent_id', task.target.folders) %>
-      <div>
-        <%= f.check_box(:highlighted) %>
-        <label for="article_highlighted"><%= _('Highlight this article')%></label>
-      </div>
-
-      <%= labelled_form_field _('Comment for author'), f.text_field(:closing_statment, :style => 'width:80%;') %>
-      <%= render :partial => partial_for_class(task.article.class), :locals => { :f => f } %>
-
-    </div>
-  <% end %>
-
-  <% button_bar do %>
-    <%= submit_button(:ok, _('Ok!')) %>
-  <% end %>
-<% end %>
@@ -0,0 +1,14 @@
+<%= labelled_form_field(_('Name for publishing'), f.text_field(:name)) %>
+<%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task]", 'article_parent_id', task.target) %>
+<%= labelled_form_field(_('Highlight this article'), f.check_box(:highlighted)) %>
+
+<div>
+  <%= labelled_form_field(_('Lead'), f.text_area(:abstract, :style => 'width: 482px; height: 200px;')) %>
+</div>
+<em><%= _('Used when a short version your text is needed.') %></em>
+
+<div style="margin-top: 10px;">
+  <%= labelled_form_field(_('Text'), f.text_area(:body, :style => 'width:482px; height: 500px;')) %>
+</div>
+<%= labelled_form_field _('Comment for author'), f.text_field(:closing_statment, :style => 'width: 488px;') %>
+
@@ -1,47 +0,0 @@
-<h2><%= _('New community')  %></h2>
-
-<%= link_to( profile_image(task.requestor, :minor, :border => 0), task.requestor.public_profile_url ) %>
-
-<%= _('%s wants to create community %s.') %
-    [content_tag('strong', link_to( task.requestor.name, task.requestor.public_profile_url ) ),
-    content_tag('strong', task.name )] %>
-
-<% form_for('task', task, :url => { :action => 'close', :id => task.id } ) do |f| %>
-
-  <div>
-    <% if !Profile.is_available?(task.name.to_slug, environment) %>
-      <p><b><%= _('This name was already taken, this community cannot be approved') %></b></p>
-      <%= hidden_field_tag(:decision, 'cancel') %>
-    <% else %>
-      <%= radio_button_tag(:decision, 'finish', true,
-                           :id => "decision-finish-#{task.id}",
-                           :onclick => "hide_closing_statement_area(#{task.id})") %>
-          <label for="<%= "decision-finish-#{task.id}" %>"><b><%= _('Approve') %></b></label>
-
-      &nbsp; &nbsp;
-
-      <%= radio_button_tag(:decision, 'cancel', false,
-                           :id => "decision-cancel-#{task.id}",
-                           :onclick => "show_closing_statement_area(#{task.id})") %>
-      <label for="<%= "decision-cancel-#{task.id}" %>"><b><%= _('Reject') %></b></label>
-    <% end %>
-
-    <script type='text/javascript'>
-      function show_closing_statement_area(id) {
-        $('task-closing-statement-' + id).show();
-      }
-      function hide_closing_statement_area(id) {
-        $('task-closing-statement-' + id).hide();
-      }
-    </script>
-
-    <div style='display:none' id=<%= "task-closing-statement-#{task.id}" %>  >
-      <%= labelled_form_field _('Please provide an explanation for the rejection'), f.text_area(:closing_statement, :style => 'height:200px; width:80%;') %>
-    </div>
-
-  </div>
-
-  <% button_bar do %>
-    <%= submit_button(:ok, _('Ok!')) %>
-  <% end %>
-<% end %>
@@ -0,0 +1,2 @@
+<%= required labelled_form_field(_('Rejection explanation'), f.text_area(:reject_explanation, :rows => 5)) %>
+
@@ -1 +0,0 @@
-<%= render :partial => 'add_friend', :locals => {:task => task} %>
@@ -0,0 +1 @@
+_add_friend_accept_details.rhtml
 \ No newline at end of file
@@ -1,29 +0,0 @@
-<h2><%= _('Join community')  %></h2>
-
-<%= link_to( profile_image(task.requestor, :minor, :border => 0), task.requestor.public_profile_url ) %>
-
-<%= _('%s invited you to join the community %s') %
-    [content_tag('strong', link_to( task.requestor.name, task.requestor.public_profile_url ) ),
-    content_tag('strong', link_to( task.community.name, task.community.public_profile_url ) )] %>
-
-<% form_for('task', task, :url => { :action => 'close', :id => task.id } ) do |f| %>
-
-  <div>
-    <%= radio_button_tag(:decision, 'finish', true,
-        :id => "decision-finish-#{task.id}",
-        :onclick => "Element.show('group-for-friend-#{task.id}')") %>
-    <label for="<%= "decision-finish-#{task.id}" %>"><b><%= _('Accept') %></b></label>
-
-    &nbsp; &nbsp;
-
-    <%= radio_button_tag(:decision, 'cancel', false,
-        :id => "decision-cancel-#{task.id}",
-        :onclick => "Element.hide('group-for-friend-#{task.id}')") %>
-    <label for="<%= "decision-cancel-#{task.id}" %>"><b><%= _('Reject') %></b></label>
-
-  </div>
-
-  <% button_bar do %>
-    <%= submit_button(:ok, _('Ok!')) %>
-  <% end %>
-<% end %>
@@ -1,41 +0,0 @@
-<h2><%= _('Processing task: %s') % task.description %></h2>
-
-<%= render :file => 'shared/tiny_mce' %>
-
-<% form_for('task', task, :url => { :action => 'close', :id => task.id}) do |f| %>
-
-
-  <%= labelled_form_field(_("Sent by: "), f.text_field(:name)) %>
-  <p><%= label_tag(_("Email: %s") % task.email) %> </p>
-  <%= required labelled_form_field(_('Title'), f.text_field(:article_name, :size => 50)) %>
-  <%= labelled_form_field(_('Source'), f.text_field(:source_name)) %>
-  <%= labelled_form_field(_("Source URL"), f.text_field(:source)) %>
-
-  <%= select_folder(_('Select the folder where the article must be published'), 'task', 'article_parent_id', task.target.folders) %>
-
-  <br style="clear: both;"/>
-  <%= button :add, _("Lead"), '#', :id => "lead-button", :style => "margin-left: 0px;" %>
-  <em><%= _('Used when a short version your text is needed.') %></em>
-      
-  <div id="article-lead">
-    <%= labelled_form_field(_('Lead'), text_area_tag('task[article_abstract]', task.article_abstract, :style => 'width: 100%; height: 200px;')) %>
-  </div>
-  <div style="margin-top: 10px;">
-    <%= labelled_form_field(_('Text'), text_area_tag('task[article_body]', task.article_body, :style => 'width:100%; height: 500px;')) %>
-  </div>
-
-  <div>
-  <%= labelled_radio_button _('OK'), :decision, 'finish', true, :onclick => "if(this.checked) $('rejection-field-#{task.id}').style.display='none'" %>
-  </div>
-  <div>
-    <%= labelled_radio_button _('Cancel'), :decision, 'cancel', false, :onclick => "if(this.checked) $('rejection-field-#{task.id}').style.display='block'" %>
-  </div>
-
-  <% button_bar do %>
-    <%= submit_button(:ok, _('OK')) %>
-  <% end %>
-
-<% end %>
-
-<%= javascript_include_tag 'article' %>
-
@@ -0,0 +1,18 @@
+<%= render :file => 'shared/tiny_mce' %>
+
+<%= labelled_form_field(_("Sent by: "), f.text_field(:name)) %>
+<p><%= label_tag(_("Email: %s") % task.email) %> </p>
+<%= required labelled_form_field(_('Title'), f.text_field(:article_name, :size => 50)) %>
+<%= labelled_form_field(_('Source'), f.text_field(:source_name)) %>
+<%= labelled_form_field(_("Source URL"), f.text_field(:source)) %>
+
+<%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task]", 'article_parent_id', task.target) %>
+
+<div>
+  <%= labelled_form_field(_('Lead'), f.text_area(:article_abstract, :style => 'width: 482px; height: 200px;')) %>
+</div>
+<em><%= _('Used when a short version your text is needed.') %></em>
+
+<div style="margin-top: 10px;">
+  <%= labelled_form_field(_('Text'), f.text_area(:article_body, :style => 'width:482px; height: 500px;')) %>
+</div>
-<%# a generic task solver %>
-<h2><%= _('Processing task: %s') % task.description %></h2>
+<div class="task_box">
-<% form_for('task', task, :url => { :action => 'close', :id => task.id}) do |f| %>
+  <div class="task_icon">
+    <%
+        icon_info = task.icon
+        if icon_info[:type] == :profile_image
+          icon = profile_image(icon_info[:profile], :minor)
+        elsif icon_info[:type] == :defined_image
+          icon = "<img src='#{icon_info[:src]}' alt='#{icon_info[:name]}' />"
+        end
+      %>
+    <%=
+        if icon_info[:url]
+          link_to(icon, icon_info[:url])
+        else
+          icon
+        end
+      %>
-  <div>
-  <%= labelled_radio_button _('OK'), :decision, 'finish', true, :onclick => "if(this.checked) $('rejection-field-#{task.id}').style.display='none'" %>
-  </div>
-  <div>
-    <%= labelled_radio_button _('Cancel'), :decision, 'cancel', false, :onclick => "if(this.checked) $('rejection-field-#{task.id}').style.display='block'" %>
   </div>
-  <div id="rejection-field-<%= task.id %>" style='display: none'>
-    <%= required labelled_form_field(_('Rejection explanation'), text_area(:task, :reject_explanation, :rows => 5))%>
+  <div class="task_decisions">
+    <%=
+        labelled_radio_button(_("Accept"), "tasks[#{task.id}][decision]", 'finish', task.default_decision == 'accept',
+                              :id => "decision-finish-#{task.id}",
+                              :class => 'task_accept_radio',
+                              :disabled => task.accept_disabled?,
+                              :task_id => "#{task.id}") +
+        labelled_radio_button(_("Reject"), "tasks[#{task.id}][decision]", 'cancel', task.default_decision == 'reject',
+                              :id => "decision-cancel-#{task.id}",
+                              :class => 'task_reject_radio',
+                              :disabled => task.reject_disabled?,
+                              :task_id => "#{task.id}") +
+        labelled_radio_button(_("Skip"), "tasks[#{task.id}][decision]", 'skip', task.default_decision == 'skip',
+                              :id => "decision-skip-#{task.id}",
+                              :class => 'task_skip_radio',
+                              :disabled => task.skip_disabled?,
+                              :task_id => "#{task.id}")
+    %>
+  </div><!-- class="task_decisions" -->
+
+  <strong class="task_title">
+    <%= task.title %>
+  </strong>
+
+  <div class="task_information">
+    <%= task_information(task) %>
   </div>
-  <% button_bar do %>
-    <%= submit_button(:ok, _('OK')) %>
+  <% fields_for "tasks[#{task.id}][task]", task do |f| %>
+    <% if task.accept_details %>
+      <div id="on-accept-information-<%=task.id%>" style="display: none">
+        <%= render :partial => partial_for_task_class(task.class, :accept_details), :locals => {:task => task, :f => f} %>
+      </div>
+    <% end %>
+
+    <% if task.reject_details %>
+      <div id="on-reject-information-<%=task.id%>" style="display: none">
+        <%= render :partial => partial_for_task_class(task.class, :reject_details), :locals => {:task => task, :f => f} %>
+      </div>
+    <% end %>
   <% end %>
-<% end %>
+</div><!-- class="task_box" -->
@@ -0,0 +1 @@
+<%= labelled_form_field(_('Rejection explanation'), f.text_area(:reject_explanation, :rows => 5)) %>
@@ -1,22 +0,0 @@
-<h2><%= _('Processing ticket: %s') % task.title %></h2>
-
-<%= task.description %>
-
-<% form_for('task', task, :url => { :action => 'close', :id => task.id}) do |f| %>
-
-  <%= labelled_form_field(_('Closing statment'), f.text_area(:closing_statment) ) %>
-  
-  <div>
-    <%= radio_button_tag(:decision, 'finish', true) %>
-    <%= _('OK') %>
-  </div>
-  <div>
-    <%= radio_button_tag(:decision, 'cancel', false) %>
-    <%= _('Cancel') %>
-  </div>
-
-  <% button_bar do %>
-    <%= submit_button(:ok, _('OK')) %>
-  <% end %>
-
-<% end %>
-<h1><%= _("%s's pending tasks") % profile.name %></h1>
+<%= stylesheet_link_tag 'tasks' %>
+<h1><%= _("%s's pending tasks") % profile.name %></h1>
 <p>
+
+<% if !@failed.blank? %>
+  <div id="errorExplanation">
+    <% @failed.each do |error, tasks_descriptions|%>
+      <h2> <%= error %></h2>
+      <p><%=_("This error happened with the following tasks: ")%></p>
+      <ul>
+        <% tasks_descriptions.each do |description| %>
+            <li> <%= description %> </li>
+        <% end %>
+      </ul>
+    <% end %>
+  </div>
+<% end %>
+
 <% if @tasks.empty? %>
   <em><%= _('No pending tasks for %s') % profile.name %></em>
 <% else %>
-  <ul class='task-list'>
-    <% @tasks.each do |item| %>
-      <li class="task-<%= item.class %>"><%= render :partial => partial_for_class(item.class), :locals => { :task => item } %></li>
+  <% form_tag :action => 'close' do%>
+    <% button_bar do %>
+      <%# FiXME button(:edit, _('View my requests'), :action => 'list_requested') %>
+      <%# FIXME button('menu-mail',  _('Send request'), :action => 'new') %>
+      <%= submit_button :save, _("Apply!") %>
+      <%= button(:edit, _('View processed tasks'), :action => 'processed') %>
+      <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
     <% end %>
-  </ul>
+
+    <ul class='task-list'>
+      <p>
+      <%= labelled_select(_("Set all to: "), 'set-decisions', 'downcase', 'to_s', nil, ["","Accept", "Reject", "Skip"], :id => "up-set-all-tasks-to") %>
+      </p>
+      <% @tasks.each do |task| %>
+        <%= render :partial => 'task', :locals => { :task => task } %>
+      <% end %>
+      <p>
+      <%= labelled_select(_("Set all to: "), 'set-decisions', 'downcase', 'to_s', nil, ["","Accept", "Reject", "Skip"], :id => "down-set-all-tasks-to") %>
+      </p>
+    </ul>
+
+    <% button_bar do %>
+      <%# FiXME button(:edit, _('View my requests'), :action => 'list_requested') %>
+      <%# FIXME button('menu-mail',  _('Send request'), :action => 'new') %>
+      <%= submit_button :save, _("Apply!") %>
+      <%= button(:edit, _('View processed tasks'), :action => 'processed') %>
+      <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
+    <% end %>
+  <% end %>
 <% end %>
 </p>
-<% button_bar do %>
-  <%= button(:edit, _('View processed tasks'), :action => 'processed') %>
-  <%# FiXME button(:edit, _('View my requests'), :action => 'list_requested') %>
-  <%# FIXME button('menu-mail',  _('Send request'), :action => 'new') %>
-  <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
-<% end %>
+
+<%= javascript_include_tag 'tasks' %>
@@ -3,7 +3,7 @@
 <ul>
   <% @tasks.each do |task| %>
     <li>
-      <strong><%= task.respond_to?(:title) ? link_to( task.title, :action => 'ticket_details', :id => task.id) : task.description %></strong><br/>
+      <strong><%= task.respond_to?(:title) ? link_to( task.title, :action => 'ticket_details', :id => task.id) : task.information %></strong><br/>
       <small>
         <%= _('Created:') + ' ' + show_date(task.created_at) %>
         &nbsp; &#151; &nbsp;
@@ -9,7 +9,7 @@
   <% end %>
   <%= hidden_field_tag 'ticket[target_type]', 'Profile' %>
   <%= f.text_field :title, :style => 'width:80%;' %>
-  <%= f.text_area :description, :style => 'height:200px; width:80%;' %>
+  <%= f.text_area :message, :style => 'height:200px; width:80%;' %>
   <% button_bar do %>
     <%= submit_button(:ok, _('Send'), :cancel => {:action => 'index'}) %>
@@ -7,7 +7,7 @@
   <ul>
     <% @tasks.each do |item| %>
       <li>
-        <strong><%= item.description %></strong> <br/>
+        <strong><%= item.information %></strong> <br/>
         <small>
           <%= _('Created:')   +' '+ show_date(item.created_at) %>
           &nbsp; &#151; &nbsp;
@@ -28,7 +28,8 @@ Feature: approve article
     And I go to Sample Community's control panel
     And I follow "Process requests"
     And I fill in "Text" with "This is an article edited"
-    And I press "Ok!"
+    And I choose "Accept"
+    And I press "Apply!"
     And I go to Sample Community's sitemap
     When I follow "Sample Article"
     Then I should see "This is an article edited"
@@ -51,8 +51,8 @@ Feature: create community
     And I go to the Control panel
     And I follow "Process requests"
     And I should see "admin_user wants to create community Community for approval"
-    And I choose "Approve"
-    When I press "Ok!"
+    And I choose "Accept"
+    When I press "Apply!"
     Then I should not see "admin_user wants to create community Community for approval"
     When I go to the Control panel
     And I follow "Manage my groups"
@@ -66,7 +66,7 @@ Feature: create community
     And I follow "Process requests"
     And I should see "admin_user wants to create community Community for approval"
     And I choose "Reject"
-    When I press "Ok!"
+    When I press "Apply!"
     Then I should not see "admin_user wants to create community Community for approval"
     When I go to the Control panel
     And I follow "Manage my groups"
@@ -89,12 +89,3 @@ Feature: create community
     When I go to the Control panel
     And I follow "Manage my groups"
     Then I should not see "Community for approval"
-
-  Scenario: environment admin accepts new community task but identifier was already taken
-    Given I am logged in as admin
-    And feature "admin_must_approve_new_communities" is enabled on environment
-    And I create community "Community for approval"
-    And I create community "Community for approval"
-    When I approve community "Community for approval"
-    Then I should see "This name was already taken, this community cannot be approved"
-    And I should see "admin_user wants to create community Community for approval"
@@ -93,7 +93,7 @@ Feature: invitation
     Given there are no pending jobs
     When I am logged in as "josesantos"
     And I go to the Control panel
-    And I should see "josesilva invited you to join the community 26 Bsslines"
+    And I should see "josesilva invited you to join 26 Bsslines."
   Scenario: noosfero user accepts to join community
     Given I invite email "santos@invalid.br" to join community "26 Bsslines"
@@ -101,10 +101,10 @@ Feature: invitation
     When I am logged in as "josesantos"
     And I go to the Control panel
     And I follow "Process requests"
-    And I should see "josesilva invited you to join the community 26 Bsslines"
+    And I should see "josesilva invited you to join 26 Bsslines."
     And I choose "Accept"
-    When I press "Ok!"
-    Then I should not see "josesilva invited you to join the community 26 Bsslines"
+    When I press "Apply!"
+    Then I should not see "josesilva invited you to join 26 Bsslines."
     When I go to the Control panel
     And I follow "Manage my groups"
     Then I should see "26 Bsslines"
@@ -115,10 +115,10 @@ Feature: invitation
     When I am logged in as "josesantos"
     And I go to the Control panel
     And I follow "Process requests"
-    And I should see "josesilva invited you to join the community 26 Bsslines"
+    And I should see "josesilva invited you to join 26 Bsslines."
     And I choose "Reject"
-    When I press "Ok!"
-    Then I should not see "josesilva invited you to join the community 26 Bsslines"
+    When I press "Apply!"
+    Then I should not see "josesilva invited you to join 26 Bsslines."
     When I go to the Control panel
     And I follow "Manage my groups"
     Then I should not see "26 Bsslines"
@@ -135,7 +135,7 @@ Feature: invitation
     When I am logged in as "josesantos"
     And I go to the Control panel
     And I follow "Process requests"
-    And I should see "josesilva wants to be your friend."
+    Then I should see "josesilva wants to be your friend."
   Scenario: noosfero user accepts to be friend
     Given I invite email "santos@invalid.br" to be my friend
@@ -145,7 +145,7 @@ Feature: invitation
     And I follow "Process requests"
     And I should see "josesilva wants to be your friend."
     And I choose "Accept"
-    When I press "Ok!"
+    When I press "Apply!"
     And I should not see "josesilva wants to be your friend."
     When I go to the Control panel
     And I follow "Manage friends"
@@ -158,8 +158,8 @@ Feature: invitation
     And I go to the Control panel
     And I follow "Process requests"
     And I should see "josesilva wants to be your friend."
-    And I choose "Ignore"
-    When I press "Ok!"
+    And I choose "Reject"
+    When I press "Apply!"
     And I should not see "josesilva wants to be your friend."
     When I go to the Control panel
     And I follow "Manage friends"
@@ -95,6 +95,33 @@ Feature: publish article
     When I go to Another Community2's sitemap
     Then I should see "Sample Article"
+  Scenario: publishing articles with the same name in a moderated community
+    Given I am logged in as "joaosilva"
+    And "Joao Silva" is a member of "Sample Community"
+    And "Joao Silva" is admin of "Sample Community"
+    And I am on Sample Community's control panel
+    And I follow "Community Info and settings"
+    And I choose "profile_data_moderated_articles_true"
+    And I press "Save"
+    And I am on Joao Silva's control panel
+    And I follow "Manage Content"
+    And I follow "Spread"
+    And I check "Sample Community"
+    And I press "Spread this"
+    And I am on Joao Silva's control panel
+    And I follow "Manage Content"
+    And I follow "Spread"
+    And I check "Sample Community"
+    And I press "Spread this"
+    And I am on Sample Community's control panel
+    And I follow "Tasks"
+    And I choose "Accept"
+    And I press "Apply!"
+    And I should not see "The title (article name) is already being used by another article, please use another title."
+    And I choose "Accept"
+    When I press "Apply!"
+    Then I should see "The title (article name) is already being used by another article, please use another title."
+
   Scenario: ask to publish an article that was deleted before approval
     Given I am logged in as "joaosilva"
     And "Joao Silva" is admin of "Sample Community"
@@ -110,6 +137,6 @@ Feature: publish article
     And "joaosilva" has no articles
     And I am on Sample Community's control panel
     When I follow "Tasks"
-    Then I should see /Joao Silva wanted.*deleted/
-    And I press "Ok!"
-    Then I should not see /Joao Silva wanted.*deleted/
+    Then I should see "The article was removed."
+    And I press "Apply!"
+    Then I should not see "The article was removed."
@@ -94,9 +94,10 @@ Feature: register enterprise
     And I am logged in as admin
     And I go to the Control panel
     When I follow "Tasks"
-    Then I should see /Processing task: Enterprise registration: "My Enterprise"/
+    Then I should see "Joao Silva wants to create enterprise My Enterprise."
     And the first mail is to admin_user@example.com
-    And I press "Ok"
+    And I choose "Accept"
+    And I press "Apply!"
     Then the last mail is to joaosilva@example.com
     And I am logged in as "joaosilva"
     And I am on Joao Silva's control panel
@@ -120,11 +121,11 @@ Feature: register enterprise
     And I am logged in as admin
     And I go to the Control panel
     When I follow "Tasks"
-    Then I should see /Processing task: Enterprise registration: "My Enterprise"/
+    Then I should see "Joao Silva wants to create enterprise My Enterprise."
     And the first mail is to admin_user@example.com
-    And I choose "Cancel"
+    And I choose "Reject"
     And I fill in "Rejection explanation" with "This enterprise has some irregularities."
-    When I press "Ok"
+    And I press "Apply!"
     Then the last mail is to joaosilva@example.com
     And I am logged in as "joaosilva"
     And I am on Joao Silva's control panel
@@ -157,9 +158,9 @@ Feature: register enterprise
     Then I should see "Enterprise registration completed"
     And I am on Validator's control panel
     When I follow "Tasks"
-    Then I should see /Processing task: Enterprise registration: "My Enterprise"/
-    And I choose "Ok"
-    And I press "Ok"
+    Then I should see "Joao Silva wants to create enterprise My Enterprise."
+    And I choose "Accept"
+    And I press "Apply!"
     And I am on Joao Silva's control panel
     When I follow "Manage my groups"
     Then I should see "My Enterprise"
@@ -190,10 +191,10 @@ Feature: register enterprise
     Then I should see "Enterprise registration completed"
     And I am on Validator's control panel
     When I follow "Tasks"
-    Then I should see /Processing task: Enterprise registration: "My Enterprise"/
-    And I choose "Cancel"
+    Then I should see "Joao Silva wants to create enterprise My Enterprise."
+    And I choose "Reject"
     And I fill in "Rejection explanation" with "This enterprise has some irregularities."
-    And I press "Ok"
+    And I press "Apply"
     And I am on Joao Silva's control panel
     When I follow "Manage my groups"
     Then I should not see "My Enterprise"
@@ -11,7 +11,7 @@ Given /^I approve community &quot;(.+)&quot;$/ do |community|
    Given 'I go to the Control panel'
    click_link('Process requests')
    choose("decision-finish-#{task.id}")
-   click_button('OK!')
+   click_button('Apply!')
 end
 Given /^I reject community "(.+)"$/ do |community|
@@ -19,5 +19,5 @@ Given /^I reject community &quot;(.+)&quot;$/ do |community|
    Given 'I go to the Control panel'
    click_link('Process requests')
    choose("decision-cancel-#{task.id}")
-   click_button('OK!')
+   click_button('Apply!')
 end
@@ -0,0 +1,788 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="900"
+   inkscape:export-xdpi="900"
+   inkscape:export-filename="article.png"
+   sodipodi:docname="article-icon.svg"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="50"
+   width="50"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4248">
+      <stop
+         style="stop-color:#ffcc00;stop-opacity:1"
+         offset="0"
+         id="stop4250" />
+      <stop
+         style="stop-color:#d40000;stop-opacity:1"
+         offset="1"
+         id="stop4252" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective91" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient6719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient6717"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient6715"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <linearGradient
+       id="linearGradient7648"
+       gradientUnits="userSpaceOnUse"
+       x1="21.9326"
+       y1="24.627399"
+       x2="21.9326"
+       y2="7.1090999">
+      <stop
+         offset="0"
+         style="stop-color:#8595bc;stop-opacity:1;"
+         id="stop7650" />
+      <stop
+         offset="1"
+         style="stop-color:#041a3b;stop-opacity:1;"
+         id="stop7652" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4542">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4544" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4546" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       id="aigrd3"
+       cx="20.892099"
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         style="stop-color:#F0F0F0"
+         id="stop15573" />
+      <stop
+         offset="1"
+         style="stop-color:#515151;stop-opacity:1;"
+         id="stop15575" />
+    </radialGradient>
+    <radialGradient
+       id="aigrd2"
+       cx="20.892099"
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         style="stop-color:#F0F0F0"
+         id="stop15566" />
+      <stop
+         offset="1.0000000"
+         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
+         id="stop15568" />
+    </radialGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1.0000000"
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9980597,0,0,1.1091725,4.1760961,-0.6958675)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99004037,0,0,1.1181563,0.71937872,-1.3901395)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0027787,0,0,1.1122543,4.0618664,-0.7125018)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4542"
+       id="radialGradient4548"
+       cx="24.306795"
+       cy="42.07798"
+       fx="24.306795"
+       fy="42.07798"
+       r="15.821514"
+       gradientTransform="matrix(1,0,0,0.284916,0,30.08928)"
+       gradientUnits="userSpaceOnUse" />
+    <inkscape:perspective
+       id="perspective3216"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       r="28.622223"
+       fy="21.208994"
+       fx="25.103651"
+       cy="25.913044"
+       cx="28.347824"
+       gradientTransform="translate(2.0080471e-6,0)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3909"
+       xlink:href="#linearGradient3942"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3942">
+      <stop
+         id="stop3944"
+         offset="0"
+         style="stop-color:#f57900;stop-opacity:0;" />
+      <stop
+         id="stop3946"
+         offset="1"
+         style="stop-color:#cc0000;stop-opacity:1" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask3951">
+      <rect
+         style="color:#000000;fill:url(#linearGradient3955);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3953"
+         width="60.666664"
+         height="60.666664"
+         x="1.6666656"
+         y="1.6666654" />
+    </mask>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3795-2"
+       id="linearGradient3955"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.6666665,0,0,4.6666665,-10.000001,-28.666667)"
+       x1="9.500001"
+       y1="8.5"
+       x2="9.5"
+       y2="12.5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3795-2">
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0"
+         id="stop3797-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3799-3" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3975">
+      <path
+         sodipodi:nodetypes="cssscccsc"
+         id="path3977"
+         d="M 60,32 C 60,47.456 47.456,60 32,60 16.544,60 4,47.456 4,32 4,24.272 7.136,17.272 12.204,12.204 c 5.068,-5.068 13.334459,-23.280923 21.949843,-29.742461 -1.025992,6.66895 0,14.2153844 4.307693,18.52307669 0,0 0,-8.61538459 4.307692,-12.92307669 C 47.07692,0.98461569 50.523074,8.3076924 52.67692,12.172942 55.418861,17.093574 59.999999,22.388434 60,32 z"
+         style="opacity:0.6;color:#000000;fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.30769205;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </clipPath>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter3963"
+       x="-0.28615385"
+       width="1.5723077"
+       y="-0.20666666"
+       height="1.4133333">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="6.676923"
+         id="feGaussianBlur3965" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3878">
+      <path
+         sodipodi:nodetypes="csssssssc"
+         id="path3880"
+         d="m 27.200893,15.993392 c 0,6.150858 -4.991999,11.142858 -11.142856,11.142858 -6.150858,0 -11.142858,-4.992 -11.142858,-11.142858 0,-2.185214 1.714285,-5.954659 1.714285,-7.7142849 0,-8.57142868 5.832926,-12.0000001 10.285715,-12.0000001 1.714286,0 2.493799,1.946371 1.714286,3.42857146 -0.661208,1.25725054 -3.428572,1.71428574 -1.714286,3.42857144 1.212183,1.2121831 6.215414,4.1736984 7.020858,4.9791428 2.016856,2.0168573 3.264856,4.8025713 3.264856,7.8779993 z"
+         style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.71428561;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </clipPath>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter3870"
+       x="-0.29058462"
+       width="1.5811692"
+       y="-0.20441557"
+       height="1.4088312">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.459375"
+         id="feGaussianBlur3872" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3471-4"
+       id="radialGradient2759-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(2.0080471e-6,0)"
+       cx="28.347824"
+       cy="25.913044"
+       fx="25.103651"
+       fy="21.208994"
+       r="28.622223" />
+    <linearGradient
+       id="linearGradient3471-4">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:0;"
+         offset="0"
+         id="stop3473-7" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="1"
+         id="stop3475-8" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask3828">
+      <rect
+         y="1.6666656"
+         x="1.6666653"
+         height="60.666664"
+         width="60.666664"
+         id="rect3830"
+         style="color:#000000;fill:url(#linearGradient3832);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </mask>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3795"
+       id="linearGradient3832"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.6666666,0,0,4.6666666,-10.000001,-28.666667)"
+       x1="8.5"
+       y1="8.5"
+       x2="9.5"
+       y2="12.5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3795">
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0"
+         id="stop3797" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3799" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3471-4"
+       id="radialGradient3416"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(2.0080471e-6,0)"
+       cx="28.347824"
+       cy="25.913044"
+       fx="25.103651"
+       fy="21.208994"
+       r="28.622223" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3942"
+       id="radialGradient3428"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(2.0080471e-6,0)"
+       cx="28.347824"
+       cy="25.913044"
+       fx="25.103651"
+       fy="21.208994"
+       r="28.622223" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3942"
+       id="radialGradient3442"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(2.0080471e-6,0)"
+       cx="28.347824"
+       cy="25.913044"
+       fx="25.103651"
+       fy="21.208994"
+       r="28.622223" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4248"
+       id="radialGradient4254"
+       cx="16.000992"
+       cy="11.373981"
+       fx="16.000992"
+       fy="11.373981"
+       r="9.5902691"
+       gradientTransform="matrix(1.1061205,-0.39028044,0.43577759,1.235069,-6.3491962,4.30218)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="25"
+     inkscape:window-x="0"
+     inkscape:window-height="694"
+     inkscape:window-width="1024"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="false"
+     inkscape:current-layer="layer5"
+     inkscape:cy="25"
+     inkscape:cx="24.886621"
+     inkscape:zoom="8.82"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.25490196"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     fill="#729fcf"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>rich</rdf:li>
+            <rdf:li>text</rdf:li>
+            <rdf:li>document</rdf:li>
+            <rdf:li>pdf</rdf:li>
+            <rdf:li>openoffice</rdf:li>
+            <rdf:li>word</rdf:li>
+            <rdf:li>rtf</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow">
+    <g
+       style="display:inline"
+       transform="matrix(0.02203962,0,0,0.02086758,45.477817,43.162522)"
+       id="g6707">
+      <rect
+         style="opacity:0.40206185;color:#000000;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         id="rect6709"
+         width="1339.6335"
+         height="478.35718"
+         x="-1559.2523"
+         y="-150.69685" />
+      <path
+         style="opacity:0.40206185;color:#000000;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+         id="path6711"
+         sodipodi:nodetypes="cccc" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path6713"
+         d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+         style="opacity:0.40206185;color:#000000;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+    </g>
+  </g>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <rect
+       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1.05215013;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+       id="rect15391"
+       width="35.947849"
+       height="43.947849"
+       x="7.5260749"
+       y="2.5260756"
+       ry="1.2340567" />
+    <rect
+       style="color:#000000;fill:none;stroke:url(#radialGradient15668);stroke-width:1.05609882;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+       id="rect15660"
+       width="33.943901"
+       height="41.943901"
+       x="8.5280485"
+       y="3.528048"
+       ry="0.16052011"
+       rx="0.1543601" />
+    <g
+       transform="translate(1.6464467,-0.0379893)"
+       id="g2270">
+      <g
+         id="g1440"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-miterlimit:4"
+         transform="matrix(0.229703,0,0,0.229703,4.967081,4.244972)">
+        <radialGradient
+           id="radialGradient1442"
+           cx="20.892099"
+           cy="114.5684"
+           r="5.256"
+           fx="20.892099"
+           fy="114.5684"
+           gradientUnits="userSpaceOnUse">
+          <stop
+             offset="0"
+             style="stop-color:#F0F0F0"
+             id="stop1444" />
+          <stop
+             offset="1"
+             style="stop-color:#474747"
+             id="stop1446" />
+        </radialGradient>
+        <path
+           style="stroke:none"
+           d="m 23.428,113.07 c 0,1.973 -1.6,3.572 -3.573,3.572 -1.974,0 -3.573,-1.6 -3.573,-3.572 0,-1.974 1.6,-3.573 3.573,-3.573 1.973,0 3.573,1.6 3.573,3.573 z"
+           id="path1448" />
+        <radialGradient
+           id="radialGradient1450"
+           cx="20.892099"
+           cy="64.567902"
+           r="5.257"
+           fx="20.892099"
+           fy="64.567902"
+           gradientUnits="userSpaceOnUse">
+          <stop
+             offset="0"
+             style="stop-color:#F0F0F0"
+             id="stop1452" />
+          <stop
+             offset="1"
+             style="stop-color:#474747"
+             id="stop1454" />
+        </radialGradient>
+        <path
+           style="stroke:none"
+           d="m 23.428,63.07 c 0,1.973 -1.6,3.573 -3.573,3.573 -1.974,0 -3.573,-1.6 -3.573,-3.573 0,-1.974 1.6,-3.573 3.573,-3.573 1.973,0 3.573,1.6 3.573,3.573 z"
+           id="path1456" />
+      </g>
+      <path
+         style="fill:#4d4d4d;fill-rule:nonzero;stroke:none"
+         d="m 9.9950109,29.952326 c 0,0.453204 -0.3675248,0.820499 -0.8207288,0.820499 -0.4534338,0 -0.8207289,-0.367524 -0.8207289,-0.820499 0,-0.453434 0.3675248,-0.820729 0.8207289,-0.820729 0.453204,0 0.8207288,0.367525 0.8207288,0.820729 z"
+         id="path15570" />
+      <path
+         style="fill:#4d4d4d;fill-rule:nonzero;stroke:none"
+         d="m 9.9950109,18.467176 c 0,0.453204 -0.3675248,0.820729 -0.8207288,0.820729 -0.4534338,0 -0.8207289,-0.367525 -0.8207289,-0.820729 0,-0.453434 0.3675248,-0.820729 0.8207289,-0.820729 0.453204,0 0.8207288,0.367525 0.8207288,0.820729 z"
+         id="path15577" />
+    </g>
+    <path
+       style="opacity:0.1;fill:none;stroke:#000000;stroke-width:1.01333487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 12.506667,4.0973012 0,40.8551318"
+       id="path15672"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.02506876;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 13.512534,4.0125702 0,40.9748958"
+       id="path15674"
+       sodipodi:nodetypes="cc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <rect
+       ry="0.065390877"
+       rx="0.096450485"
+       y="41"
+       x="17"
+       height="1"
+       width="14.000014"
+       id="rect15744"
+       style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible" />
+    <rect
+       style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible"
+       id="rect1768"
+       width="20.000006"
+       height="1"
+       x="17"
+       y="11.000006"
+       rx="0.13778631"
+       ry="0.065390877" />
+    <g
+       transform="matrix(0.58333333,0,0,0.58333333,23.082298,18.666667)"
+       id="g2782">
+      <path
+         sodipodi:nodetypes="cscccss"
+         id="path3991"
+         d="M 16.186589,21.142857 C 10.932592,21.442092 5.8719316,14.98028 8.1220005,8.1219995 9.0674911,5.2401146 13.42857,-1.1428578 16.857142,-3.7142862 c -0.408303,2.6539699 0,5.6571428 1.714286,7.3714286 0,0 0,-3.42857151 1.714285,-5.1428572 1.714286,5.1428572 3.271486,7.9716527 3.942857,9.5953544 2.058215,4.9777654 0.483956,12.5476324 -8.041981,13.0332174 z"
+         style="color:#000000;fill:url(#radialGradient4254);fill-opacity:1;stroke:#a40000;stroke-width:1.71428561;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="-1.5"
+         inkscape:original="M 16.84375 -3.71875 C 13.415178 -1.1473216 9.0704906 5.2431151 8.125 8.125 C 5.8749311 14.983281 10.933503 21.455485 16.1875 21.15625 C 24.713437 20.670665 26.276965 13.102765 24.21875 8.125 C 23.547379 6.5012983 21.995536 3.6428572 20.28125 -1.5 C 18.566965 0.21428569 18.5625 3.65625 18.5625 3.65625 C 16.848214 1.9419642 16.435447 -1.0647801 16.84375 -3.71875 z "
+         xlink:href="#path3991"
+         style="opacity:0.5;color:#000000;fill:none;stroke:#fcaf3e;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:9;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path3997"
+         inkscape:href="#path3991"
+         d="m 15.40625,-0.3125 c -0.903867,0.99041796 -1.796184,2.124373 -2.625,3.28125 -1.575827,2.1995678 -2.8557776,4.5186488 -3.21875,5.625 -1.9553465,5.959958 2.557716,11.288808 6.53125,11.0625 3.8265,-0.217934 5.732916,-1.852251 6.71875,-3.96875 0.985834,-2.116499 0.906542,-4.883117 0.03125,-7 -0.430922,-1.0421792 -1.493333,-3.2862791 -2.65625,-6.21875 -0.07263,0.5661553 -0.125,1.1875 -0.125,1.1875 A 1.50015,1.50015 0 0 1 17.5,4.71875 C 16.13821,3.3569603 15.617625,1.5548002 15.40625,-0.3125 z" />
+    </g>
+    <rect
+       style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible"
+       id="rect3450"
+       width="9.1020555"
+       height="1"
+       x="17"
+       y="22.538467"
+       rx="0.06270691"
+       ry="0.065390877" />
+    <rect
+       style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible"
+       id="rect3464"
+       width="20.000006"
+       height="1"
+       x="17"
+       y="38.692307"
+       rx="0.13778631"
+       ry="0.065390877" />
+    <rect
+       ry="0.065390877"
+       rx="0.13778631"
+       y="13.307699"
+       x="17"
+       height="1"
+       width="20.000006"
+       id="rect3466"
+       style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible" />
+    <rect
+       ry="0.065390877"
+       rx="0.06270691"
+       y="24.846159"
+       x="17"
+       height="1"
+       width="9.1020555"
+       id="rect4256"
+       style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible" />
+    <rect
+       style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible"
+       id="rect4258"
+       width="9.1020555"
+       height="1"
+       x="17"
+       y="27.153851"
+       rx="0.06270691"
+       ry="0.065390877" />
+    <rect
+       style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible"
+       id="rect4262"
+       width="9.1020555"
+       height="1"
+       x="17"
+       y="29.461542"
+       rx="0.06270691"
+       ry="0.065390877" />
+    <rect
+       ry="0.065390877"
+       rx="0.06270691"
+       y="31.769234"
+       x="17"
+       height="1"
+       width="9.1020555"
+       id="rect4264"
+       style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible" />
+    <rect
+       style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible"
+       id="rect4268"
+       width="20.000006"
+       height="1"
+       x="17"
+       y="36.384617"
+       rx="0.13778631"
+       ry="0.065390877" />
+    <rect
+       ry="0.065390877"
+       rx="0.13778631"
+       y="34.076923"
+       x="17"
+       height="1"
+       width="20.000006"
+       id="rect4270"
+       style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible" />
+    <rect
+       ry="0.065390877"
+       rx="0.06270691"
+       y="17.923084"
+       x="17"
+       height="1"
+       width="9.1020555"
+       id="rect4272"
+       style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible" />
+    <rect
+       style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible"
+       id="rect4274"
+       width="9.1020555"
+       height="1"
+       x="17"
+       y="15.615393"
+       rx="0.06270691"
+       ry="0.065390877" />
+    <rect
+       ry="0.065390877"
+       rx="0.06270691"
+       y="20.230776"
+       x="17"
+       height="1"
+       width="9.1020555"
+       id="rect4278"
+       style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible" />
+    <rect
+       ry="0.13078175"
+       rx="0.13778631"
+       y="7"
+       x="17"
+       height="2"
+       width="20.000006"
+       id="rect4280"
+       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:block;overflow:visible" />
+  </g>
+</svg>
@@ -0,0 +1,49 @@
+(function($) {
+
+  $("input.task_accept_radio").click(function(){
+    task_id = this.getAttribute("task_id");
+    $('#on-accept-information-' + task_id).show('fast');
+    $('#on-reject-information-' + task_id).hide('fast');
+    $('#on-skip-information-'   + task_id).hide('fast');
+  })
+
+  $("input.task_reject_radio").click(function(){
+    task_id = this.getAttribute("task_id");
+    $('#on-accept-information-' + task_id).hide('fast');
+    $('#on-reject-information-' + task_id).show('fast');
+    $('#on-skip-information-'   + task_id).hide('fast');
+  })
+
+  $("input.task_skip_radio").click(function(){
+    task_id = this.getAttribute("task_id");
+    $('#on-accept-information-' + task_id).hide('fast');
+    $('#on-reject-information-' + task_id).hide('fast');
+    $('#on-skip-information-'   + task_id).show('fast');
+  })
+
+  // There is probably an elegant way to do this...
+  $('#up-set-all-tasks-to').selectedIndex = 0;
+  $('#down-set-all-tasks-to').selectedIndex = 0;
+
+  $('#down-set-all-tasks-to').change(function(){
+    value = $('#down-set-all-tasks-to').selected().val();
+    up = $('#up-set-all-tasks-to')
+    up.attr('value', value).change();
+  })
+
+  $('#up-set-all-tasks-to').change(function(){
+    value = $('#up-set-all-tasks-to').selected().val();
+    down = $('#down-set-all-tasks-to')
+    down.attr('value', value);
+    $('.task_'+value+'_radio').each( function(){
+      if(!this.disabled){
+        $(this).attr('checked', 'checked').click();
+      }
+    })
+  })
+
+  $('.task_title').css('margin-right', $('.task_decisions').width()+'px');
+  $('.task_title').css('margin-left', $('.task_arrow').width()+'px');
+
+})(jQuery)
+
@@ -305,7 +305,7 @@ div.auto-complete li.selected {
   color: #204A87;
 }
-/* pending tasks list */
+/* pending tasks */
 div.pending-tasks {
   padding: 10px;
@@ -313,6 +313,19 @@ div.pending-tasks {
   margin-bottom: 20px;
 }
+#pending-tasks-count {
+  padding-left: 5px;
+  padding-right: 5px;
+  margin-left: 2px;
+  text-decoration: none;
+  background-color: #F57900;
+  color: #FFFFFF;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  -khtml-border-radius: 2px;
+  border-radius: 2px;
+}
+
 /* sitemap and agenda */
 .agenda-item a.icon,
@@ -0,0 +1,46 @@
+.task_box {
+  position: relative;
+  border: 1px solid #888;
+  -moz-border-radius: 10px;
+  -webkit-border-radius: 10px;
+  -khtml-border-radius: 10px;
+  border-radius: 10px;
+  padding: 6px 4px 9px 4px;
+  margin-top: 5px;
+  background: #EEE;
+}
+
+.task_title {
+  margin: 0px;
+  display: block;
+  line-height: 28px;
+  font-size: 120%;
+}
+
+.task_icon {
+  float: left;
+  margin-right: 10px;
+  width: 50px;
+  height: 50px;
+  text-align: center;
+}
+
+.task_decisions {
+  float: right;
+  padding-right: 5px;
+}
+
+.task_information {
+  line-height: 18px;
+  padding: 2px 0px;
+  clear: right;
+}
+
+.task_information p {
+  margin: 0px;
+}
+
+.task_target {
+  text-decoration: underline;
+  font-weight: bold;
+}
@@ -46,7 +46,7 @@ class TasksControllerTest &lt; Test::Unit::TestCase
   should 'be able to finish a task' do
     t = profile.tasks.build; t.save!
-    post :close, :decision => 'finish', :id => t.id
+    post :close, :tasks => {t.id => {:decision => 'finish', :task => {}}}
     assert_redirected_to :action => 'index'
     t.reload
@@ -56,52 +56,46 @@ class TasksControllerTest &lt; Test::Unit::TestCase
   should 'be able to cancel a task' do
     t = profile.tasks.build; t.save!
-    post :close, :decision => 'cancel', :id => t.id
+    post :close, :tasks => {t.id => {:decision => 'cancel', :task => {}}}
     assert_redirected_to :action => 'index'
     t.reload
     ok('task should be cancelled') { t.status == Task::Status::CANCELLED }
   end
-  should 'affiliate roles to user after finish add member task' do
-    t = AddMember.create!(:person => profile, :organization => profile)
-    count = profile.members.size
-    post :close, :decision => 'finish', :id => t.id
-    profile = Profile.find(@profile.id)
-    assert_equal count + 1, profile.members.size
-  end
+  should 'be able to skip a task' do
+    t = profile.tasks.build; t.save!
-  should 'display custom form to add members task' do
-    t = AddMember.create!(:person => profile, :organization => profile)
-    get :index, :profile => profile.identifier
-    assert_tag :tag => 'form', :attributes => { :action => "/myprofile/#{profile.identifier}/tasks/close/#{t.id}" }
-  end
+    post :close, :tasks => {t.id => {:decision => 'skip', :task => {}}}
+    assert_redirected_to :action => 'index'
-  should 'display member role checked if target has members' do
-    profile.affiliate(profile, Profile::Roles.admin(profile.environment.id))
-    assert_equal 1, profile.members.size
-    t = AddMember.create!(:person => profile, :organization => profile)
-    get :index, :profile => profile.identifier
-    assert_tag :tag => 'input', :attributes => { :name => 'task[roles][]', :checked => 'checked', :value => Profile::Roles.member(profile.environment.id).id }
+    t.reload
+    ok('task should be skipped') { t.status == Task::Status::ACTIVE }
   end
-  should 'display roles besides role member unchecked if target has members' do
-    profile.affiliate(profile, Profile::Roles.admin(profile.environment.id))
-    assert_equal 1, profile.members.size
-    t = AddMember.create!(:person => profile, :organization => profile)
-    get :index, :profile => profile.identifier
-    Role.find(:all).select{ |r| r.has_kind?('Profile') and r.id != Profile::Roles.member(profile.environment.id).id }.each do |i|
-      assert_no_tag :tag => 'input', :attributes => { :name => 'task[roles][]', :checked => 'checked', :value => i.id }
-    end
+  should 'be able to apply different decisions to multiples tasks at the same time' do
+    t1 = profile.tasks.build; t1.save!
+    t2 = profile.tasks.build; t2.save!
+    t3 = profile.tasks.build; t3.save!
+
+    post :close, :tasks => {t1.id => {:decision => 'finish', :task => {}}, t2.id => {:decision => 'cancel', :task => {}}, t3.id => {:decision => 'skip', :task => {}}}
+    assert_redirected_to :action => 'index'
+
+    t1.reload
+    t2.reload
+    t3.reload
+
+    ok('task should be finished') { t1.status == Task::Status::FINISHED }
+    ok('task should be canceled') { t2.status == Task::Status::CANCELLED }
+    ok('task should be skipped')  { t3.status == Task::Status::ACTIVE }
   end
-  should 'display all roles checked if target has no members' do
-    assert_equal 0, profile.members.size
+  should 'affiliate roles to user after finish add member task' do
     t = AddMember.create!(:person => profile, :organization => profile)
-    get :index, :profile => profile.identifier
-    Role.find(:all).select{ |r| r.has_kind?('Profile') }.each do |i|
-      assert_tag :tag => 'input', :attributes => { :name => 'task[roles][]', :checked => 'checked', :value => i.id }
-    end
+    count = profile.members.size
+    post :close, :tasks => {t.id => {:decision => 'finish', :task => {}}}
+    profile = Profile.find(@profile.id)
+    assert_equal count + 1, profile.members.size
   end
   should 'display a create ticket form' do
@@ -161,8 +155,8 @@ class TasksControllerTest &lt; Test::Unit::TestCase
     article = profile.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
     t = ApproveArticle.create!(:name => 'test name', :article => article, :target => c, :requestor => profile)
-    post :close, :decision => 'finish', :id => t.id, :task => { :name => 'new name'}
-    assert_equal article, c.articles.find_by_name('new name').reference_article
+    post :close, :tasks => {t.id => {:decision => 'finish', :task => {:name => 'new_name'}}}
+    assert_equal article, c.articles.find_by_name('new_name').reference_article
   end
   should 'create published article in folder after finish approve article task' do
@@ -174,8 +168,8 @@ class TasksControllerTest &lt; Test::Unit::TestCase
     article = profile.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
     t = ApproveArticle.create!(:name => 'test name', :article => article, :target => c, :requestor => profile)
-    post :close, :decision => 'finish', :id => t.id, :task => { :name => 'new name', :article_parent_id => folder.id}
-    assert_equal folder, c.articles.find_by_name('new name').parent
+    post :close, :tasks => {t.id => {:decision => 'finish', :task => {:name => 'new_name', :article_parent_id => folder.id}}}
+    assert_equal folder, c.articles.find_by_name('new_name').parent
   end
   should 'be highlighted if asked when approving a published article' do
@@ -187,8 +181,8 @@ class TasksControllerTest &lt; Test::Unit::TestCase
     article = profile.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
     t = ApproveArticle.create!(:article => article, :target => c, :requestor => profile)
-    post :close, :decision => 'finish', :id => t.id, :task => { :name => 'new name', :article_parent_id => folder.id, :highlighted => true}
-    assert_equal true, c.articles.find_by_name('new name').highlighted
+    post :close, :tasks => {t.id => {:decision => 'finish', :task => {:name => 'new_name', :article_parent_id => folder.id, :highlighted => true}}}
+    assert_equal true, c.articles.find_by_name('new_name').highlighted
   end
   should 'create article of same class after choosing root folder on approve article task' do
@@ -199,8 +193,8 @@ class TasksControllerTest &lt; Test::Unit::TestCase
     article = profile.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
     t = ApproveArticle.create!(:article => article, :target => c, :requestor => profile)
-    post :close, :decision => 'finish', :id => t.id, :task => { :name => 'new name', :article_parent_id => ""}
-    assert_equal article.class, c.articles.find_by_name('new name').class
+    post :close, :tasks => {t.id => {:decision => 'finish', :task => {:name => 'new_name', :article_parent_id => ""}}}
+    assert_not_nil c.articles.find_by_name('new_name')
   end
   should 'handle blank names for published articles' do
@@ -217,24 +211,24 @@ class TasksControllerTest &lt; Test::Unit::TestCase
     assert_includes c.tasks, a
     assert_difference article.class, :count do
-        post :close, {"commit"=>"Ok!", "id"=> a.id.to_s, "task"=>{"name"=>"", "closing_statment"=>"", "highlighted"=>"0", "article_parent_id"=>c_blog2.id.to_s}, "decision"=>"finish"}
+      post :close, :tasks => {a.id => {:decision => 'finish', :task => {:name => "", :highlighted => "0", :article_parent_id => c_blog2.id.to_s}}}
     end
     assert p_article = article.class.find_by_reference_article_id(article.id)
     assert_includes c_blog2.children(true), p_article
   end
-  should 'cancel an enterprise registration task even if there is an enterprise with the same identifier' do
+  should 'raise error if there is an enterprise with the same identifier and keep the task active' do
     e = Environment.default
     e.add_admin(profile)
     task = CreateEnterprise.create!(:name => "My Enterprise", :identifier => "my-enterprise", :requestor => profile, :target => e)
     enterprise = fast_create(Enterprise, :name => "My Enterprise", :identifier => "my-enterprise")
-    assert_nothing_raised do
-      post :close, {:profile => profile.identifier, :id => task.id, :task => {:reject_explanation => "Bla bla"}, :decision => "cancel"}
+    assert_raise ActiveRecord::RecordInvalid do
+      post :close, :tasks => {task.id => { :task => {:reject_explanation => "Bla bla"}, :decision => "cancel"}}
     end
     task.reload
-    assert_equal Task::Status::CANCELLED, task.status
+    assert_equal Task::Status::ACTIVE, task.status
   end
   should 'create TinyMceArticle article after finish approve suggested article task' do
@@ -245,7 +239,7 @@ class TasksControllerTest &lt; Test::Unit::TestCase
     SuggestArticle.skip_captcha!
     t = SuggestArticle.create!(:article_name => 'test name', :article_body => 'test body', :name => 'some name', :email => 'test@localhost.com', :target => c)
-    post :close, :decision => 'finish', :id => t.id, :task => {}
+    post :close, :tasks => {t.id => { :task => {}, :decision => "finish"}}
     assert_not_nil TinyMceArticle.find(:first)
   end
@@ -265,7 +259,7 @@ class TasksControllerTest &lt; Test::Unit::TestCase
     t.target = c
     t.save!
-    post :close, :decision => 'finish', :id => t.id, :task => {:article_name => 'new article name', :article_body => 'new body', :source => 'http://www.noosfero.com', :source_name => 'new source', :name => 'new name'}
+    post :close, :tasks => {t.id => { :task => {:article_name => 'new article name', :article_body => 'new body', :source => 'http://www.noosfero.com', :source_name => 'new source', :name => 'new name'}, :decision => "finish"}}
     assert_equal 'new article name', TinyMceArticle.find(:first).name
     assert_equal 'new name', TinyMceArticle.find(:first).author_name
     assert_equal 'new body', TinyMceArticle.find(:first).body
@@ -71,15 +71,6 @@ class AddFriendTest &lt; ActiveSupport::TestCase
     task = AddFriend.create!(:person => p1, :friend => p2)
   end
-  should 'provide proper description' do
-    p1 = create_user('testuser1').person
-    p2 = create_user('testuser2').person
-
-    task = fast_create(AddFriend, :requestor_id => p1.id, :target_id => p2.id)
-
-    assert_equal 'testuser1 wants to be your friend.', task.description
-  end
-
   should 'has permission to manage friends' do
     t = AddFriend.new
     assert_equal :manage_friends, t.permission
@@ -49,18 +49,6 @@ class AddMemberTest &lt; ActiveSupport::TestCase
     task = AddMember.create!(:person => p, :organization => c)
   end
-  should 'provide proper description' do
-    p = create_user('testuser1').person
-    c = fast_create(Community, :name => 'closed community')
-    c.update_attribute(:closed, true)
-
-    TaskMailer.stubs(:deliver_target_notification)
-
-    task = fast_create(AddMember, :requestor_id => p.id, :target_id => c.id, :target_type => 'Community')
-
-    assert_equal 'testuser1 wants to be a member of "closed community".', task.description
-  end
-
   should 'has permission to manage members' do
     t = AddMember.new
     assert_equal :manage_memberships, t.permission
@@ -588,6 +588,12 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     assert_equal ["1 for b", "2 for c", "3 for a"], unique_with_count(%w(a b c a c a))
   end
+  should 'show task information with the requestor' do
+    person = create_user('usertest').person
+    task = Task.create(:requestor => person)
+    assert_match person.name, task_information(task)
+  end
+
   protected
   def url_for(args = {})
@@ -62,7 +62,7 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
     article.destroy
     a.reload
-    assert_match /text was removed/, a.description
+    assert_equal "The article was removed.", a.information[:message]
   end
   should 'preserve article_parent' do
@@ -37,7 +37,7 @@ class EmailActivationTest &lt; Test::Unit::TestCase
     task = EmailActivation.create!(:requestor => ze.person, :target => Environment.default)
     task.finish
-    assert_equal ['zezinho@colivre.net'], ActionMailer::Base.deliveries.first.to
+    assert_equal ["zezinho@#{ze.email_domain}"], ActionMailer::Base.deliveries.first.to
   end
   should 'create only once pending task by user' do
@@ -49,11 +49,4 @@ class EmailActivationTest &lt; Test::Unit::TestCase
     assert !anothertask.save
   end
-  should 'display email address on description of task' do
-    ze = create_user('zezinho', :environment_id => Environment.default.id)
-    Environment.default.domains = [Domain.create!(:name => 'env_test.invalid')]
-    task = EmailActivation.new(:requestor => ze.person, :target => Environment.default)
-    assert_match /zezinho@env_test.invalid/, task.description
-  end
-
 end
@@ -105,13 +105,6 @@ class InviteFriendTest &lt; ActiveSupport::TestCase
     task = InviteFriend.create!(:person => p1, :friend => p2)
   end
-  should 'mention inviter in description' do
-    p1 = create_user('testuser1').person
-    task = InviteFriend.new(:person => p1)
-
-    assert_match 'testuser1', task.description
-  end
-
   should 'has permission to manage friends' do
     t = InviteFriend.new
     assert_equal :manage_friends, t.permission
@@ -85,19 +85,6 @@ class InviteMemberTest &lt; ActiveSupport::TestCase
     task = InviteMember.create!(:person => p1, :friend => p2, :community_id => fast_create(Community).id)
   end
-  should 'provide proper description' do
-    p1 = create_user('testuser1').person
-    p2 = create_user('testuser2').person
-
-    TaskMailer.expects(:deliver_task_finished).never
-    TaskMailer.expects(:deliver_task_created).never
-
-    community = fast_create(Community)
-    task = InviteMember.create!(:person => p1, :friend => p2, :community_id => community.id)
-
-    assert_match(/#{p1.name}.*#{community.name}/, task.description)
-  end
-
   should 'not invite yourself' do
     p = create_user('testuser1').person
@@ -23,10 +23,10 @@ class PendingTaskNotifierTest &lt; Test::Unit::TestCase
     p = create_user('maelcum').person
     c = fast_create(Community)
     c.add_admin(p)
-    c.tasks << Task.new
+    c.tasks << Task.new(:requestor => p)
     response = PendingTaskNotifier.deliver_notification(p)
-    assert_match /Generic task/, response.body
+    assert_match /sent you a task/, response.body
   end
   private
@@ -206,7 +206,7 @@ class RssFeedTest &lt; Test::Unit::TestCase
   end
   should 'display the referenced body of a article published' do
-    article = fast_create(TextileArticle, :body => 'This is the content of the Sample Article.')
+    article = fast_create(TextileArticle, :body => 'This is the content of the Sample Article.', :profile_id => fast_create(Person).id)
     profile = fast_create(Profile)
     blog = fast_create(Blog, :profile_id => profile.id)
     a = ApproveArticle.create!(:name => 'test name', :article => article, :target => profile, :requestor => fast_create(Person))
@@ -97,12 +97,6 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
     assert_equal 'http://www.gnu.org/', article.source
   end
-  should 'use sender name in description' do
-    t = build(SuggestArticle, :target => @profile)
-    t.stubs(:sender).returns('XYZ')
-    assert_match(/XYZ/, t.description)
-  end
-
   should 'use name and e-mail as sender info' do
     t = build(SuggestArticle, :target => @profile)
     t.name = 'Some One'
@@ -17,7 +17,7 @@ class TaskMailerTest &lt; Test::Unit::TestCase
     task = Task.new
     task.expects(:task_finished_message).returns('the message')
-    task.expects(:description).returns('the task')
+    task.expects(:information).returns('the task')
     requestor = mock()
     requestor.expects(:notification_emails).returns(['requestor@example.com'])
@@ -40,7 +40,7 @@ class TaskMailerTest &lt; Test::Unit::TestCase
     task = Task.new
     task.expects(:task_cancelled_message).returns('the message')
-    task.expects(:description).returns('the task')
+    task.expects(:information).returns('the task')
     requestor = mock()
     requestor.expects(:notification_emails).returns(['requestor@example.com'])
@@ -64,7 +64,7 @@ class TaskMailerTest &lt; Test::Unit::TestCase
     task = Task.new
     task.expects(:task_created_message).returns('the message')
-    task.expects(:description).returns('the task')
+    task.expects(:information).returns('the task')
     requestor = mock()
     requestor.expects(:notification_emails).returns(['requestor@example.com'])
@@ -85,7 +85,7 @@ class TaskMailerTest &lt; Test::Unit::TestCase
   should 'be able to send a "target notification" message' do
     task = Task.new
-    task.expects(:description).returns('the task')
+    task.expects(:information).returns('the task')
     target = mock()
     target.expects(:notification_emails).returns(['target@example.com'])
@@ -104,18 +104,18 @@ class TaskMailerTest &lt; Test::Unit::TestCase
     assert !ActionMailer::Base.deliveries.empty?
   end
-  should 'be able to send a "invitatiom notification" message' do
+  should 'be able to send a "invitation notification" message' do
     task = InviteFriend.new
-    task.expects(:description).returns('the task')
     task.expects(:code).returns('123456')
-    task.expects(:message).returns('Hello <friend>, <user> invite you, please follow this link: <url>')
+    task.stubs(:message).returns('Hello <friend>, <user> invite you, please follow this link: <url>')
     task.expects(:friend_email).returns('friend@exemple.com')
     task.expects(:friend_name).returns('friend name').at_least_once
     requestor = mock()
-    requestor.expects(:name).returns('my name')
+    requestor.stubs(:name).returns('my name')
+    requestor.stubs(:public_profile_url).returns('requestor_path')
     environment = mock()
     environment.expects(:contact_email).returns('sender@example.com')
@@ -87,7 +87,8 @@ class TaskTest &lt; Test::Unit::TestCase
   end
   should 'provide a description method' do
-    assert_kind_of String, Task.new.description
+    requestor = create_user('requestor').person
+    assert_kind_of Hash, Task.new(:requestor => requestor).information
   end
   should 'notify just after the task is created' do
	@@ -279,6 +279,19 @@ module ApplicationHelper		@@ -279,6 +279,19 @@ module ApplicationHelper
279	end	279	end
280	end	280	end
281		281
		282	+ def partial_for_task_class(klass, action)
		283	+ if klass.nil?
		284	+ raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
		285	+ end
		286	+
		287	+ name = "#{klass.name.underscore}_#{action.to_s}"
		288	+ if File.exists?(File.join(RAILS_ROOT, 'app', 'views', params[:controller], "_#{name}.rhtml"))
		289	+ name
		290	+ else
		291	+ partial_for_task_class(klass.superclass, action)
		292	+ end
		293	+ end
		294	+
282	def user	295	def user
283	@controller.send(:user)	296	@controller.send(:user)
284	end	297	end
	@@ -621,7 +634,16 @@ module ApplicationHelper		@@ -621,7 +634,16 @@ module ApplicationHelper
621	end	634	end
622		635
623	def select_folder(label, object, method, collection, html_options = {}, js_options = {})	636	def select_folder(label, object, method, collection, html_options = {}, js_options = {})
624	- labelled_form_field(label, select(object, method, collection.map {\|f\| [ profile.identifier + '/' + f.full_name, f.id ] }, html_options.merge({:include_blank => "#{profile.identifier}"}), js_options))	637	+ root = profile ? profile.identifier : _("root")
		638	+ labelled_form_field(label, select(object, method,
		639	+ collection.map {\|f\| [ root + '/' + f.full_name, f.id ]},
		640	+ {:include_blank => root}, html_options.merge(js_options)))
		641	+ end
		642	+
		643	+ def select_profile_folder(label, object, method, profile, html_options = {}, js_options = {})
		644	+ labelled_form_field(label, select(object, method,
		645	+ profile.folders.map {\|f\| [ profile.identifier + '/' + f.full_name, f.id ]},
		646	+ {:include_blank => profile.identifier}, html_options.merge(js_options)))
625	end	647	end
626		648
627	def theme_option(opt = nil)	649	def theme_option(opt = nil)
	@@ -1094,10 +1116,16 @@ module ApplicationHelper		@@ -1094,10 +1116,16 @@ module ApplicationHelper
1094	end	1116	end
1095		1117
1096	def usermenu_logged_in	1118	def usermenu_logged_in
		1119	+ pending_tasks_count = ''
		1120	+ if user && user.all_pending_tasks.count > 0
		1121	+ pending_tasks_count = link_to(user.all_pending_tasks.count.to_s, '/myprofile/{login}/tasks', :id => 'pending-tasks-count')
		1122	+ end
		1123	+
1097	(_('Welcome, %s') % link_to('<i></i><strong>{login}</strong>', '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +	1124	(_('Welcome, %s') % link_to('<i></i><strong>{login}</strong>', '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
1098	render_environment_features(:usermenu) +	1125	render_environment_features(:usermenu) +
1099	link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', { :controller => 'admin_panel', :action => 'index' }, :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +	1126	link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', { :controller => 'admin_panel', :action => 'index' }, :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
1100	link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +	1127	link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +
		1128	+ pending_tasks_count +
1101	link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))	1129	link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
1102	end	1130	end
1103		1131
	@@ -1164,4 +1192,13 @@ module ApplicationHelper		@@ -1164,4 +1192,13 @@ module ApplicationHelper
1164	content_tag(:div, _('Source: %s') % source_url, :id => 'article-source') unless source_url.nil?	1192	content_tag(:div, _('Source: %s') % source_url, :id => 'article-source') unless source_url.nil?
1165	end	1193	end
1166		1194
		1195	+ def task_information(task)
		1196	+ values = {}
		1197	+ values.merge!({:requestor => link_to(task.requestor.name, task.requestor.public_profile_url)}) if task.requestor
		1198	+ values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject
		1199	+ values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject
		1200	+ values.merge!(task.information[:variables]) if task.information[:variables]
		1201	+ task.information[:message] % values
		1202	+ end
		1203	+
1167	end	1204	end
	@@ -3,10 +3,6 @@ class ApproveArticle < Task		@@ -3,10 +3,6 @@ class ApproveArticle < Task
3		3
4	validates_presence_of :requestor_id, :target_id	4	validates_presence_of :requestor_id, :target_id
5		5
6	- def description
7	- _('%{author} wants to publish "%{article}" on %{community}') % { :author => requestor.name, :article => article_title, :community => target.name }
8	- end
9	-
10	def article_title	6	def article_title
11	article ? article.title : _('(The original text was removed)')	7	article ? article.title : _('(The original text was removed)')
12	end	8	end
	@@ -24,7 +20,7 @@ class ApproveArticle < Task		@@ -24,7 +20,7 @@ class ApproveArticle < Task
24	end	20	end
25		21
26	def name	22	def name
27	- data[:name].blank? ? article.name : data[:name]	23	+ data[:name].blank? ? (article ? article.name : _("Article removed.")) : data[:name]
28	end	24	end
29		25
30	def name= value	26	def name= value
	@@ -68,7 +64,7 @@ class ApproveArticle < Task		@@ -68,7 +64,7 @@ class ApproveArticle < Task
68	end	64	end
69		65
70	def abstract	66	def abstract
71	- data[:abstract].blank? ? article.abstract : data[:abstract]	67	+ data[:abstract].blank? ? (article ? article.abstract : '') : data[:abstract]
72	end	68	end
73		69
74	def body= value	70	def body= value
	@@ -76,17 +72,63 @@ class ApproveArticle < Task		@@ -76,17 +72,63 @@ class ApproveArticle < Task
76	end	72	end
77		73
78	def body	74	def body
79	- data[:body].blank? ? article.body : data[:body]	75	+ data[:body].blank? ? (article ? article.body : "") : data[:body]
80	end	76	end
81		77
82	def perform	78	def perform
83	article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source)	79	article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source)
84	end	80	end
85		81
		82	+ def title
		83	+ _("New article")
		84	+ end
		85	+
		86	+ def icon
		87	+ result = {:type => :defined_image, :src => '/images/icons-app/article-minor.png', :name => name}
		88	+ result.merge({:url => article.url}) if article
		89	+ return result
		90	+ end
		91	+
		92	+ def linked_subject
		93	+ {:text => name, :url => article.url} if article
		94	+ end
		95	+
		96	+ def information
		97	+ if article
		98	+ {:message => _('%{requestor} wants to publish the article: %{linked_subject}.')}
		99	+ else
		100	+ {:message => _("The article was removed.")}
		101	+ end
		102	+ end
		103	+
		104	+ def accept_details
		105	+ true
		106	+ end
		107	+
		108	+ def default_decision
		109	+ if article
		110	+ 'skip'
		111	+ else
		112	+ 'reject'
		113	+ end
		114	+ end
		115	+
		116	+ def accept_disabled?
		117	+ article.blank?
		118	+ end
		119	+
86	def target_notification_message	120	def target_notification_message
87	return nil if target.organization? && !target.moderated_articles?	121	return nil if target.organization? && !target.moderated_articles?
88	- description + "\n\n" +	122	+ _('%{requestor} wants to publish the article: %{article}.') % {:requestor => requestor.name, :article => article.name} + "\n\n"
89	_('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }	123	_('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }
90	end	124	end
91		125
		126	+ def task_finished_message
		127	+ if !closing_statment.blank?
		128	+ _("Your request for publishing the article \"%{article}\" was approved. Here is the comment left by the admin who approved your article:\n\n%{comment} ") % {:article => name, :comment => closing_statment}
		129	+ else
		130	+ _('Your request for publishing the article "%{article}" was approved.') % {:article => name}
		131	+ end
		132	+ end
		133	+
92	end	134	end
	@@ -11,8 +11,20 @@ class EmailActivation < Task		@@ -11,8 +11,20 @@ class EmailActivation < Task
11	end	11	end
12	end	12	end
13		13
14	- def description
15	- _("'%{user} wants to activate email '%{email}'") % { :user => person.name, :email => person.email_addresses.join(', ') }	14	+ def title
		15	+ _("Email activation")
		16	+ end
		17	+
		18	+ def subject
		19	+ person.email_addresses.join(', ')
		20	+ end
		21	+
		22	+ def information
		23	+ {:message => _("%{requestor} wants to activate the following email: %{subject}.")}
		24	+ end
		25	+
		26	+ def icon
		27	+ {:type => :profile_image, :profile => requestor, :url => requestor.url}
16	end	28	end
17		29
18	def perform	30	def perform
	@@ -20,4 +20,20 @@ class EnterpriseActivation < Task		@@ -20,4 +20,20 @@ class EnterpriseActivation < Task
20	self.enterprise.enable(requestor)	20	self.enterprise.enable(requestor)
21	end	21	end
22		22
		23	+ def title
		24	+ _("Enterprise activation")
		25	+ end
		26	+
		27	+ def linked_subject
		28	+ {:text => target.name, :url => target.public_profile_url}
		29	+ end
		30	+
		31	+ def information
		32	+ {:message => _('%{requestor} wants to activate enterprise %{linked_subject}.')}
		33	+ end
		34	+
		35	+ def icon
		36	+ {:type => :profile_image, :profile => requestor, :url => requestor.url}
		37	+ end
		38	+
23	end	39	end
	@@ -7,8 +7,20 @@ class InviteFriend < Invitation		@@ -7,8 +7,20 @@ class InviteFriend < Invitation
7	friend.add_friend(person, group_for_friend)	7	friend.add_friend(person, group_for_friend)
8	end	8	end
9		9
10	- def description
11	- _('%s invited you to join %s') % [person.name, person.environment.name]	10	+ def title
		11	+ _("New friend")
		12	+ end
		13	+
		14	+ def information
		15	+ {:message => _('%{requestor} wants to be your friend.')}
		16	+ end
		17	+
		18	+ def accept_details
		19	+ true
		20	+ end
		21	+
		22	+ def icon
		23	+ {:type => :profile_image, :profile => requestor, :url => requestor.url}
12	end	24	end
13		25
14	def permission	26	def permission
	@@ -15,8 +15,24 @@ class InviteMember < Invitation		@@ -15,8 +15,24 @@ class InviteMember < Invitation
15	community.add_member(friend)	15	community.add_member(friend)
16	end	16	end
17		17
18	- def description
19	- _('%s invited you to join the community %s') % [person.name, community.name]	18	+ def title
		19	+ _("Community invitation")
		20	+ end
		21	+
		22	+ def linked_subject
		23	+ {:text => community.name, :url => community.public_profile_url}
		24	+ end
		25	+
		26	+ def information
		27	+ {:message => _('%{requestor} invited you to join %{linked_subject}.')}
		28	+ end
		29	+
		30	+ def url
		31	+ community.url
		32	+ end
		33	+
		34	+ def icon
		35	+ {:type => :profile_image, :profile => community, :url => community.url}
20	end	36	end
21		37
22	def expanded_message	38	def expanded_message
	@@ -7,10 +7,6 @@ class SuggestArticle < Task		@@ -7,10 +7,6 @@ class SuggestArticle < Task
7		7
8	validates_presence_of :target_id, :article_name, :email, :name, :article_body	8	validates_presence_of :target_id, :article_name, :email, :name, :article_body
9		9
10	- def description
11	- _('%{sender} suggested to publish "%{article}" on %{community}') % { :sender => sender, :article => article_name, :community => target.name }
12	- end
13	-
14	settings_items :email, :type => String	10	settings_items :email, :type => String
15	settings_items :name, :type => String	11	settings_items :name, :type => String
16	settings_items :article_name, :type => String	12	settings_items :article_name, :type => String
	@@ -39,8 +35,30 @@ class SuggestArticle < Task		@@ -39,8 +35,30 @@ class SuggestArticle < Task
39	)	35	)
40	end	36	end
41		37
		38	+ def title
		39	+ _("Article suggestion")
		40	+ end
		41	+
		42	+ def subject
		43	+ article_name
		44	+ end
		45	+
		46	+ def information
		47	+ { :message => _('%{sender} suggested the publication of the article: %{subject}.'),
		48	+ :variables => {:sender => sender} }
		49	+ end
		50	+
		51	+ def accept_details
		52	+ true
		53	+ end
		54	+
		55	+ def icon
		56	+ result = {:type => :defined_image, :src => '/images/icons-app/article-minor.png', :name => article_name}
		57	+ end
		58	+
42	def target_notification_message	59	def target_notification_message
43	- description + "\n\n" +	60	+ _('%{sender} suggested the publication of the article: %{article}.') %
		61	+ {:sender => sender, :article => article_name} + "\n\n" +
44	_('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }	62	_('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }
45	end	63	end
46		64
	@@ -11,6 +11,8 @@		@@ -11,6 +11,8 @@
11	# will need to declare <ttserialize</tt> itself).	11	# will need to declare <ttserialize</tt> itself).
12	class Task < ActiveRecord::Base	12	class Task < ActiveRecord::Base
13		13
		14	+ acts_as_having_settings :field => :data
		15	+
14	module Status	16	module Status
15	# the status of tasks just created	17	# the status of tasks just created
16	ACTIVE = 1	18	ACTIVE = 1
	@@ -86,6 +88,14 @@ class Task < ActiveRecord::Base		@@ -86,6 +88,14 @@ class Task < ActiveRecord::Base
86	def after_finish	88	def after_finish
87	end	89	end
88		90
		91	+ def reject_explanation=(reject_explanation='')
		92	+ self.data[:reject_explanation] = reject_explanation
		93	+ end
		94	+
		95	+ def reject_explanation
		96	+ self.data[:reject_explanation]
		97	+ end
		98	+
89	# this method cancels the task. At the end a message (as returned by	99	# this method cancels the task. At the end a message (as returned by
90	# #cancel_message) is sent to the requestor with #notify_requestor.	100	# #cancel_message) is sent to the requestor with #notify_requestor.
91	def cancel	101	def cancel
	@@ -101,13 +111,50 @@ class Task < ActiveRecord::Base		@@ -101,13 +111,50 @@ class Task < ActiveRecord::Base
101	end	111	end
102	end	112	end
103		113
		114	+ # Here are the tasks customizable options.
104		115
105	- # Returns the description of the task.
106	- #
107	- # This method +must+ be overriden in subclasses to return something
108	- # meaningful for each kind of task
109	- def description
110	- _('Generic task')	116	+ def title
		117	+ _("Task")
		118	+ end
		119	+
		120	+ def subject
		121	+ nil
		122	+ end
		123	+
		124	+ def linked_subject
		125	+ nil
		126	+ end
		127	+
		128	+ def information
		129	+ {:message => _('%{requestor} sent you a task.')}
		130	+ end
		131	+
		132	+ def accept_details
		133	+ false
		134	+ end
		135	+
		136	+ def reject_details
		137	+ false
		138	+ end
		139	+
		140	+ def icon
		141	+ {:type => :defined_image, :src => "/images/icons-app/user-minor.png", :name => requestor.name, :url => requestor.url}
		142	+ end
		143	+
		144	+ def default_decision
		145	+ 'skip'
		146	+ end
		147	+
		148	+ def accept_disabled?
		149	+ false
		150	+ end
		151	+
		152	+ def reject_disabled?
		153	+ false
		154	+ end
		155	+
		156	+ def skip_disabled?
		157	+ false
111	end	158	end
112		159
113	# The message that will be sent to the requestor of the task when the task is	160	# The message that will be sent to the requestor of the task when the task is
	@@ -17,7 +17,7 @@ class TaskMailer < ActionMailer::Base		@@ -17,7 +17,7 @@ class TaskMailer < ActionMailer::Base
17	url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.url.merge(:controller => 'tasks', :action => 'index'))	17	url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.url.merge(:controller => 'tasks', :action => 'index'))
18		18
19	from self.class.generate_from(task)	19	from self.class.generate_from(task)
20	- subject '[%s] %s' % [task.environment.name, task.description]	20	+ subject '[%s] %s' % [task.environment.name, task.information]
21	body :target => task.target.name,	21	body :target => task.target.name,
22	:message => msg,	22	:message => msg,
23	:environment => task.environment.name,	23	:environment => task.environment.name,
	@@ -32,7 +32,7 @@ class TaskMailer < ActionMailer::Base		@@ -32,7 +32,7 @@ class TaskMailer < ActionMailer::Base
32	recipients task.friend_email	32	recipients task.friend_email
33		33
34	from self.class.generate_from(task)	34	from self.class.generate_from(task)
35	- subject '[%s] %s' % [ task.requestor.environment.name, task.description ]	35	+ subject '[%s] %s' % [ task.requestor.environment.name, task.information ]
36	body :message => msg	36	body :message => msg
37	end	37	end
38		38
	@@ -52,7 +52,7 @@ class TaskMailer < ActionMailer::Base		@@ -52,7 +52,7 @@ class TaskMailer < ActionMailer::Base
52		52
53	recipients task.requestor.notification_emails	53	recipients task.requestor.notification_emails
54	from self.class.generate_from(task)	54	from self.class.generate_from(task)
55	- subject '[%s] %s' % [task.requestor.environment.name, task.description]	55	+ subject '[%s] %s' % [task.requestor.environment.name, task.information]
56	body :requestor => task.requestor.name,	56	body :requestor => task.requestor.name,
57	:message => text,	57	:message => text,
58	:environment => task.requestor.environment.name,	58	:environment => task.requestor.environment.name,
1	class Ticket < Task	1	class Ticket < Task
2	acts_as_having_settings :field => :data	2	acts_as_having_settings :field => :data
3	- settings_items :title, :description, :closing_statment	3	+ settings_items :title, :message
4	end	4	end