decidim-core 0.29.2 → 0.29.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83ba22655575833dce2ce20e91060aa195abccf10cd5d185dbadbc04e79fcd93
-  data.tar.gz: a53c89d6b0c01046408b2872119406ffbd1a80a50b943256b872c8575b069e4a
+  metadata.gz: c870efc9a61fb35a4d203542d3c151236fa734857034cd0218962c0d8a5889a2
+  data.tar.gz: 870b0671cef65194a32e2fc33e430b92bab41f347c8b1068fe954dcc8e5b2990
 SHA512:
-  metadata.gz: 07db0787cc696b27044eb8765477b338a16f7263cd29d9231dfd8e7145f5c4b63b19753a90b4d35c5e7614c1a69d47104435fcb2ecf12badea9a1163709ccbef
-  data.tar.gz: 034e07f956b0ad613172afdd3a56cbb3e37e273555537919073bf75b63dfe8b2ab7ec5502ecf87fb224cd5d525ad009a01e0db6742815ce61eec643c0fa1f1ae
+  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/cells/decidim/participatory_space_dropdown_metadata/show.erb

@@ -3,7 +3,9 @@
     <%= render :metadata %>
     <%= cell "decidim/content_blocks/menu_breadcrumb_last_activity", model, hide_participatory_space: true %>
   </div>
-  <ul class="menu-bar__secondary-dropdown__menu">
-    <%= render :links %>
-  </ul>
+  <nav role="navigation" aria-label="<%= t("decidim.accessibility.secondary_menu") %>">
+    <ul class="menu-bar__secondary-dropdown__menu">
+      <%= render :links %>
+    </ul>
+  </nav>
 </div>

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

@@ -7,6 +7,6 @@
   <%= cell("decidim/follow_button", profile_holder) %>
 
   <% if user_flaggable? && model.try(:id) != current_user.try(:id) %>
-    <%= cell("decidim/report_button", profile_holder) %>
+    <%= cell("decidim/report_user_button", profile_holder) %>
   <% end %>
 </div>

data/app/cells/decidim/report_button/already_reported_modal.erb

@@ -1,10 +1,10 @@
 <%= decidim_modal id: modal_id, class: "flag-modal" do %>
   <div data-dialog-container>
     <%= icon "flag-line" %>
-    <h2 id="dialog-title-flagModal" tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
+    <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
     <div>
       <div class="form__wrapper flag-modal__form">
-        <p id="dialog-desc-flagModal" class="flag-modal__form-description"><%= t("decidim.shared.flag_modal.already_reported") %></p>
+        <p class="flag-modal__form-description"><%= t("decidim.shared.flag_modal.already_reported") %></p>
       </div>
     </div>
   </div>

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

@@ -2,7 +2,7 @@
   <%= form_for report_form, builder:, url: report_path, method: :post, html: { id: nil } do |f| %>
     <div data-dialog-container>
       <%= icon "flag-line" %>
-      <h2 id="dialog-title-<%= modal_id %>" tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
+      <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
       <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>
@@ -18,32 +18,18 @@
           <%= f.text_area :details, rows: 4, label_options: { class: "flag-modal__form-textarea-label", for: nil }, id: nil %>
 
           <% if frontend_administrable? %>
-            <% if user_reportable? %>
-              <% if current_user&.admin? %>
-                <%= f.check_box :block,
-                                label: t("decidim.shared.flag_user_modal.block"),
-                                include_hidden: false,
-                                data: {
-                                  label_action: t("decidim.shared.flag_user_modal.block"),
-                                  label_report: t("decidim.shared.flag_user_modal.report"),
-                                  block: "true"
-                                } %>
-                <%= f.check_box :hide, label: t("decidim.shared.flag_user_modal.hide"), label_options: { class: :invisible, id: "block_and_hide" } %>
-              <% end %>
-            <% else %>
-              <%= f.check_box :hide,
-                              label: t("decidim.shared.flag_modal.hide_content"),
-                              include_hidden: false,
-                              id: hide_checkbox_id,
-                              data: {
-                                label_action: t("decidim.shared.flag_modal.hide"),
-                                label_report: t("decidim.shared.flag_modal.report"),
-                                hide: "true"
-                              },
-                              label_options: {
-                                for: hide_checkbox_id
-                              } %>
-            <% end %>
+            <%= f.check_box :hide,
+                            label: t("decidim.shared.flag_modal.hide_content"),
+                            include_hidden: false,
+                            id: hide_checkbox_id,
+                            data: {
+                              label_action: t("decidim.shared.flag_modal.hide"),
+                              label_report: t("decidim.shared.flag_modal.report"),
+                              hide: "true"
+                            },
+                            label_options: {
+                              for: hide_checkbox_id
+                            } %>
           <% end %>
 
         </div>

