##// END OF EJS Templates
jro_apps » redmine
RSS
View cleanup....
View cleanup. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8479 e93f8b46-1217-0410-a6f0-8f06a7374b81
Toshi MARUYAMA - - Load All Authors

File last commit:

r7751:fb75372b86c5
r8359:d5030c8b81b7
Show More
_diff.html.erb
67 lines | 1.7 KiB | text/plain | TextLexer
/ app / views / common / _diff.html.erb
History | Source | Raw |Copy content |Copy permalink
Toshi MARUYAMA
code layout clean up app/views/common/_diff.html.erb...
 r7744 <% diff = Redmine::UnifiedDiff.new(
diff, :type => diff_type,
:max_lines => Setting.diff_max_lines_displayed.to_i) -%>
Jean-Philippe Lang
Highlight changes inside diff lines (#7139)....
 r4974
Jean-Philippe Lang
Adds a setting to limit the number of diff lines that should be displayed (default to 1500)....
 r2110 <% diff.each do |table_file| -%>
Jean-Philippe Lang
Move diff viewer to a partial....
 r1501 <div class="autoscroll">
Jean-Philippe Lang
Highlight changes inside diff lines (#7139)....
 r4974 <% if diff.diff_type == 'sbs' -%>
Jean-Philippe Lang
Replace the hardcoded "CodeRay" css class name for highlighted elements....
 r3471 <table class="filecontent">
Jean-Philippe Lang
Move diff viewer to a partial....
 r1501 <thead>
Toshi MARUYAMA
scm: attachment: remove "to_utf8" methods from helpers (#2371)...
 r7751 <tr>
<th colspan="4" class="filename">
<%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %>
</th>
</tr>
Jean-Philippe Lang
Move diff viewer to a partial....
 r1501 </thead>
<tbody>
Jean-Philippe Lang
Highlight changes inside diff lines (#7139)....
 r4974 <% table_file.each_line do |spacing, line| -%>
<% if spacing -%>
Jean-Philippe Lang
Slight changes to diff view and style....
 r1509 <tr class="spacing">
Jean-Philippe Lang
Highlight changes inside diff lines (#7139)....
 r4974 <th class="line-num">...</th><td></td><th class="line-num">...</th><td></td>
</tr>
Jean-Philippe Lang
Move diff viewer to a partial....
 r1501 <% end -%>
<tr>
Jean-Philippe Lang
Highlight changes inside diff lines (#7139)....
 r4974 <th class="line-num"><%= line.nb_line_left %></th>
<td class="line-code <%= line.type_diff_left %>">
Toshi MARUYAMA
scm: attachment: remove "to_utf8" methods from helpers (#2371)...
 r7751 <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_left) %></pre>
Jean-Philippe Lang
Move diff viewer to a partial....
 r1501 </td>
Jean-Philippe Lang
Highlight changes inside diff lines (#7139)....
 r4974 <th class="line-num"><%= line.nb_line_right %></th>
<td class="line-code <%= line.type_diff_right %>">
Toshi MARUYAMA
scm: attachment: remove "to_utf8" methods from helpers (#2371)...
 r7751 <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_right) %></pre>
Jean-Philippe Lang
Move diff viewer to a partial....
 r1501 </td>
</tr>
<% end -%>
</tbody>
</table>
<% else -%>
Jean-Philippe Lang
Highlight changes inside diff lines (#7139)....
 r4974 <table class="filecontent">
Jean-Philippe Lang
Move diff viewer to a partial....
 r1501 <thead>
Toshi MARUYAMA
scm: attachment: remove "to_utf8" methods from helpers (#2371)...
 r7751 <tr>
<th colspan="3" class="filename">
<%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %>
</th>
</tr>
Jean-Philippe Lang
Move diff viewer to a partial....
 r1501 </thead>
<tbody>
Jean-Philippe Lang
Highlight changes inside diff lines (#7139)....
 r4974 <% table_file.each_line do |spacing, line| %>
<% if spacing -%>
Jean-Philippe Lang
Slight changes to diff view and style....
 r1509 <tr class="spacing">
Jean-Philippe Lang
Highlight changes inside diff lines (#7139)....
 r4974 <th class="line-num">...</th><th class="line-num">...</th><td></td>
Jean-Philippe Lang
Slight changes to diff view and style....
 r1509 </tr>
Jean-Philippe Lang
Move diff viewer to a partial....
 r1501 <% end -%>
<tr>
Jean-Philippe Lang
Highlight changes inside diff lines (#7139)....
 r4974 <th class="line-num"><%= line.nb_line_left %></th>
<th class="line-num"><%= line.nb_line_right %></th>
<td class="line-code <%= line.type_diff %>">
Toshi MARUYAMA
scm: attachment: remove "to_utf8" methods from helpers (#2371)...
 r7751 <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line) %></pre>
Jean-Philippe Lang
Move diff viewer to a partial....
 r1501 </td>
</tr>
<% end -%>
</tbody>
</table>
<% end -%>
</div>
<% end -%>
Jean-Philippe Lang
Adds a setting to limit the number of diff lines that should be displayed (default to 1500)....
 r2110
<%= l(:text_diff_truncated) if diff.truncated? %>