annotate .svn/pristine/3c/3c182a61315731239b388b13cfd0c9e853524d29.svn-base @ 1298:4f746d8966dd redmine_2.3_integration

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