You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

_diff.html.erb 1.5KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. <% diff = Redmine::UnifiedDiff.new(diff, :type => diff_type, :max_lines => Setting.diff_max_lines_displayed.to_i) -%>
  2. <% diff.each do |table_file| -%>
  3. <div class="autoscroll">
  4. <% if diff.diff_type == 'sbs' -%>
  5. <table class="filecontent">
  6. <thead>
  7. <tr><th colspan="4" class="filename"><%=h(to_utf8(table_file.file_name)) %></th></tr>
  8. </thead>
  9. <tbody>
  10. <% table_file.each_line do |spacing, line| -%>
  11. <% if spacing -%>
  12. <tr class="spacing">
  13. <th class="line-num">...</th><td></td><th class="line-num">...</th><td></td>
  14. </tr>
  15. <% end -%>
  16. <tr>
  17. <th class="line-num"><%= line.nb_line_left %></th>
  18. <td class="line-code <%= line.type_diff_left %>">
  19. <pre><%=to_utf8 line.html_line_left %></pre>
  20. </td>
  21. <th class="line-num"><%= line.nb_line_right %></th>
  22. <td class="line-code <%= line.type_diff_right %>">
  23. <pre><%=to_utf8 line.html_line_right %></pre>
  24. </td>
  25. </tr>
  26. <% end -%>
  27. </tbody>
  28. </table>
  29. <% else -%>
  30. <table class="filecontent">
  31. <thead>
  32. <tr><th colspan="3" class="filename"><%=h(to_utf8(table_file.file_name)) %></th></tr>
  33. </thead>
  34. <tbody>
  35. <% table_file.each_line do |spacing, line| %>
  36. <% if spacing -%>
  37. <tr class="spacing">
  38. <th class="line-num">...</th><th class="line-num">...</th><td></td>
  39. </tr>
  40. <% end -%>
  41. <tr>
  42. <th class="line-num"><%= line.nb_line_left %></th>
  43. <th class="line-num"><%= line.nb_line_right %></th>
  44. <td class="line-code <%= line.type_diff %>">
  45. <pre><%=to_utf8 line.html_line %></pre>
  46. </td>
  47. </tr>
  48. <% end -%>
  49. </tbody>
  50. </table>
  51. <% end -%>
  52. </div>
  53. <% end -%>
  54. <%= l(:text_diff_truncated) if diff.truncated? %>