##// END OF EJS Templates
Fixed that date range fields don't get enabled when using the calendar popup (#8574)....
Jean-Philippe Lang -
r9318:5a35c5b2e2aa
parent child
Show More
@@ -1,38 +1,38
1 <fieldset id="date-range" class="collapsible">
1 <fieldset id="date-range" class="collapsible">
2 <legend onclick="toggleFieldset(this);"><%= l(:label_date_range) %></legend>
2 <legend onclick="toggleFieldset(this);"><%= l(:label_date_range) %></legend>
3 <div>
3 <div>
4 <p>
4 <p>
5 <%= label_tag "period_type_list", l(:description_date_range_list), :class => "hidden-for-sighted" %>
5 <%= label_tag "period_type_list", l(:description_date_range_list), :class => "hidden-for-sighted" %>
6 <%= radio_button_tag 'period_type', '1', !@free_period, :onclick => 'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");', :id => "period_type_list"%>
6 <%= radio_button_tag 'period_type', '1', !@free_period, :onclick => 'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");', :id => "period_type_list"%>
7 <%= select_tag 'period', options_for_period_select(params[:period]),
7 <%= select_tag 'period', options_for_period_select(params[:period]),
8 :onchange => 'this.form.submit();',
8 :onchange => 'this.form.submit();',
9 :onfocus => '$("period_type_1").checked = true;',
9 :onfocus => '$("period_type_1").checked = true;',
10 :disabled => @free_period %>
10 :disabled => @free_period %>
11 </p>
11 </p>
12 <p>
12 <p>
13 <%= label_tag "period_type_interval", l(:description_date_range_interval), :class => "hidden-for-sighted" %>
13 <%= label_tag "period_type_interval", l(:description_date_range_interval), :class => "hidden-for-sighted" %>
14 <%= radio_button_tag 'period_type', '2', @free_period, :onclick => 'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");', :id => "period_type_interval" %>
14 <%= radio_button_tag 'period_type', '2', @free_period, :onclick => 'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");', :id => "period_type_interval" %>
15 <span onclick="$('period_type_2').checked = true;">
15 <span onclick="$('period_type_interval').checked = true;Form.Element.enable('from');Form.Element.enable('to');Form.Element.disable('period');">
16 <%= l(:label_date_from_to,
16 <%= l(:label_date_from_to,
17 :start => ((label_tag "from", l(:description_date_from), :class => "hidden-for-sighted") +
17 :start => ((label_tag "from", l(:description_date_from), :class => "hidden-for-sighted") +
18 text_field_tag('from', @from, :size => 10, :disabled => !@free_period) + calendar_for('from')),
18 text_field_tag('from', @from, :size => 10, :disabled => !@free_period) + calendar_for('from')),
19 :end => ((label_tag "to", l(:description_date_to), :class => "hidden-for-sighted") +
19 :end => ((label_tag "to", l(:description_date_to), :class => "hidden-for-sighted") +
20 text_field_tag('to', @to, :size => 10, :disabled => !@free_period) + calendar_for('to'))).html_safe %>
20 text_field_tag('to', @to, :size => 10, :disabled => !@free_period) + calendar_for('to'))).html_safe %>
21 </span>
21 </span>
22 </p>
22 </p>
23 </div>
23 </div>
24 </fieldset>
24 </fieldset>
25 <p class="buttons">
25 <p class="buttons">
26 <%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-checked' %>
26 <%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-checked' %>
27 <%= link_to l(:button_clear), {:controller => controller_name, :action => action_name, :project_id => @project, :issue_id => @issue}, :class => 'icon icon-reload' %>
27 <%= link_to l(:button_clear), {:controller => controller_name, :action => action_name, :project_id => @project, :issue_id => @issue}, :class => 'icon icon-reload' %>
28 </p>
28 </p>
29
29
30 <div class="tabs">
30 <div class="tabs">
31 <% url_params = @free_period ? { :from => @from, :to => @to } : { :period => params[:period] } %>
31 <% url_params = @free_period ? { :from => @from, :to => @to } : { :period => params[:period] } %>
32 <ul>
32 <ul>
33 <li><%= link_to(l(:label_details), url_params.merge({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue }),
33 <li><%= link_to(l(:label_details), url_params.merge({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue }),
34 :class => (@controller.action_name == 'index' ? 'selected' : nil)) %></li>
34 :class => (@controller.action_name == 'index' ? 'selected' : nil)) %></li>
35 <li><%= link_to(l(:label_report), url_params.merge({:controller => 'timelog', :action => 'report', :project_id => @project, :issue_id => @issue}),
35 <li><%= link_to(l(:label_report), url_params.merge({:controller => 'timelog', :action => 'report', :project_id => @project, :issue_id => @issue}),
36 :class => (@controller.action_name == 'report' ? 'selected' : nil)) %></li>
36 :class => (@controller.action_name == 'report' ? 'selected' : nil)) %></li>
37 </ul>
37 </ul>
38 </div>
38 </div>
General Comments 0
You need to be logged in to leave comments. Login now