From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 24 Aug 2011 00:06:14 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/common/_diff.rhtml.
X-Git-Tag: 1.3.0~1413
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=56b173ed8a055ed5aca645df357aa22a988baf8d;p=redmine.git

rename .rhtml to .html.erb of app/views/common/_diff.rhtml.

:rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6548 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/common/_diff.html.erb b/app/views/common/_diff.html.erb
new file mode 100644
index 000000000..9967a6810
--- /dev/null
+++ b/app/views/common/_diff.html.erb
@@ -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"><%=h(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"><%=h(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? %>
diff --git a/app/views/common/_diff.rhtml b/app/views/common/_diff.rhtml
deleted file mode 100644
index 9967a6810..000000000
--- a/app/views/common/_diff.rhtml
+++ /dev/null
@@ -1,57 +0,0 @@
-<% 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"><%=h(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"><%=h(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? %>