fixes various UI issues

app/views/stopwatch/hooks/_time_entries_context_menu_start.html.erb

@@ -2,9 +2,9 @@
   <% time_entry = @time_entries.first %>
   <li>
     <% if User.current.is_running_timer? time_entry %>
-      <%= context_menu_link l(:label_stopwatch_stop), stop_stopwatch_timer_path(time_entry, context: '1'), class: 'icon icon-time', remote: true, method: :put %>
+      <%= context_menu_link sprite_icon(:time, l(:label_stopwatch_stop)), stop_stopwatch_timer_path(time_entry, context: '1'), class: 'icon', remote: true, method: :put %>
     <% else %>
-      <%= context_menu_link l(:label_stopwatch_start), start_stopwatch_timer_path(time_entry, context: '1'), class: 'icon icon-time', remote: true, method: :put %>
+      <%= context_menu_link sprite_icon(:time, l(:label_stopwatch_start)), start_stopwatch_timer_path(time_entry, context: '1'), class: 'icon', remote: true, method: :put %>
     <% end %>
   </li>
 <% end %>

app/views/stopwatch_issue_timers/stop.js.erb

@@ -1,6 +1,6 @@
 contextMenuHide();
 window.stopwatch.updateStartStopLink(
   '#stopwatch_stop_timer_<%= @issue.id %>',
-  '<%= j Stopwatch::IssueLinks.new(@issue).start_timer %>'
+  '<%= j Stopwatch::IssueLinks.new(@issue, self).start_timer %>'
 );
 window.stopwatch.timerStopped();

app/views/stopwatch_timers/_entries_list.html.erb

@@ -17,11 +17,11 @@
     <td class="hours"><%= html_hours(format_hours(entry.hours)) %></td>
     <td class="buttons">
       <% if running %>
-        <%= link_to t(:label_stopwatch_stop), stop_stopwatch_timer_path(entry), remote: true, class: "icon-only icon-time", method: :put %>
+        <%= link_to sprite_icon(:time, t(:label_stopwatch_stop)), stop_stopwatch_timer_path(entry), remote: true, class: "icon-only", method: :put %>
       <% else %>
-        <%= link_to t(:label_stopwatch_start), start_stopwatch_timer_path(entry), remote: true, class: "icon-only icon-time", method: :put %>
+        <%= link_to sprite_icon(:time, t(:label_stopwatch_start)), start_stopwatch_timer_path(entry), remote: true, class: "icon-only", method: :put %>
       <% end %>
-      <%= link_to l(:button_edit), edit_stopwatch_timer_path(entry), remote: true, class: "icon-only icon-edit" if entry.editable_by? User.current %>
+      <%= link_to sprite_icon(:edit, l(:button_edit)), edit_stopwatch_timer_path(entry), remote: true, class: "icon-only" if entry.editable_by? User.current %>
     </td>
   </tr>
 <% end -%>

assets/javascripts/stopwatch.js

@@ -74,7 +74,7 @@ window.initStopwatch = function(config){
       $('a.stopwatch_issue_timer').each(function(){
         var a = $(this);
         a.attr('href', a.attr('href').replace(/stop$/, 'start'));
-        a.text(locales.startTimer);
+        a.find('span').text(locales.startTimer);
       });
     },
     timerStarted: function(data){
@@ -94,10 +94,10 @@ window.initStopwatch = function(config){
           if(data.issue_id) {
             if(a.data('issueId') == data.issue_id) {
               a.attr('href', href.replace(/start$/, 'stop'));
-              a.text(locales.stopTimer);
+              a.find('span').text(locales.stopTimer);
             } else {
               a.attr('href', href.replace(/stop$/, 'start'));
-              a.text(locales.startTimer);
+              a.find('span').text(locales.startTimer);
             }
           }
         });

init.rb

@@ -3,9 +3,9 @@ Redmine::Plugin.register :stopwatch do
   author 'Jens Krämer'
   author_url 'https://jkraemer.net/'
   description "Start/stop timer and quick access to today's time bookings for Redmine"
-  version '1.0.0'
+  version '1.1.0'
 
-  requires_redmine version_or_higher: '5.0.0'
+  requires_redmine version_or_higher: '6.0.0'
   settings default: {
     'default_activity' => 'always_ask',
   }, partial: 'stopwatch/settings'

lib/stopwatch/context_menus_controller_patch.rb

