Collapse posts/collections in moderation interface (#37929)

app/javascript/styles/mastodon/admin.scss

@@ -378,6 +378,15 @@ $content-width: 840px;
     }
   }
 
+  details > summary {
+    text-transform: uppercase;
+    font-size: 13px;
+    font-weight: 700;
+    color: var(--color-text-secondary);
+    padding-top: 24px;
+    margin-bottom: 8px;
+  }
+
   @media screen and (max-width: $no-columns-breakpoint) {
     display: block;
 

app/views/admin/reports/show.html.haml

@@ -41,41 +41,43 @@
 %p
   = t 'admin.reports.statuses_description_html'
 
-%h4
+%details{ open: @report.status_ids.any? }
-  = t 'admin.reports.statuses'
+  %summary
+    = t 'admin.reports.statuses', count: @report.status_ids.size
 
-= form_with model: @form, url: batch_admin_account_statuses_path(@report.target_account_id, report_id: @report.id) do |f|
+  = form_with model: @form, url: batch_admin_account_statuses_path(@report.target_account_id, report_id: @report.id) do |f|
-  .batch-table
-    .batch-table__toolbar
-      %label.batch-table__toolbar__select.batch-checkbox-all
-        = check_box_tag :batch_checkbox_all, nil, false
-      .batch-table__toolbar__actions
-        = link_to safe_join([material_symbol('add'), t('admin.reports.add_to_report')]),
-                  admin_account_statuses_path(@report.target_account_id, report_id: @report.id),
-                  class: 'table-action-link'
-        - if !@statuses.empty? && @report.unresolved?
-          = f.button safe_join([material_symbol('close'), t('admin.statuses.batch.remove_from_report')]), name: :remove_from_report, class: 'table-action-link', type: :submit
-    .batch-table__body
-      - if @statuses.empty?
-        = nothing_here 'nothing-here--under-tabs'
-      - else
-        = render partial: 'admin/shared/status_batch_row', collection: @statuses, as: :status, locals: { f: f }
-
-- if Mastodon::Feature.collections_enabled?
-  %h4
-    = t 'admin.reports.collections'
-
-  %form
     .batch-table
       .batch-table__toolbar
         %label.batch-table__toolbar__select.batch-checkbox-all
-          -# = check_box_tag :batch_checkbox_all, nil, false
+          = check_box_tag :batch_checkbox_all, nil, false
         .batch-table__toolbar__actions
+          = link_to safe_join([material_symbol('add'), t('admin.reports.add_to_report')]),
+                    admin_account_statuses_path(@report.target_account_id, report_id: @report.id),
+                    class: 'table-action-link'
+          - if !@statuses.empty? && @report.unresolved?
+            = f.button safe_join([material_symbol('close'), t('admin.statuses.batch.remove_from_report')]), name: :remove_from_report, class: 'table-action-link', type: :submit
       .batch-table__body
-        - if @report.collections.empty?
+        - if @statuses.empty?
           = nothing_here 'nothing-here--under-tabs'
         - else
-          = render partial: 'admin/shared/collection_batch_row', collection: @report.collections, as: :collection
+          = render partial: 'admin/shared/status_batch_row', collection: @statuses, as: :status, locals: { f: f }
+
+- if Mastodon::Feature.collections_enabled?
+  %details{ open: @report.collections.any? }
+    %summary
+      = t 'admin.reports.collections', count: @report.collections.size
+
+    %form
+      .batch-table
+        .batch-table__toolbar
+          %label.batch-table__toolbar__select.batch-checkbox-all
+            -# = check_box_tag :batch_checkbox_all, nil, false
+          .batch-table__toolbar__actions
+        .batch-table__body
+          - if @report.collections.empty?
+            = nothing_here 'nothing-here--under-tabs'
+          - else
+            = render partial: 'admin/shared/collection_batch_row', collection: @report.collections, as: :collection
 
 - if @report.unresolved?
   %hr.spacer/

config/locales/cs.yml

@@ -717,7 +717,7 @@ cs:
       cancel: Zrušit
       category: Kategorie
       category_description_html: Důvod nahlášení tohoto účtu a/nebo obsahu bude uveden v komunikaci s nahlášeným účtem
-      collections: Sbírky
+      collections: Sbírky (%{count})
       comment:
         none: Žádné
       comment_description_html: 'Pro upřesnění uživatel %{name} napsal:'
@@ -753,7 +753,7 @@ cs:
       resolved_msg: Hlášení úspěšně vyřešeno!
       skip_to_actions: Přeskočit k akcím
       status: Stav
-      statuses: Příspěvky
+      statuses: Příspěvky (%{count})
       statuses_description_html: Obsah porušující pravidla bude uveden v komunikaci s nahlášeným účtem
       summary:
         action_preambles:

config/locales/cy.yml

@@ -745,7 +745,7 @@ cy:
       cancel: Canslo
       category: Categori
       category_description_html: Bydd y rheswm dros adrodd am y cyfrif a/neu’r cynnwys hwn yn cael ei ddyfynnu wrth gyfathrebu â’r cyfrif a adroddwyd
-      collections: Casgliadau
+      collections: Casgliadau (%{count})
       comment:
         none: Dim
       comment_description_html: 'I ddarparu rhagor o wybodaeth, ysgrifennodd %{name}:'
@@ -781,7 +781,7 @@ cy:
       resolved_msg: Llwyddwyd i ddatrys yr adroddiad!
       skip_to_actions: Mynd i gamau gweithredu
       status: Statws
-      statuses: Postiadau
+      statuses: Postiadau (%{count})
       statuses_description_html: Bydd cynnwys tramgwyddus yn cael ei ddyfynnu wrth gyfathrebu â'r cyfrif a adroddwyd
       summary:
         action_preambles:

config/locales/da.yml

@@ -689,7 +689,7 @@ da:
       cancel: Afbryd
       category: Kategori
       category_description_html: Årsagen til anmeldelsen af denne konto og/eller indhold refereres i kommunikationen med den anmeldte konto
-      collections: Samlinger
+      collections: Samlinger (%{count})
       comment:
         none: Ingen
       comment_description_html: 'For at give mere information, skrev %{name}:'
@@ -725,7 +725,7 @@ da:
       resolved_msg: Anmeldelse løst!
       skip_to_actions: Overspring til foranstaltninger
       status: Status
-      statuses: Indlæg
+      statuses: Indlæg (%{count})
       statuses_description_html: Krænkende indhold citeres i kommunikationen med den anmeldte konto
       summary:
         action_preambles:

config/locales/de.yml

@@ -689,7 +689,7 @@ de:
       cancel: Abbrechen
       category: Kategorie
       category_description_html: Der Grund, weshalb dieses Konto und/oder der Inhalt gemeldet worden ist, wird in der Kommunikation mit dem gemeldeten Konto erwähnt
-      collections: Sammlungen
+      collections: Sammlungen (%{count})
       comment:
         none: Ohne ergänzenden Kommentar
       comment_description_html: "%{name} ergänzte die Meldung um folgende Hinweis:"
@@ -725,7 +725,7 @@ de:
       resolved_msg: Meldung erfolgreich geklärt!
       skip_to_actions: Zur Maßnahme springen
       status: Status
-      statuses: Beiträge
+      statuses: Beiträge (%{count})
       statuses_description_html: Beanstandete Inhalte werden in der Kommunikation mit dem gemeldeten Konto erwähnt
       summary:
         action_preambles:

config/locales/el.yml

@@ -689,7 +689,7 @@ el:
       cancel: Άκυρο
       category: Κατηγορία
       category_description_html: Ο λόγος για τον οποίο αναφέρθηκε αυτός ο λογαριασμός και/ή το περιεχόμενο θα εσωκλείεται σε επικοινωνία με τον αναφερόμενο λογαριασμό
-      collections: Συλλογές
+      collections: Συλλογές (%{count})
       comment:
         none: Κανένα
       comment_description_html: 'Για να δώσει περισσότερες πληροφορίες, ο/η %{name} έγραψε:'
@@ -725,7 +725,7 @@ el:
       resolved_msg: Η αναφορά επιλύθηκε επιτυχώς!
       skip_to_actions: Μετάβαση στις ενέργειες
       status: Κατάσταση
-      statuses: Αναρτήσεις
+      statuses: Αναρτήσεις (%{count})
       statuses_description_html: Το προσβλητικό περιεχόμενο θα εσωκλείεται στην επικοινωνία με τον αναφερόμενο λογαριασμό
       summary:
         action_preambles:

config/locales/en-GB.yml

@@ -689,7 +689,7 @@ en-GB:
       cancel: Cancel
       category: Category
       category_description_html: The reason this account and/or content was reported will be cited in communication with the reported account
-      collections: Collections
+      collections: Collections (%{count})
       comment:
         none: None
       comment_description_html: 'To provide more information, %{name} wrote:'
@@ -725,7 +725,7 @@ en-GB:
       resolved_msg: Report successfully resolved!
       skip_to_actions: Skip to actions
       status: Status
-      statuses: Posts
+      statuses: Posts (%{count})
       statuses_description_html: Offending content will be cited in communication with the reported account
       summary:
         action_preambles:

config/locales/en.yml

@@ -689,7 +689,7 @@ en:
       cancel: Cancel
       category: Category
       category_description_html: The reason this account and/or content was reported will be cited in communication with the reported account
-      collections: Collections
+      collections: Collections (%{count})
       comment:
         none: None
       comment_description_html: 'To provide more information, %{name} wrote:'
@@ -725,7 +725,7 @@ en:
       resolved_msg: Report successfully resolved!
       skip_to_actions: Skip to actions
       status: Status
-      statuses: Posts
+      statuses: Posts (%{count})
       statuses_description_html: Offending content will be cited in communication with the reported account
       summary:
         action_preambles:

config/locales/es-AR.yml

@@ -689,7 +689,7 @@ es-AR:
       cancel: Cancelar
       category: Categoría
       category_description_html: El motivo por el que se denunció esta cuenta o contenido será citado en las comunicaciones con la cuenta denunciada
-      collections: Colecciones
+      collections: Colecciones (%{count})
       comment:
         none: Ninguno
       comment_description_html: 'Para proporcionar más información, %{name} escribió:'
@@ -725,7 +725,7 @@ es-AR:
       resolved_msg: "¡Denuncia exitosamente resuelta!"
       skip_to_actions: Ir directamente a las acciones
       status: Estado
-      statuses: Mensajes
+      statuses: Mensajes (%{count})
       statuses_description_html: El contenido ofensivo se citará en la comunicación con la cuenta denunciada
       summary:
         action_preambles:

config/locales/es-MX.yml

@@ -689,7 +689,7 @@ es-MX:
       cancel: Cancelar
       category: Categoría
       category_description_html: La razón por la que se reportó esta cuenta o contenido será citada en las comunicaciones con la cuenta reportada
-      collections: Colecciones
+      collections: Colecciones (%{count})
       comment:
         none: Ninguno
       comment_description_html: 'Para proporcionar más información, %{name} escribió:'
@@ -725,7 +725,7 @@ es-MX:
       resolved_msg: "¡La denuncia se ha resuelto correctamente!"
       skip_to_actions: Ir directamente a las acciones
       status: Estado
-      statuses: Publicaciones
+      statuses: Publicaciones (%{count})
       statuses_description_html: El contenido ofensivo se citará en comunicación con la cuenta reportada
       summary:
         action_preambles:

config/locales/es.yml

@@ -689,7 +689,7 @@ es:
       cancel: Cancelar
       category: Categoría
       category_description_html: La razón por la que se reportó esta cuenta o contenido será citada en las comunicaciones con la cuenta reportada
-      collections: Colecciones
+      collections: Colecciones (%{count})
       comment:
         none: Ninguno
       comment_description_html: 'Para proporcionar más información, %{name} escribió:'
@@ -725,7 +725,7 @@ es:
       resolved_msg: "¡La denuncia se ha resuelto correctamente!"
       skip_to_actions: Ir directamente a las acciones
       status: Estado
-      statuses: Publicaciones
+      statuses: Publicaciones (%{count})
       statuses_description_html: El contenido ofensivo se citará en la comunicación con la cuenta reportada
       summary:
         action_preambles:

config/locales/fi.yml

@@ -689,7 +689,7 @@ fi:
       cancel: Peruuta
       category: Luokka
       category_description_html: Syy siihen, miksi tämä tili ja/tai sisältö raportoitiin, mainitaan ilmoitetun tilin kanssa viestiessä
-      collections: Kokoelmat
+      collections: Kokoelmat (%{count})
       comment:
         none: Ei mitään
       comment_description_html: 'Antaakseen lisätietoja %{name} kirjoitti:'
@@ -725,7 +725,7 @@ fi:
       resolved_msg: Raportin ratkaisu onnistui!
       skip_to_actions: Siirry toimiin
       status: Tila
-      statuses: Julkaisut
+      statuses: Julkaisut (%{count})
       statuses_description_html: Loukkaava sisältö mainitaan raportoidun tilin yhteydessä
       summary:
         action_preambles:

config/locales/fr-CA.yml

@@ -692,7 +692,7 @@ fr-CA:
       cancel: Annuler
       category: Catégorie
       category_description_html: La raison pour laquelle ce compte et/ou ce contenu a été signalé sera citée dans la communication avec le compte signalé
-      collections: Collections
+      collections: Collections (%{count})
       comment:
         none: Aucun
       comment_description_html: 'Pour fournir plus d''informations, %{name} a écrit :'
@@ -728,7 +728,7 @@ fr-CA:
       resolved_msg: Signalement résolu avec succès !
       skip_to_actions: Passer aux actions
       status: Statut
-      statuses: Messages
+      statuses: Messages (%{count})
       statuses_description_html: Le contenu offensant sera cité dans la communication avec le compte signalé
       summary:
         action_preambles:

config/locales/fr.yml

@@ -692,7 +692,7 @@ fr:
       cancel: Annuler
       category: Catégorie
       category_description_html: La raison pour laquelle ce compte et/ou ce contenu a été signalé sera citée dans la communication avec le compte signalé
-      collections: Collections
+      collections: Collections (%{count})
       comment:
         none: Aucun
       comment_description_html: 'Pour fournir plus d''informations, %{name} a écrit :'
@@ -728,7 +728,7 @@ fr:
       resolved_msg: Signalement résolu avec succès !
       skip_to_actions: Passer aux actions
       status: Statut
-      statuses: Messages
+      statuses: Messages (%{count})
       statuses_description_html: Le contenu offensant sera cité dans la communication avec le compte signalé
       summary:
         action_preambles:

config/locales/ga.yml

@@ -731,7 +731,7 @@ ga:
       cancel: Cealaigh
       category: Catagóir
       category_description_html: Luafar an chúis ar tuairiscíodh an cuntas seo agus/nó an t-ábhar seo i gcumarsáid leis an gcuntas tuairiscithe
-      collections: Bailiúcháin
+      collections: Bailiúcháin (%{count})
       comment:
         none: Dada
       comment_description_html: 'Chun tuilleadh eolais a sholáthar, scríobh %{name}:'
@@ -767,7 +767,7 @@ ga:
       resolved_msg: D'éirigh le réiteach an tuairisc!
       skip_to_actions: Léim ar ghníomhartha
       status: Stádas
-      statuses: Poist
+      statuses: Poist (%{count})
       statuses_description_html: Luafar ábhar ciontach i gcumarsáid leis an gcuntas tuairiscithe
       summary:
         action_preambles:

config/locales/gl.yml

@@ -689,7 +689,7 @@ gl:
       cancel: Cancelar
       category: Categoría
       category_description_html: A razón para denunciar esta conta ou contido será citada na comunicación coa conta denunciada
-      collections: Coleccións
+      collections: Coleccións (%{count})
       comment:
         none: Ningún
       comment_description_html: 'Como información engadida, %{name} escribiu:'
@@ -725,7 +725,7 @@ gl:
       resolved_msg: Resolveuse con éxito a denuncia!
       skip_to_actions: Ir a accións
       status: Estado
-      statuses: Publicacións
+      statuses: Publicacións (%{count})
       statuses_description_html: O contido ofensivo será citado na comunicación coa conta denunciada
       summary:
         action_preambles:

config/locales/hu.yml

@@ -689,7 +689,7 @@ hu:
       cancel: Mégse
       category: Kategória
       category_description_html: A fiók vagy tartalom bejelentésének oka a jelentett fiókkal kapcsolatos kommunikációban idézve lesz
-      collections: Gyűjtemények
+      collections: Gyűjtemények (%{count})
       comment:
         none: Egyik sem
       comment_description_html: 'Hogy további információkat adjon, %{name} ezt írta:'
@@ -725,7 +725,7 @@ hu:
       resolved_msg: A bejelentést sikeresen megoldottuk!
       skip_to_actions: Tovább az intézkedésekhez
       status: Állapot
-      statuses: Bejegyzések
+      statuses: Bejegyzések (%{count})
       statuses_description_html: A sértő tartalmat idézni fogjuk a bejelentett fiókkal való kommunikáció során
       summary:
         action_preambles:

config/locales/is.yml

@@ -689,7 +689,7 @@ is:
       cancel: Hætta við
       category: Flokkur
       category_description_html: Ástæðan fyrir því að þessi notandaaðgangur og/eða efni hans var kært mun verða tiltekin í samskiptum við kærðan notandaaðgang
-      collections: Söfn
+      collections: Söfn (%{count})
       comment:
         none: Ekkert
       comment_description_html: 'Til að gefa nánari upplýsingar skrifaði %{name}:'
@@ -725,7 +725,7 @@ is:
       resolved_msg: Það tókst að leysa kæruna!
       skip_to_actions: Sleppa og fara í aðgerðir
       status: Staða
-      statuses: Færslur
+      statuses: Færslur (%{count})
       statuses_description_html: Óviðeigandi efni verður tiltekið í samskiptum við kærðan notandaaðgang
       summary:
         action_preambles:

config/locales/it.yml

@@ -689,7 +689,7 @@ it:
       cancel: Annulla
       category: Categoria
       category_description_html: Il motivo per cui questo account e/o contenuto è stato segnalato sarà citato nella comunicazione con l'account segnalato
-      collections: Collezioni
+      collections: Collezioni (%{count})
       comment:
         none: Nessuno
       comment_description_html: 'Per fornire ulteriori informazioni, %{name} ha scritto:'
@@ -725,7 +725,7 @@ it:
       resolved_msg: Rapporto risolto!
       skip_to_actions: Passa alle azioni
       status: Stato
-      statuses: Post
+      statuses: Post (%{count})
       statuses_description_html: Il contenuto offensivo sarà citato nella comunicazione con l'account segnalato
       summary:
         action_preambles:

config/locales/pt-BR.yml

@@ -689,7 +689,7 @@ pt-BR:
       cancel: Cancelar
       category: Categoria
       category_description_html: O motivo pelo qual esta conta e/ou conteúdo foi denunciado será citado na comunicação com a conta denunciada
-      collections: Coleções
+      collections: Coleções (%{count})
       comment:
         none: Nenhum
       comment_description_html: 'Para fornecer mais informações, %{name} escreveu:'
@@ -725,7 +725,7 @@ pt-BR:
       resolved_msg: Denúncia resolvida!
       skip_to_actions: Pular para ações
       status: Estado
-      statuses: Publicações
+      statuses: Publicações (%{count})
       statuses_description_html: Conteúdo ofensivo será citado em comunicação com a conta denunciada
       summary:
         action_preambles:

config/locales/pt-PT.yml

@@ -686,7 +686,7 @@ pt-PT:
       cancel: Cancelar
       category: Categoria
       category_description_html: A razão pela qual esta conta e/ou conteúdo foi denunciado será citada na comunicação com a conta denunciada
-      collections: Coleções
+      collections: Coleções (%{count})
       comment:
         none: Nenhum
       comment_description_html: 'Para fornecer mais informações, %{name} escreveu:'
@@ -722,7 +722,7 @@ pt-PT:
       resolved_msg: Denúncia resolvida com sucesso!
       skip_to_actions: Passar para as ações
       status: Estado
-      statuses: Publicações
+      statuses: Publicações (%{count})
       statuses_description_html: O conteúdo ofensivo será citado na comunicação com a conta denunciada
       summary:
         action_preambles:

config/locales/sq.yml

@@ -685,7 +685,7 @@ sq:
       cancel: Anuloje
       category: Kategori
       category_description_html: Arsyeja pse kjo llogari dhe/ose lëndë raportohet do të citohet te komunikimi me llogarinë e raportuar
-      collections: Koleksione
+      collections: Koleksione (%{count})
       comment:
         none: Asnjë
       comment_description_html: 'Për të dhënë më tepër informacion, %{name} shkroi:'
@@ -721,7 +721,7 @@ sq:
       resolved_msg: Raportimi u zgjidh me sukses!
       skip_to_actions: Kaloni te veprimet
       status: Gjendje
-      statuses: Postime
+      statuses: Postime (%{count})
       statuses_description_html: Lënda problematike do të citohet në komunikimin me llogarinë e raportuar
       summary:
         action_preambles:

config/locales/sv.yml

@@ -716,7 +716,7 @@ sv:
       resolved_msg: Anmälan har lösts framgångsrikt!
       skip_to_actions: Hoppa till åtgärder
       status: Status
-      statuses: Inlägg
+      statuses: Inlägg (%{count})
       statuses_description_html: Stötande innehåll kommer att citeras i kommunikationen med det rapporterade kontot
       summary:
         action_preambles:

config/locales/vi.yml

@@ -675,7 +675,7 @@ vi:
       cancel: Hủy bỏ
       category: Phân loại
       category_description_html: Lý do tài khoản hoặc nội dung này bị báo cáo sẽ được trích dẫn khi giao tiếp với họ
-      collections: Collection
+      collections: Collection (%{count})
       comment:
         none: Không có mô tả
       comment_description_html: "%{name} cho biết thêm:"
@@ -711,7 +711,7 @@ vi:
       resolved_msg: Đã xử lý báo cáo xong!
       skip_to_actions: Kiểm duyệt
       status: Trạng thái
-      statuses: Tút
+      statuses: Tút (%{count})
       statuses_description_html: Lý do tài khoản hoặc nội dung này bị báo cáo sẽ được trích dẫn khi giao tiếp với họ
       summary:
         action_preambles:

config/locales/zh-CN.yml

@@ -675,7 +675,7 @@ zh-CN:
       cancel: 取消
       category: 类别
       category_description_html: 在与被举报账号的通信时，将引用该账号和/或内容被举报的原因
-      collections: 收藏列表
+      collections: 收藏列表 (%{count})
       comment:
         none: 没有
       comment_description_html: "%{name} 补充道："
@@ -711,7 +711,7 @@ zh-CN:
       resolved_msg: 举报处理成功！
       skip_to_actions: 跳转到操作
       status: 状态
-      statuses: 嘟文
+      statuses: 嘟文 (%{count})
       statuses_description_html: 在与该账号的通信中将引用违规内容
       summary:
         action_preambles:

config/locales/zh-TW.yml

@@ -675,7 +675,7 @@ zh-TW:
       cancel: 取消
       category: 分類
       category_description_html: 此帳號及/或被檢舉內容之原因將被引用於檢舉帳號通知中
-      collections: 收藏名單
+      collections: 收藏名單 (%{count})
       comment:
         none: 無
       comment_description_html: 提供更多資訊，%{name} 寫道：
@@ -711,7 +711,7 @@ zh-TW:
       resolved_msg: 檢舉報告已處理完成！
       skip_to_actions: 跳過行動
       status: 嘟文
-      statuses: 嘟文
+      statuses: 嘟文 (%{count})
       statuses_description_html: 侵犯性違規內容將被引用於檢舉帳號通知中
       summary:
         action_preambles: