Mercurial > hg > soundsoftware-site
annotate app/views/common/_diff.rhtml @ 1452:d6b9fd02bb89 feature_36_js_refactoring
Deprecated develoment branch.
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Fri, 11 Oct 2013 17:01:24 +0100 |
parents | cbce1fd3b1b7 |
children |
rev | line source |
---|---|
Chris@0 | 1 <% diff = Redmine::UnifiedDiff.new(diff, :type => diff_type, :max_lines => Setting.diff_max_lines_displayed.to_i) -%> |
Chris@441 | 2 |
Chris@0 | 3 <% diff.each do |table_file| -%> |
Chris@0 | 4 <div class="autoscroll"> |
Chris@441 | 5 <% if diff.diff_type == 'sbs' -%> |
Chris@0 | 6 <table class="filecontent"> |
Chris@0 | 7 <thead> |
Chris@119 | 8 <tr><th colspan="4" class="filename"><%=to_utf8 table_file.file_name %></th></tr> |
Chris@0 | 9 </thead> |
Chris@0 | 10 <tbody> |
Chris@441 | 11 <% table_file.each_line do |spacing, line| -%> |
Chris@441 | 12 <% if spacing -%> |
Chris@0 | 13 <tr class="spacing"> |
Chris@441 | 14 <th class="line-num">...</th><td></td><th class="line-num">...</th><td></td> |
Chris@441 | 15 </tr> |
Chris@0 | 16 <% end -%> |
Chris@0 | 17 <tr> |
Chris@441 | 18 <th class="line-num"><%= line.nb_line_left %></th> |
Chris@441 | 19 <td class="line-code <%= line.type_diff_left %>"> |
Chris@441 | 20 <pre><%=to_utf8 line.html_line_left %></pre> |
Chris@0 | 21 </td> |
Chris@441 | 22 <th class="line-num"><%= line.nb_line_right %></th> |
Chris@441 | 23 <td class="line-code <%= line.type_diff_right %>"> |
Chris@441 | 24 <pre><%=to_utf8 line.html_line_right %></pre> |
Chris@0 | 25 </td> |
Chris@0 | 26 </tr> |
Chris@0 | 27 <% end -%> |
Chris@0 | 28 </tbody> |
Chris@0 | 29 </table> |
Chris@0 | 30 |
Chris@0 | 31 <% else -%> |
Chris@441 | 32 <table class="filecontent"> |
Chris@0 | 33 <thead> |
Chris@119 | 34 <tr><th colspan="3" class="filename"><%=to_utf8 table_file.file_name %></th></tr> |
Chris@0 | 35 </thead> |
Chris@0 | 36 <tbody> |
Chris@441 | 37 <% table_file.each_line do |spacing, line| %> |
Chris@441 | 38 <% if spacing -%> |
Chris@0 | 39 <tr class="spacing"> |
Chris@441 | 40 <th class="line-num">...</th><th class="line-num">...</th><td></td> |
Chris@0 | 41 </tr> |
Chris@0 | 42 <% end -%> |
Chris@0 | 43 <tr> |
Chris@441 | 44 <th class="line-num"><%= line.nb_line_left %></th> |
Chris@441 | 45 <th class="line-num"><%= line.nb_line_right %></th> |
Chris@441 | 46 <td class="line-code <%= line.type_diff %>"> |
Chris@441 | 47 <pre><%=to_utf8 line.html_line %></pre> |
Chris@0 | 48 </td> |
Chris@0 | 49 </tr> |
Chris@0 | 50 <% end -%> |
Chris@0 | 51 </tbody> |
Chris@0 | 52 </table> |
Chris@0 | 53 <% end -%> |
Chris@0 | 54 </div> |
Chris@0 | 55 <% end -%> |
Chris@0 | 56 |
Chris@0 | 57 <%= l(:text_diff_truncated) if diff.truncated? %> |