decidim-core 0.29.0 → 0.29.2

data/app/packs/src/decidim/remote_tooltips.js

@@ -0,0 +1,38 @@
+import createTooltip from "src/decidim/tooltips"
+
+/**
+ * Given the following HTML structure,
+ * <span data-remote-tooltip="true" tooltip-url="some url" data-author="true">
+ *   <span></span>
+ * </span>
+ *
+ * This function will check if the HTMLElement where is attached to has a child, and will add a data tooltip attribute
+ * to the respective child in order to attach the fetched HTML content fetched under a json key as the content of the
+ * HTML tooltip. The DOM structure is expected to be like follows:
+ *
+ * <span data-remote-tooltip="true" tooltip-url="some url" data-author="true">
+ *   <span data-tooltip="HTML content from json data field"></span>
+ * </span>
+ *
+ * @param {HTMLElement} node The element holding the initialization data
+ * @returns {void}
+ */
+export default async function(node) {
+  const container = node.firstElementChild;
+
+  if (container) {
+    const response = await fetch(node.dataset.tooltipUrl, {
+      headers: {
+        "Content-Type": "application/json"
+      }
+    });
+    if (response.ok) {
+      const json = await response.json();
+
+      container.dataset.tooltip = json.data;
+      createTooltip(container);
+    } else {
+      console.error(response.status, response.statusText);
+    }
+  }
+}

data/app/packs/src/decidim/toggle.js

