decidim-core 0.29.3 → 0.29.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28b3c4ae291bd29e865f8c3d4b18ac88f4e1e28e5f40b658b650c8fbff2773be
-  data.tar.gz: 4e3784db851ce1e0b3c857aba4bfbc4afae28f9b4c0567d071dfaa5bd37aa3eb
+  metadata.gz: a294fcf54a5fa31a1d5e44af9a717e30ab8eab2df35ae131b9873e0d600dc630
+  data.tar.gz: 41703d211fa0d4d30c760cf00629bfebda559481e039298ac6a30679a46fe77c
 SHA512:
-  metadata.gz: fa92b90aaaee207b64a405dabfc14217e5e10138de033c3a06fcd5261209840a34b28a41efa8139c9c83dea1f0b7bf4ade861058855f575505feb1f3740b2da1
-  data.tar.gz: d2714c0d00b670dc1e7245088175d6a8b1d84f1f34d30234cb55a5834940f53ca14c5c170ae913732d5ee6d6c8de8024c3e5c16e5e1697f8a2c3b3e0f8ee7999
+  metadata.gz: 28e137934317b858031cda83491fb067b5ee54349fb50f037c1c0e4aa6f223afeb13899e28df90492ee53b5097a09a3d7c1add57e4d0aa0b080997a706646c89
+  data.tar.gz: 2e153e8e591bd91f1c6fb0ec14b5a7de5ce126191aa89ba698bf64a9a4389d4fb5e8bceb84cc5d43dc77f669b2549971c7d4e2cdfaed4cca6b8dce17172a3829

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

@@ -1,19 +1,19 @@
 <div class="activity" data-activity>
-  <div class="activity__time">
+  <p class="activity__time">
     <%= created_at %>
-  </div>
+  </p>
   <div class="activity__content">
-    <span>
+    <div>
       <% if title.present? %>
-        <span>
+        <p>
           <%= title_icon %>
           <%= title %>
-        </span>
+        </p>
       <% end %>
       <a href="<%= resource_link_path %>">
         <%= html_truncate decidim_sanitize(resource_link_text, strip_tags: true), length: 80 %>
       </a>
-    </span>
+    </div>
     <% unless hide_participatory_space? %>
       <span>
         <%= participatory_space_link %>

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/content_blocks/participatory_space_main_data/title.erb

@@ -11,11 +11,11 @@
   <div class="content-block__description editor-content" <%= "data-component='accordion'" if should_truncate %>>
     <% if should_truncate %>
       <% seed = SecureRandom.hex(4) %>
-      <div id="panel-view-more-<%= seed %>" aria-hidden="true">
+      <div id="panel-view-more-<%= seed %>" aria-hidden="true" inert>
         <%= description_text %>
       </div>
 
-      <button class="button button__sm button__text-secondary mt-2" data-controls="panel-view-more-<%= seed %>" aria-expanded="false">
+      <button class="button button__sm button__text-secondary mt-2" data-controls="panel-view-more-<%= seed %>" aria-expanded="false" onclick="document.querySelector('div[id^=panel-view-more]').toggleAttribute('inert')">
         <span>
           <%= t("view_more", scope: "layouts.decidim.announcements") %>
         </span>
@@ -30,3 +30,12 @@
     <% end %>
   </div>
 <% end %>
+<script>
+  const button = document.querySelector('button[data-controls^="panel-view-more"]')
+  button.addEventListener('keydown', function(e){
+    // press space or enter
+    if (e.keyCode === 32 || e.keyCode === 13){
+      document.querySelector('div[id^=panel-view-more]').toggleAttribute('inert')
+    }
+  })
+</script>

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

@@ -1,5 +1,5 @@
-<nav role="navigation" aria-label="Help">
-  <h2 class="h4 mb-4">Help</h2>
+<nav role="navigation" aria-label="<%= t("layouts.decidim.footer.help") %>">
+  <h2 class="h4 mb-4"><%= t("layouts.decidim.footer.help") %></h2>
   <ul class="space-y-4 break-inside-avoid">
     <% topics.each do |topic| %>
       <%= topic_item(topic, class: "font-semibold underline") %>

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

