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

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

diff --git a/app/views/timelog/_date_range.html.erb b/app/views/timelog/_date_range.html.erb
new file mode 100644
index 000000000..e916bc187
--- /dev/null
+++ b/app/views/timelog/_date_range.html.erb
@@ -0,0 +1,33 @@
+<fieldset id="date-range" class="collapsible">
+<legend onclick="toggleFieldset(this);"><%= l(:label_date_range) %></legend>
+<div>
+<p>
+<%= radio_button_tag 'period_type', '1', !@free_period, :onclick => 'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");' %>
+<%= select_tag 'period', options_for_period_select(params[:period]),
+                         :onchange => 'this.form.submit();',
+                         :onfocus => '$("period_type_1").checked = true;',
+                         :disabled => @free_period %>
+</p>
+<p>
+<%= radio_button_tag 'period_type', '2', @free_period, :onclick => 'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");' %>
+<span onclick="$('period_type_2').checked = true;">
+<%= l(:label_date_from_to, :start => (text_field_tag('from', @from, :size => 10, :disabled => !@free_period) + calendar_for('from')),
+													 :end => (text_field_tag('to', @to, :size => 10, :disabled => !@free_period) + calendar_for('to'))) %>
+</span>
+</p>
+</div>
+</fieldset>
+<p class="buttons">
+	<%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-checked' %>
+  <%= link_to l(:button_clear), {:controller => controller_name, :action => action_name, :project_id => @project, :issue_id => @issue}, :class => 'icon icon-reload' %>
+</p>
+
+<div class="tabs">
+<% url_params = @free_period ? { :from => @from, :to => @to } : { :period => params[:period] } %>
+<ul>
+    <li><%= link_to(l(:label_details), url_params.merge({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue }),
+                                       :class => (@controller.action_name == 'index' ? 'selected' : nil)) %></li>
+    <li><%= link_to(l(:label_report), url_params.merge({:controller => 'time_entry_reports', :action => 'report', :project_id => @project, :issue_id => @issue}),
+                                       :class => (@controller.action_name == 'report' ? 'selected' : nil)) %></li>
+</ul>
+</div>
diff --git a/app/views/timelog/_date_range.rhtml b/app/views/timelog/_date_range.rhtml
deleted file mode 100644
index e916bc187..000000000
--- a/app/views/timelog/_date_range.rhtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<fieldset id="date-range" class="collapsible">
-<legend onclick="toggleFieldset(this);"><%= l(:label_date_range) %></legend>
-<div>
-<p>
-<%= radio_button_tag 'period_type', '1', !@free_period, :onclick => 'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");' %>
-<%= select_tag 'period', options_for_period_select(params[:period]),
-                         :onchange => 'this.form.submit();',
-                         :onfocus => '$("period_type_1").checked = true;',
-                         :disabled => @free_period %>
-</p>
-<p>
-<%= radio_button_tag 'period_type', '2', @free_period, :onclick => 'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");' %>
-<span onclick="$('period_type_2').checked = true;">
-<%= l(:label_date_from_to, :start => (text_field_tag('from', @from, :size => 10, :disabled => !@free_period) + calendar_for('from')),
-													 :end => (text_field_tag('to', @to, :size => 10, :disabled => !@free_period) + calendar_for('to'))) %>
-</span>
-</p>
-</div>
-</fieldset>
-<p class="buttons">
-	<%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-checked' %>
-  <%= link_to l(:button_clear), {:controller => controller_name, :action => action_name, :project_id => @project, :issue_id => @issue}, :class => 'icon icon-reload' %>
-</p>
-
-<div class="tabs">
-<% url_params = @free_period ? { :from => @from, :to => @to } : { :period => params[:period] } %>
-<ul>
-    <li><%= link_to(l(:label_details), url_params.merge({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue }),
-                                       :class => (@controller.action_name == 'index' ? 'selected' : nil)) %></li>
-    <li><%= link_to(l(:label_report), url_params.merge({:controller => 'time_entry_reports', :action => 'report', :project_id => @project, :issue_id => @issue}),
-                                       :class => (@controller.action_name == 'report' ? 'selected' : nil)) %></li>
-</ul>
-</div>