4 Commits
8 changed files with 40 additions and 7 deletions
+3 -4
View File
@@ -14,11 +14,10 @@ jobs:
strategy: strategy:
matrix: matrix:
redmine: redmine:
- '5.0' - '6.0'
- '5.1' - '6.1'
ruby: ruby:
- '3.0' - '3.3'
- '3.1'
database: database:
- postgresql - postgresql
- mysql - mysql
+5
View File
@@ -2,3 +2,8 @@
<label for="settings_default_activity"><%= t '.label_default_activity' %> </label> <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'] ) %> <%= 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>
<p>
<label for="settings_highlighted_links"><%= t '.label_highlighted_links' %> </label>
<%= check_box_tag 'settings[highlighted_links]', 1, Setting.plugin_stopwatch[:highlighted_links] %>
</p>
@@ -1,2 +1,3 @@
<%= javascript_include_tag "stopwatch", plugin: "stopwatch" %> <%= javascript_include_tag "stopwatch", plugin: "stopwatch" %>
<%= stylesheet_link_tag "stopwatch", plugin: "stopwatch" %> <%= stylesheet_link_tag "stopwatch", plugin: "stopwatch" %>
<%= stylesheet_link_tag "highlighted_links", plugin: "stopwatch" if Stopwatch.highlighted_links %>
+22
View File
@@ -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;
}
}
+1
View File
@@ -5,6 +5,7 @@ en:
settings: settings:
label_always_ask: 'Always ask' label_always_ask: 'Always ask'
label_default_activity: 'Default activity for "Start tracking"' label_default_activity: 'Default activity for "Start tracking"'
label_highlighted_links: "Color-code Start/Stop"
label_system: 'Use system default' label_system: 'Use system default'
stopwatch_timers: stopwatch_timers:
entries_list: entries_list:
+3 -1
View File
@@ -18,4 +18,6 @@ Redmine::Plugin.register :stopwatch do
if: ->(*_){ User.current.logged? and User.current.allowed_to?(:log_time, nil, global: true) } if: ->(*_){ User.current.logged? and User.current.allowed_to?(:log_time, nil, global: true) }
end end
Stopwatch.setup Rails.application.config.to_prepare do
Stopwatch.setup
end
+4 -1
View File
@@ -9,7 +9,6 @@ module Stopwatch
Stopwatch::Hooks # just load it Stopwatch::Hooks # just load it
end end
def self.settings def self.settings
Setting.plugin_stopwatch Setting.plugin_stopwatch
end end
@@ -42,4 +41,8 @@ module Stopwatch
return activities.detect{ |a| a == default || a.parent == default } return activities.detect{ |a| a == default || a.parent == default }
end end
end end
def self.highlighted_links
settings[:highlighted_links]
end
end end