From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 1 Sep 2011 03:55:34 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/custom_fields/_index.rhtml.
X-Git-Tag: 1.3.0~998
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8a9038297b6dabbb520587853fb3f06133da252b;p=redmine.git

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

diff --git a/app/views/custom_fields/_index.html.erb b/app/views/custom_fields/_index.html.erb
new file mode 100644
index 000000000..a6495fbfe
--- /dev/null
+++ b/app/views/custom_fields/_index.html.erb
@@ -0,0 +1,35 @@
+<table class="list">
+  <thead><tr>
+	<th width="30%"><%=l(:field_name)%></th>
+	<th><%=l(:field_field_format)%></th>
+	<th><%=l(:field_is_required)%></th>
+	<% if tab[:name] == 'IssueCustomField' %>
+	<th><%=l(:field_is_for_all)%></th>
+	<th><%=l(:label_used_by)%></th>
+	<% end %>
+	<th><%=l(:button_sort)%></th>
+	<th width="10%"></th>
+  </tr></thead>
+  <tbody>
+	<% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
+		<tr class="<%= cycle("odd", "even") %>">
+			<td><%= link_to h(custom_field.name), :action => 'edit', :id => custom_field %></td>
+			<td align="center"><%= l(Redmine::CustomFieldFormat.label_for(custom_field.field_format)) %></td>
+			<td align="center"><%= checked_image custom_field.is_required? %></td>
+			<% if tab[:name] == 'IssueCustomField' %>
+			<td align="center"><%= checked_image custom_field.is_for_all? %></td>
+			<td align="center"><%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
+			<% end %>
+		  <td align="center" style="width:15%;"><%= reorder_links('custom_field', {:action => 'edit', :id => custom_field}) %></td>
+			<td class="buttons">
+				<%= link_to(l(:button_delete), { :action => 'destroy', :id => custom_field },
+																			 :method => :post,
+																			 :confirm => l(:text_are_you_sure),
+																			 :class => 'icon icon-del') %>
+		  </td>
+		</tr>
+	<% end; reset_cycle %>
+  </tbody>
+</table>
+
+<p><%= link_to l(:label_custom_field_new), {:action => 'new', :type => tab[:name]}, :class => 'icon icon-add' %></p>
diff --git a/app/views/custom_fields/_index.rhtml b/app/views/custom_fields/_index.rhtml
deleted file mode 100644
index a6495fbfe..000000000
--- a/app/views/custom_fields/_index.rhtml
+++ /dev/null
@@ -1,35 +0,0 @@
-<table class="list">
-  <thead><tr>
-	<th width="30%"><%=l(:field_name)%></th>
-	<th><%=l(:field_field_format)%></th>
-	<th><%=l(:field_is_required)%></th>
-	<% if tab[:name] == 'IssueCustomField' %>
-	<th><%=l(:field_is_for_all)%></th>
-	<th><%=l(:label_used_by)%></th>
-	<% end %>
-	<th><%=l(:button_sort)%></th>
-	<th width="10%"></th>
-  </tr></thead>
-  <tbody>
-	<% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
-		<tr class="<%= cycle("odd", "even") %>">
-			<td><%= link_to h(custom_field.name), :action => 'edit', :id => custom_field %></td>
-			<td align="center"><%= l(Redmine::CustomFieldFormat.label_for(custom_field.field_format)) %></td>
-			<td align="center"><%= checked_image custom_field.is_required? %></td>
-			<% if tab[:name] == 'IssueCustomField' %>
-			<td align="center"><%= checked_image custom_field.is_for_all? %></td>
-			<td align="center"><%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
-			<% end %>
-		  <td align="center" style="width:15%;"><%= reorder_links('custom_field', {:action => 'edit', :id => custom_field}) %></td>
-			<td class="buttons">
-				<%= link_to(l(:button_delete), { :action => 'destroy', :id => custom_field },
-																			 :method => :post,
-																			 :confirm => l(:text_are_you_sure),
-																			 :class => 'icon icon-del') %>
-		  </td>
-		</tr>
-	<% end; reset_cycle %>
-  </tbody>
-</table>
-
-<p><%= link_to l(:label_custom_field_new), {:action => 'new', :type => tab[:name]}, :class => 'icon icon-add' %></p>