decidim-core 0.29.3 → 0.30.0.rc1

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

@@ -1,46 +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>
-    <div id="dropdown-menu-search" aria-hidden="true">
+    <% 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>
-        <%= 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>
+        <% 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 %>
+          </div>
         <% 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 %>
-            </div>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
+    <% end %>
   </div>
-</nav>
+</div>

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

@@ -9,25 +9,34 @@
   %>
 
   <%= decidim_form_for(Decidim::User.new, namespace: "login", as: :user, url: path, html: { class: nil }) do |f| %>
-    <div data-dialog-container>
-      <%= icon "user-line", class: "w-6 h-6 text-gray fill-current" %>
-      <h3 id="dialog-title-loginModal" class="h3"><%= t(".please_log_in") %></h3>
+    <div>
+      <div class="flex flex-row">
+        <%= icon "user-line", class: "w-6 h-6 text-gray fill-current" %>
+        <h3 id="dialog-title-loginModal" class="h3 ml-1"><%= t(".please_log_in") %></h3>
+      </div>
+
       <div>
         <% if current_organization.sign_in_enabled? %>
           <% cache current_organization do %>
             <%= render partial: "decidim/devise/shared/omniauth_buttons", locals: { is_horizontal: true } %>
           <% end %>
-
           <div class="form__wrapper">
             <%= f.email_field :email, autocomplete: "email", placeholder: t("placeholder_email", scope: "decidim.devise.shared") %>
 
             <%= render partial: "decidim/account/password_fields", locals: { form: f } %>
-          </div>
 
-          <div class="login__modal-links">
-            <%= link_to t(".sign_up"), decidim.new_user_registration_path, class: "sign-up-link" if current_organization.sign_up_enabled? %>
-            <%= link_to t("devise.shared.links.forgot_your_password"), new_password_path(:user) %>
           </div>
+          <div class="login__modal-remember">
+              <%= f.check_box :remember_me, label_options: { class: "form__wrapper-checkbox-label" } %>
+              <%= link_to t("devise.shared.links.forgot_your_password"), new_password_path(:user) %>
+          </div>
+          <div class="login__info flex justify-center font-semibold">
+            <p>
+              <%= t("decidim.devise.sessions.new.are_you_new?") %>
+              <%= link_to t(".sign_up"), decidim.new_user_registration_path, class: "sign-up-link" if current_organization.sign_up_enabled? %>
+            </p>
+          </div>
+
         <% else %>
           <%= cell("decidim/announcement", t("sign_in_disabled", scope: "decidim.devise.sessions.new"), callout_class: "warning" ) %>
 
@@ -35,19 +44,16 @@
             <%= render partial: "decidim/devise/shared/omniauth_buttons", locals: { is_horizontal: true } %>
           <% end %>
         <% end %>
+        <% if current_organization.sign_in_enabled? %>
+          <div data-dialog-actions>
+            <div class="form__wrapper-block w-full mb-4">
+              <button type="submit" class="button button__lg button__secondary">
+                <%= t("devise.sessions.new.log_in") %>
+              </button>
+            </div>
+          </div>
+        <% end %>
       </div>
     </div>
-
-    <% if current_organization.sign_in_enabled? %>
-      <div data-dialog-actions>
-        <button type="button" class="button button__lg button__transparent-secondary" data-dialog-close="loginModal">
-          <%= t("cancel", scope: "decidim.admin.actions") %>
-        </button>
-        <button type="submit" class="button button__lg button__secondary">
-          <%= t("devise.sessions.new.log_in") %>
-          <%= icon "arrow-right-line", class: "fill-current" %>
-        </button>
-      </div>
-    <% end %>
   <% end %>
 <% end %>

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

@@ -1,9 +1,9 @@
-<button class="order-by__button <%= b_css_class if defined?(b_css_class) %>" id="dropdown-trigger-order" data-component="dropdown" data-target="dropdown-menu-order" data-open-md="true">
+<button class="order-by__button" id="dropdown-trigger-order" data-component="dropdown" data-target="dropdown-menu-order" data-open-md="true">
   <%= 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 <%= css_class if defined?(css_class) %>">
