decidim-core 0.28.2 → 0.29.0.rc2

data/app/cells/decidim/content_blocks/stats/show.erb

@@ -1,6 +1,6 @@
 <section id="statistics" class="home__section home__section-content-block">
   <h2 class="home__section-title mb-8">
-    <%= t("decidim.pages.home.statistics.headline", organization: current_organization.name) %>
+    <%= t("decidim.pages.home.statistics.headline", organization: current_organization_name) %>
   </h2>
 
   <%= cell("decidim/statistics", stats.highlighted + stats.not_highlighted) %>

data/app/cells/decidim/content_blocks/sub_hero_cell.rb

@@ -3,9 +3,6 @@
 module Decidim
   module ContentBlocks
     class SubHeroCell < Decidim::ViewModel
-      include Decidim::IconHelper
-      include Decidim::SanitizeHelper
-
       def show
         return if translated_attribute(current_organization.description).blank?
 

data/app/cells/decidim/date_range/show.erb

@@ -1,29 +1,29 @@
-<div class="extra__date-container">
+<div data-date-container>
   <% if same_day? %>
-    <div class="extra__date">
+    <div data-date>
       <%= l start_time, format: "%d" %>
-      <span class="extra__month"><%= l start_time, format: "%B#{" %Y" if show_year?}" %></span>
+      <span data-month><%= l start_time, format: "%B#{" %Y" if show_year?}" %></span>
     </div>
-    <div class="extra__time">
+    <div data-time>
       <%= l start_time, format: "%H:%M" %> - <%= l end_time, format: "%H:%M" %>
     </div>
   <% else %>
     <div>
-      <div class="extra__date">
+      <div data-date>
         <%= l start_time, format: "%d" %>
-        <span class="extra__month"><%= l start_time, format: "%B#{" %Y" if show_year?}" %></span>
+        <span data-month><%= l start_time, format: "%B#{" %Y" if show_year?}" %></span>
       </div>
-      <div class="extra__time">
+      <div data-time>
         <%= l start_time, format: "%H:%M" %>
       </div>
     </div>
     <%= icon "arrow-right-line" %>
     <div>
-      <div class="extra__date">
+      <div data-date>
         <%= l end_time, format: "%d" %>
-        <span class="extra__month"><%= l end_time, format: "%B#{" %Y" if show_year?}" %></span>
+        <span data-month><%= l end_time, format: "%B#{" %Y" if show_year?}" %></span>
       </div>
-      <div class="extra__time">
+      <div data-time>
         <%= l end_time, format: "%H:%M" %>
       </div>
     </div>

data/app/cells/decidim/date_range_cell.rb

@@ -13,8 +13,6 @@ module Decidim
   # }
   #
   class DateRangeCell < Decidim::ViewModel
-    include Decidim::IconHelper
-
     def show
       return unless start_time && end_time
 

data/app/cells/decidim/diff_cell.rb

@@ -6,7 +6,6 @@ module Decidim
   # This cell renders the diff between `:old_data` and `:new_data`.
   class DiffCell < Decidim::ViewModel
     include Cell::ViewModel::Partial
-    include LayoutHelper
     include ActionView::Helpers::FormOptionsHelper
 
     def attribute(data)

data/app/cells/decidim/documents_panel/show.erb

@@ -1 +1,5 @@
 <%= render partial: "decidim/application/documents", formats: [:html], locals: { documents: } %>
+
+<% components_collections.each do |collection| %>
+  <%= render partial: "decidim/application/component_documents", formats: [:html], locals: { collection: } %>
+<% end %>

data/app/cells/decidim/documents_panel_cell.rb

@@ -22,7 +22,7 @@ module Decidim
     alias resource model
 
     def show
-      return if documents.blank?
+      return if blank?
 
       render
     end
@@ -30,5 +30,13 @@ module Decidim
     def documents
       @documents ||= resource.try(:documents)
     end
