Mercurial > hg > soundsoftware-site

comparison app/views/common/_diff.html.erb @ 1295:622f24f53b42 redmine-2.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to Redmine SVN revision 11972 on 2.3-stable branch
author Chris Cannam
date Fri, 14 Jun 2013 09:02:21 +0100
parents 433d4f72a19b
children
comparison
equal deleted inserted replaced
1294:3e4c3460b6ca 1295:622f24f53b42
8 <% if diff.diff_type == 'sbs' -%> 8 <% if diff.diff_type == 'sbs' -%>
9 <table class="filecontent"> 9 <table class="filecontent">
10 <thead> 10 <thead>
11 <tr> 11 <tr>
12 <th colspan="4" class="filename"> 12 <th colspan="4" class="filename">
13 <%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %> 13 <%= table_file.file_name %>
14 </th> 14 </th>
15 </tr> 15 </tr>
16 </thead> 16 </thead>
17 <tbody> 17 <tbody>
18 <% table_file.each_line do |spacing, line| -%> 18 <% table_file.each_line do |spacing, line| -%>
22 </tr> 22 </tr>
23 <% end -%> 23 <% end -%>
24 <tr> 24 <tr>
25 <th class="line-num"><%= line.nb_line_left %></th> 25 <th class="line-num"><%= line.nb_line_left %></th>
26 <td class="line-code <%= line.type_diff_left %>"> 26 <td class="line-code <%= line.type_diff_left %>">
27 <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_left).html_safe %></pre> 27 <pre><%= line.html_line_left.html_safe %></pre>
28 </td> 28 </td>
29 <th class="line-num"><%= line.nb_line_right %></th> 29 <th class="line-num"><%= line.nb_line_right %></th>
30 <td class="line-code <%= line.type_diff_right %>"> 30 <td class="line-code <%= line.type_diff_right %>">
31 <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_right).html_safe %></pre> 31 <pre><%= line.html_line_right.html_safe %></pre>
32 </td> 32 </td>
33 </tr> 33 </tr>
34 <% end -%> 34 <% end -%>
35 </tbody> 35 </tbody>
36 </table> 36 </table>
38 <% else -%> 38 <% else -%>
39 <table class="filecontent"> 39 <table class="filecontent">
40 <thead> 40 <thead>
41 <tr> 41 <tr>
42 <th colspan="3" class="filename"> 42 <th colspan="3" class="filename">
43 <%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %> 43 <%= table_file.file_name %>
44 </th> 44 </th>
45 </tr> 45 </tr>
46 </thead> 46 </thead>
47 <tbody> 47 <tbody>
48 <% table_file.each_line do |spacing, line| %> 48 <% table_file.each_line do |spacing, line| %>
53 <% end -%> 53 <% end -%>
54 <tr> 54 <tr>
55 <th class="line-num"><%= line.nb_line_left %></th> 55 <th class="line-num"><%= line.nb_line_left %></th>
56 <th class="line-num"><%= line.nb_line_right %></th> 56 <th class="line-num"><%= line.nb_line_right %></th>
57 <td class="line-code <%= line.type_diff %>"> 57 <td class="line-code <%= line.type_diff %>">
58 <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line).html_safe %></pre> 58 <pre><%= line.html_line.html_safe %></pre>
59 </td> 59 </td>
60 </tr> 60 </tr>
61 <% end -%> 61 <% end -%>
62 </tbody> 62 </tbody>
63 </table> 63 </table>