annotate app/views/common/_diff.html.erb @ 1327:287f201c2802 redmine-2.2-integration

Add italic
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Wed, 19 Jun 2013 20:56:22 +0100
parents 433d4f72a19b
children 622f24f53b42
rev   line source
Chris@909 1 <% diff = Redmine::UnifiedDiff.new(
Chris@909 2 diff, :type => diff_type,
Chris@1115 3 :max_lines => Setting.diff_max_lines_displayed.to_i,
Chris@1115 4 :style => diff_style) -%>
Chris@441 5
Chris@0 6 <% diff.each do |table_file| -%>
Chris@0 7 <div class="autoscroll">
Chris@441 8 <% if diff.diff_type == 'sbs' -%>
Chris@0 9 <table class="filecontent">
Chris@0 10 <thead>
Chris@909 11 <tr>
Chris@909 12 <th colspan="4" class="filename">
Chris@909 13 <%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %>
Chris@909 14 </th>
Chris@909 15 </tr>
Chris@0 16 </thead>
Chris@0 17 <tbody>
Chris@441 18 <% table_file.each_line do |spacing, line| -%>
Chris@441 19 <% if spacing -%>
Chris@0 20 <tr class="spacing">
Chris@441 21 <th class="line-num">...</th><td></td><th class="line-num">...</th><td></td>
Chris@441 22 </tr>
Chris@0 23 <% end -%>
Chris@0 24 <tr>
Chris@441 25 <th class="line-num"><%= line.nb_line_left %></th>
Chris@441 26 <td class="line-code <%= line.type_diff_left %>">
Chris@1115 27 <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_left).html_safe %></pre>
Chris@0 28 </td>
Chris@441 29 <th class="line-num"><%= line.nb_line_right %></th>
Chris@441 30 <td class="line-code <%= line.type_diff_right %>">
Chris@1115 31 <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_right).html_safe %></pre>
Chris@0 32 </td>
Chris@0 33 </tr>
Chris@0 34 <% end -%>
Chris@0 35 </tbody>
Chris@0 36 </table>
Chris@0 37
Chris@0 38 <% else -%>
Chris@441 39 <table class="filecontent">
Chris@0 40 <thead>
Chris@909 41 <tr>
Chris@909 42 <th colspan="3" class="filename">
Chris@909 43 <%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %>
Chris@909 44 </th>
Chris@909 45 </tr>
Chris@0 46 </thead>
Chris@0 47 <tbody>
Chris@441 48 <% table_file.each_line do |spacing, line| %>
Chris@441 49 <% if spacing -%>
Chris@0 50 <tr class="spacing">
Chris@441 51 <th class="line-num">...</th><th class="line-num">...</th><td></td>
Chris@0 52 </tr>
Chris@0 53 <% end -%>
Chris@0 54 <tr>
Chris@441 55 <th class="line-num"><%= line.nb_line_left %></th>
Chris@441 56 <th class="line-num"><%= line.nb_line_right %></th>
Chris@441 57 <td class="line-code <%= line.type_diff %>">
Chris@1115 58 <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line).html_safe %></pre>
Chris@0 59 </td>
Chris@0 60 </tr>
Chris@0 61 <% end -%>
Chris@0 62 </tbody>
Chris@0 63 </table>
Chris@0 64 <% end -%>
Chris@0 65 </div>
Chris@0 66 <% end -%>
Chris@0 67
Chris@0 68 <%= l(:text_diff_truncated) if diff.truncated? %>