decidim-core 0.29.6 → 0.30.0.rc1

data/app/views/decidim/devise/shared/_tos_fields.html.erb

@@ -0,0 +1,16 @@
+<div id="card__tos" class="form__wrapper-block border-y-2">
+  <h2 class="h4"><%= t("decidim.devise.registrations.new.tos_title") %></h2>
+
+  <div>
+    <% terms_of_service_summary_content_blocks.each do |content_block| %>
+      <%= cell content_block.manifest.cell, content_block %>
+    <% end %>
+  </div>
+
+  <%= form.check_box :tos_agreement, label: t("decidim.devise.registrations.new.tos_agreement", link: link_to(t("decidim.devise.registrations.new.terms"), decidim.page_path("terms-of-service"))), label_options: { class: "form__wrapper-checkbox-label" } %>
+</div>
+
+<div id="card__newsletter" class="form__wrapper-block">
+  <h2 class="h4"><%= t("decidim.devise.registrations.new.newsletter_title") %></h2>
+  <%= form.check_box :newsletter, label: t("decidim.devise.registrations.new.newsletter"), checked: @form.newsletter, label_options: { class: "form__wrapper-checkbox-label" } %>
+</div>

data/app/views/decidim/download_your_data/_export.html.erb

@@ -0,0 +1,15 @@
+<tr>
+  <td class="text-left p-4"><%= t(export.export_type, scope:"decidim.download_your_data.show") %></td>
+  <td class="text-center"><%= export.expired? ? t("expired", scope:"decidim.download_your_data.show") : l(export.expires_at, format: :decidim_short) %></td>
+  <td class="py-4">
+    <%= button_to download_download_your_data_path(export),
+                  class: "button button__sm button__transparent-secondary m-auto block",
+                  disabled: export.expired?,
+                  aria: { label: t("download", scope:"decidim.download_your_data.show") },
+                  method: :get do %>
+                    <span class="hidden lg:block"><%= t("download", scope:"decidim.download_your_data.show") %></span>
+                    <span class="lg:hidden"><%= icon "download-line", class: "text-secondary fill-current" %></span>
+    <% end %>
+
+  </td>
+</tr>

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

@@ -3,14 +3,60 @@
   <% content_for(:subtitle) { t("my_data", scope: "layouts.decidim.user_profile") } %>
 
   <div class="download-your-data">
-    <span class="uppercase font-semibold text-gray-2 mb-4 block">
+    <h2 class="h4 font-bold pb-4">
       <%= t("download_data", scope:"decidim.download_your_data.show") %>
-    </span>
-    <p class="help-text pb-8">
-      <%= t("download_data_description_html", scope:"decidim.download_your_data.show" , user_email: current_user.email) %>
+    </h2>
+
+    <p class="pb-4 editor-content">
+      <%= t("download_data_description_1", scope:"decidim.download_your_data.show") %>
+    </p>
+    <p class="pb-4 editor-content">
+      <%= t("download_data_description_2", scope:"decidim.download_your_data.show") %>
     </p>
-    <div class="form__wrapper-block">
+
+    <%= render layout: "decidim/application/accordion_section", locals: { open_accordion: true, panel_id: "explanation", title: t("title", scope: "decidim.download_your_data.show.explanation") } do %>
+      <p> <%= t("body_1", scope: "decidim.download_your_data.show.explanation", organization_name: current_organization_name) %> </p>
+      <p> <%= t("body_2", scope: "decidim.download_your_data.show.explanation") %> </p>
+    <% end %>
+
+    <%= render partial: "decidim/open_data/how_to_open_accordion_section" %>
+
+    <%= render layout: "decidim/application/accordion_section", locals: { panel_id: "detailed", title: t("title", scope: "decidim.open_data.index.detailed") } do %>
+      <p> <%= t("body_1", scope: "decidim.open_data.index.detailed") %> </p>
+      <% help_definitions.each do |export_manifest_name, export_manifest_definitions| %>
+        <% next if export_manifest_definitions.blank? %>
+        <div class="mt-8">
+          <h4><%= export_manifest_name %></h4>
+          <ul>
+            <% export_manifest_definitions.each do |i18n_key, i18n_value| %>
+              <li> <b><%= i18n_key %></b>: <%= i18n_value %> </li>
+            <% end %>
+          </ul>
+        </div>
+      <% end %>
+    <% end %>
+
+    <div class="py-10 flex flex-col gap-4 only:[&_*]:ml-auto">
       <%= button_to t("request_data", scope:"decidim.download_your_data.show"), export_download_your_data_path, class: "button button__sm md:button__lg button__secondary mr-auto !ml-0", data: { disable: true } %>
     </div>
