diff app/views/common/_diff.html.erb @ 908:c6c2cbd0afee redmine-1.3

Rename .rhtml files to .html.erb in preparation for merge

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/common/_diff.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,57 @@
+<% diff = Redmine::UnifiedDiff.new(diff, :type => diff_type, :max_lines => Setting.diff_max_lines_displayed.to_i) -%>
+
+<% diff.each do |table_file| -%>
+<div class="autoscroll">
+<% if diff.diff_type == 'sbs' -%>
+<table class="filecontent">
+<thead>
+<tr><th colspan="4" class="filename"><%=to_utf8 table_file.file_name %></th></tr>
+</thead>
+<tbody>
+<% table_file.each_line do |spacing, line| -%>
+<% if spacing -%>
+<tr class="spacing">
+  <th class="line-num">...</th><td></td><th class="line-num">...</th><td></td>
+</tr>
+<% end -%>
+<tr>
+  <th class="line-num"><%= line.nb_line_left %></th>
+  <td class="line-code <%= line.type_diff_left %>">
+    <pre><%=to_utf8 line.html_line_left %></pre>
+  </td>
+  <th class="line-num"><%= line.nb_line_right %></th>
+  <td class="line-code <%= line.type_diff_right %>">
+    <pre><%=to_utf8 line.html_line_right %></pre>
+  </td>
+</tr>
+<% end -%>
+</tbody>
+</table>
+
+<% else -%>
+<table class="filecontent">
+<thead>
+<tr><th colspan="3" class="filename"><%=to_utf8 table_file.file_name %></th></tr>
+</thead>
+<tbody>
+<% table_file.each_line do |spacing, line| %>
+<% if spacing -%>
+<tr class="spacing">
+  <th class="line-num">...</th><th class="line-num">...</th><td></td>
+</tr>
+<% end -%>
+<tr>
+  <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 %>">
+    <pre><%=to_utf8 line.html_line %></pre>
+  </td>
+</tr>
+<% end -%>
+</tbody>
+</table>
+<% end -%>
+</div>
+<% end -%>
+
+<%= l(:text_diff_truncated) if diff.truncated? %>