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-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb b/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb index cf1be3bcd95d7..76680cb02af26 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.restricted? %>
<%= t("restricted_space", scope: "decidim.participatory_spaces.show") %> 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 e0711ccee882f..5a12577fa7188 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 %> -
+

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 83ddf160e27de..f2b0669480ede 100644 --- a/decidim-core/app/views/decidim/gamification/badges/index.html.erb +++ b/decidim-core/app/views/decidim/gamification/badges/index.html.erb @@ -3,9 +3,9 @@ description: t(".page_description") ) %> -
+
-
+

-
+
<% 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..ad4c819c8a06f 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_enabled ? "main" : nil) do %> <%= content_for :flash_messages %> <%= yield %> <% end %> 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-elections/app/views/layouts/decidim/election_booth.html.erb b/decidim-elections/app/views/layouts/decidim/election_booth.html.erb index d2758a4c79248..96eff8c954680 100644 --- a/decidim-elections/app/views/layouts/decidim/election_booth.html.erb +++ b/decidim-elections/app/views/layouts/decidim/election_booth.html.erb @@ -12,7 +12,7 @@
-
+
<%= render partial: "layouts/decidim/election_votes_header" %>
@@ -22,7 +22,7 @@ <%= display_flash_messages %>
<% end %> -
+
<%= yield %>
diff --git a/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb b/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb index efb0ea3f3c339..acc1ff1ef6169 100644 --- a/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb +++ b/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb @@ -2,8 +2,8 @@ <%= append_stylesheet_pack_tag "decidim_initiatives", media: "all" %> <%= render "layouts/decidim/application" do %> - <%= render layout: "layouts/decidim/shared/layout_center" do %> -
+ <%= render layout: "layouts/decidim/shared/layout_center", locals: { main_enabled: false } do %> +
<%= yield %>
<% if content_for? :expanded %> 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 0a67d0b080faa..8203514855121 100644 --- a/decidim-initiatives/app/views/layouts/decidim/initiative_head.html.erb +++ b/decidim-initiatives/app/views/layouts/decidim/initiative_head.html.erb @@ -6,7 +6,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-meetings/app/views/decidim/meetings/layouts/live_event.html.erb b/decidim-meetings/app/views/decidim/meetings/layouts/live_event.html.erb index 100c2b79a9f64..726e665d975ce 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 @@ -13,7 +13,7 @@ <%= render partial: "layouts/decidim/timeout_modal" %> -
+

-
+
<%= yield %>
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 b4c05e933b050..e7fa302991a35 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 } %> -
+
<% if current_participatory_space.restricted? %>
<%= t("restricted_space", scope: "decidim.participatory_spaces.show") %> 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" %> -
+