Adds date range filter and pagination on time entries detail view (closes #434).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1173 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/timelog/_list.rhtml

@@ -0,0 +1,32 @@
+<table class="list time-entries">
+<thead>
+<%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
+<%= sort_header_tag('user_id', :caption => l(:label_member)) %>
+<%= sort_header_tag('activity_id', :caption => l(:label_activity)) %>
+<%= sort_header_tag('issue_id', :caption => l(:label_issue), :default_order => 'desc') %>
+<th><%= l(:field_comments) %></th>
+<%= sort_header_tag('hours', :caption => l(:field_hours)) %>
+<th></th>
+</thead>
+<tbody>
+<% entries.each do |entry| -%>
+<tr class="time-entry <%= cycle("odd", "even") %>">
+<td class="spent_on"><%= format_date(entry.spent_on) %></td>
+<td class="user"><%= entry.user.name %></td>
+<td class="activity"><%= entry.activity.name %></td>
+<td class="subject">
+  <% if entry.issue -%>
+  <div class="tooltip"><%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) -%>
+  <span class="tip"><%= render_issue_tooltip entry.issue %></span>
+  </div>
+  <% end -%>
+</td>
+<td class="comments"><%=h entry.comments %></td>
+<td class="hours"><%= entry.hours %></td>
+<td align="center"><%= link_to_if_authorized(l(:button_edit), 
+                                             {:controller => 'timelog', :action => 'edit', :id => entry},
+                                             :class => 'icon icon-edit') if entry.editable_by?(User.current) %></td>
+</tr>
+<% end -%>
+</tbdoy>
+</table>

app/views/timelog/details.rhtml

@@ -4,48 +4,48 @@
 
 <h2><%= l(:label_spent_time) %></h2>
 
-<h3><%= link_to(@project.name, {:action => 'details', :project_id => @project}) if @project %>
-<%= "/ " + link_to_issue(@issue) + h(": #{@issue.subject}") if @issue %></h3>
+<% if @issue %>
+<h3><%= link_to(@project.name, {:action => 'details', :project_id => @project}) %> / <%= link_to_issue(@issue) %></h3>
+<% end %>
 
-<h3 class="textright"><%= l(:label_total) %>: <%= lwr(:label_f_hour, @total_hours) %></h3>
+<% form_remote_tag( :url => {}, :method => :get, :update => 'content' ) do %>
+<%= hidden_field_tag 'project_id', params[:project_id] %>
+<%= hidden_field_tag 'issue_id', params[:issue_id] if @issue %>
+
+<fieldset><legend><%= l(:label_date_range) %></legend>
+<p>
+<%= radio_button_tag 'period_type', '1', !@free_period %>
+<%= select_tag 'period', options_for_period_select(params[:period]),
+                         :onchange => 'this.form.onsubmit();',
+                         :onfocus => '$("period_type_1").checked = true;' %>
+</p>
+<p>
+<%= radio_button_tag 'period_type', '2', @free_period %>
+<%= l(:label_date_from) %>
+<%= text_field_tag 'from', @from, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('from') %>
+<%= l(:label_date_to) %>
+<%= text_field_tag 'to', @to, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('to') %>
+<%= submit_tag l(:button_submit), :name => nil, :onclick => '$("period_type_2").checked = true;' %>
+</p>
+</fieldset>
+<% end %>
+
+<div class="total-hours">
+<p><%= l(:label_total) %>: <%= html_hours(lwr(:label_f_hour, @total_hours)) %></p>
+</div>
 
 <% unless @entries.empty? %>
-<table class="list">
-<thead>
-<%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
-<%= sort_header_tag('user_id', :caption => l(:label_member)) %>
-<%= sort_header_tag('activity_id', :caption => l(:label_activity)) %>
-<%= sort_header_tag('issue_id', :caption => l(:label_issue)) %>
-<th><%= l(:field_comments) %></th>
-<%= sort_header_tag('hours', :caption => l(:field_hours)) %>
-<th></th>
-</thead>
-<tbody>
-<% @entries.each do |entry| %>
-<tr class="<%= cycle("odd", "even") %>">
-<td align="center"><%= format_date(entry.spent_on) %></td>
-<td align="center"><%= entry.user.name %></td>
-<td align="center"><%= entry.activity.name %></td>
-<td>
-    <% if entry.issue %>
-    <div class="tooltip">
-    <%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) %>
-    <span class="tip">
-    <%= render_issue_tooltip entry.issue %>
-    </span>		
-	</div>
-	<% end %>
-</td>
-<td><%=h entry.comments %></td>
-<td align="center"><strong><%= entry.hours %></strong></td>
-<td align="center"><%= link_to_if_authorized(l(:button_edit), {:controller => 'timelog', :action => 'edit', :id => entry}, :class => "icon icon-edit") if entry.user_id == @owner_id %></td>
-</tr>
-<% end %>
-</tbdoy>
-</table>
-
+<%= render :partial => 'list', :locals => { :entries => @entries }%>
 <div class="contextual">
-<%= l(:label_export_to) %>
-<%= link_to 'CSV', params.update(:export => 'csv'), :class => 'icon icon-csv' %>
+    <%= l(:label_export_to) %>
+    <%= link_to 'CSV', params.merge(:format => 'csv'), :class => 'icon icon-csv' %>
 </div>
-<% end %>
+<p class="pagination"><%= pagination_links_full @entry_pages, @entry_count %></p>
+<% end %>
+
+<% content_for :header_tags do %>
+    <%= javascript_include_tag 'calendar/calendar' %>
+    <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
+    <%= javascript_include_tag 'calendar/calendar-setup' %>
+    <%= stylesheet_link_tag 'calendar' %>
+<% end %>