From ee836821dcaeaa947ff693aa4bc3235b3ec391b6 Mon Sep 17 00:00:00 2001 From: David Roetzel Date: Thu, 19 Dec 2024 15:06:17 +0100 Subject: [PATCH] Improve iconography --- app/javascript/material-icons/400-24px/extension-fill.svg | 1 + app/javascript/material-icons/400-24px/extension.svg | 1 + app/views/admin/fasp/providers/_provider.html.haml | 6 +++--- app/views/admin/fasp/shared/_links.html.haml | 4 ++-- config/navigation.rb | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 app/javascript/material-icons/400-24px/extension-fill.svg create mode 100644 app/javascript/material-icons/400-24px/extension.svg diff --git a/app/javascript/material-icons/400-24px/extension-fill.svg b/app/javascript/material-icons/400-24px/extension-fill.svg new file mode 100644 index 0000000000..f6e7de8cce --- /dev/null +++ b/app/javascript/material-icons/400-24px/extension-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/extension.svg b/app/javascript/material-icons/400-24px/extension.svg new file mode 100644 index 0000000000..16909a6307 --- /dev/null +++ b/app/javascript/material-icons/400-24px/extension.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/views/admin/fasp/providers/_provider.html.haml b/app/views/admin/fasp/providers/_provider.html.haml index 1591fc4e8c..e3527b4783 100644 --- a/app/views/admin/fasp/providers/_provider.html.haml +++ b/app/views/admin/fasp/providers/_provider.html.haml @@ -8,10 +8,10 @@ = t('admin.fasp.providers.registration_requested') %td - unless provider.confirmed? - = table_link_to 'link', t('admin.fasp.providers.finish_registration'), new_admin_fasp_provider_registration_path(provider) + = table_link_to 'check', t('admin.fasp.providers.finish_registration'), new_admin_fasp_provider_registration_path(provider) - if provider.sign_in_url.present? - = table_link_to 'link', t('admin.fasp.providers.sign_in'), provider.sign_in_url, target: '_blank' + = table_link_to 'open_in_new', t('admin.fasp.providers.sign_in'), provider.sign_in_url, target: '_blank' - if provider.capability?('callback') - = table_link_to 'link', t('admin.fasp.providers.callback'), admin_fasp_provider_debug_calls_path(provider), data: { method: :post } + = table_link_to 'repeat', t('admin.fasp.providers.callback'), admin_fasp_provider_debug_calls_path(provider), data: { method: :post } = table_link_to 'close', t('admin.providers.delete'), admin_fasp_provider_path(provider), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } diff --git a/app/views/admin/fasp/shared/_links.html.haml b/app/views/admin/fasp/shared/_links.html.haml index d0c29bde6a..0c1d1eb4db 100644 --- a/app/views/admin/fasp/shared/_links.html.haml +++ b/app/views/admin/fasp/shared/_links.html.haml @@ -1,5 +1,5 @@ .content__heading__tabs = render_navigation renderer: :links do |primary| :ruby - primary.item :providers, safe_join([material_symbol('description'), t('admin.fasp.providers.providers')]), admin_fasp_providers_path - primary.item :debug_callbacks, safe_join([material_symbol('group'), t('admin.fasp.debug.callbacks.title')]), admin_fasp_debug_callbacks_path + primary.item :providers, safe_join([material_symbol('database'), t('admin.fasp.providers.providers')]), admin_fasp_providers_path + primary.item :debug_callbacks, safe_join([material_symbol('repeat'), t('admin.fasp.debug.callbacks.title')]), admin_fasp_debug_callbacks_path diff --git a/config/navigation.rb b/config/navigation.rb index c3ce45f4ff..d2700a2ede 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -73,7 +73,7 @@ SimpleNavigation::Configuration.run do |navigation| s.item :announcements, safe_join([material_symbol('campaign'), t('admin.announcements.title')]), admin_announcements_path, highlights_on: %r{/admin/announcements}, if: -> { current_user.can?(:manage_announcements) } s.item :custom_emojis, safe_join([material_symbol('mood'), t('admin.custom_emojis.title')]), admin_custom_emojis_path, highlights_on: %r{/admin/custom_emojis}, if: -> { current_user.can?(:manage_custom_emojis) } s.item :webhooks, safe_join([material_symbol('inbox'), t('admin.webhooks.title')]), admin_webhooks_path, highlights_on: %r{/admin/webhooks}, if: -> { current_user.can?(:manage_webhooks) } - s.item :fasp, safe_join([material_symbol('captive_portal'), t('admin.fasp.title')]), admin_fasp_providers_path, highlights_on: %r{/admin/fasp}, if: -> { current_user.can?(:manage_federation) } + s.item :fasp, safe_join([material_symbol('extension'), t('admin.fasp.title')]), admin_fasp_providers_path, highlights_on: %r{/admin/fasp}, if: -> { current_user.can?(:manage_federation) } s.item :relays, safe_join([material_symbol('captive_portal'), t('admin.relays.title')]), admin_relays_path, highlights_on: %r{/admin/relays}, if: -> { !limited_federation_mode? && current_user.can?(:manage_federation) } end