+<div id="dropdown-menu-order" class="order-by">
   <% orders.each do |order_name| %>
     <%= order_link order_name,
                    i18n_scope:,

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

@@ -0,0 +1,21 @@
+<div class="relative ml-auto">
+  <button id="dropdown-trigger-resource-<%= resource.id %>"
+          data-component="dropdown"
+          data-target="dropdown-menu-resource-<%= resource.id %>"
+          aria-label="<%= t("decidim.resource.controls_label") %>">
+    <span class="sr-only"><%= t("decidim.resource.controls_label") %></span>
+    <%# NOTE: having two times the icon call is intentional, as that is how the `dropdown` CSS code is done %>
+    <%= icon "more-2-fill" %>
+    <%= icon "more-2-fill" %>
+  </button>
+  <div id="dropdown-menu-resource-<%= resource.id %>" aria-hidden="true">
+    <ul class="dropdown dropdown__bottom divide-y divide-gray-3 px-4" role="menu">
+      <%= yield %>
+      <% unless defined?(skip_report) && skip_report %>
+        <li role="menuitem"><%= cell "decidim/report_button", resource %></li>
+      <% end %>
+      <li role="menuitem">
+        <%= cell "decidim/follow_button", resource, large: false %></li>
+    </ul>
+  </div>
+</div>

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

@@ -2,11 +2,10 @@
   <button id="trigger-menu-<%= id %>" data-controls="panel-dropdown-menu-<%= id %>" data-open="false" data-open-md="true">
     <%= icon "arrow-down-s-line" %>
     <%= icon "arrow-up-s-line" %>
-    <span><%= t(id, scope: label_scope) %></span>
+    <span><%= label %></span>
   </button>
 
   <div id="panel-dropdown-menu-<%= id %>">
-    <% data_checkboxes_tree_id = "#{method}-#{id}-#{collection.leaf.value}" %>
     <%= form.dropdown_label(collection, method, check_boxes_tree_id:, parent_id: nil) %>
   </div>
 </div>

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

@@ -2,7 +2,7 @@
   <button id="trigger-menu-<%= id %>" data-controls="panel-dropdown-menu-<%= id %>" data-open="false" data-open-md="true">
     <%= icon "arrow-down-s-line" %>
     <%= icon "arrow-up-s-line" %>
-    <span><%= t(id, scope: label_scope) %></span>
+    <span><%= label %></span>
   </button>
   <div id="panel-dropdown-menu-<%= id %>">
     <%= form.send(

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

@@ -1,13 +1,13 @@
 <% leaf = item.tree_node? ? item.leaf : item %>
 <% data_checkboxes_tree_id = [check_boxes_tree_id, leaf.value].join("_") %>
-<% is_blank_root = leaf.value.blank? %>
+<% is_blank_root = leaf.root? %>
 <% 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}") %>
 <% end %>
 
-<% if leaf.value == "" %>
-  <%= hidden_field_tag "#{form.object_name}[#{method}][]", "", id: "#{form.options[:namespace] rescue "default"}_filter_#{method}_all" %>
+<% if is_blank_root %>
+  <%= hidden_field_tag "#{form.object_name}[#{method}][]", "", id: "#{form.options[:namespace] rescue "default"}_filter_#{check_boxes_tree_id}_all" %>
 <% end %>
 
 <div class="filter">
@@ -19,7 +19,10 @@
           class: "reset-defaults",
           data:,
           is_root_check_box: is_blank_root,
-          parent_id:
+          id: data_checkboxes_tree_id,
+          namespace: form.options[:namespace],
+          parent_id:,
+          object: form.object
         ),
         leaf.value.to_s,
         nil

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

