decidim-core 0.31.5 → 0.31.6

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

@@ -88,6 +88,20 @@
   }
 
   &__modal {
+    &-error {
+      [data-dialog-closable] {
+        @apply top-6 right-6;
+      }
+
+      [data-dialog-container] {
+        @apply inline grid-cols-none;
+      }
+
+      [data-dialog-title] {
+        @apply col-span-2 md:col-span-1 md:col-start-2 grid grid-cols-[auto_1fr] items-start md:items-center gap-2 pb-4 text-left text-xl text-gray-2 md:border-b md:border-gray-3;
+      }
+    }
+
     &-results {
       @apply mb-20 flex flex-wrap gap-x-8 gap-y-4;
     }

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

@@ -0,0 +1,49 @@
+.editor-suggestions-props {
+  --editor-suggestions-border-color: #000;
+  --editor-suggestions-background-color: #eee;
+  --editor-suggestions-selected-highlight-color: #ccc;
+}
+
+.editor-suggestions {
+  @apply editor-suggestions-props border-0 bg-[var(--editor-suggestions-background-color)] max-w-sm drop-shadow-md rounded-md;
+
+  &:hover {
+    .editor-suggestions-item[data-selected]:not(:hover) {
+      @apply bg-transparent;
+    }
+  }
+
+  .editor-suggestions-item {
+    @apply flex items-center gap-2 w-full text-left py-[0.375rem] px-1.5 border-0 rounded-none text-sm;
+
+    &:first-child {
+      @apply rounded-t-md;
+    }
+
+    &:last-child {
+      @apply rounded-b-md;
+    }
+
+    &:hover,
+    &[data-selected] {
+      @apply bg-[var(--editor-suggestions-selected-highlight-color)];
+    }
+
+    .editor-suggestions-item-avatar {
+      @apply rounded-full w-6 h-6 object-cover flex-none;
+    }
+
+    .editor-suggestions-item-label {
+      @apply truncate;
+    }
+  }
+
+  .editor-suggestions-item-disabled {
+    @apply cursor-default;
+
+    &:hover,
+    &[data-selected] {
+      @apply bg-transparent;
+    }
+  }
+}

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

@@ -1,5 +1,5 @@
 [data-floating-help] {
-  @apply absolute z-10 top-5 md:top-10 right-0 [&_button]:bg-background [&_button]:px-2 [&_button]:rounded-r-none [&_svg]:text-gray [&_svg]:fill-current;
+  @apply absolute z-10 top-20 md:top-10 right-0 [&_button]:bg-background [&_button]:px-2 [&_button]:rounded-r-none [&_svg]:text-gray [&_svg]:fill-current;
 
   &:hover {
     @apply [&_svg]:text-white [&_button]:text-white [&_button]:bg-secondary [&_button]:no-underline;

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

@@ -0,0 +1,23 @@
+@use "tom-select/dist/scss/tom-select";
+
+.ts {
+  &-control {
+    @apply border-gray text-md min-h-[40px];
+
+    input {
+      @apply font-normal text-black text-md;
+    }
+  }
+
+  &-dropdown {
+    @apply text-md text-gray-2 font-normal;
+
+    .option img {
+      @apply inline;
+    }
+
+    .active {
+      @apply bg-gray-3;
+    }
+  }
+}

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

@@ -6,6 +6,8 @@
 // Datepicker
 @use "stylesheets/decidim/vendor/datepicker_light";
 @use "stylesheets/decidim/datepicker";
+// TomSelect
+@use "stylesheets/decidim/tom_select";
 // On the other hand, the following styles match with specific routes
 @use "stylesheets/decidim/header";
 @use "stylesheets/decidim/footer";

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

@@ -1,3 +1,5 @@
+@use "stylesheets/decidim/editor_suggestions";
+
 .editor-props {
   --editor-active-color: #487bda;
   --editor-disabled-color: #eee;
@@ -5,12 +7,6 @@
   --editor-bubble-shadow-color: #333;
 }
 
-.editor-suggestions-props {
-  --editor-suggestions-border-color: #000;
-  --editor-suggestions-background-color: #eee;
-  --editor-suggestions-selected-highlight-color: #ccc;
-}
-
 .editor-active {
   @apply outline outline-4 outline-[var(--editor-active-color)];
 }
@@ -186,30 +182,3 @@
     }
   }
 }
