Chris@909: <% diff = Redmine::UnifiedDiff.new( Chris@909: diff, :type => diff_type, Chris@909: :max_lines => Setting.diff_max_lines_displayed.to_i) -%> Chris@909: Chris@909: <% diff.each do |table_file| -%> Chris@909:
Chris@909: <% if diff.diff_type == 'sbs' -%> Chris@909: Chris@909: Chris@909: Chris@909: Chris@909: Chris@909: Chris@909: Chris@909: <% table_file.each_line do |spacing, line| -%> Chris@909: <% if spacing -%> Chris@909: Chris@909: Chris@909: Chris@909: <% end -%> Chris@909: Chris@909: Chris@909: Chris@909: Chris@909: Chris@909: Chris@909: <% end -%> Chris@909: Chris@909:
Chris@909: <%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %> Chris@909:
......
<%= line.nb_line_left %> Chris@909:
<%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_left) %>
Chris@909:
<%= line.nb_line_right %> Chris@909:
<%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_right) %>
Chris@909:
Chris@909: Chris@909: <% else -%> Chris@909: Chris@909: Chris@909: Chris@909: Chris@909: Chris@909: Chris@909: Chris@909: <% table_file.each_line do |spacing, line| %> Chris@909: <% if spacing -%> Chris@909: Chris@909: Chris@909: Chris@909: <% end -%> Chris@909: Chris@909: Chris@909: Chris@909: Chris@909: Chris@909: <% end -%> Chris@909: Chris@909:
Chris@909: <%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %> Chris@909:
......
<%= line.nb_line_left %><%= line.nb_line_right %> Chris@909:
<%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line) %>
Chris@909:
Chris@909: <% end -%> Chris@909:
Chris@909: <% end -%> Chris@909: Chris@909: <%= l(:text_diff_truncated) if diff.truncated? %>