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

Augusto_Serpro
2 parents 199fc3b7 be05a862
Showing 30 changed files with 492 additions and 71 deletions Show diff stats
app/controllers/public/invite_controller.rb
app/helpers/application_helper.rb
app/models/profile.rb
app/views/content_viewer/_article_toolbar.html.erb
app/views/profile/members.html.erb
lib/add_members_job.rb
lib/noosfero/plugin.rb
plugins/comment_paragraph/controllers/myprofile/comment_paragraph_plugin_myprofile_controller.rb
plugins/comment_paragraph/lib/comment_paragraph_plugin.rb
plugins/comment_paragraph/lib/comment_paragraph_plugin/macros/allow_comment.rb
plugins/comment_paragraph/lib/ext/article.rb
plugins/comment_paragraph/po/comment_paragraph.pot
plugins/comment_paragraph/po/pt/comment_paragraph.po
plugins/comment_paragraph/public/images/internet-group-chat.png
plugins/comment_paragraph/public/style.css
plugins/comment_paragraph/test/functional/comment_paragraph_plugin_admin_controller_test.rb
plugins/comment_paragraph/test/functional/comment_paragraph_plugin_myprofile_controller_test.rb
plugins/comment_paragraph/test/functional/comment_paragraph_plugin_profile_controller_test.rb
plugins/comment_paragraph/test/functional/comment_paragraph_plugin_public_controller_test.rb
plugins/comment_paragraph/test/functional/content_viewer_controller_test.rb
@@ -62,20 +62,36 @@ class InviteController &lt; PublicController
     redirect_to :action => 'invite_friends'
   end
  
+  #Invite or add member without create a task
+  #if logged user is admin of environment
   def invite_registered_friend
+
+    if !params['q'].present? || !request.post?
+
+      redirect_to :action => 'invite_friends'
+      session[:notice] = _('Please enter a valid profile.')
+
+      return
+    end
+
     contacts_to_invite = params['q'].split(',')
-    if !contacts_to_invite.empty? && request.post?
+
+    if user.is_admin? && profile.community?
+
+      Delayed::Job.enqueue AddMembersJob.new contacts_to_invite, profile.id, locale
+
+      session[:notice] = _('This friends was added!')
+    else
       Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, '', profile.id, nil, locale)
       session[:notice] = _('Your invitations are being sent.')
-      if profile.person?
-        redirect_to :controller => 'profile', :action => 'friends'
-      else
-        redirect_to :controller => 'profile', :action => 'members'
-      end
+    end
+
+    if profile.person?
+      redirect_to :controller => 'profile', :action => 'friends'
     else
-      redirect_to :action => 'invite_friends'
-      session[:notice] = _('Please enter a valid profile.')
+      redirect_to :controller => 'profile', :action => 'members'
     end
+
   end
  
   def search
@@ -589,14 +589,24 @@ module ApplicationHelper
         trigger_class = 'enterprise-trigger'
       end
     end
