@@ -59,19 +59,19 function toggle_multi_select(field) { | |||||
59 | <table width="100%"> |
|
59 | <table width="100%"> | |
60 | <tr> |
|
60 | <tr> | |
61 | <td> |
|
61 | <td> | |
62 | <table style="padding:0;"> |
|
62 | <table> | |
63 | <% query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.each do |filter| %> |
|
63 | <% query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.each do |filter| %> | |
64 | <% field = filter[0] |
|
64 | <% field = filter[0] | |
65 | options = filter[1] %> |
|
65 | options = filter[1] %> | |
66 | <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>"> |
|
66 | <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>" class="filter"> | |
67 |
<td |
|
67 | <td style="width:200px;"> | |
68 | <%= check_box_tag 'fields[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %> |
|
68 | <%= check_box_tag 'fields[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %> | |
69 | <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label> |
|
69 | <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label> | |
70 | </td> |
|
70 | </td> | |
71 |
<td |
|
71 | <td style="width:150px;"> | |
72 | <%= select_tag "operators[#{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;" %> |
|
72 | <%= select_tag "operators[#{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;" %> | |
73 | </td> |
|
73 | </td> | |
74 |
<td |
|
74 | <td> | |
75 | <div id="div_values_<%= field %>" style="display:none;"> |
|
75 | <div id="div_values_<%= field %>" style="display:none;"> | |
76 | <% case options[:type] |
|
76 | <% case options[:type] | |
77 | when :list, :list_optional, :list_status, :list_subprojects %> |
|
77 | when :list, :list_optional, :list_status, :list_subprojects %> | |
@@ -93,7 +93,7 function toggle_multi_select(field) { | |||||
93 | <% end %> |
|
93 | <% end %> | |
94 | </table> |
|
94 | </table> | |
95 | </td> |
|
95 | </td> | |
96 | <td align="right" valign="top"> |
|
96 | <td class="add-filter"> | |
97 | <%= l(:label_filter_add) %>: |
|
97 | <%= l(:label_filter_add) %>: | |
98 | <%= select_tag 'add_filter_select', options_for_select([["",""]] + query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [ field[1][:name] || l(("field_"+field[0].to_s.gsub(/\_id$/, "")).to_sym), field[0]] unless query.has_filter?(field[0])}.compact), :onchange => "add_filter();", :class => "select-small" %> |
|
98 | <%= select_tag 'add_filter_select', options_for_select([["",""]] + query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [ field[1][:name] || l(("field_"+field[0].to_s.gsub(/\_id$/, "")).to_sym), field[0]] unless query.has_filter?(field[0])}.compact), :onchange => "add_filter();", :class => "select-small" %> | |
99 | </td> |
|
99 | </td> |
@@ -160,8 +160,12 p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;} | |||||
160 | p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; } |
|
160 | p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; } | |
161 |
|
161 | |||
162 | fieldset#filters { padding: 0.7em; } |
|
162 | fieldset#filters { padding: 0.7em; } | |
163 |
fieldset#filters p { margin: |
|
163 | fieldset#filters p { margin: 1.2em 0 0.8em 2px; } | |
164 |
fieldset#filters .buttons { |
|
164 | fieldset#filters .buttons { font-size: 0.9em; } | |
|
165 | fieldset#filters table { border-collapse: collapse; } | |||
|
166 | fieldset#filters table td { padding: 0; vertical-align: middle; } | |||
|
167 | fieldset#filters tr.filter { height: 2em; } | |||
|
168 | fieldset#filters td.add-filter { text-align: right; vertical-align: top; } | |||
165 |
|
169 | |||
166 | div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;} |
|
170 | div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;} | |
167 | div#issue-changesets .changeset { padding: 4px;} |
|
171 | div#issue-changesets .changeset { padding: 4px;} |
General Comments 0
You need to be logged in to leave comments.
Login now