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