dinislage/redmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#9489] added invisible labels for queries

Browse Source 
Contributed by Romano Licker.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7678 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2011-10-29 01:14:10 +00:00
parent f8fa9b767d
commit fc54fac556
5 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/queries/_columns.html.erb
+6 -2
View File
@@ -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>
app/views/queries/_filters.html.erb
+4 -1
View File
@@ -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;">
app/views/queries/_form.html.erb
+12 -4
View File
@@ -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>