diff --git a/app/views/queries/_columns.rhtml b/app/views/queries/_columns.rhtml index f96d87b0..6c2eda4e 100644 --- a/app/views/queries/_columns.rhtml +++ b/app/views/queries/_columns.rhtml @@ -1,6 +1,8 @@ - @@ -10,7 +12,9 @@ - diff --git a/app/views/queries/_filters.rhtml b/app/views/queries/_filters.rhtml index 1c67f580..5cf9825d 100644 --- a/app/views/queries/_filters.rhtml +++ b/app/views/queries/_filters.rhtml @@ -85,6 +85,7 @@ Event.observe(document,"dom:loaded", apply_filters_observer);
<%= select_tag 'available_columns', + + <%= 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" %> <%= select_tag 'c[]', + + <%= 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" %> + <%= 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}');", :class => "select-small", :style => "vertical-align: top;" %> diff --git a/app/views/queries/_form.rhtml b/app/views/queries/_form.rhtml index dcafe9f6..39486d90 100644 --- a/app/views/queries/_form.rhtml +++ b/app/views/queries/_form.rhtml @@ -30,10 +30,12 @@
<%= l(:label_sort) %> <% 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))) %>
+<%= 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) %> +
<% end %>
diff --git a/config/locales/de.yml b/config/locales/de.yml index fcc49dd7..30096da3 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -982,5 +982,10 @@ de: label_path_encoding: Path encoding text_mercurial_repo_example: local repository (e.g. /hgrepo, c:\hgrepo) label_diff: diff + 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 af0766b8..0a15b1ab 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -964,5 +964,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