Merge branch 'ActionItem2562' into ActionItem2520

Leandro Nunes dos Santos
2 parents 68fd5fb8 2e7d2cf5
Showing 12 changed files with 289 additions and 52 deletions Show diff stats
app/controllers/public/comment_controller.rb
app/helpers/application_helper.rb
app/helpers/comment_helper.rb
app/views/comment/_comment.rhtml
config/plugins/comment_actions
lib/noosfero/plugin.rb
public/javascripts/add-and-join.js
public/javascripts/application.js
public/stylesheets/application.css
test/functional/comment_controller_test.rb
test/functional/content_viewer_controller_test.rb
test/unit/comment_helper_test.rb
@@ -160,6 +160,15 @@ class CommentController &lt; ApplicationController
      end
    end
   end
+  
+  #FIXME make this test
+  def check_actions
+    comment = profile.comments_received.find(params[:id])
+    ids = @plugins.dispatch(:check_comment_actions, comment).collect do |action|
+      action.kind_of?(Proc) ? self.instance_eval(&action) : action
+    end.flatten.compact
+    render :json => {:ids => ids}
+  end
  
   protected
  
@@ -30,6 +30,8 @@ module ApplicationHelper
  
   include AccountHelper
  
+  include CommentHelper
+
   include BlogHelper
  
   include ContentViewerHelper
@@ -21,5 +21,48 @@ module CommentHelper
     end
     title
   end
+  
+  def comment_actions(comment)
+    url = url_for(:profile => profile.identifier, :controller => :comment, :action => :check_actions, :id => comment.id)
+    links = links_for_comment_actions(comment)
+    content_tag(:li, link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger comment-trigger', :url => url), :class=> 'vcard') unless links.empty?
+  end
+
+  private
+
+  def links_for_comment_actions(comment)
+    actions = [link_for_report_abuse(comment), link_for_spam(comment), link_for_edit(comment), link_for_remove(comment)]
+    @plugins.dispatch(:comment_actions, comment).collect do |action|
+      actions << (action.kind_of?(Proc) ? self.instance_eval(&action) : action)
+    end
+    actions.flatten.compact
+  end
+
+  def link_for_report_abuse(comment)
+    if comment.author
+      report_abuse_link = report_abuse(comment.author, :comment_link, comment)
+      {:link => report_abuse_link} if report_abuse_link
+    end
+  end
+
+  def link_for_spam(comment)
+    if comment.spam?
+      {:link => link_to_function(_('Mark as NOT SPAM'), 'remove_comment(this, %s); return false;' % url_for(:profile => profile.identifier, :mark_comment_as_ham => comment.id).to_json, :class => 'comment-footer comment-footer-link comment-footer-hide')}
+    elsif (logged_in? && (user == profile || user.has_permission?(:moderate_comments, profile)))
+      {:link => link_to_function(_('Mark as SPAM'), 'remove_comment(this, %s, %s); return false;' % [url_for(:profile => profile.identifier, :controller => 'comment', :action => :mark_as_spam, :id => comment.id).to_json, _('Are you sure you want to mark this comment as SPAM?').to_json], :class => 'comment-footer comment-footer-link comment-footer-hide')}
+    end
+  end
+
+  def link_for_edit(comment)
+    if comment.author && comment.author == user 
+      {:link => expirable_comment_link(comment, :edit, _('Edit'), url_for(:profile => profile.identifier, :controller => :comment, :action => :edit, :id => comment.id),:class => 'colorbox')}
+    end
+  end
+
+  def link_for_remove(comment)
+    if logged_in? && (user == profile || user == comment.author || user.has_permission?(:moderate_comments, profile))
+      {:link => link_to_function(_('Remove'), 'remove_comment(this, %s, %s); return false ;' % [url_for(:profile => profile.identifier, :controller => 'comment', :action => :destroy, :id => comment.id).to_json, _('Are you sure you want to remove this comment and all its replies?').to_json], :class => 'comment-footer comment-footer-link comment-footer-hide remove-children')}
+    end
+  end
  
 end
@@ -31,6 +31,21 @@
   <% comment_balloon do %>
  
     <div class="comment-details">
+      <div class="comment-header">
+        <ul>
+          <div class="comment-actions">
+            <%= comment_actions(comment) %>
+          </div>
+        </ul>
+      <% unless comment.spam? %>
+        <%= link_to_function '',
+          "var f = add_comment_reply_form(this, %s); f.find('comment_title, textarea').val(''); return false" % comment.id,
+          :class => 'comment-footer comment-footer-link comment-footer-hide comment-actions-reply button',
+          :id => 'comment-reply-to-' + comment.id.to_s
+        %>
+      <% end %>
+      </div>
+
       <div class="comment-created-at">
         <%= show_time(comment.created_at) %>
       </div>
@@ -41,7 +56,7 @@
       </div>
     </div>
  
-    <div class="comment_reply post_comment_box closed">
+    <div class="comment_reply post_comment_box closed" id="comment_reply_to_<%= comment.id %>">
       <% if @comment && @comment.errors.any? && @comment.reply_of_id.to_i == comment.id %>
         <%= error_messages_for :comment %>
         <script type="text/javascript">
@@ -51,36 +66,6 @@
           });
         </script>
       <% end %>
