diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-01-14 15:55:54 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-01-14 15:55:54 +0000 |
| commit | 002081f2245eb2f75848c0fed0cacf93902d0cf7 (patch) | |
| tree | 6d668eaaff685fa824b687e52b001824291316a2 | |
| parent | 18ea8357390018ecdcf222789bd5d91e736daa5b (diff) | |
| download | redmine-002081f2245eb2f75848c0fed0cacf93902d0cf7.tar.gz redmine-002081f2245eb2f75848c0fed0cacf93902d0cf7.zip | |
Change attachment link to download and add a view link for text attachments (#4774).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8645 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/issues_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/attachments/_links.html.erb | 11 | ||||
| -rw-r--r-- | public/images/magnifier.png | bin | 0 -> 615 bytes |
3 files changed, 9 insertions, 4 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 49d734452..9698949f2 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -210,7 +210,7 @@ module IssuesHelper old_value = content_tag("strike", old_value) if detail.old_value and detail.value.blank? if detail.property == 'attachment' && !value.blank? && a = Attachment.find_by_id(detail.prop_key) # Link to the attachment if it has not been removed - value = link_to_attachment(a) + value = link_to_attachment(a, :download => true) else value = content_tag("i", h(value)) if value end diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb index c92599a66..0b1480aad 100644 --- a/app/views/attachments/_links.html.erb +++ b/app/views/attachments/_links.html.erb @@ -1,9 +1,14 @@ <div class="attachments"> <% for attachment in attachments %> -<p><%= link_to_attachment attachment, :class => 'icon icon-attachment' -%> -<%= h(" - #{attachment.description}") unless attachment.description.blank? %> +<p><%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%> + <%= h(" - #{attachment.description}") unless attachment.description.blank? %> <span class="size">(<%= number_to_human_size attachment.filesize %>)</span> - <% if options[:deletable] %> + <% if attachment.is_text? %> + <%= link_to image_tag('magnifier.png'), + :controller => 'attachments', :action => 'show', + :id => attachment, :filename => attachment.filename %> + <% end %> + <% if options[:deletable] %> <%= link_to image_tag('delete.png'), attachment_path(attachment), :confirm => l(:text_are_you_sure), :method => :delete, diff --git a/public/images/magnifier.png b/public/images/magnifier.png Binary files differnew file mode 100644 index 000000000..cf3d97f75 --- /dev/null +++ b/public/images/magnifier.png |
