diff app/views/calendars/.svn/text-base/show.html.erb.svn-base @ 245:051f544170fe

* Update to SVN trunk revision 4993

--- a/app/views/calendars/.svn/text-base/show.html.erb.svn-base	Thu Mar 03 11:40:10 2011 +0000
+++ b/app/views/calendars/.svn/text-base/show.html.erb.svn-base	Thu Mar 03 11:42:28 2011 +0000
@@ -1,10 +1,10 @@
-<h2><%= l(:label_calendar) %></h2>
+<h2><%= @query.new_record? ? l(:label_calendar) : h(@query.name) %></h2>
 
 <% form_tag(calendar_path, :method => :put, :id => 'query_form') do %>
   <%= hidden_field_tag('project_id', @project.to_param) if @project%>
-<fieldset id="filters" class="collapsible">
+<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
   <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
-  <div>
+  <div style="<%= @query.new_record? ? "" : "display: none;" %>">
     <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
   </div>
 </fieldset>
@@ -20,16 +20,16 @@
 <%= select_year(@year, :prefix => "year", :discard_type => true) %>
 
 <%= link_to_remote l(:button_apply), 
-                   { :url => { :set_filter => (@query.new_record? ? 1 : nil) },
+                   { :url => { :set_filter => 1 },
                      :update => "content",
                      :with => "Form.serialize('query_form')"
                    }, :class => 'icon icon-checked' %>
                    
 <%= link_to_remote l(:button_clear),
-                   { :url => { :project_id => @project, :set_filter => (@query.new_record? ? 1 : nil) }, 
+                   { :url => { :project_id => @project, :set_filter => 1 }, 
                      :method => :put,
                      :update => "content",
-                   }, :class => 'icon icon-reload' if @query.new_record? %>
+                   }, :class => 'icon icon-reload' %>
 </p>
 <% end %>