From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 25 Aug 2011 01:25:19 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/settings/_display.rhtml.
X-Git-Tag: 1.3.0~1342
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8241ab458a6b42bca711652970c4fa6e81ec7ee7;p=redmine.git

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

diff --git a/app/views/settings/_display.html.erb b/app/views/settings/_display.html.erb
new file mode 100644
index 000000000..25f65fc56
--- /dev/null
+++ b/app/views/settings/_display.html.erb
@@ -0,0 +1,22 @@
+<% form_tag({:action => 'edit', :tab => 'display'}) do %>
+
+<div class="box tabular settings">
+<p><%= setting_select :ui_theme, Redmine::Themes.themes.collect {|t| [t.name, t.id]}, :blank => :label_default, :label => :label_theme %></p>
+
+<p><%= setting_select :default_language, lang_options_for_select(false) %></p>
+
+<p><%= setting_select :start_of_week, [[day_name(1),'1'], [day_name(6),'6'], [day_name(7),'7']], :blank => :label_language_based %></p>
+
+<p><%= setting_select :date_format, Setting::DATE_FORMATS.collect {|f| [Date.today.strftime(f), f]}, :blank => :label_language_based %></p>
+
+<p><%= setting_select :time_format, Setting::TIME_FORMATS.collect {|f| [Time.now.strftime(f), f]}, :blank => :label_language_based %></p>
+
+<p><%= setting_select :user_format, @options[:user_format] %></p>
+
+<p><%= setting_check_box :gravatar_enabled %></p>
+
+<p><%= setting_select :gravatar_default, [["Wavatars", 'wavatar'], ["Identicons", 'identicon'], ["Monster ids", 'monsterid'], ["Retro", 'retro'], ["Mystery man", 'mm']], :blank => :label_none %></p>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff --git a/app/views/settings/_display.rhtml b/app/views/settings/_display.rhtml
deleted file mode 100644
index 25f65fc56..000000000
--- a/app/views/settings/_display.rhtml
+++ /dev/null
@@ -1,22 +0,0 @@
-<% form_tag({:action => 'edit', :tab => 'display'}) do %>
-
-<div class="box tabular settings">
-<p><%= setting_select :ui_theme, Redmine::Themes.themes.collect {|t| [t.name, t.id]}, :blank => :label_default, :label => :label_theme %></p>
-
-<p><%= setting_select :default_language, lang_options_for_select(false) %></p>
-
-<p><%= setting_select :start_of_week, [[day_name(1),'1'], [day_name(6),'6'], [day_name(7),'7']], :blank => :label_language_based %></p>
-
-<p><%= setting_select :date_format, Setting::DATE_FORMATS.collect {|f| [Date.today.strftime(f), f]}, :blank => :label_language_based %></p>
-
-<p><%= setting_select :time_format, Setting::TIME_FORMATS.collect {|f| [Time.now.strftime(f), f]}, :blank => :label_language_based %></p>
-
-<p><%= setting_select :user_format, @options[:user_format] %></p>
-
-<p><%= setting_check_box :gravatar_enabled %></p>
-
-<p><%= setting_select :gravatar_default, [["Wavatars", 'wavatar'], ["Identicons", 'identicon'], ["Monster ids", 'monsterid'], ["Retro", 'retro'], ["Mystery man", 'mm']], :blank => :label_none %></p>
-</div>
-
-<%= submit_tag l(:button_save) %>
-<% end %>