+
+    <% unless @exports.size.zero? %>
+      <h2 class="h4 font-bold pb-4">
+        <%= t("files_to_download", scope:"decidim.download_your_data.show") %>
+      </h2>
+
+      <table class="w-full">
+        <thead class="bg-gray-5">
+          <th class="font-semibold p-4 text-left"><%= t("type", scope:"decidim.download_your_data.show") %></th>
+          <th class="w-[20%] sm:w-[25%] font-semibold py-4"><%= t("expiration", scope:"decidim.download_your_data.show") %></th>
+          <th class="w-[20%] sm:w-[25%] font-semibold py-4 text-center"><%= t("action", scope:"decidim.download_your_data.show") %></th>
+        </thead>
+        <tbody>
+          <%= render partial: "decidim/download_your_data/export", collection: @exports %>
+        </tbody>
+      </table>
+      <%= decidim_paginate(@exports) %>
+    <% end %>
   </div>
+
 <% end %>

data/app/views/decidim/endorsements/update_buttons_and_counters.js.erb

@@ -1,28 +1,25 @@
 updateEndorsementBlock();
 function updateEndorsementBlock() {
-  var $endorsementBlock = $('#resource-<%= resource.id %>-endorsement-block');
-  var $endorsementListTrigger = $('#resource-<%= resource.id %>-endorsement-block #dropdown-trigger');
-  var $endorsementButton = $('#resource-<%= resource.id %>-endorsement-button');
-  var $endorsementIdentitiesButton = $('#resource-<%= resource.id %>-endorsement-button #select-identity-button');
-  var $endorsementListGrid = $('#dropdown-menu-endorsers-list .endorsers-list__grid');
-  var endorsersCount = <%= j(cell("decidim/endorsers_list", resource).endorsers_count) %>
+  var $endorsementBlock = document.getElementById('resource-<%= resource.reload.id %>-endorsement-block');
+  var $endorsementButton = document.getElementById('resource-<%= resource.id %>-endorsement-button');
+  var $endorsementListGrid = document.getElementById('endorser-list-<%= resource.id %>');
 
-  $endorsementListTrigger[0].innerHTML = '<%= j(cell("decidim/endorsers_list", resource)).strip.html_safe %>';
-  $endorsementListGrid[0].innerHTML = '<%= j(cell("decidim/endorsers_list", resource).full_endorsers_list).strip.html_safe %>';
-  if (endorsersCount > 0) {
-    $endorsementListTrigger.removeClass('hidden');
-  } else {
-    $endorsementListTrigger.addClass('hidden');
+  var $endorsersModal = document.getElementById('endorsersModal-<%= resource.id %>');
+
+  if ($endorsersModal !== null) {
+    $endorsersModal.remove();
   }
 
+  $endorsementListGrid.outerHTML = '<%= j(cell("decidim/endorsers_list", resource)).strip.html_safe %>';
+
   <%# If the endorsement button displays a modal to select the identity to endorse only the content of the button %>
   <%# has to be updated to maintain the function of the button to open the modal. Otherwise the button has to be fully %>
   <%# updated because the form request also changes %>
-  if ($endorsementIdentitiesButton.length == 0) {
-    $endorsementButton[0].outerHTML = '<%= j(cell("decidim/endorsement_buttons", resource).show).strip.html_safe %>';
-  } else {
-    $endorsementIdentitiesButton[0].innerHTML = '<%= j(cell("decidim/endorsement_buttons", resource).button_content).strip.html_safe %>';
-  }
-  document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: $endorsementBlock[0] }));
-  document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: $endorsementListGrid[0] }));
+
+  $endorsementButton.outerHTML = '<%= j(cell("decidim/endorsement_buttons", resource).show).strip.html_safe %>';
+
+  $endorsementListGrid = document.getElementById('endorser-list-<%= resource.id %>');
+
+  document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: $endorsementBlock }));
+  document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: $endorsementListGrid }));
 }

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

