From 010a78087104c1dcf956c6bfdf1b4963464b1a48 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Wed, 12 Nov 2025 15:14:02 +0100 Subject: [PATCH 01/10] fix: add appropriate roles on header and footer --- decidim-core/app/views/layouts/decidim/_wrapper.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/decidim-core/app/views/layouts/decidim/_wrapper.html.erb b/decidim-core/app/views/layouts/decidim/_wrapper.html.erb index 067a78c7d2c30..821171a6dda1e 100644 --- a/decidim-core/app/views/layouts/decidim/_wrapper.html.erb +++ b/decidim-core/app/views/layouts/decidim/_wrapper.html.erb @@ -11,7 +11,7 @@ end %>
-
> +
role="banner">
<%= render partial: "layouts/decidim/impersonation_warning" %> <%= render partial: "layouts/decidim/omnipresent_banner" %> @@ -37,7 +37,7 @@ end <%= yield %>
-
+
<% if current_user&.ephemeral? || content_for?(:focus_mode) %> <%= render partial: "layouts/decidim/footer/focus_mode_main" %> <% else %> From d4b5dfa21962275242344029a1d0f1ae5ec42d34 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Wed, 12 Nov 2025 15:19:55 +0100 Subject: [PATCH 02/10] fix: add role main in admin and system --- .../app/views/layouts/decidim/admin/_application.html.erb | 2 +- .../app/views/layouts/decidim/system/application.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb b/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb index a0f8cd6c93cac..425c8e9492ad0 100644 --- a/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb +++ b/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb @@ -11,7 +11,7 @@ -
+
<%= render partial: "layouts/decidim/admin/title_bar_responsive" %> diff --git a/decidim-system/app/views/layouts/decidim/system/application.html.erb b/decidim-system/app/views/layouts/decidim/system/application.html.erb index f88472e1f287b..a9cc9cfb07aba 100644 --- a/decidim-system/app/views/layouts/decidim/system/application.html.erb +++ b/decidim-system/app/views/layouts/decidim/system/application.html.erb @@ -11,7 +11,7 @@ <%= render partial: "layouts/decidim/system/sidebar" %> -
+
+ diff --git a/decidim-core/app/views/layouts/decidim/shared/_layout_center.html.erb b/decidim-core/app/views/layouts/decidim/shared/_layout_center.html.erb index c053bcc1d4826..6fa7644f00b79 100644 --- a/decidim-core/app/views/layouts/decidim/shared/_layout_center.html.erb +++ b/decidim-core/app/views/layouts/decidim/shared/_layout_center.html.erb @@ -10,6 +10,6 @@ css_class = case columns end %> -<%= content_tag main_tag, class: "layout-1col #{css_class}" do %> +<%= content_tag main_tag, class: "layout-1col #{css_class}", role: "main" do %> <%= yield %> <% end %> diff --git a/decidim-core/app/views/layouts/decidim/shared/_layout_item.html.erb b/decidim-core/app/views/layouts/decidim/shared/_layout_item.html.erb index 5a245970dd03f..340293823d7f0 100644 --- a/decidim-core/app/views/layouts/decidim/shared/_layout_item.html.erb +++ b/decidim-core/app/views/layouts/decidim/shared/_layout_item.html.erb @@ -2,7 +2,7 @@ <%= yield :item_header %>
-
+
<% if params[:included_in] %> <%= render partial: "layouts/decidim/shared/linked_resource" %> <% end %> diff --git a/decidim-core/app/views/layouts/decidim/shared/_layout_two_col.html.erb b/decidim-core/app/views/layouts/decidim/shared/_layout_two_col.html.erb index f8c1fd11b687c..f466e0cfeec1f 100644 --- a/decidim-core/app/views/layouts/decidim/shared/_layout_two_col.html.erb +++ b/decidim-core/app/views/layouts/decidim/shared/_layout_two_col.html.erb @@ -7,7 +7,7 @@ <%= yield :aside %> <% main_tag = main_enabled ? :main : :div %> - <%= content_tag main_tag, class: "layout-2col__main" do %> + <%= content_tag main_tag, class: "layout-2col__main", role: "main" do %> <%= content_for :flash_messages %> <%= yield %> <% end %> From 9c46b98adf5f0aca1da42b8ac2bd136afb685a26 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Wed, 12 Nov 2025 15:24:09 +0100 Subject: [PATCH 04/10] fix: add missing role main in decidim-conferences views --- .../admin/send_conference_diploma_mailer/diploma_user.html.erb | 2 +- .../views/decidim/conferences/conference_program/show.html.erb | 2 +- .../decidim/conferences/conference_speakers/index.html.erb | 2 +- .../app/views/decidim/conferences/conferences/show.html.erb | 2 +- .../app/views/decidim/conferences/media/index.html.erb | 2 +- .../views/decidim/conferences/registration_types/index.html.erb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/decidim-conferences/app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb b/decidim-conferences/app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb index 7e50550778536..042aa5020dcf7 100644 --- a/decidim-conferences/app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb @@ -1,4 +1,4 @@ -
+
diff --git a/decidim-conferences/app/views/decidim/conferences/conference_program/show.html.erb b/decidim-conferences/app/views/decidim/conferences/conference_program/show.html.erb index 591a3e0391e9f..75d593f13e176 100644 --- a/decidim-conferences/app/views/decidim/conferences/conference_program/show.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/conference_program/show.html.erb @@ -14,7 +14,7 @@ end %> <%# NOTE: this page does not use a regular layout %> -
+

