From 2b31a4e817063ee3775fdb529b667da66c24dd62 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 25 Aug 2011 01:21:20 +0000
Subject: rename .rhtml to .html.erb of
 app/views/settings/_notifications.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@6615 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/settings/_notifications.html.erb | 42 ++++++++++++++++++++++++++++++
 app/views/settings/_notifications.rhtml    | 42 ------------------------------
 2 files changed, 42 insertions(+), 42 deletions(-)
 create mode 100644 app/views/settings/_notifications.html.erb
 delete mode 100644 app/views/settings/_notifications.rhtml

(limited to 'app/views/settings')

diff --git a/app/views/settings/_notifications.html.erb b/app/views/settings/_notifications.html.erb
new file mode 100644
index 000000000..26c11ad9a
--- /dev/null
+++ b/app/views/settings/_notifications.html.erb
@@ -0,0 +1,42 @@
+<% if @deliveries %>
+<% form_tag({:action => 'edit', :tab => 'notifications'}) do %>
+
+<div class="box tabular settings">
+<p><%= setting_text_field :mail_from, :size => 60 %></p>
+
+<p><%= setting_check_box :bcc_recipients %></p>
+
+<p><%= setting_check_box :plain_text_mail %></p>
+
+<p><%= setting_select(:default_notification_option, User.valid_notification_options.collect {|o| [l(o.last), o.first.to_s]}) %></p>
+
+</div>
+
+<fieldset class="box" id="notified_events"><legend><%=l(:text_select_mail_notifications)%></legend>
+<%= hidden_field_tag 'settings[notified_events][]', '' %>
+<% @notifiables.each do |notifiable| %>
+<%= notification_field notifiable %>
+<br />
+<% end %>
+<p><%= check_all_links('notified_events') %></p>
+</fieldset>
+
+<fieldset class="box"><legend><%= l(:setting_emails_header) %></legend>
+<%= setting_text_area :emails_header, :label => false, :class => 'wiki-edit', :rows => 5 %>
+</fieldset>
+
+<fieldset class="box"><legend><%= l(:setting_emails_footer) %></legend>
+<%= setting_text_area :emails_footer, :label => false, :class => 'wiki-edit', :rows => 5 %>
+</fieldset>
+
+<div style="float:right;">
+<%= link_to l(:label_send_test_email), :controller => 'admin', :action => 'test_email' %>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
+<% else %>
+<div class="nodata">
+<%= simple_format(l(:text_email_delivery_not_configured)) %>
+</div>
+<% end %>
diff --git a/app/views/settings/_notifications.rhtml b/app/views/settings/_notifications.rhtml
deleted file mode 100644
index 26c11ad9a..000000000
--- a/app/views/settings/_notifications.rhtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<% if @deliveries %>
-<% form_tag({:action => 'edit', :tab => 'notifications'}) do %>
-
-<div class="box tabular settings">
-<p><%= setting_text_field :mail_from, :size => 60 %></p>
-
-<p><%= setting_check_box :bcc_recipients %></p>
-
-<p><%= setting_check_box :plain_text_mail %></p>
-
-<p><%= setting_select(:default_notification_option, User.valid_notification_options.collect {|o| [l(o.last), o.first.to_s]}) %></p>
-
-</div>
-
-<fieldset class="box" id="notified_events"><legend><%=l(:text_select_mail_notifications)%></legend>
-<%= hidden_field_tag 'settings[notified_events][]', '' %>
-<% @notifiables.each do |notifiable| %>
-<%= notification_field notifiable %>
-<br />
-<% end %>
-<p><%= check_all_links('notified_events') %></p>
-</fieldset>
-
-<fieldset class="box"><legend><%= l(:setting_emails_header) %></legend>
-<%= setting_text_area :emails_header, :label => false, :class => 'wiki-edit', :rows => 5 %>
-</fieldset>
-
-<fieldset class="box"><legend><%= l(:setting_emails_footer) %></legend>
-<%= setting_text_area :emails_footer, :label => false, :class => 'wiki-edit', :rows => 5 %>
-</fieldset>
-
-<div style="float:right;">
-<%= link_to l(:label_send_test_email), :controller => 'admin', :action => 'test_email' %>
-</div>
-
-<%= submit_tag l(:button_save) %>
-<% end %>
-<% else %>
-<div class="nodata">
-<%= simple_format(l(:text_email_delivery_not_configured)) %>
-</div>
-<% end %>
-- 
cgit v1.2.3