decidim-core 0.29.3 → 0.29.5

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

@@ -61,7 +61,7 @@ header {
       @apply hidden md:block col-span-2 col-start-5 xl:col-start-4;
 
       form {
-        @apply block relative rounded text-md bg-background;
+        @apply block relative rounded text-md border border-neutral-200 outline outline-1 outline-transparent rounded bg-background-2 leading-relaxed;
       }
 
       input[type="text"] {
@@ -69,7 +69,7 @@ header {
       }
 
       button[type="submit"] {
-        @apply absolute ltr:right-2 rtl:left-2 inset-y-2 text-secondary;
+        @apply absolute ltr:right-2 rtl:left-2 inset-y-0 text-secondary px-2;
       }
     }
 
@@ -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,85 @@ 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-[100%] mt-0 grid md:grid-cols-2 gap-x-6 text-secondary;
+
+          > * {
+            @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;
+            /* 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;
+
+        &-right {
+          @apply mr-2 mb-2;
+        }
+
+        &-left {
+          @apply mr-2 mt-1;
+        }
+      }
+
+      &__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 +486,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/packs/stylesheets/decidim/_layout.scss

@@ -2,11 +2,11 @@
   @apply flex flex-col min-h-screen;
 
   &__skip {
-    @apply absolute z-10 left-0 -translate-x-full py-1 px-4 bg-primary rounded-br-lg text-white cursor-pointer transition focus:translate-x-0;
+    @apply absolute z-[9999] left-0 -translate-x-full py-1 px-4 bg-primary rounded-br-lg text-white cursor-pointer transition focus:translate-x-0;
   }
 
   [data-content] {
-    @apply relative flex flex-col;
+    @apply relative flex flex-col flex-1;
   }
 }
 

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

@@ -18,15 +18,11 @@
   }
 
   [data-dialog-container] {
-    @apply grid grid-cols-[auto_1fr] items-start md:items-center gap-2 text-left;
+    @apply grid grid-rows-[auto_1fr] items-start md:items-center gap-2 text-left;
 
     > svg {
       @apply w-6 h-6 text-gray fill-current flex-none;
     }
-
-    > :last-child {
-      @apply col-span-2 md:col-span-1 md:col-start-2;
-    }
   }
 
   [data-dialog-title] {

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

@@ -132,8 +132,12 @@
       }
 
       span {
-        @apply text-sm text-gray-2 mx-auto;
+        @apply text-sm text-gray-2 mx-auto w-full break-all mb-2;
       }
     }
   }
+
+  &__span {
+    @apply w-full break-all mb-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/permissions/decidim/permissions.rb

@@ -106,7 +106,19 @@ module Decidim
         return allow! if component.current_settings.amendment_creation_enabled
       when :accept,
           :reject
-        return allow! if component.current_settings.amendment_reaction_enabled
+        return disallow! unless component.current_settings.amendment_reaction_enabled
+
+        amendable = context.fetch(:amendable, nil)
+
+        if amendable.respond_to?(:official?) && amendable.official?
+          return allow! if user.admin?
+
+          return disallow!
+        end
+
+        return disallow! unless amendable.authored_by?(user)
+
+        return allow!
       when :promote
         return allow! if component.current_settings.amendment_promotion_enabled
       end

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/errors/internal_server_error.html.erb

@@ -1,6 +1,6 @@
 <%= render layout: "layouts/decidim/shared/layout_center" do %>
 
-  <div class="place-self-center">
+  <div class="flex flex-col items-center">
     <div class="flex justify-center">
       <h1 class="title-decorator my-12"><%= t("title", scope: "decidim.errors.internal_server_error") %></h1>
     </div>

data/app/views/decidim/errors/not_found.html.erb

@@ -1,6 +1,6 @@
 <%= render layout: "layouts/decidim/shared/layout_center" do %>
 
-  <div class="place-self-center">
+  <div class="flex flex-col items-center">
     <div class="flex justify-center">
       <h1 class="title-decorator my-12"><%= t("title", scope: "decidim.errors.not_found") %></h1>
     </div>

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/newsletters/unsubscribe.html.erb

@@ -1,4 +1,16 @@
-<div class="row">
-  <h4><%== t ".unsubscribe" %></h4>
-  <p><%== t ".check_subscription", link: decidim.notifications_settings_path %></p>
-</div>
+<main class="layout-1col cols-6">
+  <div class="text-center py-12">
+    <h1 class="h1 decorator inline-block text-left"><%= t ".unsubscribe" %></h1>
+  </div>
+  <div class="page__container">
+    <div class="editor-content">
+      <div class="rich-text-display">
+        <%= t ".subscription_preferences", organization_name: translated_attribute(current_organization.name) %>
+      </div>
+      <br>
+      <div class="rich-text-display">
+        <%= t ".check_subscription_html", link: decidim.notifications_settings_path %>
+      </div>
+    </div>
+  </div>
+</main>

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/searches/_filters.html.erb

@@ -12,35 +12,70 @@
       <%= icon "arrow-down-s-line", class: "w-8 h-8 flex-none text-secondary fill-current" %>
       <%= icon "arrow-up-s-line", class: "w-8 h-8 flex-none text-secondary fill-current" %>
     </button>
-    <div id="dropdown-menu-search" aria-hidden="true">
-      <div>
-        <%= link_to main_search_path, class: "filter#{" is-active" if params.dig(:filter, :with_resource_type) == nil}" do %>
+    <ul id="dropdown-menu-search" aria-hidden="true">
+      <li>
+        <%= link_to main_search_path, class: "filter#{" is-active" if params.dig(:filter, :with_resource_type) == nil}", "aria-current": params.dig(:filter, :with_resource_type) == nil ? "true" : "" do %>
           <%= resource_type_icon("all") %>
           <span><%= t("all", scope: "decidim.searches.filters.state") %></span>
           <span class="label ml-auto"><%= @results_count %></span>
         <% end %>
-      </div>
+      </li>
       <% @blocks.each do |elements| %>
-        <div>
-          <% elements.each do |type, results| %>
-            <div>
+        <li>
+          <ul>
+            <% elements.each do |type, results| %>
               <% if results[:count].positive? %>
-                <%= link_to search_path_by_resource_type(type), class: "filter#{" is-active" if params.dig(:filter, :with_resource_type) == type}" do %>
+                <li>
+                <%= link_to search_path_by_resource_type(type), class: "filter#{" is-active" if params.dig(:filter, :with_resource_type) == type}", "aria-current": params.dig(:filter, :with_resource_type) == type ? "true" : "" do %>
                   <%= resource_type_icon(type) %>
                   <span><%= searchable_resource_human_name(type) %></span>
                   <span class="label ml-auto"><%= results[:count] %></span>
                 <% end %>
+                </li>
               <% else %>
-                <%= content_tag :div, class: "filter#{" is-empty" if results[:count].zero?}" do %>
+                <%= content_tag :li, class: "filter#{" is-empty" if results[:count].zero?}" do %>
                   <%= resource_type_icon(type) %>
                   <span><%= searchable_resource_human_name(type) %></span>
                   <span class="label ml-auto"><%= results[:count] %></span>
                 <% end %>
               <% end %>
-            </div>
-          <% end %>
-        </div>
+            <% end %>
+          </ul>
+        </li>
       <% end %>
-    </div>
+    </ul>
   </div>
 </nav>
+<script type="text/javascript">
+  const button = document.querySelector('#dropdown-trigger-search');
+  const arrowDown = button.querySelector('svg:first-of-type');
+  const arrowUp = button.querySelector('svg:last-of-type');
+  const list = document.querySelector('#dropdown-menu-search');
+  // the arrow is up when user arrives on the page, with the list displayed
+  arrowUp.addEventListener('click', function(){
+    setTimeout(() => {
+      button.setAttribute('aria-expanded', 'false');
+      list.style.display = "none";
+      }, 300)
+  })
+  arrowDown.addEventListener('click', function(){
+    setTimeout(() => {
+      button.setAttribute('aria-expanded', 'true');
+      list.style.display = "block";
+    }, 300)
+  })
+  // 32 is code for space bar and 13 is code for enter
+  button.addEventListener('keydown', function(e){
+    if ((e.keyCode === 13 || e.keyCode === 32) && button.getAttribute('aria-expanded') === 'true') {
+      setTimeout(() => {
+        button.setAttribute('aria-expanded', 'false');
+        list.style.display = "none";
+      }, 300)
+    } else if ((e.keyCode === 13 || e.keyCode === 32) && button.getAttribute('aria-expanded') === 'false'){
+        setTimeout(() => {
+          button.setAttribute('aria-expanded', 'true');
+          list.style.display = "block";
+        }, 300)
+    }
+  })
+</script>

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

@@ -1,5 +1,5 @@
 <% announcement = translated_attribute(current_settings.announcement).presence || translated_attribute(component_settings.announcement).presence %>
-<% if announcement %>
+<% if strip_tags(announcement).present? %>
   <section class="layout-main__section">
     <%= cell("decidim/announcement", announcement, local_assigns.merge(callout_class: "editor-content")) %>
   </section>

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

@@ -1,16 +1,14 @@
 <%= decidim_modal id: "confirm-modal" do %>
   <div data-dialog-container>
-    <%= icon "delete-bin-line" %>
     <h2 class="h2" data-dialog-title id="dialog-title-confirm-modal"><%= t("title", scope: "decidim.shared.confirm_modal") %></h2>
-
     <div data-confirm-modal-content></div>
   </div>
 
-  <div data-dialog-actions>
-    <button class="button button__lg button__transparent-secondary" data-confirm-cancel data-dialog-close="confirm-modal">
+  <div data-dialog-actions class="flex flex-col-reverse md:flex-row">
+    <button class="button button__lg button__transparent-secondary w-full md:w-auto" data-confirm-cancel data-dialog-close="confirm-modal">
       <span><%= t("cancel", scope: "decidim.shared.confirm_modal") %></span>
     </button>
-    <button class="button button__lg button__secondary" data-confirm-ok>
+    <button class="button button__lg button__secondary w-full md:w-auto" data-confirm-ok>
       <span><%= t("ok", scope: "decidim.shared.confirm_modal") %></span>
     </button>
   </div>

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

@@ -16,16 +16,18 @@
       <% if local_assigns.has_key?(:skip_to_id) %>
         <%= link_to t("skip", scope: "decidim.shared.filter_form_help"), "##{skip_to_id}", class: "filter-skip", role: "menuitem" %>
       <% end %>
-      <p class="filter-help" role="menuitem" aria-disabled="true"><%= t("help", scope: "decidim.shared.filter_form_help") %></p>
+
+      <p id="filter-help-text" class="filter-help" role="menuitem" aria-disabled="true"><%= t("help", scope: "decidim.shared.filter_form_help") %></p>
 
       <% if local_assigns.has_key?(:search_variable) %>
         <div class="filter-search filter-container" role="menuitem">
           <%= form.search_field search_variable,
                                 label: false,
                                 placeholder: search_label,
-                                title: search_label,
-                                "aria-label": search_label %>
-          <button type="submit" aria-label="<%= search_label %>">
+                                title: filter_search_label(search_label, skip_to_id),
+                                "aria-label": filter_search_label(search_label, skip_to_id),
+                                "aria-describedby": "filter-help-text" %>
+          <button type="submit" aria-label="<%= filter_search_label(search_label, skip_to_id) %>">
             <%= icon "search-line" %>
           </button>
         </div>

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/_js_configuration.html.erb

@@ -7,6 +7,7 @@ js_configs = {
     "mentionsModal": {
       "removeRecipient": t("decidim.shared.mentions_modal.remove_recipient", name: "%name%")
     },
+    "confirmUnload": t("decidim.shared.confirm_unload"),
     emojis: I18n.t("emojis").deep_transform_keys { |k| k.to_s.camelize(:lower) },
     editor: I18n.t("editor"),
     date: I18n.t("date"),

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/footer/_main.html.erb

@@ -11,7 +11,7 @@
     <nav class="md:w-1/2 lg:w-auto" role="navigation" aria-label="Legal">
       <%= render partial: "layouts/decidim/footer/main_legal" %>
     </nav>
-    <nav class="w-full md:w-auto md:ml-auto" role="navigation" aria-label="Social media">
+    <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" %>

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

@@ -1,6 +1,6 @@
 <% if current_organization.official_img_footer.attached? %>
   <%= link_to current_organization.official_url, class: "block mb-6" do %>
-    <%= image_tag current_organization.attached_uploader(:official_img_footer).url, alt: current_organization_name, class: "max-h-16" %>
+    <%= image_tag current_organization.attached_uploader(:official_img_footer).url, alt: t("layouts.decidim.footer.current_organization_img", organization: current_organization_name), class: "max-h-16" %>
   <% end %>
 <% end %>
 <div class="text-sm text-white prose">

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

@@ -4,9 +4,9 @@
       <a rel="decidim noopener noreferrer" href="https://decidim.org/" target="_blank" data-external-link="text-only">
         <%= image_pack_tag("media/images/decidim-logo.svg", alt: t("layouts.decidim.footer.decidim_logo"), class: "max-h-8 block") %>
       </a>
-      <div class="text-xs mt-2 [&_a]:underline">
+      <p class="text-xs mt-2 [&_a]:underline">
         <%= t("layouts.decidim.footer.made_with_open_source").html_safe %>
-      </div>
+      </p>
     </div>
     <a class="flex gap-1 hover:opacity-50" rel="license noopener noreferrer" href="http://creativecommons.org/licenses/by-sa/4.0/" target="_blank" data-external-link="text-only">
       <span class="sr-only"><%= t("layouts.decidim.footer.cc_by_license") %></span>

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

@@ -8,10 +8,10 @@
         <%= render partial: "layouts/decidim/logo_mobile", locals: { organization: current_organization } %>
       </div>
     </div>
-    <div class="main-bar__search">
+    <div role="search" class="main-bar__search">
       <%= render partial: "layouts/decidim/header/main_search" %>
     </div>
-    <div class="main-bar__links-desktop">
+    <div role="navigation" class="main-bar__links-desktop">
       <%= render partial: "layouts/decidim/header/main_links_desktop" %>
     </div>
     <div class="main-bar__menu-mobile">

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

@@ -30,6 +30,12 @@
       <% 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 %>
       <% if current_user.avatar.attached? %>
         <span class="main-bar__avatar">