summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-08-28 19:04:04 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-08-28 19:04:04 +0000
commited349ca9420cf3f6b794f2b7d408a6ee3386dbf8 (patch)
treee892c27c84b247c2639c947eeaff72e533496f2b
parentbfd0fb067ac35a4fa76b545a7b357fac72a63e18 (diff)
downloadredmine-ed349ca9420cf3f6b794f2b7d408a6ee3386dbf8.tar.gz
redmine-ed349ca9420cf3f6b794f2b7d408a6ee3386dbf8.zip
Sligth changes to issue comments quoting links.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1773 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/journals_helper.rb6
-rw-r--r--app/views/issues/show.rhtml4
2 files changed, 4 insertions, 6 deletions
diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index 92d6e5593..45579f771 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 df8fc372a..2dd1bacaa 100644
--- 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>