From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 2 Sep 2011 04:18:20 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/users/_general.rhtml.
X-Git-Tag: 1.3.0~919
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7bdce08d70f9d03dbf352cb2ef9e54e6cbd8937e;p=redmine.git

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

diff --git a/app/views/users/_general.html.erb b/app/views/users/_general.html.erb
new file mode 100644
index 000000000..193fcdde5
--- /dev/null
+++ b/app/views/users/_general.html.erb
@@ -0,0 +1,7 @@
+<% labelled_tabular_form_for :user, @user, :url => { :controller => 'users', :action => "update", :tab => nil }, :html => { :method => :put, :class => nil } do |f| %>
+	<%= render :partial => 'form', :locals => { :f => f } %>
+	<% if @user.active? && email_delivery_enabled? -%>
+		<p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
+	<% end -%>
+	<p><%= submit_tag l(:button_save) %></p>
+<% end %>
diff --git a/app/views/users/_general.rhtml b/app/views/users/_general.rhtml
deleted file mode 100644
index 193fcdde5..000000000
--- a/app/views/users/_general.rhtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<% labelled_tabular_form_for :user, @user, :url => { :controller => 'users', :action => "update", :tab => nil }, :html => { :method => :put, :class => nil } do |f| %>
-	<%= render :partial => 'form', :locals => { :f => f } %>
-	<% if @user.active? && email_delivery_enabled? -%>
-		<p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
-	<% end -%>
-	<p><%= submit_tag l(:button_save) %></p>
-<% end %>