decidim-core 0.28.1 → 0.28.2

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

@@ -5,7 +5,7 @@
   <% if current_user.unconfirmed_email.present? %>
     <%# NOTE: announcement cell clean_body method will purge the button %>
     <div id="email-change-pending" class="flash secondary" data-announcement>
-      <span class="flash__message flex-none block leading-relaxed">
+      <div class="flash__message flex-none block leading-relaxed">
         <p>
           <strong><%= t("decidim.account.email_change.title") %></strong>
         </p>
@@ -18,7 +18,7 @@
             resend_link: link_to(t("decidim.account.email_change.send_again"), resend_confirmation_instructions_account_path, role: :button, method: :post, remote: true),
             cancel_link: link_to(t("decidim.account.email_change.cancel"), cancel_email_change_account_path, role: :button, method: :post, remote: true)) %>
         </p>
-      </span>
+      </div>
     </div>
   <% end %>
 

data/app/views/decidim/application/_document.html.erb

@@ -7,8 +7,8 @@
       <div class="card__list-text"><%= decidim_escape_translated(document.description) %></div>
     <% end %>
     <div class="card__list-metadata">
-      <span><%= icon "file-text-line" %><%= document.file_type %></span>
-      <span><%= icon "scales-2-line" %><%= number_to_human_size(document.file_size) %></span>
+      <div><%= icon "file-text-line" %><%= document.file_type %></div>
+      <div><%= icon "scales-2-line" %><%= number_to_human_size(document.file_size) %></div>
     </div>
   </div>
   <%= link_to document.url,

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

@@ -1,5 +1,4 @@
 updateEndorsementBlock();
-
 function updateEndorsementBlock() {
   var $endorsementBlock = $('#resource-<%= resource.id %>-endorsement-block');
   var $endorsementListTrigger = $('#resource-<%= resource.id %>-endorsement-block #dropdown-trigger');
@@ -24,4 +23,6 @@ function updateEndorsementBlock() {
   } 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] }));
 }

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

@@ -1,40 +1,41 @@
-<div class="wrapper">
-  <div class="row column mb-m">
-    <h1><%= t ".title" %></h1>
-    <p>
-      <%= t ".page_description" %>
+<% add_decidim_meta_tags(
+  title: t(".title"),
+  description: t(".page_description")
+) %>
+
+<main class="layout-1col cols-10">
+
+  <header class="text-center py-10">
+    <h1 class="title-decorator inline-block text-left mb-12">
+      <%= t ".title" %>
+    </h1>
+    <p class="text-lg text-gray-2">
+    <%= t ".page_description" %>
     </p>
-  </div>
+  </header>
+
   <% @badges.each do |badge| %>
-    <div class="row column mb-m">
-      <div class="column medium-2">
-        <div class="card card--badge absolutes">
-          <div class="card__content">
-            <div class="card__header">
-              <div class="badge-container">
-                <%= image_tag badge.image %>
-              </div>
-            </div>
-            <div class="card__text text-center">
-              <strong><%= badge.translated_name %></strong>
-            </div>
+    <div class="mb-12">
+      <h2 class="h4 mb-4"><%= t ".badge_title", name: badge.translated_name %></h2>
+      <div class="grid grid-cols-10 text-gray-2 leading-relaxed">
+        <div class="col-span-2">
+          <div class="flex justify-center items-center">
+            <%= image_tag badge.image, class: "w-32", alt: badge.translated_name %>
+          </div>
+          <div class="text-center mt-4">
+            <strong><%= badge.translated_name %></strong>
           </div>
         </div>
-      </div>
-      <div class="column medium-10">
-        <h6>
-          <strong><%= t ".badge_title", name: badge.translated_name %></strong>
-        </h6>
-        <p><%= badge.description(current_organization.name) %></p>
-        <h6>
-          <strong><%= t ".how" %></strong>
-        </h6>
-        <ol>
-          <% badge.conditions.each do |condition| %>
-            <li><%= condition %></li>
-          <% end %>
-        </ol>
+        <div class="col-span-7 ml-2">
+          <p><%= badge.description(current_organization.name) %></p>
+          <p class="mt-4"><strong><%= t ".how" %></strong></p>
+          <ol class="list-decimal">
+            <% badge.conditions.each do |condition| %>
+              <li><%= condition %></li>
+            <% end %>
+          </ol>
+        </div>
       </div>
     </div>
   <% end %>
