Mercurial > hg > soundsoftware-site
annotate .svn/pristine/97/97e5af17b0ff620e9c12200e0ea40a146395b3bd.svn-base @ 1524:82fac3dcf466 redmine-2.5-integration
Fix failure to interpret Javascript when autocompleting members for project
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Thu, 11 Sep 2014 10:24:38 +0100 |
parents | 261b3d9a4903 |
children |
rev | line source |
---|---|
Chris@1464 | 1 <% diff = Redmine::UnifiedDiff.new( |
Chris@1464 | 2 diff, :type => diff_type, |
Chris@1464 | 3 :max_lines => Setting.diff_max_lines_displayed.to_i, |
Chris@1464 | 4 :style => diff_style) -%> |
Chris@1464 | 5 |
Chris@1464 | 6 <% diff.each do |table_file| -%> |
Chris@1464 | 7 <div class="autoscroll"> |
Chris@1464 | 8 <% if diff.diff_type == 'sbs' -%> |
Chris@1464 | 9 <table class="filecontent"> |
Chris@1464 | 10 <thead> |
Chris@1464 | 11 <tr> |
Chris@1464 | 12 <th colspan="4" class="filename"> |
Chris@1464 | 13 <%= table_file.file_name %> |
Chris@1464 | 14 </th> |
Chris@1464 | 15 </tr> |
Chris@1464 | 16 </thead> |
Chris@1464 | 17 <tbody> |
Chris@1464 | 18 <% table_file.each_line do |spacing, line| -%> |
Chris@1464 | 19 <% if spacing -%> |
Chris@1464 | 20 <tr class="spacing"> |
Chris@1464 | 21 <th class="line-num">...</th><td></td><th class="line-num">...</th><td></td> |
Chris@1464 | 22 </tr> |
Chris@1464 | 23 <% end -%> |
Chris@1464 | 24 <tr> |
Chris@1464 | 25 <th class="line-num"><%= line.nb_line_left %></th> |
Chris@1464 | 26 <td class="line-code <%= line.type_diff_left %>"> |
Chris@1464 | 27 <pre><%= line.html_line_left.html_safe %></pre> |
Chris@1464 | 28 </td> |
Chris@1464 | 29 <th class="line-num"><%= line.nb_line_right %></th> |
Chris@1464 | 30 <td class="line-code <%= line.type_diff_right %>"> |
Chris@1464 | 31 <pre><%= line.html_line_right.html_safe %></pre> |
Chris@1464 | 32 </td> |
Chris@1464 | 33 </tr> |
Chris@1464 | 34 <% end -%> |
Chris@1464 | 35 </tbody> |
Chris@1464 | 36 </table> |
Chris@1464 | 37 |
Chris@1464 | 38 <% else -%> |
Chris@1464 | 39 <table class="filecontent"> |
Chris@1464 | 40 <thead> |
Chris@1464 | 41 <tr> |
Chris@1464 | 42 <th colspan="3" class="filename"> |
Chris@1464 | 43 <%= table_file.file_name %> |
Chris@1464 | 44 </th> |
Chris@1464 | 45 </tr> |
Chris@1464 | 46 </thead> |
Chris@1464 | 47 <tbody> |
Chris@1464 | 48 <% table_file.each_line do |spacing, line| %> |
Chris@1464 | 49 <% if spacing -%> |
Chris@1464 | 50 <tr class="spacing"> |
Chris@1464 | 51 <th class="line-num">...</th><th class="line-num">...</th><td></td> |
Chris@1464 | 52 </tr> |
Chris@1464 | 53 <% end -%> |
Chris@1464 | 54 <tr> |
Chris@1464 | 55 <th class="line-num"><%= line.nb_line_left %></th> |
Chris@1464 | 56 <th class="line-num"><%= line.nb_line_right %></th> |
Chris@1464 | 57 <td class="line-code <%= line.type_diff %>"> |
Chris@1464 | 58 <pre><%= line.html_line.html_safe %></pre> |
Chris@1464 | 59 </td> |
Chris@1464 | 60 </tr> |
Chris@1464 | 61 <% end -%> |
Chris@1464 | 62 </tbody> |
Chris@1464 | 63 </table> |
Chris@1464 | 64 <% end -%> |
Chris@1464 | 65 </div> |
Chris@1464 | 66 <% end -%> |
Chris@1464 | 67 |
Chris@1464 | 68 <%= l(:text_diff_truncated) if diff.truncated? %> |