Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-07-07 14:33:16 +02:00
Code Issues Packages Projects Releases Activity

Merged r23318 from trunk to 6.0-stable (#41864).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23333 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2024-11-30 06:58:49 +00:00
parent c5bb1f02e2
commit 58e1efe160
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/timelog/report.html.erb
View File

@@ -1,10 +1,10 @@
<div class="contextual">
<%= link_to l(:button_log_time),
<%= link_to sprite_icon('time-add', l(:button_log_time)),
_new_time_entry_path(@project, @issue),
:class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
<%= 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) %>
<%= link_to_if_authorized sprite_icon('settings', l(:label_settings)),
{:controller => 'projects', :action => 'settings', :id => @project, :tab => 'activities'},
:class => 'icon icon-settings' if User.current.allowed_to?(:manage_project_activities, @project) %>
</div>
<h2><%= @query.new_record? ? l(:label_spent_time) : @query.name %></h2>
@@ -26,7 +26,7 @@
:style => 'width: 200px',
:disabled => (@report.criteria.length >= 3),
:id => "criterias") %>
<%= link_to l(:button_clear), {:params => request.query_parameters.merge(:criteria => nil)}, :class => 'icon icon-reload' %></p>
<%= link_to sprite_icon('reload', l(:button_clear)), {:params => request.query_parameters.merge(:criteria => nil)}, :class => 'icon icon-reload' %></p>
<%= hidden_field_tag 'encoding', l(:general_csv_encoding) unless l(:general_csv_encoding).casecmp('UTF-8') == 0 %>
<% end %>