diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-09-20 07:24:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-09-20 07:24:16 +0000 |
| commit | 3477ded32af3d26a9e4ae7910ac0848c0049e175 (patch) | |
| tree | ddea3292773e0eac67e566ca8588b11ad9b0b7f7 /app/views/timelog | |
| parent | cc3c8a717c488c2567c10e92555ce92377f65443 (diff) | |
| download | redmine-3477ded32af3d26a9e4ae7910ac0848c0049e175.tar.gz redmine-3477ded32af3d26a9e4ae7910ac0848c0049e175.zip | |
Makes tickets and timelogs filters collapsible (UI).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2891 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/timelog')
| -rw-r--r-- | app/views/timelog/_date_range.rhtml | 13 | ||||
| -rw-r--r-- | app/views/timelog/details.rhtml | 2 | ||||
| -rw-r--r-- | app/views/timelog/report.rhtml | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/app/views/timelog/_date_range.rhtml b/app/views/timelog/_date_range.rhtml index 9b4557e1f..0375d3457 100644 --- a/app/views/timelog/_date_range.rhtml +++ b/app/views/timelog/_date_range.rhtml @@ -1,4 +1,6 @@ -<fieldset id="filters"><legend><%= l(:label_date_range) %></legend> +<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 %> <%= select_tag 'period', options_for_period_select(params[:period]), @@ -11,9 +13,16 @@ <%= 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'))) %> </span> -<%= submit_tag l(:button_apply), :name => nil %> </p> +</div> </fieldset> +<p class="buttons"> + <%= link_to_remote l(:button_apply), + { :url => { }, + :update => "content", + :with => "Form.serialize('query_form')" + }, :class => 'icon icon-checked' %> +</p> <div class="tabs"> <% url_params = @free_period ? { :from => @from, :to => @to } : { :period => params[:period] } %> diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml index 20cf8cea4..eecfec2eb 100644 --- a/app/views/timelog/details.rhtml +++ b/app/views/timelog/details.rhtml @@ -6,7 +6,7 @@ <h2><%= l(:label_spent_time) %></h2>
-<% form_remote_tag( :url => {}, :html => {:method => :get}, :method => :get, :update => 'content' ) do %>
+<% form_remote_tag( :url => {}, :html => {:method => :get, :id => 'query_form'}, :method => :get, :update => 'content' ) do %>
<%# TOOD: remove the project_id and issue_id hidden fields, that information is
already in the URI %>
<%= hidden_field_tag('project_id', params[:project_id]) if @project %>
diff --git a/app/views/timelog/report.rhtml b/app/views/timelog/report.rhtml index 52bd11f48..2107fcf72 100644 --- a/app/views/timelog/report.rhtml +++ b/app/views/timelog/report.rhtml @@ -6,7 +6,7 @@ <h2><%= l(:label_spent_time) %></h2> -<% form_remote_tag(:url => {}, :html => {:method => :get}, :method => :get, :update => 'content') do %> +<% form_remote_tag(:url => {}, :html => {:method => :get, :id => 'query_form'}, :method => :get, :update => 'content') do %> <% @criterias.each do |criteria| %> <%= hidden_field_tag 'criterias[]', criteria, :id => nil %> <% end %> |