decidim-core 0.31.5 → 0.32.0.rc2

data/app/queries/decidim/last_activity.rb

@@ -79,7 +79,7 @@ module Decidim
       Decidim.participatory_space_manifests.map do |manifest|
         klass = manifest.model_class_name.constantize
 
-        condition = if klass.include?(Decidim::HasPrivateUsers)
+        condition = if klass.include?(Decidim::ParticipatorySpace::HasMembers)
                       Arel.sql(
                         <<~SQL.squish
                           (

data/app/serializers/decidim/exporters/participatory_space_serializer.rb

@@ -27,7 +27,8 @@ module Decidim
           follows_count: resource.follows_count,
           short_description: resource.short_description,
           description: resource.description,
-          promoted: resource.promoted
+          promoted: resource.promoted,
+          component_settings:
         }
       end
 
@@ -98,6 +99,19 @@ module Decidim
         serializer = Decidim::Exporters::ParticipatorySpaceComponentsSerializer.new(resource)
         serializer.run
       end
+
+      def component_settings
+        return unless resource.respond_to?(:components)
+
+        resource.components.map do |component|
+          {
+            id: component.id,
+            name: component.name,
+            manifest_name: component.manifest_name,
+            settings: component.settings.respond_to?(:as_json) ? component.settings.as_json : component.settings
+          }
+        end
+      end
     end
   end
 end

data/app/services/decidim/email_notification_generator.rb

@@ -44,6 +44,7 @@ module Decidim
 
     def send_to_affected_users
       affected_users.each do |recipient|
+        next unless recipient.is_a?(Decidim::User)
         next unless ["all", "own-only"].include?(recipient.notification_types)
         next if recipient.deleted? || recipient.blocked?
 
@@ -53,6 +54,7 @@ module Decidim
 
     def send_to_followers
       followers.each do |recipient|
+        next unless recipient.is_a?(Decidim::User)
         next unless ["all", "followed-only"].include?(recipient.notification_types)
         next if recipient.deleted? || recipient.blocked?
 

data/app/services/decidim/notification_generator.rb

@@ -37,10 +37,14 @@ module Decidim
       return unless event_class.types.include?(:notification)
 
       followers.each do |recipient|
+        next unless recipient.is_a?(Decidim::User)
+
         generate_notification_for(recipient, user_role: :follower) if ["all", "followed-only"].include?(recipient.notification_types)
       end
 
       affected_users.each do |recipient|
+        next unless recipient.is_a?(Decidim::User)
+
         generate_notification_for(recipient, user_role: :affected_user) if ["all", "own-only"].include?(recipient.notification_types)
       end
     end

data/app/uploaders/decidim/organization_favicon_uploader.rb

@@ -7,7 +7,8 @@ module Decidim
       huge: 512,
       big: 192,
       medium: 180,
-      small: 32
+      small: 32,
+      favicon: 256
     }.freeze
 
     set_variants do
@@ -16,17 +17,11 @@ module Decidim
           resize_and_pad: [value, value],
           format: :png
         }
-      end.merge(
-        favicon: {
-          resize_and_pad: [256, 256],
-          define: "icon:auto-resize=16,24,32,48,64,72,96,128,256",
-          format: :ico
-        }
-      )
+      end
     end
 
     def extension_allowlist
-      %w(png jpg jpeg webp ico)
+      %w(png jpg jpeg webp)
     end
   end
 end

data/app/validators/uploader_image_dimensions_validator.rb

@@ -3,7 +3,7 @@
 # This validator checks when the files to be uploaded are images and the attached uploader's
 # has enabled dimensions validation that the image dimensions are below the
 # limit defined by the uploader
-require "mini_magick"
+require "vips"
 
 class UploaderImageDimensionsValidator < ActiveModel::Validations::FileContentTypeValidator
   def validate_each(record, attribute, value)
@@ -28,14 +28,16 @@ class UploaderImageDimensionsValidator < ActiveModel::Validations::FileContentTy
     return unless uploader.validable_dimensions
     return if (image = extract_image(file)).blank?
 
-    record.errors.add attribute, I18n.t("decidim.errors.files.file_resolution_too_large") if image.dimensions.any? { |dimension| dimension > uploader.max_image_height_or_width }
-  rescue MiniMagick::Error
-    # The error may happen because of many reasons but most commonly the image
-    # exceeds the default maximum dimensions set for ImageMagick when the
-    # `identify` command fails to identify the image.
+    # A simple check to avoid DoS with maliciously crafted images, or just to
+    # avoid reckless users that upload images with too many pixels.
     #
