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

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
new file mode 100644 (file)
index 0000000..e9e5944
--- /dev/null
+++ b/app/views/welcome/index.html.erb
@@ -0,0 +1,40 @@
+<h2><%= l(:label_home) %></h2>
+
+<div class="splitcontentleft">
+  <%= textilizable Setting.welcome_text %>
+  <% if @news.any? %>
+  <div class="news box">
+       <h3><%=l(:label_news_latest)%></h3>
+               <%= render :partial => 'news/news', :collection => @news %>
+               <%= link_to l(:label_news_view_all), :controller => 'news' %>
+  </div>
+  <% end %>
+  <%= call_hook(:view_welcome_index_left, :projects => @projects) %>
+</div>
+
+<div class="splitcontentright">
+    <% if @projects.any? %>
+       <div class="projects box">
+       <h3><%=l(:label_project_latest)%></h3>
+               <ul>
+               <% for project in @projects %>
+                 <% @project = project %>
+                       <li>
+                       <%= link_to_project project %> (<%= format_time(project.created_on) %>)
+                       <%= textilizable project.short_description, :project => project %>
+                       </li>
+               <% end %>
+    <% @project = nil %>
+               </ul>
+       </div>
+       <% end %>
+    <%= call_hook(:view_welcome_index_right, :projects => @projects) %>
+</div> 
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag 'scm' %>
+<%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
+                                   :title => "#{Setting.app_title}: #{l(:label_news_latest)}") %>
+<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
+                                   :title => "#{Setting.app_title}: #{l(:label_activity)}") %>
+<% end %>

diff --git a/app/views/welcome/index.rhtml b/app/views/welcome/index.rhtml
deleted file mode 100644 (file)
index e9e5944..0000000
--- a/app/views/welcome/index.rhtml
+++ /dev/null
@@ -1,40 +0,0 @@
-<h2><%= l(:label_home) %></h2>
-
-<div class="splitcontentleft">
-  <%= textilizable Setting.welcome_text %>
-  <% if @news.any? %>
-  <div class="news box">
-       <h3><%=l(:label_news_latest)%></h3>
-               <%= render :partial => 'news/news', :collection => @news %>
-               <%= link_to l(:label_news_view_all), :controller => 'news' %>
-  </div>
-  <% end %>
-  <%= call_hook(:view_welcome_index_left, :projects => @projects) %>
-</div>
-
-<div class="splitcontentright">
-    <% if @projects.any? %>
-       <div class="projects box">
-       <h3><%=l(:label_project_latest)%></h3>
-               <ul>
-               <% for project in @projects %>
-                 <% @project = project %>
-                       <li>
-                       <%= link_to_project project %> (<%= format_time(project.created_on) %>)
-                       <%= textilizable project.short_description, :project => project %>
-                       </li>
-               <% end %>
-    <% @project = nil %>
-               </ul>
-       </div>
-       <% end %>
-    <%= call_hook(:view_welcome_index_right, :projects => @projects) %>
-</div> 
-
-<% content_for :header_tags do %>
-<%= stylesheet_link_tag 'scm' %>
-<%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
-                                   :title => "#{Setting.app_title}: #{l(:label_news_latest)}") %>
-<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
-                                   :title => "#{Setting.app_title}: #{l(:label_activity)}") %>
-<% end %>