@@ -1,6 +1,6 @@
 <%= render layout: "layouts/decidim/shared/layout_center" do %>
 
-  <div class="flex flex-col items-center">
+  <div class="place-self-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="flex flex-col items-center">
+  <div class="place-self-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/export_mailer/download_your_data_export.html.erb

@@ -1,7 +1,7 @@
 <p class="email-instructions">
-  <%= t(".click_button", password: @password, date: l(Decidim.download_your_data_expiry_time.from_now, format: :decidim_short) ).html_safe %><br>
+  <%= t(".click_button_html", date: l(@private_export.expires_at, format: :decidim_short) ) %><br>
 </p>
 
 <p class="email-button email-button__cta">
-  <%= link_to t(".download"), download_file_download_your_data_url(host: @organization.host, filename: @filename), class: "button expanded hollow button--sc" %>
+  <%= link_to t(".download"), download_download_your_data_url(@private_export, host: @organization.host), class: "button expanded hollow button--sc" %>
 </p>

data/app/views/decidim/export_mailer/export.html.erb

@@ -1,3 +1,7 @@
 <p class="email-instructions">
-  <%= t(".ready") %>
+  <%= t(".click_button_html", date: l(@private_export.expires_at, format: :decidim_short) ) %><br>
+</p>
+
+<p class="email-button email-button__cta">
+  <%= link_to t(".download"), download_download_your_data_url(@private_export, host: @organization.host), class: "button expanded hollow button--sc" %>
 </p>

data/app/views/decidim/last_activities/index.html.erb

@@ -5,7 +5,7 @@
   <h1 class="title-decorator my-12"><%= t("last_activity", scope: "decidim.last_activities.index") %></h1>
 
   <div class="profile__activity pb-16">
-    <%= cell "decidim/resource_types_filter", resource_types, source: :last_activities, filter_param_key: :with_resource_type %>
+    <%= cell "decidim/resource_types_filter", resource_types, form_path: last_activities_path, filter_param_key: :with_resource_type, filter: %>
     <div id="activities">
       <%= render partial: "activities" %>
     </div>

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

@@ -1,7 +1,8 @@
 <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.text_area :body, label: false, rows: 4, required: true, placeholder: t(".placeholder"), data: { "input-emoji": true }, aria: { label: t(".placeholder") } %>
+      <%= 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.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 }, aria: { label: t(".placeholder") } %>
+      <%= f.text_area :body, label: false, rows: 4, required: true, placeholder: t(".placeholder"), data: { "input-emoji": true } %>
       <%= 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,16 +1,4 @@
-<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>
+<div class="row">
+  <h4><%== t ".unsubscribe" %></h4>
+  <p><%== t ".check_subscription", link: decidim.notifications_settings_path %></p>
+</div>

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

@@ -99,6 +99,28 @@
         </label>
       </div>
 
+      <label>
+        <%= t("valuators", scope: "decidim.notifications_settings.show") %>
+      </label>
+      <div class="toggle__switch-trigger">
+        <label for="email_on_assigned_proposals" class="toggle__switch-toggle">
+          <span>
+            <input
+              <%== %(checked="checked") if @notifications_settings.email_on_assigned_proposals %>
+              id="email_on_assigned_proposals"
+              type="checkbox"
+              name="email_on_assigned_proposals">
+            <span class="toggle__switch-toggle-content">
+            </span>
+            <%= icon "check-line", class: "toggle__switch-toggle-icon" %>
+            <%= icon "close-line", class: "toggle__switch-toggle-icon" %>
+          </span>
+          <span class="toggle__switch-trigger-text">
+            <%= t("assigned_to_proposal", scope: "decidim.notifications_settings.show") %>
+          </span>
+        </label>
+      </div>
+
       <% if current_user.moderator? %>
         <label>
           <%= t("administrators", scope: "decidim.notifications_settings.show") %>

