decidim-core 0.31.2 → 0.32.1

data/app/views/decidim/devise/invitations/edit.html.erb

@@ -4,7 +4,7 @@
     <h1 class="title-decorator inline-block text-left mb-12"><%= t "devise.invitations.edit.header" %></h1>
 
     <p class="text-lg text-gray-2">
-      <%= t("devise.invitations.edit.subtitle").html_safe %>
+      <%= current_organization.users_registration_mode_disabled? ? t("devise.invitations.edit.subtitle_no_password").html_safe : t("devise.invitations.edit.subtitle").html_safe %>
     </p>
   </div>
 
@@ -16,8 +16,8 @@
 
       <%= f.text_field :nickname, help_text: t("devise.invitations.edit.nickname_help", organization: current_organization_name), required: "required", autocomplete: "nickname" %>
 
-      <% if f.object.class.require_password_on_accepting %>
-        <%= render partial: "decidim/account/password_fields", locals: { form: f, user: :user } %>
+      <% unless current_organization.users_registration_mode_disabled? %>
+        <%= render partial: "decidim/account/password_fields", locals: { form: f, user: resource.admin? ? :admin : :user } %>
       <% end %>
     </div>
 

data/app/views/decidim/devise/registrations/new.html.erb

@@ -34,6 +34,7 @@
       <%= f.text_field :name, help_text: t("decidim.devise.registrations.new.username_help"), autocomplete: "name", placeholder: "John Doe" %>
 
       <%= f.email_field :email, autocomplete: "email", placeholder: t("placeholder_email", scope: "decidim.devise.shared") %>
+      <span class="sr-only"><%= t("placeholder_email", scope: "decidim.devise.shared") %></span>
 
       <%= render partial: "decidim/account/password_fields", locals: { form: f, user: :user } %>
     </div>

data/app/views/decidim/devise/shared/_tos_fields.html.erb

@@ -1,13 +1,13 @@
 <div id="card__tos" class="form__wrapper-block border-y-2">
   <h2 class="h4"><%= t("decidim.devise.registrations.new.tos_title") %></h2>
+  <span class="sr-only"><%= t("forms.required") %></span>
 
-  <div>
+  <div id="terms_of_service_summary">
     <% terms_of_service_summary_content_blocks.each do |content_block| %>
       <%= cell content_block.manifest.cell, content_block %>
     <% end %>
   </div>
-
-  <%= form.check_box :tos_agreement, label: t("decidim.devise.registrations.new.tos_agreement", link: link_to(t("decidim.devise.registrations.new.terms"), decidim.page_path("terms-of-service"))), label_options: { class: "form__wrapper-checkbox-label" } %>
+  <%= form.check_box :tos_agreement, label: t("decidim.devise.registrations.new.tos_agreement", link: link_to(t("decidim.devise.registrations.new.terms"), decidim.page_path("terms-of-service"))), label_options: { class: "form__wrapper-checkbox-label" }, "aria-describedby": "terms_of_service_summary" %>
 </div>
 
 <div id="card__newsletter" class="form__wrapper-block">

data/app/views/decidim/gamification/badges/index.html.erb

@@ -3,7 +3,7 @@
   description: t(".page_description")
 ) %>
 
-<main class="layout-1col cols-10">
+<main class="layout-1col cols-10" role="main">
 
   <header class="text-center py-10">
     <h1 class="title-decorator inline-block text-left mb-12">

data/app/views/decidim/homepage/show.html.erb

@@ -1,13 +1,13 @@
 <%
   edit_link(
-    decidim_admin.edit_organization_path,
+    decidim_admin.edit_organization_homepage_path,
     :update,
     :organization,
     organization: current_organization
   )
 %>
 
-<main class="home">
+<main class="home" role="main">
   <% Decidim::ContentBlock.published.for_scope(:homepage, organization: current_organization).each do |content_block| %>
     <% next unless content_block.manifest %>
 

data/app/views/decidim/last_activities/index.html.erb

@@ -1,7 +1,7 @@
 <% add_decidim_page_title(t("last_activity", scope: "decidim.last_activities.index")) %>
 
 <%# NOTE: this page does not use a regular layout %>
-<main class="container">
+<main class="container" role="main">
   <h1 class="title-decorator my-12"><%= t("last_activity", scope: "decidim.last_activities.index") %></h1>
 
   <div class="profile__activity pb-16">

data/app/views/decidim/messaging/conversations/_error_modal.html.erb