@@ -21,7 +21,9 @@
       <%= link_to(
         decidim.demote_group_manage_user_path(model.nickname, membership),
         method: :post,
-        data: { confirm: t("decidim.group_admins.actions.are_you_sure") },
+        data: { confirm: t("decidim.group_admins.actions.confirm_remove_from_admin"),
+                confirm_title: t("decidim.group_admins.actions.confirm_modal.title_remove"),
+                confirm_button: t("decidim.group_admins.actions.confirm_modal.ok_remove") },
         class: "button button__sm button__transparent-secondary"
       ) do %>
         <span><%= t("decidim.group_admins.actions.demote_admin") %></span>

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

@@ -24,14 +24,18 @@
         t("decidim.group_members.actions.promote_to_admin"),
         decidim.promote_group_manage_user_path(model.nickname, membership),
         method: :post,
-        data: { confirm: t("decidim.group_members.actions.are_you_sure") },
+        data: { confirm: t("decidim.group_members.actions.confirm_promote_to_admin"),
+                confirm_title: t("decidim.group_admins.actions.confirm_modal.title_add"),
+                confirm_button: t("decidim.group_admins.actions.confirm_modal.ok_add") },
         class: "button button__sm button__transparent-secondary"
       ) %>
 
       <%= link_to(
         decidim.group_manage_user_path(model.nickname, membership),
         method: :delete,
-        data: { confirm: t("decidim.group_members.actions.are_you_sure") },
+        data: { confirm: t("decidim.group_members.actions.confirm_remove_from_group"),
+                confirm_title: t("decidim.group_members.actions.confirm_modal.title_remove"),
+                confirm_button: t("decidim.group_members.actions.confirm_modal.ok_remove") },
         class: "button button__sm button__transparent-secondary"
       ) do %>
         <span><%= t("decidim.group_members.actions.remove_from_group") %></span>

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

@@ -1,7 +1,10 @@
 <div class="grid grid-cols-1 md:grid-cols-4 gap-6">
-  <% photos.each_with_index do |photo, index| %>
+  <% photos.each_with_index do |photo| %>
     <%= link_to photo.big_url, target: "_blank", rel: "noopener", class: "overflow-hidden rounded aspect-video" do %>
-      <%= image_tag photo.thumbnail_url, class:"w-full h-full object-cover", alt: strip_tags(translated_attribute(photo.title)) %>
+      <%= image_tag photo.thumbnail_url,
+                    class: "w-full h-full object-cover",
+                    role: "presentation",
+                    "data-filename": strip_tags(translated_attribute(photo.title)) %>
     <% end %>
   <% end %>
 </div>

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/cells/decidim/report_button/flag_modal.erb

@@ -6,16 +6,18 @@
       <div>
         <div class="form__wrapper flag-modal__form">
           <p id="dialog-desc-<%= modal_id %>" class="flag-modal__form-description"><%= t("decidim.shared.flag_modal.description") %></p>
-          <p class="flag-modal__form-reason"><%= t("decidim.shared.flag_modal.reason") %>:</p>
-          <%= f.collection_radio_buttons :reason, [
-            [:spam, t("decidim.shared.flag_modal.spam")],
-            [:offensive, t("decidim.shared.flag_modal.offensive")],
-            [:does_not_belong, t("decidim.shared.flag_modal.does_not_belong", organization_name: current_organization_name)]
-          ], :first, :last do |builder|
-            builder.label(for: nil, class: "form__wrapper-checkbox-label") { builder.radio_button(id: nil) + builder.text }
-          end %>
+          <fieldset class="mt-6">
+            <legend class="flag-modal__form-reason"><%= t("decidim.shared.flag_modal.reason") %>:</legend>
+            <%= f.collection_radio_buttons :reason, [
+              [:spam, t("decidim.shared.flag_modal.spam")],
+              [:offensive, t("decidim.shared.flag_modal.offensive")],
+              [:does_not_belong, t("decidim.shared.flag_modal.does_not_belong", organization_name: current_organization_name)]
+            ], :first, :last do |builder|
+              builder.label(for: "#{builder.value.to_s}-#{modal_id}", class: "form__wrapper-checkbox-label") { builder.radio_button(id: "#{builder.value.to_s}-#{modal_id}") + builder.text }
+            end %>
+          </fieldset>
 
