Merged trunk r1773.

git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1774 e93f8b46-1217-0410-a6f0-8f06a7374b81

groups/app/views/timelog/_list.rhtml

@@ -27,9 +27,9 @@
 <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
 <td align="center">
 <% if entry.editable_by?(User.current) -%>
-    <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry},
+    <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry, :project_id => nil},
                                        :title => l(:button_edit) %>
-    <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry},
+    <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry, :project_id => nil},
                                          :confirm => l(:text_are_you_sure),
                                          :method => :post,
                                          :title => l(:button_delete) %>

groups/app/views/timelog/_report_criteria.rhtml

@@ -3,7 +3,7 @@
 <% next if hours_for_value.empty? -%>
 <tr class="<%= cycle('odd', 'even') %> <%= 'last-level' unless criterias.length > level+1 %>">
 <%= '<td></td>' * level %>
-<td><%= format_criteria_value(criterias[level], value) %></td>
+<td><%= h(format_criteria_value(criterias[level], value)) %></td>
 <%= '<td></td>' * (criterias.length - level - 1) -%>
   <% total = 0 -%>
   <% @periods.each do |period| -%>

groups/app/views/timelog/details.rhtml

@@ -24,8 +24,13 @@
 
 <p class="other-formats">
 <%= l(:label_export_to) %>
+<span><%= link_to 'Atom', {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
 <span><%= link_to 'CSV', params.merge(:format => 'csv'), :class => 'csv' %></span>
 </p>
 <% end %>
 
 <% html_title l(:label_spent_time), l(:label_details) %>
+
+<% content_for :header_tags do %>
+    <%= auto_discovery_link_tag(:atom, {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :title => l(:label_spent_time)) %>
+<% end %>

groups/app/views/timelog/edit.rhtml

@@ -9,7 +9,10 @@
 <p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
 <p><%= f.text_field :hours, :size => 6, :required => true %></p>
 <p><%= f.text_field :comments, :size => 100 %></p>
-<p><%= f.select :activity_id, (@activities.collect {|p| [p.name, p.id]}), :required => true %></p>
+<p><%= f.select :activity_id, activity_collection_for_select_options, :required => true %></p>
+<% @time_entry.custom_field_values.each do |value| %>
+	<p><%= custom_field_tag_with_label :time_entry, value %></p>
+<% end %>
 </div>
 
 <%= submit_tag l(:button_save) %>