From 58e1efe160562b28fd866b1ea77e1ee01ce852af Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sat, 30 Nov 2024 06:58:49 +0000 Subject: Merged r23318 from trunk to 6.0-stable (#41864). git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23333 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/timelog/report.html.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/timelog/report.html.erb b/app/views/timelog/report.html.erb index e0e80cd0e..180ac1512 100644 --- a/app/views/timelog/report.html.erb +++ b/app/views/timelog/report.html.erb @@ -1,10 +1,10 @@
-<%= 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) %>

<%= @query.new_record? ? l(:label_spent_time) : @query.name %>

@@ -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' %>

+ <%= link_to sprite_icon('reload', l(:button_clear)), {:params => request.query_parameters.merge(:criteria => nil)}, :class => 'icon icon-reload' %>

<%= hidden_field_tag 'encoding', l(:general_csv_encoding) unless l(:general_csv_encoding).casecmp('UTF-8') == 0 %> <% end %> -- cgit v1.2.3