Version Bump

.github/workflows/redmine.yml

@@ -14,11 +14,10 @@ jobs:
     strategy:
       matrix:
         redmine:
-          - '5.0'
+          - '6.0'
-          - '5.1'
+          - '6.1'
         ruby:
-          - '3.0'
+          - '3.3'
-          - '3.1'
         database:
           - postgresql
           - mysql

app/views/stopwatch/_settings.html.erb

@@ -2,3 +2,8 @@
   <label for="settings_default_activity"><%= t '.label_default_activity' %> </label>
   <%= select_tag 'settings[default_activity]', options_from_collection_for_select( [['always_ask', t('.label_always_ask')], ['system', t('.label_system')]] + TimeEntryActivity.system.active.to_a.pluck(:id, :name), :first, :last, Stopwatch.settings['default_activity'] ) %>
 </p>
+
+<p>
+  <label for="settings_highlighted_links"><%= t '.label_highlighted_links' %> </label>
+  <%= check_box_tag 'settings[highlighted_links]', 1, Setting.plugin_stopwatch[:highlighted_links] %>
+</p>

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

@@ -1,2 +1,3 @@
 <%= javascript_include_tag "stopwatch", plugin: "stopwatch" %>
 <%= stylesheet_link_tag "stopwatch", plugin: "stopwatch" %>
+<%= stylesheet_link_tag "highlighted_links", plugin: "stopwatch" if Stopwatch.highlighted_links %>

assets/stylesheets/highlighted_links.css

@@ -0,0 +1,22 @@
+a.stopwatch_issue_timer[href*="stop"] {
+  color: red;
+}
+
+a.stopwatch_issue_timer[href*="start"] {
+  color: limegreen;
+}
+
+/* Mobile only */
+@media (max-width: 899px) {
+  a.stopwatch_issue_timer[href*="stop"] {
+    color: red;
+    background-color: #ffe5e5;
+    border: 1px solid red;
+  }
+
+  a.stopwatch_issue_timer[href*="start"] {
+    color: limegreen;
+    background-color: #eaffea; 
+    border: 1px solid limegreen; 
+  }
+}

assets/stylesheets/stopwatch.css

@@ -1,3 +1,3 @@
 tr.time-entry.running td.hours {
   color: red;
-}
+}

config/locales/en.yml

@@ -5,6 +5,7 @@ en:
     settings:
       label_always_ask: 'Always ask'
       label_default_activity: 'Default activity for "Start tracking"'
+      label_highlighted_links: "Color-code Start/Stop"
       label_system: 'Use system default'
   stopwatch_timers:
     entries_list:

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.1.0'
+  version '2026.7.0'
 
-  requires_redmine version_or_higher: '6.0.0'
+  requires_redmine version_or_higher: '7.0.0'
   settings default: {
     'default_activity' => 'always_ask',
   }, partial: 'stopwatch/settings'
@@ -18,4 +18,4 @@ Redmine::Plugin.register :stopwatch do
     if: ->(*_){ User.current.logged? and User.current.allowed_to?(:log_time, nil, global: true) }
 end
 
-Stopwatch.setup
+Stopwatch.setup

lib/stopwatch.rb

@@ -2,14 +2,12 @@
 
 module Stopwatch
   def self.setup
-    Stopwatch::ContextMenusControllerPatch.apply
     Stopwatch::IssuesControllerPatch.apply
     ::TimeEntry.prepend Stopwatch::TimeEntryPatch
     ::User.prepend Stopwatch::UserPatch
     Stopwatch::Hooks # just load it
   end
 
-
   def self.settings
     Setting.plugin_stopwatch
   end
@@ -42,4 +40,8 @@ module Stopwatch
       return activities.detect{ |a| a == default || a.parent == default }
     end
   end
+
+  def self.highlighted_links
+    settings[:highlighted_links]
+  end
 end

lib/stopwatch/context_menus_controller_patch.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Stopwatch
-  module ContextMenusControllerPatch
-    module Helper
-      def watcher_link(objects, user)
-        link = +''
-        if params[:action] == 'issues' and
-            objects.one? and (issue = objects[0]).is_a?(Issue) and
-            User.current.allowed_to?(:log_time, issue.project)
-          t = Stopwatch::IssueTimer.new(issue: issue)
-          if t.running?
-            link << IssueLinks.new(issue, self).stop_timer
-          else
-            link << IssueLinks.new(issue, self).start_timer
-          end
-        end
-        super + content_tag(:li, link.html_safe)
-      end
-    end
-
-    def self.apply
-      ContextMenusController.class_eval do
-        helper Helper
-      end
-    end
-  end
-end

lib/stopwatch/hooks.rb

@@ -6,5 +6,28 @@ module Stopwatch
       partial: 'stopwatch/hooks/layouts_base_body_bottom'
     render_on :view_time_entries_context_menu_start,
       partial: 'stopwatch/hooks/time_entries_context_menu_start'
+
+    # This hook is natively provided by Redmine 7's issues context menu view
+    def view_issues_context_menu_start(context = {})
+      issues = context[:issues]
+      
+      # We only append our element if exactly one issue is highlighted
+      return '' unless issues&.one?
+
+      issue = issues.first
+      return '' unless User.current.allowed_to?(:log_time, issue.project)
+
+      # 'controller' in this context gives access to view helper context
+      view = context[:controller].view_context
+      timer = Stopwatch::IssueTimer.new(issue: issue)
+      
+      link = if timer.running?
+               IssueLinks.new(issue, view).stop_timer
+             else
+               IssueLinks.new(issue, view).start_timer
+             end
+
+      view.content_tag(:li, link.html_safe)
+    end
   end
 end