diff --git a/app/views/timelog/_date_range.html.erb b/app/views/timelog/_date_range.html.erb index 7c5523871..17a34b99b 100644 --- a/app/views/timelog/_date_range.html.erb +++ b/app/views/timelog/_date_range.html.erb @@ -12,13 +12,11 @@

<%= label_tag "period_type_interval", l(:description_date_range_interval), :class => "hidden-for-sighted" %> <%= radio_button_tag 'period_type', '2', @free_period, :onclick => '$("#from,#to").removeAttr("disabled");$("#period").attr("disabled", true);', :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')), :end => ((label_tag "to", l(:description_date_to), :class => "hidden-for-sighted") + text_field_tag('to', @to, :size => 10, :disabled => !@free_period) + calendar_for('to'))).html_safe %> -

@@ -36,3 +34,9 @@ :class => (action_name == 'report' ? 'selected' : nil)) %> + +<%= javascript_tag do %> +$('#from, #to').change(function(){ + $('#period_type_interval').attr('checked', true); $('#from,#to').removeAttr('disabled'); $('#period').attr('disabled', true); +}); +<% end %>