data/app/views/decidim/open_data/_how_to_open_accordion_section.html.erb

@@ -0,0 +1,15 @@
+<%# i18n-tasks-use t("decidim.open_data.index.how_to.step_1.title") %>
+<%# i18n-tasks-use t("decidim.open_data.index.how_to.step_1.body_html") %>
+<%# i18n-tasks-use t("decidim.open_data.index.how_to.step_2.title") %>
+<%# i18n-tasks-use t("decidim.open_data.index.how_to.step_2.body_html") %>
+<%# i18n-tasks-use t("decidim.open_data.index.how_to.step_3.title") %>
+<%# i18n-tasks-use t("decidim.open_data.index.how_to.step_3.body_html") %>
+<%= render layout: "decidim/application/accordion_section", locals: { panel_id: "how_to", title: t("title", scope: "decidim.open_data.index.how_to") } do %>
+  <% (1..3).each do |step_number| %>
+    <% scope = "decidim.open_data.index.how_to.step_#{step_number}" %>
+    <div class="row column">
+      <h3 class="text-lg pt-8"><%= t("title", scope:) %></h3>
+      <%= t("body_html", scope:) %>
+    </div>
+  <% end %>
+<% end %>

data/app/views/decidim/open_data/index.html.erb

@@ -0,0 +1,108 @@
+<% add_decidim_meta_tags(
+  title: t(".title"),
+  description: t(".description")
+) %>
+
+<%= render layout:"layouts/decidim/shared/layout_center" do %>
+
+  <div class="text-center py-12">
+    <h1 class="h1 decorator inline-block text-left">
+      <%= t("title", scope: "decidim.open_data.index") %>
+    </h1>
+  </div>
+
+  <div class="page__container page__container-open_data">
+    <div class="editor-content">
+      <p>
+      <%= t("description", scope: "decidim.open_data.index", organization_name: current_organization_name) %>
+      </p>
+
+      <%= render layout: "decidim/application/accordion_section", locals: { panel_id: "explanation", title: t("title", scope: "decidim.open_data.index.explanation") } do %>
+        <p> <%= t("body_1", scope: "decidim.open_data.index.explanation", organization_name: current_organization_name) %> </p>
+        <p> <%= t("body_2", scope: "decidim.open_data.index.explanation") %> </p>
+      <% end %>
+
+      <%= render partial: "decidim/open_data/how_to_open_accordion_section" %>
+
+      <%= render layout: "decidim/application/accordion_section", locals: { panel_id: "detailed", title: t("title", scope: "decidim.open_data.index.detailed") } do %>
+        <p> <%= t("body_1", scope: "decidim.open_data.index.detailed") %> </p>
+
+        <h3><%= t("components", scope: "decidim.open_data.index.detailed") %> </h3>
+        <% open_data_component_manifests.each do |export_manifest| %>
+          <div class="mt-8">
+            <h4><%= export_manifest.name %></h4>
+            <ul>
+              <% t(export_manifest.name, scope: "decidim.open_data.help").each do |i18n_key, i18n_value| %>
+                <li> <b><%= i18n_key %></b>: <%= i18n_value %> </li>
+              <% end %>
+            </ul>
+          </div>
+        <% end %>
+
+        <hr class="mt-8 mb-4">
+
+        <h3><%= t("spaces", scope: "decidim.open_data.index.detailed") %> </h3>
+        <% open_data_participatory_space_manifests.each do |export_manifest| %>
+          <div class="mt-8">
+            <h4><%= export_manifest.name %></h4>
+            <ul>
+              <% t(export_manifest.name, scope: "decidim.open_data.help").each do |i18n_key, i18n_value| %>
+                <li> <b><%= i18n_key %></b>: <%= i18n_value %> </li>
+              <% end %>
+            </ul>
+          </div>
+        <% end %>
+
+        <hr class="mt-8 mb-4">
+
+        <h3><%= t("core", scope: "decidim.open_data.index.download") %></h3>
+        <% open_data_core_manifests.each do |export_manifest| %>
+          <div class="mt-8">
+            <h4><%= export_manifest.name %></h4>
+            <ul>
+              <% t(export_manifest.name, scope: "decidim.open_data.help").each do |i18n_key, i18n_value| %>
+                <li> <b><%= i18n_key %></b>: <%= i18n_value %> </li>
+              <% end %>
+            </ul>
+          </div>
+        <% end %>
+
+      <% end %>
+    </div>
+
+    <%= render layout: "decidim/application/accordion_section", locals: { panel_id: "license", title: t("title", scope: "decidim.open_data.index.license") } do %>
+      <% link_database = link_to(t("license_database_name", scope: "decidim.open_data.index.license"), t("license_database_link", scope: "decidim.open_data.index.license")) %>
+      <% link_contents = link_to(t("license_contents_name", scope: "decidim.open_data.index.license"), t("license_contents_link", scope: "decidim.open_data.index.license")) %>
+      <p> <%= t("body_1_html", scope: "decidim.open_data.index.license", organization_name: current_organization_name, link_database:, link_contents:) %> </p>
+    <% end %>
+
+    <div class="editor-content mt-8">
+      <h2 class="h4"><%= t("title", scope: "decidim.open_data.index.download") %></h2>
+      <h3 class="h5"><%= t("components", scope: "decidim.open_data.index.download") %></h3>
+      <ul>
+        <% open_data_component_manifests.each do |manifest| %>
+          <li><%= link_to(t("download_resource", scope: "decidim.open_data.index", resource_name: manifest.name), open_data_download_resource_path(manifest.name)) %></li>
+        <% end %>
+      </ul>
+
+      <h3 class="h5"><%= t("spaces", scope: "decidim.open_data.index.download") %></h3>
+      <ul>
+        <% open_data_participatory_space_manifests.each do |manifest| %>
+          <li><%= link_to(t("download_resource", scope: "decidim.open_data.index", resource_name: manifest.name), open_data_download_resource_path(manifest.name)) %></li>
+        <% end %>
+      </ul>
+
+      <h3 class="h5"><%= t("core", scope: "decidim.open_data.index.download") %></h3>
+      <ul>
+        <% open_data_core_manifests.each do |manifest| %>
+          <li><%= link_to(t("download_resource", scope: "decidim.open_data.index", resource_name: manifest.name), open_data_download_resource_path(manifest.name)) %></li>
+        <% end %>
+      </ul>
+    </div>
+
+    <div class="mt-4 flex flex-col items-center">
+      <%= link_to t("download_open_data", scope: "decidim.open_data.index"), decidim.open_data_download_path, class: "button button__primary button__xl" %>
+    </div>
+  </div>
+
+<% end %>

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