<%= t(".program") %> <%= t(".program") %> (<%= translated_attribute current_participatory_space.title %>) diff --git a/decidim-conferences/app/views/decidim/conferences/conference_speakers/index.html.erb b/decidim-conferences/app/views/decidim/conferences/conference_speakers/index.html.erb index 77c855563a3ae..bfb883f5dcb37 100644 --- a/decidim-conferences/app/views/decidim/conferences/conference_speakers/index.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/conference_speakers/index.html.erb @@ -14,7 +14,7 @@ edit_link( %> <%# NOTE: this page does not use a regular layout %> -
+

diff --git a/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb b/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb index f8cbf75ddc5fb..37e66f5856e43 100644 --- a/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb @@ -20,7 +20,7 @@ edit_link( include the hero inside the two-column layout. Therefore is mandatory to pass the "main_enabled: false" flag to the layout_two_col for disabling the original main. %> -
+
<%= content_for :aside do %>
diff --git a/decidim-conferences/app/views/decidim/conferences/media/index.html.erb b/decidim-conferences/app/views/decidim/conferences/media/index.html.erb index 6baad67eb1192..2ea7fb5b7260f 100644 --- a/decidim-conferences/app/views/decidim/conferences/media/index.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/media/index.html.erb @@ -13,7 +13,7 @@ edit_link( %> <%# NOTE: this page does not use a regular layout %> -
+

<%= t("media", scope: "layouts.decidim.conferences_nav") %> <%= t("media", scope: "layouts.decidim.conferences_nav") %> (<%= translated_attribute current_participatory_space.title %>) diff --git a/decidim-conferences/app/views/decidim/conferences/registration_types/index.html.erb b/decidim-conferences/app/views/decidim/conferences/registration_types/index.html.erb index f785a76fa3064..a66b12a1eb043 100644 --- a/decidim-conferences/app/views/decidim/conferences/registration_types/index.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/registration_types/index.html.erb @@ -16,7 +16,7 @@ edit_link( <%= append_stylesheet_pack_tag "decidim_conferences" %> <%# NOTE: this page does not use a regular layout %> -
+

From 7a22f9977f45c32dac3b4f23a0337400f768544b Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Wed, 12 Nov 2025 15:25:32 +0100 Subject: [PATCH 05/10] fix: add missing role main in initiatives and processes views --- .../app/views/layouts/decidim/election_booth.html.erb | 2 +- .../app/views/layouts/decidim/initiative_head.html.erb | 2 +- .../participatory_process_groups/show.html.erb | 2 +- .../participatory_processes/show.html.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/decidim-elections/app/views/layouts/decidim/election_booth.html.erb b/decidim-elections/app/views/layouts/decidim/election_booth.html.erb index d2758a4c79248..943f8bfa3749b 100644 --- a/decidim-elections/app/views/layouts/decidim/election_booth.html.erb +++ b/decidim-elections/app/views/layouts/decidim/election_booth.html.erb @@ -22,7 +22,7 @@ <%= display_flash_messages %>

<% end %> -
+
<%= yield %>
diff --git a/decidim-initiatives/app/views/layouts/decidim/initiative_head.html.erb b/decidim-initiatives/app/views/layouts/decidim/initiative_head.html.erb index 2a644271e7670..354804f0cb77c 100644 --- a/decidim-initiatives/app/views/layouts/decidim/initiative_head.html.erb +++ b/decidim-initiatives/app/views/layouts/decidim/initiative_head.html.erb @@ -8,7 +8,7 @@ <%= render "layouts/decidim/application" do %> <%= render partial: "decidim/initiatives/initiatives/initiative_hero" %> <%= render layout:"layouts/decidim/shared/layout_two_col", locals: { reverse: true, main_enabled: false } do %> -
+
<%= yield %>
<% end %> diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb index ca88b316b304b..8400ce665de75 100644 --- a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb +++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb @@ -12,7 +12,7 @@ ) %> -
+
<% active_content_blocks.each do |content_block| %> <% next unless content_block.manifest %> <%= cell content_block.manifest.cell, content_block %> diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb index 2e806acd194bf..4719c18a9f5b9 100644 --- a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb +++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb @@ -16,7 +16,7 @@ <%= render partial: "layouts/decidim/header/follow_space_menu_bar_button", locals: { participatory_space: current_participatory_space } %> -
+
<%# NOTE: this elements goes outside of the .participatory-space__container block %> <% if current_participatory_space.private_space? %>
From cba98f208e8b78aa16315fe034a9b683246c0a15 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Wed, 12 Nov 2025 15:26:39 +0100 Subject: [PATCH 06/10] fix: add missign role main in views --- .../app/views/decidim/assemblies/assemblies/show.html.erb | 2 +- .../app/views/layouts/decidim/design/_layout.html.erb | 2 +- .../app/views/layouts/decidim/initiative.html.erb | 2 +- .../app/views/decidim/meetings/layouts/live_event.html.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb b/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb index 260c7b36c05d9..e63cf4cefceba 100644 --- a/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb +++ b/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb @@ -15,7 +15,7 @@ edit_link( <%= render partial: "layouts/decidim/header/follow_space_menu_bar_button", locals: { participatory_space: current_participatory_space } %> -
+
<% if current_participatory_space.private_space? %>
<%= t("private_space", scope: "decidim.assemblies.show") %> diff --git a/decidim-design/app/views/layouts/decidim/design/_layout.html.erb b/decidim-design/app/views/layouts/decidim/design/_layout.html.erb index 739dd8982c9ee..d7c1470777e1f 100644 --- a/decidim-design/app/views/layouts/decidim/design/_layout.html.erb +++ b/decidim-design/app/views/layouts/decidim/design/_layout.html.erb @@ -53,7 +53,7 @@ -
+
<% if content_for?(:heading) %>

diff --git a/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb b/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb index a49d60de5d8a2..88a48cb72395a 100644 --- a/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb +++ b/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb @@ -5,7 +5,7 @@ <%= render "layouts/decidim/application" do %> <%= render layout: "layouts/decidim/shared/layout_center" do %> -
+
<%= yield %>
<% if content_for? :expanded %> diff --git a/decidim-meetings/app/views/decidim/meetings/layouts/live_event.html.erb b/decidim-meetings/app/views/decidim/meetings/layouts/live_event.html.erb index 100c2b79a9f64..bb645acbb080d 100644 --- a/decidim-meetings/app/views/decidim/meetings/layouts/live_event.html.erb +++ b/decidim-meetings/app/views/decidim/meetings/layouts/live_event.html.erb @@ -30,7 +30,7 @@

-
+
<%= yield %>
From 841ddf6afac75a3f14eb84fd4944ae3af57c75a6 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Wed, 12 Nov 2025 15:38:11 +0100 Subject: [PATCH 07/10] fix: remove unrelated code --- .../header/_main_links_mobile_account.html.erb | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb b/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb index d2625c46365dc..f72ba2726225f 100644 --- a/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb +++ b/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb @@ -10,9 +10,8 @@
-
+
<%= icon "close-line" %> -

<%= t("close", scope: "decidim.shared.flag_modal") %>

@@ -38,16 +37,3 @@ - From f8f64ff44c2a0603694cddfed227efd591fa10f7 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Wed, 12 Nov 2025 16:26:40 +0100 Subject: [PATCH 08/10] fix: add missing role banner in views --- .../app/views/decidim/gamification/badges/index.html.erb | 2 +- decidim-core/app/views/decidim/pages/_tabbed.html.erb | 2 +- .../views/layouts/decidim/shared/_layout_user_profile.html.erb | 2 +- .../app/views/layouts/decidim/election_booth.html.erb | 2 +- .../app/views/decidim/meetings/layouts/live_event.html.erb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/decidim-core/app/views/decidim/gamification/badges/index.html.erb b/decidim-core/app/views/decidim/gamification/badges/index.html.erb index d5726ec31aee3..f2b0669480ede 100644 --- a/decidim-core/app/views/decidim/gamification/badges/index.html.erb +++ b/decidim-core/app/views/decidim/gamification/badges/index.html.erb @@ -5,7 +5,7 @@
-
+