summaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2020-01-23 20:33:20 +0100
committerGitHub <noreply@github.com>2020-01-23 20:33:20 +0100
commitc0006a004d0e58bb3ad356759c17e60f28975b61 (patch)
treec7db8022c8759f30cddc497e3d7aa1c474dbd9fd /app/views
parent27f9aa34776e89d0e56fc8aba7a52e075927b146 (diff)
Change followers page to relationships page in admin UI (#12927)
Allow browsing and filtering all relationships instead of just followers, unify the codebase with the user-facing relationship manager, add ability to see who the user invited
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/accounts/show.html.haml2
-rw-r--r--app/views/admin/followers/index.html.haml28
-rw-r--r--app/views/admin/relationships/index.html.haml39
3 files changed, 40 insertions, 29 deletions
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index 1429f56d568..f191d8f25f9 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -41,7 +41,7 @@
.dashboard__counters__num= number_to_human_size @account.media_attachments.sum('file_file_size')
.dashboard__counters__label= t 'admin.accounts.media_attachments'
%div
- = link_to admin_account_followers_path(@account.id) do
+ = link_to admin_account_relationships_path(@account.id, location: 'local') do
.dashboard__counters__num= number_with_delimiter @account.local_followers_count
.dashboard__counters__label= t 'admin.accounts.followers'
%div
diff --git a/app/views/admin/followers/index.html.haml b/app/views/admin/followers/index.html.haml
deleted file mode 100644
index 25f1f290f42..00000000000
--- a/app/views/admin/followers/index.html.haml
+++ /dev/null
@@ -1,28 +0,0 @@
-- content_for :page_title do
- = t('admin.followers.title', acct: @account.acct)
-
-.filters
- .filter-subset
- %strong= t('admin.accounts.location.title')
- %ul
- %li= link_to t('admin.accounts.location.local'), admin_account_followers_path(@account.id), class: 'selected'
- .back-link{ style: 'flex: 1 1 auto; text-align: right' }
- = link_to admin_account_path(@account.id) do
- = fa_icon 'chevron-left fw'
- = t('admin.followers.back_to_account')
-
-%hr.spacer/
-
-.table-wrapper
- %table.table
- %thead
- %tr
- %th= t('admin.accounts.username')
- %th= t('admin.accounts.role')
- %th= t('admin.accounts.most_recent_ip')
- %th= t('admin.accounts.most_recent_activity')
- %th
- %tbody
- = render partial: 'admin/accounts/account', collection: @followers
-
-= paginate @followers
diff --git a/app/views/admin/relationships/index.html.haml b/app/views/admin/relationships/index.html.haml
new file mode 100644
index 00000000000..3afaff61538
--- /dev/null
+++ b/app/views/admin/relationships/index.html.haml
@@ -0,0 +1,39 @@
+- content_for :page_title do
+ = t('admin.relationships.title', acct: @account.acct)
+
+.filters
+ .filter-subset
+ %strong= t 'relationships.relationship'
+ %ul
+ %li= filter_link_to t('relationships.following'), relationship: nil
+ %li= filter_link_to t('relationships.followers'), relationship: 'followed_by'
+ %li= filter_link_to t('relationships.mutual'), relationship: 'mutual'
+ %li= filter_link_to t('relationships.invited'), relationship: 'invited'
+
+ .filter-subset
+ %strong= t('admin.accounts.location.title')
+ %ul
+ %li= filter_link_to t('admin.accounts.moderation.all'), location: nil
+ %li= filter_link_to t('admin.accounts.location.local'), location: 'local'
+ %li= filter_link_to t('admin.accounts.location.remote'), location: 'remote'
+
+ .back-link{ style: 'flex: 1 1 auto; text-align: right' }
+ = link_to admin_account_path(@account.id) do
+ = fa_icon 'chevron-left fw'
+ = t('admin.statuses.back_to_account')
+
+%hr.spacer/
+
+.table-wrapper
+ %table.table
+ %thead
+ %tr
+ %th= t('admin.accounts.username')
+ %th= t('admin.accounts.role')
+ %th= t('admin.accounts.most_recent_ip')
+ %th= t('admin.accounts.most_recent_activity')
+ %th
+ %tbody
+ = render partial: 'admin/accounts/account', collection: @accounts
+
+= paginate @accounts