-    # To relax ImageMagick default limits, please refer to:
-    # https://imagemagick.org/script/security-policy.php
+    # See https://hackerone.com/reports/390
+    max_dimension = [image.width, image.height].max
+    record.errors.add attribute, I18n.t("decidim.errors.files.file_resolution_too_large") if max_dimension > uploader.max_image_height_or_width
+  rescue Vips::Error
+    # The error may happen because of many reasons but most commonly the image
+    # exceeds the default maximum dimensions set for libvips when the image
+    # fails to load.
     #
     # Note that the error can also happen because of other reasons than only
     # the image dimensions being too large. But as we do not really know the
@@ -47,11 +49,11 @@ class UploaderImageDimensionsValidator < ActiveModel::Validations::FileContentTy
     return unless file.try(:content_type).to_s.start_with?("image")
 
     if uploaded_file?(file)
-      MiniMagick::Image.new(file.path, File.extname(file.original_filename))
+      Vips::Image.new_from_file(file.path)
     elsif file.is_a?(ActiveStorage::Attached) && file.blob.persisted?
-      MiniMagick::Image.read(file.blob.download, File.extname(file.blob.filename.to_s))
+      Vips::Image.new_from_buffer(file.blob.download, "")
     end
-  rescue ActiveStorage::FileNotFoundError, MiniMagick::Invalid
+  rescue ActiveStorage::FileNotFoundError, Vips::Error
     # Although the blob is persisted, the file is not available to download and analyze
     # after committing the record
     nil

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