@@ -9,7 +9,7 @@ export default function createToggle(component) {
   const { toggle } = component.dataset
 
   if (!component.id) {
-    // when component has no id, we enforce to have it one
+    // when component has no id, we enforce it to have one
     component.id = `toggle-${Math.random().toString(36).substring(7)}`
   }
 

data/app/packs/src/decidim/tooltips.js

@@ -63,9 +63,32 @@ export default function(node) {
   // append to dom hidden, to apply css transitions
   tooltip.setAttribute("aria-hidden", true)
 
-  const append = () => {
-    // do nothing if the tooltip is already present at the DOM
+  // used to detect if the user is on a mobile device by checking the user agent
+  const useMobile = (/Mobi|Android/i).test(navigator.userAgent);
+
+  // used not to collapse tooltip
+  let removeTooltip = () => {
+    tooltip.setAttribute("aria-hidden", "true");
+  }
+
+  // used to allow clicks outside the tooltip to take place on the page or device
+  const OutsideClick = (event) => {
+    if (!tooltip.contains(event.target) && event.target !== node) {
+      removeTooltip();
+    }
+  }
+
+  // function called again to allow clicks outside the tooltip to collapse the tooltip
+  removeTooltip = () => {
+    tooltip.setAttribute("aria-hidden", "true");
+    document.removeEventListener("click", OutsideClick)
+  }
+
+  const toggleTooltip = (event) => {
+    event.preventDefault();
+    // if the tooltip is visible in the DOM, hide it otherwise display
     if (tooltip.getAttribute("aria-hidden") === "false") {
+      tooltip.setAttribute("aria-hidden", "true");
       return
     }
 
@@ -106,27 +129,24 @@ export default function(node) {
     tooltip.style.left = `${positionX}px`
 
     tooltip.setAttribute("aria-hidden", false)
-  }
-
-  // in order to revoke the remove event when the mouse is over the trigger/tooltip
-  let cancelRemove = false
 
-  const remove = () => {
-    cancelRemove = false
-    // give some sleep time before hiding the element from the DOM
-    setTimeout(() => !cancelRemove && tooltip.setAttribute("aria-hidden", true), 500);
+    // sleep time before hiding the element from the DOM
+    setTimeout(() => document.addEventListener("click", OutsideClick))
   }
 
-  // keyboard listener is at root-level
-  window.addEventListener("keydown", (event) => event.key === "Escape" && remove())
-
-  node.addEventListener("mouseenter", append)
-  node.addEventListener("mouseleave", remove)
-  node.addEventListener("focus", append)
-  node.addEventListener("blur", remove)
-  tooltip.addEventListener("mouseenter", () => tooltip.setAttribute("aria-hidden", false))
-  tooltip.addEventListener("mouseleave", remove)
-
-  node.addEventListener("mouseover", () => (cancelRemove = true))
-  tooltip.addEventListener("mouseover", () => (cancelRemove = true))
+  if (useMobile) {
+    // mobile use to click and toggle the tooltip
+    node.addEventListener("click", toggleTooltip);
+    window.addEventListener("keydown", (event) => event.key === "Escape" && removeTooltip())
+  } else {
+    // desktop use for hover and blur over tooltip
+    node.addEventListener("mouseenter", toggleTooltip)
+    node.addEventListener("mouseleave", removeTooltip)
+    node.addEventListener("focus", toggleTooltip)
+    node.addEventListener("blur", removeTooltip)
+
+    // tooltip hover listeners to prevent hiding when hovered
+    tooltip.addEventListener("mouseenter", () => tooltip.setAttribute("aria-hidden", false))
+    tooltip.addEventListener("mouseleave", removeTooltip)
+  }
 }

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

@@ -67,7 +67,7 @@
   }
 
   &.is-hover,
-  &:not([disabled]):not([class*="button__text"]):hover {
+  &:not([disabled]):not([class*="button__text"]):not(label):hover {
     @apply text-white;
 
     background: linear-gradient(0deg, rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0.3)),

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

@@ -6,7 +6,7 @@
   --warning: #ad4910;
   --bg-warning: #ffeebd;
 
-  @apply bg-background text-gray-2 rounded inline-flex items-center gap-1 px-2 font-semibold text-sm;
+  @apply bg-background text-gray-2 rounded inline-flex items-center gap-1 px-2 py-1 h-min font-semibold text-sm;
 
   &.success {
     @apply bg-[var(--bg-success)] text-[var(--success)];

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

@@ -6,6 +6,10 @@
       @apply py-14;
     }
 
+    &.is-disabled label.button__secondary {
+      @apply text-gray-2 bg-background-3 border border-gray-2 cursor-not-allowed;
+    }
+
     &-container {
       @apply space-y-4;
     }

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

@@ -45,7 +45,7 @@
 
   &__actions {
     &-main {
-      @apply w-fit grid grid-cols-2 md:grid-cols-1 mx-auto gap-x-4 gap-y-6 md:gap-4;
+      @apply w-fit mx-auto gap-x-4 gap-y-6 md:gap-4;
 
       &__dropdown {
         @apply divide-y divide-gray-3 z-20 w-64;

data/app/packs/stylesheets/decidim/_progress-bar.scss

@@ -29,7 +29,7 @@
   }
 
   &__sm {
-    @apply w-16;
+    @apply w-16 pt-2;
   }
 
   &__sm &__number {

data/app/packs/stylesheets/decidim/legacy/conference-diploma.scss

@@ -37,7 +37,6 @@
 }
 
 .conference-diploma .diploma__logo {
-  border: 1px solid #333;
   padding: 2rem;
 }
 
@@ -47,10 +46,12 @@
     max-height: 100%;
     max-width: 100%;
     margin: 0;
+    padding-top: 10%;
   }
 
   .conference-diploma .diploma__border {
     margin: 0;
+    margin-top: 15%;
     -moz-border-image: url("../images/decidim/pattern.png") 20 repeat;
     -webkit-border-image: url("../images/decidim/pattern.png") 20 repeat;
     -o-border-image: url("../images/decidim/pattern.png") 20 repeat;

data/app/presenters/decidim/attachment_presenter.rb

@@ -6,7 +6,7 @@ module Decidim
   #
   class AttachmentPresenter < SimpleDelegator
     def attachment_file_url
-      attachment.attached_uploader(:file).url(host: attached_to.organization.host)
+      attachment.attached_uploader(:file).url
     end
 
     def attachment

data/app/queries/decidim/last_activity.rb

@@ -56,13 +56,24 @@ module Decidim
 
         condition = if klass.include?(Decidim::HasPrivateUsers)
                       Arel.sql(
-                        [
-                          "decidim_action_logs.participatory_space_type = '#{manifest.model_class_name}'",
-                          "decidim_action_logs.participatory_space_id IN (#{Arel.sql(klass.visible_for(current_user).select(:id).to_sql)})"
-                        ].join(" AND ")
+                        <<~SQL.squish
+                          (
+                            decidim_action_logs.participatory_space_type = '#{manifest.model_class_name}' AND#{" "}
+                            decidim_action_logs.participatory_space_id IN (#{Arel.sql(klass.visible_for(current_user).select(:id).to_sql)})
+                          ) OR#{" "}
+                          (
+                            decidim_action_logs.resource_type = '#{manifest.model_class_name}' AND#{" "}
+                            decidim_action_logs.resource_id IN (#{Arel.sql(klass.visible_for(current_user).select(:id).to_sql)})
+                          )
+                        SQL
                       ).to_s
                     else
-                      Arel.sql("decidim_action_logs.participatory_space_type = '#{manifest.model_class_name}'").to_s
+                      Arel.sql(
+                        [
+                          "decidim_action_logs.resource_type = '#{manifest.model_class_name}'",
+                          "decidim_action_logs.participatory_space_type = '#{manifest.model_class_name}'"
+                        ].join(" OR ")
+                      ).to_s
                     end
 
         conditions << "(#{condition})"

data/app/services/decidim/base_diff_renderer.rb

@@ -41,7 +41,7 @@ module Decidim
     end
 
     def parse_i18n_changeset(attribute, values, type, diff)
-      values.last.keys.each do |locale, _value|
+      (values.last.keys - ["machine_translations"]).each do |locale, _value|
         first_value = values.first.try(:[], locale)
         last_value = values.last.try(:[], locale)
         next if first_value == last_value
@@ -56,6 +56,27 @@ module Decidim
           }
         )
       end
+
+      return diff unless values.last.has_key?("machine_translations")
+
+      values.last.fetch("machine_translations").each_key do |locale, _value|
+        next unless I18n.available_locales.include?(locale.to_sym)
+
+        first_value = values.first.try(:[], "machine_translations").try(:[], locale)
+        last_value = values.last.try(:[], "machine_translations").try(:[], locale)
+
+        attribute_locale = :"#{attribute}_machine_translations_#{locale}"
+
+        diff.update(
+          attribute_locale => {
+            type:,
+            label: generate_i18n_label(attribute, locale, "decidim.machine_translations.automatic"),
+            old_value: first_value,
+            new_value: last_value
+          }
+        )
+      end
+
       diff
     end
 
@@ -108,7 +129,8 @@ module Decidim
     end
 
     # Returns a String.
-    def generate_i18n_label(attribute, locale)
+    # i18n-tasks-use t("decidim.machine_translations.automatic")
+    def generate_i18n_label(attribute, locale, postfix = "")
       label = I18n.t(attribute, scope: i18n_scope)
       locale_name = if I18n.available_locales.include?(locale.to_sym)
                       I18n.t("locale.name", locale:)
@@ -116,6 +138,8 @@ module Decidim
                       locale
                     end
 
+      locale_name = I18n.t(postfix, locale_name:, locale:) if postfix.present?
+
       "#{label} (#{locale_name})"
     end
 

data/app/services/decidim/email_notification_generator.rb

@@ -36,20 +36,29 @@ module Decidim
       return unless resource
       return unless event_class.types.include?(:email)
 
-      followers.each do |recipient|
-        next unless ["all", "followed-only"].include?(recipient.notification_types)
+      send_to_followers
+      send_to_affected_users
+    end
 
-        send_email_to(recipient, user_role: :follower)
-      end
+    private
 
+    def send_to_affected_users
       affected_users.each do |recipient|
         next unless ["all", "own-only"].include?(recipient.notification_types)
+        next if recipient.deleted? || recipient.blocked?
 
         send_email_to(recipient, user_role: :affected_user)
       end
     end
 
-    private
+    def send_to_followers
+      followers.each do |recipient|
+        next unless ["all", "followed-only"].include?(recipient.notification_types)
+        next if recipient.deleted? || recipient.blocked?
+
+        send_email_to(recipient, user_role: :follower)
+      end
+    end
 
     attr_reader :event, :event_class, :resource, :followers, :affected_users, :extra
 

data/app/views/decidim/devise/omniauth_registrations/new.html.erb

@@ -13,7 +13,7 @@
     <%= form_required_explanation %>
   </div>
 
-  <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: omniauth_registrations_path(resource_name)) do |f| %>
+  <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: decidim.omniauth_registrations_path(resource_name)) do |f| %>
 
     <div class="form__wrapper">
       <%= f.text_field :name, help_text: t("decidim.devise.omniauth_registrations.new.username_help"), autocomplete: "name", placeholder: "John Doe" %>

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 mt-8">
+<main id="offline-fallback-html" class="text-center my-8">
   <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/_tabbed.html.erb

@@ -10,7 +10,7 @@
   </header>
 
   <div class="vertical-tabs">
-    <nav>
+    <nav role="navigation" aria-label="<%= I18n.t("layouts.decidim.navigation.aria_label", title: translated_attribute(page.title)) %>">
       <button id="dropdown-trigger-pages" data-component="dropdown" data-target="dropdown-menu-pages" data-open-md="true" data-auto-close="true">
         <span>
           <%= translated_attribute(page.title) %>
@@ -21,7 +21,7 @@
       <ul id="dropdown-menu-pages" class="vertical-tabs__list" role="menu">
         <% pages.each do |sibling| %>
           <li class="<%= "is-active" if page == sibling %>" role="menuitem">
-            <%= link_to translated_attribute(sibling.title), page_path(sibling.slug) %>
+            <%= link_to translated_attribute(sibling.title), page_path(sibling.slug), "aria-current": (page == sibling).to_s %>
           </li>
         <% end %>
       </ul>

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

@@ -2,7 +2,7 @@
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <% available_locales.each do |locale| %>
-  <link rel="alternate" href="<%= url_for(request.parameters.merge(locale:)) %>" hreflang="<%= locale %>">
+  <link rel="alternate" href="<%= current_url(request.parameters.merge(locale:)) %>" hreflang="<%= locale %>">
 <% end %>
 
 <meta name="twitter:card" content="summary_large_image">

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>
     <% breadcrumb_items.last(2).each_with_index do |item, i| %>
-      <% item_label = decidim_escape_translated(item[:label]) %>
+      <% item_label = decidim_escape_translated(item[:label]).html_safe %>
       <% if i.positive? %>
         <span>/</span>
       <% end %>

data/config/locales/ar.yml

@@ -91,6 +91,8 @@ ar:
     'false': 'لا'
     'true': 'نعم'
   date:
+    buttons:
+      select: تحديد
     formats:
       decidim_short: "%d/%m/%Y"
       decidim_short_with_month_name_short: "%d %b %Y"
@@ -282,6 +284,7 @@ ar:
           withdrawn: |-
             تم سحب هذا التعديل على %{amendable_type} %{amendable_link}
             من قبل المؤلف.
+      name: تعديل
       new:
         amendment_author: مؤلف التعديل
         send: إنشاء
@@ -454,6 +457,8 @@ ar:
         description: الوصف
       footer_sub_hero:
         name: تذييل البطل الفرعي راية
+      global_menu:
+        name: القائمة العامة
       hero_settings_form:
         background_image: الصورة الخلفية
         welcome_text: نص الترحيب
@@ -473,8 +478,12 @@ ar:
         name: النشاط الاخير
         title: النشاط الاخير
         view_all: عرض الكل
+      metadata:
+        name: البيانات الوصفية
       metrics:
         name: مقاييس المنظمة
+      participatory_space_metrics:
+        name: المقاييس
       participatory_space_stats:
         name: الإحصائيات
       social_networks_metadata:
@@ -493,6 +502,10 @@ ar:
         name: احصائيات المنظمة
       sub_hero:
         name: البطل الفرعي راية
+    core:
+      application_helper:
+        filter_category_values:
+          all: الكل
     devise:
       omniauth_registrations:
         new:
@@ -796,7 +809,6 @@ ar:
           title_required: العنوان مطلوب!
           uploaded: تم التحميل
           validating: جارية المصادقة...
-          validation_error: خطأ في المصادقة!
         select_file: اختيار ملف
       upload_help:
         dropzone: قم بإسقاط الملفات هنا أو انقر للتحميل
@@ -1253,6 +1265,7 @@ ar:
       participatory_space_filters:
         filters:
           areas: المناطق
+          scope: نطاق
           select_an_area: اختر المنطقة
       public_participation:
         public_participation: إبراز حضوري علنا
@@ -1665,6 +1678,8 @@ ar:
     whatsapp_web: واتساب
     xing: شينغ
   time:
+    buttons:
+      select: تحديد
     formats:
       day_of_month: "%b %d"
       day_of_week: "%a"

data/config/locales/bg.yml

@@ -926,7 +926,6 @@ bg:
           title_required: Заглавието е задължително!
           uploaded: Качено
           validating: Валидиране...
-          validation_error: Грешка при валидирането!
         select_file: Избор на файл
       upload_help:
         dropzone: Пуснете файлове тук или щракнете върху бутона за качване

data/config/locales/bn-BD.yml

@@ -0,0 +1 @@
+bn:

data/config/locales/bs-BA.yml

@@ -0,0 +1,98 @@
+---
+bs:
+  activerecord:
+    models:
+      decidim/endorsement:
+        one: Podržavanje
+        few: Podržavanja
+        other: Podržavanja
+  decidim:
+    accessibility:
+      logo: "Zvanični logo %{organization}"
+      skip_button: Preskoči na glavni sadržaj
+    admin_log:
+      user:
+        show_email: "%{user_name} je pribavio e-mail adresu učesnika %{resource_name}"
+    application:
+      document:
+        download: Preuzmi datoteku
+    author:
+      endorsements:
+        one: podržavanje
+        few: podržavanja
+        other: podržavanja
+    content_blocks:
+      hero_settings_form:
+        background_image: Pozadinska slika
+        welcome_text: Tekst dobrodošlice
+      stats:
+        name: Statistika organizacije
+    endorsements:
+      identities:
+        done: Gotovo
+        select_identity: Izaberite identitet
+    events:
+      resource_endorsed:
+        email_intro: '%{endorser_name}%{endorser_nickname}, koga pratite, je podržao %{resource_title} i mislimo da bi vas to možda interesovalo. Pogledajte i doprinesite:'
+        email_outro: Dobili ste ovo obaveštenje jer pratite %{endorser_nickname}. Možete da prestanete da dobijate obaveštenja, ukoliko pratite prethodni link.
+        email_subject: "%{endorser_nickname} je podržao nešto"
+    messaging:
+      conversations:
+        add_conversation_users:
+          add_max_users: 'Dodajte korisnike u razgovor: najviše 9 korisnika'
+          add_users_placeholder: Pretraži...
+          modal_title: Novi razgovor
+          no_results: Nema rezultata
+        index:
+          new_conversation: Novi razgovor
+          next: Sledeće
+    newsletter_templates:
+      basic_only_text:
+        body_preview: 'Probni tekst za pasus: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque fringilla nisl tellus. Donec sed mi dui. Sed efficitur libero a felis tempor sollicitudin. Nullam vestibulum fringilla felis, id efficitur lorem sagittis et. Vivamus aliquam maximus velit vel dapibus. Mauris pellentesque, enim eu varius lacinia, risus ante rutrum ipsum, non lobortis augue lorem quis urna. Aenean et malesuada arcu.'
+        name: Osnovno (samo tekst)
+      basic_only_text_settings_form:
+        body: Glavni deo teksta
+        interpolations_hint: 'Mala pomoć: Možeš da napišeš "%{name}" bilo gde u tekstu ili naslovu i automatski će se zameniti sa imenom primaoca.'
+      image_text_cta:
+        body_preview: 'Probni tekst za pasus: Maecenas ac nisl vitae lectus pretium facilisis. Etiam facilisis sem nibh, sit amet rutrum mi aliquam nec. Sed id urna at nisl pretium mollis eu vel velit. Proin vitae suscipit urna, sed faucibus urna. Pellentesque id libero vulputate ipsum scelerisque suscipit. Nam aliquam sodales mi sit amet cursus. Donec mattis faucibus purus. Aenean tincidunt porta lorem ac commodo. Vestibulum in mollis mi. Morbi eros erat, cursus ut tortor sit amet, imperdiet dapibus arcu. Suspendisse id egestas enim. In eget magna sed enim efficitur elementum sit amet aliquam quam. Donec fermentum metus eget urna luctus pulvinar.'
+        cta_text_preview: Tekst Poziva na akciju
+        introduction_preview: 'Probni tekst za uvod: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque fringilla nisl tellus. Donec sed mi dui. Sed efficitur libero a felis tempor sollicitudin. Nullam vestibulum fringilla felis, id efficitur lorem sagittis et. Vivamus aliquam maximus velit vel dapibus. Mauris pellentesque, enim eu varius lacinia, risus ante rutrum ipsum, non lobortis augue lorem quis urna. Aenean et malesuada arcu.'
+        name: Dugme za sliku, tekst i Poziv na akciju
+      image_text_cta_settings_form:
+        body: Glavni deo teksta
+        cta_text: Tekst dugmeta poziva na akciju
+        cta_url: Link dugmeta poziva na akciju
+        interpolations_hint: 'Mala pomoć: Možeš da napišeš "%{name}" bilo gde u uvodu, glavnom delu teksta, pozivu na akciju ili naslovu i automatski će se zameniti sa imenom primaoca.'
+        introduction: Uvod
+        main_image: Glavna slika
+    notifications_settings:
+      show:
+        direct_messages: Primaj direktne poruke od svih bez ograničenja
+    pages:
+      participatory_space:
+        metrics:
+          headline: Metrika
+          link: Prikaži svu metriku
+    resource_endorsements:
+      create:
+        error: Nastao je problem pri podržavanju.
+    shared:
+      results_per_page:
+        title: Izaberite broj rezultata po stranici
+    user_contact_disabled: Ovaj učesnik ne prihvata direktne poruke.
+  errors:
+    messages:
+      invalid_time_zone: nije validna vremenska zona
+  locale:
+    name: Bosanski
+  time:
+    formats:
+      long_dashed: "%d-%m-%Y %H:%M:%S"
+  versions:
+    dropdown:
+      choose_diff_view_html: 'HTML režim gledanja:'
+  views:
+    pagination:
+      next_title: Veza ka sledećoj stranici
+      previous_title: Veza ka prethodnoj stranici
+      title: 'Redni broj stranice:'