-
-.editor-suggestions {
-  @apply editor-suggestions-props border-0 bg-[var(--editor-suggestions-background-color)] max-w-sm drop-shadow-md rounded-md;
-
-  &:hover {
-    .editor-suggestions-item[data-selected]:not(:hover) {
-      @apply bg-transparent;
-    }
-  }
-
-  .editor-suggestions-item {
-    @apply block w-full text-left py-[0.375rem] px-1.5 border-0 rounded-none truncate text-sm;
-
-    &:first-child {
-      @apply rounded-t-md;
-    }
-
-    &:last-child {
-      @apply rounded-b-md;
-    }
-
-    &:hover,
-    &[data-selected] {
-      @apply bg-[var(--editor-suggestions-selected-highlight-color)];
-    }
-  }
-}

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

@@ -1,5 +1,13 @@
-.geocoding-container {
-  .user-device-location button {
+.geocoding {
+  &__locate .geocoding__button {
     @apply mt-4;
+
+    &--locating {
+      @apply opacity-70 cursor-wait;
+    }
+
+    .geocoding__spinner {
+      @apply inline-block w-4 h-4 rounded-full animate-spin border-2 border-l-transparent border-y-transparent border-r-secondary align-middle;
+    }
   }
 }

data/app/presenters/decidim/menu_item_presenter.rb

@@ -29,9 +29,9 @@ module Decidim
     delegate :content_tag, :safe_join, :link_to, :active_link_to_class, :is_active_link?, :icon, to: :@view
 
     def render
-      content_tag :li, role: menuitem_role, class: link_wrapper_classes do
+      content_tag :li, role: wrapper_role, class: link_wrapper_classes do
         output = if url == "#"
-                   [content_tag(:span, composed_label, class: "sidebar-menu__item-disabled")]
+                   [content_tag(:span, composed_label, class: "sidebar-menu__item-disabled", role: menuitem_role)]
                  else
                    [link_to(composed_label, url, link_options)]
                  end
@@ -52,7 +52,7 @@ module Decidim
         { aria: { current: "page" } }
       else
         {}
-      end.merge({ class: link_classes })
+      end.merge({ class: link_classes, role: menuitem_role })
     end
 
     def composed_label
@@ -75,6 +75,12 @@ module Decidim
       @options.role || :menuitem
     end
 
+    def wrapper_role
+      return if menuitem_role.blank?
+
+      :presentation
+    end
+
     def active_class
       active_link_to_class(
         url,

data/app/presenters/decidim/stats_presenter.rb

@@ -15,7 +15,7 @@ module Decidim
             hash[name][:data][idx] += value
           end
         else
-          hash[name] = stat
+          hash[name] = stat.merge(data: stat[:data].dup)
         end
       end.values
     end

data/app/uploaders/decidim/image_uploader.rb

@@ -8,7 +8,7 @@ module Decidim
     end
 
     def content_type_allowlist
-      extension_allowlist.map { |ext| MiniMime.lookup_by_extension(ext).content_type }.uniq
+      extension_allowlist.filter_map { |ext| MiniMime.lookup_by_extension(ext)&.content_type }.uniq
     end
 
     # Fetches info about different variants, their processors and dimensions

data/app/views/decidim/delete_user_mailer/delete.html.erb

@@ -0,0 +1,6 @@
+<p class="email-greeting"><%= t(".hello", username: @user_name) %></p>
+
+<p class="email-instructions"><%= t ".body_1" %></p>
+<p class="email-instructions"><%= t ".body_2" %></p>
+
+<p class="email-closing"><%= t(".greetings_html", organization_name: organization_name(@organization), organization_url: decidim.root_url(host: @organization.host)) %></p>

data/app/views/decidim/gamification/badges/index.html.erb

@@ -3,7 +3,7 @@
   description: t(".page_description")
 ) %>
 
-<main class="layout-1col cols-10">
+<main class="layout-1col cols-10" role="main">
 
   <header class="text-center py-10">
     <h1 class="title-decorator inline-block text-left mb-12">

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

@@ -7,7 +7,7 @@
   )
 %>
 
-<main class="home">
+<main class="home" role="main">
   <% Decidim::ContentBlock.published.for_scope(:homepage, organization: current_organization).each do |content_block| %>
     <% next unless content_block.manifest %>
 

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

@@ -1,7 +1,7 @@
 <% add_decidim_page_title(t("last_activity", scope: "decidim.last_activities.index")) %>
 
 <%# NOTE: this page does not use a regular layout %>
-<main class="container">
+<main class="container" role="main">
   <h1 class="title-decorator my-12"><%= t("last_activity", scope: "decidim.last_activities.index") %></h1>
 
   <div class="profile__activity pb-16">

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

@@ -1,21 +1,13 @@
-<div id="messageErrorModal" data-reveal>
-  <div>
-    <h2><%= error %></h2>
-    <button class="close-button" data-close aria-label="<%= t(".close") %>"
-      type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <div class="reveal__body">
-    <p><%= t(".intro") %></p>
-    <p>
-      <%= messages.join("<br>") %>
-    </p>
-    <p><%= t(".correct_errors") %></p>
-  </div>
-  <div>
-    <div>
-      <a class="button" role="button" href="#" data-close aria-label="<%= t(".ok") %>"><%= t(".ok") %></a>
+<%= decidim_modal id: "messageErrorModal", class: "conversation__modal-error" do %>
+  <div data-dialog-container>
+    <h2 id="dialog-title-messageErrorModal" tabindex="-1" data-dialog-title><%= error %></h2>
+    <div id="dialog-desc-messageErrorModal" class="mt-4">
+      <p><%= t(".intro") %></p>
+      <p><%= safe_join(messages, tag.br) %></p>
+      <p><%= t(".correct_errors") %></p>
+    </div>
+    <div data-dialog-actions>
+      <button type="button" class="button button__sm lg:button__lg button__secondary" data-dialog-close="messageErrorModal" aria-label="<%= t(".ok") %>"><%= t(".ok") %></button>
     </div>
   </div>
-</div>
+<% end %>

data/app/views/decidim/messaging/conversations/error.js.erb

@@ -1,10 +1,15 @@
-var $messageError = $("#messageErrorModal");
-if ($messageError.length > 0) {
-  $messageError.foundation("_destroy").remove();
+var messageError = document.getElementById("messageErrorModal")
+
+if (messageError) {
+  messageError.remove();
 }
+document.body.insertAdjacentHTML("beforeend", "<%= j(render "error_modal", error:, messages:).html_safe %>");
 
-$("#messages").append("<%= j(render "error_modal", error:, messages:).html_safe %>");
-$messageError = $("#messageErrorModal");
+messageError = document.getElementById("messageErrorModal")
+if (messageError) {
+  window.createDialog(messageError);
 
-var messageErrorReveal = new Foundation.Reveal($messageError);
-messageErrorReveal.open();
+  if (Decidim.currentDialogs.messageErrorModal) {
+    window.Decidim.currentDialogs.messageErrorModal.open();
+  }
+}

data/app/views/decidim/newsletters/unsubscribe.html.erb

@@ -1,4 +1,4 @@
-<main class="layout-1col cols-6">
+<main class="layout-1col cols-6" role="main">
   <div class="text-center py-12">
     <h1 class="h1 decorator inline-block text-left"><%= t ".unsubscribe" %></h1>
   </div>

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

@@ -1,6 +1,6 @@
 <% add_decidim_page_title(t("decidim.offline.name")) %>
 
-<main id="offline-fallback-html" class="text-center my-8">
+<main id="offline-fallback-html" class="text-center my-8" role="main">
   <div class="flex justify-center">
     <svg xmlns="http://www.w3.org/2000/svg" width="5rem" height="r5em" viewBox="0 0 25 25">
       <path

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

@@ -42,7 +42,7 @@ edit_link(
                 <div id="accordion-panel-<%= ix %>" class="page__accordion-panel" aria-hidden="true">
                   <ul role="menu">
                     <% topic.pages.each do |page| %>
-                      <li role="menuitem"><%= link_to translated_attribute(page.title), page_path(page), class: "text-secondary" %></li>
+                      <li role="presentation"><%= link_to translated_attribute(page.title), page_path(page), class: "text-secondary", role: "menuitem" %></li>
                     <% end %>
                   </ul>
                 </div>

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

@@ -6,6 +6,6 @@
 <% end %>
 
 <%# NOTE: this page does not use a regular layout %>
-<main>
+<main role="main">
   <%= cell "decidim/profile", profile_holder, context: { content_cell: @content_cell } %>
 </main>

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

@@ -12,12 +12,12 @@
     <ul class="dropdown dropdown__bottom divide-y divide-gray-3" role="menu">
       <%= yield %>
       <% unless defined?(skip_report) && skip_report %>
-        <li role="menuitem" class="dropdown__item">
-          <%= cell "decidim/report_button", resource, button_classes: "dropdown__button" %>
+        <li role="presentation" class="dropdown__item">
+          <%= cell "decidim/report_button", resource, button_classes: "dropdown__button", html_options: { role: "menuitem" } %>
         </li>
       <% end %>
-      <li role="menuitem" class="dropdown__item">
-        <%= cell "decidim/follow_button", resource, large: false, button_classes: "dropdown__button" %>
+      <li role="presentation" class="dropdown__item">
+        <%= cell "decidim/follow_button", resource, large: false, button_classes: "dropdown__button", html_options: { role: "menuitem" } %>
       </li>
     </ul>
   </div>

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

@@ -6,7 +6,7 @@
 <% end %>
 
 <%# NOTE: this page does not use a regular layout %>
-<main>
+<main role="main">
   <%= cell "decidim/profile", user, context: {
         content_cell: "decidim/user_activity",
         activities:,

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

@@ -11,7 +11,7 @@ end
 %>
 
 <div class="layout-container">
-  <header <%= "class=with-admin-bar" if current_user && allowed_to?(:read, :admin_dashboard) %>>
+  <header <%= "class=with-admin-bar" if current_user && allowed_to?(:read, :admin_dashboard) %> role="banner">
     <div id="sticky-header-container" data-controller="sticky-header">
       <%= render partial: "layouts/decidim/impersonation_warning" %>
       <%= render partial: "layouts/decidim/omnipresent_banner" %>
@@ -37,7 +37,7 @@ end
     <%= yield %>
   </div>
 
-  <footer>
+  <footer role="contentinfo">
     <% if current_user&.ephemeral? || content_for?(:focus_mode) %>
       <%= render partial: "layouts/decidim/footer/focus_mode_main" %>
     <% else %>

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

@@ -2,7 +2,7 @@
 <div class="menu-bar__breadcrumb-mobile__dropdown-trigger">
   <span class="inline-block w-full overflow-hidden text-ellipsis align-middle">
     <% breadcrumb_items.last(2).each_with_index do |item, idx| %>
-      <% item_label = decidim_escape_translated(item[:label]) %>
+      <% item_label = translated_attribute(item[:label]) %>
       <% if idx.positive? %>
         <span>/</span>
       <% end %>

data/app/views/layouts/decidim/shared/_layout_center.html.erb

@@ -10,6 +10,6 @@ css_class = case columns
             end
 %>
 
-<%= content_tag main_tag, class: "layout-1col #{css_class}" do %>
+<%= content_tag main_tag, class: "layout-1col #{css_class}", role: (main_enabled ? "main" : nil)  do %>
   <%= yield %>
 <% end %>

data/app/views/layouts/decidim/shared/_layout_item.html.erb

@@ -2,7 +2,7 @@
   <%= yield :item_header %>
 </div>
 <div class="<%= layout_item_classes %>">
-  <main class="layout-item__main">
+  <main class="layout-item__main" role="main">
     <% if params[:included_in] %>
       <%= render partial: "layouts/decidim/shared/linked_resource" %>
     <% end %>

data/app/views/layouts/decidim/shared/_layout_two_col.html.erb

@@ -7,7 +7,7 @@
     <%= yield :aside %>
   </aside>
   <% main_tag = main_enabled ? :main : :div %>
-  <%= content_tag main_tag, class: "layout-2col__main" do %>
+  <%= content_tag main_tag, class: "layout-2col__main", role: (main_enabled ? "main" : nil) do %>
     <%= content_for :flash_messages %>
     <%= yield %>
   <% end %>

data/config/locales/ar.yml

@@ -293,9 +293,6 @@ ar:
       update_draft:
         error: حدثت هناك مشكلة أثناء تحديث مسودة التعديل.
         success: تم تحديث مسودة التعديل بنجاح.
-      wizard_step_form:
-        steps:
-          '1': إنشاء التعديل الخاص بك
     anonymous_user: مجهول
     application:
       document:
@@ -410,7 +407,6 @@ ar:
           global:
             amendments_enabled: تم تمكين التعديلات
             comments_enabled: تم تمكين التعليقات
-            comments_max_length: الحد الأقصى لطول التعليقات
             dummy_global_attribute1: السمة الدمية 1
             dummy_global_attribute2: السمة الدمية 2
             dummy_global_translatable_text: نص افتراضي قابل للترجمة
@@ -813,7 +809,6 @@ ar:
           modal_title: محادثة جديدة
           no_results: لا توجد نتائج
         error_modal:
-          close: اغلاق النموذج
           correct_errors: يرجى تصحيح الأخطاء والمحاولة مرة أخرى.
           intro: 'حدثت الأخطاء التالية في رسالتك:'
           ok: حسناً

data/config/locales/bg.yml

@@ -337,10 +337,6 @@ bg:
         success: Черновата на поправка е успешно обновена.
       withdraw:
         success: Изменението беше оттеглено успешно.
-      wizard_step_form:
-        steps:
-          '1': Създайте Ваша поправка
-          '2': Публикувайте своето изменение
     anonymous_user: Анонимен
     application:
       document:
@@ -462,7 +458,6 @@ bg:
           global:
             amendments_enabled: Поправки разрешени
             comments_enabled: Коментари разрешени
-            comments_max_length: Максимална дължина на коментарите
             dummy_global_attribute1: Макетен атрибут 1
             dummy_global_attribute2: Макетен атрибут 2
             dummy_global_translatable_text: Макетен преводим текст
@@ -934,7 +929,6 @@ bg:
         create:
           error: Разговора не започна. Опитайте по-късно.
         error_modal:
-          close: Затвори прозореца
           correct_errors: Моля, коригирайте грешките и опитайте отново.
           intro: 'Имаше следните грешки с вашето съобщение:'
           ok: ОК

data/config/locales/ca-IT.yml

@@ -554,7 +554,7 @@ ca-IT:
           global:
             amendments_enabled: Esmenes habilitades
             comments_enabled: Comentaris habilitats
-            comments_max_length: Longitud màxima dels comentaris
+            comments_max_length: Caràcters màxims per comentari
             define_taxonomy_filters: Si us plau, defineix algunes filtres per aquest espai de participació abans de fer servir aquesta configuració.
             dummy_global_attribute1: Atribut de prova 1
             dummy_global_attribute2: Atribut de prova 2
@@ -661,6 +661,13 @@ ca-IT:
           all: Tots
         filter_taxonomy_values:
           all: Totes
+    delete_user_mailer:
+      delete:
+        body_1: El teu compte s'ha desactivat i ja no és accessible. Les teves dades personals estan programades per eliminar-les permanentment d'acord amb les nostres polítiques de retenció de dades.
+        body_2: Per raons de seguretat, es conservaran algunes dades relacionades amb la verificació; d'aquesta manera si creessis un compte nou i el tornes a verificar, es podria vincular l'autorització amb aquest compte nou.
+        greetings_html: Atentament,<br/><a href="%{organization_url}">%{organization_name}</a>
+        hello: Hola %{username},
+      subject: El teu compte ha estat eliminat
     devise:
       omniauth_registrations:
         create:
@@ -1175,7 +1182,7 @@ ca-IT:
         taxonomy_presenter:
           not_found: 'No s''ha trobat la taxonomia a la base de dades (ID: %{id})'
     machine_translations:
-      automatic: traducció automàtica a %{locale_name} 
+      automatic: traducció automàtica a %{locale_name}
     managed_users:
       expired_session: La sessió actual d'administració d'una participant ha caducat.
     map:
@@ -1212,7 +1219,6 @@ ca-IT:
         create:
           error: No s'ha iniciat la conversa. Torna-ho a provar més tard.
         error_modal:
-          close: Tanca la finestra
           correct_errors: Si us plau, corregiu els errors i torneu-ho a intentar.
           intro: 'Hi ha els següents errors al vostre missatge:'
           ok: D'acord
@@ -1524,13 +1530,6 @@ ca-IT:
         log_in: entra
         never_logged_in: mai ha iniciat sessió
         subject: Avís de compte inactiu
-      removal_notification:
-        body: El teu compte a %{organization_name} s'ha eliminat per inactivitat.
-        greetings_html: |
-          Atentament,<br>
-          %{organization_name}
-        hello: Benvolgut/da %{username},
-        subject: Avís de compte inactiu
     passwords:
       update:
         error: Hi ha hagut un problema en actualitzar la contrasenya.

data/config/locales/ca.yml

@@ -554,7 +554,7 @@ ca:
           global:
             amendments_enabled: Esmenes habilitades
             comments_enabled: Comentaris habilitats
-            comments_max_length: Longitud màxima dels comentaris
+            comments_max_length: Caràcters màxims per comentari
             define_taxonomy_filters: Si us plau, defineix algunes filtres per aquest espai de participació abans de fer servir aquesta configuració.
             dummy_global_attribute1: Atribut de prova 1
             dummy_global_attribute2: Atribut de prova 2
@@ -661,6 +661,13 @@ ca:
           all: Tots
         filter_taxonomy_values:
           all: Totes
+    delete_user_mailer:
+      delete:
+        body_1: El teu compte s'ha desactivat i ja no és accessible. Les teves dades personals estan programades per eliminar-les permanentment d'acord amb les nostres polítiques de retenció de dades.
+        body_2: Per raons de seguretat, es conservaran algunes dades relacionades amb la verificació; d'aquesta manera si creessis un compte nou i el tornes a verificar, es podria vincular l'autorització amb aquest compte nou.
+        greetings_html: Atentament,<br/><a href="%{organization_url}">%{organization_name}</a>
+        hello: Hola %{username},
+      subject: El teu compte ha estat eliminat
     devise:
       omniauth_registrations:
         create:
@@ -1212,7 +1219,6 @@ ca:
         create:
           error: No s'ha iniciat la conversa. Torna-ho a provar més tard.
         error_modal:
-          close: Tanca la finestra
           correct_errors: Si us plau, corregiu els errors i torneu-ho a intentar.
           intro: 'Hi ha els següents errors al vostre missatge:'
           ok: D'acord
@@ -1524,13 +1530,6 @@ ca:
         log_in: entra
         never_logged_in: mai ha iniciat sessió
         subject: Avís de compte inactiu
-      removal_notification:
-        body: El teu compte a %{organization_name} s'ha eliminat per inactivitat.
-        greetings_html: |
-          Atentament,<br>
-          %{organization_name}
-        hello: Benvolgut/da %{username},
-        subject: Avís de compte inactiu
     passwords:
       update:
         error: Hi ha hagut un problema en actualitzar la contrasenya.
@@ -1858,7 +1857,7 @@ ca:
       invite_collaborator:
         subject: T'han convidat a col·laborar a %{organization}
       invite_private_user:
-        subject: T'han convidat a participar en un espai de participació privat a%{organization}
+        subject: T'han convidat a participar en un espai de participació privat a %{organization}
       organization_admin_invitation_instructions:
         subject: T'han convidat a administrar %{organization}
       password_change: