jro_apps/redmine Commit - r9979:1749fbf3e616

Build issue filters using javascript....

Jean-Philippe Lang -

r9979:1749fbf3e616

parent child

Context file:

r9979:1749fbf3e616

Collapse all files

app/helpers/queries_helper.rb +6 -3

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module QueriesHelper
+              def filters_options_for_select(query)
-              def operators_for_select(filter_type)
+                options = [[]]
-                Query.operators_by_filter_type[filter_type].collect {|o| [l(Query.operators[o]), o]}
+                options += query.available_filters.sort {|a,b| a[1][:order] <=> b[1][:order]}.map do |field, field_options|
+                  [field_options[:name], field]
+                end
+                options_for_select(options)
               end
               def column_header(column)
                 column.sortable ? sort_header_tag(column.name.to_s, :caption => column.caption,
                                                                     :default_order => column.default_order) :
                                   content_tag('th', h(column.caption))
               end
               def column_content(column, issue)
                 value = column.value(issue)
                 if value.is_a?(Array)
                   value.collect {|v| column_value(column, issue, v)}.compact.sort.join(', ').html_safe
                 else
                   column_value(column, issue, value)
                 end
               end
               def column_value(column, issue, value)
                 case value.class.name
                 when 'String'
                   if column.name == :subject
                     link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
                   else
                     h(value)
                   end
                 when 'Time'
                   format_time(value)
                 when 'Date'
                   format_date(value)
                 when 'Fixnum', 'Float'
                   if column.name == :done_ratio
                     progress_bar(value, :width => '80px')
                   elsif  column.name == :spent_hours
                     sprintf "%.2f", value
                   else
                     h(value.to_s)
                   end
                 when 'User'
                   link_to_user value
                 when 'Project'
                   link_to_project value
                 when 'Version'
                   link_to(h(value), :controller => 'versions', :action => 'show', :id => value)
                 when 'TrueClass'
                   l(:general_text_Yes)
                 when 'FalseClass'
                   l(:general_text_No)
                 when 'Issue'
                   link_to_issue(value, :subject => false)
                 else
                   h(value)
                 end
               end
               # Retrieve query from session or build a new query
               def retrieve_query
                 if !params[:query_id].blank?
                   cond = "project_id IS NULL"
                   cond << " OR project_id = #{@project.id}" if @project
                   @query = Query.find(params[:query_id], :conditions => cond)
                   raise ::Unauthorized unless @query.visible?
                   @query.project = @project
                   session[:query] = {:id => @query.id, :project_id => @query.project_id}
                   sort_clear
                 elsif api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
                   # Give it a name, required to be valid
                   @query = Query.new(:name => "_")
                   @query.project = @project
                   build_query_from_params
                   session[:query] = {:project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by, :column_names => @query.column_names}
                 else
                   # retrieve from session
                   @query = Query.find_by_id(session[:query][:id]) if session[:query][:id]
                   @query ||= Query.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
                   @query.project = @project
                 end
               end
               def retrieve_query_from_session
                 if session[:query]
                   if session[:query][:id]
                     @query = Query.find_by_id(session[:query][:id])
                     return unless @query
                   else
                     @query = Query.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
                   end
                   if session[:query].has_key?(:project_id)
                     @query.project_id = session[:query][:project_id]
                   else
                     @query.project = @project
                   end
                   @query
                 end
               end
               def build_query_from_params
                 if params[:fields] || params[:f]
                   @query.filters = {}
                   @query.add_filters(params[:fields] || params[:f], params[:operators] || params[:op], params[:values] || params[:v])
                 else
                   @query.available_filters.keys.each do |field|
                     @query.add_short_filter(field, params[field]) if params[field]
                   end
                 end
                 @query.group_by = params[:group_by] || (params[:query] && params[:query][:group_by])
                 @query.column_names = params[:c] || (params[:query] && params[:query][:column_names])
               end
             end

app/models/query.rb +18 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class QueryColumn
               attr_accessor :name, :sortable, :groupable, :default_order
               include Redmine::I18n
               def initialize(name, options={})
                 self.name = name
                 self.sortable = options[:sortable]
                 self.groupable = options[:groupable] || false
                 if groupable == true
                   self.groupable = name.to_s
                 end
                 self.default_order = options[:default_order]
                 @caption_key = options[:caption] || "field_#{name}"
               end
               def caption
                 l(@caption_key)
               end
               # Returns true if the column is sortable, otherwise false
               def sortable?
                 !@sortable.nil?
               end
               def sortable
                 @sortable.is_a?(Proc) ? @sortable.call : @sortable
               end
               def value(issue)
                 issue.send name
               end
               def css_classes
                 name
               end
             end
             class QueryCustomFieldColumn < QueryColumn
               def initialize(custom_field)
                 self.name = "cf_#{custom_field.id}".to_sym
                 self.sortable = custom_field.order_statement || false
                 self.groupable = custom_field.group_statement || false
                 @cf = custom_field
               end
               def caption
                 @cf.name
               end
               def custom_field
                 @cf
               end
               def value(issue)
                 cv = issue.custom_values.select {|v| v.custom_field_id == @cf.id}.collect {|v| @cf.cast_value(v.value)}
                 cv.size > 1 ? cv : cv.first
               end
               def css_classes
                 @css_classes ||= "#{name} #{@cf.field_format}"
               end
             end
             class Query < ActiveRecord::Base
               class StatementInvalid < ::ActiveRecord::StatementInvalid
               end
               belongs_to :project
               belongs_to :user
               serialize :filters
               serialize :column_names
               serialize :sort_criteria, Array
               attr_protected :project_id, :user_id
               validates_presence_of :name
               validates_length_of :name, :maximum => 255
               validate :validate_query_filters
               @@operators = { "="   => :label_equals,
                               "!"   => :label_not_equals,
                               "o"   => :label_open_issues,
                               "c"   => :label_closed_issues,
                               "!*"  => :label_none,
                               "*"   => :label_all,
                               ">="  => :label_greater_or_equal,
                               "<="  => :label_less_or_equal,
                               "><"  => :label_between,
                               "<t+" => :label_in_less_than,
                               ">t+" => :label_in_more_than,
                               "t+"  => :label_in,
                               "t"   => :label_today,
                               "w"   => :label_this_week,
                               ">t-" => :label_less_than_ago,
                               "<t-" => :label_more_than_ago,
                               "t-"  => :label_ago,
                               "~"   => :label_contains,
                               "!~"  => :label_not_contains }
               cattr_reader :operators
               @@operators_by_filter_type = { :list => [ "=", "!" ],
                                              :list_status => [ "o", "=", "!", "c", "*" ],
                                              :list_optional => [ "=", "!", "!*", "*" ],
                                              :list_subprojects => [ "*", "!*", "=" ],
                                              :date => [ "=", ">=", "<=", "><", "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-", "!*", "*" ],
                                              :date_past => [ "=", ">=", "<=", "><", ">t-", "<t-", "t-", "t", "w", "!*", "*" ],
                                              :string => [ "=", "~", "!", "!~", "!*", "*" ],
                                              :text => [  "~", "!~", "!*", "*" ],
                                              :integer => [ "=", ">=", "<=", "><", "!*", "*" ],
                                              :float => [ "=", ">=", "<=", "><", "!*", "*" ] }
               cattr_reader :operators_by_filter_type
               @@available_columns = [
                 QueryColumn.new(:project, :sortable => "#{Project.table_name}.name", :groupable => true),
                 QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position", :groupable => true),
                 QueryColumn.new(:parent, :sortable => ["#{Issue.table_name}.root_id", "#{Issue.table_name}.lft ASC"], :default_order => 'desc', :caption => :field_parent_issue),
                 QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position", :groupable => true),
                 QueryColumn.new(:priority, :sortable => "#{IssuePriority.table_name}.position", :default_order => 'desc', :groupable => true),
                 QueryColumn.new(:subject, :sortable => "#{Issue.table_name}.subject"),
                 QueryColumn.new(:author, :sortable => lambda {User.fields_for_order_statement("authors")}, :groupable => true),
                 QueryColumn.new(:assigned_to, :sortable => lambda {User.fields_for_order_statement}, :groupable => true),
                 QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default_order => 'desc'),
                 QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name", :groupable => true),
                 QueryColumn.new(:fixed_version, :sortable => lambda {Version.fields_for_order_statement}, :groupable => true),
                 QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
                 QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
                 QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
                 QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio", :groupable => true),
                 QueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on", :default_order => 'desc'),
               ]
               cattr_reader :available_columns
               scope :visible, lambda {|*args|
                 user = args.shift || User.current
                 base = Project.allowed_to_condition(user, :view_issues, *args)
                 user_id = user.logged? ? user.id : 0
                 {
                   :conditions => ["(#{table_name}.project_id IS NULL OR (#{base})) AND (#{table_name}.is_public = ? OR #{table_name}.user_id = ?)", true, user_id],
                   :include => :project
                 }
               }
               def initialize(attributes=nil, *args)
                 super attributes
                 self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
                 @is_for_all = project.nil?
               end
               def validate_query_filters
                 filters.each_key do |field|
                   if values_for(field)
                     case type_for(field)
                     when :integer
                       add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^[+-]?\d+$/) }
                     when :float
                       add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^[+-]?\d+(\.\d*)?$/) }
                     when :date, :date_past
                       case operator_for(field)
                       when "=", ">=", "<=", "><"
                         add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && (!v.match(/^\d{4}-\d{2}-\d{2}$/) || (Date.parse(v) rescue nil).nil?) }
                       when ">t-", "<t-", "t-"
                         add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^\d+$/) }
                       end
                     end
                   end
                   add_filter_error(field, :blank) unless
                       # filter requires one or more values
                       (values_for(field) and !values_for(field).first.blank?) or
                       # filter doesn't require any value
                       ["o", "c", "!*", "*", "t", "w"].include? operator_for(field)
                 end if filters
               end
               def add_filter_error(field, message)
                 m = label_for(field) + " " + l(message, :scope => 'activerecord.errors.messages')
                 errors.add(:base, m)
               end
               # Returns true if the query is visible to +user+ or the current user.
               def visible?(user=User.current)
                 (project.nil? || user.allowed_to?(:view_issues, project)) && (self.is_public? || self.user_id == user.id)
               end
               def editable_by?(user)
                 return false unless user
                 # Admin can edit them all and regular users can edit their private queries
                 return true if user.admin? || (!is_public && self.user_id == user.id)
                 # Members can not edit public queries that are for all project (only admin is allowed to)
                 is_public && !@is_for_all && user.allowed_to?(:manage_public_queries, project)
               end
               def trackers
                 @trackers ||= project.nil? ? Tracker.find(:all, :order => 'position') : project.rolled_up_trackers
               end
+              # Returns a hash of localized labels for all filter operators
+              def self.operators_labels
+                operators.inject({}) {|h, operator| h[operator.first] = l(operator.last); h}
+              end
               def available_filters
                 return @available_filters if @available_filters
                 @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },
                                        "tracker_id" => { :type => :list, :order => 2, :values => trackers.collect{|s| [s.name, s.id.to_s] } },
                                        "priority_id" => { :type => :list, :order => 3, :values => IssuePriority.all.collect{|s| [s.name, s.id.to_s] } },
                                        "subject" => { :type => :text, :order => 8 },
                                        "created_on" => { :type => :date_past, :order => 9 },
                                        "updated_on" => { :type => :date_past, :order => 10 },
                                        "start_date" => { :type => :date, :order => 11 },
                                        "due_date" => { :type => :date, :order => 12 },
                                        "estimated_hours" => { :type => :float, :order => 13 },
                                        "done_ratio" =>  { :type => :integer, :order => 14 }}
                 principals = []
                 if project
                   principals += project.principals.sort
                   unless project.leaf?
                     subprojects = project.descendants.visible.all
                     if subprojects.any?
                       @available_filters["subproject_id"] = { :type => :list_subprojects, :order => 13, :values => subprojects.collect{|s| [s.name, s.id.to_s] } }
                       principals += Principal.member_of(subprojects)
                     end
                   end
                 else
                   all_projects = Project.visible.all
                   if all_projects.any?
                     # members of visible projects
                     principals += Principal.member_of(all_projects)
                     # project filter
                     project_values = []
                     if User.current.logged? && User.current.memberships.any?
                       project_values << ["<< #{l(:label_my_projects).downcase} >>", "mine"]
                     end
                     Project.project_tree(all_projects) do |p, level|
                       prefix = (level > 0 ? ('--' * level + ' ') : '')
                       project_values << ["#{prefix}#{p.name}", p.id.to_s]
                     end
                     @available_filters["project_id"] = { :type => :list, :order => 1, :values => project_values} unless project_values.empty?
                   end
                 end
                 principals.uniq!
                 principals.sort!
                 users = principals.select {|p| p.is_a?(User)}
                 assigned_to_values = []
                 assigned_to_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
                 assigned_to_values += (Setting.issue_group_assignment? ? principals : users).collect{|s| [s.name, s.id.to_s] }
                 @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => assigned_to_values } unless assigned_to_values.empty?
                 author_values = []
                 author_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
                 author_values += users.collect{|s| [s.name, s.id.to_s] }
                 @available_filters["author_id"] = { :type => :list, :order => 5, :values => author_values } unless author_values.empty?
                 group_values = Group.all.collect {|g| [g.name, g.id.to_s] }
                 @available_filters["member_of_group"] = { :type => :list_optional, :order => 6, :values => group_values } unless group_values.empty?
                 role_values = Role.givable.collect {|r| [r.name, r.id.to_s] }
                 @available_filters["assigned_to_role"] = { :type => :list_optional, :order => 7, :values => role_values } unless role_values.empty?
                 if User.current.logged?
                   @available_filters["watcher_id"] = { :type => :list, :order => 15, :values => [["<< #{l(:label_me)} >>", "me"]] }
                 end
                 if project
                   # project specific filters
                   categories = project.issue_categories.all
                   unless categories.empty?
                     @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => categories.collect{|s| [s.name, s.id.to_s] } }
                   end
                   versions = project.shared_versions.all
                   unless versions.empty?
                     @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => versions.sort.collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s] } }
                   end
                   add_custom_fields_filters(project.all_issue_custom_fields)
                 else
                   # global filters for cross project issue list
                   system_shared_versions = Version.visible.find_all_by_sharing('system')
                   unless system_shared_versions.empty?
                     @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => system_shared_versions.sort.collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s] } }
                   end
                   add_custom_fields_filters(IssueCustomField.find(:all, :conditions => {:is_filter => true, :is_for_all => true}))
                 end
                 if User.current.allowed_to?(:set_issues_private, nil, :global => true) ||
                   User.current.allowed_to?(:set_own_issues_private, nil, :global => true)
                   @available_filters["is_private"] = { :type => :list, :order => 15, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]] }
                 end
                 Tracker.disabled_core_fields(trackers).each {|field|
                   @available_filters.delete field
                 }
