diff --git a/app/views/timelog/_date_range.rhtml b/app/views/timelog/_date_range.rhtml index e916bc18..d537d0a1 100644 --- a/app/views/timelog/_date_range.rhtml +++ b/app/views/timelog/_date_range.rhtml @@ -2,17 +2,23 @@ <%= l(:label_date_range) %>

-<%= radio_button_tag 'period_type', '1', !@free_period, :onclick => 'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");' %> +<%= label_tag "period_type_list", l(:description_date_range_list), :class => "hidden-for-sighted" %> +<%= radio_button_tag 'period_type', '1', !@free_period, :onclick => 'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");', :id => "period_type_list"%> <%= select_tag 'period', options_for_period_select(params[:period]), :onchange => 'this.form.submit();', :onfocus => '$("period_type_1").checked = true;', :disabled => @free_period %>

-<%= radio_button_tag 'period_type', '2', @free_period, :onclick => 'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");' %> +<%= 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 => (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'))) %> + +<%= 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'))) %>

diff --git a/config/locales/de.yml b/config/locales/de.yml index b30a064b..5c779704 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -995,3 +995,7 @@ de: description_selected_columns: Ausgewählte Spalten description_ticket_reassign: Ticketzuordnung description_wiki_reassign: Wikiseitenzuordnung + description_date_range_list: Zeitraum aus einer Liste wählen + description_date_range_interval: Zeitraum durch Start- und Enddatum festlegen + description_date_from: Startdatum eintragen + description_date_to: Enddatum eintragen diff --git a/config/locales/en.yml b/config/locales/en.yml index 0398c912..c30fb19b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -977,3 +977,7 @@ en: description_selected_columns: Selected Spalten description_ticket_reassign: Assign issues to description_wiki_reassign: Assign page to + description_date_range_list: Choose range from list + description_date_range_interval: Choose range by selecting start and end date + description_date_from: Enter start date + description_date_to: Enter end date