From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 1 Sep 2011 10:55:25 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/my/account.rhtml.
X-Git-Tag: 1.3.0~987
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3b74d3f7cc6b7620b023bde67e87345f901be4f6;p=redmine.git

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

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
new file mode 100644
index 000000000..a8cd37623
--- /dev/null
+++ b/app/views/my/account.html.erb
@@ -0,0 +1,51 @@
+<div class="contextual">
+<%= link_to(l(:button_change_password), {:action => 'password'}, :class => 'icon icon-passwd') if @user.change_password_allowed? %>
+<%= call_hook(:view_my_account_contextual, :user => @user)%>
+</div>
+
+<h2><%=l(:label_my_account)%></h2>
+<%= error_messages_for 'user' %>
+
+<% form_for :user, @user, :url => { :action => "account" }, 
+                          :builder => TabularFormBuilder, 
+                          :lang => current_language,
+                          :html => { :id => 'my_account_form' } do |f| %>
+<div class="splitcontentleft">
+<fieldset class="box tabular">
+	<legend><%=l(:label_information_plural)%></legend>
+	<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.select(&:editable?).each do |value| %>
+		<p><%= custom_field_tag_with_label :user, value %></p>
+	<% end %>
+	<%= call_hook(:view_my_account, :user => @user, :form => f) %>
+</fieldset>
+
+<%= submit_tag l(:button_save) %>
+</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>
+<% end %>
+
+<% content_for :sidebar do %>
+<%= render :partial => 'sidebar' %>
+<% end %>
+
+<% html_title(l(:label_my_account)) -%>
diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml
deleted file mode 100644
index a8cd37623..000000000
--- a/app/views/my/account.rhtml
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="contextual">
-<%= link_to(l(:button_change_password), {:action => 'password'}, :class => 'icon icon-passwd') if @user.change_password_allowed? %>
-<%= call_hook(:view_my_account_contextual, :user => @user)%>
-</div>
-
-<h2><%=l(:label_my_account)%></h2>
-<%= error_messages_for 'user' %>
-
-<% form_for :user, @user, :url => { :action => "account" }, 
-                          :builder => TabularFormBuilder, 
-                          :lang => current_language,
-                          :html => { :id => 'my_account_form' } do |f| %>
-<div class="splitcontentleft">
-<fieldset class="box tabular">
-	<legend><%=l(:label_information_plural)%></legend>
-	<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.select(&:editable?).each do |value| %>
-		<p><%= custom_field_tag_with_label :user, value %></p>
-	<% end %>
-	<%= call_hook(:view_my_account, :user => @user, :form => f) %>
-</fieldset>
-
-<%= submit_tag l(:button_save) %>
-</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>
-<% end %>
-
-<% content_for :sidebar do %>
-<%= render :partial => 'sidebar' %>
-<% end %>
-
-<% html_title(l(:label_my_account)) -%>