-          <%= f.text_area :details, rows: 4, label_options: { class: "flag-modal__form-textarea-label", for: nil }, id: nil %>
+          <%= f.text_area :details, rows: 4, label_options: { class: "flag-modal__form-textarea-label", for: "additional-comments-#{modal_id}" }, id: "additional-comments-#{modal_id}" %>
 
           <% if frontend_administrable? %>
             <%= f.check_box :hide,

data/app/cells/decidim/report_user_button/flag_modal.erb

@@ -6,16 +6,17 @@
       <div>
         <div class="form__wrapper flag-modal__form">
           <p class="flag-modal__form-description"><%= t("decidim.shared.flag_user_modal.description") %></p>
-          <p class="flag-modal__form-reason"><%= t("decidim.shared.flag_modal.reason") %>:</p>
-          <%= f.collection_radio_buttons :reason, [
-            [:spam, t("decidim.shared.flag_user_modal.spam")],
-            [:offensive, t("decidim.shared.flag_user_modal.offensive")],
-            [:does_not_belong, t("decidim.shared.flag_user_modal.does_not_belong", organization_name: current_organization_name)]
-          ], :first, :last do |builder|
-            builder.label(for: nil, class: "form__wrapper-checkbox-label") { builder.radio_button(id: nil) + builder.text }
-          end %>
-
-          <%= f.text_area :details, rows: 4, label_options: { class: "flag-modal__form-textarea-label", for: nil }, id: nil %>
+          <fieldset class="mt-6">
+            <legend class="flag-modal__form-reason"><%= t("decidim.shared.flag_modal.reason") %>:</legend>
+            <%= f.collection_radio_buttons :reason, [
+              [:spam, t("decidim.shared.flag_user_modal.spam")],
+              [:offensive, t("decidim.shared.flag_user_modal.offensive")],
+              [:does_not_belong, t("decidim.shared.flag_user_modal.does_not_belong", organization_name: current_organization_name)]
+            ], :first, :last do |builder|
+              builder.label(for: "#{builder.value.to_s}-#{modal_id}", class: "form__wrapper-checkbox-label") { builder.radio_button(id: "#{builder.value.to_s}-#{modal_id}") + builder.text }
+            end %>
+          </fieldset>
+          <%= f.text_area :details, rows: 4, label_options: { class: "flag-modal__form-textarea-label", for: "additional-comments-#{modal_id}" }, id: "additional-comments-#{modal_id}" %>
 
           <% if frontend_administrable? %>
             <%= f.check_box :block,

data/app/cells/decidim/upload_modal/files.erb

@@ -25,19 +25,19 @@
 
         <div class="attachment-details" data-attachment-id="<%= attachment.id %>" data-title="<%= title_for(attachment) %>" data-filename="<%= file_name_for(attachment) %>" data-state="uploaded">
           <% if file_attachment_path(attachment) && blob(attachment).image? %>
-            <div><%= image_tag(file_attachment_path(attachment), alt: title_for(attachment) || file_name_for(attachment)) %></div>
+            <div><%= image_tag(file_attachment_path(attachment), alt: "") %></div>
           <% elsif uploader_default_image_path(attribute).present? %>
             <div><%= image_tag uploader_default_image_path(attribute) %></div>
           <% end %>
 
           <% if has_title? %>
-            <span><%= title_for(attachment) %> (<%= truncated_file_name_for(attachment) %>)</span>
+            <span><%= title_for(attachment) %></span>
             <%= form.hidden_field attribute, multiple: true, value: attachment.id, id: attachment.id %>
           <% else %>
             <% if blob(attachment).image? %>
-              <span><%= truncated_file_name_for(attachment, 15) %></span>
+              <span><%= title_for(attachment) %></span>
             <% else %>
-              <%= link_to truncated_file_name_for(attachment), file_attachment_path(attachment) %>
+              <%= link_to title_for(attachment), file_attachment_path(attachment), class: "w-full break-all mb-2" %>
             <% end %>
           <% end %>
         </div>

data/app/cells/decidim/upload_modal_cell.rb

@@ -132,9 +132,11 @@ module Decidim
     end
 
     def title_for(attachment)
