From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 23 Aug 2011 08:41:31 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/repositories/diff.rhtml.
X-Git-Tag: 1.3.0~1420
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e338d16b70417bbd6856cb86344130efb085abce;p=redmine.git

rename .rhtml to .html.erb of app/views/repositories/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@6541 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/repositories/diff.html.erb b/app/views/repositories/diff.html.erb
new file mode 100644
index 000000000..cb868665a
--- /dev/null
+++ b/app/views/repositories/diff.html.erb
@@ -0,0 +1,23 @@
+<h2><%= l(:label_revision) %> <%= @diff_format_revisions %> <%=h @path %></h2>
+
+<!-- Choose view type -->
+<% form_tag({:path => to_path_param(@path)}, :method => 'get') do %>
+  <%= hidden_field_tag('rev', params[:rev]) if params[:rev] %>
+  <%= hidden_field_tag('rev_to', params[:rev_to]) if params[:rev_to] %>
+  <p><label><%= l(:label_view_diff) %></label>
+  <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %></p>
+<% end %>
+
+<% cache(@cache_key) do -%>
+<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
+<% end -%>
+
+<% other_formats_links do |f| %>
+	<%= f.link_to 'Diff', :url => params, :caption => 'Unified diff' %>
+<% end %>
+
+<% html_title(h(with_leading_slash(@path)), 'Diff') -%>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag "scm" %>
+<% end %>
diff --git a/app/views/repositories/diff.rhtml b/app/views/repositories/diff.rhtml
deleted file mode 100644
index cb868665a..000000000
--- a/app/views/repositories/diff.rhtml
+++ /dev/null
@@ -1,23 +0,0 @@
-<h2><%= l(:label_revision) %> <%= @diff_format_revisions %> <%=h @path %></h2>
-
-<!-- Choose view type -->
-<% form_tag({:path => to_path_param(@path)}, :method => 'get') do %>
-  <%= hidden_field_tag('rev', params[:rev]) if params[:rev] %>
-  <%= hidden_field_tag('rev_to', params[:rev_to]) if params[:rev_to] %>
-  <p><label><%= l(:label_view_diff) %></label>
-  <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %></p>
-<% end %>
-
-<% cache(@cache_key) do -%>
-<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
-<% end -%>
-
-<% other_formats_links do |f| %>
-	<%= f.link_to 'Diff', :url => params, :caption => 'Unified diff' %>
-<% end %>
-
-<% html_title(h(with_leading_slash(@path)), 'Diff') -%>
-
-<% content_for :header_tags do %>
-<%= stylesheet_link_tag "scm" %>
-<% end %>