@@ -1,6 +1,7 @@
 <% add_decidim_meta_tags(
   title: translated_attribute(@page.title),
-  description: translated_attribute(@page.content)
+  description: translated_attribute(@page.content),
+  resource: @page
 ) %>
 
 <%

data/app/views/decidim/participatory_space_private_users/_participatory_space_private_user.html.erb

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

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

@@ -0,0 +1,9 @@
+<p class="email-greeting"><%= t(".hello", name: @user.name) %></p>
+
+<p class="email-instructions">
+  <%= t(".report_html", url: reported_content_url ) %>
+</p>
+
+<p class="email-button email-button__cta">
+  <%= link_to t(".manage_moderations"), manage_moderations_url %>
+</p>

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

@@ -1,7 +1,7 @@
 <p class="email-greeting"><%= t(".hello", name: @user.name) %></p>
 
 <p class="email-instructions">
-  <%= t(".report_html", url: report_url) %>
+  <%= t(".report_html", url: reported_content_url) %>
 </p>
 
 <br>

data/app/views/decidim/searches/_count.html.erb

@@ -15,6 +15,6 @@
   <% end %>
 </div>
 
-<h1 id="search-results-title" class="h3 decorator mb-10 md:my-10">
+<h1 class="h3 decorator mb-10 md:my-10">
   <%= t("decidim.search.results_found_for_term", count: @results_count, term:) %>
 </h1>

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

