From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 29 Aug 2011 01:39:54 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/timelog/bulk_edit.rhtml.
X-Git-Tag: 1.3.0~1252
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=510504b0071d58335fe6a716df47ba76e5e29e12;p=redmine.git

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

diff --git a/app/views/timelog/bulk_edit.html.erb b/app/views/timelog/bulk_edit.html.erb
new file mode 100644
index 000000000..a93e39238
--- /dev/null
+++ b/app/views/timelog/bulk_edit.html.erb
@@ -0,0 +1,49 @@
+<h2><%= l(:label_bulk_edit_selected_time_entries) %></h2>
+
+<ul><%= @time_entries.collect {|i| content_tag('li', link_to(h("#{i.spent_on.strftime("%Y-%m-%d")} -- #{i.project}:  #{l(:label_f_hour_plural, :value => i.hours)}"), { :action => 'edit', :id => i }))} %></ul>
+
+<% form_tag(:action => 'bulk_update') do %>
+<%= @time_entries.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
+<div class="box tabular">
+  <fieldset class="attributes">
+  <legend><%= l(:label_change_properties) %></legend>
+  <div>
+    <p>
+      <label><%= l(:field_issue) %></label>
+      <%= text_field :time_entry, :issue_id, :size => 6 %>
+    </p>
+
+    <p>
+      <label><%= l(:field_spent_on) %></label>
+      <%= text_field :time_entry, :spent_on, :size => 10 %><%= calendar_for('time_entry_spent_on') %>
+    </p>
+
+    <p>
+      <label><%= l(:field_hours) %></label>
+      <%= text_field :time_entry, :hours, :size => 6 %>
+    </p>
+
+    <% if @available_activities.any? %>
+    <p>
+      <label><%= l(:field_activity) %></label>
+      <%= select_tag('time_entry[activity_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_activities, :id, :name)) %>
+    </p>
+    <% end %>
+
+    <p>
+      <label><%= l(:field_comments) %></label>
+      <%= text_field(:time_entry, :comments, :size => 100) %>
+    </p>
+
+    <% @custom_fields.each do |custom_field| %>
+      <p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit('time_entry', custom_field, @projects) %></p>
+    <% end %>
+
+    <%= call_hook(:view_time_entries_bulk_edit_details_bottom, { :time_entries => @time_entries }) %>
+  </div>
+
+  </fieldset>
+</div>
+
+<p><%= submit_tag l(:button_submit) %></p>
+<% end %>
diff --git a/app/views/timelog/bulk_edit.rhtml b/app/views/timelog/bulk_edit.rhtml
deleted file mode 100644
index a93e39238..000000000
--- a/app/views/timelog/bulk_edit.rhtml
+++ /dev/null
@@ -1,49 +0,0 @@
-<h2><%= l(:label_bulk_edit_selected_time_entries) %></h2>
-
-<ul><%= @time_entries.collect {|i| content_tag('li', link_to(h("#{i.spent_on.strftime("%Y-%m-%d")} -- #{i.project}:  #{l(:label_f_hour_plural, :value => i.hours)}"), { :action => 'edit', :id => i }))} %></ul>
-
-<% form_tag(:action => 'bulk_update') do %>
-<%= @time_entries.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
-<div class="box tabular">
-  <fieldset class="attributes">
-  <legend><%= l(:label_change_properties) %></legend>
-  <div>
-    <p>
-      <label><%= l(:field_issue) %></label>
-      <%= text_field :time_entry, :issue_id, :size => 6 %>
-    </p>
-
-    <p>
-      <label><%= l(:field_spent_on) %></label>
-      <%= text_field :time_entry, :spent_on, :size => 10 %><%= calendar_for('time_entry_spent_on') %>
-    </p>
-
-    <p>
-      <label><%= l(:field_hours) %></label>
-      <%= text_field :time_entry, :hours, :size => 6 %>
-    </p>
-
-    <% if @available_activities.any? %>
-    <p>
-      <label><%= l(:field_activity) %></label>
-      <%= select_tag('time_entry[activity_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_activities, :id, :name)) %>
-    </p>
-    <% end %>
-
-    <p>
-      <label><%= l(:field_comments) %></label>
-      <%= text_field(:time_entry, :comments, :size => 100) %>
-    </p>
-
-    <% @custom_fields.each do |custom_field| %>
-      <p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit('time_entry', custom_field, @projects) %></p>
-    <% end %>
-
-    <%= call_hook(:view_time_entries_bulk_edit_details_bottom, { :time_entries => @time_entries }) %>
-  </div>
-
-  </fieldset>
-</div>
-
-<p><%= submit_tag l(:button_submit) %></p>
-<% end %>