# HG changeset patch # User Chris Cannam # Date 1350402471 -3600 # Node ID e89e425134aea2b2c7ff350abe4df67029924ca1 # Parent f8985bd5d0d6fdbd47584437fc6029c9d20dab9a# Parent 3c5858c5794da0aa71e121e1bb09dc737cfcc383 Merge from branch "feature_523" diff -r f8985bd5d0d6 -r e89e425134ae app/views/attachments/_links.html.erb --- a/app/views/attachments/_links.html.erb Tue Oct 16 16:28:50 2012 +0100 +++ b/app/views/attachments/_links.html.erb Tue Oct 16 16:47:51 2012 +0100 @@ -2,7 +2,7 @@ <% for attachment in attachments %>
<%= link_to_attachment attachment, :class => 'icon icon-attachment' -%> <%= h(" - #{attachment.description}") unless attachment.description.blank? %> - (<%= number_to_human_size attachment.filesize %><%= ", " + l(:label_x_downloads, :count => attachment.downloads) unless attachment.downloads == 0 %>) + <%= number_to_human_size attachment.filesize %><%= ", " + l(:label_x_downloads, :count => attachment.downloads) unless attachment.downloads == 0 %> <% if options[:deletable] %> <%= link_to image_tag('delete.png'), attachment_path(attachment), :confirm => l(:text_are_you_sure), diff -r f8985bd5d0d6 -r e89e425134ae public/stylesheets/application.css --- a/public/stylesheets/application.css Tue Oct 16 16:28:50 2012 +0100 +++ b/public/stylesheets/application.css Tue Oct 16 16:47:51 2012 +0100 @@ -506,7 +506,8 @@ div.attachments { margin-top: 12px; } div.attachments p { margin:4px 0 2px 0; } div.attachments img { vertical-align: middle; } -div.attachments span.author { font-size: 0.9em; color: #888; } +div.attachments span.author { font-size: 0.9em; color: #888; font-style: italic; padding-left: 4px } +div.attachments span.size_and_count { font-size: 0.9em; color: #888; padding-left: 4px; } p.other-formats { text-align: right; font-size:0.9em; color: #666; } .other-formats span + span:before { content: "| "; }