ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add admin area view partials for each record type (#2700)

rebase/4.0.0rc2
Matt Jankowski 2017-05-02 14:56:28 -04:00 committed by Eugen Rochko
parent 2128682162
commit b5eec34230
11 changed files with 82 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/domain_blocks_controller.rb
View File

@ -3,7 +3,7 @@
module Admin
class DomainBlocksController < BaseController
def index
@blocks = DomainBlock.page(params[:page])
@domain_blocks = DomainBlock.page(params[:page])
end
def new

23
app/views/admin/accounts/_account.html.haml Normal file
View File

@ -0,0 +1,23 @@
%tr
%td.username
= account.username
%td.domain
- unless account.local?
= link_to account.domain, admin_accounts_path(by_domain: account.domain)
%td.confirmed
- if account.local?
- if account.user_confirmed?
%i.fa.fa-check
- else
%i.fa.fa-times
%td.subscribed
- if account.local?
= t('admin.accounts.location.local')
- elsif account.subscribed?
%i.fa.fa-check
- else
%i.fa.fa-times
%td
= table_link_to 'circle', t('admin.accounts.web'), web_path("accounts/#{account.id}")
= table_link_to 'globe', t('admin.accounts.public'), TagManager.instance.url_for(account)
= table_link_to 'pencil', t('admin.accounts.edit'), admin_account_path(account.id)

24
app/views/admin/accounts/index.html.haml
View File

@ -29,28 +29,6 @@
%th= fa_icon 'paper-plane-o'
%th
%tbody
- @accounts.each do |account|
%tr
%td= account.username
%td
- unless account.local?
= link_to account.domain, admin_accounts_path(by_domain: account.domain)
%td
- if account.local?
- if account.user.present? && account.user.confirmed?
%i.fa.fa-check
- else
%i.fa.fa-times
%td
- if account.local?
= t('admin.accounts.location.local')
- elsif account.subscribed?
%i.fa.fa-check
- else
%i.fa.fa-times
%td
= table_link_to 'circle', t('admin.accounts.web'), web_path("accounts/#{account.id}")
= table_link_to 'globe', t('admin.accounts.public'), TagManager.instance.url_for(account)
= table_link_to 'pencil', t('admin.accounts.edit'), admin_account_path(account.id)
= render @accounts
= paginate @accounts

10
app/views/admin/domain_blocks/_domain_block.html.haml Normal file
View File

@ -0,0 +1,10 @@
%tr
%td.domain
%samp= domain_block.domain
%td.severity
= t("admin.domain_blocks.severities.#{domain_block.severity}")
%td.reject_media
- if domain_block.reject_media? || domain_block.suspend?
%i.fa.fa-check
%td
= table_link_to 'undo', t('admin.domain_blocks.undo'), admin_domain_block_path(domain_block)

13
app/views/admin/domain_blocks/index.html.haml
View File

@ -9,16 +9,7 @@
%th= t('admin.domain_blocks.reject_media')
%th
%tbody
- @blocks.each do |block|
%tr
%td
%samp= block.domain
%td= t("admin.domain_blocks.severities.#{block.severity}")
%td
- if block.reject_media? || block.suspend?
%i.fa.fa-check
%td
= table_link_to 'undo', t('admin.domain_blocks.undo'), admin_domain_block_path(block)
= render @domain_blocks
= paginate @blocks
= paginate @domain_blocks
= link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path, class: 'button'

5
app/views/admin/instances/_instance.html.haml Normal file
View File

@ -0,0 +1,5 @@
%tr
%td.domain
= instance.domain
%td.count
= instance.accounts_count

5
app/views/admin/instances/index.html.haml
View File

@ -7,9 +7,6 @@
%th= t('admin.instances.domain_name')
%th= t('admin.instances.account_count')
%tbody
- @instances.each do |instance|
%tr
%td= instance.domain
%td= instance.accounts_count
= render partial: 'instance', collection: @instances
= paginate @instances

16
app/views/admin/pubsubhubbub/_subscription.html.haml Normal file
View File

@ -0,0 +1,16 @@
%tr
%td
%samp= subscription.account.acct
%td
%samp= subscription.callback_url
%td
- if subscription.confirmed?
%i.fa.fa-check
%td{ style: "color: #{subscription.expired? ? 'red' : 'inherit'};" }
= precede subscription.expired? ? '-' : '' do
= time_ago_in_words(subscription.expires_at)
%td
- if subscription.last_successful_delivery_at?
= l subscription.last_successful_delivery_at
- else
%i.fa.fa-times

18
app/views/admin/pubsubhubbub/index.html.haml
View File

@ -10,22 +10,6 @@
%th= t('admin.pubsubhubbub.expires_in')
%th= t('admin.pubsubhubbub.last_delivery')
%tbody
- @subscriptions.each do |subscription|
%tr
%td
%samp= subscription.account.acct
%td
%samp= subscription.callback_url
%td
- if subscription.confirmed?
%i.fa.fa-check
%td{ style: "color: #{subscription.expired? ? 'red' : 'inherit'};" }
= precede subscription.expired? ? '-' : '' do
= time_ago_in_words(subscription.expires_at)
%td
- if subscription.last_successful_delivery_at?
= l subscription.last_successful_delivery_at
- else
%i.fa.fa-times
= render partial: 'subscription', collection: @subscriptions
= paginate @subscriptions

21
app/views/admin/reports/_report.html.haml Normal file
View File

@ -0,0 +1,21 @@
%tr
%td.id
= "##{report.id}"
%td.target
= link_to report.target_account.acct, admin_account_path(report.target_account.id)
%td.reporter
= link_to report.account.acct, admin_account_path(report.account.id)
%td.comment
%span{title: report.comment}
= truncate(report.comment, length: 30, separator: ' ')
%td.stats
- unless report.statuses.empty?
%span{title: t('admin.accounts.statuses')}
= fa_icon('comment')
= report.statuses.count
- unless report.media_attachments.empty?
%span{title: t('admin.accounts.media_attachments')}
= fa_icon('camera')
= report.media_attachments.count
%td
= table_link_to 'circle', t('admin.reports.view'), admin_report_path(report)

20
app/views/admin/reports/index.html.haml
View File

@ -21,24 +21,6 @@
%th= t('admin.reports.report_contents')
%th
%tbody
- @reports.each do |report|
%tr
-# %td= check_box_tag 'select', report.id
%td= "##{report.id}"
%td= link_to report.target_account.acct, admin_account_path(report.target_account.id)
%td= link_to report.account.acct, admin_account_path(report.account.id)
%td
%span{title: report.comment}
= truncate(report.comment, length: 30, separator: ' ')
%td
- unless report.statuses.empty?
%span{title: t('admin.accounts.statuses')}
= fa_icon('comment')
= report.statuses.count
- unless report.media_attachments.empty?
%span{title: t('admin.accounts.media_attachments')}
= fa_icon('camera')
= report.media_attachments.count
%td= table_link_to 'circle', t('admin.reports.view'), admin_report_path(report)
= render @reports
= paginate @reports