diff --git a/app/views/components/_comments_checked_submenu.haml b/app/views/components/_comments_checked_submenu.haml new file mode 100644 index 00000000..4998e5c7 --- /dev/null +++ b/app/views/components/_comments_checked_submenu.haml @@ -0,0 +1,3 @@ += render 'components/dropdown_item', text: t('.submenu_pause'), path: '/' += render 'components/dropdown_item', text: t('.submenu_accept'), path: '/' += render 'components/dropdown_item', text: t('.submenu_reject'), path: '/' \ No newline at end of file diff --git a/app/views/components/_comments_filters.haml b/app/views/components/_comments_filters.haml new file mode 100644 index 00000000..7c453088 --- /dev/null +++ b/app/views/components/_comments_filters.haml @@ -0,0 +1,6 @@ +.d-flex.py-2 + = render 'components/dropdown', text: t('.text_checked') do + = render 'components/comments_checked_submenu' + + = render 'components/dropdown', text: t('.text_show') do + = render 'components/comments_show_submenu' \ No newline at end of file diff --git a/app/views/components/_comments_show_submenu.haml b/app/views/components/_comments_show_submenu.haml new file mode 100644 index 00000000..0308b926 --- /dev/null +++ b/app/views/components/_comments_show_submenu.haml @@ -0,0 +1,4 @@ += render 'components/dropdown_item', text: t('.submenu_pause'), path: '/' += render 'components/dropdown_item', text: t('.submenu_accept'), path: '/' += render 'components/dropdown_item', text: t('.submenu_report'), path: '/' += render 'components/dropdown_item', text: t('.submenu_reject'), path: '/' \ No newline at end of file diff --git a/app/views/components/_instances_checked_submenu.haml b/app/views/components/_instances_checked_submenu.haml new file mode 100644 index 00000000..f0b76185 --- /dev/null +++ b/app/views/components/_instances_checked_submenu.haml @@ -0,0 +1,3 @@ += render 'components/dropdown_item', text: t('.submenu_case'), path: '/' += render 'components/dropdown_item', text: t('.submenu_allow'), path: '/' += render 'components/dropdown_item', text: t('.submenu_reject'), path: '/' \ No newline at end of file diff --git a/app/views/components/_instances_filters.haml b/app/views/components/_instances_filters.haml new file mode 100644 index 00000000..213bb7c0 --- /dev/null +++ b/app/views/components/_instances_filters.haml @@ -0,0 +1,6 @@ +.d-flex.py-2 + = render 'components/dropdown', text: t('.text_checked') do + = render 'components/instances_checked_submenu' + + = render 'components/dropdown', text: t('.text_show') do + = render 'components/comments_show_submenu' diff --git a/app/views/components/_instances_show_submenu.haml b/app/views/components/_instances_show_submenu.haml new file mode 100644 index 00000000..1074cc3f --- /dev/null +++ b/app/views/components/_instances_show_submenu.haml @@ -0,0 +1,2 @@ += render 'components/dropdown_item', text: t('.submenu_allow'), path: '/' += render 'components/dropdown_item', text: t('.submenu_reject'), path: '/' \ No newline at end of file diff --git a/app/views/components/_profiles_checked_submenu.haml b/app/views/components/_profiles_checked_submenu.haml new file mode 100644 index 00000000..8d8f8940 --- /dev/null +++ b/app/views/components/_profiles_checked_submenu.haml @@ -0,0 +1,4 @@ += render 'components/dropdown_item', text: t('.submenu_pause'), path: '/' += render 'components/dropdown_item', text: t('.submenu_accept'), path: '/' += render 'components/dropdown_item', text: t('.submenu_reject'), path: '/' += render 'components/dropdown_item', text: t('.submenu_block'), path: '/' diff --git a/app/views/components/_profiles_filters.haml b/app/views/components/_profiles_filters.haml new file mode 100644 index 00000000..0088afef --- /dev/null +++ b/app/views/components/_profiles_filters.haml @@ -0,0 +1,6 @@ +.d-flex.py-2 + = render 'components/dropdown', text: t('.text_checked') do + = render 'components/profiles_checked_submenu' + + = render 'components/dropdown', text: t('.text_show') do + = render 'components/profiles_show_submenu' \ No newline at end of file diff --git a/app/views/components/_profiles_show_submenu.haml b/app/views/components/_profiles_show_submenu.haml new file mode 100644 index 00000000..2ba949b1 --- /dev/null +++ b/app/views/components/_profiles_show_submenu.haml @@ -0,0 +1,3 @@ += render 'components/dropdown_item', text: t('.submenu_accept'), path: '/' += render 'components/dropdown_item', text: t('.submenu_reject'), path: '/' += render 'components/dropdown_item', text: t('.submenu_block'), path: '/' \ No newline at end of file diff --git a/app/views/moderation_queue/_accounts.haml b/app/views/moderation_queue/_accounts.haml index 1885059e..e954d2f3 100644 --- a/app/views/moderation_queue/_accounts.haml +++ b/app/views/moderation_queue/_accounts.haml @@ -1,12 +1,5 @@ -# Filtros -.d-flex.py-2 - = render 'components/dropdown', text: t('moderation_queue.filter_box.text_checked') do - = render 'components/dropdown_item', text: t('moderation_queue.filter_box.submenu_case'), path: '/' - = render 'components/dropdown_item', text: t('moderation_queue.filter_box.submenu_allow'), path: '/' - = render 'components/dropdown_item', text: t('moderation_queue.filter_box.submenu_reject'), path: '/' - = render 'components/dropdown', text: t('moderation_queue.filter_box.text_show') do - = render 'components/dropdown_item', text: t('moderation_queue.filter_box.submenu_allow'), path: '/' - = render 'components/dropdown_item', text: t('moderation_queue.filter_box.submenu_reject'), path: '/' += render 'components/profiles_filters' - @moderation_queue.map{ |c| c['attributedTo'] }.uniq.each do |remote_profile| = render 'account', profile: remote_profile diff --git a/app/views/moderation_queue/_comments.haml b/app/views/moderation_queue/_comments.haml index e4285326..c5f7ae5d 100644 --- a/app/views/moderation_queue/_comments.haml +++ b/app/views/moderation_queue/_comments.haml @@ -1,5 +1,5 @@ -# Filtros -= render 'moderation_queue/filter_box' += render 'components/comments_filters' - moderation_queue.each do |comment| diff --git a/app/views/moderation_queue/_instances.haml b/app/views/moderation_queue/_instances.haml index 38f4ad51..e50a6e02 100644 --- a/app/views/moderation_queue/_instances.haml +++ b/app/views/moderation_queue/_instances.haml @@ -1,17 +1,9 @@ -# Filtros -.d-flex.py-2 - = render 'components/dropdown', text: t('moderation_queue.filter_box.text_checked') do - = render 'components/dropdown_item', text: t('moderation_queue.filter_box.submenu_case'), path: '/' - = render 'components/dropdown_item', text: t('moderation_queue.filter_box.submenu_allow'), path: '/' - = render 'components/dropdown_item', text: t('moderation_queue.filter_box.submenu_reject'), path: '/' - = render 'components/dropdown', text: t('moderation_queue.filter_box.text_show') do - = render 'components/dropdown_item', text: t('moderation_queue.filter_box.submenu_allow'), path: '/' - = render 'components/dropdown_item', text: t('moderation_queue.filter_box.submenu_reject'), path: '/' += render 'components/instances_filters' - @instances.each do |instance| = render 'moderation_queue/instance', instance: instance - -# Botones moderación .d-flex.py-4 - @class = 'btn btn-secondary' diff --git a/app/views/posts/_moderation_queue.haml b/app/views/posts/_moderation_queue.haml index fa6adfef..df17b1ff 100644 --- a/app/views/posts/_moderation_queue.haml +++ b/app/views/posts/_moderation_queue.haml @@ -1,15 +1,6 @@ .flex -# Filtros - .d-flex.py-2 - = render 'components/dropdown', text: t('moderation_queue.filter_box.text_checked') do - = render 'components/dropdown_item', text: t('moderation_queue.filter_box.submenu_pause'), path: '/' - = render 'components/dropdown_item', text: t('moderation_queue.filter_box.submenu_reject'), path: '/' - = render 'components/dropdown_item', text: t('moderation_queue.filter_box.submenu_accept'), path: '/' - = render 'components/dropdown', text: t('moderation_queue.filter_box.text_show') do - = render 'components/dropdown_item', text: t('moderation_queue.filter_box.submenu_pause'), path: '/' - = render 'components/dropdown_item', text: t('moderation_queue.filter_box.submenu_reject'), path: '/' - = render 'components/dropdown_item', text: t('moderation_queue.filter_box.submenu_accept'), path: '/' - = render 'components/dropdown_item', text: t('moderation_queue.filter_box.submenu_report'), path: '/' + = render 'components/comments_filters' - moderation_queue.each do |comment| = render 'moderation_queue/comment', comment: comment, profile: @remote_profile diff --git a/config/locales/es.yml b/config/locales/es.yml index fd1626e3..7cd59cbf 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1,4 +1,39 @@ es: + components: + instances_filters: + text_show: Ver + text_checked: Con los marcados + instances_checked_submenu: + submenu_case: Moderar caso por caso + submenu_allow: Permitir todo + submenu_reject: Rechazado + instances_show_submenu: + submenu_allow: Permitido + submenu_reject: Rechazado + comments_filters: + text_show: Ver + text_checked: Con los marcados + comments_checked_submenu: + submenu_pause: Pausado + submenu_accept: Aceptado + submenu_reject: Rechazado + comments_show_submenu: + submenu_pause: Pausado + submenu_accept: Aceptado + submenu_report: Reportado + submenu_reject: Rechazado + profiles_filters: + text_show: Ver + text_checked: Con los marcados + profiles_checked_submenu: + submenu_pause: Pausado + submenu_accept: Aceptado + submenu_reject: Rechazado + submenu_block: Bloqueado + profiles_show_submenu: + submenu_accept: Aceptado + submenu_block: Bloqueado + submenu_reject: Rechazado moderation_queue: index: title: Actividades de moderación @@ -25,15 +60,6 @@ es: text_accept: Aceptar Publicación text_reply: Responder text_report: Reportar - filter_box: - text_show: Ver - text_checked: Con los marcados - submenu_pause: Pausado - submenu_reject: Rechazado - submenu_accept: Aceptado - submenu_report: Reportado - submenu_case: Moderar caso por caso - submenu_allow: Permitir todo instances_button_box: text_check: Moderar caso por caso text_allow: Permitir todo @@ -44,6 +70,9 @@ es: block_lists: Listas de bloqueo custom_block: Lista personalizada de bloqueo submit: Guardar lista de bloqueo + comments_filter_box: + text_show: Ver + text_checked: Con los marcados dark: Oscuro es: Castellano en: English