-      return unless has_title?
-
-      decidim_html_escape(decidim_sanitize(translated_attribute(attachment.title)))
+      if has_title?
+        decidim_html_escape(decidim_sanitize(translated_attribute(attachment.title)))
+      else
+        decidim_html_escape(decidim_sanitize(determine_filename(attachment)))
+      end
     end
 
     def truncated_file_name_for(attachment, max_length = 31)

data/app/commands/decidim/amendable/accept.rb

@@ -62,7 +62,8 @@ module Decidim
           @amendable.save!
           @amendable
         end
-        @amendable.add_coauthor(@amender, user_group: @user_group)
+
+        @amendable.add_coauthor(@amender, user_group: @user_group) if @amendable.is_a?(Decidim::Coauthorable)
       end
 
       def notify_emendation_state_change!

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/headers/browser_feature_permissions.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Headers
+    # This module controls the "Permissions-Policy" header to define the
+    # specific sets of browser features that the website is able to use.
+    module BrowserFeaturePermissions
+      extend ActiveSupport::Concern
+
+      included do
+        after_action :define_permissions_policy
+      end
+
+      private
+
+      def define_permissions_policy
+        return if response.media_type != "text/html"
+        return if response.headers["Permissions-Policy"].present?
+
+        # Allow the "unload" and "onbeforeunload" events to be used at the
+        # current domain to prevent the user unintentionally changing the page
+        # when they have something important to do on the page, such as an
+        # unsaved form.
+        #
+        # This header is required because Chrome is phasing this event out due
+        # to some performance issues with the back/forward cache feature of the
+        # browser. However, currently there are no alternative events that would
+        # allow preventing accidental page reloads, tab closing or window
+        # closing.
+        #
+        # For further information, see:
+        # https://developer.chrome.com/docs/web-platform/deprecating-unload
+        # https://github.com/fergald/docs/blob/master/explainers/permissions-policy-unload.md
+        #
+        # Note that even Google suggests using the "beforeunload" for this
+        # particular use case:
+        # https://developer.chrome.com/docs/web-platform/page-lifecycle-api#events
+        #
+        # beforeunload
+        #   Important: the beforeunload event should only be used to alert the
+        #   user of unsaved changes. Once those changes are saved, the event
+        #   should be removed. It should never be added unconditionally to the
+        #   page, as doing so can hurt performance in some cases.
+        response.headers["Permissions-Policy"] = "unload=(self)"
+      end
+    end
+  end
+end

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/amendments_controller.rb

@@ -107,7 +107,7 @@ module Decidim
     end
 
     def reject
-      enforce_permission_to :reject, :amendment, current_component: amendable.component
+      enforce_permission_to :reject, :amendment, amendable:, current_component: amendable.component
 
       @form = form(Decidim::Amendable::RejectForm).from_model(amendment)
 
@@ -143,13 +143,13 @@ module Decidim
     end
 
     def review
-      enforce_permission_to :accept, :amendment, current_component: amendable.component
+      enforce_permission_to :accept, :amendment, amendable:, current_component: amendable.component
 
       @form = form(Decidim::Amendable::ReviewForm).from_params(params)
     end
 
     def accept
-      enforce_permission_to :accept, :amendment, current_component: amendable.component
+      enforce_permission_to :accept, :amendment, amendable:, current_component: amendable.component
 
       @form = form(Decidim::Amendable::ReviewForm).from_params(params)
 

data/app/controllers/decidim/application_controller.rb

@@ -16,6 +16,7 @@ module Decidim
     include NeedsTosAccepted
     include Headers::HttpCachingDisabler
     include Headers::ContentSecurityPolicy
+    include Headers::BrowserFeaturePermissions
     include ActionAuthorization
     include ForceAuthentication
     include SafeRedirect

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/amendments_helper.rb

@@ -70,8 +70,9 @@ module Decidim
     # Checks if the user can accept and reject the emendation
     def allowed_to_accept_and_reject?(emendation)
       return unless emendation.amendment.evaluating?
+      return current_user.admin? if emendation.amendable.respond_to?(:official?) && emendation.amendable.official?
 
