[#9489] set ids, created invisible labels and linked them

Contributed by Romano Licker.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7689 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/timelog/_date_range.html.erb b/app/views/timelog/_date_range.html.erb
index 93c487a20505bd42de20ee8f47f900eed5ca715e..fb694a704bfc3dc3568aea44bf7de44fcc813035 100644 (file)
--- a/app/views/timelog/_date_range.html.erb
+++ b/app/views/timelog/_date_range.html.erb
@@ -2,17 +2,22 @@
 <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");' %>
+<%= 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 %>
 </p>
 <p>
-<%= 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" %>
 <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'))) %>
+<%= 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'))) %>
 </span>
 </p>
 </div>

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 23f06bbabb450f945e853f58e51cb60302cab5e8..78c0177b0e573274188f689b864a7c0e641d3fa8 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1010,4 +1010,8 @@ 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 93c987cedcdf96523e517d8c4ece3cd4f68af0bf..c2351e5394504f18c5d31ea360dbb2cb17685b83 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -988,3 +988,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