@@ -109,20 +109,20 Event.observe(document,"dom:loaded", apply_filters_observer); | |||||
109 | <% field = filter[0] |
|
109 | <% field = filter[0] | |
110 | options = filter[1] %> |
|
110 | options = filter[1] %> | |
111 | <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>" class="filter"> |
|
111 | <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>" class="filter"> | |
112 | <td style="width:200px;"> |
|
112 | <td class="field"> | |
113 | <%= check_box_tag 'f[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %> |
|
113 | <%= check_box_tag 'f[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %> | |
114 | <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label> |
|
114 | <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label> | |
115 | </td> |
|
115 | </td> | |
116 | <td style="width:170px;"> |
|
116 | <td class="operator"> | |
117 |
<%= select_tag "op[#{field}]", options_for_select(operators_for_select(options[:type]), query.operator_for(field)), :id => "operators_#{field}", :onchange => "toggle_operator('#{field}');" |
|
117 | <%= select_tag "op[#{field}]", options_for_select(operators_for_select(options[:type]), query.operator_for(field)), :id => "operators_#{field}", :onchange => "toggle_operator('#{field}');" %> | |
118 | </td> |
|
118 | </td> | |
119 | <td> |
|
119 | <td class="values"> | |
120 | <div id="div_values_<%= field %>" style="display:none;"> |
|
120 | <div id="div_values_<%= field %>" style="display:none;"> | |
121 | <% case options[:type] |
|
121 | <% case options[:type] | |
122 | when :list, :list_optional, :list_status, :list_subprojects %> |
|
122 | when :list, :list_optional, :list_status, :list_subprojects %> | |
123 | <span class="span_values_<%= field %>"> |
|
123 | <span class="span_values_<%= field %>"> | |
124 | <%= select_tag "v[#{field}][]", options_for_select(options[:values], query.values_for(field)), :class => "values_#{field}", :id => "values_#{field}_1", :multiple => (query.values_for(field) && query.values_for(field).length > 1) %> |
|
124 | <%= select_tag "v[#{field}][]", options_for_select(options[:values], query.values_for(field)), :class => "values_#{field}", :id => "values_#{field}_1", :multiple => (query.values_for(field) && query.values_for(field).length > 1) %> | |
125 |
<%= link_to_function image_tag('bullet_toggle_plus.png'), "toggle_multi_select('values_#{field}_1');" |
|
125 | <%= link_to_function image_tag('bullet_toggle_plus.png'), "toggle_multi_select('values_#{field}_1');" %> | |
126 | </span> |
|
126 | </span> | |
127 | <% when :date, :date_past %> |
|
127 | <% when :date, :date_past %> | |
128 | <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field), :size => 10, :class => "values_#{field}", :id => "values_#{field}_1" %> <%= calendar_for "values_#{field}_1" %></span> |
|
128 | <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field), :size => 10, :class => "values_#{field}", :id => "values_#{field}_1" %> <%= calendar_for "values_#{field}_1" %></span> |
@@ -294,6 +294,10 fieldset#date-range p { margin: 2px 0 2px 0; } | |||||
294 | fieldset#filters table { border-collapse: collapse; } |
|
294 | fieldset#filters table { border-collapse: collapse; } | |
295 | fieldset#filters table td { padding: 0; vertical-align: middle; } |
|
295 | fieldset#filters table td { padding: 0; vertical-align: middle; } | |
296 | fieldset#filters tr.filter { height: 2em; } |
|
296 | fieldset#filters tr.filter { height: 2em; } | |
|
297 | fieldset#filters td.field { width:200px; } | |||
|
298 | fieldset#filters td.operator { width:170px; } | |||
|
299 | fieldset#filters td.values { white-space:nowrap; } | |||
|
300 | fieldset#filters td.values img { vertical-align: bottom; } | |||
297 | fieldset#filters td.add-filter { text-align: right; vertical-align: top; } |
|
301 | fieldset#filters td.add-filter { text-align: right; vertical-align: top; } | |
298 | .buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; } |
|
302 | .buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; } | |
299 |
|
303 |
General Comments 0
You need to be logged in to leave comments.
Login now