From: Jean-Philippe Lang Date: Fri, 20 Apr 2012 06:13:37 +0000 (+0000) Subject: Merged r9452 from trunk. X-Git-Tag: 1.4.1~7 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2b2f721ef4184eef7f2ced028cf55bed0cf7d643;p=redmine.git Merged r9452 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9453 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/timelog/_date_range.html.erb b/app/views/timelog/_date_range.html.erb index d95dfab95..95e604dcf 100644 --- a/app/views/timelog/_date_range.html.erb +++ b/app/views/timelog/_date_range.html.erb @@ -12,7 +12,7 @@

<%= label_tag "period_type_interval", l(:description_date_range_interval), :class => "hidden-for-sighted" %> <%= radio_button_tag 'period_type', '2', @free_period, :onclick => 'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");', :id => "period_type_interval" %> - + <%= l(:label_date_from_to, :start => ((label_tag "from", l(:description_date_from), :class => "hidden-for-sighted") + text_field_tag('from', @from, :size => 10, :disabled => !@free_period) + calendar_for('from')),