From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 29 Oct 2011 01:14:10 +0000 (+0000)
Subject: [#9489] added invisible labels for queries
X-Git-Tag: 1.3.0~312
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fc54fac55621a39e9ca447dc733f6a179fe1ceb8;p=redmine.git

[#9489] added invisible labels for queries

Contributed by Romano Licker.

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

diff --git a/app/views/queries/_columns.html.erb b/app/views/queries/_columns.html.erb
index 1c3c771ed..3e08726b0 100644
--- a/app/views/queries/_columns.html.erb
+++ b/app/views/queries/_columns.html.erb
@@ -1,6 +1,8 @@
 <table style="border-collapse: collapse; border:0;">
   <tr>
-    <td style="padding-left:0"><%= select_tag 'available_columns',
+    <td style="padding-left:0">
+      <%= label_tag "available_columns", l(:description_available_columns), :class => "hidden-for-sighted" %>
+      <%= select_tag 'available_columns',
               options_for_select((query.available_columns - query.columns).collect {|column| [column.caption, column.name]}),
               :multiple => true, :size => 10, :style => "width:150px" %>
     </td>
@@ -10,7 +12,9 @@
       <input type="button" value="&#8592;"
        onclick="moveOptions(this.form.selected_columns, this.form.available_columns);" />
     </td>
-    <td><%= select_tag 'c[]',
+    <td>
+      <%= label_tag "selected_columns", l(:description_selected_columns), :class => "hidden-for-sighted" %>
+      <%= select_tag 'c[]',
               options_for_select(query.columns.collect {|column| [column.caption, column.name]}),
               :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px" %>
     </td>
diff --git a/app/views/queries/_filters.html.erb b/app/views/queries/_filters.html.erb
index 09172eef1..af640dd12 100644
--- a/app/views/queries/_filters.html.erb
+++ b/app/views/queries/_filters.html.erb
@@ -114,7 +114,10 @@ Event.observe(document,"dom:loaded", apply_filters_observer);
         <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label>
     </td>
     <td class="operator">
-        <%= select_tag "op[#{field}]", options_for_select(operators_for_select(options[:type]), query.operator_for(field)), :id => "operators_#{field}", :onchange => "toggle_operator('#{field}');" %>
+        <%= label_tag "op_#{field}", l(:description_filter), :class => "hidden-for-sighted" %>
+        <%= select_tag "op[#{field}]", options_for_select(operators_for_select(options[:type]),
+                        query.operator_for(field)), :id => "operators_#{field}",
+                        :onchange => "toggle_operator('#{field}');" %>
     </td>
     <td class="values">
     <div id="div_values_<%= field %>" style="display:none;">
diff --git a/app/views/queries/_form.html.erb b/app/views/queries/_form.html.erb
index 806944359..cee8fbaa8 100644
--- a/app/views/queries/_form.html.erb
+++ b/app/views/queries/_form.html.erb
@@ -29,10 +29,18 @@
 
 <fieldset><legend><%= l(:label_sort) %></legend>
 <% 3.times do |i| %>
-<%= i+1 %>: <%= select_tag("query[sort_criteria][#{i}][]",
-                  options_for_select([[]] + query.available_columns.select(&:sortable?).collect {|column| [column.caption, column.name.to_s]}, @query.sort_criteria_key(i))) %>
-            <%= select_tag("query[sort_criteria][#{i}][]",
-                            options_for_select([[], [l(:label_ascending), 'asc'], [l(:label_descending), 'desc']], @query.sort_criteria_order(i))) %><br />
+<%= i+1 %>: 
+<%= label_tag "query_sort_criteria_attribute_" + i.to_s,
+              l(:description_query_sort_criteria_attribute), :class => "hidden-for-sighted" %>
+<%= select_tag("query[sort_criteria][#{i}][]",
+               options_for_select([[]] + query.available_columns.select(&:sortable?).collect {|column| [column.caption, column.name.to_s]}, @query.sort_criteria_key(i)),
+               :id => "query_sort_criteria_attribute_" + i.to_s)%>
+<%= label_tag "query_sort_criteria_direction_" + i.to_s,
+              l(:description_query_sort_criteria_direction), :class => "hidden-for-sighted" %>
+<%= select_tag("query[sort_criteria][#{i}][]",
+                options_for_select([[], [l(:label_ascending), 'asc'], [l(:label_descending), 'desc']], @query.sort_criteria_order(i)),
+                :id => "query_sort_criteria_direction_" + i.to_s) %>
+<br />
 <% end %>
 </fieldset>
 
diff --git a/config/locales/de.yml b/config/locales/de.yml
index a24278ac2..7f1b146d9 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1000,6 +1000,11 @@ de:
   label_diff: diff
   text_git_repository_note: Repository is bare and local (e.g. /gitrepo, c:\gitrepo)
 
+  description_filter: Filter
   description_search: Suchfeld
   description_project_scope: Suchbereich
+  description_query_sort_criteria_attribute: Sortierattribut
+  description_query_sort_criteria_direction: Sortierrichtung
+  description_available_columns: Verfügbare Spalten
+  description_selected_columns: Ausgewählte Spalten
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 02c318f75..004fd9109 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -978,5 +978,10 @@ en:
   enumeration_doc_categories: Document categories
   enumeration_activities: Activities (time tracking)
   enumeration_system_activity: System Activity
+  description_filter: Filter
   description_search: Searchfield
   description_project_scope: Search scope
+  description_query_sort_criteria_attribute: Sort attribute
+  description_query_sort_criteria_direction: Sort direction
+  description_available_columns: Available Columns
+  description_selected_columns: Selected Spalten