-    extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
+
+    extra_info_tag = ''
+    img_class = 'profile-image'
+
+    if extra_info.is_a? Hash
+      extra_info_tag = content_tag( 'span', extra_info[:value], :class => 'extra_info '+extra_info[:class])
+      img_class +=' '+extra_info[:class]
+    else
+      extra_info_tag = content_tag( 'span', extra_info, :class => 'extra_info' )
+    end
+    #extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
     links = links_for_balloon(profile)
     content_tag('div', content_tag(tag,
                                    (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? popover_menu(_('Profile links'),profile.short_name,links,{:class => trigger_class, :url => url}) : "") +
     link_to(
-      content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
+      content_tag( 'span', profile_image( profile, size ), :class => img_class ) +
       content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
-      extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
+      extra_info_tag + profile_sex_icon( profile ) + profile_cat_icons( profile ),
       profile.url,
       :class => 'profile_link url',
       :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
@@ -703,6 +703,32 @@ private :generate_url, :url_options
     end
   end
  
+  # Adds many people to profile by id's or email's
+  def add_members(people_ids)
+
+    unless people_ids.nil? && people_ids.empty?
+      people = []
+
+      if people_ids.first =~ /\@/
+        people = User.where(email: people_ids)
+      else
+        people = Person.where(id: people_ids)
+      end
+
+      people.each do |profile|
+        person = profile
+
+        if profile.is_a? User
+          person = profile.person
+        end
+
+        unless person.is_member_of?(self)
+          add_member person
+        end
+      end
+    end
+  end
+
   def remove_member(person)
     self.disaffiliate(person, Profile::Roles.all_roles(environment.id))
   end
@@ -50,6 +50,8 @@
     <%#*Adds extra buttons to the toolbar%>
     <%= @plugins.dispatch(:article_extra_toolbar_buttons, @page).collect { |content| instance_exec(&content) }.join("") %>
  
+    <%= @plugins.dispatch(:article_toolbar_actions, @page).collect { |content| instance_exec(&content) }.join("")%>
+
     <%= report_abuse(profile, :link, @page) %>
   </div>
   <div id="article-header">
@@ -4,6 +4,10 @@
  
 <% cache_timeout(profile.members_cache_key(params), 4.hours) do %>
   <ul class='profile-list'>
+    <!--
+     @todo Highlight visual for invited members
+         of a community
+    -->
     <% @members.each do |member| %>
       <%= profile_image_link(member) %>
     <% end %>
@@ -0,0 +1,11 @@
+class AddMembersJob < Struct.new(:people_ids, :profile_id, :locale)
+
+  def perform
+    Noosfero.with_locale(locale) do
+
+      profile = Profile.find(profile_id)
+      profile.add_members people_ids
+
+    end
+  end
+end
@@ -448,6 +448,12 @@ class Noosfero::Plugin
     []
   end
  
+  # -> Adds aditional actions to article
+  # returns = lambda block that creates html code
+  def article_toolbar_actions article
+    nil
+  end
+
   # -> Adds adicional content to article
   # returns = lambda block that creates html code
   def article_extra_contents(article)
@@ -0,0 +1,18 @@
+class CommentParagraphPluginMyprofileController < MyProfileController
+
+  before_filter :check_permission
+
+  def toggle_activation
+    @article.comment_paragraph_plugin_activate = !@article.comment_paragraph_plugin_activate
+    @article.save!
+    redirect_to @article.view_url
+  end
+
+  protected
+
+  def check_permission
+    @article = profile.articles.find(params[:id])
+    render_access_denied unless @article.comment_paragraph_plugin_enabled? && @article.allow_edit?(user)
+  end
+
+end
@@ -41,7 +41,14 @@ class CommentParagraphPlugin &lt; Noosfero::Plugin
   end
  
   def self.activation_mode_default_setting
-    'auto'
+    'manual'
+  end
+
+  def article_toolbar_actions(article)
+    return unless article.comment_paragraph_plugin_enabled?
+    proc do
+      button :toggle_comment_paragraph, article.comment_paragraph_plugin_activated? ? _('Deactivate Comments') : _('Activate Comments'), :controller => 'comment_paragraph_plugin_myprofile', :action => 'toggle_activation', :id => article.id if article.allow_edit?(user)
+    end
   end
  
 end
@@ -12,7 +12,7 @@ class CommentParagraphPlugin::AllowComment &lt; Noosfero::Plugin::Macro
     count = article.paragraph_comments.without_spam.in_paragraph(paragraph_uuid).count
  
     proc {
-      if controller.kind_of?(ContentViewerController)
+      if controller.kind_of?(ContentViewerController) && article.comment_paragraph_plugin_activated?
         render :partial => 'comment_paragraph_plugin_profile/comment_paragraph',
                :locals => {:paragraph_uuid => paragraph_uuid, :article_id => article.id, :inner_html => inner_html, :count => count, :profile_identifier => article.profile.identifier }
       else
@@ -12,21 +12,21 @@ class Article
     environment.plugin_enabled?(CommentParagraphPlugin) && self.kind_of?(TextArticle)
   end
  
-  protected
-
-  def comment_paragraph_plugin_activate?
-      comment_paragraph_plugin_enabled? && comment_paragraph_plugin_settings.activation_mode == 'auto'
+  def comment_paragraph_plugin_activated?
+    comment_paragraph_plugin_activate && comment_paragraph_plugin_enabled?
   end
  
-  def comment_paragraph_plugin_parse_html
-    comment_paragraph_plugin_activate = comment_paragraph_plugin_activate?
-    return unless comment_paragraph_plugin_activate
+  protected
  
-    if body && body_changed?
+  def comment_paragraph_plugin_parse_html
+    comment_paragraph_plugin_set_initial_value unless persisted?
+    return unless comment_paragraph_plugin_activated?
+    if body && (body_changed? || setting_changed?(:comment_paragraph_plugin_activate))
       parsed_paragraphs = []
-      updated = body_change[1]
-      doc = Hpricot(updated)
-      doc.search("/*").each do |paragraph|
+      updated = body_changed? ? body_change[1] : body
+      doc =  Nokogiri::HTML(updated).css('body')
+      
+      doc.children.each do |paragraph|
         if paragraph.to_html =~ /^<div(.*)paragraph_comment(.*)$/ || paragraph.to_html =~ /^<p>\W<\/p>$/
           parsed_paragraphs << paragraph.to_html
         else
@@ -41,6 +41,11 @@ class Article
     end
   end
  
+  def comment_paragraph_plugin_set_initial_value
+    self.comment_paragraph_plugin_activate = comment_paragraph_plugin_enabled? &&
+      comment_paragraph_plugin_settings.activation_mode == 'auto'
+  end
+
   def comment_paragraph_plugin_settings
     @comment_paragraph_plugin_settings ||= Noosfero::Plugin::Settings.new(environment, CommentParagraphPlugin)
   end
@@ -48,8 +53,7 @@ class Article
   def comment_paragraph_plugin_parse_paragraph(paragraph_content, paragraph_uuid)
     "<div class='macro article_comments paragraph_comment' " +
       "data-macro='comment_paragraph_plugin/allow_comment' " +
-      "data-macro-paragraph_uuid='#{paragraph_uuid}'>#{paragraph_content}</div>\r\n" +
-      "<p>&nbsp;</p>"
+      "data-macro-paragraph_uuid='#{paragraph_uuid}'>#{paragraph_content}</div>\r\n"
   end
  
 end
@@ -0,0 +1,62 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.0-rc3-2337-g7296e49\n"
+"POT-Creation-Date: 2015-03-03 07:51-0300\n"
+"PO-Revision-Date: 2015-03-03 07:41-0300\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: plugins/comment_paragraph/controllers/comment_paragraph_plugin_admin_controller.rb:8
+msgid "Settings successfuly saved"
+msgstr ""
+
+#: plugins/comment_paragraph/lib/comment_paragraph_plugin.rb:8
+msgid "A plugin that display comments divided by paragraphs."
+msgstr ""
+
+#: plugins/comment_paragraph/lib/comment_paragraph_plugin.rb:50
+msgid "Deactivate Comments"
+msgstr ""
+
+#: plugins/comment_paragraph/lib/comment_paragraph_plugin.rb:50
+msgid "Activate Comments"
+msgstr ""
+
+#: plugins/comment_paragraph/views/comment_paragraph_plugin_admin/index.html.erb:2
+msgid "Comment Paragraph Plugin Settings"
+msgstr ""
+
+#: plugins/comment_paragraph/views/comment_paragraph_plugin_admin/index.html.erb:7
+msgid "Activation Mode"
+msgstr ""
+
+#: plugins/comment_paragraph/views/comment_paragraph_plugin_admin/index.html.erb:10
+msgid "Auto"
+msgstr ""
+
+#: plugins/comment_paragraph/views/comment_paragraph_plugin_admin/index.html.erb:11
+msgid "(all text articles will be activated by default)"
+msgstr ""
+
+#: plugins/comment_paragraph/views/comment_paragraph_plugin_admin/index.html.erb:15
+msgid "Manual"
+msgstr ""
+
+#: plugins/comment_paragraph/views/comment_paragraph_plugin_admin/index.html.erb:16
+msgid "(click on \"Activate Comment Paragraph\" )"
+msgstr ""
+
+#: plugins/comment_paragraph/views/comment_paragraph_plugin_admin/index.html.erb:21
+msgid "Save"
+msgstr ""
@@ -0,0 +1,62 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.0-rc3-2337-g7296e49\n"
+"POT-Creation-Date: 2015-03-03 07:51-0300\n"
+"PO-Revision-Date: 2015-03-03 07:41-0300\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: plugins/comment_paragraph/controllers/comment_paragraph_plugin_admin_controller.rb:8
+msgid "Settings successfuly saved"
+msgstr "Configurações salvas com sucesso"
+
+#: plugins/comment_paragraph/lib/comment_paragraph_plugin.rb:8
+msgid "A plugin that display comments divided by paragraphs."
+msgstr "Um plugin que mostra os comentários por paragráfos"
+
+#: plugins/comment_paragraph/lib/comment_paragraph_plugin.rb:50
+msgid "Deactivate Comments"
+msgstr "Desativar Comentários"
+
+#: plugins/comment_paragraph/lib/comment_paragraph_plugin.rb:50
+msgid "Activate Comments"
+msgstr "Ativar Comentários"
+
+#: plugins/comment_paragraph/views/comment_paragraph_plugin_admin/index.html.erb:2
+msgid "Comment Paragraph Plugin Settings"
+msgstr "Configurações do Plugin de Comentário por Parágrafos"
+
+#: plugins/comment_paragraph/views/comment_paragraph_plugin_admin/index.html.erb:7
+msgid "Activation Mode"
+msgstr "Modo de Ativação"
+
+#: plugins/comment_paragraph/views/comment_paragraph_plugin_admin/index.html.erb:10
+msgid "Auto"
+msgstr "Automático"
+
+#: plugins/comment_paragraph/views/comment_paragraph_plugin_admin/index.html.erb:11
+msgid "(all text articles will be activated by default)"
+msgstr "(todos os artigos de texto serão ativados por padrão)"
+
+#: plugins/comment_paragraph/views/comment_paragraph_plugin_admin/index.html.erb:15
+msgid "Manual"
+msgstr "Manual"
+
+#: plugins/comment_paragraph/views/comment_paragraph_plugin_admin/index.html.erb:16
+msgid "(click on \"Activate Comment Paragraph\" )"
+msgstr "(clicar em \"Ativar Comentário por Parágrafo\")"
+
+#: plugins/comment_paragraph/views/comment_paragraph_plugin_admin/index.html.erb:21
+msgid "Save"
+msgstr "Salvar"
+#content #article-toolbar .icon-toggle_comment_paragraph {
+  top: -71px;
+  border: 0;
+  background-color: transparent;
+  color: gray;
+}
+#content #article-toolbar .icon-toggle_comment_paragraph:hover {
+  color: black;
+}
+
+.icon-toggle_comment_paragraph{
+  background-image: url('/plugins/comment_paragraph/images/internet-group-chat.png');
+}
+
 #comment-bubble.visible {
   visibility: visible;
 }
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../../controllers/comment_paragraph_plugin_admin_controller'
+require_relative '../../../../test/test_helper'
+require_relative '../../controllers/comment_paragraph_plugin_admin_controller'
  
 # Re-raise errors caught by the controller.
 class CommentParagraphPluginAdminController; def rescue_action(e) raise e end; end
@@ -22,10 +22,10 @@ class CommentParagraphPluginAdminControllerTest &lt; ActionController::TestCase
   end
  
   should 'update comment paragraph plugin settings' do
-    assert_not_equal 'manual', plugin_settings.get_setting(:activation_mode)
-    post :index, :settings => { :activation_mode => 'manual' }
+    assert_not_equal 'auto', plugin_settings.get_setting(:activation_mode)
+    post :index, :settings => { :activation_mode => 'auto' }
     environment.reload
-    assert_equal 'manual', plugin_settings.get_setting(:activation_mode)
+    assert_equal 'auto', plugin_settings.get_setting(:activation_mode)
   end
  
   should 'get article types previously selected' do
@@ -0,0 +1,35 @@
+require_relative '../test_helper'
+
+class CommentParagraphPluginMyprofileControllerTest < ActionController::TestCase
+
+  def setup
+    @environment = Environment.default
+    @environment.enable_plugin(CommentParagraphPlugin)
+    @profile = fast_create(Profile)
+    @user = create_user_with_permission('testuser', 'post_content', @profile)
+    login_as(@user.identifier)
+    @article = fast_create(TextArticle, :profile_id => profile.id, :author_id => @user.id)
+  end
+
+  attr_reader :article, :profile, :user, :environment
+
+  should 'toggle comment paragraph activation' do
+    assert !article.comment_paragraph_plugin_activate
+    get :toggle_activation, :id => article.id, :profile => profile.identifier
+    assert article.reload.comment_paragraph_plugin_activate
+    assert_redirected_to article.view_url
+  end
+
+  should 'deny access to toggle activation for forbidden users' do
+    login_as(create_user('anotheruser').login)
+    get :toggle_activation, :id => article.id, :profile => profile.identifier
+    assert_response :forbidden
+  end
+
+  should 'deny access to toggle activation if plugin is not enabled' do
+    environment.disable_plugin(CommentParagraphPlugin)
+    get :toggle_activation, :id => article.id, :profile => profile.identifier
+    assert_response :forbidden
+  end
+
+end
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/../../controllers/profile/comment_paragraph_plugin_profile_controller'
+require_relative '../test_helper'
+require_relative '../../controllers/profile/comment_paragraph_plugin_profile_controller'
  
 # Re-raise errors caught by the controller.
 class CommentParagraphPluginProfileController; def rescue_action(e) raise e end; end
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/../../controllers/public/comment_paragraph_plugin_public_controller'
+require_relative '../test_helper'
+require_relative '../../controllers/public/comment_paragraph_plugin_public_controller'
  
  
 # Re-raise errors caught by the controller.
@@ -9,8 +9,7 @@ class CommentParagraphPluginPublicControllerTest &lt; ActionController::TestCase
  
   def setup
     @profile = create_user('testuser').person
-    @article = profile.articles.build(:name => 'test')
-    @article.save!
+    @article = profile.articles.create!(:name => 'test')
   end
   attr_reader :article, :profile
  
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative '../test_helper'
  
 class ContentViewerController
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
@@ -10,10 +10,12 @@ end
 class ContentViewerControllerTest < ActionController::TestCase
  
   def setup
-    @profile = fast_create(Community)
-    @page = fast_create(Article, :profile_id => @profile.id, :body => "<div class=\"macro\" data-macro-paragraph_uuid=\"0\" data-macro='comment_paragraph_plugin/allow_comment' ></div>")
     @environment = Environment.default
     @environment.enable_plugin(CommentParagraphPlugin)
+    @profile = fast_create(Community)
+    @page = fast_create(TextArticle, :profile_id => @profile.id, :body => "<p>inner text</p>")
+    @page.comment_paragraph_plugin_activate = true
+    @page.save!
   end
  
   attr_reader :page
-require File.dirname(__FILE__) + '/../../../test/test_helper'
+require_relative '../../../test/test_helper'
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative '../test_helper'
  
 class AllowCommentTest < ActiveSupport::TestCase
  
   def setup
     @macro = CommentParagraphPlugin::AllowComment.new
+    @environment = Environment.default
+    @environment.enable_plugin(CommentParagraphPlugin)
+
+    @profile = fast_create(Community)
+
+    @article = fast_create(TextArticle, :profile_id => profile.id, :body => 'inner')
+    @article.comment_paragraph_plugin_activate = true
+    @article.save!
+
+    @comment = fast_create(Comment, :paragraph_uuid => 1, :source_id => article.id)
+    @controller = mock
   end
  
-  attr_reader :macro
+  attr_reader :macro, :profile, :article, :controller, :comment, :environment
  
   should 'have a configuration' do
     assert CommentParagraphPlugin::AllowComment.configuration
   end
  
   should 'parse contents to include comment paragraph view' do
-    profile = fast_create(Community)
-    article = fast_create(Article, :profile_id => profile.id)
-    comment = fast_create(Comment, :paragraph_uuid => 1, :source_id => article.id)
-    inner_html = 'inner'
-    content = macro.parse({:paragraph_uuid => comment.paragraph_uuid}, inner_html, article)
-    expects(:controller).returns(ContentViewerController.new)
-
-    expects(:render).with({:partial => 'comment_paragraph_plugin_profile/comment_paragraph', :locals => {:paragraph_uuid => comment.paragraph_uuid, :article_id => article.id, :inner_html => inner_html, :count => 1, :profile_identifier => profile.identifier} })
+    content = macro.parse({:paragraph_uuid => comment.paragraph_uuid}, article.body, article)
+    controller.expects(:kind_of?).with(ContentViewerController).returns(true)
+
+    expects(:render).with({:partial => 'comment_paragraph_plugin_profile/comment_paragraph', :locals => {:paragraph_uuid => comment.paragraph_uuid, :article_id => article.id, :inner_html => article.body, :count => 1, :profile_identifier => profile.identifier} })
     instance_eval(&content)
   end
  
   should 'not parse contents outside content viewer controller' do
-    profile = fast_create(Community)
-    article = fast_create(Article, :profile_id => profile.id)
-    comment = fast_create(Comment, :paragraph_uuid => 1, :source_id => article.id)
-    inner_html = 'inner'
-    content = macro.parse({:paragraph_uuid => comment.paragraph_uuid}, inner_html, article)
-    expects(:controller).returns(HomeController.new)
+    article = fast_create(TextArticle, :profile_id => profile.id, :body => 'inner')
+    content = macro.parse({:paragraph_uuid => comment.paragraph_uuid}, article.body, article)
+    controller.expects(:kind_of?).with(ContentViewerController).returns(false)
+    assert_equal 'inner', instance_eval(&content)
+  end
  
+  should 'not parse contents if comment_paragraph is not activated' do
+    article = fast_create(TextArticle, :profile_id => profile.id, :body => 'inner')
+    article.expects(:comment_paragraph_plugin_activated?).returns(false)
+    content = macro.parse({:paragraph_uuid => comment.paragraph_uuid}, article.body, article)
+    controller.expects(:kind_of?).with(ContentViewerController).returns(true)
     assert_equal 'inner', instance_eval(&content)
   end
  
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative '../test_helper'
 require 'benchmark'
  
 class ArticleTest < ActiveSupport::TestCase
  
   def setup
-    profile = fast_create(Community)
-    @article = fast_create(Article, :profile_id => profile.id)
+    @profile = fast_create(Community)
+    @article = fast_create(TextArticle, :profile_id => profile.id)
     @environment = Environment.default
     @environment.enable_plugin(CommentParagraphPlugin)
   end
  
-  attr_reader :article, :environment
+  attr_reader :article, :environment, :profile
  
   should 'return paragraph comments from article' do
     comment1 = fast_create(Comment, :paragraph_uuid => 1, :source_id => article.id)
@@ -34,9 +34,67 @@ class ArticleTest &lt; ActiveSupport::TestCase
  
   should 'parse html if the plugin is not enabled' do
     article.body = "<p>paragraph 1</p><p>paragraph 2</p>"
-    article.expects(:comment_paragraph_plugin_enabled?).returns(true)
+    article.comment_paragraph_plugin_activate = true
     article.save!
-    assert_match /data-macro='comment_paragraph_plugin\/allow_comment'/, article.body
+    assert_match /data-macro="comment_paragraph_plugin\/allow_comment"/, article.body
+  end
+
+  should 'do not remove macro div when disable comment paragraph' do
+    article.body = "<p>paragraph 1</p><p>paragraph 2</p>"
+    article.comment_paragraph_plugin_activate = true
+    article.save!
+    assert_match /data-macro="comment_paragraph_plugin\/allow_comment"/, article.body
+    article.comment_paragraph_plugin_activate = false
+    article.save!
+    assert_match /data-macro="comment_paragraph_plugin\/allow_comment"/, article.body
+  end
+
+  should 'parse html when activate comment paragraph' do
+    article.body = "<p>paragraph 1</p><p>paragraph 2</p>"
+    article.comment_paragraph_plugin_activate = false
+    article.save!
+    assert_equal "<p>paragraph 1</p><p>paragraph 2</p>", article.body
+    article.comment_paragraph_plugin_activate = true
+    article.save!
+    assert_match /data-macro="comment_paragraph_plugin\/allow_comment"/, article.body
+  end
+
+  should 'be enabled if plugin is enabled and article is a kind of TextArticle' do
+    assert article.comment_paragraph_plugin_enabled?
+  end
+
+  should 'not be enabled if plugin is not enabled' do
+    environment.disable_plugin(CommentParagraphPlugin)
+    assert !article.comment_paragraph_plugin_enabled?
+  end
+
+  should 'not be enabled if article if not a kind of TextArticle' do
+    article = fast_create(Article, :profile_id => profile.id)
+    assert !article.comment_paragraph_plugin_enabled?
+  end
+
+  should 'not be activated by default' do
+    article = fast_create(TextArticle, :profile_id => profile.id)
+    assert !article.comment_paragraph_plugin_activated?
+  end
+
+  should 'be activated by default if it is enabled and activation mode is auto' do
+    settings = Noosfero::Plugin::Settings.new(environment, CommentParagraphPlugin)
+    settings.activation_mode = 'auto'
+    settings.save!
+    article = TextArticle.create!(:profile => profile, :name => 'title')
+    assert article.comment_paragraph_plugin_activated?
+  end
+
+  should 'be activated when forced' do
+    article.comment_paragraph_plugin_activate = true
+    assert article.comment_paragraph_plugin_activated?
+  end
+
+  should 'not be activated if plugin is not enabled' do
+    article.comment_paragraph_plugin_activate = true
+    environment.disable_plugin(CommentParagraphPlugin)
+    assert !article.comment_paragraph_plugin_enabled?
   end
  
 end
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative '../test_helper'
 include ActionView::Helpers::FormTagHelper
  
 class CommentParagraphPluginTest < ActiveSupport::TestCase
@@ -6,9 +6,10 @@ class CommentParagraphPluginTest &lt; ActiveSupport::TestCase
   def setup
     @environment = Environment.default
     @plugin = CommentParagraphPlugin.new
+    @user = create_user('testuser').person
   end
  
-  attr_reader :environment, :plugin
+  attr_reader :environment, :plugin, :user
  
   should 'have a name' do
     assert_not_equal Noosfero::Plugin.plugin_name, CommentParagraphPlugin::plugin_name
@@ -35,4 +36,30 @@ class CommentParagraphPluginTest &lt; ActiveSupport::TestCase
     assert_nil /comment_paragraph_selected_area/.match(prok.call.inspect)
   end
  
+  should 'display button to toggle comment paragraph for users which can edit the article' do
+    article = fast_create(Article)
+    article.expects(:comment_paragraph_plugin_enabled?).returns(true)
+    article.expects(:allow_edit?).with(user).returns(true)
+
+    content = plugin.article_header_extra_contents(article)
+    expects(:button).once
+    instance_eval(&content)
+  end
+
+  should 'not display button to toggle comment paragraph for users which can not edit the article' do
+    article = fast_create(Article)
+    article.expects(:comment_paragraph_plugin_enabled?).returns(true)
+    article.expects(:allow_edit?).with(user).returns(false)
+
+    content = plugin.article_header_extra_contents(article)
+    assert_equal nil, instance_eval(&content)
+  end
+
+  should 'not display button to toggle comment paragraph if plugin is not enabled' do
+    article = fast_create(Article)
+    article.expects(:comment_paragraph_plugin_enabled?).returns(false)
+
+    assert_equal nil, plugin.article_header_extra_contents(article)
+  end
+
 end
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative '../test_helper'
  
 class CommentTest < ActiveSupport::TestCase
  
@@ -6,10 +6,14 @@
     <div class="activation-mode">
       <h4><%= _('Activation Mode') %></h4>
       <div class="auto">
-        <%= f.radio_button(:activation_mode, 'auto') %> <%= _('Auto') %>
+        <%= f.radio_button(:activation_mode, 'auto') %>
+        <span class="name"><strong><%= _('Auto') %></strong></span>
+        <span class="detail"><%= _('(all text articles will be activated by default)') %></span>
       </div>
-      <div>
-        <%= f.radio_button(:activation_mode, 'manual') %> <%= _('Manual') %>
+      <div class="manual">
+        <%= f.radio_button(:activation_mode, 'manual') %>
+        <span class="name"><strong><%= _('Manual') %></strong></span>
+        <span class="detail"><%= _('(click on "Activate Comment Paragraph" )') %></span>
       </div>
     </div>
  
@@ -65,7 +65,7 @@ class CommunityTrackPlugin::Track &lt; Folder
  
   def category_name
     category = categories.first
-    category ? category.top_ancestor.name : ''
+    category ? (category.top_ancestor.nil? ? '' : category.top_ancestor.name) : ''
   end
  
   def to_html(options = {})
@@ -10,7 +10,7 @@
 <div class="clear"></div>
  
 <style>
-  <% box_decorator.select_blocks(block.blocks, { :article => @page, :request_path => request.path, :locale => locale }).each do |child| %>
+  <% box_decorator.select_blocks(block, block.blocks, { :article => @page, :request_path => request.path, :locale => locale, params: request.params, controller: controller}).each do |child| %>      
     #block-<%=block.id%> #block-<%=child.id%> { width: <%= block.child_width(child.id) %>px; }
   <% end %>
 </style>
@@ -2205,6 +2205,21 @@ a.button.disabled, input.disabled {
 .profile-list .extra_info {
   font-size: 9px;
 }
+
+/* New members of community added
+* by admin of environment feature
+* #issue 227
+*/
+.profile-list .extra_info.new-profile {
+  margin-top: 5px;
+  color: #0A0;
+  font-weight: bold;
+}
+
+span.new-profile img{
+  border-top: solid 2px #0A0;
+  margin-top: -2px;
+}
 /* ==> blocks/recent-documents-block.css <<= */
  
 #content .recent-documents-block {
@@ -284,6 +284,11 @@ class InviteControllerTest &lt; ActionController::TestCase
     assert_empty json_response
   end
  
+  #@todo Copy this test and create a another version
+  #of this, for test add members in a community
+  #logged as admin of environment!
+  # #issue227
+  #
   should 'invite registered users through profile id' do
     friend1 = create_user('testuser1').person
     friend2 = create_user('testuser2').person
@@ -297,6 +302,29 @@ class InviteControllerTest &lt; ActionController::TestCase
     end
   end
  
+  should 'add registered users imediatly instead invite if logged user is a environment admin' do
+
+    #Add user like a environment admin
+    Environment.default.add_admin profile
+
+    friend1 = create_user('testuser1').person
+    friend2 = create_user('testuser2').person
+
+    assert_difference 'Delayed::Job.count', 1 do
+      assert_equal 0,community.members.count
+
+      post :invite_registered_friend, :profile => @community.identifier, :q => [friend1.id,friend2.id]
+
+      assert_response :redirect
+      assert_redirected_to :controller => 'profile', :action => 'members'
+    end
+
+    Delayed::Worker.new.run(Delayed::Job.last)
+
+    assert_equal 2,community.members.count
+
+  end
+
   private
  
   def json_response
...	...	@@ -62,20 +62,36 @@ class InviteController < PublicController
62	62	redirect_to :action => 'invite_friends'
63	63	end
64	64
	65	+ #Invite or add member without create a task
	66	+ #if logged user is admin of environment
65	67	def invite_registered_friend
	68	+
	69	+ if !params['q'].present? \|\| !request.post?
	70	+
	71	+ redirect_to :action => 'invite_friends'
	72	+ session[:notice] = _('Please enter a valid profile.')
	73	+
	74	+ return
	75	+ end
	76	+
66	77	contacts_to_invite = params['q'].split(',')
67		- if !contacts_to_invite.empty? && request.post?
	78	+
	79	+ if user.is_admin? && profile.community?
	80	+
	81	+ Delayed::Job.enqueue AddMembersJob.new contacts_to_invite, profile.id, locale
	82	+
	83	+ session[:notice] = _('This friends was added!')
	84	+ else
68	85	Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, '', profile.id, nil, locale)
69	86	session[:notice] = _('Your invitations are being sent.')
70		- if profile.person?
71		- redirect_to :controller => 'profile', :action => 'friends'
72		- else
73		- redirect_to :controller => 'profile', :action => 'members'
74		- end
	87	+ end
	88	+
	89	+ if profile.person?
	90	+ redirect_to :controller => 'profile', :action => 'friends'
75	91	else
76		- redirect_to :action => 'invite_friends'
77		- session[:notice] = _('Please enter a valid profile.')
	92	+ redirect_to :controller => 'profile', :action => 'members'
78	93	end
	94	+
79	95	end
80	96
81	97	def search
...	...
...	...	@@ -589,14 +589,24 @@ module ApplicationHelper
589	589	trigger_class = 'enterprise-trigger'
590	590	end
591	591	end
592		- extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
	592	+
	593	+ extra_info_tag = ''
	594	+ img_class = 'profile-image'
	595	+
	596	+ if extra_info.is_a? Hash
	597	+ extra_info_tag = content_tag( 'span', extra_info[:value], :class => 'extra_info '+extra_info[:class])
	598	+ img_class +=' '+extra_info[:class]
	599	+ else
	600	+ extra_info_tag = content_tag( 'span', extra_info, :class => 'extra_info' )
	601	+ end
	602	+ #extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
593	603	links = links_for_balloon(profile)
594	604	content_tag('div', content_tag(tag,
595	605	(environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? popover_menu(_('Profile links'),profile.short_name,links,{:class => trigger_class, :url => url}) : "") +
596	606	link_to(
597		- content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
	607	+ content_tag( 'span', profile_image( profile, size ), :class => img_class ) +
598	608	content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
599		- extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
	609	+ extra_info_tag + profile_sex_icon( profile ) + profile_cat_icons( profile ),
600	610	profile.url,
601	611	:class => 'profile_link url',
602	612	:help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
...	...
...	...	@@ -703,6 +703,32 @@ private :generate_url, :url_options
703	703	end
704	704	end
705	705
	706	+ # Adds many people to profile by id's or email's
	707	+ def add_members(people_ids)
	708	+
	709	+ unless people_ids.nil? && people_ids.empty?
	710	+ people = []
	711	+
	712	+ if people_ids.first =~ /\@/
	713	+ people = User.where(email: people_ids)
	714	+ else
	715	+ people = Person.where(id: people_ids)
	716	+ end
	717	+
	718	+ people.each do \|profile\|
	719	+ person = profile
	720	+
	721	+ if profile.is_a? User
	722	+ person = profile.person
	723	+ end
	724	+
	725	+ unless person.is_member_of?(self)
	726	+ add_member person
	727	+ end
	728	+ end
	729	+ end
	730	+ end
	731	+
706	732	def remove_member(person)
707	733	self.disaffiliate(person, Profile::Roles.all_roles(environment.id))
708	734	end
...	...
...	...	@@ -50,6 +50,8 @@
50	50	<%#*Adds extra buttons to the toolbar%>
51	51	<%= @plugins.dispatch(:article_extra_toolbar_buttons, @page).collect { \|content\| instance_exec(&content) }.join("") %>
52	52
	53	+ <%= @plugins.dispatch(:article_toolbar_actions, @page).collect { \|content\| instance_exec(&content) }.join("")%>
	54	+
53	55	<%= report_abuse(profile, :link, @page) %>
54	56	</div>
55	57	<div id="article-header">
...	...
...	...	@@ -4,6 +4,10 @@
4	4
5	5	<% cache_timeout(profile.members_cache_key(params), 4.hours) do %>
6	6	<ul class='profile-list'>
	7	+ <!--
	8	+ @todo Highlight visual for invited members
	9	+ of a community
	10	+ -->
7	11	<% @members.each do \|member\| %>
8	12	<%= profile_image_link(member) %>
9	13	<% end %>
...	...
...	...	@@ -0,0 +1,11 @@
	1	+class AddMembersJob < Struct.new(:people_ids, :profile_id, :locale)
	2	+
	3	+ def perform
	4	+ Noosfero.with_locale(locale) do
	5	+
	6	+ profile = Profile.find(profile_id)
	7	+ profile.add_members people_ids
	8	+
	9	+ end
	10	+ end
	11	+end
...	...
...	...	@@ -448,6 +448,12 @@ class Noosfero::Plugin
448	448	[]
449	449	end
450	450
	451	+ # -> Adds aditional actions to article
	452	+ # returns = lambda block that creates html code
	453	+ def article_toolbar_actions article
	454	+ nil
	455	+ end
	456	+
451	457	# -> Adds adicional content to article
452	458	# returns = lambda block that creates html code
453	459	def article_extra_contents(article)
...	...
...	...	@@ -0,0 +1,18 @@
	1	+class CommentParagraphPluginMyprofileController < MyProfileController
	2	+
	3	+ before_filter :check_permission
	4	+
	5	+ def toggle_activation
	6	+ @article.comment_paragraph_plugin_activate = !@article.comment_paragraph_plugin_activate
	7	+ @article.save!
	8	+ redirect_to @article.view_url
	9	+ end
	10	+
	11	+ protected
	12	+
	13	+ def check_permission
	14	+ @article = profile.articles.find(params[:id])
	15	+ render_access_denied unless @article.comment_paragraph_plugin_enabled? && @article.allow_edit?(user)
	16	+ end
	17	+
	18	+end
...	...
...	...	@@ -41,7 +41,14 @@ class CommentParagraphPlugin < Noosfero::Plugin
41	41	end
42	42
43	43	def self.activation_mode_default_setting
44		- 'auto'
	44	+ 'manual'
	45	+ end
	46	+
	47	+ def article_toolbar_actions(article)
	48	+ return unless article.comment_paragraph_plugin_enabled?
	49	+ proc do
	50	+ button :toggle_comment_paragraph, article.comment_paragraph_plugin_activated? ? _('Deactivate Comments') : _('Activate Comments'), :controller => 'comment_paragraph_plugin_myprofile', :action => 'toggle_activation', :id => article.id if article.allow_edit?(user)
	51	+ end
45	52	end
46	53
47	54	end
...	...
...	...	@@ -12,7 +12,7 @@ class CommentParagraphPlugin::AllowComment < Noosfero::Plugin::Macro
12	12	count = article.paragraph_comments.without_spam.in_paragraph(paragraph_uuid).count
13	13
14	14	proc {
15		- if controller.kind_of?(ContentViewerController)
	15	+ if controller.kind_of?(ContentViewerController) && article.comment_paragraph_plugin_activated?
16	16	render :partial => 'comment_paragraph_plugin_profile/comment_paragraph',
17	17	:locals => {:paragraph_uuid => paragraph_uuid, :article_id => article.id, :inner_html => inner_html, :count => count, :profile_identifier => article.profile.identifier }
18	18	else
...	...