+                @available_filters.each do |field, options|
+                  options[:name] ||= l("field_#{field}".gsub(/_id$/, ''))
+                end
                 @available_filters
               end
+            	# Returns a representation of the available filters for JSON serialization
+              def available_filters_as_json
+                json = {}
+                available_filters.each do |field, options|
+                  json[field] = options.slice(:type, :name, :values).stringify_keys
+                end
+                json
+              end
               def add_filter(field, operator, values)
                 # values must be an array
                 return unless values.nil? || values.is_a?(Array)
                 # check if field is defined as an available filter
                 if available_filters.has_key? field
                   filter_options = available_filters[field]
                   # check if operator is allowed for that filter
                   #if @@operators_by_filter_type[filter_options[:type]].include? operator
                   #  allowed_values = values & ([""] + (filter_options[:values] || []).collect {|val| val[1]})
                   #  filters[field] = {:operator => operator, :values => allowed_values } if (allowed_values.first and !allowed_values.first.empty?) or ["o", "c", "!*", "*", "t"].include? operator
                   #end
                   filters[field] = {:operator => operator, :values => (values || [''])}
                 end
               end
               def add_short_filter(field, expression)
                 return unless expression && available_filters.has_key?(field)
                 field_type = available_filters[field][:type]
                 @@operators_by_filter_type[field_type].sort.reverse.detect do |operator|
                   next unless expression =~ /^#{Regexp.escape(operator)}(.*)$/
                   add_filter field, operator, $1.present? ? $1.split('|') : ['']
                 end || add_filter(field, '=', expression.split('|'))
               end
               # Add multiple filters using +add_filter+
               def add_filters(fields, operators, values)
                 if fields.is_a?(Array) && operators.is_a?(Hash) && (values.nil? || values.is_a?(Hash))
                   fields.each do |field|
                     add_filter(field, operators[field], values && values[field])
                   end
                 end
               end
               def has_filter?(field)
                 filters and filters[field]
               end
               def type_for(field)
                 available_filters[field][:type] if available_filters.has_key?(field)
               end
               def operator_for(field)
                 has_filter?(field) ? filters[field][:operator] : nil
               end
               def values_for(field)
                 has_filter?(field) ? filters[field][:values] : nil
               end
               def value_for(field, index=0)
                 (values_for(field) || [])[index]
               end
               def label_for(field)
                 label = available_filters[field][:name] if available_filters.has_key?(field)
                 label ||= l("field_#{field.to_s.gsub(/_id$/, '')}", :default => field)
               end
               def available_columns
                 return @available_columns if @available_columns
                 @available_columns = ::Query.available_columns.dup
                 @available_columns += (project ?
                                         project.all_issue_custom_fields :
                                         IssueCustomField.find(:all)
                                        ).collect {|cf| QueryCustomFieldColumn.new(cf) }
                 if User.current.allowed_to?(:view_time_entries, project, :global => true)
                   index = nil
                   @available_columns.each_with_index {|column, i| index = i if column.name == :estimated_hours}
                   index = (index ? index + 1 : -1)
                   # insert the column after estimated_hours or at the end
                   @available_columns.insert index, QueryColumn.new(:spent_hours,
                     :sortable => "(SELECT COALESCE(SUM(hours), 0) FROM #{TimeEntry.table_name} WHERE #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id)",
                     :default_order => 'desc',
                     :caption => :label_spent_time
                   )
                 end
                 if User.current.allowed_to?(:set_issues_private, nil, :global => true) ||
                   User.current.allowed_to?(:set_own_issues_private, nil, :global => true)
                   @available_columns << QueryColumn.new(:is_private, :sortable => "#{Issue.table_name}.is_private")
                 end
                 disabled_fields = Tracker.disabled_core_fields(trackers).map {|field| field.sub(/_id$/, '')}
                 @available_columns.reject! {|column|
                   disabled_fields.include?(column.name.to_s)
                 }
                 @available_columns
               end
               def self.available_columns=(v)
                 self.available_columns = (v)
               end
               def self.add_available_column(column)
                 self.available_columns << (column) if column.is_a?(QueryColumn)
               end
               # Returns an array of columns that can be used to group the results
               def groupable_columns
                 available_columns.select {|c| c.groupable}
               end
               # Returns a Hash of columns and the key for sorting
               def sortable_columns
                 {'id' => "#{Issue.table_name}.id"}.merge(available_columns.inject({}) {|h, column|
                                                            h[column.name.to_s] = column.sortable
                                                            h
                                                          })
               end
               def columns
                 # preserve the column_names order
                 (has_default_columns? ? default_columns_names : column_names).collect do |name|
                    available_columns.find { |col| col.name == name }
                 end.compact
               end
               def default_columns_names
                 @default_columns_names ||= begin
                   default_columns = Setting.issue_list_default_columns.map(&:to_sym)
                   project.present? ? default_columns : [:project] | default_columns
                 end
               end
               def column_names=(names)
                 if names
                   names = names.select {|n| n.is_a?(Symbol) || !n.blank? }
                   names = names.collect {|n| n.is_a?(Symbol) ? n : n.to_sym }
                   # Set column_names to nil if default columns
                   if names == default_columns_names
                     names = nil
                   end
                 end
                 write_attribute(:column_names, names)
               end
               def has_column?(column)
                 column_names && column_names.include?(column.is_a?(QueryColumn) ? column.name : column)
               end
               def has_default_columns?
                 column_names.nil? || column_names.empty?
               end
               def sort_criteria=(arg)
                 c = []
                 if arg.is_a?(Hash)
                   arg = arg.keys.sort.collect {|k| arg[k]}
                 end
                 c = arg.select {|k,o| !k.to_s.blank?}.slice(0,3).collect {|k,o| [k.to_s, o == 'desc' ? o : 'asc']}
                 write_attribute(:sort_criteria, c)
               end
               def sort_criteria
                 read_attribute(:sort_criteria) || []
               end
               def sort_criteria_key(arg)
                 sort_criteria && sort_criteria[arg] && sort_criteria[arg].first
               end
               def sort_criteria_order(arg)
                 sort_criteria && sort_criteria[arg] && sort_criteria[arg].last
               end
               # Returns the SQL sort order that should be prepended for grouping
               def group_by_sort_order
                 if grouped? && (column = group_by_column)
                   column.sortable.is_a?(Array) ?
                     column.sortable.collect {|s| "#{s} #{column.default_order}"}.join(',') :
                     "#{column.sortable} #{column.default_order}"
                 end
               end
               # Returns true if the query is a grouped query
               def grouped?
                 !group_by_column.nil?
               end
               def group_by_column
                 groupable_columns.detect {|c| c.groupable && c.name.to_s == group_by}
               end
               def group_by_statement
                 group_by_column.try(:groupable)
               end
               def project_statement
                 project_clauses = []
                 if project && !project.descendants.active.empty?
                   ids = [project.id]
                   if has_filter?("subproject_id")
                     case operator_for("subproject_id")
                     when '='
                       # include the selected subprojects
                       ids += values_for("subproject_id").each(&:to_i)
                     when '!*'
                       # main project only
                     else
                       # all subprojects
                       ids += project.descendants.collect(&:id)
                     end
                   elsif Setting.display_subprojects_issues?
                     ids += project.descendants.collect(&:id)
                   end
                   project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
                 elsif project
                   project_clauses << "#{Project.table_name}.id = %d" % project.id
                 end
                 project_clauses.any? ? project_clauses.join(' AND ') : nil
               end
               def statement
                 # filters clauses
                 filters_clauses = []
                 filters.each_key do |field|
                   next if field == "subproject_id"
                   v = values_for(field).clone
                   next unless v and !v.empty?
                   operator = operator_for(field)
                   # "me" value subsitution
                   if %w(assigned_to_id author_id watcher_id).include?(field)
                     if v.delete("me")
                       if User.current.logged?
                         v.push(User.current.id.to_s)
                         v += User.current.group_ids.map(&:to_s) if field == 'assigned_to_id'
                       else
                         v.push("0")
                       end
                     end
                   end
                   if field == 'project_id'
                     if v.delete('mine')
                       v += User.current.memberships.map(&:project_id).map(&:to_s)
                     end
                   end
                   if field =~ /^cf_(\d+)$/
                     # custom field
                     filters_clauses << sql_for_custom_field(field, operator, v, $1)
                   elsif respond_to?("sql_for_#{field}_field")
                     # specific statement
                     filters_clauses << send("sql_for_#{field}_field", field, operator, v)
                   else
                     # regular field
                     filters_clauses << '(' + sql_for_field(field, operator, v, Issue.table_name, field) + ')'
                   end
                 end if filters and valid?
                 filters_clauses << project_statement
                 filters_clauses.reject!(&:blank?)
                 filters_clauses.any? ? filters_clauses.join(' AND ') : nil
               end
               # Returns the issue count
               def issue_count
                 Issue.visible.count(:include => [:status, :project], :conditions => statement)
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               # Returns the issue count by group or nil if query is not grouped
               def issue_count_by_group
                 r = nil
                 if grouped?
                   begin
                     # Rails3 will raise an (unexpected) RecordNotFound if there's only a nil group value
                     r = Issue.visible.count(:group => group_by_statement, :include => [:status, :project], :conditions => statement)
                   rescue ActiveRecord::RecordNotFound
                     r = {nil => issue_count}
                   end
                   c = group_by_column
                   if c.is_a?(QueryCustomFieldColumn)
                     r = r.keys.inject({}) {|h, k| h[c.custom_field.cast_value(k)] = r[k]; h}
                   end
                 end
                 r
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               # Returns the issues
               # Valid options are :order, :offset, :limit, :include, :conditions
               def issues(options={})
                 order_option = [group_by_sort_order, options[:order]].reject {|s| s.blank?}.join(',')
                 order_option = nil if order_option.blank?
                 issues = Issue.visible.scoped(:conditions => options[:conditions]).find :all, :include => ([:status, :project] + (options[:include] || [])).uniq,
                                  :conditions => statement,
                                  :order => order_option,
                                  :joins => joins_for_order_statement(order_option),
                                  :limit  => options[:limit],
                                  :offset => options[:offset]
                 if has_column?(:spent_hours)
                   Issue.load_visible_spent_hours(issues)
                 end
                 issues
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               # Returns the issues ids
               def issue_ids(options={})
                 order_option = [group_by_sort_order, options[:order]].reject {|s| s.blank?}.join(',')
                 order_option = nil if order_option.blank?
                 Issue.visible.scoped(:conditions => options[:conditions]).scoped(:include => ([:status, :project] + (options[:include] || [])).uniq,
                                  :conditions => statement,
                                  :order => order_option,
                                  :joins => joins_for_order_statement(order_option),
                                  :limit  => options[:limit],
                                  :offset => options[:offset]).find_ids
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               # Returns the journals
               # Valid options are :order, :offset, :limit
               def journals(options={})
                 Journal.visible.find :all, :include => [:details, :user, {:issue => [:project, :author, :tracker, :status]}],
                                    :conditions => statement,
                                    :order => options[:order],
                                    :limit => options[:limit],
                                    :offset => options[:offset]
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               # Returns the versions
               # Valid options are :conditions
               def versions(options={})
                 Version.visible.scoped(:conditions => options[:conditions]).find :all, :include => :project, :conditions => project_statement
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               def sql_for_watcher_id_field(field, operator, value)
                 db_table = Watcher.table_name
                 "#{Issue.table_name}.id #{ operator == '=' ? 'IN' : 'NOT IN' } (SELECT #{db_table}.watchable_id FROM #{db_table} WHERE #{db_table}.watchable_type='Issue' AND " +
                   sql_for_field(field, '=', value, db_table, 'user_id') + ')'
               end
               def sql_for_member_of_group_field(field, operator, value)
                 if operator == '*' # Any group
                   groups = Group.all
                   operator = '=' # Override the operator since we want to find by assigned_to
                 elsif operator == "!*"
                   groups = Group.all
                   operator = '!' # Override the operator since we want to find by assigned_to
                 else
                   groups = Group.find_all_by_id(value)
                 end
                 groups ||= []
                 members_of_groups = groups.inject([]) {|user_ids, group|
                   if group && group.user_ids.present?
                     user_ids << group.user_ids
                   end
                   user_ids.flatten.uniq.compact
                 }.sort.collect(&:to_s)
                 '(' + sql_for_field("assigned_to_id", operator, members_of_groups, Issue.table_name, "assigned_to_id", false) + ')'
               end
               def sql_for_assigned_to_role_field(field, operator, value)
                 case operator
                 when "*", "!*" # Member / Not member
                   sw = operator == "!*" ? 'NOT' : ''
                   nl = operator == "!*" ? "#{Issue.table_name}.assigned_to_id IS NULL OR" : ''
                   "(#{nl} #{Issue.table_name}.assigned_to_id #{sw} IN (SELECT DISTINCT #{Member.table_name}.user_id FROM #{Member.table_name}" +
                     " WHERE #{Member.table_name}.project_id = #{Issue.table_name}.project_id))"
                 when "=", "!"
                   role_cond = value.any? ?
                     "#{MemberRole.table_name}.role_id IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")" :
                     "1=0"
                   sw = operator == "!" ? 'NOT' : ''
                   nl = operator == "!" ? "#{Issue.table_name}.assigned_to_id IS NULL OR" : ''
                   "(#{nl} #{Issue.table_name}.assigned_to_id #{sw} IN (SELECT DISTINCT #{Member.table_name}.user_id FROM #{Member.table_name}, #{MemberRole.table_name}" +
                     " WHERE #{Member.table_name}.project_id = #{Issue.table_name}.project_id AND #{Member.table_name}.id = #{MemberRole.table_name}.member_id AND #{role_cond}))"
                 end
               end
               def sql_for_is_private_field(field, operator, value)
                 op = (operator == "=" ? 'IN' : 'NOT IN')
                 va = value.map {|v| v == '0' ? connection.quoted_false : connection.quoted_true}.uniq.join(',')
                 "#{Issue.table_name}.is_private #{op} (#{va})"
               end
               private
               def sql_for_custom_field(field, operator, value, custom_field_id)
                 db_table = CustomValue.table_name
                 db_field = 'value'
                 filter = @available_filters[field]
                 if filter && filter[:format] == 'user'
                   if value.delete('me')
                     value.push User.current.id.to_s
                   end
                 end
                 not_in = nil
                 if operator == '!'
                   # Makes ! operator work for custom fields with multiple values
                   operator = '='
                   not_in = 'NOT'
                 end
                 "#{Issue.table_name}.id #{not_in} IN (SELECT #{Issue.table_name}.id FROM #{Issue.table_name} LEFT OUTER JOIN #{db_table} ON #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{custom_field_id} WHERE " +
                   sql_for_field(field, operator, value, db_table, db_field, true) + ')'
               end
               # Helper method to generate the WHERE sql for a +field+, +operator+ and a +value+
               def sql_for_field(field, operator, value, db_table, db_field, is_custom_filter=false)
                 sql = ''
                 case operator
                 when "="
                   if value.any?
                     case type_for(field)
                     when :date, :date_past
                       sql = date_clause(db_table, db_field, (Date.parse(value.first) rescue nil), (Date.parse(value.first) rescue nil))
                     when :integer
                       if is_custom_filter
                         sql = "(#{db_table}.#{db_field} <> '' AND CAST(#{db_table}.#{db_field} AS decimal(60,3)) = #{value.first.to_i})"
                       else
                         sql = "#{db_table}.#{db_field} = #{value.first.to_i}"
                       end
                     when :float
                       if is_custom_filter
                         sql = "(#{db_table}.#{db_field} <> '' AND CAST(#{db_table}.#{db_field} AS decimal(60,3)) BETWEEN #{value.first.to_f - 1e-5} AND #{value.first.to_f + 1e-5})"
                       else
                         sql = "#{db_table}.#{db_field} BETWEEN #{value.first.to_f - 1e-5} AND #{value.first.to_f + 1e-5}"
                       end
                     else
                       sql = "#{db_table}.#{db_field} IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
                     end
                   else
                     # IN an empty set
                     sql = "1=0"
                   end
                 when "!"
                   if value.any?
                     sql = "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
                   else
                     # NOT IN an empty set
                     sql = "1=1"
                   end
                 when "!*"
                   sql = "#{db_table}.#{db_field} IS NULL"
                   sql << " OR #{db_table}.#{db_field} = ''" if is_custom_filter
                 when "*"
                   sql = "#{db_table}.#{db_field} IS NOT NULL"
                   sql << " AND #{db_table}.#{db_field} <> ''" if is_custom_filter
                 when ">="
                   if [:date, :date_past].include?(type_for(field))
                     sql = date_clause(db_table, db_field, (Date.parse(value.first) rescue nil), nil)
                   else
                     if is_custom_filter
                       sql = "(#{db_table}.#{db_field} <> '' AND CAST(#{db_table}.#{db_field} AS decimal(60,3)) >= #{value.first.to_f})"
                     else
                       sql = "#{db_table}.#{db_field} >= #{value.first.to_f}"
                     end
                   end
                 when "<="
                   if [:date, :date_past].include?(type_for(field))
                     sql = date_clause(db_table, db_field, nil, (Date.parse(value.first) rescue nil))
                   else
                     if is_custom_filter
                       sql = "(#{db_table}.#{db_field} <> '' AND CAST(#{db_table}.#{db_field} AS decimal(60,3)) <= #{value.first.to_f})"
                     else
                       sql = "#{db_table}.#{db_field} <= #{value.first.to_f}"
                     end
                   end
                 when "><"
                   if [:date, :date_past].include?(type_for(field))
                     sql = date_clause(db_table, db_field, (Date.parse(value[0]) rescue nil), (Date.parse(value[1]) rescue nil))
                   else
                     if is_custom_filter
                       sql = "(#{db_table}.#{db_field} <> '' AND CAST(#{db_table}.#{db_field} AS decimal(60,3)) BETWEEN #{value[0].to_f} AND #{value[1].to_f})"
                     else
                       sql = "#{db_table}.#{db_field} BETWEEN #{value[0].to_f} AND #{value[1].to_f}"
                     end
                   end
                 when "o"
                   sql = "#{Issue.table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{connection.quoted_false})" if field == "status_id"
                 when "c"
                   sql = "#{Issue.table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{connection.quoted_true})" if field == "status_id"
                 when ">t-"
                   sql = relative_date_clause(db_table, db_field, - value.first.to_i, 0)
                 when "<t-"
                   sql = relative_date_clause(db_table, db_field, nil, - value.first.to_i)
                 when "t-"
                   sql = relative_date_clause(db_table, db_field, - value.first.to_i, - value.first.to_i)
                 when ">t+"
                   sql = relative_date_clause(db_table, db_field, value.first.to_i, nil)
                 when "<t+"
                   sql = relative_date_clause(db_table, db_field, 0, value.first.to_i)
                 when "t+"
                   sql = relative_date_clause(db_table, db_field, value.first.to_i, value.first.to_i)
                 when "t"
                   sql = relative_date_clause(db_table, db_field, 0, 0)
                 when "w"
                   first_day_of_week = l(:general_first_day_of_week).to_i
                   day_of_week = Date.today.cwday
                   days_ago = (day_of_week >= first_day_of_week ? day_of_week - first_day_of_week : day_of_week + 7 - first_day_of_week)
                   sql = relative_date_clause(db_table, db_field, - days_ago, - days_ago + 6)
                 when "~"
                   sql = "LOWER(#{db_table}.#{db_field}) LIKE '%#{connection.quote_string(value.first.to_s.downcase)}%'"
                 when "!~"
                   sql = "LOWER(#{db_table}.#{db_field}) NOT LIKE '%#{connection.quote_string(value.first.to_s.downcase)}%'"
                 else
                   raise "Unknown query operator #{operator}"
                 end
                 return sql
               end
               def add_custom_fields_filters(custom_fields)
                 @available_filters ||= {}
                 custom_fields.select(&:is_filter?).each do |field|
                   case field.field_format
                   when "text"
                     options = { :type => :text, :order => 20 }
                   when "list"
                     options = { :type => :list_optional, :values => field.possible_values, :order => 20}
                   when "date"
                     options = { :type => :date, :order => 20 }
                   when "bool"
                     options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
                   when "int"
                     options = { :type => :integer, :order => 20 }
                   when "float"
                     options = { :type => :float, :order => 20 }
                   when "user", "version"
                     next unless project
                     values = field.possible_values_options(project)
                     if User.current.logged? && field.field_format == 'user'
                       values.unshift ["<< #{l(:label_me)} >>", "me"]
                     end
                     options = { :type => :list_optional, :values => values, :order => 20}
                   else
                     options = { :type => :string, :order => 20 }
                   end
                   @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name, :format => field.field_format })
                 end
               end
               # Returns a SQL clause for a date or datetime field.
               def date_clause(table, field, from, to)
                 s = []
                 if from
                   from_yesterday = from - 1
                   from_yesterday_time = Time.local(from_yesterday.year, from_yesterday.month, from_yesterday.day)
                   if self.class.default_timezone == :utc
                     from_yesterday_time = from_yesterday_time.utc
                   end
                   s << ("#{table}.#{field} > '%s'" % [connection.quoted_date(from_yesterday_time.end_of_day)])
                 end
                 if to
                   to_time = Time.local(to.year, to.month, to.day)
                   if self.class.default_timezone == :utc
                     to_time = to_time.utc
                   end
                   s << ("#{table}.#{field} <= '%s'" % [connection.quoted_date(to_time.end_of_day)])
                 end
                 s.join(' AND ')
               end
               # Returns a SQL clause for a date or datetime field using relative dates.
               def relative_date_clause(table, field, days_from, days_to)
                 date_clause(table, field, (days_from ? Date.today + days_from : nil), (days_to ? Date.today + days_to : nil))
               end
               # Additional joins required for the given sort options
               def joins_for_order_statement(order_options)
                 joins = []
                 if order_options
                   if order_options.include?('authors')
                     joins << "LEFT OUTER JOIN #{User.table_name} authors ON authors.id = #{Issue.table_name}.author_id"
                   end
                   order_options.scan(/cf_\d+/).uniq.each do |name|
                     column = available_columns.detect {|c| c.name.to_s == name}
                     join = column && column.custom_field.join_for_order_statement
                     if join
                       joins << join
                     end
                   end
                 end
                 joins.any? ? joins.join(' ') : nil
               end
             end

