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

diff --git a/app/views/settings/_general.html.erb b/app/views/settings/_general.html.erb
new file mode 100644 (file)
index 0000000..a384693
--- /dev/null
+++ b/app/views/settings/_general.html.erb
@@ -0,0 +1,37 @@
+<% form_tag({:action => 'edit'}) do %>
+
+<div class="box tabular settings">
+<p><%= setting_text_field :app_title, :size => 30 %></p>
+
+<p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
+<%= wikitoolbar_for 'settings_welcome_text' %>
+
+<p><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
+
+<p><%= setting_text_field :per_page_options, :size => 20 %><br />
+<em><%= l(:text_comma_separated) %></em></p>
+
+<p><%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p>
+
+<p><%= setting_text_field :host_name, :size => 60 %><br />
+<em><%= l(:label_example) %>: <%= @guessed_host_and_path %></em></p>
+
+<p><%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %></p>
+
+<p><%= setting_select :text_formatting, Redmine::WikiFormatting.format_names.collect{|name| [name, name.to_s]}, :blank => :label_none %></p>
+
+<p><%= setting_check_box :cache_formatted_text %></p>
+
+<p><%= setting_select :wiki_compression, [['Gzip', 'gzip']], :blank => :label_none %></p>
+
+<p><%= setting_text_field :feeds_limit, :size => 6 %></p>
+
+<p><%= setting_text_field :file_max_size_displayed, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
+
+<p><%= setting_text_field :diff_max_lines_displayed, :size => 6 %></p>
+
+<%= call_hook(:view_settings_general_form) %>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>

diff --git a/app/views/settings/_general.rhtml b/app/views/settings/_general.rhtml
deleted file mode 100644 (file)
index a384693..0000000
--- a/app/views/settings/_general.rhtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<% form_tag({:action => 'edit'}) do %>
-
-<div class="box tabular settings">
-<p><%= setting_text_field :app_title, :size => 30 %></p>
-
-<p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
-<%= wikitoolbar_for 'settings_welcome_text' %>
-
-<p><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
-
-<p><%= setting_text_field :per_page_options, :size => 20 %><br />
-<em><%= l(:text_comma_separated) %></em></p>
-
-<p><%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p>
-
-<p><%= setting_text_field :host_name, :size => 60 %><br />
-<em><%= l(:label_example) %>: <%= @guessed_host_and_path %></em></p>
-
-<p><%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %></p>
-
-<p><%= setting_select :text_formatting, Redmine::WikiFormatting.format_names.collect{|name| [name, name.to_s]}, :blank => :label_none %></p>
-
-<p><%= setting_check_box :cache_formatted_text %></p>
-
-<p><%= setting_select :wiki_compression, [['Gzip', 'gzip']], :blank => :label_none %></p>
-
-<p><%= setting_text_field :feeds_limit, :size => 6 %></p>
-
-<p><%= setting_text_field :file_max_size_displayed, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
-
-<p><%= setting_text_field :diff_max_lines_displayed, :size => 6 %></p>
-
-<%= call_hook(:view_settings_general_form) %>
-</div>
-
-<%= submit_tag l(:button_save) %>
-<% end %>