Merge branch 'develop' into szzh

This commit is contained in:
sw 2015-02-03 16:34:08 +08:00
commit 8c74a2f6a5
1 changed files with 1 additions and 1 deletions

View File

@ -1,7 +1,7 @@
<div class="attachments" style="font-weight:normal;"> <div class="attachments" style="font-weight:normal;">
<% for attachment in attachments %> <% for attachment in attachments %>
<p style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"> <p style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
<div style="width:65%;white-space: nowrap; overflow: hidden; text-overflow: ellipsis;float: left;"> <div style="max-width:65%;white-space: nowrap; overflow: hidden; text-overflow: ellipsis;float: left;">
<span title="<%= attachment.filename%>" id = "attachment_"> <span title="<%= attachment.filename%>" id = "attachment_">
<% if options[:length] %> <% if options[:length] %>
<%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%> <%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%>