kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

html5 compliance.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10110 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-07-29 10:12:26 +00:00
parent 8ee2ae1846
commit c6106543e1
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/issues_helper.rb
View File

@ -290,7 +290,7 @@ module IssuesHelper
unless no_html unless no_html
label = content_tag('strong', label) label = content_tag('strong', label)
old_value = content_tag("i", h(old_value)) if detail.old_value old_value = content_tag("i", h(old_value)) if detail.old_value
old_value = content_tag("strike", old_value) if detail.old_value and detail.value.blank? old_value = content_tag("del", old_value) if detail.old_value and detail.value.blank?
if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key) if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key)
# Link to the attachment if it has not been removed # Link to the attachment if it has not been removed
value = link_to_attachment(atta, :download => true, :only_path => options[:only_path]) value = link_to_attachment(atta, :download => true, :only_path => options[:only_path])

2
app/views/attachments/_form.html.erb
View File

@ -8,7 +8,7 @@
<% end %> <% end %>
<span id="attachments_fields"> <span id="attachments_fields">
<span> <span>
<%= file_field_tag 'attachments[1][file]', :size => 30, :id => nil, :class => 'file', <%= file_field_tag 'attachments[1][file]', :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)))}');" -%> :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)))}');" -%>
<%= text_field_tag 'attachments[1][description]', '', :id => nil, :class => 'description', :maxlength => 255, :placeholder => l(:label_optional_description) %> <%= text_field_tag 'attachments[1][description]', '', :id => nil, :class => 'description', :maxlength => 255, :placeholder => l(:label_optional_description) %>
<%= link_to_function(image_tag('delete.png'), 'removeFileField(this)', :title => (l(:button_delete))) %> <%= link_to_function(image_tag('delete.png'), 'removeFileField(this)', :title => (l(:button_delete))) %>

5
test/unit/helpers/issues_helper_test.rb
View File

@ -32,7 +32,8 @@ class IssuesHelperTest < ActionView::TestCase
:enabled_modules, :enabled_modules,
:workflows, :workflows,
:custom_fields, :custom_fields,
:attachments :attachments,
:versions
def setup def setup
super super
@ -104,7 +105,7 @@ class IssuesHelperTest < ActionView::TestCase
html = show_detail(@detail, false) html = show_detail(@detail, false)
assert_include '<strong>% Done</strong>', html assert_include '<strong>% Done</strong>', html
assert_include '<strike><i>50</i></strike>', html assert_include '<del><i>50</i></del>', html
end end
end end