-</div>
+</main>

data/app/views/decidim/links/_modal.html.erb

@@ -16,6 +16,6 @@
     <button class="button button__lg button__transparent-secondary" data-dialog-close="external-domain-warning">
       <%= t("decidim.links.warning.cancel") %>
     </button>
-    <%= link_to t("decidim.links.warning.proceed"), external_url.to_s , target: "_blank", class: "button button__lg button__secondary" %>
+    <%= link_to t("decidim.links.warning.proceed"), external_url.to_s , target: "_blank", class: "button button__lg button__secondary", rel: "nofollow noopener noreferrer" %>
   </div>
 <% end %>

data/app/views/decidim/links/new.html.erb

@@ -1,3 +1,5 @@
+<% add_decidim_page_title t("decidim.links.warning.title") %>
+
 <%= render layout: "layouts/decidim/shared/layout_center" do %>
 
   <div class="flex justify-center">
@@ -12,7 +14,7 @@
   </code>
 
   <div class="form__wrapper-block">
-    <%= link_to t("decidim.links.warning.proceed"), external_url.to_s, class: "button button__lg button__secondary ml-auto" %>
+    <%= link_to t("decidim.links.warning.proceed"), external_url.to_s, class: "button button__lg button__secondary ml-auto", rel: "nofollow noopener noreferrer" %>
   </div>
 
 <% end %>

data/app/views/decidim/manifests/show.json.erb

@@ -5,7 +5,7 @@
   "display": "<%= organization_params.pwa_display %>",
   "start_url": "<%= organization_params.start_url %>",
   "theme_color": "<%= organization_params.colors["primary"] %>",
