Mercurial > hg > soundsoftware-site
changeset 986:5beffb0393f7 cannam
Merge
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Fri, 26 Oct 2012 17:19:01 +0100 |
| parents | a97e573d7f87 (current diff) acaa61dde68b (diff) |
| children | a5af76c3fca0 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/app/views/attachments/_form.html.erb Thu Oct 25 14:54:46 2012 +0100 +++ b/app/views/attachments/_form.html.erb Fri Oct 26 17:19:01 2012 +0100 @@ -2,10 +2,10 @@ <span> <%= file_field_tag 'attachments[1][file]', :size => 30, :id => nil, :class => 'file', :onchange => "checkFileSize(this, #{Setting.attachment_max_size.to_i.kilobytes}, '#{escape_javascript(l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)))}');" -%> - <label class="inline"><%= l(:label_optional_description) %><%= text_field_tag 'attachments[1][description]', '', :size => 60, :id => nil, :class => 'description' %></label> - <%= link_to_function(image_tag('delete.png'), 'removeFileField(this)', :title => (l(:button_delete))) %> + <nobr><label class="inline"><%= l(:label_optional_description) %><%= text_field_tag 'attachments[1][description]', '', :size => 60, :id => nil, :class => 'description' %></label> + <%= link_to_function(image_tag('delete.png'), 'removeFileField(this)', :title => (l(:button_delete))) %></nobr> </span> </span> -<small><%= link_to l(:label_add_another_file), '#', :onclick => 'addFileField(); return false;' %> +<br><small><%= link_to l(:label_add_another_file), '#', :onclick => 'addFileField(); return false;' %> (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>) </small>
--- a/public/stylesheets/application.css Thu Oct 25 14:54:46 2012 +0100 +++ b/public/stylesheets/application.css Fri Oct 26 17:19:01 2012 +0100 @@ -500,7 +500,7 @@ .summary {font-style: italic;} #attachments_fields input[type=text] {margin-left: 8px; } -#attachments_fields span {display:block; white-space:nowrap;} +/*#attachments_fields span {display:block; white-space:nowrap;} */ #attachments_fields img {vertical-align: middle;} div.attachments { margin-top: 12px; }