@@ -1,6 +1,6 @@
 <%
   edit_link(
-    decidim_admin.edit_organization_path,
+    decidim_admin.edit_organization_homepage_path,
     :update,
     :organization,
     organization: current_organization

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/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/participatory_space/members/_member.html.erb

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

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

@@ -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/_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/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

@@ -12,7 +12,7 @@ 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">
+    <div id="header-container">
       <%= render partial: "layouts/decidim/impersonation_warning" %>
       <%= render partial: "layouts/decidim/omnipresent_banner" %>
       <%= render partial: "layouts/decidim/offline_banner" %>

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

@@ -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>

data/app/views/layouts/decidim/header/_focus_mode_back_button.html.erb

@@ -9,11 +9,14 @@
   <% end %>
 </div>
 
+<div class="main-bar__language-chooser-desktop focus-mode">
+  <%= render partial: "layouts/decidim/header/main_language_chooser", locals: { id: "dropdown-menu-language-chooser-desktop" } %>
+</div>
+
 <div class="main-bar__back-button lg:hidden">
   <%= link_to(
       content_for(:focus_mode_return_path),
       class: "main-bar__links-desktop__item",
-      type: :button,
       "aria-label": t("layouts.decidim.header.back")
     ) do %>
       <span class="flex items-center gap-1">

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

@@ -16,14 +16,23 @@
       <% if current_user&.ephemeral? %>
         <%= render partial: "layouts/decidim/header/close_ephemeral_session" %>
       <% else %>
-        <div role="search" class="main-bar__search">
-          <%= render partial: "layouts/decidim/header/main_search" %>
-        </div>
-        <nav role="navigation" class="main-bar__links-desktop">
-          <%= render partial: "layouts/decidim/header/main_links_desktop" %>
-        </nav>
-        <div class="main-bar__menu-mobile">
-          <%= render partial: "layouts/decidim/header/main_menu_mobile" %>
+        <div class="flex lg:justify-between lg:gap-x-10">
+          <div class="hidden lg:flex lg:gap-x-8 border-r border-gray-6 pr-10">
+            <div role="search" class="main-bar__search">
+              <%= render partial: "layouts/decidim/header/main_search" %>
+            </div>
+
+            <div class="main-bar__language-chooser-desktop">
+              <%= render partial: "layouts/decidim/header/main_language_chooser", locals: { id: "dropdown-menu-language-chooser-desktop" } %>
+            </div>
+          </div>
+
+          <nav role="navigation" aria-label="<%= t("layouts.decidim.header.user_menu") %>" class="main-bar__links-desktop md:flex md:gap-x-8">
+            <%= render partial: "layouts/decidim/header/main_links_desktop" %>
+          </nav>
+          <div class="main-bar__menu-mobile">
+            <%= render partial: "layouts/decidim/header/main_menu_mobile" %>
+          </div>
         </div>
         <%= render partial: "layouts/decidim/header/main_links_mobile_account" if current_user %>
       <% end %>

data/app/views/layouts/decidim/header/_main_language_chooser.html.erb

@@ -0,0 +1,24 @@
+<% if available_locales.length > 1 %>
+  <div class="main-bar__language-chooser">
+    <button id="trigger-<%= id %>" data-controller="dropdown" data-target="<%= id %>" class="main-bar__language-chooser-trigger">
+      <span class="main-bar__language-chooser-holder">
+        <%= icon "global-line" %>
+        <span><%= t("name", scope: "locale" ) %></span>
+      </span>
+      <%= icon "arrow-down-s-line" %>
+      <span class="sr-only" lang="<%= locale %>">
+        <%= t("layouts.decidim.language_chooser.choose_language") %>
+      </span>
+    </button>
+
+    <div id="<%= id %>" aria-hidden="true">
+      <ul class="main-bar__language-chooser-list" role="menu">
+        <% available_locales.each do |locale| %>
+          <li class="<%= I18n.locale.to_s == locale ? "main-bar__language-chooser-item-active" : "main-bar__language-chooser-item" %>" role="presentation">
+            <%= link_to locale_name(locale), decidim.locale_path(locale:), method: :post, role: "menuitem", lang: locale, class: "p-2 w-full block" %>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+  </div>
+<% end %>

data/app/views/layouts/decidim/header/_main_links_desktop.html.erb

@@ -1,61 +1,61 @@
-<div>
-  <%= link_to decidim.pages_path, class: "main-bar__links-desktop__item", "aria-label": t("decidim.menu.help") do %>
-    <%= icon "question-line" %><span><%= t("decidim.menu.help") %></span>
-  <% end %>
-</div>
-<div class="main-bar__links-desktop__item-wrapper">
-  <div>
-    <% if Decidim.module_installed?(:meetings) %>
-      <%= link_to Decidim::Meetings::DirectoryEngine.routes.url_helpers.root_path, class: "main-bar__links-desktop__item", "aria-label": t("decidim.pages.home.extended.meetings") do %>
-        <%= icon "road-map-line" %><span><%= t("decidim.pages.home.extended.meetings") %></span>
+<div class="flex items-center gap-x-8">
+  <% if !current_user %>
+    <div>
+      <%= link_to decidim.new_user_session_path, class: "main-bar__links-desktop__item", "aria-label": t("layouts.decidim.header.log_in") do %>
+        <%= icon "user-line" %><span><%= t("layouts.decidim.header.log_in") %></span>
       <% end %>
-    <% end %>
-  </div>
-  <div>
-    <%= link_to decidim.last_activities_path, class: "main-bar__links-desktop__item", "aria-label": t("decidim.profiles.show.activity") do %>
-      <%= icon "bubble-chart-line" %><span><%= t("decidim.profiles.show.activity") %></span>
-    <% end %>
-  </div>
-</div>
-
-<% if !current_user %>
-  <div>
-    <%= link_to decidim.new_user_session_path, class: "main-bar__links-desktop__item", "aria-label": t("layouts.decidim.header.log_in") do %>
-      <%= icon "user-line" %><span><%= t("layouts.decidim.header.log_in") %></span>
-    <% end %>
-  </div>
-<% else %>
-  <div class="main-bar__dropdown-container">
-    <button id="trigger-dropdown-account" class="main-bar__dropdown-trigger" data-controller="dropdown" data-target="dropdown-menu-account">
-      <% unread_data = current_user_unread_data %>
-      <% if unread_data[:unread_items] %>
-        <%= content_tag :span, "", class: "main-bar__notification", data: unread_data %>
-        <% if unread_data[:unread_notifications] %>
-          <%= content_tag :span, t("layouts.decidim.user_menu.unread_notifications"), class: "sr-only" %>
-        <% end %>
-        <% if unread_data[:unread_conversations] %>
-          <%= content_tag :span, t("layouts.decidim.user_menu.unread_conversations"), class: "sr-only" %>
+    </div>
+  <% else %>
+    <div class="main-bar__dropdown-container">
+      <button id="trigger-dropdown-account" class="main-bar__dropdown-trigger" data-controller="dropdown" data-target="dropdown-menu-account">
+        <% unread_data = current_user_unread_data %>
+        <% if unread_data[:unread_items] %>
+          <%= content_tag :span, "", class: "main-bar__notification", data: unread_data %>
+          <% if unread_data[:unread_notifications] %>
+            <%= content_tag :span, t("layouts.decidim.user_menu.unread_notifications"), class: "sr-only" %>
+          <% end %>
+          <% if unread_data[:unread_conversations] %>
+            <%= content_tag :span, t("layouts.decidim.user_menu.unread_conversations"), class: "sr-only" %>
+          <% end %>
         <% end %>
-      <% end %>
-      <% if current_user.avatar.attached? %>
-        <span class="main-bar__avatar">
-          <span>
-            <%= image_tag(
-                  current_user.attached_uploader(:avatar).variant_url(:thumb),
-                  alt: t("decidim.author.avatar", name: decidim_sanitize(current_user.avatar.name))
-                ) %>
+        <% if current_user.avatar.attached? %>
+          <span class="main-bar__avatar">
+            <span>
+              <%= image_tag(
+                    current_user.attached_uploader(:avatar).variant_url(:thumb),
+                    alt: t("decidim.author.avatar", name: decidim_sanitize(current_user.avatar.name))
+                  ) %>
+            </span>
           </span>
-        </span>
-      <% else %>
-        <span class="main-bar__links-desktop__item-account">
-          <%= text_initials(current_user.name) %>
-        </span>
-      <% end %>
-    </button>
-    <div id="dropdown-menu-account" aria-hidden="true">
-      <ul class="dropdown dropdown__bottom main-bar__dropdown">
-        <%= render partial: "layouts/decidim/header/main_links_dropdown", locals: { unread_data: } %>
-      </ul>
+        <% else %>
+          <span class="main-bar__links-desktop__item-account">
+            <%= text_initials(current_user.name) %>
+          </span>
+        <% end %>
+      </button>
+      <div id="dropdown-menu-account" aria-hidden="true" data-controller="assign-role" data-role="dialog">
+        <ul class="dropdown dropdown__bottom main-bar__dropdown">
+          <%= render partial: "layouts/decidim/header/main_links_dropdown", locals: { unread_data: } %>
+        </ul>
+      </div>
+    </div>
+  <% end %>
+  <button id="main-dropdown-summary-desktop" class="main-bar__links-desktop__trigger"
+          data-controller="main-menu"
+          data-close-button="main-dropdown-summary-desktop-close"
+          data-target="dropdown-menu-main-desktop" aria-expanded="false">
+    <%= icon "menu-line" %><span><%= t("menu", scope: "decidim.admin.titles") %></span>
+  </button>
+
+  <div id="dropdown-menu-main-desktop" class="main-bar__links-desktop__dropdown main-bar__links-desktop__dropdown-before" aria-hidden="true">
+    <div id="breadcrumb-main-dropdown-desktop" class="menu-bar__main-dropdown menu-bar__dropdown-desktop">
+      <button id="main-dropdown-summary-desktop-close" class="main-bar__links-desktop__trigger">
+        <%= icon "close-line" %><span><%= t("close", scope: "layouts.decidim.header") %></span>
+      </button>
+      <%= breadcrumb_root_menu.render %>
+      <div class="menu-bar__main-dropdown__left">
+        <%= cell("decidim/highlighted_participatory_process", menu_highlighted_participatory_process) %>
+      </div>
     </div>
   </div>
-<% end %>
+</div>

data/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb

@@ -1,4 +1,4 @@
-<div id="dropdown-menu-account-mobile" class="main-bar__links-mobile__account" aria-hidden="true">
+<div id="dropdown-menu-account-mobile" class="main-bar__links-mobile__account" aria-hidden="true" data-controller="assign-role" data-role="dialog">
   <div class="main-bar">
     <div class="main-bar__logo">
       <div class="main-bar__logo-desktop">
@@ -10,7 +10,7 @@
     </div>
 
     <div>
-      <div class="main-bar__links-mobile__trigger" tabindex="0" onclick="document.querySelector('#dropdown-trigger-links-mobile').click();document.querySelector('#dropdown-menu-account-mobile').removeAttribute('aria-modal')">
+      <div id="dropdown-trigger-links-mobile-close" class="main-bar__links-mobile__trigger" tabindex="0">
         <%= icon "close-line" %>
         <p class="sr-only"><%= t("close", scope: "decidim.shared.flag_modal") %></p>
       </div>

data/app/views/layouts/decidim/header/_main_links_mobile_item_account.html.erb

@@ -1,5 +1,7 @@
 <% if current_user %>
-  <button id="dropdown-trigger-links-mobile" class="main-bar__links-mobile__item" data-controller="dropdown" data-target="dropdown-menu-account-mobile">
+  <button id="dropdown-trigger-links-mobile" class="main-bar__links-mobile__item" data-controller="main-menu"
+          data-target="dropdown-menu-account-mobile"
+          data-close-button="dropdown-trigger-links-mobile-close">
     <% if current_user.notifications.any? %>
       <span class="main-bar__notification"></span>
     <% end %>

data/app/views/layouts/decidim/header/_main_menu_mobile.html.erb

@@ -1,12 +1,25 @@
 <button id="main-dropdown-summary-mobile" class="main-bar__links-mobile__trigger p-0"
-                                          data-controller="dropdown"
-                                          data-target="dropdown-menu-main-mobile">
-  <%= icon "menu-line" %><span class="sr-only"><%= t("main_menu", scope: "layouts.decidim.header") %></span>
-  <%= icon "close-line" %>
+        data-controller="main-menu"
+        data-target="dropdown-menu-main-mobile"
+        data-close-button="main-dropdown-summary-mobile"
+        aria-expanded="false">
+  <%= icon "menu-line" %><span><%= t("menu", scope: "decidim.admin.titles") %></span>
+  <%= icon "close-line" %><span><%= t("close", scope: "layouts.decidim.header") %></span>
 </button>
+<div aria-hidden="true" class="md:hidden border-r border-gray-6 h-full"></div>
 
 <div id="dropdown-menu-main-mobile" class="main-bar__links-mobile__dropdown main-bar__links-mobile__dropdown-before" aria-hidden="true">
-  <%= render partial: "layouts/decidim/header/menu_breadcrumb_main_dropdown_mobile", locals: { id: "breadcrumb-main-dropdown-mobile" } %>
+  <div id="breadcrumb-main-dropdown-mobile" class="menu-bar__main-dropdown">
+    <div class="menu-bar__main-dropdown__top">
+      <div class="mb-8">
+        <%= render partial: "layouts/decidim/header/menu_form_search_mobile" %>
+      </div>
+      <%= mobile_breadcrumb_root_menu.render %>
+      <div class="menu-bar__language-chooser-mobile">
+        <%= render partial: "layouts/decidim/header/main_language_chooser", locals: { id: "dropdown-menu-language-chooser-mobile" } %>
+      </div>
+    </div>
+  </div>
 </div>
 
 <%= render partial: "layouts/decidim/header/main_links_mobile_item_account" %>

data/app/views/layouts/decidim/header/_main_search.html.erb

@@ -1,4 +1,7 @@
 <%= form_tag(decidim.search_path, method: :get, id: "form-search_topbar") do %>
+  <button type="submit" aria-label="<%= t("decidim.search.term_input_placeholder") %>">
+    <%= icon "search-line" %>
+  </button>
   <%= text_field_tag(
     :term,
     nil,
@@ -9,7 +12,4 @@
     title: t("decidim.search.term_input_placeholder"),
     "aria-label": t("decidim.search.term_input_placeholder")
   ) %>
-  <button type="submit" aria-label="<%= t("decidim.search.term_input_placeholder") %>">
-    <%= icon "search-line" %>
-  </button>
 <% end %>

data/app/views/layouts/decidim/header/_menu.html.erb

@@ -2,9 +2,9 @@
   <div class="menu-bar">
 
     <%# secondary dropdown only desktop %>
-    <div class="menu-bar__breadcrumb-desktop">
+    <nav class="menu-bar__breadcrumb-desktop">
       <%= render partial: "layouts/decidim/header/menu_breadcrumb_desktop" %>
-    </div>
+    </nav>
     <% if content_for?(:participatory_space_actions) %>
       <div class="menu-bar__actions">
         <%= content_for :participatory_space_actions %>
@@ -12,9 +12,9 @@
     <% end %>
 
     <%# secondary dropdown mobile-tablet %>
-    <div class="menu-bar__breadcrumb-mobile">
-      <%= render partial: "layouts/decidim/header/menu_breadcrumb_mobile_tablet" %>
-    </div>
+    <nav class="menu-bar__breadcrumb-mobile">
+      <%= render partial: "layouts/decidim/header/menu_breadcrumb_mobile" %>
+    </nav>
 
   </div>
 </div>