-  "background_color": "<%= organization_params.colors["primary"] %>",
+  "background_color": "#FFFFFF",
   "icons": [
     {
       "src": "<%= current_organization.attached_uploader(:favicon).variant_path :small %>",

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

@@ -1,4 +1,4 @@
 $("#messages").append("<%= j(render "messages", sender: conversation.messages.first.sender, messages: [conversation.messages.first]).html_safe %>");
 $("div[data-add-message]").replaceWith("<%= j(render "reply", form:, conversation:).html_safe %>");
-$("#new_message_").foundation();
+window.initFoundation($("#new_message_"));
 Decidim.addInputEmoji();

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

@@ -12,7 +12,7 @@
           <label for="notifications_from_own_activity" class="toggle__switch-toggle">
             <span>
               <input
-                <%= %(checked="checked") if @notifications_settings.notifications_from_own_activity %>
+                <%== %(checked="checked") if @notifications_settings.notifications_from_own_activity %>
                 id="notifications_from_own_activity"
                 type="checkbox"
                 name="notifications_from_own_activity">
@@ -30,7 +30,7 @@
           <label for="notifications_from_followed" class="toggle__switch-toggle">
             <span>
               <input
-                <%= %(checked="checked") if @notifications_settings.notifications_from_followed %>
+                <%== %(checked="checked") if @notifications_settings.notifications_from_followed %>
                 id="notifications_from_followed"
                 type="checkbox"
                 name="notifications_from_followed">
@@ -62,7 +62,7 @@
         <label for="newsletter_notifications" class="toggle__switch-toggle">
           <span>
             <input
-              <%= %(checked="checked") if @notifications_settings.newsletter_notifications %>
+              <%== %(checked="checked") if @notifications_settings.newsletter_notifications %>
               id="newsletter_notifications"
               type="checkbox"
               name="newsletter_notifications">
@@ -84,7 +84,7 @@
         <label for="allow_public_contact" class="toggle__switch-toggle">
           <span>
             <input
-              <%= %(checked="checked") if @notifications_settings.allow_public_contact %>
+              <%== %(checked="checked") if @notifications_settings.allow_public_contact %>
               id="allow_public_contact"
               type="checkbox"
               name="allow_public_contact">
@@ -108,7 +108,7 @@
             <label for="email_on_moderations" class="toggle__switch-toggle">
               <span>
                 <input
-                  <%= %(checked="checked") if @notifications_settings.email_on_moderations %>
+                  <%== %(checked="checked") if @notifications_settings.email_on_moderations %>
                   id="email_on_moderations"
                   type="checkbox"
                   name="email_on_moderations">
@@ -156,7 +156,7 @@
             <label class="toggle__switch-toggle" for="allow_push_notifications">
               <span>
                 <input
-                  <%= %(checked="checked") if @notifications_settings.meet_push_notifications_requirements? %>
+                  <%== %(checked="checked") if @notifications_settings.meet_push_notifications_requirements? %>
                   id="allow_push_notifications"
                   type="checkbox"
                   name="allow_push_notifications">

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

@@ -11,14 +11,14 @@
 
   <div class="vertical-tabs">
     <nav>
-      <button id="dropdown-trigger-pages" data-component="dropdown" data-target="dropdown-menu-pages" data-auto-close="true" data-disabled-md="true">
+      <button id="dropdown-trigger-pages" data-component="dropdown" data-target="dropdown-menu-pages" data-auto-close="true">
         <span>
           <%= translated_attribute(page.title) %>
         </span>
         <%= icon "arrow-down-s-line" %>
         <%= icon "arrow-up-s-line" %>
       </button>
-      <ul id="dropdown-menu-pages" class="vertical-tabs__list">
+      <ul id="dropdown-menu-pages" class="vertical-tabs__list" aria-hidden="true">
         <% pages.each do |sibling| %>
           <li class="<%= "is-active" if page == sibling %>">
             <%= link_to translated_attribute(sibling.title), page_path(sibling.slug) %>

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

@@ -1,5 +1,5 @@
 <div class="filter-container search__filter">
-  <button id="dropdown-trigger-search" data-component="dropdown" data-target="dropdown-menu-search" data-auto-close="true" data-disabled-md="true">
+  <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| %>
@@ -11,7 +11,7 @@
     <%= 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">
+  <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") %>

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

@@ -4,7 +4,7 @@
 <% if filter_sections.present? || local_assigns.has_key?(:search_variable) %>
   <%= filter_form_for filter, url_for, class: "new_filter self-stretch", data: { filters: "", component: "accordion" } do |form| %>
 
-    <button id="dropdown-trigger-filters" data-component="dropdown" data-target="dropdown-menu-filters" data-disabled-md="true">
+    <button id="dropdown-trigger-filters" data-component="dropdown" data-target="dropdown-menu-filters">
       <%= icon "arrow-down-s-line" %>
       <%= icon "arrow-up-s-line" %>
       <span>
@@ -12,7 +12,7 @@
       </span>
     </button>
 
-    <div id="dropdown-menu-filters">
+    <div id="dropdown-menu-filters" aria-hidden="true">
       <% if local_assigns.has_key?(:skip_to_id) %>
         <%= link_to t("skip", scope: "decidim.shared.filter_form_help"), "##{skip_to_id}", class: "filter-skip" %>
       <% end %>

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

@@ -1,9 +1,9 @@
-<button class="order-by__button" id="dropdown-trigger-order" data-component="dropdown" data-target="dropdown-menu-order" data-open="false" data-disabled-md="true">
+<button class="order-by__button" id="dropdown-trigger-order" data-component="dropdown" data-target="dropdown-menu-order" data-open="false">
   <%= icon "arrow-down-s-line" %>
   <%= icon "arrow-up-s-line" %>
   <span><%= t("#{i18n_scope}.label") %></span>
 </button>
-<div id="dropdown-menu-order" class="order-by">
+<div id="dropdown-menu-order" class="order-by" aria-hidden="true">
   <% orders.each do |order_name| %>
     <%= order_link order_name,
                    i18n_scope:,

data/app/views/decidim/shared/filters/_collection.html.erb

@@ -11,8 +11,10 @@
         collection,
         :first,
         :last
-    ) do |builder|
-      builder.label(class: "filter") { builder.send(builder_type.singularize, class: "reset-defaults") + filter_text_for(builder.text) }
-    end %>
+    ) do |builder| %>
+      <div class="filter">
+        <%= builder.label { builder.send(builder_type.singularize, class: "reset-defaults") + filter_text_for(builder.text) } %>
+      </div>
+    <% end %>
   </div>
 </div>