+
+    def components_collections
+      @components_collections ||= options[:components_collections] || []
+    end
+
+    def blank?
+      documents.blank? && components_collections.blank?
+    end
   end
 end

data/app/cells/decidim/endorsement_buttons_cell.rb

@@ -1,20 +1,12 @@
 # frozen_string_literal: true
 
 module Decidim
-  # This cell renders the endrosement button and the endorsements count.
+  # This cell renders the endorsement button and the endorsements count.
   # It only supports one row of buttons per page due to current tag ids used by javascript.
   class EndorsementButtonsCell < Decidim::ViewModel
-    include LayoutHelper
     include CellsHelper
     include EndorsableHelper
     include ResourceHelper
-    include IconHelper
-    include Decidim::SanitizeHelper
-
-    delegate :current_user, to: :controller, prefix: false
-    delegate :current_settings, to: :controller, prefix: false
-    delegate :current_component, to: :controller, prefix: false
-    delegate :allowed_to?, to: :controller, prefix: false
 
     # Renders the "Endorse" button.
     # Contains all the logic about how the button should be rendered
@@ -49,13 +41,13 @@ module Decidim
     end
 
     # produce the path to endorsements from the engine routes as the cell does not have access to routes
-    def endorsements_path(*args)
-      decidim.endorsements_path(*args)
+    def endorsements_path(*)
+      decidim.endorsements_path(*)
     end
 
     # produce the path to an endorsement from the engine routes as the cell does not have access to routes
-    def endorsement_path(*args)
-      decidim.endorsement_path(*args)
+    def endorsement_path(*)
+      decidim.endorsement_path(*)
     end
 
     def button_content

data/app/cells/decidim/flag_modal/flag_user.erb

@@ -1,6 +1,6 @@
-<div class="reveal flag-modal hidden" id="flagUserModal" data-reveal role="dialog" aria-modal="true" aria-labelledby="flagUserModal-label">
-  <div class="reveal__header">
-    <h3 id="flagUserModal-label" class="reveal__title"><%= t("decidim.shared.flag_user_modal.title") %></h3>
+<div class="flag-modal hidden" id="flagUserModal" data-reveal role="dialog" aria-modal="true" aria-labelledby="flagUserModal-label">
+  <div>
+    <h3 id="flagUserModal-label"><%= t("decidim.shared.flag_user_modal.title") %></h3>
     <button class="close-button" data-close aria-label="<%= t("decidim.shared.flag_user_modal.close") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>

data/app/cells/decidim/followers_cell.rb

@@ -3,7 +3,6 @@
 module Decidim
   class FollowersCell < Decidim::ViewModel
     include Decidim::CellsPaginateHelper
-    include Decidim::ApplicationHelper
     include Decidim::Core::Engine.routes.url_helpers
     include Decidim::CardHelper
 

data/app/cells/decidim/following_cell.rb

@@ -3,7 +3,6 @@
 module Decidim
   class FollowingCell < Decidim::ViewModel
     include Decidim::CellsPaginateHelper
-    include Decidim::ApplicationHelper
     include Decidim::Core::Engine.routes.url_helpers
     include Decidim::CardHelper
 

data/app/cells/decidim/footer_topics/show.erb

@@ -0,0 +1,8 @@
+<nav role="navigation" aria-label="Help">
+  <h2 class="h4 mb-4">Help</h2>
+  <ul class="space-y-4 break-inside-avoid">
+    <% topics.each do |topic| %>
+      <%= topic_item(topic, class: "font-semibold underline") %>
+    <% end %>
+  </ul>
+</nav>