data/app/cells/decidim/report_button_cell.rb

@@ -11,8 +11,6 @@ module Decidim
     end
 
     def frontend_administrable?
-      return true if user_reportable? && current_user&.admin?
-
       user_entity? &&
         model.can_be_administered_by?(current_user) &&
         (model.respond_to?(:official?) && !model.official?)
@@ -47,16 +45,12 @@ module Decidim
       options[:modal_id] || "flagModal"
     end
 
-    def user_reportable?
-      model.is_a?(Decidim::UserReportable)
-    end
-
     def report_form
-      @report_form ||= user_reportable? ? Decidim::ReportForm.from_params(reason: "spam") : Decidim::ReportForm.new(reason: "spam")
+      @report_form ||= Decidim::ReportForm.new(reason: "spam")
     end
 
     def report_path
-      @report_path ||= user_reportable? ? decidim.report_user_path(sgid: model.to_sgid.to_s) : decidim.report_path(sgid: model.to_sgid.to_s)
+      @report_path ||= decidim.report_path(sgid: model.to_sgid.to_s)
     end
 
     def builder

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

@@ -0,0 +1,11 @@
+<%= decidim_modal id: modal_id, class: "flag-user-modal" do %>
+  <div data-dialog-container>
+    <%= icon "flag-line" %>
+    <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_user_modal.title") %></h2>
+    <div>
+      <div class="form__wrapper flag-modal__form">
+        <p class="flag-modal__form-description"><%= t("decidim.shared.flag_user_modal.already_reported") %></p>
+      </div>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,46 @@
+<%= decidim_modal id: modal_id, class: "flag-user-modal" do %>
+  <%= form_for report_form, builder:, url: report_path, method: :post, html: { id: nil } do |f| %>
+    <div data-dialog-container>
+      <%= icon "flag-line" %>
+      <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_user_modal.title") %></h2>
+      <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 %>
+
+          <% if frontend_administrable? %>
+            <%= f.check_box :block,
+                            label: t("decidim.shared.flag_user_modal.block"),
+                            include_hidden: false,
+                            data: {
+                              label_action: t("decidim.shared.flag_user_modal.block"),
+                              label_report: t("decidim.shared.flag_user_modal.report"),
+                              block: "true"
+                            } %>
+            <%= f.check_box :hide, label: t("decidim.shared.flag_user_modal.hide"), label_options: { class: :invisible, id: "block_and_hide" } %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+
+    <div data-dialog-actions>
+      <button type="button" class="button button__lg button__transparent-secondary" data-dialog-close="<%= modal_id %>">
+        <%= t("decidim.shared.confirm_modal.cancel") %>
+      </button>
+
+      <button type="submit" class="button button__lg button__secondary">
+        <span><%= t("decidim.shared.flag_modal.report") %></span>
+        <%= icon "arrow-right-line", class: "fill-current" %>
+      </button>
+    </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,2 @@
+<%= render :button %>
+<%= flag_modal unless only_button? %>

data/app/cells/decidim/report_user_button_cell.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ReportUserButtonCell < ButtonCell
+    include ActionView::Helpers::FormOptionsHelper
+
+    def flag_modal
+      return render :already_reported_modal if model.reported_by?(current_user)
+
+      render
+    end
+
+    private
+
+    def report_form
+      @report_form ||= Decidim::ReportForm.from_params(reason: "spam")
+    end
+
+    def report_path
+      @report_path ||= decidim.report_user_path(sgid: model.to_sgid.to_s)
+    end
+
+    def user_reportable?
+      model.is_a?(Decidim::UserReportable)
+    end
+
+    def frontend_administrable?
+      current_user&.admin?
+    end
+
+    def builder
+      Decidim::FormBuilder
+    end
+
+    def only_button?
+      options[:only_button]
+    end
+
+    def modal_id
+      options[:modal_id] || "flagUserModal"
+    end
+
+    def button_classes
+      options[:button_classes] || "button button__sm button__text button__text-secondary"
+    end
+
+    def text
+      t("decidim.shared.flag_modal.report")
+    end
+
+    def icon_name
+      "flag-line"
+    end
+
+    def html_options
+      { data: { "dialog-open": current_user ? modal_id : "loginModal" } }
+    end
+  end
+end

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

