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