Merge changes from upstream with the CSS reload fix

5 files changed, 81 insertions, 19 deletions

diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index fd468bba0..0af47bde3 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -18,13 +18,13 @@
 .landing-page
   .header-wrapper
     .mascot-container
-      = image_tag asset_pack_path('elephant-fren.png'), class: 'mascot'
+      = image_tag asset_pack_path('elephant-fren.png'), alt: '', role: 'presentation', class: 'mascot'
 
     .header
       .container.links
         .brand
           = link_to root_url do
-            = image_tag asset_pack_path('logo.svg')
+            = image_tag asset_pack_path('logo.svg'), alt: '', role: 'presentation'
             Mastodon
 
         %ul.nav
@@ -38,9 +38,9 @@
 
       .container.hero
         .floats
-          = image_tag asset_pack_path('cloud2.png'), class: 'float-1'
-          = image_tag asset_pack_path('cloud3.png'), class: 'float-2'
-          = image_tag asset_pack_path('cloud4.png'), class: 'float-3'
+          = image_tag asset_pack_path('cloud2.png'), alt: '', role: 'presentation', class: 'float-1'
+          = image_tag asset_pack_path('cloud3.png'), alt: '', role: 'presentation', class: 'float-2'
+          = image_tag asset_pack_path('cloud4.png'), alt: '', role: 'presentation', class: 'float-3'
         .heading
           %h1
             = @instance_presenter.site_title
@@ -54,7 +54,7 @@
                 %p= t('about.closed_registrations')
               - else
                 = @instance_presenter.closed_registrations_message.html_safe
-            = link_to t('about.find_another_instance'), 'https://joinmastodon.org', class: 'button button-alternative button--block'
+            = link_to t('about.find_another_instance'), 'https://joinmastodon.org/', class: 'button button-alternative button--block'
 
   .learn-more-cta
     .container
@@ -69,7 +69,7 @@
       .about-mastodon
         %h3= t 'about.what_is_mastodon'
         %p= t 'about.about_mastodon_html'
-        %a.button.button-secondary{ href: 'https://joinmastodon.org' }= t 'about.learn_more'
+        %a.button.button-secondary{ href: 'https://joinmastodon.org/' }= t 'about.learn_more'
         = render 'features'
   .footer-links
     .container
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index d91ba9c78..5ad1fd6ee 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -53,11 +53,11 @@
       %td= @account.followers_count
     %tr
       %th= t('admin.accounts.statuses')
-      %td= @account.statuses_count
+      %td= link_to @account.statuses_count, admin_account_statuses_path(@account.id)
     %tr
       %th= t('admin.accounts.media_attachments')
       %td
-        = @account.media_attachments.count
+        = link_to @account.media_attachments.count, admin_account_statuses_path(@account.id, { media: true })
         = surround '(', ')' do
           = number_to_human_size @account.media_attachments.sum('file_file_size')
     %tr
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index 44486cb42..5747cc274 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -1,3 +1,6 @@
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+
 - content_for :page_title do
   = t('admin.reports.report', id: @report.id)
 
@@ -19,16 +22,27 @@
 - unless @report.statuses.empty?
   %hr/
 