@@ -11,7 +11,7 @@
   <ul id="dropdown-menu-resource">
     <% resource_types.each do |resource_type| %>
       <li role="menuitem">
-        <%= link_to decidim.last_activities_path(filter: { with_resource_type: resource_type[0] } ), class: "filter#{" is-active" if filter_param == resource_type[0]}" do %>
+        <%= link_to filter_url(resource_type[0]), class: "filter#{" is-active" if filter_param == resource_type[0]}" do %>
           <span class="sr-only"><%= resource_type[1] %></span>
           <%= text_with_resource_icon(*resource_type) %>
         <% end %>

data/app/cells/decidim/resource_types_filter_cell.rb

@@ -27,8 +27,12 @@ module Decidim
       options[:id] || "filters"
     end
 
-    def form_path
-      options[:form_path]
+    def filter_url(resource_type)
+      if options[:source] == :last_activities
+        last_activities_path(filter: { with_resource_type: resource_type })
+      else
+        profile_activity_path(nickname: params[:nickname], filter: { resource_type: })
+      end
     end
 
     def filter_param_key
@@ -39,10 +43,6 @@ module Decidim
       @filter_param ||= params.dig(:filter, filter_param_key) || all_types_key
     end
 
-    def filter
-      options[:filter]
-    end
-
     def all_resource_types_option
       [all_types_key, I18n.t("all", scope: "decidim.last_activities")]
     end

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

@@ -1,5 +1,5 @@
 <div class="profile__activity">
-  <%= cell "decidim/resource_types_filter", resource_types, form_path: url_for, filter: %>
+  <%= cell "decidim/resource_types_filter", resource_types, source: :profile_activity %>
   <div class="profile__activity__container" id="activities-container">
     <% if activities.length == 0 %>
       <%= cell "decidim/announcement", t("decidim.user_activity.index.no_activities_warning") %>

data/app/commands/decidim/create_omniauth_registration.rb

@@ -45,6 +45,8 @@ module Decidim
 
     attr_reader :form, :verified_email
 
