From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 1 Sep 2011 11:52:42 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/projects/settings/_activities.rhtml.
X-Git-Tag: 1.3.0~974
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1252b44381ec81ea3d1af2f26650201007358b34;p=redmine.git

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

diff --git a/app/views/projects/settings/_activities.html.erb b/app/views/projects/settings/_activities.html.erb
new file mode 100644
index 000000000..66be53008
--- /dev/null
+++ b/app/views/projects/settings/_activities.html.erb
@@ -0,0 +1,42 @@
+<% form_tag(project_project_enumerations_path(@project), :method => :put, :class => "tabular") do %>
+
+<table class="list">
+  <thead><tr>
+    <th><%= l(:field_name) %></th>
+    <th><%= l(:enumeration_system_activity) %></th>
+    <% TimeEntryActivity.new.available_custom_fields.each do |value| %>
+	<th><%= h value.name %></th>
+    <% end %>
+    <th style="width:15%;"><%= l(:field_active) %></th>
+  </tr></thead>
+
+  <% @project.activities(true).each do |enumeration| %>
+  <% fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %>
+  <tr class="<%= cycle('odd', 'even') %>">
+    <td>
+      <%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %>
+      <%= h(enumeration) %>
+    </td>
+    <td align="center" style="width:15%;"><%= checked_image !enumeration.project %></td>
+    <% enumeration.custom_field_values.each do |value| %>
+	<td align="center">
+      <%= custom_field_tag "enumerations[#{enumeration.id}]", value %>
+    </td>
+    <% end %>
+    <td align="center" style="width:15%;">
+      <%= ff.check_box :active %>
+    </td>
+  </tr>
+  <% end %>
+  <% end %>
+</table>
+
+<div class="contextual">
+<%= link_to(l(:button_reset), project_project_enumerations_path(@project),
+						:method => :delete,
+						:confirm => l(:text_are_you_sure),
+            :class => 'icon icon-del') %>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff --git a/app/views/projects/settings/_activities.rhtml b/app/views/projects/settings/_activities.rhtml
deleted file mode 100644
index 66be53008..000000000
--- a/app/views/projects/settings/_activities.rhtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<% form_tag(project_project_enumerations_path(@project), :method => :put, :class => "tabular") do %>
-
-<table class="list">
-  <thead><tr>
-    <th><%= l(:field_name) %></th>
-    <th><%= l(:enumeration_system_activity) %></th>
-    <% TimeEntryActivity.new.available_custom_fields.each do |value| %>
-	<th><%= h value.name %></th>
-    <% end %>
-    <th style="width:15%;"><%= l(:field_active) %></th>
-  </tr></thead>
-
-  <% @project.activities(true).each do |enumeration| %>
-  <% fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %>
-  <tr class="<%= cycle('odd', 'even') %>">
-    <td>
-      <%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %>
-      <%= h(enumeration) %>
-    </td>
-    <td align="center" style="width:15%;"><%= checked_image !enumeration.project %></td>
-    <% enumeration.custom_field_values.each do |value| %>
-	<td align="center">
-      <%= custom_field_tag "enumerations[#{enumeration.id}]", value %>
-    </td>
-    <% end %>
-    <td align="center" style="width:15%;">
-      <%= ff.check_box :active %>
-    </td>
-  </tr>
-  <% end %>
-  <% end %>
-</table>
-
-<div class="contextual">
-<%= link_to(l(:button_reset), project_project_enumerations_path(@project),
-						:method => :delete,
-						:confirm => l(:text_are_you_sure),
-            :class => 'icon icon-del') %>
-</div>
-
-<%= submit_tag l(:button_save) %>
-<% end %>