Sligth changes to issue comments quoting links.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1773 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index 92d6e55932355b79a3493a7a70ce22bde66d75d1..45579f771fa0e8c260c736c05c73651790f570aa 100644 (file)
--- 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 df8fc372aedc4036c5e03e54b22711290df86dea..2dd1bacaa700e1043ccc68debb497aeac41f0cef 100644 (file)
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -57,9 +57,7 @@ end %>
 <hr />
 
 <div class="contextual">
-<%= 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' %>
 </div>
                               
 <p><strong><%=l(:field_description)%></strong></p>