@@ -1,21 +1,13 @@
-<div id="messageErrorModal" data-reveal>
-  <div>
-    <h2><%= error %></h2>
-    <button class="close-button" data-close aria-label="<%= t(".close") %>"
-      type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <div class="reveal__body">
-    <p><%= t(".intro") %></p>
-    <p>
-      <%= messages.join("<br>") %>
-    </p>
-    <p><%= t(".correct_errors") %></p>
-  </div>
-  <div>
-    <div>
-      <a class="button" role="button" href="#" data-close aria-label="<%= t(".ok") %>"><%= t(".ok") %></a>
+<%= decidim_modal id: "messageErrorModal", class: "conversation__modal-error" do %>
+  <div data-dialog-container>
+    <h2 id="dialog-title-messageErrorModal" tabindex="-1" data-dialog-title><%= error %></h2>
+    <div id="dialog-desc-messageErrorModal" class="mt-4">
+      <p><%= t(".intro") %></p>
+      <p><%= safe_join(messages, tag.br) %></p>
+      <p><%= t(".correct_errors") %></p>
+    </div>
+    <div data-dialog-actions>
+      <button type="button" class="button button__sm lg:button__lg button__secondary" data-dialog-close="messageErrorModal" aria-label="<%= t(".ok") %>"><%= t(".ok") %></button>
     </div>
   </div>
-</div>
+<% end %>

data/app/views/decidim/messaging/conversations/_new_conversation_button.html.erb

@@ -5,7 +5,7 @@
 
 <%= decidim_modal id: "conversation", class: "conversation__modal" do %>
   <%= decidim_form_for(@form, url: conversations_check_multiple_url, html: { class: "form", id: nil }) do |f| %>
-    <%= render "add_conversation_users", object: f, locals: { title: "new title" } %>
+    <%= render "decidim/messaging/conversations/add_conversation_users", object: f, locals: { title: "new title" } %>
 
     <div data-dialog-actions>
       <button type="button" class="button button__sm md:button__lg button__transparent-secondary" data-dialog-close="conversation">

data/app/views/decidim/messaging/conversations/_reply.html.erb

@@ -2,7 +2,7 @@
   <% if conversation.with_deleted_users?(current_user) %>
     <%= cell("decidim/announcement", t("decidim.messaging.conversations.show.deleted_accounts"), callout_class: "warning") %>
   <% elsif conversation.accept_user?(current_user) %>
-    <%= render "reply_form", form:, conversation: %>
+    <%= render "decidim/messaging/conversations/reply_form", form:, conversation: %>
   <% else %>
     <%= cell("decidim/announcement", t("decidim.messaging.conversations.show.not_allowed"), callout_class: "warning") %>
   <% end %>

data/app/views/decidim/messaging/conversations/error.js.erb