app/views/queries/_filters.html.erb +16 -42

@@ -1,53 +1,27
		1	<%= javascript_tag do %>
		2	var operatorLabels = <%= raw Query.operators_labels.to_json %>;
		3	var operatorByType = <%= raw Query.operators_by_filter_type.to_json %>;
		4	var availableFilters = <%= raw query.available_filters_as_json.to_json %>;
		5	var labelDayPlural = "<%= raw escape_javascript(l(:label_day_plural)) %>";
		6	$(document).ready(function(){
		7	initFilters();
		8	<% query.filters.each do \|field, options\| %>
		9	addFilter("<%= field %>", <%= raw query.operator_for(field).to_json %>, <%= raw query.values_for(field).to_json %>);
		10	<% end %>
		11	});
		12	<% end %>
		13
1	<table style="width:100%">	14	<table style="width:100%">
2	<tr>	15	<tr>
3	<td>	16	<td>
4	<table>	17	<table id="filters-table">
5	<% query.available_filters.sort{\|a,b\| a[1][:order]<=>b[1][:order]}.each do \|filter\| %>
6	<% field = filter[0]
7	options = filter[1] %>
8	<tr <%= 'style="display:none;"'.html_safe unless query.has_filter?(field) %> id="tr_<%= field %>" class="filter">
9	<td class="field">
10	<%= check_box_tag 'f[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
11	<label for="cb_<%= field %>"><%= filter[1][:name] \|\| l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label>
12	</td>
13	<td class="operator">
14	<%= label_tag "operators_#{field}", l(:description_filter), :class => "hidden-for-sighted" %>
15	<%= select_tag "op[#{field}]", options_for_select(operators_for_select(options[:type]),
16	query.operator_for(field)), :id => "operators_#{field}",
17	:onchange => "toggle_operator('#{field}');" %>
18	</td>
19	<td class="values">
20	<div id="div_values_<%= field %>" style="display:none;">
21	<% case options[:type]
22	when :list, :list_optional, :list_status, :list_subprojects %>
23	<span class="span_values_<%= field %>">
24	<%= 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) %>
25	<%= link_to_function image_tag('bullet_toggle_plus.png'), "toggle_multi_select('values_#{field}_1');" %>
26	</span>
27	<% when :date, :date_past %>
28	<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>
29	<span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field, 1), :size => 10, :class => "values_#{field}", :id => "values_#{field}_2" %> <%= calendar_for "values_#{field}_2" %></span>
30	<span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field), :size => 3, :class => "values_#{field}" %> <%= l(:label_day_plural) %></span>
31	<% when :string, :text %>
32	<span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field), :class => "values_#{field}", :id => "values_#{field}", :size => 30 %></span>
33	<% when :integer, :float %>
34	<span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field), :class => "values_#{field}", :id => "values_#{field}_1", :size => 6 %></span>
35	<span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field, 1), :class => "values_#{field}", :id => "values_#{field}_2", :size => 6 %></span>
36	<% end %>
37	</div>
38	<script type="text/javascript">toggle_filter('<%= field %>');</script>
39	</td>
40	</tr>
41	<% end %>
42	</table>	18	</table>
43	</td>	19	</td>
44	<td class="add-filter">	20	<td class="add-filter">
45	<%= label_tag('add_filter_select', l(:label_filter_add)) %>	21	<%= label_tag('add_filter_select', l(:label_filter_add)) %>
46	<%= 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),	22	<%= select_tag 'add_filter_select', filters_options_for_select(query), :name => nil %>
47	:onchange => "add_filter();",
48	:name => nil %>
49	</td>	23	</td>
50	</tr>	24	</tr>
51	</table>	25	</table>
52	<%= hidden_field_tag 'f[]', '' %>	26	<%= hidden_field_tag 'f[]', '' %>
53	<%= javascript_tag '$(document).ready(function(){observeIssueFilters();});' %>	27	<% include_calendar_headers_tags %>

