From 6d187587269b17e81ecacd9e66fd16ca38e3b013 Mon Sep 17 00:00:00 2001 From: Chris <76159444+hunchr@users.noreply.github.com> Date: Tue, 12 Aug 2025 13:29:16 +0000 Subject: [PATCH] Migrate to Redmine 6 icons --- .../timer_session_entry_component.html.erb | 32 ++++++++----------- app/helpers/timer_sessions_helper.rb | 2 ++ app/views/shared/_ticker_issue_list.html.erb | 2 +- .../_time_discrepancy_modal.html.erb | 9 +++--- .../timer_sessions/_timer_container.html.erb | 6 ++-- config/locales/de.yml | 25 ++++++++------- config/locales/en.yml | 1 + 7 files changed, 37 insertions(+), 40 deletions(-) diff --git a/app/components/timer_session_entry_component.html.erb b/app/components/timer_session_entry_component.html.erb index 81a11883..79c44070 100644 --- a/app/components/timer_session_entry_component.html.erb +++ b/app/components/timer_session_entry_component.html.erb @@ -11,34 +11,30 @@ <% if timer_session_entry? %> <% if can_continue_entry? %> - <%= link_to timer_sessions_continue_path(timer_session_entry), - method: :post, - data: { timer_session_continue_button: '' } do %> - - <% end %> + <%= link_to(sprite_icon('arrow-right', t(:button_continue), icon_only: true), + timer_sessions_continue_path(timer_session_entry), + data: { timer_session_continue_button: '' }, + method: :post, class: 'icon-only icon-arrow-right') %> <% end %> <% if can_edit_entry? %> - <%= link_to edit_timer_session_path(timer_session_entry), + <%= link_to(sprite_icon('edit', t(:button_edit), icon_only: true), + edit_timer_session_path(timer_session_entry), data: { timer_session_edit_button: '' }, - remote: true do %> - - <% end %> + remote: true, class: 'icon-only icon-edit') %> <% end %> <% if can_destroy_entry? %> - <%= link_to timer_session_path(timer_session_entry), + <%= link_to(sprite_icon('del', t(:button_delete), icon_only: true), + timer_session_path(timer_session_entry), data: { confirm: t(:text_are_you_sure), timer_session_destroy_button: '' }, - method: :delete, title: t(:button_delete) do %> - - <% end %> + method: :delete, class: 'icon-only icon-del') %> <% end %> <% if display_discrepancy_errors? %> - <%= link_to timer_sessions_time_error_path(timer_session_entry), + <%= link_to(sprite_icon('warning', t('timer_sessions.messaging.errors.discrepancy_in_time_sum.title'), icon_only: true), + timer_sessions_time_error_path(timer_session_entry), data: { timer_session_discrepancy_button: '' }, - remote: true do %> - - <% end %> + remote: true, class: 'icon-only icon-warning') %> <% elsif display_overlap_errors? %> - + <%= sprite_icon('warning', t('timer_sessions.messaging.overlap_error'), icon_only: true) %> <% end %> <% end %> diff --git a/app/helpers/timer_sessions_helper.rb b/app/helpers/timer_sessions_helper.rb index 8a52d74a..20eddb36 100644 --- a/app/helpers/timer_sessions_helper.rb +++ b/app/helpers/timer_sessions_helper.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true module TimerSessionsHelper + include IconsHelper + MAX_SUBJECT_LENGTH = 75 SECONDS_IN_MINUTE = 60 GAP_LIMIT_IN_MINUTES = 5 diff --git a/app/views/shared/_ticker_issue_list.html.erb b/app/views/shared/_ticker_issue_list.html.erb index 07dd146a..44f0c4f0 100644 --- a/app/views/shared/_ticker_issue_list.html.erb +++ b/app/views/shared/_ticker_issue_list.html.erb @@ -11,7 +11,7 @@ - + <%= sprite_icon('del', t(:button_delete), icon_only: true) %> <%= hidden_field_tag 'timer_session[issue_ids][]', issue.id, id: "timer_session_issue_id_#{issue.id}", readonly: true %> diff --git a/app/views/timer_sessions/_time_discrepancy_modal.html.erb b/app/views/timer_sessions/_time_discrepancy_modal.html.erb index 5df58ea7..d2872638 100644 --- a/app/views/timer_sessions/_time_discrepancy_modal.html.erb +++ b/app/views/timer_sessions/_time_discrepancy_modal.html.erb @@ -7,7 +7,7 @@ <%= t('resolution_options.edit_timer_session', scope: base_scope, hours: format_worked_hours(timer_session.recorded_hours)) %>
<%= link_to edit_timer_session_path(timer_session), remote: true do %> <%= t('timer_sessions.edit.title') %> -
+ <%= sprite_icon('edit', t(:button_edit), icon_only: true) %> <% end %>
  • @@ -18,7 +18,7 @@
  • <%= link_to edit_time_entry_path(time_entry) do %> <%= format_time_entry_information(time_entry) %> -
    + <%= sprite_icon('edit', t(:button_edit), icon_only: true) %> <% end %>
    • @@ -33,14 +33,13 @@
    <%= link_to timer_session_path(timer_session), data: { confirm: l(:text_are_you_sure) }, method: :delete, title: l(:button_delete) do %> <%= t('timer_sessions.destroy.button') %> -
    + <%= sprite_icon('del', t(:button_delete), icon_only: true) %> <% end %>
    <%= link_to timer_sessions_rebalance_path(timer_session), data: { confirm: l(:text_are_you_sure) }, method: :post, title: l(:button_delete) do %> <%= t('timer_sessions.rebalance.button') %> -
    + <%= sprite_icon('add', t(:button_add), icon_only: true) %> <% end %>
    - diff --git a/app/views/timer_sessions/_timer_container.html.erb b/app/views/timer_sessions/_timer_container.html.erb index 7f1fe555..e3361ea3 100644 --- a/app/views/timer_sessions/_timer_container.html.erb +++ b/app/views/timer_sessions/_timer_container.html.erb @@ -71,24 +71,22 @@ <% if User.current.allowed_to_globally?(action: :update, controller: 'time_tracker') %> <%= f.button :stop, type: :submit, data: { name: 'timer-stop', form_target: 'stopButton' }, name: :stop do %> <%= t('timer_sessions.timer.stop') %> - <% end %> <% end %> <% if User.current.allowed_to_globally?(action: :destroy, controller: 'time_tracker') %> <%= f.button :cancel, type: :submit, data: { name: 'timer-cancel', confirm: l(:text_are_you_sure) }, class: 'ml-3', name: :cancel, value: :cancel, form: "timer-cancel-form" do %> <%= t('timer_sessions.timer.cancel') %> - <% end %> <% end %> <% elsif !timer_session.persisted? && User.current.allowed_to_globally?(action: :create, controller: 'time_tracker') %> <%= f.button :start, type: :submit, value: :start, data: { name: 'timer-start' }, name: :commit do %> <%= t('timer_sessions.timer.start') %> - + <%= sprite_icon('add') %> <% end %> <%= f.button :start, type: :submit, value: :continue_last_session, data: { name: 'timer-continue' }, class: 'ml-3', name: :commit do %> <%= t('timer_sessions.timer.continue_last_session') %> - + <%= sprite_icon('add') %> <% end %> <% end %> <% end %> diff --git a/config/locales/de.yml b/config/locales/de.yml index 2a9ab73d..d516d568 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -24,6 +24,7 @@ de: issue_id: no_selection: mindestens ein Issue muss gewählt sein invalid: ein oder mehrere Issues müssen gewählt sein + button_continue: Weitermachen timer_sessions: filters: filter: Filter @@ -63,7 +64,7 @@ de: Es wurde eine Diskrepanz in der erfassten Zeit der Session %{range} gefunden! Bitte resuliere diese Diskrepanz! resolution_options: - options: "Um eine Diskrepanz zu resulieren hast du folgende Optionen:" + options: 'Um eine Diskrepanz zu resulieren hast du folgende Optionen:' edit_timer_session: Du kannst die Session direkt editieren, damit sie %{hours} umfasst edit_time_entries: Du kannst einen der Zeiterfassungen anpassen damit die Summe %{hours} ergibt last_resort: | @@ -74,15 +75,15 @@ de: continue_last_session: Anschliessend Starten stop: Stop cancel: Abbrechen - date_placeholder: "dd.mm.yyyy hh:mm" - absolute_time_placeholder: "0.75" - current: "Aktuelle Arbeitserfassung: " + date_placeholder: 'dd.mm.yyyy hh:mm' + absolute_time_placeholder: '0.75' + current: 'Aktuelle Arbeitserfassung: ' index: title: Tracky table: - total_hours_worked: "Totale Stunden: %{hours} h" + total_hours_worked: 'Totale Stunden: %{hours} h' rebalance: - button: "Ausbalancieren" + button: 'Ausbalancieren' edit: title: Arbeitseintrag bearbeiten update: Überarbeiten @@ -93,10 +94,10 @@ de: tomorrow: Morgen yesterday: Gestern formats: - date_with_year: "%d.%m.%Y" - date_with_year_and_weekday: "%A %d.%m.%Y" - date_without_year: "%d.%m" - datetime_format: "%d.%m.%Y %H:%M" + date_with_year: '%d.%m.%Y' + date_with_year_and_weekday: '%A %d.%m.%Y' + date_without_year: '%d.%m' + datetime_format: '%d.%m.%Y %H:%M' jquery_datetime_format: d.m.Y H:i - js_datetime_format: "dd.MM.yyyy HH:mm" - time: "%H:%M" + js_datetime_format: 'dd.MM.yyyy HH:mm' + time: '%H:%M' diff --git a/config/locales/en.yml b/config/locales/en.yml index c8e5ea95..4a8b4d60 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -29,6 +29,7 @@ en: issue_id: no_selection: at least one issue must be selected invalid: one or more issues do not exist + button_continue: Continue timer_sessions: filters: filter: Filter