From a08c192606bc6780e76804e8817ede497d650c3f Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Tue, 30 Apr 2019 07:41:02 +0000 Subject: [PATCH] Merged r18106 from trunk to 3.4-stable (#31153). git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18108 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/files/index.html.erb | 72 +++++++++++++++++----------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index a1149bfbe..3e8dda160 100644 --- a/app/views/files/index.html.erb +++ b/app/views/files/index.html.erb @@ -6,41 +6,43 @@ <% delete_allowed = User.current.allowed_to?(:manage_files, @project) %> - - - <%= sort_header_tag('filename', :caption => l(:field_filename)) %> - <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc') %> - <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc') %> - <%= sort_header_tag('downloads', :caption => l(:label_downloads_abbr), :default_order => 'desc') %> - - - - -<% @containers.each do |container| %> - <% next if container.attachments.empty? -%> - <% if container.is_a?(Version) -%> - - - - <% end -%> - <% container.attachments.each do |file| %> - - - - - - - - +
+
<%= l(:field_digest) %>
- <%= link_to(container, {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %> -
<%= link_to_attachment file, :title => file.description -%><%= format_time(file.created_on) %><%= number_to_human_size(file.filesize) %><%= file.downloads %><%= file.digest_type %>: <%= file.digest %> - <%= link_to_attachment file, class: 'icon-only icon-download', title: l(:button_download), download: true %> - <%= link_to(l(:button_delete), attachment_path(file), :class => 'icon-only icon-del', - :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %> -
+ + <%= sort_header_tag('filename', :caption => l(:field_filename)) %> + <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc') %> + <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc') %> + <%= sort_header_tag('downloads', :caption => l(:label_downloads_abbr), :default_order => 'desc') %> + + + + + <% @containers.each do |container| %> + <% next if container.attachments.empty? -%> + <% if container.is_a?(Version) -%> + + + + <% end -%> + <% container.attachments.each do |file| %> + + + + + + + + + <% end %> <% end %> -<% end %> - -
<%= l(:field_digest) %>
+ <%= link_to(container, {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %> +
<%= link_to_attachment file, :title => file.description -%><%= format_time(file.created_on) %><%= number_to_human_size(file.filesize) %><%= file.downloads %><%= file.digest_type %>: <%= file.digest %> + <%= link_to_attachment file, class: 'icon-only icon-download', title: l(:button_download), download: true %> + <%= link_to(l(:button_delete), attachment_path(file), :class => 'icon-only icon-del', + :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %> +
+ + + <% html_title(l(:label_attachment_plural)) -%> -- 2.39.5