app/views/queries/_form.html.erb +1 -1

             <%= error_messages_for 'query' %>
             <div class="box">
             <div class="tabular">
             <p><label for="query_name"><%=l(:field_name)%></label>
             <%= text_field 'query', 'name', :size => 80 %></p>
             <% if User.current.admin? || User.current.allowed_to?(:manage_public_queries, @project) %>
             <p><label for="query_is_public"><%=l(:field_is_public)%></label>
             <%= check_box 'query', 'is_public',
                   :onchange => (User.current.admin? ? nil : 'if (this.checked) {$("#query_is_for_all").removeAttr("checked"); $("#query_is_for_all").attr("disabled", true);} else {$("#query_is_for_all").removeAttr("disabled");}') %></p>
             <% end %>
             <p><label for="query_is_for_all"><%=l(:field_is_for_all)%></label>
             <%= check_box_tag 'query_is_for_all', 1, @query.project.nil?,
                   :disabled => (!@query.new_record? && (@query.project.nil? || (@query.is_public? && !User.current.admin?))) %></p>
             <p><label for="query_default_columns"><%=l(:label_default_columns)%></label>
             <%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
                   :onclick => 'if (this.checked) {$("#columns").hide();} else {$("#columns").show();}' %></p>
             <p><label for="query_group_by"><%= l(:field_group_by) %></label>
             <%= select 'query', 'group_by', @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, :include_blank => true %></p>
             </div>
-            <fieldset><legend><%= l(:label_filter_plural) %></legend>
+            <fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
             <%= render :partial => 'queries/filters', :locals => {:query => query}%>
             </fieldset>
             <fieldset><legend><%= l(:label_sort) %></legend>
             <% 3.times do |i| %>
             <%= 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>
             <%= content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
             <legend><%= l(:field_column_names) %></legend>
             <%= render :partial => 'queries/columns', :locals => {:query => query}%>
             <% end %>
             </div>

public/javascripts/application.js +120 -36

             /* Redmine - project management software
                Copyright (C) 2006-2012  Jean-Philippe Lang */
             function checkAll(id, checked) {
               if (checked) {
                 $('#'+id).find('input[type=checkbox]').attr('checked', true);
               } else {
                 $('#'+id).find('input[type=checkbox]').removeAttr('checked');
               }
             }
             function toggleCheckboxesBySelector(selector) {
               var all_checked = true;
               $(selector).each(function(index) {
                 if (!$(this).is(':checked')) { all_checked = false; }
               });
               $(selector).attr('checked', !all_checked)
             }
             function showAndScrollTo(id, focus) {
               $('#'+id).show();
               if (focus!=null) {
                 $('#'+focus).focus();
               }
               $('html, body').animate({scrollTop: $('#'+id).offset().top}, 100);
             }
             function toggleRowGroup(el) {
               var tr = $(el).parents('tr').first();
               var n = tr.next();
               tr.toggleClass('open');
               while (n.length && !n.hasClass('group')) {
                 n.toggle();
                 n = n.next('tr');
               }
             }
             function collapseAllRowGroups(el) {
               var tbody = $(el).parents('tbody').first();
               tbody.children('tr').each(function(index) {
                 if ($(this).hasClass('group')) {
                   $(this).removeClass('open');
                 } else {
                   $(this).hide();
                 }
               });
             }
             function expandAllRowGroups(el) {
               var tbody = $(el).parents('tbody').first();
               tbody.children('tr').each(function(index) {
                 if ($(this).hasClass('group')) {
                   $(this).addClass('open');
                 } else {
                   $(this).show();
                 }
               });
             }
             function toggleAllRowGroups(el) {
               var tr = $(el).parents('tr').first();
               if (tr.hasClass('open')) {
                 collapseAllRowGroups(el);
               } else {
                 expandAllRowGroups(el);
               }
             }
             function toggleFieldset(el) {
               var fieldset = $(el).parents('fieldset').first();
               fieldset.toggleClass('collapsed');
               fieldset.children('div').toggle();
             }
             function hideFieldset(el) {
               var fieldset = $(el).parents('fieldset').first();
               fieldset.toggleClass('collapsed');
               fieldset.children('div').hide();
             }
