comparison app/views/timelog/.svn/text-base/_date_range.rhtml.svn-base @ 441:cbce1fd3b1b7 redmine-1.2

Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)

 <fieldset id="date-range" class="collapsible">
 <legend onclick="toggleFieldset(this);"><%= l(:label_date_range) %></legend>
 <div>
 <p>
-<%= radio_button_tag 'period_type', '1', !@free_period %>
+<%= radio_button_tag 'period_type', '1', !@free_period, :onclick => 'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");' %>
 <%= select_tag 'period', options_for_period_select(params[:period]),
-                         :onchange => 'this.form.onsubmit();',
-                         :onfocus => '$("period_type_1").checked = true;' %>
+                         :onchange => 'this.form.submit();',
+                         :onfocus => '$("period_type_1").checked = true;',
+                         :disabled => @free_period %>
 </p>
 <p>
-<%= radio_button_tag 'period_type', '2', @free_period %>
+<%= radio_button_tag 'period_type', '2', @free_period, :onclick => 'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");' %>
 <span onclick="$('period_type_2').checked = true;">
-<%= l(:label_date_from_to, :start => (text_field_tag('from', @from, :size => 10) + calendar_for('from')),
-													 :end => (text_field_tag('to', @to, :size => 10) + calendar_for('to'))) %>
+<%= l(:label_date_from_to, :start => (text_field_tag('from', @from, :size => 10, :disabled => !@free_period) + calendar_for('from')),
+													 :end => (text_field_tag('to', @to, :size => 10, :disabled => !@free_period) + calendar_for('to'))) %>
 </span>
 </p>
 </div>
 </fieldset>
 <p class="buttons">
-	<%= link_to_remote l(:button_apply), 
-	                   { :url => { },
-	                     :update => "content",
-                            :with => "Form.serialize('query_form')",
-                            :method => :get
-	                   }, :class => 'icon icon-checked' %>
+	<%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-checked' %>
+  <%= link_to l(:button_clear), {:controller => controller_name, :action => action_name, :project_id => @project, :issue_id => @issue}, :class => 'icon icon-reload' %>
 </p>
 
 <div class="tabs">
 <% url_params = @free_period ? { :from => @from, :to => @to } : { :period => params[:period] } %>
 <ul>