diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-12-01 12:12:42 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-12-01 12:12:42 +0100 |
| commit | 99f1f48741865fd5cb510930488d36af27a5d24d (patch) | |
| tree | 1abd8eed33721830f7757a5d5ba85ffbd3b1012a /app/views | |
| parent | 7f6315841c98a1eee6cb57171a91a88f5c5343df (diff) | |
| parent | d70268f0991ba69568112d4da5768e821d5983dd (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/reports/index.html.haml | 14 | ||||
| -rw-r--r-- | app/views/relationships/show.html.haml | 4 |
2 files changed, 16 insertions, 2 deletions
diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml index bfbd32108..b09472270 100644 --- a/app/views/admin/reports/index.html.haml +++ b/app/views/admin/reports/index.html.haml @@ -8,6 +8,20 @@ %li= filter_link_to t('admin.reports.unresolved'), resolved: nil %li= filter_link_to t('admin.reports.resolved'), resolved: '1' += form_tag admin_reports_url, method: 'GET', class: 'simple_form' do + .fields-group + - Admin::FilterHelper::REPORT_FILTERS.each do |key| + - if params[key].present? + = hidden_field_tag key, params[key] + + - %i(by_target_domain).each do |key| + .input.string.optional + = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.reports.#{key}") + + .actions + %button= t('admin.accounts.search') + = link_to t('admin.accounts.reset'), admin_reports_path, class: 'button negative' + - @reports.group_by(&:target_account_id).each do |target_account_id, reports| - target_account = reports.first.target_account .report-card diff --git a/app/views/relationships/show.html.haml b/app/views/relationships/show.html.haml index 1de4e373f..408390a35 100644 --- a/app/views/relationships/show.html.haml +++ b/app/views/relationships/show.html.haml @@ -5,8 +5,8 @@ .filter-subset %strong= t 'relationships.relationship' %ul - %li= filter_link_to t('accounts.following', count: current_account.following_count), relationship: nil - %li= filter_link_to t('accounts.followers', count: current_account.followers_count), relationship: 'followed_by' + %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' .filter-subset |