From d249989257a16135a6812855e2bc286d418b339d Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 20 Dec 2011 08:32:30 +0000
Subject: Rails3: rename sample_plugin .rhtml to .html.erb (#6317, #4796)

: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@8304 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 extra/sample_plugin/app/views/example/say_goodbye.html.erb       | 5 +++++
 extra/sample_plugin/app/views/example/say_goodbye.rhtml          | 5 -----
 extra/sample_plugin/app/views/example/say_hello.html.erb         | 9 +++++++++
 extra/sample_plugin/app/views/example/say_hello.rhtml            | 9 ---------
 extra/sample_plugin/app/views/my/blocks/_sample_block.html.erb   | 3 +++
 extra/sample_plugin/app/views/my/blocks/_sample_block.rhtml      | 3 ---
 .../app/views/settings/_sample_plugin_settings.html.erb          | 3 +++
 .../app/views/settings/_sample_plugin_settings.rhtml             | 3 ---
 8 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 extra/sample_plugin/app/views/example/say_goodbye.html.erb
 delete mode 100644 extra/sample_plugin/app/views/example/say_goodbye.rhtml
 create mode 100644 extra/sample_plugin/app/views/example/say_hello.html.erb
 delete mode 100644 extra/sample_plugin/app/views/example/say_hello.rhtml
 create mode 100644 extra/sample_plugin/app/views/my/blocks/_sample_block.html.erb
 delete mode 100644 extra/sample_plugin/app/views/my/blocks/_sample_block.rhtml
 create mode 100644 extra/sample_plugin/app/views/settings/_sample_plugin_settings.html.erb
 delete mode 100644 extra/sample_plugin/app/views/settings/_sample_plugin_settings.rhtml

(limited to 'extra/sample_plugin')

diff --git a/extra/sample_plugin/app/views/example/say_goodbye.html.erb b/extra/sample_plugin/app/views/example/say_goodbye.html.erb
new file mode 100644
index 000000000..3f4d63dae
--- /dev/null
+++ b/extra/sample_plugin/app/views/example/say_goodbye.html.erb
@@ -0,0 +1,5 @@
+<p class="icon icon-example-works"><%= l(:text_say_goodbye) %></p>
+
+<% content_for :header_tags do %>
+  <%= stylesheet_link_tag "example.css", :plugin => "sample_plugin", :media => "screen" %>
+<% end %>
diff --git a/extra/sample_plugin/app/views/example/say_goodbye.rhtml b/extra/sample_plugin/app/views/example/say_goodbye.rhtml
deleted file mode 100644
index 3f4d63dae..000000000
--- a/extra/sample_plugin/app/views/example/say_goodbye.rhtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<p class="icon icon-example-works"><%= l(:text_say_goodbye) %></p>
-
-<% content_for :header_tags do %>
-  <%= stylesheet_link_tag "example.css", :plugin => "sample_plugin", :media => "screen" %>
-<% end %>
diff --git a/extra/sample_plugin/app/views/example/say_hello.html.erb b/extra/sample_plugin/app/views/example/say_hello.html.erb
new file mode 100644
index 000000000..17aca7bc4
--- /dev/null
+++ b/extra/sample_plugin/app/views/example/say_hello.html.erb
@@ -0,0 +1,9 @@
+<p class="icon icon-example-works"><%= l(:text_say_hello) %></p>
+
+<p><label>Example setting</label>: <%= @value %></p>
+
+<%= link_to_if_authorized 'Good bye', :action => 'say_goodbye', :id => @project %>
+
+<% content_for :header_tags do %>
+  <%= stylesheet_link_tag "example.css", :plugin => "sample_plugin", :media => "screen" %>
+<% end %>
diff --git a/extra/sample_plugin/app/views/example/say_hello.rhtml b/extra/sample_plugin/app/views/example/say_hello.rhtml
deleted file mode 100644
index 17aca7bc4..000000000
--- a/extra/sample_plugin/app/views/example/say_hello.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<p class="icon icon-example-works"><%= l(:text_say_hello) %></p>
-
-<p><label>Example setting</label>: <%= @value %></p>
-
-<%= link_to_if_authorized 'Good bye', :action => 'say_goodbye', :id => @project %>
-
-<% content_for :header_tags do %>
-  <%= stylesheet_link_tag "example.css", :plugin => "sample_plugin", :media => "screen" %>
-<% end %>
diff --git a/extra/sample_plugin/app/views/my/blocks/_sample_block.html.erb b/extra/sample_plugin/app/views/my/blocks/_sample_block.html.erb
new file mode 100644
index 000000000..c19e49739
--- /dev/null
+++ b/extra/sample_plugin/app/views/my/blocks/_sample_block.html.erb
@@ -0,0 +1,3 @@
+<h3>Sample block</h3>
+
+You are <strong><%= h(User.current) %></strong> and this is a sample block for My Page added from a plugin.
diff --git a/extra/sample_plugin/app/views/my/blocks/_sample_block.rhtml b/extra/sample_plugin/app/views/my/blocks/_sample_block.rhtml
deleted file mode 100644
index c19e49739..000000000
--- a/extra/sample_plugin/app/views/my/blocks/_sample_block.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>Sample block</h3>
-
-You are <strong><%= h(User.current) %></strong> and this is a sample block for My Page added from a plugin.
diff --git a/extra/sample_plugin/app/views/settings/_sample_plugin_settings.html.erb b/extra/sample_plugin/app/views/settings/_sample_plugin_settings.html.erb
new file mode 100644
index 000000000..bf06e2666
--- /dev/null
+++ b/extra/sample_plugin/app/views/settings/_sample_plugin_settings.html.erb
@@ -0,0 +1,3 @@
+<p><label>Example setting</label><%= text_field_tag 'settings[sample_setting]', @settings['sample_setting'] %></p>
+
+<p><label>Foo</label><%= text_field_tag 'settings[foo]', @settings['foo'] %></p>
diff --git a/extra/sample_plugin/app/views/settings/_sample_plugin_settings.rhtml b/extra/sample_plugin/app/views/settings/_sample_plugin_settings.rhtml
deleted file mode 100644
index bf06e2666..000000000
--- a/extra/sample_plugin/app/views/settings/_sample_plugin_settings.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<p><label>Example setting</label><%= text_field_tag 'settings[sample_setting]', @settings['sample_setting'] %></p>
-
-<p><label>Foo</label><%= text_field_tag 'settings[foo]', @settings['foo'] %></p>
-- 
cgit v1.2.3