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