-  - @report.statuses.each do |status|
-    .report-status
-      .activity-stream.activity-stream-headless
-        .entry= render 'stream_entries/simple_status', status: status
-      .report-status__actions
-        - unless status.media_attachments.empty?
-          = link_to admin_report_reported_status_path(@report, status, status: { sensitive: !status.sensitive }), method: :patch, class: 'icon-button nsfw-button', title: t("admin.reports.nsfw.#{!status.sensitive}") do
-            = fa_icon status.sensitive? ? 'eye' : 'eye-slash'
-        = link_to admin_report_reported_status_path(@report, status), method: :delete, class: 'icon-button trash-button', title: t('admin.reports.delete'), data: { confirm: t('admin.reports.are_you_sure') } do
-          = fa_icon 'trash'
+  = form_for(@form, url: admin_report_reported_statuses_path(@report.id)) do |f|
+    .batch-form-box
+      .batch-checkbox-all
+        = check_box_tag :batch_checkbox_all, nil, false
+      = f.select :action, Form::StatusBatch::ACTION_TYPE.map{|action| [t("admin.statuses.batch.#{action}"), action]}
+      = f.submit t('admin.statuses.execute'), data: { confirm: t('admin.reports.are_you_sure') }, class: 'button'
+      .media-spoiler-toggle-buttons
+        .media-spoiler-show-button.button= t('admin.statuses.media.show')
+        .media-spoiler-hide-button.button= t('admin.statuses.media.hide')
+    - @report.statuses.each do |status|
+      .report-status{ data: { id: status.id } }
+        .batch-checkbox
+          = f.check_box :status_ids, { multiple: true, include_hidden: false }, status.id
+        .activity-stream.activity-stream-headless
+          .entry= render 'stream_entries/simple_status', status: status
+        .report-status__actions
+          - unless status.media_attachments.empty?
+            = link_to admin_report_reported_status_path(@report, status, status: { sensitive: !status.sensitive }), method: :put, class: 'icon-button nsfw-button', title: t("admin.reports.nsfw.#{!status.sensitive}") do
+              = fa_icon status.sensitive? ? 'eye' : 'eye-slash'
+          = link_to admin_report_reported_status_path(@report, status), method: :delete, class: 'icon-button trash-button', title: t('admin.reports.delete'), data: { confirm: t('admin.reports.are_you_sure') }, remote: true do
+            = fa_icon 'trash'
 
 %hr/
 
diff --git a/app/views/admin/statuses/index.html.haml b/app/views/admin/statuses/index.html.haml
new file mode 100644
index 000000000..fe2581527
--- /dev/null
+++ b/app/views/admin/statuses/index.html.haml
@@ -0,0 +1,47 @@
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+
+- content_for :page_title do
+  = t('admin.statuses.title')
+
+.back-link
+  = link_to admin_account_path(@account.id) do
+    %i.fa.fa-chevron-left.fa-fw
+    = t('admin.statuses.back_to_account')
+
+.filters
+  .filter-subset
+    %strong= t('admin.statuses.media.title')
+    %ul
+      %li= link_to t('admin.statuses.no_media'), admin_account_statuses_path(@account.id, current_params.merge(media: nil)), class: !params[:media] && 'selected'
+      %li= link_to t('admin.statuses.with_media'), admin_account_statuses_path(@account.id, current_params.merge(media: true)), class: params[:media] && 'selected'
+
+- if @statuses.empty?
+  .accounts-grid
+    = render 'accounts/nothing_here'
+- else
+  = form_for(@form, url: admin_account_statuses_path(@account.id)) do |f|
+    = hidden_field_tag :page, params[:page]
+    = hidden_field_tag :media, params[:media]
+    .batch-form-box
+      .batch-checkbox-all
+        = check_box_tag :batch_checkbox_all, nil, false
+      = f.select :action, Form::StatusBatch::ACTION_TYPE.map{|action| [t("admin.statuses.batch.#{action}"), action]}
+      = f.submit t('admin.statuses.execute'), data: { confirm: t('admin.reports.are_you_sure') }, class: 'button'
+      .media-spoiler-toggle-buttons
+        .media-spoiler-show-button.button= t('admin.statuses.media.show')
+        .media-spoiler-hide-button.button= t('admin.statuses.media.hide')
+    - @statuses.each do |status|
+      .account-status{ data: { id: status.id } }
+        .batch-checkbox
+          = f.check_box :status_ids, { multiple: true, include_hidden: false }, status.id
+        .activity-stream.activity-stream-headless
+          .entry= render 'stream_entries/simple_status', status: status
+        .account-status__actions
+          - unless status.media_attachments.empty?
+            = link_to admin_account_status_path(@account.id, status, current_params.merge(status: { sensitive: !status.sensitive })), method: :patch, class: 'icon-button nsfw-button', title: t("admin.reports.nsfw.#{!status.sensitive}") do
+              = fa_icon status.sensitive? ? 'eye' : 'eye-slash'
+          = link_to admin_account_status_path(@account.id, status), method: :delete, class: 'icon-button trash-button', title: t('admin.reports.delete'), data: { confirm: t('admin.reports.are_you_sure') }, remote: true do
+            = fa_icon 'trash'
+
+= paginate @statuses
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index 3b5d90942..fae6090c8 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -44,6 +44,7 @@
     = f.input :setting_noindex, as: :boolean, wrapper: :with_label
 
   .fields-group
+    = f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label
     = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label
     = f.input :setting_delete_modal, as: :boolean, wrapper: :with_label