-      <%= report_abuse(comment.author, :comment_link, comment) if comment.author %>
-
-      <% if comment.spam? %>
-        &nbsp;
-        <%= link_to_function(_('Mark as NOT SPAM'), 'remove_comment(this, %s); return false;' % url_for(:profile => profile.identifier, :mark_comment_as_ham => comment.id).to_json, :class => 'comment-footer comment-footer-link comment-footer-hide')  %>
-      <% else %>
-        <% if (logged_in? && (user == profile || user.has_permission?(:moderate_comments, profile))) %>
-          &nbsp;
-          <%= link_to_function(_('Mark as SPAM'), 'remove_comment(this, %s, %s); return false;' % [url_for(:profile => profile.identifier, :controller => 'comment', :action => :mark_as_spam, :id => comment.id).to_json, _('Are you sure you want to mark this comment as SPAM?').to_json], :class => 'comment-footer comment-footer-link comment-footer-hide')  %>
-        <% end %>
-      <% end %>
-
-      <% if comment.author && comment.author == user %>
-        &nbsp;
-        <%= expirable_comment_link comment, :edit, _('Edit'), url_for(:profile => profile.identifier, :controller => :comment, :action => :edit, :id => comment.id),:class => 'colorbox' %>
-      <% end %>
-
-      <% if logged_in? && (user == profile || user == comment.author || user.has_permission?(:moderate_comments, profile)) %>
-        &nbsp;
-        <%= link_to_function(_('Remove'), 'remove_comment(this, %s, %s); return false ;' % [url_for(:profile => profile.identifier, :controller => 'comment', :action => :destroy, :id => comment.id).to_json, _('Are you sure you want to remove this comment and all its replies?').to_json], :class => 'comment-footer comment-footer-link comment-footer-hide remove-children') %>
-      <% end %>
-
-      <% unless comment.spam? %>
-        &nbsp;
-        <%= link_to_function _('Reply'),
-          "var f = add_comment_reply_form(this, %s); f.find('comment_title, textarea').val(''); return false" % comment.id,
-          :class => 'comment-footer comment-footer-link comment-footer-hide',
-          :id => 'comment-reply-to-' + comment.id.to_s
-        %>
-      <% end %>
     </div>
  
   <% end %>
@@ -0,0 +1 @@
+/home/81665687568/projetos/noosfero_development/plugins/comment_actions
 \ No newline at end of file
@@ -339,6 +339,30 @@ class Noosfero::Plugin
   def comment_marked_as_ham(comment)
   end
  
+  # Adds extra actions for comments
+  # returns = list of hashes or lambda block that creates a list of hashes
+  # example:
+  #
+  #   def comment_actions(comment)
+  #     [{:link => link_to_function(...)}]
+  #   end
+  #
+  def comment_actions(comment)
+    nil
+  end
+
+  # This method is called when the user click on comment actions menu.
+  # returns = list or lambda block that return ids of enabled menu items for comments
+  # example:
+  #
+  #   def check_comment_actions(comment)
+  #     ['#action1', '#action2']
+  #   end
+  #
+  def check_comment_actions(comment)
+    []
+  end
+
   # -> Adds fields to the signup form
   # returns = lambda block that creates html code
   def signup_extra_contents
@@ -100,4 +100,24 @@ jQuery(function($) {
         clicked.parent().find(".send-an-email").fadeOut();
     })
   })
+
+  $(".comment-trigger").live('click', function(){
+    clicked = $(this);
+    url = clicked.attr("url");
+    $.get(url, function(data){
+      ids = [];
+      if(data && data.ids) {
+        for(var i=0; i<data.ids.length; i++) {
+          clicked.parent().find(data.ids[i]).fadeIn();
+          ids.push(data.ids[i]);
+        }
+      }
+      clicked.parent().find('.comment-action-extra').each(function() {
+        if($.inArray('#'+$(this).attr('id'), ids))
+          $(this).fadeOut();
+      });
+    })
+    return false;
+  })
+
 });
