Merge branch 'issue-14966' of 0xacab.org:sutty/sutty into issue-15109-1

app/views/components/_block_list.haml

@@ -4,5 +4,5 @@
     .d-flex.flex-row
       = render 'components/checkbox', id: blocklist['id'] do
         -#%span.h4= blocklist["title"]
-        %h4
+        %h4.m-0
           %a{ href: blocklist['link'] }= blocklist['title']

app/views/layouts/_details.haml

@@ -2,5 +2,6 @@
 
 %details.details.py-2
   %summary
+    .col-11
       %h3.py-2= summary
   = yield

app/views/moderation_queue/_account.haml

@@ -5,3 +5,7 @@
     %h4
       %a{href: profile['id']}= profile['preferredUsername']
     =profile['summary'].html_safe
+
+    -# Botones de Moderación
+    .d-flex.pb-4
+      = render 'components/profiles_btn_box'

app/views/moderation_queue/_accounts.haml

@@ -9,7 +9,4 @@
   %hr
   = render 'account', profile: remote_profile
 
--# Botones de Moderación
-.d-flex.pb-4
-  = render 'components/profiles_btn_box'
 

app/views/moderation_queue/_block_instances_textarea.haml

@@ -1,5 +1,5 @@
 .form-group
   = label_tag "custom_blocklist", t('moderation_queue.instances.custom_block')
   = text_area_tag "custom_blocklist", nil, class: 'form-control'
-  %button.btn.btn-secondary.mt-3{ type: 'submit' }= t('moderation_queue.instances.submit')
+  %p
-
+    %a.mt-3{ role: 'button', href: '', class: 'btn btn-secondary' }= t('moderation_queue.instances.submit')

app/views/moderation_queue/_instance.haml

@@ -5,8 +5,12 @@
     %h4
       %a{ href: instance.uri }= instance.content['title']
     %p= instance.content['description'].html_safe
-    %p
+    %dl
-      %span= t('.users')
+      %dt= t('.users')
-      %span
+      %dd
         = instance.content.dig('usage', 'users', 'active_month')
         = instance.content.dig('stats', 'user_count')
+    
+    -# Botones moderación
+    .d-flex.pb-4
+      = render 'components/instances_btn_box', instance_moderation: instance_moderation

app/views/moderation_queue/_instances.haml

@@ -15,10 +15,6 @@
           %hr
           = render 'moderation_queue/instance', instance_moderation: instance_moderation, instance: instance_moderation.instance
 
-          -# Botones moderación
-          .d-flex.pb-4
-            = render 'components/instances_btn_box', site: site, instance_moderation: instance_moderation
-
       %hr
   %div
     %h3.mt-5= t('moderation_queue.instances.title')

app/views/moderation_queue/_remote_profile.haml

@@ -5,14 +5,19 @@
     %dt= t('.profile_name')
     %dd= remote_profile['name']
 
+    %dt= t('.preferred_name')
+    %dd= remote_profile['preferredUsername']
+
     %dt= t('.profile_id')
-    %dd= remote_profile['id']
+    %dd
+      %a{ href: 'https://mastodon.mauve.moe/users/mauve' }= remote_profile['id']
 
     %dt= t('.profile_published')
-    %dd= remote_profile['published'].to_datetime.strftime('%m/%d/%Y')
+    %dd
-
+      = render 'layouts/time', time: remote_profile['published']
     %dt= t('.profile_summary')
-    %dd= remote_profile['summary'].html_safe
+    %dd
+      %p= remote_profile['summary'].html_safe
 
   = render 'moderation_queue/comments', moderation_queue: @moderation_queue
 

config/locales/en.yml

@@ -117,6 +117,7 @@ en:
       user: Username
       profile: Profile
       profile_name: Profile name
+      preferred_name: Name in Fediverse
       profile_id: ID
       profile_published: Published
       profile_summary: Summary
@@ -125,6 +126,7 @@ en:
       description: Description
       custom_block: Custom block lists
       submit: Save block lists
+    instance:
       users: "Users:"
   dark: Dark
   dir: ltr

config/locales/es.yml

@@ -117,14 +117,16 @@ es:
       user: Nombre de usuario
       profile: Cuenta de Origen
       profile_name: Nombre de la Cuenta
+      preferred_name: Nombre en el Fediverso
       profile_id: ID
       profile_published: Publicada
-      profile_summary: Resumen
+      profile_summary: Presentación
     instances:
       title:  Mis listas de bloqueo
       description: Descripción de listas de bloqueo
       custom_block: Lista personalizada de bloqueo
       submit: Guardar lista de bloqueo
+    instance:
       users: "Usuaries:"
   dark: Oscuro
   es: Castellano