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

diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
new file mode 100644 (file)
index 0000000..4b145bc
--- /dev/null
+++ b/app/views/users/_form.html.erb
@@ -0,0 +1,51 @@
+<%= error_messages_for 'user' %>
+
+<div id="user_form">
+<!--[form:user]-->
+<div class="splitcontentleft">
+<fieldset class="box tabular">
+       <legend><%=l(:label_information_plural)%></legend>
+       <p><%= f.text_field :login, :required => true, :size => 25  %></p>
+       <p><%= f.text_field :firstname, :required => true %></p>
+       <p><%= f.text_field :lastname, :required => true %></p>
+       <p><%= f.text_field :mail, :required => true %></p>
+       <p><%= f.select :language, lang_options_for_select %></p>
+       <% if Setting.openid? %>
+       <p><%= f.text_field :identity_url  %></p>
+       <% end %>
+       
+       <% @user.custom_field_values.each do |value| %>
+               <p><%= custom_field_tag_with_label :user, value %></p>
+       <% end %>
+       
+       <p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
+       <%= call_hook(:view_users_form, :user => @user, :form => f) %>
+</fieldset>
+
+<fieldset class="box tabular">
+       <legend><%=l(:label_authentication)%></legend>
+       <% unless @auth_sources.empty? %>
+       <p><%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {Element.show('password_fields');} else {Element.hide('password_fields');}" %></p>
+       <% end %>
+       <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
+       <p><%= f.password_field :password, :required => true, :size => 25  %><br />
+       <em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
+       <p><%= f.password_field :password_confirmation, :required => true, :size => 25  %></p>
+       </div>
+</fieldset>
+</div>
+
+<div class="splitcontentright">
+<fieldset class="box">
+       <legend><%=l(:field_mail_notification)%></legend>
+       <%= render :partial => 'users/mail_notifications' %>
+</fieldset>
+
+<fieldset class="box tabular">
+       <legend><%=l(:label_preferences)%></legend>
+       <%= render :partial => 'users/preferences' %>
+</fieldset>
+</div>
+</div>
+<div style="clear:left;"></div>
+<!--[eoform:user]-->

diff --git a/app/views/users/_form.rhtml b/app/views/users/_form.rhtml
deleted file mode 100644 (file)
index 4b145bc..0000000
--- a/app/views/users/_form.rhtml
+++ /dev/null
@@ -1,51 +0,0 @@
-<%= error_messages_for 'user' %>
-
-<div id="user_form">
-<!--[form:user]-->
-<div class="splitcontentleft">
-<fieldset class="box tabular">
-       <legend><%=l(:label_information_plural)%></legend>
-       <p><%= f.text_field :login, :required => true, :size => 25  %></p>
-       <p><%= f.text_field :firstname, :required => true %></p>
-       <p><%= f.text_field :lastname, :required => true %></p>
-       <p><%= f.text_field :mail, :required => true %></p>
-       <p><%= f.select :language, lang_options_for_select %></p>
-       <% if Setting.openid? %>
-       <p><%= f.text_field :identity_url  %></p>
-       <% end %>
-       
-       <% @user.custom_field_values.each do |value| %>
-               <p><%= custom_field_tag_with_label :user, value %></p>
-       <% end %>
-       
-       <p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
-       <%= call_hook(:view_users_form, :user => @user, :form => f) %>
-</fieldset>
-
-<fieldset class="box tabular">
-       <legend><%=l(:label_authentication)%></legend>
-       <% unless @auth_sources.empty? %>
-       <p><%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {Element.show('password_fields');} else {Element.hide('password_fields');}" %></p>
-       <% end %>
-       <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
-       <p><%= f.password_field :password, :required => true, :size => 25  %><br />
-       <em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
-       <p><%= f.password_field :password_confirmation, :required => true, :size => 25  %></p>
-       </div>
-</fieldset>
-</div>
-
-<div class="splitcontentright">
-<fieldset class="box">
-       <legend><%=l(:field_mail_notification)%></legend>
-       <%= render :partial => 'users/mail_notifications' %>
-</fieldset>
-
-<fieldset class="box tabular">
-       <legend><%=l(:label_preferences)%></legend>
-       <%= render :partial => 'users/preferences' %>
-</fieldset>
-</div>
-</div>
-<div style="clear:left;"></div>
-<!--[eoform:user]-->