@@ -314,11 +314,17 @@ function toggleSubmenu(trigger, title, link_list) {
   content.append('<h4>' + title + '</h4>');
   jQuery.each(link_list, function(index, link_hash) {
     for (label in link_hash) {
-      options = "";
-      jQuery.each(link_hash[label], function(option, value){
-        options += option +'="'+ value + '" ';
-      })
-      list.append('<li><a '+ options +'>' + label + '</a></li>');
+      if(link_hash[label]!=null) {
+        if(label=='link' && jQuery.type(link_hash[label])=="string") {
+          list.append('<li>' + link_hash[label] + '</li>');
+        } else {
+          options = "";
+          jQuery.each(link_hash[label], function(option, value){
+            options += option +'="'+ value + '" ';
+          })
+          list.append('<li><a '+ options +'>' + label + '</a></li>');
+        }
+      }
     }
   });
   content.append(list);
@@ -342,9 +348,9 @@ function hideAllSubmenus() {
 // Hide visible ballons when clicked outside them
 jQuery(document).ready(function() {
   jQuery('body').live('click', function() { hideAllSubmenus(); });
-  jQuery('.menu-submenu-trigger').click(function(e) { e.stopPropagation(); });
-  jQuery('.simplemenu-trigger').click(function(e) { e.stopPropagation(); });
-  jQuery('#chat-online-users').click(function(e) { e.stopPropagation(); });
+  jQuery('.menu-submenu-trigger').live('click', function(e) { e.stopPropagation(); });
+  jQuery('.simplemenu-trigger').live('click', function(e) { e.stopPropagation(); });
+  jQuery('#chat-online-users').live('click', function(e) { e.stopPropagation(); });
 });
  
 function input_javascript_ordering_stuff() {
@@ -710,8 +716,8 @@ jQuery(function($) {
 });
  
 function add_comment_reply_form(button, comment_id) {
-  var container = jQuery(button).parents('.comment_reply');
-
+  //var container = jQuery(button).parents('.comment_reply');
+  var container = jQuery('#comment_reply_to_'+comment_id);
   var f = container.find('.comment_form');
   if (f.length == 0) {
     comments_div = jQuery(button).parents('.comments');
@@ -1802,13 +1802,32 @@ a.button.disabled, input.disabled {
 #content .profile-list-block ul {
   width: 200px;
 }
-#content .common-profile-list-block li {
-  margin: 0px;
+#content .comment-header .comment-actions-reply {
+  float: right;
+  background-image: url(/designs/icons/tango/Tango/16x16/actions/go-jump.png);
+  height: 12px;
+}
+#content .comment-header ul {
+  float: right;
+  margin: 1px 0px 14px 0px;
+}
+#content .comment-actions .menu-submenu-header, #content .comment-actions .menu-submenu-footer, #content .comment-actions .menu-submenu h4 {
+  display: none;
+}
+#content .comment-actions .menu-submenu ul {
+  border: 1px solid #888a85;
+  background-color: #efefef;
+  padding-right: 2px;
+  height: auto;
+  display: block;
+}
+#content .common-profile-list-block li, #content .comment-actions li {
+  margin: 0px !important;
   padding: 0px;
   list-style: none;
   position: relative;
 }
