Move the links (All time entries, Import) from Spent time section of the spent time...

Patch by Marius BALTEANU.

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

diff --git a/app/views/timelog/_sidebar.html.erb b/app/views/timelog/_sidebar.html.erb
index f54a73f81e7d09396350f4c2dc755de8ba4c6cde..b9ffe733631df0d2ae2c01f4dd45a1e814253bcf 100644 (file)
--- a/app/views/timelog/_sidebar.html.erb
+++ b/app/views/timelog/_sidebar.html.erb
@@ -1,10 +1 @@
-<h3><%= l(:label_spent_time) %></h3>
-
-<ul>
-  <li><%= link_to l(:label_time_entries_visibility_all), _time_entries_path(@project, nil, :set_filter => 1) %></li>
-  <% if User.current.allowed_to?(:log_time, @project, :global => true) %>
-    <li><%= link_to l(:button_import), new_time_entries_import_path %></li>
-  <% end %>
-</ul>
-
 <%= render_sidebar_queries(TimeEntryQuery, @project) %>

diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb
index 0ce69caddfc4da11b411aed05e71c70d983877d0..2de12180666202fac80674666dd3f35fd8ad265a 100644 (file)
--- a/app/views/timelog/index.html.erb
+++ b/app/views/timelog/index.html.erb
@@ -5,6 +5,11 @@
 <%= link_to_if_authorized l(:label_settings),
             {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'activities'},
             :class => 'icon icon-settings' if User.current.allowed_to?(:manage_project_activities, @project) %>
+<%= actions_dropdown do %>
+  <% if User.current.allowed_to?(:log_time, @project, :global => true) %>
+    <%= link_to l(:button_import), new_time_entries_import_path %>
+  <% end %>
+<% end %>
 </div>
 
 <h2><%= @query.new_record? ? l(:label_spent_time) : @query.name %></h2>