From 00d259da0169ac93f0a84998f326b6c25fa29b01 Mon Sep 17 00:00:00 2001 From: elviabth Date: Tue, 27 Aug 2024 13:30:31 +0200 Subject: [PATCH] update icons --- .../decidim/civicrm/needs_civicrm_snippets.rb | 2 +- app/helpers/decidim/civicrm/admin/civicrm_helpers.rb | 4 ++-- .../decidim/civicrm/admin/groups/index.html.erb | 6 +++--- app/views/decidim/civicrm/admin/info/index.html.erb | 2 +- .../admin/meeting_registrations/index.html.erb | 12 ++++++------ lib/decidim/civicrm/admin_engine.rb | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/controllers/concerns/decidim/civicrm/needs_civicrm_snippets.rb b/app/controllers/concerns/decidim/civicrm/needs_civicrm_snippets.rb index 3c79ea3..0293c6c 100644 --- a/app/controllers/concerns/decidim/civicrm/needs_civicrm_snippets.rb +++ b/app/controllers/concerns/decidim/civicrm/needs_civicrm_snippets.rb @@ -13,7 +13,7 @@ def snippets @snippets ||= Decidim::Snippets.new unless @snippets.any?(:oauth2_civicrm) - @snippets.add(:oauth2_civicrm, ActionController::Base.helpers.javascript_pack_tag("decidim_civicrm")) + # @snippets.add(:oauth2_civicrm, ActionController::Base.helpers.javascript_pack_tag("decidim_civicrm")) @snippets.add(:oauth2_civicrm, ActionController::Base.helpers.stylesheet_pack_tag("decidim_civicrm")) @snippets.add(:head, @snippets.for(:oauth2_civicrm)) end diff --git a/app/helpers/decidim/civicrm/admin/civicrm_helpers.rb b/app/helpers/decidim/civicrm/admin/civicrm_helpers.rb index fab4513..01fa706 100644 --- a/app/helpers/decidim/civicrm/admin/civicrm_helpers.rb +++ b/app/helpers/decidim/civicrm/admin/civicrm_helpers.rb @@ -15,10 +15,10 @@ def last_sync_class(datetime) def check_icon(valid, label: false, icon: true) if valid - pic = icon "check", class: "action-icon text-success" + pic = icon "check-line", class: "action-icon text-success" txt = "#{t("enabled", scope: "decidim.civicrm.admin")}" else - pic = icon "x", class: "action-icon text-muted" + pic = icon "close-line", class: "action-icon text-muted" txt = "#{t("disabled", scope: "decidim.civicrm.admin")}" end diff --git a/app/views/decidim/civicrm/admin/groups/index.html.erb b/app/views/decidim/civicrm/admin/groups/index.html.erb index 6637eaf..5ddd367 100644 --- a/app/views/decidim/civicrm/admin/groups/index.html.erb +++ b/app/views/decidim/civicrm/admin/groups/index.html.erb @@ -31,13 +31,13 @@ <%= l(group.last_sync, format: :decidim_short) if group.last_sync %> <% if group.auto_sync_members? %> - <%= icon_link_to "check", decidim_civicrm_admin.toggle_auto_sync_groups_path(id: group.id), t(".auto_sync.disable"), class: "action-icon action-icon--success", method: :put %> + <%= icon_link_to "check-line", decidim_civicrm_admin.toggle_auto_sync_groups_path(id: group.id), t(".auto_sync.disable"), class: "action-icon action-icon--success", method: :put %> <% else %> - <%= icon_link_to "check", decidim_civicrm_admin.toggle_auto_sync_groups_path(id: group.id), t(".auto_sync.enable"), class: "action-icon action-icon--remove", method: :put %> + <%= icon_link_to "check-line", decidim_civicrm_admin.toggle_auto_sync_groups_path(id: group.id), t(".auto_sync.enable"), class: "action-icon action-icon--remove", method: :put %> <% end %> <%= icon_link_to "reload", decidim_civicrm_admin.sync_groups_path(id: group.id), t(".sync"), class: "action-icon--reload" %> - <%= icon_link_to "people", decidim_civicrm_admin.group_path(group), t(".members"), class: "action-icon" %> + <%= icon_link_to "group-line", decidim_civicrm_admin.group_path(group), t(".members"), class: "action-icon" %> <% end %> diff --git a/app/views/decidim/civicrm/admin/info/index.html.erb b/app/views/decidim/civicrm/admin/info/index.html.erb index e26dbf0..956d992 100644 --- a/app/views/decidim/civicrm/admin/info/index.html.erb +++ b/app/views/decidim/civicrm/admin/info/index.html.erb @@ -35,7 +35,7 @@ oauth_enabled = Decidim::Civicrm.omniauth.dig(:enabled) <%= if Decidim::Civicrm.authorizations.respond_to?(:map) Decidim::Civicrm.authorizations.map do |auth| Decidim::Authorization.where(user: current_organization.users, name: auth).count.to_s + " " + Decidim::Verifications.find_workflow_manifest(auth).description + " " + - icon_link_to("key" , decidim_civicrm_admin.info_index_path(authorization: auth), t(".regenerate_authorizations"), method: :post) + icon_link_to("key-2-line" , decidim_civicrm_admin.info_index_path(authorization: auth), t(".regenerate_authorizations"), method: :post) end.join("
").html_safe else check_icon false, label: true, icon: false diff --git a/app/views/decidim/civicrm/admin/meeting_registrations/index.html.erb b/app/views/decidim/civicrm/admin/meeting_registrations/index.html.erb index 78eb54e..93c8379 100644 --- a/app/views/decidim/civicrm/admin/meeting_registrations/index.html.erb +++ b/app/views/decidim/civicrm/admin/meeting_registrations/index.html.erb @@ -39,25 +39,25 @@ <%= event_meeting.civicrm_registrations_count %> <%= l(event_meeting.last_sync, format: :decidim_short) if event_meeting.last_sync %> <% if event_meeting.redirect_active? %> - <%= icon "check", class: "action-icon text-success" %> + <%= icon "check-line", class: "action-icon text-success" %> <% else %> - <%= icon "x", class: "action-icon text-muted" %> + <%= icon "close-line", class: "action-icon text-muted" %> <% end %> <% if event_meeting.redirect_url.present? %> <% if event_meeting.redirect_active? %> - <%= icon_link_to "check", decidim_civicrm_admin.toggle_active_meeting_registrations_path(id: event_meeting.id), t(".redirect_active.disable"), class: "action-icon action-icon--success", method: :put %> + <%= icon_link_to "check-line", decidim_civicrm_admin.toggle_active_meeting_registrations_path(id: event_meeting.id), t(".redirect_active.disable"), class: "action-icon action-icon--success", method: :put %> <% else %> - <%= icon_link_to "check", decidim_civicrm_admin.toggle_active_meeting_registrations_path(id: event_meeting.id), t(".redirect_active.enable"), class: "action-icon action-icon--remove", method: :put %> + <%= icon_link_to "check-line", decidim_civicrm_admin.toggle_active_meeting_registrations_path(id: event_meeting.id), t(".redirect_active.enable"), class: "action-icon action-icon--remove", method: :put %> <% end %> <% end %> <%= icon_link_to "pencil", decidim_civicrm_admin.edit_meeting_registration_path(id: event_meeting.id), t(".edit"), class: "action-icon--pencil" %> <%= icon_link_to "reload", decidim_civicrm_admin.sync_meeting_registrations_path(id: event_meeting.id), t(".sync"), class: "action-icon--reload" %> - <%= icon_link_to "people", decidim_civicrm_admin.meeting_registration_path(event_meeting), t(".registrations"), class: "action-icon" %> + <%= icon_link_to "group-line", decidim_civicrm_admin.meeting_registration_path(event_meeting), t(".registrations"), class: "action-icon" %> <% unless event_meeting.civicrm_event_id.present? %> - <%= icon_link_to "x", decidim_civicrm_admin.meeting_path(event_meeting), t(".remove"), class: "action-icon action-icon--remove", method: :delete %> + <%= icon_link_to "close-line", decidim_civicrm_admin.meeting_path(event_meeting), t(".remove"), class: "action-icon action-icon--remove", method: :delete %> <% end %> diff --git a/lib/decidim/civicrm/admin_engine.rb b/lib/decidim/civicrm/admin_engine.rb index f0c0635..ad87d2f 100644 --- a/lib/decidim/civicrm/admin_engine.rb +++ b/lib/decidim/civicrm/admin_engine.rb @@ -56,7 +56,7 @@ class AdminEngine < ::Rails::Engine menu.add_item :civicrm, I18n.t("menu.civicrm", scope: "decidim.admin", default: "CiViCRM"), decidim_civicrm_admin.info_index_path, - icon_name: "people", + icon_name: "group-line", position: 5.75, active: is_active_link?(decidim_civicrm_admin.info_index_path, :inclusive), if: defined?(current_user) && current_user&.read_attribute("admin")