nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update /admin/accounts/:id view for ActivityPub (#4600) 

* Add protocol field
* Switch protocol specific information according to active protocol
* Hide PuSH subscription related buttons if ActivityPub is active
This commit is contained in:
unarist 2017-08-14 21:09:00 +09:00 committed by Eugen Rochko
parent 5f22c0189d
commit 5b9ae7981e
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/views/admin/accounts/show.html.haml
View File

@ -32,18 +32,30 @@
%th= t('admin.accounts.profile_url') %th= t('admin.accounts.profile_url')
%td= link_to @account.url, @account.url %td= link_to @account.url, @account.url
%tr %tr
%th= t('admin.accounts.feed_url') %th= t('admin.accounts.protocol')
%td= link_to @account.remote_url, @account.remote_url %td= @account.protocol
%tr
%th= t('admin.accounts.push_subscription_expires') - if @account.ostatus?
%td %tr
- if @account.subscribed? %th= t('admin.accounts.feed_url')
= l @account.subscription_expires_at %td= link_to @account.remote_url, @account.remote_url
- else %tr
= t('admin.accounts.not_subscribed') %th= t('admin.accounts.push_subscription_expires')
%tr %td
%th= t('admin.accounts.salmon_url') - if @account.subscribed?
%td= link_to @account.salmon_url, @account.salmon_url = l @account.subscription_expires_at
- else
= t('admin.accounts.not_subscribed')
%tr
%th= t('admin.accounts.salmon_url')
%td= link_to @account.salmon_url, @account.salmon_url
- elsif @account.activitypub?
%tr
%th= t('admin.accounts.inbox_url')
%td= link_to @account.inbox_url, @account.inbox_url
%tr
%th= t('admin.accounts.outbox_url')
%td= link_to @account.outbox_url, @account.outbox_url
%tr %tr
%th= t('admin.accounts.follows') %th= t('admin.accounts.follows')
@ -74,9 +86,10 @@
- if @account.user&.otp_required_for_login? - if @account.user&.otp_required_for_login?
= link_to t('admin.accounts.disable_two_factor_authentication'), admin_user_two_factor_authentication_path(@account.user.id), method: :delete, class: 'button' = link_to t('admin.accounts.disable_two_factor_authentication'), admin_user_two_factor_authentication_path(@account.user.id), method: :delete, class: 'button'
- else - else
= link_to @account.subscribed? ? t('admin.accounts.resubscribe') : t('admin.accounts.subscribe'), subscribe_admin_account_path(@account.id), method: :post, class: 'button' - if @account.ostatus?
- if @account.subscribed? = link_to @account.subscribed? ? t('admin.accounts.resubscribe') : t('admin.accounts.subscribe'), subscribe_admin_account_path(@account.id), method: :post, class: 'button'
= link_to t('admin.accounts.unsubscribe'), unsubscribe_admin_account_path(@account.id), method: :post, class: 'button negative' - if @account.subscribed?
= link_to t('admin.accounts.unsubscribe'), unsubscribe_admin_account_path(@account.id), method: :post, class: 'button negative'
= link_to t('admin.accounts.redownload'), redownload_admin_account_path(@account.id), method: :post, class: 'button' = link_to t('admin.accounts.redownload'), redownload_admin_account_path(@account.id), method: :post, class: 'button'
%div{ style: 'float: left' } %div{ style: 'float: left' }

3
config/locales/en.yml
View File

@ -57,6 +57,7 @@ en:
feed_url: Feed URL feed_url: Feed URL
followers: Followers followers: Followers
follows: Follows follows: Follows
inbox_url: Inbox URL
ip: IP ip: IP
location: location:
all: All all: All
@ -76,8 +77,10 @@ en:
alphabetic: Alphabetic alphabetic: Alphabetic
most_recent: Most recent most_recent: Most recent
title: Order title: Order
outbox_url: Outbox URL
perform_full_suspension: Perform full suspension perform_full_suspension: Perform full suspension
profile_url: Profile URL profile_url: Profile URL
protocol: Protocol
public: Public public: Public
push_subscription_expires: PuSH subscription expires push_subscription_expires: PuSH subscription expires
redownload: Refresh avatar redownload: Refresh avatar