@@ -1,10 +1,15 @@
-var $messageError = $("#messageErrorModal");
-if ($messageError.length > 0) {
-  $messageError.foundation("_destroy").remove();
+var messageError = document.getElementById("messageErrorModal")
+
+if (messageError) {
+  messageError.remove();
 }
+document.body.insertAdjacentHTML("beforeend", "<%= j(render "error_modal", error:, messages:).html_safe %>");
 
-$("#messages").append("<%= j(render "error_modal", error:, messages:).html_safe %>");
-$messageError = $("#messageErrorModal");
+messageError = document.getElementById("messageErrorModal")
+if (messageError) {
+  window.createDialog(messageError);
 
-var messageErrorReveal = new Foundation.Reveal($messageError);
-messageErrorReveal.open();
+  if (Decidim.currentDialogs.messageErrorModal) {
+    window.Decidim.currentDialogs.messageErrorModal.open();
+  }
+}

data/app/views/decidim/messaging/conversations/new.html.erb

@@ -1,4 +1,4 @@
 <%= render layout: "show", locals: { participants: @form.recipient.to_a } do %>
   <div id="messages" class="space-y-6" data-controller="scroll-to-last"></div>
-  <%= render "start", form: @form %>
+  <%= render "decidim/messaging/conversations/start", form: @form %>
 <% end %>

data/app/views/decidim/messaging/conversations/show.html.erb

@@ -1,9 +1,9 @@
 <%= render layout: "show", locals: { participants: conversation.interlocutors(current_user) } do %>
   <div id="messages" class="space-y-6" data-controller="scroll-to-last">
     <% user_grouped_messages.each do |sender, messages| %>
-      <%= render "messages", sender:, messages: %>
+      <%= render "decidim/messaging/conversations/messages", sender:, messages: %>
     <% end %>
   </div>
 
-  <%= render "reply", form: @form, conversation: %>
+  <%= render "decidim/messaging/conversations/reply", form: @form, conversation: %>
 <% end %>

data/app/views/decidim/newsletters/unsubscribe.html.erb

@@ -1,4 +1,4 @@
-<main class="layout-1col cols-6">
+<main class="layout-1col cols-6" role="main">
   <div class="text-center py-12">
     <h1 class="h1 decorator inline-block text-left"><%= t ".unsubscribe" %></h1>
   </div>

data/app/views/decidim/notification_mailer/event_received.html.erb

@@ -15,7 +15,7 @@
 
   <blockquote>
     <p>
-      <%= @event_instance.safe_resource_text %>
+      <%= decidim_transform_image_urls(@event_instance.safe_resource_text, @organization.host).html_safe %>
     </p>
   </blockquote>
 <% end %>
@@ -28,7 +28,7 @@
   <p style="font-weight: bold"><%= t(".translated_text") %></p>
   <blockquote>
     <p>
-      <%= @event_instance.safe_resource_translated_text %>
+      <%= decidim_transform_image_urls(@event_instance.safe_resource_translated_text, @organization.host).html_safe %>
     </p>
   </blockquote>
 <% end %>
@@ -40,7 +40,7 @@
         <table>
           <tr>
             <td>
-              <%= link_to @event_instance.button_text, @event_instance.button_url, target: :blank %>
+              <%= link_to decidim_sanitize(@event_instance.button_text, strip_tags: true), @event_instance.button_url, target: :blank %>
             </td>
           </tr>
         </table>

data/app/views/decidim/notifications_settings/show.html.erb

@@ -167,20 +167,20 @@
       <% end %>
 
       <% if @notifications_settings.meet_push_notifications_requirements? %>
-        <div class="push-notifications js-sw-mandatory">
+        <div class="push-notifications js-sw-mandatory" data-push-notifications-container>
           <label>
             <%= t("push_notifications", scope: "decidim.notifications_settings.show") %>
           </label>
-          <p id="push-notifications-reminder" class="push-notifications__reminder block my-4">
+          <p id="push-notifications-reminder" class="push-notifications__reminder block my-4" data-push-notifications-reminder>
             <%= t("push_notifications_reminder", scope: "decidim.notifications_settings.show") %>
           </p>
           <div class="toggle__switch-trigger">
             <label class="toggle__switch-toggle" for="allow_push_notifications">
               <span>
                 <input
-                  <%== %(checked="checked") if @notifications_settings.meet_push_notifications_requirements? %>
                   id="allow_push_notifications"
                   type="checkbox"
+                  data-push-notifications-toggle
                   name="allow_push_notifications">
                 <span class="toggle__switch-toggle-content">
                 </span>
@@ -194,8 +194,8 @@
           </div>
         </div>
 
-        <input id="vapidPublicKey" name="vapid_public_key" type="hidden" value="<%= Base64.urlsafe_decode64(Decidim.vapid_public_key.to_s).bytes %>">
-        <input id="subKeys" name="sub_key" type="hidden" value="<%= current_user.notifications_subscriptions.keys %>">
+        <input id="vapidPublicKey" name="vapid_public_key" data-push-vapid-public-key type="hidden" value="<%= Base64.urlsafe_decode64(Decidim.vapid_public_key.to_s).bytes.to_json %>">
+        <input id="subKeys" name="sub_key" data-push-sub-keys type="hidden" value="<%= current_user.notifications_subscriptions.keys.to_json %>">
       <% end %>
 
       <div class="form__wrapper-block">

data/app/views/decidim/offline/show.html.erb

@@ -1,6 +1,6 @@
 <% add_decidim_page_title(t("decidim.offline.name")) %>
 
-<main id="offline-fallback-html" class="text-center my-8">
+<main id="offline-fallback-html" class="text-center my-8" role="main">
   <div class="flex justify-center">
     <svg xmlns="http://www.w3.org/2000/svg" width="5rem" height="r5em" viewBox="0 0 25 25">
       <path

data/app/views/decidim/pages/_tabbed.html.erb

@@ -11,16 +11,16 @@
 
   <div class="vertical-tabs">
     <nav role="navigation" aria-label="<%= I18n.t("layouts.decidim.navigation.aria_label", title: translated_attribute(page.title)) %>">
-      <button id="dropdown-trigger-pages" data-controller="dropdown" data-target="dropdown-menu-pages" data-open-md="true" data-auto-close="true">
+      <button id="dropdown-trigger-pages" data-controller="dropdown" data-target="dropdown-menu-pages" data-open-md="true" data-auto-close="true" data-add-aria-roles="false">
         <span>
           <%= translated_attribute(page.title) %>
         </span>
         <%= icon "arrow-down-s-line" %>
         <%= icon "arrow-up-s-line" %>
       </button>
-      <ul id="dropdown-menu-pages" class="vertical-tabs__list" role="menu">
+      <ul id="dropdown-menu-pages" class="vertical-tabs__list">
         <% pages.each do |sibling| %>
-          <li class="<%= "is-active" if page == sibling %>" role="menuitem">
+          <li class="<%= "is-active" if page == sibling %>">
             <%= link_to translated_attribute(sibling.title), page_path(sibling.slug), "aria-current": ("page" if page == sibling) %>
           </li>
         <% end %>

data/app/views/decidim/pages/index.html.erb

@@ -42,7 +42,7 @@ edit_link(
                 <div id="accordion-panel-<%= ix %>" class="page__accordion-panel" aria-hidden="true">
                   <ul role="menu">
                     <% topic.pages.each do |page| %>
-                      <li role="menuitem"><%= link_to translated_attribute(page.title), page_path(page), class: "text-secondary" %></li>
+                      <li role="presentation"><%= link_to translated_attribute(page.title), page_path(page), class: "text-secondary", role: "menuitem" %></li>
                     <% end %>
                   </ul>
                 </div>

data/app/views/decidim/participatory_space/members/_member.html.erb

@@ -0,0 +1 @@
+<%= cell "decidim/member", Decidim::ParticipatorySpace::MemberPresenter.new(member) %>

data/app/views/decidim/profiles/show.html.erb

@@ -6,6 +6,6 @@
 <% end %>
 
 <%# NOTE: this page does not use a regular layout %>
-<main>
+<main role="main">
   <%= cell "decidim/profile", profile_holder, context: { content_cell: @content_cell } %>
 </main>

data/app/views/decidim/searches/_filters.html.erb

@@ -16,7 +16,7 @@
         </button>
       <% end %>
     </div>
-    <button id="dropdown-trigger-search" data-controller="dropdown" data-target="dropdown-menu-search" data-auto-close="true" aria-expanded="true">
+    <button id="dropdown-trigger-search" data-controller="dropdown" data-target="dropdown-menu-search" data-auto-close="true">
       <%= content_tag :span, t("decidim.searches.filters_small_view.filter_by"), class: "#{"is-active" if params.dig(:filter, :with_resource_type) == nil}" %>
       <% @blocks.each do |elements| %>
         <% elements.each do |type, results| %>

data/app/views/decidim/shared/_filters.html.erb

@@ -2,9 +2,9 @@
 <% search_label = t("decidim.searches.filters.search") unless local_assigns.has_key?(:search_label) %>
 
 <% if filter_sections.present? || local_assigns.has_key?(:search_variable) %>
-  <%= filter_form_for filter, url_for, class: "new_filter self-stretch", data: { filters: "", controller: "accordion form-filter" } do |form| %>
+  <%= filter_form_for filter, url_for, class: "new_filter self-stretch", data: { filters: "", controller: "accordion form-filter", panel_role: "group" } do |form| %>
 
-    <button id="dropdown-trigger-filters" data-controller="dropdown" data-target="dropdown-menu-filters" data-open-md="true">
+    <button id="dropdown-trigger-filters" data-controller="dropdown" data-target="dropdown-menu-filters" data-open-md="true" data-add-aria-roles="false">
       <%= icon "arrow-down-s-line" %>
       <%= icon "arrow-up-s-line" %>
       <span>
@@ -14,13 +14,13 @@
 
     <div id="dropdown-menu-filters">
       <% if local_assigns.has_key?(:skip_to_id) %>
-        <%= link_to t("skip", scope: "decidim.shared.filter_form_help"), "##{skip_to_id}", class: "filter-skip", role: "menuitem", "data-skip-to-content": true %>
+        <%= link_to t("skip", scope: "decidim.shared.filter_form_help"), "##{skip_to_id}", class: "filter-skip", "data-skip-to-content": true %>
       <% end %>
 
-      <p id="filter-help-text" class="filter-help" role="menuitem" aria-disabled="true"><%= t("help", scope: "decidim.shared.filter_form_help") %></p>
+      <p id="filter-help-text" class="filter-help" aria-disabled="true"><%= t("help", scope: "decidim.shared.filter_form_help") %></p>
 
       <% if local_assigns.has_key?(:search_variable) %>
-        <div class="filter-search filter-container" role="menuitem">
+        <div class="filter-search filter-container">
           <%= form.search_field search_variable,
                                 label: false,
                                 placeholder: search_label,

data/app/views/decidim/shared/_resource_actions.html.erb

@@ -12,12 +12,12 @@
     <ul class="dropdown dropdown__bottom divide-y divide-gray-3" role="menu">
       <%= yield %>
       <% unless defined?(skip_report) && skip_report %>
-        <li role="menuitem" class="dropdown__item">
-          <%= cell "decidim/report_button", resource, button_classes: "dropdown__button" %>
+        <li role="presentation" class="dropdown__item">
+          <%= cell "decidim/report_button", resource, button_classes: "dropdown__button", html_options: { role: "menuitem" } %>
         </li>
       <% end %>
-      <li role="menuitem" class="dropdown__item">
-        <%= cell "decidim/follow_button", resource, large: false, button_classes: "dropdown__button" %>
+      <li role="presentation" class="dropdown__item">
+        <%= cell "decidim/follow_button", resource, large: false, button_classes: "dropdown__button", html_options: { role: "menuitem" } %>
       </li>
     </ul>
   </div>

data/app/views/decidim/shared/_results_per_page.html.erb

@@ -13,7 +13,7 @@
         <% Decidim::Paginable::OPTIONS.each do |per_page_option| %>
           <li role="presentation">
             <%= link_to per_page_option,
-                        url_for(params.to_unsafe_h.merge(page: nil, per_page: per_page_option)),
+                        url_for(params.to_unsafe_h.except("locale", :locale).merge(page: nil, per_page: per_page_option)),
                         data: { per_page_option: },
                         class: "dropdown__item",
                         title: t("decidim.shared.results_per_page.title"),

data/app/views/decidim/shared/filters/_check_boxes_tree.html.erb

@@ -1,4 +1,4 @@
-<div class="filter-container" role="menuitem">
+<div class="filter-container">
   <button id="trigger-menu-<%= id %>" data-controls="panel-dropdown-menu-<%= id %>" data-open="false" data-open-md="true">
     <%= icon "arrow-down-s-line" %>
     <%= icon "arrow-up-s-line" %>
@@ -6,6 +6,6 @@
   </button>
 
   <div id="panel-dropdown-menu-<%= id %>">
-    <%= form.dropdown_label(collection, method, check_boxes_tree_id:, parent_id: nil) %>
+    <%= form.dropdown_label(collection, method, name:, check_boxes_tree_id:, parent_id: nil) %>
   </div>
 </div>

data/app/views/decidim/shared/filters/_collection.html.erb

@@ -1,4 +1,4 @@
-<div class="filter-container" role="menuitem">
+<div class="filter-container">
   <button id="trigger-menu-<%= id %>" data-controls="panel-dropdown-menu-<%= id %>" data-open="false" data-open-md="true">
     <%= icon "arrow-down-s-line" %>
     <%= icon "arrow-up-s-line" %>

data/app/views/decidim/shared/filters/_dropdown_label.html.erb

@@ -7,7 +7,7 @@
 <% end %>
 
 <% if is_blank_root %>
-  <%= hidden_field_tag "#{form.object_name}[#{method}][]", "", id: "#{form.options[:namespace] rescue "default"}_filter_#{check_boxes_tree_id}_all" %>
+  <%= hidden_field_tag "#{form.object_name}#{name}[]", "", id: "#{form.options[:namespace] rescue "default"}_filter_#{check_boxes_tree_id}_all" %>
 <% end %>
 
 <div class="filter">
@@ -22,7 +22,8 @@
           id: data_checkboxes_tree_id,
           namespace: form.options[:namespace],
           parent_id:,
-          object: form.object
+          object: form.object,
+          name: "#{form.object_name}#{name}[]"
         ),
         leaf.value.to_s,
         nil
@@ -38,7 +39,7 @@
 <% if item.tree_node? && item.node.present? %>
   <% subitems_content = capture do %>
     <% item.node.each do |subitem| %>
-      <%= form.dropdown_label(subitem, method, check_boxes_tree_id:, parent_id: data_checkboxes_tree_id || "") %>
+      <%= form.dropdown_label(subitem, method, name:, check_boxes_tree_id:, parent_id: data_checkboxes_tree_id || "") %>
     <% end %>
   <% end %>
 

data/app/views/decidim/user_activities/index.html.erb

@@ -6,7 +6,7 @@
 <% end %>
 
 <%# NOTE: this page does not use a regular layout %>
-<main>
+<main role="main">
   <%= cell "decidim/profile", user, context: {
         content_cell: "decidim/user_activity",
         activities:,

data/app/views/devise/mailer/{invite_private_user.html.erb → invite_member.html.erb}

@@ -2,9 +2,9 @@
 
 <p class="email-instructions">
   <% if @resource.invited_by.present? %>
-    <%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
+    <%= t("devise.mailer.invitation_instructions.invited_you_as_member", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
   <% else %>
-    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: organization_name(@resource.organization)) %>
+    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_member", application: organization_name(@resource.organization)) %>
   <% end %>
 </p>
 

data/app/views/devise/mailer/{invite_private_user.text.erb → invite_member.text.erb}

@@ -1,9 +1,9 @@
 <%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
 
 <% if @resource.invited_by.present? %>
-<%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
+<%= t("devise.mailer.invitation_instructions.invited_you_as_member", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
 <% else %>
-<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: organization_name(@resource.organization)) %>
+<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_member", application: organization_name(@resource.organization)) %>
 <% end %>
 
 <%= accept_invitation_url(@resource, invitation_token: @token, host: @resource.organization.host) %>

data/app/views/layouts/decidim/_head.html.erb

@@ -1,7 +1,7 @@
 <%= csrf_meta_tags %>
 
-<% available_locales.each do |locale| %>
-  <link rel="alternate" href="<%= current_url(request.parameters.merge(locale:)) %>" hreflang="<%= locale %>">
+<% available_locales.excluding(current_locale).each do |locale| %>
+  <link rel="alternate" href="<%= canonical_url(request.url, locale) %>" hreflang="<%= locale %>">
 <% end %>
 
 <%= tag :meta, name: "viewport", content: "width=device-width, initial-scale=1.0" %>

data/app/views/layouts/decidim/_wrapper.html.erb

@@ -11,8 +11,8 @@ end
 %>
 
 <div class="layout-container">
-  <header <%= "class=with-admin-bar" if current_user && allowed_to?(:read, :admin_dashboard) %>>
-    <div id="sticky-header-container" data-controller="sticky-header">
+  <header <%= "class=with-admin-bar" if current_user && allowed_to?(:read, :admin_dashboard) %> role="banner">
+    <div id="header-container">
       <%= render partial: "layouts/decidim/impersonation_warning" %>
       <%= render partial: "layouts/decidim/omnipresent_banner" %>
       <%= render partial: "layouts/decidim/offline_banner" %>
@@ -37,7 +37,7 @@ end
     <%= yield %>
   </div>
 
-  <footer>
+  <footer role="contentinfo">
     <% if current_user&.ephemeral? || content_for?(:focus_mode) %>
       <%= render partial: "layouts/decidim/footer/focus_mode_main" %>
     <% else %>

data/app/views/layouts/decidim/footer/_focus_mode_main.html.erb

@@ -2,6 +2,5 @@
   <div class="main-footer__down">
     <%= render partial: "layouts/decidim/footer/main_legal" %>
     <div class="w-full md:w-auto md:ml-auto"></div>
-    <%= render partial: "layouts/decidim/footer/main_language_chooser" %>
   </div>
 </div>

data/app/views/layouts/decidim/footer/_main.html.erb

@@ -3,7 +3,7 @@
     <div class="lg:w-1/3">
       <%= render partial: "layouts/decidim/footer/main_intro" %>
     </div>
-    <div class="lg:w-2/3 grid grid-cols-1 gap-x-4 gap-y-10 lg:grid-cols-4 text-md text-white">
+    <div class="lg:w-2/3 grid grid-cols-1 gap-x-4 lg:grid-cols-4 text-md text-white">
       <%= render partial: "layouts/decidim/footer/main_links" %>
     </div>
   </div>
@@ -14,6 +14,5 @@
     <nav class="w-full md:w-auto md:ml-auto" role="navigation" aria-label="<%= t("layouts.decidim.footer.social_media") %>">
       <%= render partial: "layouts/decidim/footer/main_social_media_links" %>
     </nav>
-    <%= render partial: "layouts/decidim/footer/main_language_chooser" %>
   </div>
 </div>