decidim-core 0.29.3 → 0.29.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28b3c4ae291bd29e865f8c3d4b18ac88f4e1e28e5f40b658b650c8fbff2773be
-  data.tar.gz: 4e3784db851ce1e0b3c857aba4bfbc4afae28f9b4c0567d071dfaa5bd37aa3eb
+  metadata.gz: c870efc9a61fb35a4d203542d3c151236fa734857034cd0218962c0d8a5889a2
+  data.tar.gz: 870b0671cef65194a32e2fc33e430b92bab41f347c8b1068fe954dcc8e5b2990
 SHA512:
-  metadata.gz: fa92b90aaaee207b64a405dabfc14217e5e10138de033c3a06fcd5261209840a34b28a41efa8139c9c83dea1f0b7bf4ade861058855f575505feb1f3740b2da1
-  data.tar.gz: d2714c0d00b670dc1e7245088175d6a8b1d84f1f34d30234cb55a5834940f53ca14c5c170ae913732d5ee6d6c8de8024c3e5c16e5e1697f8a2c3b3e0f8ee7999
+  metadata.gz: 3370c446ba0ebc647b221e031500993fd56719e96908a38832d62497103893295a46a33da7eadb42f110f119a4f4abf634cfd8c5a8ae707009c9a186ca31352b
+  data.tar.gz: babce000ab8d7cd3fa51f6c8f81a2e5d6791817dda5e3336369af31316d8d7ba061e85cb38fd5f97885100b74f06f61e05b109d91fc9d1b67c2f49dc77e96c34

data/app/cells/decidim/address/show.erb

@@ -4,13 +4,13 @@
       <%= icon "map-pin-line" %>
       <div class="address">
         <% if has_location? %>
-          <div class="address__location"><%= location %></div>
+          <p class="address__location"><%= location %></p>
         <% end %>
 
-        <div class="address__address"><%= address %></div>
+        <p class="address__address"><%= address %></p>
 
         <% if has_location_hints? %>
-          <div class="address__hints"><%= location_hints %></div>
+          <p class="address__hints"><%= location_hints %></p>
         <% end %>
       </div>
     </div>

data/app/cells/decidim/author/show.erb

@@ -1,7 +1,5 @@
-<%# If the options hash has the demo key it means we are in the decidim-design engine, so it is not a real-world scenario with actual users %>
-<% tooltip = options.has_key?(:demo) ? { tooltip: render(:profile_minicard).html_safe } : nil %>
-<%= content_tag(:span, class: :author, data: ) do %>
-  <%= content_tag :span, class: "author__container#{" is-compact" if layout == :compact}", data: tooltip do %>
+<%= content_tag(:p, class: :author, data: ) do %>
+  <%= content_tag :span, class: "author__container#{" is-compact" if layout == :compact}" do %>
     <% if layout == :compact %>
       <%= render :avatar %>
 

data/app/cells/decidim/content_blocks/participatory_space_extra_data/extra_data.erb

@@ -2,10 +2,10 @@
   <div class="participatory-space__metadata-item">
     <div class="participatory-space__metadata-item-title">
       <%= icon item[:icon] %>
-      <span><%= item[:title] %></span>
+      <h2><%= item[:title] %></h2>
     </div>
     <% if item[:text].present? %>
-      <%= content_tag :span, item[:text] %>
+      <%= content_tag :p, item[:text] %>
     <% elsif item[:partial].present? %>
       <%= render item[:partial] %>
     <% end %>

data/app/cells/decidim/participatory_space_dropdown_metadata/metadata.erb

@@ -1,9 +1,9 @@
 <h4 class="menu-bar__secondary-dropdown__title"><%= title %></h4>
-<div class="menu-bar__secondary-dropdown__metadata">
-  <% if hashtag.present? %>
+<% if hashtag.present? %>
+  <div class="menu-bar__secondary-dropdown__metadata">
     <span>
       <%= icon "twitter-x-line", class: "text-gray fill-current" %>
       <%= link_to "##{hashtag}", twitter_hashtag_url(hashtag), target: "_blank", class: "text-secondary underline" %>
     </span>
