Merge commit '563d054' into feature/rails3

Conflicts:
	app/assets/stylesheets/default/application.css.erb

app/assets/stylesheets/default/application.css.erb

@@ -335,8 +335,7 @@ fieldset.collapsible.collapsed.header_collapsible legend {
 fieldset.collapsible { border-width: 1px 0 0 0; }
 fieldset.collapsible.borders { border-width: 1px; }
 fieldset.collapsible.collapsed.borders { border-width: 1px 0 0 0; }
-fieldset.collapsible legend { padding-left: 16px; background: url(<%= asset_path 'arrow_expanded.png' %>) no-repeat 0% 40%; cursor:pointer; }
+fieldset.collapsible legend { padding-left: 16px; cursor:pointer; }
-fieldset.collapsible.collapsed legend { background-image: url(<%= asset_path 'arrow_collapsed.png' %>); }
 
 fieldset#date-range p { margin: 2px 0 2px 0; }
 fieldset#filters table { border-collapse: collapse; }

app/views/issues/calendars/index.html.erb

@@ -2,9 +2,9 @@
 
 <%= form_tag(issues_calendar_index_path, :method => :get, :id => 'query_form') do %>
   <%= hidden_field_tag('project_id', @project.to_param) if @project%>
-<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
+<fieldset id="filters" class="header_collapsible collapsible <%= @query.new_record? ? "" : "collapsed" %>">
   <legend onclick="toggleFieldset(this);"><a href="javascript:"><%= l(:label_filter_plural) %></a></legend>
-  <div style="<%= @query.new_record? ? "" : "display: none;" %>">
+  <div class="title-bar-extras"<%= " style=\"display: none;\"" if !@query.new_record? %>>
     <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
   </div>
 </fieldset>