-.common-profile-list-block .vcard a {
+.common-profile-list-block .vcard a, .comment-actions .vcard a {
   display: block;
   height: 112px;
   max-height: 112px;
@@ -1819,7 +1838,7 @@ a.button.disabled, input.disabled {
   text-align: center;
   overflow: hidden;
   font-size: 11px;
-  text-decoration: none;
+  text-decoration: none !important;
   color: #000;
   position: relative;
   cursor: pointer; /* work arround bug for MSIE */
@@ -4575,11 +4594,17 @@ h1#agenda-title {
 }
 /* Profile balloon */
  
-.common-profile-list-block .vcard {
+.common-profile-list-block .vcard, .comment-actions .vcard {
   position: relative !important;
   float: left;
 }
-.common-profile-list-block .vcard .menu-submenu-trigger, .menu-submenu-trigger {
+#content .comment-actions .vcard {
+  padding-right: 20px;
+}
+#content .comment-actions .vcard .menu-submenu-trigger {
+  display: block;
+}
+.common-profile-list-block .vcard .menu-submenu-trigger, .menu-submenu-trigger, .comment-actions .vcard .menu-submenu-trigger {
   display: none;
   width: 16px;
   height: 16px;
@@ -4593,7 +4618,7 @@ h1#agenda-title {
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
 }
-.common-profile-list-block .vcard .menu-submenu-trigger:hover, .menu-submenu-trigger:hover {
+.common-profile-list-block .vcard .menu-submenu-trigger:hover, .menu-submenu-trigger:hover, .comment-actions .vcard .menu-submenu-trigger:hover {
   background: #fff url(/images/top-arrow.png) center center no-repeat;
   border: 1px solid #ccc;
 }
@@ -4612,6 +4637,10 @@ h1#agenda-title {
   padding: 0;
   text-align: left;
 }
+.comment-details .menu-submenu {
+  bottom: 0px;
+  right: -134px;
+}
 .box-2 .menu-submenu, .box-3 .menu-submenu {
   bottom: 78px;
   right: -44px;
@@ -4646,7 +4675,7 @@ h1#agenda-title {
 .msie7 #search-results .menu-submenu-trigger {
   width: 20px !important;
 }
-.common-profile-list-block .vcard .menu-submenu a {
+.common-profile-list-block .vcard .menu-submenu a, .comment-actions .vcard .menu-submenu a {
   float: none;
   display: block;
   height: auto;
@@ -493,7 +493,7 @@ class CommentControllerTest &lt; ActionController::TestCase
     assert_equal 'Comment edited', Comment.find(comment.id).body
   end
  
-   should 'not crash on update comment if comment does not exist' do
+  should 'not crash on update comment if comment does not exist' do
     login_as profile.identifier
     page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
  
@@ -501,4 +501,18 @@ class CommentControllerTest &lt; ActionController::TestCase
     assert_response 404
   end
  
+  should 'returns ids of menu items that has to be displayed' do
+    class TestActionPlugin < Noosfero::Plugin
+      def check_comment_actions(c)
+        ['action1', 'action2']
+      end
+    end
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestActionPlugin.new])
+    login_as profile.identifier
+    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
+    comment = fast_create(Comment, :body => 'Original comment', :source_id => page.id, :source_type => 'Article')
+    xhr :post, :check_actions, :profile => profile.identifier, :id => comment.id
+    assert_match /\{\"ids\":\[\"action1\",\"action2\"\]\}/, @response.body
+  end
+
 end
@@ -1047,7 +1047,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     comment.save!
     login_as 'testuser'
     get :view_page, :profile => 'testuser', :page => [ 'test' ]
-    assert_tag :tag => 'a', :attributes => { :class => /comment-footer-link/ }, :content => 'Reply'
+    assert_tag :tag => 'a', :attributes => { :class => /comment-actions-reply/ }
   end
  
   should 'display reply to comment button if not authenticated' do
@@ -1057,7 +1057,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     comment = article.comments.build(:author => profile, :title => 'a comment', :body => 'lalala')
     comment.save!
     get :view_page, :profile => 'testuser', :page => [ 'test' ]
-    assert_tag :tag => 'a', :attributes => { :class => /comment-footer-link/ }, :content => 'Reply'
+    assert_tag :tag => 'a', :attributes => { :class => /comment-actions-reply/ }
   end
  
   should 'display replies if comment has replies' do
@@ -0,0 +1,104 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CommentHelperTest < ActiveSupport::TestCase
+
+  include CommentHelper
+  include ActionView::Helpers::TagHelper
+  include NoosferoTestHelper
+
+  def setup
+    @user = create_user('usertest').person
+    @profile = @user
+    self.stubs(:logged_in?).returns(true)
+    self.stubs(:report_abuse).returns('<a href="#">link</a>')
+    self.stubs(:expirable_comment_link).returns('<a href="#">link</a>')
+    @plugins.stubs(:dispatch).returns([])
+  end
+
+  attr_reader :user, :profile
+
+  should 'show menu if it has links for actions' do
+    comment = Comment.new
+    menu = comment_actions(comment)
+    assert menu
+  end
+  
+  should 'do not show menu if it has no actions' do
+    comment = Comment.new
+    self.stubs(:links_for_comment_actions).returns([])
+    menu = comment_actions(comment)
+    assert !menu
+  end
+  
+  should 'do not show menu if it has nil actions only' do
+    comment = Comment.new
+    self.stubs(:link_for_report_abuse).returns(nil)
+    self.stubs(:link_for_spam).returns(nil)
+    self.stubs(:link_for_edit).returns(nil)
+    self.stubs(:link_for_remove).returns(nil)
+    menu = comment_actions(comment)
+    assert !menu
+  end
+
+  should 'include actions of plugins in menu' do
+    comment = Comment.new
+    plugin_action = {:link => 'plugin_action'}
+    @plugins.stubs(:dispatch).returns([plugin_action])
+    links = links_for_comment_actions(comment)
+    assert_includes links, plugin_action
+  end
+
+  should 'include lambda actions of plugins in menu' do
+    comment = Comment.new
+    plugin_action = lambda{[{:link => 'plugin_action'}, {:link => 'plugin_action2'}]}
+    @plugins.stubs(:dispatch).returns([plugin_action])
+    links = links_for_comment_actions(comment)
+    assert_includes links, {:link => 'plugin_action'}
+    assert_includes links, {:link => 'plugin_action2'}
+  end
+  
+  should 'return link for report abuse action when comment has a author' do
+    comment = Comment.new
+    comment.author = user
+    link = link_for_report_abuse(comment)
+    assert link
+  end
+  
+  should 'do not return link for report abuse action when comment has no author' do
+    comment = Comment.new
+    link = link_for_report_abuse(comment)
+    assert !link
+  end
+
+  should 'return link for mark comment as spam' do
+    comment = Comment.new
+    link = link_for_spam(comment)
+    assert_match /Mark as SPAM/, link[:link]
+  end
+
+  should 'return link for mark comment as not spam' do
+    comment = Comment.new
+    comment.spam = true
+    link = link_for_spam(comment)
+    assert_match /Mark as NOT SPAM/, link[:link]
+  end
+
+  should 'do not return link for edit comment' do
+    comment = Comment.new
+    link = link_for_edit(comment)
+    assert !link
+  end
+
+  should 'return link for edit comment' do
+    comment = Comment.new
+    comment.author = user
+    link = link_for_edit(comment)
+    assert link
+  end
+
+  def link_to_function(content, url, options = {})
+    link_to(content, url, options)
+  end
+
+end
+
...	...	@@ -160,6 +160,15 @@ class CommentController < ApplicationController
160	160	end
161	161	end
162	162	end
	163	+
	164	+ #FIXME make this test
	165	+ def check_actions
	166	+ comment = profile.comments_received.find(params[:id])
	167	+ ids = @plugins.dispatch(:check_comment_actions, comment).collect do \|action\|
	168	+ action.kind_of?(Proc) ? self.instance_eval(&action) : action
	169	+ end.flatten.compact
	170	+ render :json => {:ids => ids}
	171	+ end
163	172
164	173	protected
165	174
...	...
...	...	@@ -30,6 +30,8 @@ module ApplicationHelper
30	30
31	31	include AccountHelper
32	32
	33	+ include CommentHelper
	34	+
33	35	include BlogHelper
34	36
35	37	include ContentViewerHelper
...	...
...	...	@@ -21,5 +21,48 @@ module CommentHelper
21	21	end
22	22	title
23	23	end
	24	+
	25	+ def comment_actions(comment)
	26	+ url = url_for(:profile => profile.identifier, :controller => :comment, :action => :check_actions, :id => comment.id)
	27	+ links = links_for_comment_actions(comment)
	28	+ content_tag(:li, link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger comment-trigger', :url => url), :class=> 'vcard') unless links.empty?
	29	+ end
	30	+
	31	+ private
	32	+
	33	+ def links_for_comment_actions(comment)
	34	+ actions = [link_for_report_abuse(comment), link_for_spam(comment), link_for_edit(comment), link_for_remove(comment)]
	35	+ @plugins.dispatch(:comment_actions, comment).collect do \|action\|
	36	+ actions << (action.kind_of?(Proc) ? self.instance_eval(&action) : action)
	37	+ end
	38	+ actions.flatten.compact
	39	+ end
	40	+
	41	+ def link_for_report_abuse(comment)
	42	+ if comment.author
	43	+ report_abuse_link = report_abuse(comment.author, :comment_link, comment)
	44	+ {:link => report_abuse_link} if report_abuse_link
	45	+ end
	46	+ end
	47	+
	48	+ def link_for_spam(comment)
	49	+ if comment.spam?
	50	+ {:link => link_to_function(_('Mark as NOT SPAM'), 'remove_comment(this, %s); return false;' % url_for(:profile => profile.identifier, :mark_comment_as_ham => comment.id).to_json, :class => 'comment-footer comment-footer-link comment-footer-hide')}
	51	+ elsif (logged_in? && (user == profile \|\| user.has_permission?(:moderate_comments, profile)))
	52	+ {:link => link_to_function(_('Mark as SPAM'), 'remove_comment(this, %s, %s); return false;' % [url_for(:profile => profile.identifier, :controller => 'comment', :action => :mark_as_spam, :id => comment.id).to_json, _('Are you sure you want to mark this comment as SPAM?').to_json], :class => 'comment-footer comment-footer-link comment-footer-hide')}
	53	+ end
	54	+ end
	55	+
	56	+ def link_for_edit(comment)
	57	+ if comment.author && comment.author == user
	58	+ {:link => expirable_comment_link(comment, :edit, _('Edit'), url_for(:profile => profile.identifier, :controller => :comment, :action => :edit, :id => comment.id),:class => 'colorbox')}
	59	+ end
	60	+ end
	61	+
	62	+ def link_for_remove(comment)
	63	+ if logged_in? && (user == profile \|\| user == comment.author \|\| user.has_permission?(:moderate_comments, profile))
	64	+ {:link => link_to_function(_('Remove'), 'remove_comment(this, %s, %s); return false ;' % [url_for(:profile => profile.identifier, :controller => 'comment', :action => :destroy, :id => comment.id).to_json, _('Are you sure you want to remove this comment and all its replies?').to_json], :class => 'comment-footer comment-footer-link comment-footer-hide remove-children')}
	65	+ end
	66	+ end
24	67
25	68	end
...	...
...	...	@@ -31,6 +31,21 @@
31	31	<% comment_balloon do %>
32	32
33	33	<div class="comment-details">
	34	+ <div class="comment-header">
	35	+ <ul>
	36	+ <div class="comment-actions">
	37	+ <%= comment_actions(comment) %>
	38	+ </div>
	39	+ </ul>
	40	+ <% unless comment.spam? %>
	41	+ <%= link_to_function '',
	42	+ "var f = add_comment_reply_form(this, %s); f.find('comment_title, textarea').val(''); return false" % comment.id,
	43	+ :class => 'comment-footer comment-footer-link comment-footer-hide comment-actions-reply button',
	44	+ :id => 'comment-reply-to-' + comment.id.to_s
	45	+ %>
	46	+ <% end %>
	47	+ </div>
	48	+
34	49	<div class="comment-created-at">
35	50	<%= show_time(comment.created_at) %>
36	51	</div>
...	...	@@ -41,7 +56,7 @@
41	56	</div>
42	57	</div>
43	58
44		- <div class="comment_reply post_comment_box closed">
	59	+ <div class="comment_reply post_comment_box closed" id="comment_reply_to_<%= comment.id %>">
45	60	<% if @comment && @comment.errors.any? && @comment.reply_of_id.to_i == comment.id %>
46	61	<%= error_messages_for :comment %>
47	62	<script type="text/javascript">
...	...	@@ -51,36 +66,6 @@
51	66	});
52	67	</script>
53	68	<% end %>
54		- <%= report_abuse(comment.author, :comment_link, comment) if comment.author %>
55		-
56		- <% if comment.spam? %>
57		-
58		- <%= link_to_function(_('Mark as NOT SPAM'), 'remove_comment(this, %s); return false;' % url_for(:profile => profile.identifier, :mark_comment_as_ham => comment.id).to_json, :class => 'comment-footer comment-footer-link comment-footer-hide') %>
59		- <% else %>
60		- <% if (logged_in? && (user == profile \|\| user.has_permission?(:moderate_comments, profile))) %>
61		-
62		- <%= link_to_function(_('Mark as SPAM'), 'remove_comment(this, %s, %s); return false;' % [url_for(:profile => profile.identifier, :controller => 'comment', :action => :mark_as_spam, :id => comment.id).to_json, _('Are you sure you want to mark this comment as SPAM?').to_json], :class => 'comment-footer comment-footer-link comment-footer-hide') %>
63		- <% end %>
64		- <% end %>
65		-
66		- <% if comment.author && comment.author == user %>
67		-
68		- <%= expirable_comment_link comment, :edit, _('Edit'), url_for(:profile => profile.identifier, :controller => :comment, :action => :edit, :id => comment.id),:class => 'colorbox' %>
69		- <% end %>
70		-
71		- <% if logged_in? && (user == profile \|\| user == comment.author \|\| user.has_permission?(:moderate_comments, profile)) %>
72		-
73		- <%= link_to_function(_('Remove'), 'remove_comment(this, %s, %s); return false ;' % [url_for(:profile => profile.identifier, :controller => 'comment', :action => :destroy, :id => comment.id).to_json, _('Are you sure you want to remove this comment and all its replies?').to_json], :class => 'comment-footer comment-footer-link comment-footer-hide remove-children') %>
74		- <% end %>
75		-
76		- <% unless comment.spam? %>
77		-
78		- <%= link_to_function _('Reply'),
79		- "var f = add_comment_reply_form(this, %s); f.find('comment_title, textarea').val(''); return false" % comment.id,
80		- :class => 'comment-footer comment-footer-link comment-footer-hide',
81		- :id => 'comment-reply-to-' + comment.id.to_s
82		- %>
83		- <% end %>
84	69	</div>
85	70
86	71	<% end %>
...	...
...	...	@@ -0,0 +1 @@
	1	+/home/81665687568/projetos/noosfero_development/plugins/comment_actions
0	2	\ No newline at end of file
...	...
...	...	@@ -339,6 +339,30 @@ class Noosfero::Plugin
339	339	def comment_marked_as_ham(comment)
340	340	end
341	341
	342	+ # Adds extra actions for comments
	343	+ # returns = list of hashes or lambda block that creates a list of hashes
	344	+ # example:
	345	+ #
	346	+ # def comment_actions(comment)
	347	+ # [{:link => link_to_function(...)}]
	348	+ # end
	349	+ #
	350	+ def comment_actions(comment)
	351	+ nil
	352	+ end
	353	+
	354	+ # This method is called when the user click on comment actions menu.
	355	+ # returns = list or lambda block that return ids of enabled menu items for comments
	356	+ # example:
	357	+ #
	358	+ # def check_comment_actions(comment)
	359	+ # ['#action1', '#action2']
	360	+ # end
	361	+ #
	362	+ def check_comment_actions(comment)
	363	+ []
	364	+ end
	365	+
342	366	# -> Adds fields to the signup form
343	367	# returns = lambda block that creates html code
344	368	def signup_extra_contents
...	...
...	...	@@ -100,4 +100,24 @@ jQuery(function($) {
100	100	clicked.parent().find(".send-an-email").fadeOut();
101	101	})
102	102	})
	103	+
	104	+ $(".comment-trigger").live('click', function(){
	105	+ clicked = $(this);
	106	+ url = clicked.attr("url");
	107	+ $.get(url, function(data){
	108	+ ids = [];
	109	+ if(data && data.ids) {
	110	+ for(var i=0; i<data.ids.length; i++) {
	111	+ clicked.parent().find(data.ids[i]).fadeIn();
	112	+ ids.push(data.ids[i]);
	113	+ }
	114	+ }
	115	+ clicked.parent().find('.comment-action-extra').each(function() {
	116	+ if($.inArray('#'+$(this).attr('id'), ids))
	117	+ $(this).fadeOut();
	118	+ });
	119	+ })
	120	+ return false;
	121	+ })
	122	+