-  <% end %>
-</div>
+  </div>
+<% end %>

data/app/commands/decidim/create_report.rb

@@ -76,7 +76,11 @@ module Decidim
       participatory_space_moderators.each do |moderator|
         next unless moderator.email_on_moderations
 
-        ReportedMailer.hide(moderator, @report).deliver_later
+        if hidden_by_admin?
+          ReportedMailer.hidden_manually(moderator, @report, current_user).deliver_later
+        else
+          ReportedMailer.hidden_automatically(moderator, @report).deliver_later
+        end
       end
     end
 

data/app/commands/decidim/invite_user.rb

@@ -41,7 +41,7 @@ module Decidim
       @user = Decidim::User.new(
         name: form.name,
         email: form.email.downcase,
-        nickname: UserBaseEntity.nicknamize(form.name, organization: form.organization),
+        nickname: UserBaseEntity.nicknamize(form.name, form.organization.id),
         organization: form.organization,
         admin: form.role == "admin",
         roles: form.role == "admin" ? [] : [form.role].compact

data/app/controllers/concerns/decidim/participatory_space_context.rb

@@ -9,6 +9,7 @@ module Decidim
 
     included do
       include Decidim::NeedsOrganization
+      include Decidim::UserRoleChecker
 
       helper ParticipatorySpaceHelpers, IconHelper, ContextualHelpHelper
       helper_method :current_participatory_space
@@ -81,8 +82,10 @@ module Decidim
       return true unless current_participatory_space.try(:private_space?) &&
                          !current_participatory_space.try(:is_transparent?)
       return false unless current_user
+      return true if current_user.admin?
+      return true if user_has_any_role?(current_user, current_participatory_space, broad_check: true)
 
-      current_user.admin || current_participatory_space.users.include?(current_user)
+      current_participatory_space.users.include?(current_user)
     end
 
     def help_section

data/app/controllers/decidim/reports_controller.rb

@@ -2,6 +2,7 @@
 
 module Decidim
   # Exposes the report resource so users can report a reportable.
+  # Unless the reportable is marked as hideable, the resource notice will change accordingly.
   class ReportsController < Decidim::ApplicationController
     include FormFactory
     include NeedsPermission
@@ -15,7 +16,11 @@ module Decidim
 
       CreateReport.call(@form, reportable) do
         on(:ok) do
-          flash[:notice] = I18n.t("decidim.reports.create.success")
+          flash[:notice] = if hideable?
+                             I18n.t("decidim.reports.hide.success")
+                           else
+                             I18n.t("decidim.reports.create.success")
+                           end
           redirect_to reportable.reload.reported_content_url
         end
 

data/app/forms/decidim/omniauth_registration_form.rb

@@ -25,7 +25,7 @@ module Decidim
     end
 
     def normalized_nickname
-      UserBaseEntity.nicknamize(nickname || name, organization: current_organization)
+      UserBaseEntity.nicknamize(nickname || name, current_organization.id)
     end
   end
 end

data/app/forms/decidim/registration_form.rb

@@ -37,7 +37,7 @@ module Decidim
     end
 
     def generate_nickname(name, organization)
-      Decidim::UserBaseEntity.nicknamize(name, organization:)
+      Decidim::UserBaseEntity.nicknamize(name, organization.id)
     end
 
     def valid_users

data/app/helpers/decidim/menu_helper.rb

@@ -39,7 +39,7 @@ module Decidim
       @breadcrumb_root_menu ||= ::Decidim::BreadcrumbRootMenuPresenter.new(
         :menu,
         self,
-        container_options: { class: "menu-bar__main-dropdown__menu" }
+        container_options: { class: "menu-bar__dropdown-menu" }
       )
     end
 
@@ -47,7 +47,7 @@ module Decidim
       @mobile_breadcrumb_root_menu ||= ::Decidim::BreadcrumbRootMenuPresenter.new(
         :mobile_menu,
         self,
-        container_options: { class: "menu-bar__main-dropdown__menu" }
+        container_options: { class: "menu-bar__main-dropdown__top-menu" }
       )
     end
 

data/app/helpers/decidim/paginate_helper.rb

@@ -13,7 +13,7 @@ module Decidim
 
       per_page = (params[:per_page] || paginate_params[:per_page] || Decidim::Paginable::OPTIONS.first).to_i
 
-      content_tag :div, class: "flex flex-col-reverse md:flex-row items-center justify-between gap-1 py-8 md:py-16", data: { pagination: "" } do
+      content_tag :div, class: "flex flex-col-reverse md:flex-row items-center justify-between gap-1 py-8 md:py-16 md:flex-wrap", data: { pagination: "" } do
         template = ""
         template += render(partial: "decidim/shared/results_per_page", locals: { per_page: }, formats: [:html]) if collection.total_pages.positive?
         template += paginate collection, window: 2, outer_window: 1, theme: "decidim", params: paginate_params

data/app/helpers/decidim/tooltip_helper.rb

@@ -5,7 +5,10 @@ module Decidim
   # on the layout.
   module TooltipHelper
     def with_tooltip(title, opts = {}, &)
-      content_tag(:span, title:, data: { tooltip: content_tag(:div, title, id: opts[:id], class: opts[:class] || "bottom", role: "tooltip", "aria-hidden": "true") }) do
+      content_tag(:p,
+                  title:,
+                  class: "inline-block",
+                  data: { tooltip: content_tag(:p, title, id: opts[:id], class: opts[:class] || "bottom", role: "tooltip", "aria-hidden": "true") }) do
         capture(&).html_safe
       end
     end

data/app/mailers/decidim/notifications_digest_mailer.rb

@@ -14,7 +14,13 @@ module Decidim
         @organization = user.organization
         @notifications_digest = Decidim::NotificationsDigestPresenter.new(user)
         @display_see_more_message = notifications.size > SIZE_LIMIT
-        @notifications = notifications[0...SIZE_LIMIT].map { |notification| Decidim::NotificationToMailerPresenter.new(notification) }
+        # Note that this could be improved by adding a "type" column to the notifications table
+        # This fix can generate lists of notifications that are below the SIZE_LIMIT
+        @notifications = notifications[0...SIZE_LIMIT].filter_map do |notification|
+          next unless notification.event_class_instance.respond_to?(:email_intro)
+
+          Decidim::NotificationToMailerPresenter.new(notification)
+        end
 
         mail(to: user.email, subject: @notifications_digest.subject)
       end

data/app/mailers/decidim/reported_mailer.rb

@@ -21,14 +21,29 @@ module Decidim
       end
     end
 
-    def hide(user, report)
+    # This is used when a user with special rights (like an administrator, a space administrator or a moderator) hides a resource
+    def hidden_manually(user, report, current_user)
       with_user(user) do
         @report = report
         @participatory_space = @report.moderation.participatory_space
         @reportable = @report.moderation.reportable
         @organization = user.organization
         @user = user
-        subject = I18n.t("hide.subject", scope: "decidim.reported_mailer")
+        @moderator = current_user
+        subject = I18n.t("hidden_manually.subject", scope: "decidim.reported_mailer", moderator: @moderator.name)
+        mail(to: user.email, subject:)
+      end
+    end
+
+    # This is meant to be used when a resource is hidden by an algorithm, such as the `decidim-ai` module, or the `Decidim.max_reports_before_hiding` feature.
+    def hidden_automatically(user, report)
+      with_user(user) do
+        @report = report
+        @participatory_space = @report.moderation.participatory_space
+        @reportable = @report.moderation.reportable
+        @organization = user.organization
+        @user = user
+        subject = I18n.t("hidden_automatically.subject", scope: "decidim.reported_mailer")
         mail(to: user.email, subject:)
       end
     end

data/app/packs/src/decidim/input_character_counter.js

@@ -93,7 +93,7 @@ export default class InputCharacterCounter {
       this.$srTarget = $(`#${screenReaderId}`);
       if (!this.$srTarget.length) {
         this.$srTarget = $(
-          `<span role="status" id="${screenReaderId}" class="sr-only remaining-character-count-sr" />`
+          `<span role="status" id="${screenReaderId}" class="sr-only remaining-character-count-sr" aria-hidden="true"/>`
         );
         this.$target.before(this.$srTarget);
       }

data/app/packs/stylesheets/decidim/_cards.scss

@@ -159,7 +159,7 @@
   /* shared styles */
   &__highlight-metadata,
   &__grid-metadata {
-    @apply mt-auto flex items-center justify-between flex-wrap text-sm text-gray-2 [&>*]:flex [&>*]:items-center [&>*]:gap-1 first:[&>*]:flex-none;
+    @apply mt-auto flex items-center justify-between flex-wrap w-full text-sm text-gray-2 [&>*]:flex [&>*]:items-center [&>*]:gap-1 first:[&>*]:w-4/5;
 
     svg {
       @apply flex-none text-gray fill-current;

data/app/packs/stylesheets/decidim/_header.scss

@@ -334,10 +334,6 @@ header {
       &__dropdown-trigger {
         @apply flex items-center justify-between text-white;
 
-        span {
-          @apply flex flex-wrap md:flex-nowrap gap-x-2.5 overflow-hidden text-white;
-        }
-
         svg {
           @apply w-6 h-6 fill-current;
         }
@@ -373,54 +369,77 @@ header {
       @apply absolute top-full left-0 bg-white rounded w-full bg-gray-5;
     }
 
-    &__main-dropdown {
-      @apply bg-white divide-y divide-gray-3 rounded-b shadow-lg text-black w-full lg:w-[1280px] h-screen md:h-auto;
+    &__dropdown-menu {
+      @apply w-full md:w-1/4 bg-primary px-4 md:px-8 pt-0 pb-3 md:py-3 divide-y divide-gray-3 text-white;
 
-      &__bottom,
-      &__top {
-        @apply flex flex-col md:flex-row justify-between p-4 md:p-8 gap-x-8;
+      > * {
+        @apply py-3 md:py-3.5;
+      }
 
-        &-right {
-          @apply hidden md:block md:w-1/2;
+      a {
+        @apply flex items-center justify-start gap-1 font-semibold text-lg text-white;
+
+        span {
+          @apply min-w-0 truncate;
         }
-      }
 
-      &__bottom {
-        @apply hidden md:flex;
+        svg {
+          @apply flex-none fill-current;
+        }
       }
+    }
 
-      &__title {
-        @apply hidden h4 md:flex md:h3;
-      }
+    &__main-dropdown {
+      @apply bg-white flex flex-row rounded-b shadow-lg text-black w-full lg:w-[1280px] h-screen md:h-auto;
 
-      &__subtitle {
-        @apply hidden text-md md:flex md:text-lg text-gray-2 mt-5;
+      &__left {
+        @apply flex flex-col justify-between p-4 md:p-8 space-y-5 hidden md:block md:w-3/4;
+
+        &-top {
+          @apply border-b-4 border-gray-3 pb-3;
+        }
       }
 
-      &__menu {
-        @apply w-full md:w-1/2 mt-0 grid md:grid-cols-2 gap-x-6 text-secondary;
+      &__top {
+        @apply w-full px-4;
 
-        > * {
-          @apply py-3 md:py-3.5 border-b last:border-0 border-gray-3;
+        &-menu {
+          @apply w-full md:w-1/2 mt-0 grid md:grid-cols-2 gap-x-6 text-secondary;
 
-          /* since the grid has 2 columns, remove the border for these last 2 columns */
-          &:nth-last-child(-n + 2) {
-            @apply md:border-0;
+          > * {
+            @apply py-3 md:py-3.5 border-b last:border-0 border-gray-3;
+
+            /* since the grid has 2 columns, remove the border for these last 2 columns */
+            &:nth-last-child(-n + 2) {
+              @apply md:border-0;
+            }
           }
-        }
 
-        a {
-          @apply flex items-center justify-start gap-1 font-semibold text-lg text-secondary;
+          a {
+            @apply flex items-center justify-start gap-1 font-semibold text-lg text-secondary;
 
-          span {
-            @apply min-w-0 truncate;
-          }
+            span {
+              @apply min-w-0 truncate;
+            }
 
-          svg {
-            @apply flex-none fill-current;
+            svg {
+              @apply flex-none fill-current;
+            }
           }
         }
       }
+
+      &__bottom {
+        @apply hidden md:flex;
+      }
+
+      &__title {
+        @apply hidden h4 md:flex md:h3;
+      }
+
+      &__subtitle {
+        @apply hidden text-md md:flex md:text-lg text-gray-2 mt-5;
+      }
     }
 
     &__secondary-dropdown {
@@ -459,7 +478,7 @@ header {
       }
 
       &__metadata {
-        @apply flex items-center text-sm space-x-6 py-8;
+        @apply flex items-center text-sm space-x-6 pb-6;
 
         > span {
           @apply flex items-center space-x-2;

data/app/permissions/decidim/default_permissions.rb

@@ -5,6 +5,8 @@ module Decidim
   # actions by any kind of user. Also works as a default implementation so other
   # components can inherit from it and get some convenience methods.
   class DefaultPermissions
+    include Decidim::UserRoleChecker
+
     def initialize(user, permission_action, context = {})
       @user = user
       @permission_action = permission_action

data/app/presenters/decidim/notification_to_mailer_presenter.rb

@@ -14,15 +14,19 @@ module Decidim
     delegate :url_helpers, to: "Decidim::Core::Engine.routes"
     delegate :resource_title, to: :event
     delegate :resource_url, to: :event
-    delegate :email_intro, to: :event
     delegate :resource_path, to: :event
     delegate :safe_resource_text, to: :event
 
+    def email_intro
+      event.email_intro if event.respond_to?(:email_intro)
+    end
+
     def date_time
+      created_at_in_time_zone = created_at.in_time_zone(resource.organization.time_zone)
       if frequency == :daily
-        created_at.strftime("%H:%M")
+        I18n.l(created_at_in_time_zone, format: :time_of_day)
       else
-        I18n.l(created_at, format: :decidim_short)
+        I18n.l(created_at_in_time_zone, format: :decidim_short)
       end
     end
 

data/app/queries/decidim/last_activity.rb

@@ -18,6 +18,7 @@ module Decidim
         query = filter_moderated(query)
         query = filter_spaces(query)
         query = filter_deleted(query)
+        query = filter_withdrawn(query)
         query.with_new_resource_type("all")
       end
     end
@@ -48,6 +49,30 @@ module Decidim
       ).where(decidim_moderations: { id: nil })
     end
 
+    def filter_withdrawn(query)
+      # Filter out the items that have been withdrawn.
+      conditions = []
+
+      ActionLog.public_resource_types.each do |resource_type|
+        klass = resource_type.constantize
+
+        condition = if klass.respond_to?(:not_withdrawn)
+                      Arel.sql(
+                        [
+                          "decidim_action_logs.resource_type = '#{resource_type}'",
+                          "decidim_action_logs.resource_id IN (#{Arel.sql(klass.not_withdrawn.select(:id).to_sql)})"
+                        ].join(" AND ")
+                      ).to_s
+                    else
+                      Arel.sql("decidim_action_logs.resource_type = '#{resource_type}'").to_s
+                    end
+
+        conditions << "(#{condition})"
+      end
+
+      query.where(Arel.sql(conditions.join(" OR ")).to_s)
+    end
+
     def filter_spaces(query)
       conditions = []
 

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

@@ -1,8 +1,7 @@
 <div data-conversation-reply>
   <%= decidim_form_for form, url: decidim.conversation_path(conversation.id), method: :put, remote: true do |f| %>
     <div class="conversation__reply">
-      <%= f.label :body, nil, class: "sr-only" %>
-      <%= f.text_area :body, label: false, rows: 4, required: true, placeholder: t(".placeholder"), data: { "input-emoji": true } %>
+      <%= f.text_area :body, label: false, rows: 4, required: true, placeholder: t(".placeholder"), data: { "input-emoji": true }, aria: { label: t(".placeholder") } %>
       <%= f.submit "#{t(".send")} #{icon "arrow-right-line", class: "fill-current"}".html_safe, class: "button button__sm button__secondary self-end mt-4" %>
     </div>
   <% end %>

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

@@ -5,7 +5,7 @@
         <%= f.hidden_field :recipient_id, id: nil, name: "conversation[recipient_id][]", value: recipient.id %>
       <% end %>
       <%= f.label :body, nil, class: "sr-only" %>
-      <%= f.text_area :body, label: false, rows: 4, required: true, placeholder: t(".placeholder"), data: { "input-emoji": true } %>
+      <%= f.text_area :body, label: false, rows: 4, required: true, placeholder: t(".placeholder"), data: { "input-emoji": true }, aria: { label: t(".placeholder") } %>
       <%= f.submit "#{t(".send")} #{icon "arrow-right-line", class: "fill-current"}".html_safe, class: "button button__sm button__secondary self-end mt-4" %>
     </div>
   <% end %>

data/app/views/decidim/reported_mailer/hidden_manually.html.erb

@@ -0,0 +1,25 @@
+<p class="email-greeting"><%= t(".hello", name: @user.name) %></p>
+
+<p class="email-instructions">
+  <%= t(".report_html", url: reported_content_url, moderator: @moderator.name) %>
+</p>
+
+<p><b><%= t(".participatory_space") %></b></p>
+<p><%= link_to translated_attribute(@participatory_space.title), resource_locator(@participatory_space).url %></p>
+
+<p><b><%= t(".reason") %></b></p>
+<p><%= t(@report.reason, organization_name: organization_name(@participatory_space.organization), scope: "decidim.shared.flag_modal") %></p>
+
+<% if @report.details.present? %>
+  <p><b><%= t(".details") %></b></p>
+  <blockquote>
+    <%= @report.details %>
+  </blockquote>
+<% end %>
+
+<p><b><%= t(".content") %></b></p>
+<%= reported_content_cell %>
+
+<p class="email-button email-button__cta">
+  <%= link_to t(".manage_moderations"), manage_moderations_url %>
+</p>

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

@@ -1,7 +1,7 @@
 <% menu_id = "#{SecureRandom.uuid}_results_per_page_menu" %>
 <div class="flex items-center gap-1">
   <%= icon "list-check-2", class: "w-4 h-4 text-gray fill-current" %>
-  <span class="text-gray-2"><%= t("decidim.shared.results_per_page.label") %></span>
+  <p class="text-gray-2"><%= t("decidim.shared.results_per_page.label") %></p>
 
   <details class="relative">
       <summary id="<%= menu_id %>-control" class="flex items-center cursor-pointer text-secondary font-semibold" aria-controls="<%= menu_id %>" aria-haspopup="menu" title="<%= t("decidim.shared.results_per_page.title") %>">

data/app/views/kaminari/decidim/_page.html.erb

@@ -6,6 +6,6 @@
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote -%>
-<li class="w-6 h-6 rounded-full hover:bg-background-3 transition<%= "mx-2 bg-background-3 grid place-items-center" if page.current? %>" <%== 'aria-current="page"' if page.current? %> data-page>
+<li class="w-6 h-6 px-2 rounded-full hover:bg-background-3 transition min-w-fit <%= "bg-background-3 grid place-items-center" if page.current? %>" <%== 'aria-current="page"' if page.current? %> data-page>
   <%= link_to_unless page.current?, page, url, { class: "w-full h-full grid place-items-center", remote:, rel: page.rel, title: t("views.pagination.title") << page.to_s } %>
 </li>

data/app/views/kaminari/decidim/_paginator.html.erb

@@ -8,7 +8,7 @@ paginator:     the paginator that renders the pagination tags inside -%>
 
 <% if total_pages > 1 %>
   <nav aria-label="<%= t("views.pagination.pagination") %>">
-    <ul class="flex items-center text-sm text-secondary" data-pages>
+    <ul class="flex flex-wrap items-center text-sm text-secondary gap-x-1" data-pages>
       <%= paginator.prev_page_tag unless current_page.first? %>
 
       <% paginator.each_page do |page| -%>

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

@@ -1,7 +1,7 @@
 <% if organization %>
-  <%= link_to decidim.root_url(host: organization.host), "aria-label": t("front_page_link", scope: "decidim.accessibility") do %>
+  <%= link_to decidim.root_url(host: organization.host) do %>
     <% if organization.logo.attached? %>
-      <%= image_tag organization.attached_uploader(:logo).variant_url(:medium), alt: t("logo", scope: "decidim.accessibility", organization: current_organization_name) %>
+      <%= image_tag organization.attached_uploader(:logo).variant_url(:medium), alt: "#{current_organization_name} (#{t("decidim.errors.not_found.back_home")})" %>
     <% else %>
       <span><%= current_organization_name %></span>
     <% end %>

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

@@ -1,16 +1,10 @@
 <div id="<%= id %>" class="menu-bar__main-dropdown">
-  <div class="menu-bar__main-dropdown__top">
-    <div class="menu-bar__main-dropdown__top-left">
+  <div class="menu-bar__main-dropdown__left">
+    <div class="menu-bar__main-dropdown__left-top">
       <%= render partial: "layouts/decidim/header/menu_breadcrumb_main_dropdown_top_left" %>
     </div>
-    <%= breadcrumb_root_menu.render %>
-  </div>
-  <div class="menu-bar__main-dropdown__bottom">
-    <div class="menu-bar__main-dropdown__bottom-left">
-      <%= cell("decidim/highlighted_participatory_process", menu_highlighted_participatory_process) %>
-    </div>
-    <div class="menu-bar__main-dropdown__bottom-right">
-      <%= cell "decidim/content_blocks/menu_breadcrumb_last_activity", current_organization %>
-    </div>
+    <%= cell("decidim/highlighted_participatory_process", menu_highlighted_participatory_process) %>
+    <%= cell "decidim/content_blocks/menu_breadcrumb_last_activity", current_organization %>
   </div>
+  <%= breadcrumb_root_menu.render %>
 </div>

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

@@ -1,12 +1,12 @@
 <% dropdown_item = breadcrumb_items.select { |item| item[:dropdown_cell].present? }.last %>
 <div class="menu-bar__breadcrumb-mobile__dropdown-trigger">
-  <span>
-    <% breadcrumb_items.last(2).each_with_index do |item, i| %>
-      <% item_label = decidim_escape_translated(item[:label]).html_safe %>
-      <% if i.positive? %>
+  <span class="inline-block w-full overflow-hidden text-ellipsis align-middle">
+    <% breadcrumb_items.last(2).each_with_index do |item, idx| %>
+      <% item_label = decidim_escape_translated(item[:label]) %>
+      <% if idx.positive? %>
         <span>/</span>
       <% end %>
-      <span class="cursor-pointer <%= "truncate" if i.positive? %>" <%== 'aria-current="page"' if item[:active] %>>
+      <span class="cursor-pointer truncate" <%== 'aria-current="page"' if item[:active] %>>
         <% if item[:url].present? && !is_active_link?(item[:url], :exclusive) %>
           <%= link_to(item_label, item[:url]) %>
         <% else %>

data/config/locales/ar.yml

@@ -576,7 +576,6 @@ ar:
       drag_and_drop_help: يمكن إضافة صور عن طريق سحبها وإسقاطها أو لصقها.
     endorsement_buttons_cell:
       already_endorsed: لا يعجبني
-      endorse: يعجبني
     endorsements:
       identities:
         done: تم
@@ -1181,11 +1180,6 @@ ar:
           message: الرسالة
           resend_email_confirmation_instructions: إعادة إرسال تعليمات تأكيد البريد الإلكتروني
     reported_mailer:
-      hide:
-        hello: مرحبا %{name}،
-        manage_moderations: إدارة التعديلات
-        report_html: <p>بعد <a href="%{url}">محتوى</a> تم إخفاء تلقائيا.</p>
-        subject: تم إخفاء المورد تلقائيًا
       report:
         authors: المؤلفون
         content: محتوى تم الإبلاغ عنه