From 0e9b82a807ac32737b9102b988f7d5df1d06d7da Mon Sep 17 00:00:00 2001 From: Romano Licker Date: Fri, 16 Dec 2011 12:28:14 +0100 Subject: [PATCH] [accessibility] labels, alt tags for rate edit views --- app/views/cost_types/_rate.rhtml | 10 ++++++++-- app/views/cost_types/edit.rhtml | 1 + app/views/hourly_rates/_rate.rhtml | 22 ++++++++++++++-------- app/views/hourly_rates/edit.rhtml | 1 + config/locales/de.yml | 1 + config/locales/en.yml | 1 + 6 files changed, 26 insertions(+), 10 deletions(-) diff --git a/app/views/cost_types/_rate.rhtml b/app/views/cost_types/_rate.rhtml index cbf656cc03..6027bc9c5a 100644 --- a/app/views/cost_types/_rate.rhtml +++ b/app/views/cost_types/_rate.rhtml @@ -15,8 +15,14 @@ <% unless error_messages.blank? %><%= error_messages %><% end %> <% fields_for prefix, rate do |rate_form| %> - <%= rate_form.text_field :valid_from, :size => 10, :class => 'date', :index => id_or_index %><%= calendar_for("#{id_prefix}_valid_from") %> - <%= rate_form.text_field :rate, :size => 7, :index => id_or_index, :value => rate.rate ? rate.rate.round(2) : "" %> <%= Setting.plugin_redmine_costs['costs_currency'] %> + + + <%= rate_form.text_field :valid_from, :size => 10, :class => 'date', :index => id_or_index %><%= calendar_for("#{id_prefix}_valid_from") %> + + + + <%= rate_form.text_field :rate, :size => 7, :index => id_or_index, :value => rate.rate ? rate.rate.round(2) : "" %> <%= Setting.plugin_redmine_costs['costs_currency'] %> + <%= image_to_function 'delete.png', "var e = $('#{id_prefix}');parent=e.up();e.remove();recalculate_even_odd(parent)", {:alt => l(:button_delete), :title => l(:button_delete)}%> <% end %> diff --git a/app/views/cost_types/edit.rhtml b/app/views/cost_types/edit.rhtml index 021ea55aff..726184f63e 100644 --- a/app/views/cost_types/edit.rhtml +++ b/app/views/cost_types/edit.rhtml @@ -37,6 +37,7 @@
+ <%= text_field_tag :add_rate_date, "", :size => 10, :value => Date.today %><%= calendar_for("add_rate_date") %> <%= link_to_function l(:button_add_rate), "addRate($('add_rate_date'))", {:class => "icon icon-add"} %>
diff --git a/app/views/hourly_rates/_rate.rhtml b/app/views/hourly_rates/_rate.rhtml index 35276351a1..5ba865f15a 100644 --- a/app/views/hourly_rates/_rate.rhtml +++ b/app/views/hourly_rates/_rate.rhtml @@ -1,7 +1,7 @@ -<%- - index ||= "INDEX" +<%- + index ||= "INDEX" new_or_existing = rate.new_record? ? 'new' : 'existing' - id_or_index = rate.new_record? ? index : rate.id + id_or_index = rate.new_record? ? index : rate.id prefix = "user[#{new_or_existing}_rate_attributes][]" id_prefix = "user_#{new_or_existing}_rate_attributes_#{id_or_index}" name_prefix = "user[#{new_or_existing}_rate_attributes][#{id_or_index}]" @@ -9,14 +9,20 @@ @rate = rate error_messages = error_messages_for 'rate' --%> +-%> <% unless error_messages.blank? %><%= error_messages %><% end %> <% fields_for prefix, rate do |rate_form| %> - <%= rate_form.text_field :valid_from, :size => 10, :class => 'date', :index => id_or_index %><%= calendar_for("#{id_prefix}_valid_from") %> - <%= rate_form.text_field :rate, :size => 7, :index => id_or_index, :value => rate.rate ? rate.rate.round(2) : "" %> <%= Setting.plugin_redmine_costs['costs_currency'] %> - <%= image_to_function 'delete.png', "var e = $('#{id_prefix}');parent=e.up();e.remove();recalculate_even_odd(parent)"%> + + + <%= rate_form.text_field :valid_from, :size => 10, :class => 'date', :index => id_or_index %><%= calendar_for("#{id_prefix}_valid_from") %> + + + + <%= rate_form.text_field :rate, :size => 7, :index => id_or_index, :value => rate.rate ? rate.rate.round(2) : "" %> <%= Setting.plugin_redmine_costs['costs_currency'] %> + + <%= image_to_function 'delete.png', "var e = $('#{id_prefix}');parent=e.up();e.remove();recalculate_even_odd(parent)", :alt => l(:button_delete) %> -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/hourly_rates/edit.rhtml b/app/views/hourly_rates/edit.rhtml index 7df4c8d3c9..5f385fb69f 100644 --- a/app/views/hourly_rates/edit.rhtml +++ b/app/views/hourly_rates/edit.rhtml @@ -26,6 +26,7 @@
+ <%= text_field_tag :add_rate_date, "", :size => 10, :value => Date.today %><%= calendar_for("add_rate_date") %> <%= link_to_function l(:button_add_rate), "addRate($('add_rate_date'))", {:class => "icon icon-add"} %>
diff --git a/config/locales/de.yml b/config/locales/de.yml index 2d345afefe..4c4de354a7 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -165,3 +165,4 @@ de: caption_locked_on: "Gesperrt am" caption_show_locked: "Gesperrte Typen anzeigen" button_cancel_edit_budget: "Budget bearbeiten abbrechen" + description_date_for_new_rate: "Datum für neuen Satz" diff --git a/config/locales/en.yml b/config/locales/en.yml index a5d3df5e84..9246fbd3c8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -163,3 +163,4 @@ en: caption_locked_on: "Locked on" caption_show_locked: "Show locked types" button_cancel_edit_budget: "Cancel editing budget" + description_date_for_new_rate: "Date for new rate"