diff --git a/app/views/queries/_columns.html.erb b/app/views/queries/_columns.html.erb index 1c3c771..3e08726 100644 --- a/app/views/queries/_columns.html.erb +++ b/app/views/queries/_columns.html.erb @@ -1,6 +1,8 @@ - @@ -10,7 +12,9 @@ - diff --git a/app/views/queries/_filters.html.erb b/app/views/queries/_filters.html.erb index 09172ee..af640dd 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);
<%= 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" %> - <%= 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}');" %>