-      emendation.amendable.created_by?(current_user) || current_user.admin?
+      emendation.amendable.created_by?(current_user)
     end
 
     # Checks if the user can promote the emendation

data/app/helpers/decidim/filters_helper.rb

@@ -32,6 +32,31 @@ module Decidim
       end
     end
 
+    def filter_search_label(label, id)
+      I18n.t("decidim.searches.filters.resource", label:, collection: filter_for_resource(id))
+    end
+
+    def filter_for_resource(skip_to_id)
+      case skip_to_id
+      when "proposals"
+        I18n.t("decidim/proposals/proposal.other", scope: "activerecord.models")
+      when "meetings"
+        I18n.t("decidim/meetings/meeting.other", scope: "activerecord.models")
+      when "debates"
+        I18n.t("decidim/debates/debate.other", scope: "activerecord.models")
+      when "sortitions"
+        I18n.t("decidim/sortitions/sortition.other", scope: "activerecord.models")
+      when "surveys"
+        I18n.t("decidim/surveys/survey.other", scope: "activerecord.models")
+      when "projects"
+        I18n.t("decidim/budgets/project.other", scope: "activerecord.models")
+      when "initiatives"
+        I18n.t("decidim/initiative.other", scope: "activerecord.models")
+      else
+        ""
+      end
+    end
+
     private
 
     # Creates a unique namespace for a filter form to prevent duplicate IDs in

data/app/helpers/decidim/layout_helper.rb

@@ -60,6 +60,12 @@ module Decidim
       html_properties = options.with_indifferent_access.transform_keys(&:dasherize).slice("width", "height", "aria-label", "role", "aria-hidden", "class", "style")
       html_properties = default_html_properties.merge(html_properties)
 
+      if name == "wechat-line"
+        html_properties = html_properties.merge({ "aria-label" => I18n.t("decidim.author.comments.other") }).except("aria-hidden")
+      elsif name == "heart-line"
+        html_properties = html_properties.merge({ "aria-label" => I18n.t("decidim.author.endorsements.other") }).except("aria-hidden")
+      end
+
       href = Decidim.cors_enabled ? "" : asset_pack_path("media/images/remixicon.symbol.svg")
 
       content_tag :svg, html_properties do

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/images/decidim/default-avatar.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" width="200" height="200" x="0" y="0" enable-background="new 0 0 200 200" version="1.1" viewBox="0 0 200 200" xml:space="preserve"><g><path fill="#C5C5C5" d="M200-0.5H0v200h26.099c2.885-35.293,24.07-64.381,52.419-74.319C64.372,117.596,54.75,102.674,54.75,85.5 c0-24.853,20.146-45,45-45c24.853,0,45,20.147,45,45c0,17.095-9.533,31.963-23.572,39.58c28.5,9.837,49.828,39.002,52.724,74.42 H200V-0.5z"/><path fill="#FFF" d="M121.178,125.08c14.039-7.617,23.572-22.485,23.572-39.58c0-24.853-20.147-45-45-45 c-24.854,0-45,20.147-45,45c0,17.174,9.622,32.096,23.768,39.681c-28.349,9.938-49.534,39.026-52.419,74.319h147.803 C171.006,164.082,149.678,134.917,121.178,125.08z"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" width="200" height="200" x="0" y="0" enable-background="new 0 0 200 200" version="1.1" viewBox="0 0 200 200" xml:space="preserve"><g><path fill="#908e8e" d="M200-0.5H0v200h26.099c2.885-35.293,24.07-64.381,52.419-74.319C64.372,117.596,54.75,102.674,54.75,85.5 c0-24.853,20.146-45,45-45c24.853,0,45,20.147,45,45c0,17.095-9.533,31.963-23.572,39.58c28.5,9.837,49.828,39.002,52.724,74.42 H200V-0.5z"/><path fill="#FFF" d="M121.178,125.08c14.039-7.617,23.572-22.485,23.572-39.58c0-24.853-20.147-45-45-45 c-24.854,0-45,20.147-45,45c0,17.174,9.622,32.096,23.768,39.681c-28.349,9.938-49.534,39.026-52.419,74.319h147.803 C171.006,164.082,149.678,134.917,121.178,125.08z"/></g></svg>