move_links_under_the_dropdown.patch

Marius BALTEANU, 2019-06-20 22:50

Download (1.33 KB)

View differences:

app/views/timelog/_sidebar.html.erb
1
<h3><%= l(:label_spent_time) %></h3>
2

  
3
<ul>
4
  <li><%= link_to l(:label_time_entries_visibility_all), _time_entries_path(@project, nil, :set_filter => 1) %></li>
5
  <% if User.current.allowed_to?(:log_time, @project, :global => true) %>
6
    <li><%= link_to l(:button_import), new_time_entries_import_path %></li>
7
  <% end %>
8
</ul>
9

  
10 1
<%= render_sidebar_queries(TimeEntryQuery, @project) %>
app/views/timelog/index.html.erb
5 5
<%= link_to_if_authorized l(:label_settings),
6 6
            {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'activities'},
7 7
            :class => 'icon icon-settings' if User.current.allowed_to?(:manage_project_activities, @project) %>
8
<%= actions_dropdown do %>
9
  <% if User.current.allowed_to?(:log_time, @project, :global => true) %>
10
    <%= link_to l(:button_import), new_time_entries_import_path %>
11
  <% end %>
12
<% end %>
8 13
</div>
9 14

  
10 15
<h2><%= @query.new_record? ? l(:label_spent_time) : @query.name %></h2>