data/app/views/decidim/shared/filters/_dropdown_label.html.erb

@@ -4,31 +4,33 @@
 <% data = item.tree_node? && item.node.present? ? { checkboxes_tree: data_checkboxes_tree_id } : {} %>
 <% check_box_label = capture do %>
   <%= filter_text_for(leaf.label, id: "dropdown-title-#{data_checkboxes_tree_id}") %>
-  <% if !is_blank_root && item.tree_node? && item.node.present? %>
-    <button id="dropdown-trigger-<%= data_checkboxes_tree_id %>" data-controls="panel-dropdown-menu-<%= data_checkboxes_tree_id %>" aria-labelledby="dropdown-title-<%= data_checkboxes_tree_id %>">
-      <%= icon "arrow-down-s-fill" %>
-      <%= icon "arrow-up-s-fill" %>
-    </button>
-  <% end %>
 <% end %>
 
 <% if leaf.value == "" %>
   <%= hidden_field_tag "#{form.object_name}[#{method}][]", "", id: "#{form.options[:namespace] rescue "default"}_filter_#{method}_all" %>
 <% end %>
 
-<%= form.check_box(
-      method,
-      check_boxes_tree_options(
-        leaf.value,
-        check_box_label,
-        class: "reset-defaults",
-        data:,
-        is_root_check_box: is_blank_root,
-        parent_id:
-      ),
-      leaf.value.to_s,
-      nil
-    ) %>
+<div class="filter">
+  <%= form.check_box(
+        method,
+        check_boxes_tree_options(
+          leaf.value,
+          check_box_label,
+          class: "reset-defaults",
+          data:,
+          is_root_check_box: is_blank_root,
+          parent_id:
+        ),
+        leaf.value.to_s,
+        nil
+      ) %>
+  <% if !is_blank_root && item.tree_node? && item.node.present? %>
+    <button id="dropdown-trigger-<%= data_checkboxes_tree_id %>" data-controls="panel-dropdown-menu-<%= data_checkboxes_tree_id %>" aria-labelledby="dropdown-title-<%= data_checkboxes_tree_id %>">
+      <%= icon "arrow-down-s-fill" %>
+      <%= icon "arrow-up-s-fill" %>
+    </button>
+  <% end %>
+</div>
 
 <% if item.tree_node? && item.node.present? %>
   <% subitems_content = capture do %>

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

@@ -12,7 +12,7 @@ end
 
 <div class="layout-container">
   <header>
-    <%= render partial: "layouts/decidim/admin_links" if current_user&.admin %>
+    <%= render partial: "layouts/decidim/admin_links" if current_user && allowed_to?(:read, :admin_dashboard) %>
     <%= render partial: "layouts/decidim/header/main" %>
     <% if display_flash_messages.present? %>
       <div class="container">

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

@@ -4,7 +4,9 @@
   <h2 class="h4 mb-4"><%= t("layouts.decidim.footer.resources") %></h2>
   <ul class="space-y-4 break-inside-avoid">
     <li class="font-semibold underline"><%= link_to t("decidim.profiles.show.activity"), decidim.last_activities_path %></li>
-    <li class="font-semibold underline"><%= link_to t("decidim.pages.home.extended.meetings"), Decidim::Meetings::DirectoryEngine.routes.url_helpers.root_path %></li>
+    <% if Decidim.module_installed?(:meetings) %>
+      <li class="font-semibold underline"><%= link_to t("decidim.pages.home.extended.meetings"), Decidim::Meetings::DirectoryEngine.routes.url_helpers.root_path %></li>
+    <% end %>
     <li class="font-semibold underline"><%= link_to t("layouts.decidim.footer.download_open_data"), decidim.open_data_download_path %></li>
   </ul>
 </nav>

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

@@ -5,8 +5,10 @@
 </div>
 <div class="main-bar__links-desktop__item-wrapper">
   <div>
-    <%= link_to Decidim::Meetings::DirectoryEngine.routes.url_helpers.root_path, class: "main-bar__links-desktop__item", "aria-label": t("decidim.pages.home.extended.meetings") do %>
-      <%= icon "road-map-line" %><span><%= t("decidim.pages.home.extended.meetings") %></span>
+    <% if Decidim.module_installed?(:meetings) %>
+      <%= link_to Decidim::Meetings::DirectoryEngine.routes.url_helpers.root_path, class: "main-bar__links-desktop__item", "aria-label": t("decidim.pages.home.extended.meetings") do %>
+        <%= icon "road-map-line" %><span><%= t("decidim.pages.home.extended.meetings") %></span>
+      <% end %>
     <% end %>
   </div>
   <div>

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

@@ -1,4 +1,6 @@
 <% breadcrumb_items.each_with_index do |item, i| %>
+  <% next if item.blank? %>
+
   <% item_label = translated_attribute(item[:label]) %>
   <span>/</span>
   <% if item[:dropdown_cell].present? %>

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

@@ -10,12 +10,12 @@
 
   <div class="vertical-tabs">
     <nav aria-label="menu-vertical">
-      <button id="dropdown-trigger-profile" data-component="dropdown" data-target="dropdown-menu-profile" data-disabled-md="true">
+      <button id="dropdown-trigger-profile" data-component="dropdown" data-target="dropdown-menu-profile">
         <span><%= user_menu.active_item&.label || t("decidim.searches.filters.jump_to") %></span>
         <%= icon "arrow-down-s-line" %>
         <%= icon "arrow-up-s-line" %>
       </button>
-      <ul id="dropdown-menu-profile" class="vertical-tabs__list">
+      <ul id="dropdown-menu-profile" class="vertical-tabs__list" aria-hidden="true">
         <%= user_menu.render %>
       </ul>
     </nav>

data/config/locales/ar.yml

@@ -312,7 +312,6 @@ ar:
           '1': إنشاء التعديل الخاص بك
           '2': قارن تعديلك
           '3': اكمل تعديلك
-          '4': انشر تعديلك
     anonymous_user: مجهول
     application:
       document:
@@ -809,6 +808,7 @@ ar:
           filename: اسم الملف
           remove: حذف
           replace: إستبدال
+          save: حفظ
           title: العنوان
           title_required: العنوان مطلوب!
           uploaded: تم التحميل
@@ -1227,7 +1227,6 @@ ar:
           past: الماضي
       filters_small_view:
         filter: منقي
-        filter_and_search: التصفية والبحث
         filter_by: مصنف بواسطة
       results:
         view_all: عرض الكل (%{count})
@@ -1455,7 +1454,6 @@ ar:
       links:
         back: الى الخلف
         forgot_your_password: نسيت رقمك السري؟
-        log_in: تسجيل الدخول
         log_in_with_provider: تسجيل الدخول باستخدام %{provider}
         sign_up: انشئ حسابًا
       minimum_password_length:
@@ -1616,13 +1614,11 @@ ar:
         decidim_logo: شعار Decidim
         decidim_title: Decidim
         download_open_data: تحميل ملفات البيانات المفتوحة
-        log_in: تسجيل الدخول
         made_with_open_source: موقع تم إنشاؤه <a target="_blank" href="https://github.com/decidim/decidim">بالبرمجيات الحرة</a>.
         resources: الموارد
         sign_up: انشئ حسابًا
         terms_and_conditions: الشروط والأحكام
       header:
-        log_in: تسجيل الدخول
         main_menu: القائمة الرئيسية
         user_menu: قائمة المستخدم
       impersonation_warning: