From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 30 Aug 2011 14:17:28 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/news/index.rhtml.
X-Git-Tag: 1.3.0~1148
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2b609121bcd1a27fd5df69d9cd4f08d1cadc7e78;p=redmine.git

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

diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb
new file mode 100644
index 000000000..b9cd2b24e
--- /dev/null
+++ b/app/views/news/index.html.erb
@@ -0,0 +1,51 @@
+<div class="contextual">
+<%= link_to(l(:label_news_new),
+            new_project_news_path(@project),
+            :class => 'icon icon-add',
+            :onclick => 'Element.show("add-news"); Form.Element.focus("news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %>
+</div>
+
+<div id="add-news" style="display:none;">
+<h2><%=l(:label_news_new)%></h2>
+<% labelled_tabular_form_for :news, @news, :url => project_news_index_path(@project),
+                                           :html => { :id => 'news-form' } do |f| %>
+<%= render :partial => 'news/form', :locals => { :f => f } %>
+<%= submit_tag l(:button_create) %>
+<%= link_to_remote l(:label_preview), 
+                   { :url => preview_news_path(:project_id => @project),
+                     :method => 'get',
+                     :update => 'preview',
+                     :with => "Form.serialize('news-form')"
+                   }, :accesskey => accesskey(:preview) %> |
+<%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-news")' %>
+<% end if @project %>
+<div id="preview" class="wiki"></div>
+</div>
+
+<h2><%=l(:label_news_plural)%></h2>
+
+<% if @newss.empty? %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% else %>
+<% @newss.each do |news| %>
+    <h3><%= link_to_project(news.project) + ': ' unless news.project == @project %>
+    <%= link_to h(news.title), news_path(news) %>
+    <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %></h3>
+    <p class="author"><%= authoring news.created_on, news.author %></p>
+    <div class="wiki">
+    <%= textilizable(news.description) %>
+    </div>
+<% end %>
+<% end %>
+<p class="pagination"><%= pagination_links_full @news_pages %></p>
+
+<% other_formats_links do |f| %>
+	<%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %>
+<% end %>
+
+<% content_for :header_tags do %>
+  <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
+  <%= stylesheet_link_tag 'scm' %>
+<% end %>
+
+<% html_title(l(:label_news_plural)) -%>
diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml
deleted file mode 100644
index b9cd2b24e..000000000
--- a/app/views/news/index.rhtml
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="contextual">
-<%= link_to(l(:label_news_new),
-            new_project_news_path(@project),
-            :class => 'icon icon-add',
-            :onclick => 'Element.show("add-news"); Form.Element.focus("news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %>
-</div>
-
-<div id="add-news" style="display:none;">
-<h2><%=l(:label_news_new)%></h2>
-<% labelled_tabular_form_for :news, @news, :url => project_news_index_path(@project),
-                                           :html => { :id => 'news-form' } do |f| %>
-<%= render :partial => 'news/form', :locals => { :f => f } %>
-<%= submit_tag l(:button_create) %>
-<%= link_to_remote l(:label_preview), 
-                   { :url => preview_news_path(:project_id => @project),
-                     :method => 'get',
-                     :update => 'preview',
-                     :with => "Form.serialize('news-form')"
-                   }, :accesskey => accesskey(:preview) %> |
-<%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-news")' %>
-<% end if @project %>
-<div id="preview" class="wiki"></div>
-</div>
-
-<h2><%=l(:label_news_plural)%></h2>
-
-<% if @newss.empty? %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% else %>
-<% @newss.each do |news| %>
-    <h3><%= link_to_project(news.project) + ': ' unless news.project == @project %>
-    <%= link_to h(news.title), news_path(news) %>
-    <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %></h3>
-    <p class="author"><%= authoring news.created_on, news.author %></p>
-    <div class="wiki">
-    <%= textilizable(news.description) %>
-    </div>
-<% end %>
-<% end %>
-<p class="pagination"><%= pagination_links_full @news_pages %></p>
-
-<% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %>
-<% end %>
-
-<% content_for :header_tags do %>
-  <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
-  <%= stylesheet_link_tag 'scm' %>
-<% end %>
-
-<% html_title(l(:label_news_plural)) -%>