From: Jean-Philippe Lang Date: Sun, 13 Apr 2008 11:18:09 +0000 (+0000) Subject: Left align filter buttons (closes #872) and reduce filters spacing. X-Git-Tag: 0.8.0-RC1~587 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=56683967dac2a3cd215f7495b33b2ed7dbf236f1;p=redmine.git Left align filter buttons (closes #872) and reduce filters spacing. git-svn-id: http://redmine.rubyforge.org/svn/trunk@1346 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/queries/_filters.rhtml b/app/views/queries/_filters.rhtml index 458d7139e..ec9d4fef6 100644 --- a/app/views/queries/_filters.rhtml +++ b/app/views/queries/_filters.rhtml @@ -59,19 +59,19 @@ function toggle_multi_select(field) { - diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 682e95dde..7b73d0939 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -160,8 +160,12 @@ p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;} p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; } fieldset#filters { padding: 0.7em; } -fieldset#filters p { margin: 0.8em 0 0.8em 0; } -fieldset#filters .buttons { text-align: right; font-size: 0.9em; } +fieldset#filters p { margin: 1.2em 0 0.8em 2px; } +fieldset#filters .buttons { font-size: 0.9em; } +fieldset#filters table { border-collapse: collapse; } +fieldset#filters table td { padding: 0; vertical-align: middle; } +fieldset#filters tr.filter { height: 2em; } +fieldset#filters td.add-filter { text-align: right; vertical-align: top; } div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;} div#issue-changesets .changeset { padding: 4px;}
- +
<% query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.each do |filter| %> <% field = filter[0] options = filter[1] %> - id="tr_<%= field %>"> - id="tr_<%= field %>" class="filter"> + - -
+
<%= check_box_tag 'fields[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %> + <%= 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;" %> +
+ <%= l(:label_filter_add) %>: <%= 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" %>