103	123	});
...	...
...	...	@@ -314,11 +314,17 @@ function toggleSubmenu(trigger, title, link_list) {
314	314	content.append('<h4>' + title + '</h4>');
315	315	jQuery.each(link_list, function(index, link_hash) {
316	316	for (label in link_hash) {
317		- options = "";
318		- jQuery.each(link_hash[label], function(option, value){
319		- options += option +'="'+ value + '" ';
320		- })
321		- list.append('<li><a '+ options +'>' + label + '</a></li>');
	317	+ if(link_hash[label]!=null) {
	318	+ if(label=='link' && jQuery.type(link_hash[label])=="string") {
	319	+ list.append('<li>' + link_hash[label] + '</li>');
	320	+ } else {
	321	+ options = "";
	322	+ jQuery.each(link_hash[label], function(option, value){
	323	+ options += option +'="'+ value + '" ';
	324	+ })
	325	+ list.append('<li><a '+ options +'>' + label + '</a></li>');
	326	+ }
	327	+ }
322	328	}
323	329	});
324	330	content.append(list);
...	...	@@ -342,9 +348,9 @@ function hideAllSubmenus() {
342	348	// Hide visible ballons when clicked outside them
343	349	jQuery(document).ready(function() {
344	350	jQuery('body').live('click', function() { hideAllSubmenus(); });
345		- jQuery('.menu-submenu-trigger').click(function(e) { e.stopPropagation(); });
346		- jQuery('.simplemenu-trigger').click(function(e) { e.stopPropagation(); });
347		- jQuery('#chat-online-users').click(function(e) { e.stopPropagation(); });
	351	+ jQuery('.menu-submenu-trigger').live('click', function(e) { e.stopPropagation(); });
	352	+ jQuery('.simplemenu-trigger').live('click', function(e) { e.stopPropagation(); });
	353	+ jQuery('#chat-online-users').live('click', function(e) { e.stopPropagation(); });
348	354	});
349	355
350	356	function input_javascript_ordering_stuff() {
...	...	@@ -710,8 +716,8 @@ jQuery(function($) {
710	716	});
711	717
712	718	function add_comment_reply_form(button, comment_id) {
713		- var container = jQuery(button).parents('.comment_reply');
714		-
	719	+ //var container = jQuery(button).parents('.comment_reply');
	720	+ var container = jQuery('#comment_reply_to_'+comment_id);
715	721	var f = container.find('.comment_form');
716	722	if (f.length == 0) {
717	723	comments_div = jQuery(button).parents('.comments');
...	...
...	...	@@ -1802,13 +1802,32 @@ a.button.disabled, input.disabled {
1802	1802	#content .profile-list-block ul {
1803	1803	width: 200px;
1804	1804	}
1805		-#content .common-profile-list-block li {
1806		- margin: 0px;
	1805	+#content .comment-header .comment-actions-reply {
	1806	+ float: right;
	1807	+ background-image: url(/designs/icons/tango/Tango/16x16/actions/go-jump.png);
	1808	+ height: 12px;
	1809	+}
	1810	+#content .comment-header ul {
	1811	+ float: right;
	1812	+ margin: 1px 0px 14px 0px;
	1813	+}
	1814	+#content .comment-actions .menu-submenu-header, #content .comment-actions .menu-submenu-footer, #content .comment-actions .menu-submenu h4 {
	1815	+ display: none;
	1816	+}
	1817	+#content .comment-actions .menu-submenu ul {
	1818	+ border: 1px solid #888a85;
	1819	+ background-color: #efefef;
	1820	+ padding-right: 2px;
	1821	+ height: auto;
	1822	+ display: block;
	1823	+}
	1824	+#content .common-profile-list-block li, #content .comment-actions li {
	1825	+ margin: 0px !important;
1807	1826	padding: 0px;
1808	1827	list-style: none;
1809	1828	position: relative;
1810	1829	}
1811		-.common-profile-list-block .vcard a {
	1830	+.common-profile-list-block .vcard a, .comment-actions .vcard a {
1812	1831	display: block;
1813	1832	height: 112px;
1814	1833	max-height: 112px;
...	...	@@ -1819,7 +1838,7 @@ a.button.disabled, input.disabled {
1819	1838	text-align: center;
1820	1839	overflow: hidden;
1821	1840	font-size: 11px;
1822		- text-decoration: none;
	1841	+ text-decoration: none !important;
1823	1842	color: #000;
1824	1843	position: relative;
1825	1844	cursor: pointer; /* work arround bug for MSIE */
...	...	@@ -4575,11 +4594,17 @@ h1#agenda-title {
4575	4594	}
4576	4595	/* Profile balloon */
4577	4596
4578		-.common-profile-list-block .vcard {
	4597	+.common-profile-list-block .vcard, .comment-actions .vcard {
4579	4598	position: relative !important;
4580	4599	float: left;
4581	4600	}
4582		-.common-profile-list-block .vcard .menu-submenu-trigger, .menu-submenu-trigger {
	4601	+#content .comment-actions .vcard {
	4602	+ padding-right: 20px;
	4603	+}
	4604	+#content .comment-actions .vcard .menu-submenu-trigger {
	4605	+ display: block;
	4606	+}
	4607	+.common-profile-list-block .vcard .menu-submenu-trigger, .menu-submenu-trigger, .comment-actions .vcard .menu-submenu-trigger {
4583	4608	display: none;
4584	4609	width: 16px;
4585	4610	height: 16px;
...	...	@@ -4593,7 +4618,7 @@ h1#agenda-title {
4593	4618	-moz-border-radius: 5px;
4594	4619	-webkit-border-radius: 5px;
4595	4620	}
4596		-.common-profile-list-block .vcard .menu-submenu-trigger:hover, .menu-submenu-trigger:hover {
	4621	+.common-profile-list-block .vcard .menu-submenu-trigger:hover, .menu-submenu-trigger:hover, .comment-actions .vcard .menu-submenu-trigger:hover {
4597	4622	background: #fff url(/images/top-arrow.png) center center no-repeat;
4598	4623	border: 1px solid #ccc;
4599	4624	}
...	...	@@ -4612,6 +4637,10 @@ h1#agenda-title {
4612	4637	padding: 0;
4613	4638	text-align: left;
4614	4639	}
	4640	+.comment-details .menu-submenu {
	4641	+ bottom: 0px;
	4642	+ right: -134px;
	4643	+}
4615	4644	.box-2 .menu-submenu, .box-3 .menu-submenu {
4616	4645	bottom: 78px;
4617	4646	right: -44px;
...	...	@@ -4646,7 +4675,7 @@ h1#agenda-title {
4646	4675	.msie7 #search-results .menu-submenu-trigger {
4647	4676	width: 20px !important;
4648	4677	}
4649		-.common-profile-list-block .vcard .menu-submenu a {
	4678	+.common-profile-list-block .vcard .menu-submenu a, .comment-actions .vcard .menu-submenu a {
4650	4679	float: none;
4651	4680	display: block;
4652	4681	height: auto;
...	...
...	...	@@ -493,7 +493,7 @@ class CommentControllerTest < ActionController::TestCase
493	493	assert_equal 'Comment edited', Comment.find(comment.id).body
494	494	end
495	495
496		- should 'not crash on update comment if comment does not exist' do
	496	+ should 'not crash on update comment if comment does not exist' do
497	497	login_as profile.identifier
498	498	page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
499	499
...	...	@@ -501,4 +501,18 @@ class CommentControllerTest < ActionController::TestCase
501	501	assert_response 404
502	502	end
503	503
	504	+ should 'returns ids of menu items that has to be displayed' do
	505	+ class TestActionPlugin < Noosfero::Plugin
	506	+ def check_comment_actions(c)
	507	+ ['action1', 'action2']
	508	+ end
	509	+ end
	510	+ Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestActionPlugin.new])
	511	+ login_as profile.identifier
	512	+ page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
	513	+ comment = fast_create(Comment, :body => 'Original comment', :source_id => page.id, :source_type => 'Article')
	514	+ xhr :post, :check_actions, :profile => profile.identifier, :id => comment.id
	515	+ assert_match /\{\"ids\":\[\"action1\",\"action2\"\]\}/, @response.body
	516	+ end
	517	+
504	518	end
...	...