annotate .svn/pristine/83/8336e9f46dcb5eb005a350a17c0dd1aa44840422.svn-base @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author Chris Cannam
date Fri, 14 Jun 2013 09:28:30 +0100
parents 622f24f53b42
children
rev   line source
Chris@1295 1 <fieldset id="date-range" class="collapsible">
Chris@1295 2 <legend onclick="toggleFieldset(this);"><%= l(:label_date_range) %></legend>
Chris@1295 3 <div>
Chris@1295 4 <p>
Chris@1295 5 <%= label_tag "period_type_list", l(:description_date_range_list), :class => "hidden-for-sighted" %>
Chris@1295 6 <%= radio_button_tag 'period_type', '1', !@free_period, :onclick => '$("#from,#to").attr("disabled", true);$("#period").removeAttr("disabled");', :id => "period_type_list"%>
Chris@1295 7 <%= select_tag 'period', options_for_period_select(params[:period]),
Chris@1295 8 :onchange => 'this.form.submit();',
Chris@1295 9 :onfocus => '$("#period_type_1").attr("checked", true);',
Chris@1295 10 :disabled => @free_period %>
Chris@1295 11 </p>
Chris@1295 12 <p>
Chris@1295 13 <%= label_tag "period_type_interval", l(:description_date_range_interval), :class => "hidden-for-sighted" %>
Chris@1295 14 <%= radio_button_tag 'period_type', '2', @free_period, :onclick => '$("#from,#to").removeAttr("disabled");$("#period").attr("disabled", true);', :id => "period_type_interval" %>
Chris@1295 15 <%= l(:label_date_from_to,
Chris@1295 16 :start => ((label_tag "from", l(:description_date_from), :class => "hidden-for-sighted") +
Chris@1295 17 text_field_tag('from', @from, :size => 10, :disabled => !@free_period) + calendar_for('from')),
Chris@1295 18 :end => ((label_tag "to", l(:description_date_to), :class => "hidden-for-sighted") +
Chris@1295 19 text_field_tag('to', @to, :size => 10, :disabled => !@free_period) + calendar_for('to'))).html_safe %>
Chris@1295 20 </p>
Chris@1295 21 </div>
Chris@1295 22 </fieldset>
Chris@1295 23 <p class="buttons">
Chris@1295 24 <%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
Chris@1295 25 <%= link_to l(:button_clear), {:controller => controller_name, :action => action_name, :project_id => @project, :issue_id => @issue}, :class => 'icon icon-reload' %>
Chris@1295 26 </p>
Chris@1295 27
Chris@1295 28 <div class="tabs">
Chris@1295 29 <% url_params = @free_period ? { :from => @from, :to => @to } : { :period => params[:period] } %>
Chris@1295 30 <ul>
Chris@1295 31 <li><%= link_to(l(:label_details), url_params.merge({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue }),
Chris@1295 32 :class => (action_name == 'index' ? 'selected' : nil)) %></li>
Chris@1295 33 <li><%= link_to(l(:label_report), url_params.merge({:controller => 'timelog', :action => 'report', :project_id => @project, :issue_id => @issue}),
Chris@1295 34 :class => (action_name == 'report' ? 'selected' : nil)) %></li>
Chris@1295 35 </ul>
Chris@1295 36 </div>
Chris@1295 37
Chris@1295 38 <%= javascript_tag do %>
Chris@1295 39 $('#from, #to').change(function(){
Chris@1295 40 $('#period_type_interval').attr('checked', true); $('#from,#to').removeAttr('disabled'); $('#period').attr('disabled', true);
Chris@1295 41 });
Chris@1295 42 <% end %>