@@ -1,81 +1,44 @@
-<nav role="navigation" aria-labelledby="search-results-title">
-  <div class="filter-container search__filter">
-    <button id="dropdown-trigger-search" data-component="dropdown" data-target="dropdown-menu-search" data-auto-close="true">
-      <%= content_tag :span, t("decidim.searches.filters_small_view.filter_by"), class: "#{"is-active" if params.dig(:filter, :with_resource_type) == nil}" %>
-      <% @blocks.each do |elements| %>
-        <% elements.each do |type, results| %>
-          <%= content_tag :span, class: "#{"is-active" if params.dig(:filter, :with_resource_type) == type}" do %>
-            <span><%= searchable_resource_human_name(type) %></span>
-          <% end %>
+<div class="filter-container search__filter">
+  <button id="dropdown-trigger-search" data-component="dropdown" data-target="dropdown-menu-search" data-auto-close="true">
+    <%= content_tag :span, t("decidim.searches.filters_small_view.filter_by"), class: "#{"is-active" if params.dig(:filter, :with_resource_type) == nil}" %>
+    <% @blocks.each do |elements| %>
+      <% elements.each do |type, results| %>
+        <%= content_tag :span, class: "#{"is-active" if params.dig(:filter, :with_resource_type) == type}" do %>
+          <span><%= searchable_resource_human_name(type) %></span>
         <% end %>
       <% end %>
-      <%= 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>
-    <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 %>
-      </li>
-      <% @blocks.each do |elements| %>
-        <li>
-          <ul>
-            <% elements.each do |type, results| %>
-              <% if results[:count].positive? %>
-                <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 :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 %>
+    <%= 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 %>
+        <%= resource_type_icon("all") %>
+        <span><%= t("all", scope: "decidim.searches.filters.state") %></span>
+        <span class="label ml-auto"><%= @results_count %></span>
+      <% end %>
+    </div>
+    <% @blocks.each do |elements| %>
+      <div>
+        <% elements.each do |type, results| %>
+          <div>
+            <% 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 %>
+                <%= resource_type_icon(type) %>
+                <span><%= searchable_resource_human_name(type) %></span>
+                <span class="label ml-auto"><%= results[:count] %></span>
+              <% end %>
+            <% else %>
+              <%= content_tag :div, 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 %>
-          </ul>
-        </li>
-      <% end %>
-    </ul>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
   </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>
+</div>

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 strip_tags(announcement).present? %>
+<% if announcement %>
   <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,14 +1,16 @@
 <%= 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 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">
+  <div data-dialog-actions>
+    <button class="button button__lg button__transparent-secondary" 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 w-full md:w-auto" data-confirm-ok>
+    <button class="button button__lg button__secondary" data-confirm-ok>
       <span><%= t("ok", scope: "decidim.shared.confirm_modal") %></span>
     </button>
   </div>

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

@@ -14,20 +14,18 @@
 
     <div id="dropdown-menu-filters">
       <% 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", "data-skip-to-content": true %>
+        <%= link_to t("skip", scope: "decidim.shared.filter_form_help"), "##{skip_to_id}", class: "filter-skip", role: "menuitem" %>
       <% end %>
-
-      <p id="filter-help-text" class="filter-help" role="menuitem" aria-disabled="true"><%= t("help", scope: "decidim.shared.filter_form_help") %></p>
+      <p 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: 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) %>">
+                                title: search_label,
+                                "aria-label": search_label %>
+          <button type="submit" aria-label="<%= search_label %>">
             <%= icon "search-line" %>
           </button>
         </div>