+    REGEXP_SANITIZER = /[<>?%&\^*#@()\[\]=+:;"{}\\|]/
+
     def create_or_find_user
       @user = User.find_or_initialize_by(
         email: verified_email,
@@ -63,16 +65,11 @@ module Decidim
         @user.save!
       else
         @user.email = (verified_email || form.email)
-        @user.name = form.name
+        @user.name = form.name.gsub(REGEXP_SANITIZER, "")
         @user.nickname = form.normalized_nickname
         @user.newsletter_notifications_at = nil
         @user.password = SecureRandom.hex
-        if form.avatar_url.present?
-          url = URI.parse(form.avatar_url)
-          filename = File.basename(url.path)
-          file = url.open
-          @user.avatar.attach(io: file, filename:)
-        end
+        attach_avatar(form.avatar_url) if form.avatar_url.present?
         @user.skip_confirmation! if verified_email
         @user.tos_agreement = "1"
         @user.save!
@@ -81,6 +78,15 @@ module Decidim
       end
     end
 
+    def attach_avatar(avatar_url)
+      url = URI.parse(avatar_url)
+      filename = File.basename(url.path)
+      file = url.open
+      @user.avatar.attach(io: file, filename:)
+    rescue OpenURI::HTTPError, Errno::ECONNREFUSED
+      # Do not attach the avatar, as it fails to fetch it.
+    end
+
     def create_identity
       @user.identities.create!(
         provider: form.provider,
@@ -126,7 +132,7 @@ module Decidim
         provider: form.provider,
         uid: form.uid,
         email: form.email,
-        name: form.name,
+        name: form.name.gsub(REGEXP_SANITIZER, ""),
         nickname: form.normalized_nickname,
         avatar_url: form.avatar_url,
         raw_data: form.raw_data

data/app/commands/decidim/create_report.rb

@@ -34,7 +34,7 @@ module Decidim
       send_report_notification_to_moderators
 
       if hideable?
-        hide!
+        @tool.hide!
         send_hide_notification_to_moderators
       end
 
@@ -72,16 +72,15 @@ module Decidim
       hidden_by_admin? || (!@reportable.hidden? && moderation.report_count >= Decidim.max_reports_before_hiding)
     end
 
-    def hide!
-      @tool.hide!
-      @tool.send_notification_to_author
-    end
-
     def send_hide_notification_to_moderators
       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/commands/decidim/search.rb

@@ -37,6 +37,12 @@ module Decidim
                     klass.order_by_id_list(result_ids.take(HIGHLIGHTED_RESULTS_COUNT))
                   end
 
+        uncommentable_resources = uncommentable_resources(results) if results.present?
+        if uncommentable_resources.present?
+          results -= uncommentable_resources
+          results_count -= uncommentable_resources.count
+        end
+
         results_by_type.update(class_name => {
                                  count: results_count,
                                  results:
@@ -89,5 +95,13 @@ module Decidim
       query = query.global_search(I18n.transliterate(term)) if term.present?
       query
     end
+
+    def uncommentable_resources(results)
+      results.where(id: results.select { |obj| related_uncommentable_resources?(obj) }.map(&:id))
+    end
+
+    def related_uncommentable_resources?(object)
+      object.respond_to?(:commentable) && !object.commentable.commentable?
+    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/profiles_controller.rb

@@ -24,7 +24,7 @@ module Decidim
     def show
       return redirect_to profile_members_path if profile_holder.is_a?(Decidim::UserGroup)
 
-      redirect_to profile_activity_path(nickname: params[:nickname])
+      redirect_to profile_activity_path(nickname: params[:nickname].downcase)
     end
 
     def tooltip
@@ -116,7 +116,7 @@ module Decidim
     def profile_holder
       return if params[:nickname].blank?
 
-      @profile_holder ||= Decidim::UserBaseEntity.find_by("LOWER(nickname) = ? AND decidim_organization_id = ?", params[:nickname].downcase, current_organization.id)
+      @profile_holder ||= Decidim::UserBaseEntity.find_by("nickname = ? AND decidim_organization_id = ?", params[:nickname].downcase, current_organization.id)
     end
   end
 end

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,8 +16,12 @@ module Decidim
 
       CreateReport.call(@form, reportable) do
         on(:ok) do
-          flash[:notice] = I18n.t("decidim.reports.create.success")
-          redirect_back fallback_location: root_path
+          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
 
         on(:invalid) do

data/app/controllers/decidim/user_activities_controller.rb

@@ -22,7 +22,7 @@ module Decidim
     def user
       return unless params[:nickname]
 
-      @user ||= current_organization.users.find_by("LOWER(nickname) = ?", params[:nickname].downcase)
+      @user ||= current_organization.users.find_by("nickname = ?", params[:nickname].downcase)
     end
 
     def activities

data/app/forms/decidim/account_form.rb

@@ -21,7 +21,10 @@ module Decidim
 
     validates :name, presence: true, format: { with: Decidim::User::REGEXP_NAME }
     validates :email, presence: true, "valid_email_2/email": { disposable: true }
-    validates :nickname, presence: true, format: { with: Decidim::User::REGEXP_NICKNAME }
+    validates :nickname,
+              presence: true,
+              format: { with: Decidim::User::REGEXP_NICKNAME, message: :format },
+              length: { maximum: Decidim::User.nickname_max_length }
 
     validates :nickname, length: { maximum: Decidim::User.nickname_max_length, allow_blank: true }
     validates :password, password: { name: :name, email: :email, username: :nickname }, if: -> { password.present? }
@@ -66,7 +69,7 @@ module Decidim
 
     def unique_nickname
       return true if Decidim::UserBaseEntity.where(
-        "decidim_organization_id = ? AND LOWER(nickname) = ? ",
+        "decidim_organization_id = ? AND nickname = ? ",
         context.current_organization.id,
         nickname.downcase
       ).where.not(id: context.current_user.id).empty?

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

@@ -13,7 +13,8 @@ module Decidim
     def order_selector(orders, options = {})
       render partial: "decidim/shared/orders", locals: {
         orders:,
-        i18n_scope: options[:i18n_scope]
+        i18n_scope: options[:i18n_scope],
+        css_class: options[:css_class]
       }
     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/participatory_space_helpers.rb

@@ -28,7 +28,7 @@ module Decidim
     end
 
     def participatory_space_floating_help
-      return if help_section.blank?
+      return if help_section.blank? || strip_tags(translated_attribute(help_section).html_safe).blank?
 
       floating_help(help_id) { translated_attribute(help_section).html_safe }
     end