diff --git a/README.md b/README.md index 0f8c4e4..a5ab166 100644 --- a/README.md +++ b/README.md @@ -67,6 +67,7 @@ fi - [`robots.patch`](patches/robots.patch): Disallow search engines for all of Mastodon - [`increase-sidekiq-timeout.patch`](patches/increase-sidekiq-timeout.patch): Small bump in Sidekiq's timeout before it decides a remote instance isn't available. **Use this one very carefully!** - [`favicons.patch`](patches/favicons.patch): Use custom icon images instead of Mastodon logo +- [`admin-move-federation-to-sidebar.patch`](patches/admin-move-federation-to-sidebar.patch): Why is the most frequently used admin page listed under a link that takes you to another page to open a submenu in the sidebar to finally be able to click on it to go to the page?!? - [`system-font.patch`](patches/system-font.patch): Use the system's default sans-serif font stack instead of Roboto - [`glitch/system-font.patch`](patches/glitch/system-font.patch) - [`hide-contact-email.patch`](patches/hide-contact-email.patch): Hides the `mailto:` link on the About page diff --git a/patches/admin-move-federation-to-sidebar.patch b/patches/admin-move-federation-to-sidebar.patch new file mode 100644 index 0000000..74c07d7 --- /dev/null +++ b/patches/admin-move-federation-to-sidebar.patch @@ -0,0 +1,19 @@ +diff --git a/config/navigation.rb b/config/navigation.rb +index aab72d27c4..5aeb6b4e0b 100644 +--- a/config/navigation.rb ++++ b/config/navigation.rb +@@ -45,12 +45,13 @@ SimpleNavigation::Configuration.run do |navigation| + s.item :links, safe_join([fa_icon('newspaper-o fw'), t('admin.trends.links.title')]), admin_trends_links_path, highlights_on: %r{/admin/trends/links} + end + ++ n.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_path, highlights_on: %r{/admin/instances|/admin/domain_blocks|/admin/domain_allows}, if: -> { current_user.can?(:manage_federation) } ++ + n.item :moderation, safe_join([fa_icon('gavel fw'), t('moderation.title')]), nil, if: -> { current_user.can?(:manage_reports, :view_audit_log, :manage_users, :manage_invites, :manage_taxonomies, :manage_federation, :manage_blocks) } do |s| + s.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_path, highlights_on: %r{/admin/reports}, if: -> { current_user.can?(:manage_reports) } + s.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_path(origin: 'local'), highlights_on: %r{/admin/accounts|/admin/pending_accounts|/admin/disputes|/admin/users}, if: -> { current_user.can?(:manage_users) } + s.item :invites, safe_join([fa_icon('user-plus fw'), t('admin.invites.title')]), admin_invites_path, if: -> { current_user.can?(:manage_invites) } + s.item :follow_recommendations, safe_join([fa_icon('user-plus fw'), t('admin.follow_recommendations.title')]), admin_follow_recommendations_path, highlights_on: %r{/admin/follow_recommendations}, if: -> { current_user.can?(:manage_taxonomies) } +- s.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_path(limited: whitelist_mode? ? nil : '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks|/admin/domain_allows}, if: -> { current_user.can?(:manage_federation) } + s.item :email_domain_blocks, safe_join([fa_icon('envelope fw'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_path, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.can?(:manage_blocks) } + s.item :ip_blocks, safe_join([fa_icon('ban fw'), t('admin.ip_blocks.title')]), admin_ip_blocks_path, highlights_on: %r{/admin/ip_blocks}, if: -> { current_user.can?(:manage_blocks) } + s.item :action_logs, safe_join([fa_icon('bars fw'), t('admin.action_logs.title')]), admin_action_logs_path, if: -> { current_user.can?(:view_audit_log) }