From 935ff6bc0bd4318960fa0b0235d54864b228c416 Mon Sep 17 00:00:00 2001 From: Leandro Nunes dos Santos Date: Fri, 28 Jun 2013 09:31:28 -0300 Subject: [PATCH] mergin with ActionItem2562 --- app/views/comment/_comment_form.rhtml | 18 ++++++------------ app/views/content_viewer/view_page.rhtml | 2 +- plugins/solr/views/search/.communities.rhtml.swp | Bin 0 -> 12288 bytes plugins/solr/views/search/.people.rhtml.swp | Bin 0 -> 12288 bytes public/javascripts/application.js | 63 --------------------------------------------------------------- public/javascripts/comment_form.js | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 6 files changed, 75 insertions(+), 82 deletions(-) create mode 100644 plugins/solr/views/search/.communities.rhtml.swp create mode 100644 plugins/solr/views/search/.people.rhtml.swp diff --git a/app/views/comment/_comment_form.rhtml b/app/views/comment/_comment_form.rhtml index 96bb539..a9413ca 100644 --- a/app/views/comment/_comment_form.rhtml +++ b/app/views/comment/_comment_form.rhtml @@ -5,17 +5,7 @@
-<% if display_link %> -

- <%= content_tag('a', '', :name => 'comment_form') + _('Post a comment') %> -

-<% end %> +<%= link_to(_('Post a comment'), '#', :class => 'display-comment-form') if display_link %> <% if !edition_mode && !pass_without_comment_captcha? %>
+ +<%= javascript_include_tag 'comment_form'%> diff --git a/app/views/content_viewer/view_page.rhtml b/app/views/content_viewer/view_page.rhtml index 648203f..f7621cb 100644 --- a/app/views/content_viewer/view_page.rhtml +++ b/app/views/content_viewer/view_page.rhtml @@ -95,7 +95,7 @@ <% end %> <% if @page.accept_comments? && @comments_count > 1 %> - <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button') %> + <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button', :onclick => "jQuery('#page-comment-form .display-comment-form').first().click();") %> <% end %>