data/app/cells/decidim/footer_topics_cell.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  # Topics and their corresponding pages are mapped out to the footer
+  # of the layout.
+  #
+  #  Example:
+  #
+  #   cell("decidim/footer_topics", nil)
+  #
+  class FooterTopicsCell < Decidim::ViewModel
+    def show
+      return if topics.blank?
+
+      render
+    end
+
+    private
+
+    def topics
+      @topics ||= current_organization.static_page_topics.where(show_in_footer: true).map do |topic|
+        next if topic.pages.empty?
+
+        {
+          title: decidim_escape_translated(topic.title),
+          path: decidim.page_path(topic.pages.first)
+        }
+      end.compact
+    end
+
+    def topic_item(page_data, opts = {})
+      content_tag(:li, **opts.slice(:class)) do
+        link_to page_data[:title], page_data[:path]
+      end
+    end
+  end
+end

data/app/cells/decidim/groups_cell.rb

@@ -4,9 +4,6 @@ module Decidim
   # This cell is intended to be used on profiles.
   class GroupsCell < Decidim::ViewModel
     include Decidim::CellsPaginateHelper
-    include Decidim::LayoutHelper
-    include Decidim::ApplicationHelper
-    include Decidim::LayoutHelper
     include Decidim::Core::Engine.routes.url_helpers
     include Decidim::CardHelper
 

data/app/cells/decidim/linked_resources_for_cell.rb

@@ -23,9 +23,6 @@ module Decidim
   #   )
   class LinkedResourcesForCell < Decidim::ViewModel
     include Cell::ViewModel::Partial
-    include Decidim::ApplicationHelper
-
-    delegate :current_settings, to: :controller
 
     alias resource model
 

data/app/cells/decidim/members_cell.rb

@@ -5,7 +5,6 @@ module Decidim
   # Lists the members of the given user group.
   class MembersCell < Decidim::ViewModel
     include Decidim::CellsPaginateHelper
-    include Decidim::ApplicationHelper
     include Decidim::Core::Engine.routes.url_helpers
     include Decidim::CardHelper
 

data/app/cells/decidim/navbar_admin_link_cell.rb

@@ -8,8 +8,6 @@ module Decidim
   #   <%= cell("decidim/navbar_admin_link", { link_url: link_url, link_options: link_options }) %>
   #
   class NavbarAdminLinkCell < Decidim::ViewModel
-    include Decidim::IconHelper
-
     def show
       render if link_url
     end

data/app/cells/decidim/newsletter_templates/base_cell.rb

@@ -5,7 +5,6 @@ require "cell/partial"
 module Decidim
   module NewsletterTemplates
     class BaseCell < Decidim::ViewModel
-      include Decidim::SanitizeHelper
       include Cell::ViewModel::Partial
       include Decidim::NewslettersHelper
 

data/app/cells/decidim/newsletter_templates/basic_only_text/show.erb

@@ -62,9 +62,9 @@
           <th class="small-12 first columns cityhall-bar">
             <div class="decidim-logo" style="float: right; text-align: right; padding-right: 16px">
               <% if custom_url_for_mail_root.present? %>
-                <%= link_to organization.name.html_safe, custom_url_for_mail_root %>
+                <%= link_to organization_name(organization).html_safe, custom_url_for_mail_root %>
               <% else %>
-                <%= link_to organization.name.html_safe, decidim.root_url(host: organization.host) %>
+                <%= link_to organization_name(organization).html_safe, decidim.root_url(host: organization.host) %>
               <% end %>
             </div>
           </th>

data/app/cells/decidim/newsletter_templates/image_text_cta/show.erb