-            function add_filter() {
+            function initFilters(){
-              var select = $('#add_filter_select');
+              $('#add_filter_select').change(function(){
-              var field = select.val();
+                addFilter($(this).val(), '', []);
-              $('#tr_'+field).show();
+              });
-              var check_box = $('#cb_' + field);
+              $('#filters-table td.field input[type=checkbox]').each(function(){
-              check_box.attr('checked', true);
+                toggleFilter($(this).val());
-              toggle_filter(field);
+              });
-              select.val('');
+              $('#filters-table td.field input[type=checkbox]').live('click',function(){
+                toggleFilter($(this).val());
-              select.children('option').each(function(index) {
+              });
+              $('#filters-table .toggle-multiselect').live('click',function(){
+                toggleMultiSelect($(this).siblings('select'));
+              });
+              $('#filters-table input[type=text]').live('keypress', function(e){
+                if (e.keyCode == 13) submit_query_form("query_form");
+              });
+            }
+            function addFilter(field, operator, values) {
+              var fieldId = field.replace('.', '_');
+              var tr = $('#tr_'+fieldId);
+              if (tr.length > 0) {
+                tr.show();
+              } else {
+                buildFilterRow(field, operator, values);
+              }
+              $('#cb_'+fieldId).attr('checked', true);
+              toggleFilter(field);
+              $('#add_filter_select').val('').children('option').each(function(){
                 if ($(this).attr('value') == field) {
                   $(this).attr('disabled', true);
                 }
               });
             }
-            function toggle_filter(field) {
+            function buildFilterRow(field, operator, values) {
-              check_box = $('#cb_' + field);
+              var fieldId = field.replace('.', '_');
-              if (check_box.is(':checked')) {
+              var filterTable = $("#filters-table");
-                $("#operators_" + field).show().removeAttr('disabled');
+              var filterOptions = availableFilters[field];
-                toggle_operator(field);
+              var operators = operatorByType[filterOptions['type']];
+              var filterValues = filterOptions['values'];
+              var i, select;
+              var tr = $('<tr class="filter">').attr('id', 'tr_'+fieldId).html(
+                '<td class="field"><input checked="checked" id="cb_'+fieldId+'" name="f[]" value="'+field+'" type="checkbox"><label for="cb_'+fieldId+'"> '+filterOptions['name']+'</label></td>' +
+                '<td class="operator"><select id="operators_'+fieldId+'" name="op['+field+']"></td>' +
+                '<td class="values"></td>'
+              );
+              filterTable.append(tr);
+              select = tr.find('td.operator select');
+              for (i=0;i<operators.length;i++){
+                var option = $('<option>').val(operators[i]).html(operatorLabels[operators[i]]);
+                if (operators[i] == operator) {option.attr('selected', true)};
+                select.append(option);
+              }
+              select.change(function(){toggleOperator(field)});
+              switch (filterOptions['type']){
+              case "list":
+              case "list_optional":
+              case "list_status":
+              case "list_subprojects":
+                tr.find('td.values').append(
+                  '<span style="display:none;"><select class="value" id="values_'+fieldId+'_1" name="v['+field+'][]"></select>' +
+                  ' <span class="toggle-multiselect">&nbsp;</span></span>'
+                );
+                select = tr.find('td.values select');
+                if (values.length > 1) {select.attr('multiple', true)};
+                for (i=0;i<filterValues.length;i++){
+                  var filterValue = filterValues[i];
+                  var option = $('<option>');
+                  if ($.isArray(filterValue)) {
+                    option.val(filterValue[1]).html(filterValue[0]);
+                  } else {
+                    option.val(filterValue).html(filterValue);
+                  }
+                  if (values.indexOf(filterValues[i][1]) > -1) {option.attr('selected', true)};
+                  select.append(option);
+                }
+                break;
+              case "date":
+              case "date_past":
+                tr.find('td.values').append(
+                  '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_1" size="10" class="value date_value" value="'+values[0]+'" /></span>' +
+                  ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_2" size="10" class="value date_value" value="'+values[1]+'" /></span>' +
+                  ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'" size="3" class="value" value="'+values[0]+'" /> '+labelDayPlural+'</span>'
+                );
+                $('#values_'+fieldId+'_1').val(values[0]).datepicker(datepickerOptions);
+                $('#values_'+fieldId+'_2').val(values[1]).datepicker(datepickerOptions);
+                $('#values_'+fieldId).val(values[0]);
+                break;
+              case "string":
+              case "text":
+                tr.find('td.values').append(
+                  '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'" size="30" class="value" value="'+values[0]+'" /></span>'
+                );
+                $('#values_'+fieldId).val(values[0]);
+                break;
+              case "integer":
+              case "float":
+                tr.find('td.values').append(
+                  '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_1" size="6" class="value" value="'+values[0]+'" /></span>' +
+                  ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_2" size="6" class="value" value="'+values[1]+'" /></span>'
+                );
+                $('#values_'+fieldId+'_1').val(values[0]);
+                $('#values_'+fieldId+'_2').val(values[1]);
+                break;
+              }
+            }
+            function toggleFilter(field) {
+              var fieldId = field.replace('.', '_');
+              if ($('#cb_' + fieldId).is(':checked')) {
+                $("#operators_" + fieldId).show().removeAttr('disabled');
+                toggleOperator(field);
               } else {
-                $("#operators_" + field).hide().attr('disabled', true);
+                $("#operators_" + fieldId).hide().attr('disabled', true);
                 enableValues(field, []);
               }
             }
             function enableValues(field, indexes) {
-              $(".values_" + field).each(function(index) {
+              var fieldId = field.replace('.', '_');
+              $('#tr_'+fieldId+' td.values .value').each(function(index) {
                 if (indexes.indexOf(index) >= 0) {
                   $(this).removeAttr('disabled');
                   $(this).parents('span').first().show();
                 } else {
                   $(this).val('');
                   $(this).attr('disabled', true);
                   $(this).parents('span').first().hide();
                 }
                 if ($(this).hasClass('group')) {
                   $(this).addClass('open');
                 } else {
                   $(this).show();
                 }
               });
-              if (indexes.length > 0) {
-                $("#div_values_" + field).show();
-              } else {
-                $("#div_values_" + field).hide();
             }
-            function toggle_operator(field) {
+            function toggleOperator(field) {
-              operator = $("#operators_" + field);
+              var fieldId = field.replace('.', '_');
+              var operator = $("#operators_" + fieldId);
               switch (operator.val()) {
                 case "!*":
                 case "*":
                 case "t":
                 case "w":
                 case "o":
                 case "c":
                   enableValues(field, []);
                   break;
                 case "><":
                   enableValues(field, [0,1]);
                   break;
                 case "<t+":
                 case ">t+":
                 case "t+":
                 case ">t-":
                 case "<t-":
                 case "t-":
                   enableValues(field, [2]);
                   break;
                 default:
                   enableValues(field, [0]);
                   break;
               }
             }
-            function toggle_multi_select(id) {
+            function toggleMultiSelect(el) {
-              var select = $('#'+id);
+              if (el.attr('multiple')) {
-              if (select.attr('multiple')) {
+                el.removeAttr('multiple');
-                select.removeAttr('multiple');
               } else {
-                select.attr('multiple', true);
+                el.attr('multiple', true);
               }
             }
             function submit_query_form(id) {
               selectAllOptions("selected_columns");
               $('#'+id).submit();
             }
-            function observeIssueFilters() {
-              $('#query_form input[type=text]').keypress(function(e){
-                if (e.keyCode == 13) submit_query_form("query_form");
-              });
             var fileFieldCount = 1;
             function addFileField() {
               var fields = $('#attachments_fields');
               if (fields.children().length >= 10) return false;
               fileFieldCount++;
               var s = fields.children('span').first().clone();
               s.children('input.file').attr('name', "attachments[" + fileFieldCount + "][file]").val('');
               s.children('input.description').attr('name', "attachments[" + fileFieldCount + "][description]").val('');
               fields.append(s);
             }
             function removeFileField(el) {
               var fields = $('#attachments_fields');
               var s = $(el).parents('span').first();
               if (fields.children().length > 1) {
                 s.remove();
               } else {
                 s.children('input.file').val('');
                 s.children('input.description').val('');
               }
             }
             function checkFileSize(el, maxSize, message) {
               var files = el.files;
               if (files) {
                 for (var i=0; i<files.length; i++) {
                   if (files[i].size > maxSize) {
                     alert(message);
                     el.value = "";
                   }
                 }
               }
             }
             function showTab(name) {
               $('div#content .tab-content').hide();
               $('div.tabs a').removeClass('selected');
               $('#tab-content-' + name).show();
               $('#tab-' + name).addClass('selected');
               return false;
             }
             function moveTabRight(el) {
               var lis = $(el).parents('div.tabs').first().find('ul').children();
               var tabsWidth = 0;
               var i = 0;
               lis.each(function(){
                 if ($(this).is(':visible')) {
                   tabsWidth += $(this).width() + 6;
                 }
               });
               if (tabsWidth < $(el).parents('div.tabs').first().width() - 60) { return; }
               while (i<lis.length && !lis.eq(i).is(':visible')) { i++; }
               lis.eq(i).hide();
             }
             function moveTabLeft(el) {
               var lis = $(el).parents('div.tabs').first().find('ul').children();
               var i = 0;
               while (i<lis.length && !lis.eq(i).is(':visible')) { i++; }
               if (i>0) {
                 lis.eq(i-1).show();
               }
             }
             function displayTabsButtons() {
               var lis;
               var tabsWidth = 0;
               var el;
               $('div.tabs').each(function() {
                 el = $(this);
                 lis = el.find('ul').children();
                 lis.each(function(){
                   if ($(this).is(':visible')) {
                     tabsWidth += $(this).width() + 6;
                   }
                 });
                 if ((tabsWidth < el.width() - 60) && (lis.first().is(':visible'))) {
                   el.find('div.tabs-buttons').hide();
                 } else {
                   el.find('div.tabs-buttons').show();
                 }
               });
             }
             function setPredecessorFieldsVisibility() {
               var relationType = $('#relation_relation_type');
               if (relationType.val() == "precedes" || relationType.val() == "follows") {
                 $('#predecessor_fields').show();
               } else {
                 $('#predecessor_fields').hide();
               }
             }
             function showModal(id, width) {
               var el = $('#'+id).first();
               if (el.length == 0 || el.is(':visible')) {return;}
               var title = el.find('h3.title').text();
               el.dialog({
                 width: width,
                 modal: true,
                 resizable: false,
                 dialogClass: 'modal',
                 title: title
               });
               el.find("input[type=text], input[type=submit]").first().focus();
             }
             function hideModal(el) {
               var modal;
               if (el) {
                 modal = $(el).parents('.ui-dialog-content');
               } else {
                 modal = $('#ajax-modal');
               }
               modal.dialog("close");
             }
             function submitPreview(url, form, target) {
               $.ajax({
                 url: url,
                 type: 'post',
                 data: $('#'+form).serialize(),
                 success: function(data){
                   $('#'+target).html(data);
                 }
               });
             }
             function collapseScmEntry(id) {
               $('.'+id).each(function() {
                 if ($(this).hasClass('open')) {
                   collapseScmEntry($(this).attr('id'));
                 }
                 $(this).hide();
               });
               $('#'+id).removeClass('open');
             }
             function expandScmEntry(id) {
               $('.'+id).each(function() {
                 $(this).show();
                 if ($(this).hasClass('loaded') && !$(this).hasClass('collapsed')) {
                   expandScmEntry($(this).attr('id'));
                 }
               });
               $('#'+id).addClass('open');
             }
             function scmEntryClick(id, url) {
                 el = $('#'+id);
                 if (el.hasClass('open')) {
                     collapseScmEntry(id);
                     el.addClass('collapsed');
                     return false;
                 } else if (el.hasClass('loaded')) {
                     expandScmEntry(id);
                     el.removeClass('collapsed');
                     return false;
                 }
                 if (el.hasClass('loading')) {
                     return false;
                 }
                 el.addClass('loading');
                 $.ajax({
                   url: url,
                   success: function(data){
                     el.after(data);
                     el.addClass('open').addClass('loaded').removeClass('loading');
                   }
                 });
                 return true;
             }
             function randomKey(size) {
               var chars = new Array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z');
               var key = '';
               for (i = 0; i < size; i++) {
                 key += chars[Math.floor(Math.random() * chars.length)];
               }
               return key;
             }
             // Can't use Rails' remote select because we need the form data
             function updateIssueFrom(url) {
               $.ajax({
                 url: url,
                 type: 'post',
                 data: $('#issue-form').serialize()
               });
             }
             function updateBulkEditFrom(url) {
               $.ajax({
                 url: url,
                 type: 'post',
                 data: $('#bulk_edit_form').serialize()
               });
             }
             function observeAutocompleteField(fieldId, url) {
               $('#'+fieldId).autocomplete({
                 source: url,
                 minLength: 2,
               });
             }
             function observeSearchfield(fieldId, targetId, url) {
               $('#'+fieldId).each(function() {
                 var $this = $(this);
                 $this.attr('data-value-was', $this.val());
                 var check = function() {
                   var val = $this.val();
                   if ($this.attr('data-value-was') != val){
                     $this.attr('data-value-was', val);
                     if (val != '') {
                       $.ajax({
                         url: url,
                         type: 'get',
                         data: {q: $this.val()},
                         success: function(data){ $('#'+targetId).html(data); },
                         beforeSend: function(){ $this.addClass('ajax-loading'); },
                         complete: function(){ $this.removeClass('ajax-loading'); }
                       });
                     }
                   }
                 };
                 var reset = function() {
                   if (timer) {
                     clearInterval(timer);
                     timer = setInterval(check, 300);
                   }
                 };
                 var timer = setInterval(check, 300);
                 $this.bind('keyup click mousemove', reset);
               });
             }
             function observeProjectModules() {
               var f = function() {
                 /* Hides trackers and issues custom fields on the new project form when issue_tracking module is disabled */
                 if ($('#project_enabled_module_names_issue_tracking').attr('checked')) {
                   $('#project_trackers').show();
                 }else{
                   $('#project_trackers').hide();
                 }
               };
               $(window).load(f);
               $('#project_enabled_module_names_issue_tracking').change(f);
             }
             function initMyPageSortable(list, url) {
               $('#list-'+list).sortable({
                 connectWith: '.block-receiver',
                 tolerance: 'pointer',
                 update: function(){
                   $.ajax({
                     url: url,
                     type: 'post',
                     data: {'blocks': $.map($('#list-'+list).children(), function(el){return $(el).attr('id');})}
                   });
                 }
               });
               $("#list-top, #list-left, #list-right").disableSelection();
             }
             var warnLeavingUnsavedMessage;
             function warnLeavingUnsaved(message) {
               warnLeavingUnsavedMessage = message;
               $('form').submit(function(){
                 $('textarea').removeData('changed');
               });
               $('textarea').change(function(){
                 $(this).data('changed', 'changed');
               });
               window.onbeforeunload = function(){
                 var warn = false;
                 $('textarea').blur().each(function(){
                   if ($(this).data('changed')) {
                     warn = true;
                   }
                 });
                 if (warn) {return warnLeavingUnsavedMessage;}
               };
             };
             $(document).ready(function(){
               $('#ajax-indicator').bind('ajaxSend', function(){
                 if ($('.ajax-loading').length == 0) {
                   $('#ajax-indicator').show();
                 }
               });
               $('#ajax-indicator').bind('ajaxStop', function(){
                 $('#ajax-indicator').hide();
               });
             });
             function hideOnLoad() {
               $('.hol').hide();
             }
             function addFormObserversForDoubleSubmit() {
               $('form[method=post]').each(function() {
                 if (!$(this).hasClass('multiple-submit')) {
                   $(this).submit(function(form_submission) {
                     if ($(form_submission.target).attr('data-submitted')) {
                       form_submission.preventDefault();
                     } else {
                       $(form_submission.target).attr('data-submitted', true);
                     }
                   });
                 }
               });
             }
             $(document).ready(hideOnLoad);
             $(document).ready(addFormObserversForDoubleSubmit);

public/stylesheets/application.css +3 -2

             html {overflow-y:scroll;}
             body { font-family: Verdana, sans-serif; font-size: 12px; color:#484848; margin: 0; padding: 0; min-width: 900px; }
             h1, h2, h3, h4 { font-family: "Trebuchet MS", Verdana, sans-serif;}
             h1 {margin:0; padding:0; font-size: 24px;}
             h2, .wiki h1 {font-size: 20px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; color: #444;}
             h3, .wiki h2 {font-size: 16px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; color: #444;}
             h4, .wiki h3 {font-size: 13px;padding: 2px 10px 1px 0px;margin-bottom: 5px; border-bottom: 1px dotted #bbbbbb; color: #444;}
             /***** Layout *****/
             #wrapper {background: white;}
             #top-menu {background: #3E5B76; color: #fff; height:1.8em; font-size: 0.8em; padding: 2px 2px 0px 6px;}
             #top-menu ul {margin: 0;  padding: 0;}
             #top-menu li {
               float:left;
               list-style-type:none;
               margin: 0px 0px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
             }
             #top-menu a {color: #fff; margin-right: 8px; font-weight: bold;}
             #top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; }
             #account {float:right;}
             #header {height:5.3em;margin:0;background-color:#628DB6;color:#f8f8f8; padding: 4px 8px 0px 6px; position:relative;}
             #header a {color:#f8f8f8;}
             #header h1 a.ancestor { font-size: 80%; }
             #quick-search {float:right;}
             #main-menu {position: absolute;  bottom: 0px;  left:6px; margin-right: -500px;}
             #main-menu ul {margin: 0;  padding: 0;}
             #main-menu li {
               float:left;
               list-style-type:none;
               margin: 0px 2px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
             }
             #main-menu li a {
               display: block;
               color: #fff;
               text-decoration: none;
               font-weight: bold;
               margin: 0;
               padding: 4px 10px 4px 10px;
             }
             #main-menu li a:hover {background:#759FCF; color:#fff;}
             #main-menu li a.selected, #main-menu li a.selected:hover {background:#fff; color:#555;}
             #admin-menu ul {margin: 0;  padding: 0;}
             #admin-menu li {margin: 0;  padding: 0 0 6px 0; list-style-type:none;}
             #admin-menu a { background-position: 0% 40%; background-repeat: no-repeat; padding-left: 20px; padding-top: 2px; padding-bottom: 3px;}
             #admin-menu a.projects { background-image: url(../images/projects.png); }
             #admin-menu a.users { background-image: url(../images/user.png); }
             #admin-menu a.groups { background-image: url(../images/group.png); }
             #admin-menu a.roles { background-image: url(../images/database_key.png); }
             #admin-menu a.trackers { background-image: url(../images/ticket.png); }
             #admin-menu a.issue_statuses { background-image: url(../images/ticket_edit.png); }
             #admin-menu a.workflows { background-image: url(../images/ticket_go.png); }
             #admin-menu a.custom_fields { background-image: url(../images/textfield.png); }
             #admin-menu a.enumerations { background-image: url(../images/text_list_bullets.png); }
             #admin-menu a.settings { background-image: url(../images/changeset.png); }
             #admin-menu a.plugins { background-image: url(../images/plugin.png); }
             #admin-menu a.info { background-image: url(../images/help.png); }
             #admin-menu a.server_authentication { background-image: url(../images/server_key.png); }
             #main {background-color:#EEEEEE;}
             #sidebar{ float: right; width: 22%; position: relative; z-index: 9; padding: 0; margin: 0;}
             * html #sidebar{ width: 22%; }
             #sidebar h3{ font-size: 14px; margin-top:14px; color: #666;  }
             #sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; }
             * html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; }
             #sidebar .contextual { margin-right: 1em; }
             #content { width: 75%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; }
             * html #content{ width: 75%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
             html>body #content { min-height: 600px; }
             * html body #content { height: 600px; } /* IE */
             #main.nosidebar #sidebar{ display: none; }
             #main.nosidebar #content{ width: auto; border-right: 0; }
             #footer {clear: both; border-top: 1px solid #bbb; font-size: 0.9em; color: #aaa; padding: 5px; text-align:center; background:#fff;}
             #login-form table {margin-top:5em; padding:1em; margin-left: auto; margin-right: auto; border: 2px solid #FDBF3B; background-color:#FFEBC1; }
             #login-form table td {padding: 6px;}
             #login-form label {font-weight: bold;}
             #login-form input#username, #login-form input#password { width: 300px; }
             div.modal { border-radius:5px; background:#fff; z-index:50; padding:4px;}
             div.modal h3.title {display:none;}
             div.modal p.buttons {text-align:right; margin-bottom:0;}
             input#openid_url { background: url(../images/openid-bg.gif) no-repeat; background-color: #fff; background-position: 0 50%; padding-left: 18px; }
             .clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
             /***** Links *****/
             a, a:link, a:visited{ color: #169; text-decoration: none; }
             a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
             a img{ border: 0; }
             a.issue.closed, a.issue.closed:link, a.issue.closed:visited { color: #999; text-decoration: line-through; }
             a.project.closed, a.project.closed:link, a.project.closed:visited { color: #999; }
             #sidebar a.selected {line-height:1.7em; padding:1px 3px 2px 2px; margin-left:-2px; background-color:#9DB9D5; color:#fff; border-radius:2px;}
             #sidebar a.selected:hover {text-decoration:none;}
             #admin-menu a {line-height:1.7em;}
             #admin-menu a.selected {padding-left: 20px !important; background-position: 2px 40%;}
             a.collapsible {padding-left: 12px; background: url(../images/arrow_expanded.png) no-repeat -3px 40%;}
             a.collapsible.collapsed {background: url(../images/arrow_collapsed.png) no-repeat -5px 40%;}
             a#toggle-completed-versions {color:#999;}
             /***** Tables *****/
             table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
             table.list th {  background-color:#EEEEEE; padding: 4px; white-space:nowrap; }
             table.list td { vertical-align: top; }
             table.list td.id { width: 2%; text-align: center;}
             table.list td.checkbox { width: 15px; padding: 2px 0 0 0; }
             table.list td.checkbox input {padding:0px;}
             table.list td.buttons { width: 15%; white-space:nowrap; text-align: right; }
             table.list td.buttons a { padding-right: 0.6em; }
             table.list caption { text-align: left; padding: 0.5em 0.5em 0.5em 0; }
             tr.project td.name a { white-space:nowrap; }
             tr.project.closed, tr.project.archived { color: #aaa; }
             tr.project.closed a, tr.project.archived a { color: #aaa; }
             tr.project.idnt td.name span {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%; padding-left: 16px;}
             tr.project.idnt-1 td.name {padding-left: 0.5em;}
             tr.project.idnt-2 td.name {padding-left: 2em;}
             tr.project.idnt-3 td.name {padding-left: 3.5em;}
             tr.project.idnt-4 td.name {padding-left: 5em;}
             tr.project.idnt-5 td.name {padding-left: 6.5em;}
             tr.project.idnt-6 td.name {padding-left: 8em;}
             tr.project.idnt-7 td.name {padding-left: 9.5em;}
             tr.project.idnt-8 td.name {padding-left: 11em;}
             tr.project.idnt-9 td.name {padding-left: 12.5em;}
             tr.issue { text-align: center; white-space: nowrap; }
             tr.issue td.subject, tr.issue td.category, td.assigned_to, tr.issue td.string, tr.issue td.text { white-space: normal; }
             tr.issue td.subject { text-align: left; }
             tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
             tr.issue.idnt td.subject a {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%; padding-left: 16px;}
             tr.issue.idnt-1 td.subject {padding-left: 0.5em;}
             tr.issue.idnt-2 td.subject {padding-left: 2em;}
             tr.issue.idnt-3 td.subject {padding-left: 3.5em;}
             tr.issue.idnt-4 td.subject {padding-left: 5em;}
             tr.issue.idnt-5 td.subject {padding-left: 6.5em;}
             tr.issue.idnt-6 td.subject {padding-left: 8em;}
             tr.issue.idnt-7 td.subject {padding-left: 9.5em;}
             tr.issue.idnt-8 td.subject {padding-left: 11em;}
             tr.issue.idnt-9 td.subject {padding-left: 12.5em;}
             tr.entry { border: 1px solid #f8f8f8; }
             tr.entry td { white-space: nowrap; }
             tr.entry td.filename { width: 30%; }
             tr.entry td.filename_no_report { width: 70%; }
             tr.entry td.size { text-align: right; font-size: 90%; }
             tr.entry td.revision, tr.entry td.author { text-align: center; }
             tr.entry td.age { text-align: right; }
             tr.entry.file td.filename a { margin-left: 16px; }
             tr.entry.file td.filename_no_report a { margin-left: 16px; }
             tr span.expander {background-image: url(../images/bullet_toggle_plus.png); padding-left: 8px; margin-left: 0; cursor: pointer;}
             tr.open span.expander {background-image: url(../images/bullet_toggle_minus.png);}
             tr.changeset { height: 20px }
             tr.changeset ul, ol { margin-top: 0px; margin-bottom: 0px; }
             tr.changeset td.revision_graph { width: 15%; background-color: #fffffb; }
             tr.changeset td.author { text-align: center; width: 15%; white-space:nowrap;}
             tr.changeset td.committed_on { text-align: center; width: 15%; white-space:nowrap;}
             table.files tr.file td { text-align: center; }
             table.files tr.file td.filename { text-align: left; padding-left: 24px; }
             table.files tr.file td.digest { font-size: 80%; }
             table.members td.roles, table.memberships td.roles { width: 45%; }
             tr.message { height: 2.6em; }
             tr.message td.subject { padding-left: 20px; }
             tr.message td.created_on { white-space: nowrap; }
             tr.message td.last_message { font-size: 80%; white-space: nowrap; }
             tr.message.locked td.subject { background: url(../images/locked.png) no-repeat 0 1px; }
             tr.message.sticky td.subject { background: url(../images/bullet_go.png) no-repeat 0 1px; font-weight: bold; }
             tr.version.closed, tr.version.closed a { color: #999; }
             tr.version td.name { padding-left: 20px; }
             tr.version.shared td.name { background: url(../images/link.png) no-repeat 0% 70%; }
             tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; white-space:nowrap; }
             tr.user td { width:13%; }
             tr.user td.email { width:18%; }
             tr.user td { white-space: nowrap; }
             tr.user.locked, tr.user.registered { color: #aaa; }
             tr.user.locked a, tr.user.registered a { color: #aaa; }
             table.permissions td.role {color:#999;font-size:90%;font-weight:normal !important;text-align:center;vertical-align:bottom;}
             tr.wiki-page-version td.updated_on, tr.wiki-page-version td.author {text-align:center;}
             tr.time-entry { text-align: center; white-space: nowrap; }
             tr.time-entry td.subject, tr.time-entry td.comments { text-align: left; white-space: normal; }
             td.hours { text-align: right; font-weight: bold; padding-right: 0.5em; }
             td.hours .hours-dec { font-size: 0.9em; }
             table.plugins td { vertical-align: middle; }
             table.plugins td.configure { text-align: right; padding-right: 1em; }
             table.plugins span.name { font-weight: bold; display: block; margin-bottom: 6px; }
             table.plugins span.description { display: block; font-size: 0.9em; }
             table.plugins span.url { display: block; font-size: 0.9em; }
             table.list tbody tr.group td { padding: 0.8em 0 0.5em 0.3em; font-weight: bold; border-bottom: 1px solid #ccc; }
             table.list tbody tr.group span.count { color: #aaa; font-size: 80%; }
             tr.group a.toggle-all { color: #aaa; font-size: 80%; font-weight: normal; display:none;}
             tr.group:hover a.toggle-all { display:inline;}
             a.toggle-all:hover {text-decoration:none;}
             table.list tbody tr:hover { background-color:#ffffdd; }
             table.list tbody tr.group:hover { background-color:inherit; }
             table td {padding:2px;}
             table p {margin:0;}
             .odd {background-color:#f6f7f8;}
             .even {background-color: #fff;}
             a.sort { padding-right: 16px; background-position: 100% 50%; background-repeat: no-repeat; }
             a.sort.asc  { background-image: url(../images/sort_asc.png); }
             a.sort.desc { background-image: url(../images/sort_desc.png); }
             table.attributes { width: 100% }
             table.attributes th { vertical-align: top; text-align: left; }
             table.attributes td { vertical-align: top; }
             table.boards a.board, h3.comments { background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 20px; }
             table.boards td.topic-count, table.boards td.message-count {text-align:center;}
             table.boards td.last-message {font-size:80%;}
             table.messages td.author, table.messages td.created_on, table.messages td.reply-count {text-align:center;}
             table.query-columns {
               border-collapse: collapse;
               border: 0;
             }
             table.query-columns td.buttons {
               vertical-align: middle;
               text-align: center;
             }
             td.center {text-align:center;}
             h3.version { background: url(../images/package.png) no-repeat 0% 50%; padding-left: 20px; }
             div.issues h3 { background: url(../images/ticket.png) no-repeat 0% 50%; padding-left: 20px; }
             div.members h3 { background: url(../images/group.png) no-repeat 0% 50%; padding-left: 20px; }
             div.news h3 { background: url(../images/news.png) no-repeat 0% 50%; padding-left: 20px; }
             div.projects h3 { background: url(../images/projects.png) no-repeat 0% 50%; padding-left: 20px; }
             #watchers ul {margin: 0;  padding: 0;}
             #watchers li {list-style-type:none;margin: 0px 2px 0px 0px; padding: 0px 0px 0px 0px;}
             #watchers select {width: 95%; display: block;}
             #watchers a.delete {opacity: 0.4;}
             #watchers a.delete:hover {opacity: 1;}
             #watchers img.gravatar {margin: 0 4px 2px 0;}
             span#watchers_inputs {overflow:auto; display:block;}
             span.search_for_watchers {display:block;}
             span.search_for_watchers, span.add_attachment {font-size:80%; line-height:2.5em;}
             span.search_for_watchers a, span.add_attachment a {padding-left:16px; background: url(../images/bullet_add.png) no-repeat 0 50%; }
             .highlight { background-color: #FCFD8D;}
             .highlight.token-1 { background-color: #faa;}
             .highlight.token-2 { background-color: #afa;}
             .highlight.token-3 { background-color: #aaf;}
             .box{
               padding:6px;
               margin-bottom: 10px;
               background-color:#f6f6f6;
               color:#505050;
               line-height:1.5em;
               border: 1px solid #e4e4e4;
             }
             div.square {
               border: 1px solid #999;
               float: left;
               margin: .3em .4em 0 .4em;
               overflow: hidden;
               width: .6em; height: .6em;
             }
             .contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px; padding-left: 10px; font-size:0.9em;}
             .contextual input, .contextual select {font-size:0.9em;}
             .message .contextual { margin-top: 0; }
             .splitcontent {overflow:auto;}
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             form {display: inline;}
             input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;}
             fieldset {border: 1px solid #e4e4e4; margin:0;}
             legend {color: #484848;}
             hr { width: 100%; height: 1px; background: #ccc; border: 0;}
             blockquote { font-style: italic; border-left: 3px solid #e0e0e0; padding-left: 0.6em; margin-left: 2.4em;}
             blockquote blockquote { margin-left: 0;}
             acronym  { border-bottom: 1px dotted; cursor: help; }
             textarea.wiki-edit { width: 99%; }
             li p {margin-top: 0;}
             div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
             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; }
             p.footnote { font-size: 0.9em; margin-top: 0px; margin-bottom: 0px; }
             div.issue div.subject div div { padding-left: 16px; }
             div.issue div.subject p {margin: 0; margin-bottom: 0.1em; font-size: 90%; color: #999;}
             div.issue div.subject>div>p { margin-top: 0.5em; }
             div.issue div.subject h3 {margin: 0; margin-bottom: 0.1em;}
             div.issue span.private { position:relative; bottom: 2px; text-transform: uppercase; background: #d22; color: #fff; font-weight:bold; padding: 0px 2px 0px 2px; font-size: 60%; margin-right: 2px; border-radius: 2px;}
             div.issue .next-prev-links {color:#999;}
             div.issue table.attributes th {width:22%;}
             div.issue table.attributes td {width:28%;}
             #issue_tree table.issues, #relations table.issues { border: 0; }
             #issue_tree td.checkbox, #relations td.checkbox {display:none;}
             #relations td.buttons {padding:0;}
             fieldset.collapsible { border-width: 1px 0 0 0; font-size: 0.9em; }
             fieldset.collapsible legend { padding-left: 16px; background: url(../images/arrow_expanded.png) no-repeat 0% 40%; cursor:pointer; }
             fieldset.collapsible.collapsed legend { background-image: url(../images/arrow_collapsed.png); }
             fieldset#date-range p { margin: 2px 0 2px 0; }
             fieldset#filters table { border-collapse: collapse; }
             fieldset#filters table td { padding: 0; vertical-align: middle; }
-            fieldset#filters tr.filter { height: 2em; }
+            fieldset#filters tr.filter { height: 2.1em; }
             fieldset#filters td.field { width:200px; }
             fieldset#filters td.operator { width:170px; }
             fieldset#filters td.values { white-space:nowrap; }
             fieldset#filters td.values select {min-width:130px;}
-            fieldset#filters td.values img { vertical-align: middle; margin-left:1px; }
+            fieldset#filters td.values input {height:1em;}
             fieldset#filters td.add-filter { text-align: right; vertical-align: top; }
+            .toggle-multiselect {background: url(../images/bullet_toggle_plus.png) no-repeat 0% 40%; padding-left:8px; margin-left:0; cursor:pointer;}
             .buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; }
             div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
             div#issue-changesets div.changeset { padding: 4px;}
             div#issue-changesets div.changeset { border-bottom: 1px solid #ddd; }
             div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
             .journal ul.details img {margin:0 0 -3px 4px;}
             div#activity dl, #search-results { margin-left: 2em; }
             div#activity dd, #search-results dd { margin-bottom: 1em; padding-left: 18px; font-size: 0.9em; }
             div#activity dt, #search-results dt { margin-bottom: 0px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
             div#activity dt.me .time { border-bottom: 1px solid #999; }
             div#activity dt .time { color: #777; font-size: 80%; }
             div#activity dd .description, #search-results dd .description { font-style: italic; }
             div#activity span.project:after, #search-results span.project:after { content: " -"; }
             div#activity dd span.description, #search-results dd span.description { display:block; color: #808080; }
             #search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px; }
             div#search-results-counts {float:right;}
             div#search-results-counts ul { margin-top: 0.5em; }
             div#search-results-counts  li { list-style-type:none; float: left; margin-left: 1em; }
             dt.issue { background-image: url(../images/ticket.png); }
             dt.issue-edit { background-image: url(../images/ticket_edit.png); }
             dt.issue-closed { background-image: url(../images/ticket_checked.png); }
             dt.issue-note { background-image: url(../images/ticket_note.png); }
             dt.changeset { background-image: url(../images/changeset.png); }
             dt.news { background-image: url(../images/news.png); }
             dt.message { background-image: url(../images/message.png); }
             dt.reply { background-image: url(../images/comments.png); }
             dt.wiki-page { background-image: url(../images/wiki_edit.png); }
             dt.attachment { background-image: url(../images/attachment.png); }
             dt.document { background-image: url(../images/document.png); }
             dt.project { background-image: url(../images/projects.png); }
             dt.time-entry { background-image: url(../images/time.png); }
             #search-results dt.issue.closed { background-image: url(../images/ticket_checked.png); }
             div#roadmap .related-issues { margin-bottom: 1em; }
             div#roadmap .related-issues td.checkbox { display: none; }
             div#roadmap .wiki h1:first-child { display: none; }
             div#roadmap .wiki h1 { font-size: 120%; }
             div#roadmap .wiki h2 { font-size: 110%; }
             body.controller-versions.action-show div#roadmap .related-issues {width:70%;}
             div#version-summary { float:right; width:28%; margin-left: 16px; margin-bottom: 16px; background-color: #fff; }
             div#version-summary fieldset { margin-bottom: 1em; }
             div#version-summary fieldset.time-tracking table { width:100%; }
             div#version-summary th, div#version-summary td.total-hours { text-align: right; }
             table#time-report td.hours, table#time-report th.period, table#time-report th.total { text-align: right; padding-right: 0.5em; }
             table#time-report tbody tr.subtotal { font-style: italic; color:#777;}
             table#time-report tbody tr.subtotal td.hours { color:#b0b0b0; }
             table#time-report tbody tr.total { font-weight: bold; background-color:#EEEEEE; border-top:1px solid #e4e4e4;}
             table#time-report .hours-dec { font-size: 0.9em; }
             div.wiki-page .contextual a {opacity: 0.4}
             div.wiki-page .contextual a:hover {opacity: 1}
             form .attributes select { width: 60%; }
             input#issue_subject { width: 99%; }
             select#issue_done_ratio { width: 95px; }
             ul.projects { margin: 0; padding-left: 1em; }
             ul.projects.root { margin: 0;  padding: 0; }
             ul.projects ul.projects { border-left: 3px solid #e0e0e0; }
             ul.projects li.root { list-style-type:none; margin-bottom: 1em; }
             ul.projects li.child { list-style-type:none; margin-top: 1em;}
             ul.projects div.root a.project { font-family: "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 16px; margin: 0 0 10px 0; }
             .my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; }
             #tracker_project_ids ul { margin: 0;  padding-left: 1em; }
             #tracker_project_ids li { list-style-type:none; }
             #related-issues li img {vertical-align:middle;}
             ul.properties {padding:0; font-size: 0.9em; color: #777;}
             ul.properties li {list-style-type:none;}
             ul.properties li span {font-style:italic;}
             .total-hours { font-size: 110%; font-weight: bold; }
             .total-hours span.hours-int { font-size: 120%; }
             .autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em;}
             #user_login, #user_firstname, #user_lastname, #user_mail, #my_account_form select, #user_form select, #user_identity_url { width: 90%; }
             #workflow_copy_form select { width: 200px; }
             table.transitions td.enabled {background: #bfb;}
             table.fields_permissions select {font-size:90%}
             table.fields_permissions td.readonly {background:#ddd;}
             table.fields_permissions td.required {background:#d88;}
             textarea#custom_field_possible_values {width: 99%}
             input#content_comments {width: 99%}
             .pagination {font-size: 90%}
             p.pagination {margin-top:8px;}
             /***** Tabular forms ******/
             .tabular p{
               margin: 0;
               padding: 3px 0 3px 0;
               padding-left: 180px; /* width of left column containing the label elements */
               min-height: 1.8em;
               clear:left;
             }
             html>body .tabular p {overflow:hidden;}
             .tabular label{
               font-weight: bold;
               float: left;
               text-align: right;
               /* width of left column */
               margin-left: -180px;
               /* width of labels. Should be smaller than left column to create some right margin */
               width: 175px;
             }
             .tabular label.floating{
               font-weight: normal;
               margin-left: 0px;
               text-align: left;
               width: 270px;
             }
             .tabular label.block{
               font-weight: normal;
               margin-left: 0px !important;
               text-align: left;
               float: none;
               display: block;
               width: auto;
             }
             .tabular label.inline{
               float:none;
               margin-left: 5px !important;
               width: auto;
             }
             label.no-css {
               font-weight: inherit;
               float:none;
               text-align:left;
               margin-left:0px;
               width:auto;
             }
             input#time_entry_comments { width: 90%;}
             #preview fieldset {margin-top: 1em; background: url(../images/draft.png)}
             .tabular.settings p{ padding-left: 300px; }
             .tabular.settings label{ margin-left: -300px; width: 295px; }
             .tabular.settings textarea { width: 99%; }
             .settings.enabled_scm table {width:100%}
             .settings.enabled_scm td.scm_name{ font-weight: bold; }
             fieldset.settings label { display: block; }
             fieldset#notified_events .parent { padding-left: 20px; }
             span.required {color: #bb0000;}
             .summary {font-style: italic;}
             #attachments_fields input.description {margin-left: 8px; width:340px;}
             #attachments_fields span {display:block; white-space:nowrap;}
             #attachments_fields img {vertical-align: middle;}
             div.attachments { margin-top: 12px; }
             div.attachments p { margin:4px 0 2px 0; }
             div.attachments img { vertical-align: middle; }
             div.attachments span.author { font-size: 0.9em; color: #888; }
             div.thumbnails {margin-top:0.6em;}
             div.thumbnails div {background:#fff;border:2px solid #ddd;display:inline-block;margin-right:2px;}
             div.thumbnails img {margin: 3px;}
             p.other-formats { text-align: right; font-size:0.9em; color: #666; }
             .other-formats span + span:before { content: "| "; }
             a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
             em.info {font-style:normal;font-size:90%;color:#888;display:block;}
             em.info.error {padding-left:20px; background:url(../images/exclamation.png) no-repeat 0 50%;}
             textarea.text_cf {width:90%;}
             /* Project members tab */
             div#tab-content-members .splitcontentleft, div#tab-content-memberships .splitcontentleft, div#tab-content-users .splitcontentleft { width: 64% }
             div#tab-content-members .splitcontentright, div#tab-content-memberships .splitcontentright, div#tab-content-users .splitcontentright { width: 34% }
             div#tab-content-members fieldset, div#tab-content-memberships fieldset, div#tab-content-users fieldset { padding:1em; margin-bottom: 1em; }
             div#tab-content-members fieldset legend, div#tab-content-memberships fieldset legend, div#tab-content-users fieldset legend { font-weight: bold; }
             div#tab-content-members fieldset label, div#tab-content-memberships fieldset label, div#tab-content-users fieldset label { display: block; }
             div#tab-content-members fieldset div, div#tab-content-users fieldset div { max-height: 400px; overflow:auto; }
             #users_for_watcher {height: 200px; overflow:auto;}
             #users_for_watcher label {display: block;}
             table.members td.group { padding-left: 20px; background: url(../images/group.png) no-repeat 0% 50%; }
             input#principal_search, input#user_search {width:100%}
             input#principal_search, input#user_search {
               background: url(../images/magnifier.png) no-repeat 2px 50%; padding-left:20px;
               border:1px solid #9EB1C2; border-radius:3px; height:1.5em; width:95%;
             }
             input#principal_search.ajax-loading, input#user_search.ajax-loading {
               background-image: url(../images/loading.gif);
             }
             * html div#tab-content-members fieldset div { height: 450px; }
             /***** Flash & error messages ****/
             #errorExplanation, div.flash, .nodata, .warning, .conflict {
               padding: 4px 4px 4px 30px;
               margin-bottom: 12px;
               font-size: 1.1em;
               border: 2px solid;
             }
             div.flash {margin-top: 8px;}
             div.flash.error, #errorExplanation {
               background: url(../images/exclamation.png) 8px 50% no-repeat;
               background-color: #ffe3e3;
               border-color: #dd0000;
               color: #880000;
             }
             div.flash.notice {
               background: url(../images/true.png) 8px 5px no-repeat;
               background-color: #dfffdf;
               border-color: #9fcf9f;
               color: #005f00;
             }
             div.flash.warning, .conflict {
               background: url(../images/warning.png) 8px 5px no-repeat;
               background-color: #FFEBC1;
               border-color: #FDBF3B;
               color: #A6750C;
               text-align: left;
             }
             .nodata, .warning {
               text-align: center;
               background-color: #FFEBC1;
               border-color: #FDBF3B;
               color: #A6750C;
             }
             #errorExplanation ul { font-size: 0.9em;}
             #errorExplanation h2, #errorExplanation p { display: none; }
             .conflict-details {font-size:80%;}
             /***** Ajax indicator ******/
             #ajax-indicator {
             position: absolute; /* fixed not supported by IE */
             background-color:#eee;
             border: 1px solid #bbb;
             top:35%;
             left:40%;
             width:20%;
             font-weight:bold;
             text-align:center;
             padding:0.6em;
             z-index:100;
             opacity: 0.5;
             }
             html>body #ajax-indicator { position: fixed; }
             #ajax-indicator span {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             background-image: url(../images/loading.gif);
             padding-left: 26px;
             vertical-align: bottom;
             }
             /***** Calendar *****/
             table.cal {border-collapse: collapse; width: 100%; margin: 0px 0 6px 0;border: 1px solid #d7d7d7;}
             table.cal thead th {width: 14%; background-color:#EEEEEE; padding: 4px; }
             table.cal thead th.week-number {width: auto;}
             table.cal tbody tr {height: 100px;}
             table.cal td {border: 1px solid #d7d7d7; vertical-align: top; font-size: 0.9em;}
             table.cal td.week-number { background-color:#EEEEEE; padding: 4px; border:none; font-size: 1em;}
             table.cal td p.day-num {font-size: 1.1em; text-align:right;}
             table.cal td.odd p.day-num {color: #bbb;}
             table.cal td.today {background:#ffffdd;}
             table.cal td.today p.day-num {font-weight: bold;}
             table.cal .starting a, p.cal.legend .starting {background: url(../images/bullet_go.png) no-repeat -1px -2px; padding-left:16px;}
             table.cal .ending a, p.cal.legend .ending {background: url(../images/bullet_end.png) no-repeat -1px -2px; padding-left:16px;}
             table.cal .starting.ending a, p.cal.legend .starting.ending {background: url(../images/bullet_diamond.png) no-repeat -1px -2px; padding-left:16px;}
             p.cal.legend span {display:block;}
             /***** Tooltips ******/
             .tooltip{position:relative;z-index:24;}
             .tooltip:hover{z-index:25;color:#000;}
             .tooltip span.tip{display: none; text-align:left;}
             div.tooltip:hover span.tip{
             display:block;
             position:absolute;
             top:12px; left:24px; width:270px;
             border:1px solid #555;
             background-color:#fff;
             padding: 4px;
             font-size: 0.8em;
             color:#505050;
             }
             img.ui-datepicker-trigger {
               cursor: pointer;
               vertical-align: middle;
               margin-left: 4px;
             }
             /***** Progress bar *****/
             table.progress {
               border-collapse: collapse;
               border-spacing: 0pt;
               empty-cells: show;
               text-align: center;
               float:left;
               margin: 1px 6px 1px 0px;
             }
             table.progress td { height: 1em; }
             table.progress td.closed { background: #BAE0BA none repeat scroll 0%; }
             table.progress td.done { background: #D3EDD3 none repeat scroll 0%; }
             table.progress td.todo { background: #eee none repeat scroll 0%; }
             p.pourcent {font-size: 80%;}
             p.progress-info {clear: left; font-size: 80%; margin-top:-4px; color:#777;}
             #roadmap table.progress td { height: 1.2em; }
             /***** Tabs *****/
             #content .tabs {height: 2.6em; margin-bottom:1.2em; position:relative; overflow:hidden;}
             #content .tabs ul {margin:0; position:absolute; bottom:0; padding-left:0.5em; width: 2000px; border-bottom: 1px solid #bbbbbb;}
             #content .tabs ul li {
               float:left;
               list-style-type:none;
               white-space:nowrap;
               margin-right:4px;
               background:#fff;
               position:relative;
               margin-bottom:-1px;
             }
             #content .tabs ul li a{
               display:block;
               font-size: 0.9em;
               text-decoration:none;
               line-height:1.3em;
               padding:4px 6px 4px 6px;
               border: 1px solid #ccc;
               border-bottom: 1px solid #bbbbbb;
               background-color: #f6f6f6;
               color:#999;
               font-weight:bold;
               border-top-left-radius:3px;
               border-top-right-radius:3px;
             }
             #content .tabs ul li a:hover {
               background-color: #ffffdd;
               text-decoration:none;
             }
             #content .tabs ul li a.selected {
               background-color: #fff;
               border: 1px solid #bbbbbb;
               border-bottom: 1px solid #fff;
               color:#444;
             }
             #content .tabs ul li a.selected:hover {background-color: #fff;}
             div.tabs-buttons { position:absolute; right: 0; width: 48px; height: 24px; background: white; bottom: 0; border-bottom: 1px solid #bbbbbb; }
             button.tab-left, button.tab-right {
               font-size: 0.9em;
               cursor: pointer;
               height:24px;
               border: 1px solid #ccc;
               border-bottom: 1px solid #bbbbbb;
               position:absolute;
               padding:4px;
               width: 20px;
               bottom: -1px;
             }
             button.tab-left {
               right: 20px;
               background: #eeeeee url(../images/bullet_arrow_left.png) no-repeat 50% 50%;
               border-top-left-radius:3px;
             }
             button.tab-right {
               right: 0;
               background: #eeeeee url(../images/bullet_arrow_right.png) no-repeat 50% 50%;
               border-top-right-radius:3px;
             }
             /***** Diff *****/
             .diff_out { background: #fcc; }
             .diff_out span { background: #faa; }
             .diff_in { background: #cfc; }
             .diff_in span { background: #afa; }
             .text-diff {
               padding: 1em;
               background-color:#f6f6f6;
               color:#505050;
               border: 1px solid #e4e4e4;
             }
             /***** Wiki *****/
             div.wiki table {
               border-collapse: collapse;
               margin-bottom: 1em;
             }
             div.wiki table, div.wiki td, div.wiki th {
               border: 1px solid #bbb;
               padding: 4px;
             }
             div.wiki .noborder, div.wiki .noborder td, div.wiki .noborder th {border:0;}
             div.wiki .external {
               background-position: 0% 60%;
               background-repeat: no-repeat;
               padding-left: 12px;
               background-image: url(../images/external.png);
             }
             div.wiki a.new {color: #b73535;}
             div.wiki ul, div.wiki ol {margin-bottom:1em;}
             div.wiki pre {
               margin: 1em 1em 1em 1.6em;
               padding: 8px;
               background-color: #fafafa;
               border: 1px solid #e2e2e2;
               width:auto;
               overflow-x: auto;
               overflow-y: hidden;
             }
             div.wiki ul.toc {
               background-color: #ffffdd;
               border: 1px solid #e4e4e4;
               padding: 4px;
               line-height: 1.2em;
               margin-bottom: 12px;
               margin-right: 12px;
               margin-left: 0;
               display: table
             }
             * html div.wiki ul.toc { width: 50%; } /* IE6 doesn't autosize div */
             div.wiki ul.toc.right { float: right; margin-left: 12px; margin-right: 0; width: auto; }
             div.wiki ul.toc.left  { float: left; margin-right: 12px; margin-left: 0; width: auto; }
             div.wiki ul.toc ul { margin: 0; padding: 0; }
             div.wiki ul.toc li { list-style-type:none; margin: 0;}
             div.wiki ul.toc li li { margin-left: 1.5em; }
             div.wiki ul.toc li li li { font-size: 0.8em; }
             div.wiki ul.toc a {
               font-size: 0.9em;
               font-weight: normal;
               text-decoration: none;
               color: #606060;
             }
             div.wiki ul.toc a:hover { color: #c61a1a; text-decoration: underline;}
             a.wiki-anchor { display: none; margin-left: 6px; text-decoration: none; }
             a.wiki-anchor:hover { color: #aaa !important; text-decoration: none; }
             h1:hover a.wiki-anchor, h2:hover a.wiki-anchor, h3:hover a.wiki-anchor { display: inline; color: #ddd; }
             div.wiki img { vertical-align: middle; }
             /***** My page layout *****/
             .block-receiver {
               border:1px dashed #c0c0c0;
               margin-bottom: 20px;
               padding: 15px 0 15px 0;
             }
             .mypage-box {
               margin:0 0 20px 0;
               color:#505050;
               line-height:1.5em;
             }
             .handle {cursor: move;}
             a.close-icon {
               display:block;
               margin-top:3px;
               overflow:hidden;
               width:12px;
               height:12px;
               background-repeat: no-repeat;
               cursor:pointer;
               background-image:url('../images/close.png');
             }
             a.close-icon:hover {background-image:url('../images/close_hl.png');}
             /***** Gantt chart *****/
             .gantt_hdr {
               position:absolute;
               top:0;
               height:16px;
               border-top: 1px solid #c0c0c0;
               border-bottom: 1px solid #c0c0c0;
               border-right: 1px solid #c0c0c0;
               text-align: center;
               overflow: hidden;
             }
             .gantt_subjects { font-size: 0.8em; }
             .gantt_subjects div { line-height:16px;height:16px;overflow:hidden;white-space:nowrap;text-overflow: ellipsis; }
             .task {
               position: absolute;
               height:8px;
               font-size:0.8em;
               color:#888;
               padding:0;
               margin:0;
               line-height:16px;
               white-space:nowrap;
             }
             .task.label {width:100%;}
             .task.label.project, .task.label.version { font-weight: bold; }
             .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
             .task_done { background:#00c600 url(../images/task_done.png); border: 1px solid #00c600; }
             .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
             .task_todo.parent { background: #888; border: 1px solid #888; height: 3px;}
             .task_late.parent, .task_done.parent { height: 3px;}
             .task.parent.marker.starting  { position: absolute; background: url(../images/task_parent_end.png) no-repeat 0 0; width: 8px; height: 16px; margin-left: -4px; left: 0px; top: -1px;}
             .task.parent.marker.ending { position: absolute; background: url(../images/task_parent_end.png) no-repeat 0 0; width: 8px; height: 16px; margin-left: -4px; right: 0px; top: -1px;}
             .version.task_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
             .version.task_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}
             .version.task_todo { background:#fff url(../images/milestone_todo.png); border: 1px solid #fff; height: 2px; margin-top: 3px;}
             .version.marker { background-image:url(../images/version_marker.png); background-repeat: no-repeat; border: 0; margin-left: -4px; margin-top: 1px; }
             .project.task_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
             .project.task_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}
             .project.task_todo { background:#fff url(../images/milestone_todo.png); border: 1px solid #fff; height: 2px; margin-top: 3px;}
             .project.marker { background-image:url(../images/project_marker.png); background-repeat: no-repeat; border: 0; margin-left: -4px; margin-top: 1px; }
             .version-behind-schedule a, .issue-behind-schedule a {color: #f66914;}
             .version-overdue a, .issue-overdue a, .project-overdue a {color: #f00;}
             /***** Icons *****/
             .icon {
               background-position: 0% 50%;
               background-repeat: no-repeat;
               padding-left: 20px;
               padding-top: 2px;
               padding-bottom: 3px;
             }
             .icon-add { background-image: url(../images/add.png); }
             .icon-edit { background-image: url(../images/edit.png); }
             .icon-copy { background-image: url(../images/copy.png); }
             .icon-duplicate { background-image: url(../images/duplicate.png); }
             .icon-del { background-image: url(../images/delete.png); }
             .icon-move { background-image: url(../images/move.png); }
             .icon-save { background-image: url(../images/save.png); }
             .icon-cancel { background-image: url(../images/cancel.png); }
             .icon-multiple { background-image: url(../images/table_multiple.png); }
             .icon-folder { background-image: url(../images/folder.png); }
             .open .icon-folder { background-image: url(../images/folder_open.png); }
             .icon-package { background-image: url(../images/package.png); }
             .icon-user { background-image: url(../images/user.png); }
             .icon-projects { background-image: url(../images/projects.png); }
             .icon-help { background-image: url(../images/help.png); }
             .icon-attachment  { background-image: url(../images/attachment.png); }
             .icon-history  { background-image: url(../images/history.png); }
             .icon-time  { background-image: url(../images/time.png); }
             .icon-time-add  { background-image: url(../images/time_add.png); }
             .icon-stats  { background-image: url(../images/stats.png); }
             .icon-warning  { background-image: url(../images/warning.png); }
             .icon-fav  { background-image: url(../images/fav.png); }
             .icon-fav-off  { background-image: url(../images/fav_off.png); }
             .icon-reload  { background-image: url(../images/reload.png); }
             .icon-lock  { background-image: url(../images/locked.png); }
             .icon-unlock  { background-image: url(../images/unlock.png); }
             .icon-checked  { background-image: url(../images/true.png); }
             .icon-details  { background-image: url(../images/zoom_in.png); }
             .icon-report  { background-image: url(../images/report.png); }
             .icon-comment  { background-image: url(../images/comment.png); }
             .icon-summary  { background-image: url(../images/lightning.png); }
             .icon-server-authentication { background-image: url(../images/server_key.png); }
             .icon-issue { background-image: url(../images/ticket.png); }
             .icon-zoom-in { background-image: url(../images/zoom_in.png); }
             .icon-zoom-out { background-image: url(../images/zoom_out.png); }
             .icon-passwd { background-image: url(../images/textfield_key.png); }
             .icon-test { background-image: url(../images/bullet_go.png); }
             .icon-file { background-image: url(../images/files/default.png); }
             .icon-file.text-plain { background-image: url(../images/files/text.png); }
             .icon-file.text-x-c { background-image: url(../images/files/c.png); }
             .icon-file.text-x-csharp { background-image: url(../images/files/csharp.png); }
             .icon-file.text-x-java { background-image: url(../images/files/java.png); }
             .icon-file.text-x-javascript { background-image: url(../images/files/js.png); }
             .icon-file.text-x-php { background-image: url(../images/files/php.png); }
             .icon-file.text-x-ruby { background-image: url(../images/files/ruby.png); }
             .icon-file.text-xml { background-image: url(../images/files/xml.png); }
             .icon-file.text-css { background-image: url(../images/files/css.png); }
             .icon-file.text-html { background-image: url(../images/files/html.png); }
             .icon-file.image-gif { background-image: url(../images/files/image.png); }
             .icon-file.image-jpeg { background-image: url(../images/files/image.png); }
             .icon-file.image-png { background-image: url(../images/files/image.png); }
             .icon-file.image-tiff { background-image: url(../images/files/image.png); }
             .icon-file.application-pdf { background-image: url(../images/files/pdf.png); }
             .icon-file.application-zip { background-image: url(../images/files/zip.png); }
             .icon-file.application-x-gzip { background-image: url(../images/files/zip.png); }
             img.gravatar {
               padding: 2px;
               border: solid 1px #d5d5d5;
               background: #fff;
               vertical-align: middle;
             }
             div.issue img.gravatar {
               float: left;
               margin: 0 6px 0 0;
               padding: 5px;
             }
             div.issue table img.gravatar {
               height: 14px;
               width: 14px;
               padding: 2px;
               float: left;
               margin: 0 0.5em 0 0;
             }
             h2 img.gravatar {margin: -2px 4px -4px 0;}
             h3 img.gravatar {margin: -4px 4px -4px 0;}
             h4 img.gravatar {margin: -6px 4px -4px 0;}
             td.username img.gravatar {margin: 0 0.5em 0 0; vertical-align: top;}
             #activity dt img.gravatar {float: left; margin: 0 1em 1em 0;}
             /* Used on 12px Gravatar img tags without the icon background */
             .icon-gravatar {float: left; margin-right: 4px;}
             #activity dt, .journal {clear: left;}
             .journal-link {float: right;}
             h2 img { vertical-align:middle; }
             .hascontextmenu { cursor: context-menu; }
             /************* CodeRay styles *************/
             .syntaxhl div {display: inline;}
             .syntaxhl .line-numbers {padding: 2px 4px 2px 4px; background-color: #eee; margin:0px 5px 0px 0px;}
             .syntaxhl .code pre { overflow: auto }
             .syntaxhl .debug { color: white !important; background: blue !important; }
             .syntaxhl .annotation { color:#007 }
             .syntaxhl .attribute-name { color:#b48 }
             .syntaxhl .attribute-value { color:#700 }
             .syntaxhl .binary { color:#509 }
             .syntaxhl .char .content { color:#D20 }
             .syntaxhl .char .delimiter { color:#710 }
             .syntaxhl .char { color:#D20 }
             .syntaxhl .class { color:#258; font-weight:bold }
             .syntaxhl .class-variable { color:#369 }
             .syntaxhl .color { color:#0A0 }
             .syntaxhl .comment { color:#385 }
             .syntaxhl .comment .char { color:#385 }
             .syntaxhl .comment .delimiter { color:#385 }
             .syntaxhl .complex { color:#A08 }
             .syntaxhl .constant { color:#258; font-weight:bold }
             .syntaxhl .decorator { color:#B0B }
             .syntaxhl .definition { color:#099; font-weight:bold }
             .syntaxhl .delimiter { color:black }
             .syntaxhl .directive { color:#088; font-weight:bold }
             .syntaxhl .doc { color:#970 }
             .syntaxhl .doc-string { color:#D42; font-weight:bold }
             .syntaxhl .doctype { color:#34b }
             .syntaxhl .entity { color:#800; font-weight:bold }
             .syntaxhl .error { color:#F00; background-color:#FAA }
             .syntaxhl .escape  { color:#666 }
             .syntaxhl .exception { color:#C00; font-weight:bold }
             .syntaxhl .float { color:#06D }
             .syntaxhl .function { color:#06B; font-weight:bold }
             .syntaxhl .global-variable { color:#d70 }
             .syntaxhl .hex { color:#02b }
             .syntaxhl .imaginary { color:#f00 }
             .syntaxhl .include { color:#B44; font-weight:bold }
             .syntaxhl .inline { background-color: hsla(0,0%,0%,0.07); color: black }
             .syntaxhl .inline-delimiter { font-weight: bold; color: #666 }
             .syntaxhl .instance-variable { color:#33B }
             .syntaxhl .integer  { color:#06D }
             .syntaxhl .key .char { color: #60f }
             .syntaxhl .key .delimiter { color: #404 }
             .syntaxhl .key { color: #606 }
             .syntaxhl .keyword { color:#939; font-weight:bold }
             .syntaxhl .label { color:#970; font-weight:bold }
             .syntaxhl .local-variable { color:#963 }
             .syntaxhl .namespace { color:#707; font-weight:bold }
             .syntaxhl .octal { color:#40E }
             .syntaxhl .operator { }
             .syntaxhl .predefined { color:#369; font-weight:bold }
             .syntaxhl .predefined-constant { color:#069 }
             .syntaxhl .predefined-type { color:#0a5; font-weight:bold }
             .syntaxhl .preprocessor { color:#579 }
             .syntaxhl .pseudo-class { color:#00C; font-weight:bold }
             .syntaxhl .regexp .content { color:#808 }
             .syntaxhl .regexp .delimiter { color:#404 }
             .syntaxhl .regexp .modifier { color:#C2C }
             .syntaxhl .regexp { background-color:hsla(300,100%,50%,0.06); }
             .syntaxhl .reserved { color:#080; font-weight:bold }
             .syntaxhl .shell .content { color:#2B2 }
             .syntaxhl .shell .delimiter { color:#161 }
             .syntaxhl .shell { background-color:hsla(120,100%,50%,0.06); }
             .syntaxhl .string .char { color: #46a }
             .syntaxhl .string .content { color: #46a }
             .syntaxhl .string .delimiter { color: #46a }
             .syntaxhl .string .modifier { color: #46a }
             .syntaxhl .symbol .content { color:#d33 }
             .syntaxhl .symbol .delimiter { color:#d33 }
             .syntaxhl .symbol { color:#d33 }
             .syntaxhl .tag { color:#070 }
             .syntaxhl .type { color:#339; font-weight:bold }
             .syntaxhl .value { color: #088; }
             .syntaxhl .variable  { color:#037 }
             .syntaxhl .insert { background: hsla(120,100%,50%,0.12) }
             .syntaxhl .delete { background: hsla(0,100%,50%,0.12) }
             .syntaxhl .change { color: #bbf; background: #007; }
             .syntaxhl .head { color: #f8f; background: #505 }
             .syntaxhl .head .filename { color: white; }
             .syntaxhl .delete .eyecatcher { background-color: hsla(0,100%,50%,0.2); border: 1px solid hsla(0,100%,45%,0.5); margin: -1px; border-bottom: none; border-top-left-radius: 5px; border-top-right-radius: 5px; }
             .syntaxhl .insert .eyecatcher { background-color: hsla(120,100%,50%,0.2); border: 1px solid hsla(120,100%,25%,0.5); margin: -1px; border-top: none; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; }
             .syntaxhl .insert .insert { color: #0c0; background:transparent; font-weight:bold }
             .syntaxhl .delete .delete { color: #c00; background:transparent; font-weight:bold }
             .syntaxhl .change .change { color: #88f }
             .syntaxhl .head .head { color: #f4f }
             /***** Media print specific styles *****/
             @media print {
               #top-menu, #header, #main-menu, #sidebar, #footer, .contextual, .other-formats { display:none; }
               #main { background: #fff; }
               #content { width: 99%; margin: 0; padding: 0; border: 0; background: #fff; overflow: visible !important;}
               #wiki_add_attachment { display:none; }
               .hide-when-print { display: none; }
               .autoscroll {overflow-x: visible;}
               table.list {margin-top:0.5em;}
               table.list th, table.list td {border: 1px solid #aaa;}
             }
             /* Accessibility specific styles */
             .hidden-for-sighted {
               position:absolute;
               left:-10000px;
               top:auto;
               width:1px;
               height:1px;
               overflow:hidden;
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages