Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge new changes from Redmine 1.3.1 (http://www.redmine.org/projects…

  • Loading branch information...
commit ca3e91f6d33a145cf5822d04a08f7f2ee1f116f2 1 parent 2283632
@martin-denizet authored
Showing with 6 additions and 3 deletions.
  1. +6 −3 app/views/attachments/_form.rhtml
View
9 app/views/attachments/_form.rhtml
@@ -3,10 +3,13 @@
<%= javascript_include_tag 'attach_screenshot', :plugin => 'redmine_attach_screenshot' %>
<% end %>
<span id="attachments_fields">
-<%= file_field_tag 'attachments[1][file]', :size => 30, :id => nil, :title => l(:label_attachment_description) %><label class="inline"><span id="attachment_description_label_content"><%= l(:label_optional_description) %></span><%= text_field_tag 'attachments[1][description]', '', :size => 60, :id => nil %>
-</label>
+ <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))) %>
+ </span>
</span>
-<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>
Please sign in to comment.
Something went wrong with that request. Please try again.