diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-09-27 09:38:33 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-09-27 09:38:33 +0000 |
| commit | bd464018215f052092321f454982236fc42bf5e2 (patch) | |
| tree | 0abdbde3337d67b2969475bdb3963ac1feab5797 /app/views/timelog | |
| parent | bf4a6ccf6d602a8c77df61f5b0ee86923c598836 (diff) | |
| download | redmine-bd464018215f052092321f454982236fc42bf5e2.tar.gz redmine-bd464018215f052092321f454982236fc42bf5e2.zip | |
Move the links (All time entries, Import) from Spent time section of the spent time list sidebar under a dropdown (#31598).
Patch by Marius BALTEANU.
git-svn-id: http://svn.redmine.org/redmine/trunk@18546 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/timelog')
| -rw-r--r-- | app/views/timelog/_sidebar.html.erb | 9 | ||||
| -rw-r--r-- | app/views/timelog/index.html.erb | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/app/views/timelog/_sidebar.html.erb b/app/views/timelog/_sidebar.html.erb index f54a73f81..b9ffe7336 100644 --- 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 0ce69cadd..2de121806 100644 --- 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> |