@@ -22,7 +22,6 @@
     <%= render partial: "decidim/shared/confirm_modal" %>
     <%= render partial: "decidim/shared/login_modal" unless current_user %>
     <%= render partial: "decidim/shared/authorization_modal" %>
-    <%= render partial: "decidim/shared/share_modal" %>
     <%= render partial: "layouts/decidim/decidim_javascript" %>
     <%= render partial: "layouts/decidim/data_consent_warning" %>
 

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

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

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

@@ -1,5 +1,5 @@
 <% if organization %>
-  <%= link_to decidim.root_url(host: organization.host), "aria-label": t("front_page_link", scope: "decidim.accessibility") do %>
+  <%= link_to root_url, "aria-label": t("front_page_link", scope: "decidim.accessibility") do %>
     <% if organization.logo.attached? %>
       <%= image_tag organization.attached_uploader(:logo).variant_url(:medium), alt: t("logo", scope: "decidim.accessibility", organization: current_organization_name) %>
     <% else %>

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

@@ -1,5 +1,5 @@
 <% if organization %>
-  <%= link_to decidim.root_url(host: organization.host), "aria-label": t("front_page_link", scope: "decidim.accessibility") do %>
+  <%= link_to root_url, "aria-label": t("front_page_link", scope: "decidim.accessibility") do %>
     <% if organization.favicon.attached? %>
       <%= image_tag organization.attached_uploader(:favicon).variant_path(:medium), alt: t("logo", scope: "decidim.accessibility", organization: current_organization_name) %>
     <% else %>

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

@@ -1,11 +1,6 @@
-<% add_decidim_meta_tags({
-                           description: strip_tags(translated_attribute(current_organization.description)),
-                           title: current_organization_name,
-                           url: request.original_url,
-                           twitter_handler: current_organization.twitter_handler,
-                           image_url: Decidim::ContentBlock.published.find_by(
-    organization: current_organization,
-    scope_name: :homepage,
-    manifest_name: :hero
-  ).try(:images_container).try(:attached_uploader, :background_image).try(:path)
-                         }) %>
+<% add_decidim_meta_tags(
+    description: strip_tags(translated_attribute(current_organization.description)),
+    title: current_organization_name,
+    url: request.original_url,
+    twitter_handler: current_organization.twitter_handler,
+    resource: current_organization) %>

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

@@ -0,0 +1,3 @@
+<script type="application/ld+json">
+<%== render_schema_org_breadcrumb_list(breadcrumb_items) %>
+</script>

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

@@ -20,21 +20,27 @@ end
       <%= render partial: "layouts/decidim/header/main" %>
     </div>
     <div id="menu-bar-container">
-      <% if display_flash_messages.present? %>
-        <div id="flash-messages-container" class="container">
-          <%= display_flash_messages %>
-        </div>
+      <% unless current_user&.ephemeral? %>
+        <%= render partial: "layouts/decidim/header/menu" unless controller_name == "homepage" %>
       <% end %>
-      <%= render partial: "layouts/decidim/header/menu" unless controller_name == "homepage" %>
     </div>
   </header>
 
+  <% if display_flash_messages.present? %>
+    <div id="flash-messages-container" class="container">
+      <%= display_flash_messages %>
+    </div>
+  <% end %>
+  <%= display_onboarding_action_message(current_user) %>
+
   <div id="content" data-content>
     <%= yield %>
   </div>
 
-  <footer>
-    <%= render partial: "layouts/decidim/footer/main" %>
-    <%= render partial: "layouts/decidim/footer/mini" %>
-  </footer>
+  <% unless current_user&.ephemeral? %>
+    <footer>
+      <%= render partial: "layouts/decidim/footer/main" %>
+      <%= render partial: "layouts/decidim/footer/mini" %>
+    </footer>
+  <% end %>
 </div>

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

@@ -3,6 +3,6 @@
     <%= link_to t("layouts.decidim.footer.terms_of_service"), decidim.page_path("terms-of-service") %>
   </li>
   <li>