@@ -101,9 +101,9 @@ table.button table td {
           <th class="small-12 first columns cityhall-bar">
             <div class="decidim-logo" style="float: right; text-align: right; padding-right: 16px">
               <% if custom_url_for_mail_root.present? %>
-                <%= link_to organization.name.html_safe, custom_url_for_mail_root %>
+                <%= link_to organization_name(organization).html_safe, custom_url_for_mail_root %>
               <% else %>
-                <%= link_to organization.name.html_safe, decidim.root_url(host: organization.host) %>
+                <%= link_to organization_name(organization).html_safe, decidim.root_url(host: organization.host) %>
               <% end %>
             </div>
           </th>

data/app/cells/decidim/notification/show.erb

@@ -6,6 +6,11 @@
       <% if notification.display_resource_text? %>
         <div class="editor-content"><%= notification.resource_text %></div>
       <% end %>
+      <% if action_cell %>
+        <div class="notification__snippet-actions">
+          <%= cell(action_cell, model) %>
+        </div>
+      <% end %>
     </div>
   </div>
   <%= link_to model, remote: true, method: :delete, class: "notification__button", data: { "notification-read": "" } do %>

data/app/cells/decidim/notification_actions/base_cell.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module NotificationActions
+    class BaseCell < Decidim::NotificationCell
+      def data
+        model&.event_class_instance&.action_data
+      end
+    end
+  end
+end

data/app/cells/decidim/notification_actions/buttons/show.erb

@@ -0,0 +1,5 @@
+<div class="flex items-start gap-4">
+  <% buttons.each do |button| %>
+    <%= link_to *button %>
+  <% end %>
+</div>

data/app/cells/decidim/notification_actions/buttons_cell.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module NotificationActions
+    class ButtonsCell < BaseCell
+      def show
+        return unless data.present? && data.respond_to?(:map)
+
+        render :show
+      end
+
+      def buttons
+        @buttons ||= data.map do |item|
+          [
+            label_for(item),
+            item[:url],
+            {
+              class: "button button__sm #{class_for(item)}",
+              remote: true,
+              data: { "notification-action" => "button" }
+            }
+          ].tap do |button|
+            button[2][:method] = item[:method] if item[:method].in?(%w(get patch put delete post))
+          end
+        end
+      end
+
+      private
+
+      def label_for(item)
+        "#{item[:label].presence || I18n.t(item[:i18n_label])}#{icon(item[:icon]) if item[:icon].present?}"
+      end
+
+      def class_for(item)
+        (item[:class].presence || "button__transparent-secondary")
+      end
+    end
+  end
+end

data/app/cells/decidim/notification_cell.rb

@@ -4,9 +4,7 @@ module Decidim
   # This cell renders a notification from a notifications collection
 
   class NotificationCell < Decidim::ViewModel
-    include Decidim::IconHelper
     include Decidim::Core::Engine.routes.url_helpers
-    include Decidim::SanitizeHelper
 
     def show
       if notification.event_class_instance.try(:hidden_resource?)
@@ -27,11 +25,19 @@ module Decidim
 
       participatory_space = notification.resource.participatory_space
       link_to(
-        decidim_html_escape(translated_attribute(participatory_space.title)),
+        decidim_escape_translated(participatory_space.title),
         resource_locator(participatory_space).path
       )
     end
 
+    def action_class
+      @action ||= ("#{notification.event_class_instance.action_cell.camelize}Cell" if notification.event_class_instance.action_cell)
+    end
+
+    def action_cell
+      @action_cell ||= (notification.event_class_instance.action_cell if action_class&.safe_constantize)
+    end
+
     private
 
     def notification

data/app/cells/decidim/notifications_cell.rb

@@ -3,7 +3,6 @@
 module Decidim
   class NotificationsCell < Decidim::ViewModel
     include Decidim::CellsPaginateHelper
-    include Decidim::LayoutHelper
     include Decidim::Core::Engine.routes.url_helpers
 
     helper_method :notifications

data/app/cells/decidim/pad_iframe/show.erb

@@ -1,6 +1,6 @@
 <div class="row etherpad">
   <div class="columns large-12">
-    <div class="section documents">
+    <div class="documents">
       <h4><%= t("decidim.pad_iframe.pad") %></h4>
       <p><%= t("decidim.pad_iframe.explanation") %></p>
       <iframe
@@ -8,7 +8,7 @@
         src="<%= iframe_url %>"
         style="border: solid 4px #fff; border-radius: 4px; box-shadow: 0 0 0 1px #e8e8e8; width: 100%; height: 600px">
       </iframe>
-      <p><%= t("decidim.pad_iframe.disclaimer", organization: current_organization.name) %></p>
+      <p><%= t("decidim.pad_iframe.disclaimer", organization: current_organization_name) %></p>
     </div>
   </div>
 </div>

data/app/cells/decidim/pad_iframe_cell.rb

@@ -4,7 +4,6 @@ module Decidim
   # This cell is used to render an iframe to embed an Etherpad from a
   # Paddable model.
   class PadIframeCell < Decidim::ViewModel
-    include Decidim::ApplicationHelper
     include Decidim::Core::Engine.routes.url_helpers
 
     def show

data/app/cells/decidim/participatory_space_dropdown_metadata_cell.rb

@@ -3,7 +3,6 @@
 module Decidim
   class ParticipatorySpaceDropdownMetadataCell < Decidim::ViewModel
     include Decidim::TwitterSearchHelper
-    include Decidim::SanitizeHelper
 
     private
 
@@ -17,7 +16,7 @@ module Decidim
     end
 
     def title
-      decidim_html_escape(translated_attribute(model.try(:title) || model.try(:name) || ""))
+      decidim_escape_translated(model.try(:title) || model.try(:name) || "")
     end
 
     def hashtag

data/app/cells/decidim/photo_cell.rb

@@ -3,10 +3,6 @@
 module Decidim
   # This cell renders the media link card for an instance of a MediaLink
   class PhotoCell < Decidim::ViewModel
-    include Decidim::ApplicationHelper
-    include Decidim::LayoutHelper
-    include Decidim::SanitizeHelper
-
     def show
       render
     end
@@ -30,7 +26,7 @@ module Decidim
     end
 
     def title
-      decidim_html_escape(translated_attribute(model.title))
+      decidim_escape_translated(model.title)
     end
 
     def short_description

data/app/cells/decidim/photos_list_cell.rb

@@ -4,8 +4,6 @@ module Decidim
   # This cell renders the photos list
   class PhotosListCell < Decidim::ViewModel
     include Cell::ViewModel::Partial
-    include Decidim::ApplicationHelper
-    include Decidim::SanitizeHelper
 
     def show
       return unless model.any?

data/app/cells/decidim/profile_cell.rb

@@ -2,11 +2,9 @@
 
 module Decidim
   class ProfileCell < Decidim::ViewModel
-    include Decidim::ApplicationHelper
     include Decidim::Core::Engine.routes.url_helpers
     include Decidim::UserProfileHelper
     include Decidim::AriaSelectedLinkToHelper
-    include Decidim::LayoutHelper
     include Decidim::ViewHooksHelper
     include ActiveLinkTo
 

data/app/cells/decidim/profile_sidebar/show.erb

@@ -1,7 +1,7 @@
 <div class="card profile--sidebar">
   <%= image_tag profile_user.avatar_url(:profile), class: "card__image card__image--larger", alt: "avatar #{profile_user.name}" %>
-  <div class="card__content">
-    <h1 class="profile--sidebar--title">
+  <div>
+    <h1>
       <strong><%= profile_user.name %></strong>
       <br>
       <span>
@@ -14,12 +14,12 @@
         &nbsp;
       <% end %>
       <% if can_contact_user? %>
-        <span class="user-contact_link">
+        <span>
           <%= link_to_current_or_new_conversation_with(profile_holder) %>
         </span>
       <% end %>
     </h1>
-    <div class="mb-s">
+    <div>
       <small><%= decidim_html_escape(profile_user.about.to_s) %></small>
     </div>
     <% if profile_user.personal_url.present? %>
@@ -27,7 +27,7 @@
     <% end %>
   </div>
   <% if profile_user.badge.present? %>
-    <div class="badge-card__content">
+    <div>
       <span>
         <%= icon profile_user.badge, class: "author__verified", aria_label: t("decidim.profiles.show.officialized"), role: "img" %>
       </span>
@@ -37,29 +37,29 @@
     </div>
   <% end %>
   <%= render_hook(:user_profile_bottom) %>
-  <div class="card__footer card__footer--transparent">
-    <div class="p-s text-center">
+  <div>
+    <div class="text-center">
       <% if profile_user_can_follow? %>
-        <div class="mr-s">
+        <div>
           <%= link_to profile_followers_path(nickname: profile_holder.nickname) do %>
             <%= t("decidim.profiles.show.followers") %>
             <div><strong><%= profile_user.followers_count %></strong></div>
           <% end %>
         </div>
-        <div class="ml-s">
+        <div>
           <%= link_to profile_following_path(nickname: profile_holder.nickname) do %>
             <%= t("decidim.profiles.show.following") %>
             <div><strong><%= profile_user.following_count %></strong></div>
           <% end %>
         </div>
       <% else %>
-        <div class="mr-s">
+        <div>
           <%= link_to profile_followers_path(nickname: profile_holder.nickname) do %>
             <%= t("decidim.profiles.show.followers") %>
             <div><%= profile_user.followers_count %></div>
           <% end %>
         </div>
-        <div class="ml-s">
+        <div>
           <%= link_to profile_members_path(nickname: profile_holder.nickname) do %>
             <%= t("decidim.profiles.show.members") %>
             <div><%= profile_user.members_count %></div>
@@ -70,20 +70,20 @@
   </div>
 
   <% if current_organization.badges_enabled? && badge_statuses.any? %>
-    <div class="card__footer card__footer--transparent">
-      <div class="card__support">
-        <div class="row column mb-s">
-          <strong class="muted"><%= t("decidim.profiles.sidebar.badges.title") %></strong>
-          <div class="badge-tip badge-tip--inline">
-            <div data-tooltip data-position="top" title="<%= t("decidim.profiles.sidebar.badges.info") %>" data-yeti-box="badges-tooltip" data-toggle="badges-tooltip" data-resize="badges-tooltip" class="has-tip" data-events="resize">
+    <div>
+      <div>
+        <div class="row column">
+          <strong><%= t("decidim.profiles.sidebar.badges.title") %></strong>
+          <div>
+            <div data-tooltip data-position="top" title="<%= t("decidim.profiles.sidebar.badges.info") %>" data-yeti-box="badges-tooltip" data-toggle="badges-tooltip" data-resize="badges-tooltip" data-events="resize">
               <%= icon "info", class: "icon--small", role: "img", "aria-hidden": true %>
             </div>
           </div>
         </div>
-        <div class="collapsible-list is-filtered row small-up-2 medium-up-4 collapse">
+        <div class="row collapse">
           <% badge_statuses.each do |status| %>
             <div class="column">
-              <div class="badge-container pr-xs">
+              <div>
                 <%= cell("decidim/badge", profile_holder, badge: status.badge, status:).call(:small) %>
               </div>
             </div>
@@ -95,7 +95,7 @@
 </div>
 
 <div class="row">
-  <div class="column medium-8 medium-centered">
+  <div class="column">
     <% if own_profile? %>
       <div class="text-center">
         <%= link_to decidim.account_path, class: "button" do %>

data/app/cells/decidim/profile_sidebar_cell.rb

@@ -3,15 +3,10 @@
 module Decidim
   class ProfileSidebarCell < Decidim::ProfileCell
     include Decidim::Messaging::ConversationHelper
-    include Decidim::IconHelper
     include Decidim::ViewHooksHelper
-    include Decidim::ApplicationHelper
-    include Decidim::SanitizeHelper
     include Decidim::CellsHelper
 
-    helper_method :profile_user, :logged_in?, :current_user
-
-    delegate :user_signed_in?, to: :controller
+    helper_method :profile_user
 
     def show
       render :show
@@ -19,10 +14,6 @@ module Decidim
 
     private
 
-    def logged_in?
-      current_user.present?
-    end
-
     def profile_user
       @profile_user ||= present(model)
     end