@@ -10,9 +10,9 @@ module Stopwatch
             User.current.allowed_to?(:log_time, issue.project)
           t = Stopwatch::IssueTimer.new(issue: issue)
           if t.running?
-            link << IssueLinks.new(issue).stop_timer
+            link << IssueLinks.new(issue, self).stop_timer
           else
-            link << IssueLinks.new(issue).start_timer
+            link << IssueLinks.new(issue, self).start_timer
           end
         end
         super + content_tag(:li, link.html_safe)
@@ -26,4 +26,3 @@ module Stopwatch
     end
   end
 end
-

lib/stopwatch/issue_links.rb

@@ -1,26 +1,25 @@
 module Stopwatch
-  class IssueLinks < Struct.new(:issue)
+  class IssueLinks < Struct.new(:issue, :context)
-    include ActionView::Helpers::UrlHelper
-    include Rails.application.routes.url_helpers
-
-
     def start_timer
-      link_to(I18n.t(:label_stopwatch_start),
+      context.link_to(
-              start_issue_timer_path(issue),
+        context.sprite_icon(:time, I18n.t(:label_stopwatch_start)),
-              class: 'icon icon-time stopwatch_issue_timer',
+        context.start_issue_timer_path(issue),
-              data: { issue_id: issue.id },
+        class: 'icon stopwatch_issue_timer',
-              remote: true,
+        data: { issue_id: issue.id },
-              method: 'post')
+        remote: true,
+        method: 'post'
+      )
     end
 
     def stop_timer
-      link_to(I18n.t(:label_stopwatch_stop),
+      context.link_to(
-              stop_issue_timer_path(issue),
+        context.sprite_icon(:time, I18n.t(:label_stopwatch_stop)),
-              class: 'icon icon-time stopwatch_issue_timer',
+        context.stop_issue_timer_path(issue),
-              data: { issue_id: issue.id },
+        class: 'icon stopwatch_issue_timer',
-              remote: true,
+        data: { issue_id: issue.id },
-              method: 'post')
+        remote: true,
-
+        method: 'post'
+      )
     end
 
     # to make route helpers happy

lib/stopwatch/issues_controller_patch.rb

@@ -8,9 +8,9 @@ module Stopwatch
         if User.current.allowed_to?(:log_time, issue.project)
           t = Stopwatch::IssueTimer.new(issue: issue)
           if t.running?
-            link << IssueLinks.new(issue).stop_timer
+            link << IssueLinks.new(issue, self).stop_timer
           else
-            link << IssueLinks.new(issue).start_timer
+            link << IssueLinks.new(issue, self).start_timer
           end
         end
         link.html_safe + super

test/integration/ticket_timer_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __dir__)
 
 class TicketTimerTest < Redmine::IntegrationTest
   include ActiveJob::TestHelper
@@ -30,6 +30,7 @@ class TicketTimerTest < Redmine::IntegrationTest
     assert_not_running
 
     get "/issues/1"
+    assert_response :success
     assert_select "div.contextual a", text: /start tracking/i
     assert_no_difference ->{TimeEntry.count} do
       post "/issues/1/timer/start", xhr: true
@@ -77,7 +78,7 @@ class TicketTimerTest < Redmine::IntegrationTest
     TimeEntry.delete_all
     assert_no_difference ->{TimeEntry.count} do
       post "/issues/1/timer/start", xhr: true
-      assert_response 200
+      assert_response :ok
     end
   end
 
@@ -86,7 +87,7 @@ class TicketTimerTest < Redmine::IntegrationTest
     TimeEntry.delete_all
     with_settings plugin_stopwatch: { 'default_activity' => 'system'} do
       post "/issues/1/timer/start", xhr: true
-      assert_response 201
+      assert_response :created
     end
     assert te = TimeEntry.last
     assert_equal 1, te.issue_id
@@ -98,18 +99,17 @@ class TicketTimerTest < Redmine::IntegrationTest
     TimeEntry.delete_all
     with_settings plugin_stopwatch: { 'default_activity' => '9'} do
       post "/issues/1/timer/start", xhr: true
-      assert_response 201
+      assert_response :created
     end
     assert te = TimeEntry.last
     assert_equal 1, te.issue_id
     assert_equal 9, te.activity_id
   end
 
-
   private
 
   def assert_not_running
-    refute Stopwatch::Timer.new(User.find(@user.id)).running?
+    assert_not Stopwatch::Timer.new(User.find(@user.id)).running?
   end
 
   def assert_running