-    <a href="#" role="button" data-dialog-open="dc-modal"><%= t("layouts.decidim.footer.data_consent_settings") %></a>
+    <a href="#" data-dialog-open="dc-modal"><%= t("layouts.decidim.footer.data_consent_settings") %></a>
   </li>
 </ul>

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

@@ -24,7 +24,7 @@
     <% 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>
+    <li class="font-semibold underline"><%= link_to t("layouts.decidim.footer.open_data"), decidim.open_data_path %></li>
   </ul>
 </nav>
 

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

@@ -0,0 +1,25 @@
+<div class="main-bar__links-desktop">
+  <div>
+    <%= link_to(
+        decidim.destroy_user_session_path,
+        method: :delete,
+        class: "main-bar__links-desktop__item",
+        "aria-label": t("layouts.decidim.header.close"),
+        data: { close: "", confirm: t("layouts.decidim.header.confirm_close_ephemeral_session") }
+     ) do %>
+        <%= icon "close-line" %><span><%= t("layouts.decidim.header.close") %></span>
+    <% end %>
+  </div>
+</div>
+
+<div class="main-bar__menu-mobile">
+  <%= link_to(
+      icon("close-line", class: "w-8 h-6 fill-current"),
+      decidim.destroy_user_session_path,
+      method: :delete,
+      class: "text-secondary",
+      type: :button,
+      "aria-label": t("layouts.decidim.header.close"),
+      data: { close: "", confirm: t("layouts.decidim.header.confirm_close_ephemeral_session") }
+    ) %>
+</div>

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

@@ -8,15 +8,19 @@
         <%= render partial: "layouts/decidim/logo_mobile", locals: { organization: current_organization } %>
       </div>
     </div>
-    <div class="main-bar__search">
-      <%= render partial: "layouts/decidim/header/main_search" %>
-    </div>
-    <div class="main-bar__links-desktop">
-      <%= render partial: "layouts/decidim/header/main_links_desktop" %>
-    </div>
-    <div class="main-bar__menu-mobile">
-      <%= render partial: "layouts/decidim/header/main_menu_mobile" %>
-    </div>
-    <%= render partial: "layouts/decidim/header/main_links_mobile_account" if current_user %>
+    <% if current_user&.ephemeral? %>
+      <%= render partial: "layouts/decidim/header/close_ephemeral_session" %>
+    <% else %>
+      <div class="main-bar__search">
+        <%= render partial: "layouts/decidim/header/main_search" %>
+      </div>
+      <div class="main-bar__links-desktop">
+        <%= render partial: "layouts/decidim/header/main_links_desktop" %>
+      </div>
+      <div class="main-bar__menu-mobile">
+        <%= render partial: "layouts/decidim/header/main_menu_mobile" %>
+      </div>
+      <%= render partial: "layouts/decidim/header/main_links_mobile_account" if current_user %>
+    <% end %>
   </div>
 </div>

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

@@ -30,3 +30,5 @@
     <% end %>
   <% end %>
 <% end %>
+
+<%= render partial: "layouts/decidim/schema_org_breadcrumb_list", locals: { breadcrumb_items: } %>

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

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

data/config/assets.rb

@@ -15,5 +15,6 @@ Decidim::Webpacker.register_entrypoints(
   decidim_geocoding_provider_here: "#{base_path}/app/packs/entrypoints/decidim_geocoding_provider_here.js",
   decidim_map_provider_default: "#{base_path}/app/packs/entrypoints/decidim_map_provider_default.js",
   decidim_map_provider_here: "#{base_path}/app/packs/entrypoints/decidim_map_provider_here.js",
-  decidim_widget: "#{base_path}/app/packs/entrypoints/decidim_widget.js"
+  decidim_widget: "#{base_path}/app/packs/entrypoints/decidim_widget.js",
+  decidim_geocoding: "#{base_path}/app/packs/entrypoints/decidim_geocoding.js"
 )