<% for attachment in attachments %>
@@ -20,43 +20,13 @@
<% else %>
- <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 80 -%>
+ <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 45 -%>
(<%= number_to_human_size attachment.filesize , :precision => 0 %>)
<% if options[:deletable] %>
- <%#= link_to image_tag('delete.png'), attachment_path(attachment),
- :data => {:confirm => l(:text_are_you_sure)},
- :method => :delete,
- :class => 'delete',
- #:remote => true,
- #:id => "attachments_" + attachment.id.to_s,
- :title => l(:button_delete) %>
<% end %>
<% end %>
-
- <%# if attachment.is_text? %>
- <%#= link_to image_tag('magnifier.png'),
- :controller => 'attachments',
- :action => 'show',
- :id => attachment,
- :filename => attachment.filename%>
- <%# end %>
-
-
-
-
-
-
-
-
-
-
- <%#= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author) %>
-
-
-
-
<% end %>
<% if defined?(thumbnails) && thumbnails %>
<% images = attachments.select(&:thumbnailable?) %>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 1e2f0f25b..550c7a4fe 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -69,7 +69,7 @@
<%= @memo.content.html_safe%>
+
<% if @memo.attachments.any?%>
<% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %>
<%= render :partial => 'attachments_links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %>