From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 24 Aug 2011 03:52:48 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/wiki/history.rhtml.
X-Git-Tag: 1.3.0~1401
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=afbbda2209d7fcfa24a9b5c458149767763038b7;p=redmine.git

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

diff --git a/app/views/wiki/history.html.erb b/app/views/wiki/history.html.erb
new file mode 100644
index 000000000..256394471
--- /dev/null
+++ b/app/views/wiki/history.html.erb
@@ -0,0 +1,37 @@
+<%= wiki_page_breadcrumb(@page) %>
+
+<h2><%= h(@page.pretty_title) %></h2>
+
+<h3><%= l(:label_history) %></h3>
+
+<% form_tag({:action => "diff"}, :method => :get) do %>
+<table class="list wiki-page-versions">
+<thead><tr>
+    <th>#</th>
+    <th></th>
+    <th></th>
+    <th><%= l(:field_updated_on) %></th>
+    <th><%= l(:field_author) %></th>
+    <th><%= l(:field_comments) %></th>
+    <th></th>
+</tr></thead>
+<tbody>
+<% show_diff = @versions.size > 1 %>
+<% line_num = 1 %>
+<% @versions.each do |ver| %>
+<tr class="wiki-page-version <%= cycle("odd", "even") %>">
+    <td class="id"><%= link_to h(ver.version), :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %></td>
+    <td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < @versions.size) %></td>
+    <td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td>
+    <td class="updated_on"><%= format_time(ver.updated_on) %></td>
+    <td class="author"><%= link_to_user ver.author %></td>
+    <td class="comments"><%=h ver.comments %></td>
+    <td class="buttons"><%= link_to l(:button_annotate), :action => 'annotate', :id => @page.title, :version => ver.version %></td>
+</tr>
+<% line_num += 1 %>
+<% end %>
+</tbody>
+</table>
+<%= submit_tag l(:label_view_diff), :class => 'small' if show_diff %>
+<span class="pagination"><%= pagination_links_full @version_pages, @version_count, :page_param => :p %></span>
+<% end %>
diff --git a/app/views/wiki/history.rhtml b/app/views/wiki/history.rhtml
deleted file mode 100644
index 256394471..000000000
--- a/app/views/wiki/history.rhtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<%= wiki_page_breadcrumb(@page) %>
-
-<h2><%= h(@page.pretty_title) %></h2>
-
-<h3><%= l(:label_history) %></h3>
-
-<% form_tag({:action => "diff"}, :method => :get) do %>
-<table class="list wiki-page-versions">
-<thead><tr>
-    <th>#</th>
-    <th></th>
-    <th></th>
-    <th><%= l(:field_updated_on) %></th>
-    <th><%= l(:field_author) %></th>
-    <th><%= l(:field_comments) %></th>
-    <th></th>
-</tr></thead>
-<tbody>
-<% show_diff = @versions.size > 1 %>
-<% line_num = 1 %>
-<% @versions.each do |ver| %>
-<tr class="wiki-page-version <%= cycle("odd", "even") %>">
-    <td class="id"><%= link_to h(ver.version), :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %></td>
-    <td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < @versions.size) %></td>
-    <td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td>
-    <td class="updated_on"><%= format_time(ver.updated_on) %></td>
-    <td class="author"><%= link_to_user ver.author %></td>
-    <td class="comments"><%=h ver.comments %></td>
-    <td class="buttons"><%= link_to l(:button_annotate), :action => 'annotate', :id => @page.title, :version => ver.version %></td>
-</tr>
-<% line_num += 1 %>
-<% end %>
-</tbody>
-</table>
-<%= submit_tag l(:label_view_diff), :class => 'small' if show_diff %>
-<span class="pagination"><%= pagination_links_full @version_pages, @version_count, :page_param => :p %></span>
-<% end %>