diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb index 92d6e559..45579f77 100644 --- a/app/helpers/journals_helper.rb +++ b/app/helpers/journals_helper.rb @@ -21,12 +21,12 @@ module JournalsHelper editable = journal.editable_by?(User.current) links = [] if !journal.notes.blank? + links << link_to_remote(image_tag('comment.png'), + { :url => {:controller => 'issues', :action => 'reply', :id => journal.journalized, :journal_id => journal} }, + :title => l(:button_quote)) if options[:reply_links] links << link_to_in_place_notes_editor(image_tag('edit.png'), "journal-#{journal.id}-notes", { :controller => 'journals', :action => 'edit', :id => journal }, :title => l(:button_edit)) if editable - links << link_to_remote(image_tag('comment.png'), - { :url => {:controller => 'issues', :action => 'reply', :id => journal.journalized, :journal_id => journal} }, - :title => l(:button_reply)) if options[:reply_links] end content << content_tag('div', links.join(' '), :class => 'contextual') unless links.empty? content << textilizable(journal, :notes) diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml index df8fc372..2dd1baca 100644 --- a/app/views/issues/show.rhtml +++ b/app/views/issues/show.rhtml @@ -57,9 +57,7 @@ end %>
-<%= link_to_remote(image_tag('comment.png'), - { :url => {:controller => 'issues', :action => 'reply', :id => @issue} }, - :title => l(:button_reply)) if authorize_for('issues', 'edit') %> +<%= link_to_remote_if_authorized l(:button_quote), { :url => {:action => 'reply', :id => @issue} }, :class => 'icon icon-comment' %>

<%=l(:field_description)%>