decidim-core 0.27.4 → 0.28.0.rc4

data/app/cells/decidim/diff/diff_mode_dropdown.erb

@@ -1,34 +1,6 @@
-<div class="diff-view-by show-for-mediumlarge">
-  <div class="diff-view-by__dropdown">
-    <span class="diff-view-by__text">
-      <%= t("versions.dropdown.choose_diff_view_mode") %>
-    </span>
-
-    <ul class="dropdown menu" data-dropdown-menu
-      data-autoclose="false"
-      data-disable-hover="true"
-      data-click-open="true"
-      data-close-on-click="true"
-      role="menubar">
-      <li class="is-dropdown-submenu-parent" role="presentation">
-        <a href="#diffmode-chooser-menu" id="diff-view-selected" aria-controls="diffmode-chooser-menu" aria-haspopup="true" aria-label="<%= t("versions.dropdown.choose_diff_view_mode_menu") %>" role="menuitem">
-          <%= t("versions.dropdown.option_unified") %>
-        </a>
-
-        <ul class="menu is-dropdown-submenu" id="diffmode-chooser-menu" role="menu" aria-labelledby="diff-view-selected">
-          <li role="presentation">
-            <%= link_to "#diff-view-unified", class: "diff-view-mode", id:"diff-view-unified", role: "menuitem" do %>
-              <%= t("versions.dropdown.option_unified") %>
-            <% end %>
-          </li>
-
-          <li role="presentation">
-            <%= link_to "#diff-view-split", class: "diff-view-mode", id:"diff-view-split", role: "menuitem" do %>
-              <%= t("versions.dropdown.option_split") %>
-            <% end %>
-          </li>
-        </ul>
-      </li>
-    </ul>
-  </div>
+<div class="version__selector">
+  <label for="diff-mode">
+    <%= t("versions.dropdown.choose_diff_view_mode") %>
+  </label>
+  <%= select_tag "diff-mode", mode_options, id: "diff-mode" %>
 </div>

data/app/cells/decidim/diff/diff_mode_html.erb

@@ -1,36 +1,8 @@
 <% if show_html_view_dropdown? %>
-  <div class="diff-view-by diff-view-html" style="margin-left: 0;">
-    <div class="diff-view-by__dropdown">
-      <span class="diff-view-by__text">
-        <%= t("versions.dropdown.choose_diff_view_html") %>
-      </span>
-
-      <ul class="dropdown menu" data-dropdown-menu
-        data-autoclose="false"
-        data-disable-hover="true"
-        data-click-open="true"
-        data-close-on-click="true"
-        role="menubar">
-        <li class="is-dropdown-submenu-parent" role="presentation">
-          <a href="#htmlmode-chooser-menu" id="diff-view-html-selected" aria-controls="htmlmode-chooser-menu" aria-haspopup="true" aria-label="<%= t("versions.dropdown.choose_diff_view_mode_menu") %>" role="menuitem">
-            <%= t("versions.dropdown.option_unescaped") %>
-          </a>
-
-          <ul class="menu is-dropdown-submenu" id="htmlmode-chooser-menu" role="menu" aria-labelledby="diff-view-html-selected">
-            <li role="presentation">
-              <%= link_to "#diff-view-unescaped-html", class: "diff-view-html", id: "diff-view-unescaped-html", role: "menuitem" do %>
-                <%= t("versions.dropdown.option_unescaped") %>
-              <% end %>
-            </li>
-
-            <li role="presentation">
-              <%= link_to "#diff-view-escaped-html", class: "diff-view-html", id: "diff-view-escaped-html", role: "menuitem" do %>
-                <%= t("versions.dropdown.option_escaped") %>
-              <% end %>
-            </li>
-          </ul>
-        </li>
-      </ul>
-    </div>
+  <div class="version__selector">
+    <label for="diff-html">
+      <%= t("versions.dropdown.choose_diff_view_html") %>
+    </label>
+    <%= select_tag "diff-html", html_options, id: "diff-html" %>
   </div>
 <% end %>

data/app/cells/decidim/diff/diff_split.erb

@@ -1,11 +1,2 @@
-<div class="mediumlarge-6 columns">
-  <div class="diff-direction-label">
-    <%= t(direction, scope: "versions.directions") %>
-  </div>
-
-  <div class="card">
-    <div class="diff-data">
-      <%= output_split_diff(data, direction, format) %>
-    </div>
-  </div>
-</div>
+<span><%= t(direction, scope: "versions.directions") %></span>
+<%= output_split_diff(data, direction, format) %>

data/app/cells/decidim/diff/diff_split_full.erb

@@ -0,0 +1,8 @@
+<div class="version__diff-split">
+  <div>
+    <%= diff_split(data, "left", format) %>
+  </div>
+  <div>
+    <%= diff_split(data, "right", format) %>
+  </div>
+</div>

data/app/cells/decidim/diff/diff_unified.erb

@@ -1,7 +1 @@
-<div class="mediumlarge-12 columns">
-  <div class="card">
-    <div class="diff-data">
-      <%= output_unified_diff(data, format) %>
-    </div>
-  </div>
-</div>
+<%= output_unified_diff(data, format) %>

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

@@ -1,7 +1,14 @@
-<%= render :diff_mode_dropdown %>
-<%= render :diff_mode_html %>
+<% if path({}).present? %>
+  <%= form_tag(path({}), method: :get) do %>
+    <div class="version__selector-container">
+      <%= render :diff_mode_dropdown %>
+      <%= render :diff_mode_html %>
+      <%= submit_tag t("versions.dropdown.toggle"), class: "button button__sm md:button__lg button__secondary" %>
+    </div>
+  <% end %>
+<% end %>
 
-<div aria-live="polite">
+<div class="version__diff-container" aria-live="polite">
   <% diff_data.each do |data| %>
     <%= attribute(data) %>
   <% end %>

data/app/cells/decidim/diff_cell.rb

@@ -7,21 +7,52 @@ module Decidim
   class DiffCell < Decidim::ViewModel
     include Cell::ViewModel::Partial
     include LayoutHelper
+    include ActionView::Helpers::FormOptionsHelper
 
     def attribute(data)
-      render locals: { data: data }
+      render locals: { data: }
     end
 
     def diff_unified(data, format)
-      render locals: { data: data, format: format }
+      render locals: { data:, format: }
     end
 
     def diff_split(data, direction, format)
-      render locals: { data: data, direction: direction, format: format }
+      render locals: { data:, direction:, format: }
+    end
+
+    def diff_split_full(data, format)
+      render locals: { data:, format: }
+    end
+
+    def path(extra_params)
+      return if options[:path].blank?
+
+      options[:path].call(extra_params)
+    end
+
+    def dropdown_options_for_select(options, value)
+      options_for_select(options.map { |opt| [t("versions.dropdown.option_#{opt}"), opt] }, value)
+    end
+
+    def mode_options
+      dropdown_options_for_select(%w(unified split), params["diff-mode"])
+    end
+
+    def html_options
+      dropdown_options_for_select(%w(unescaped escaped), params["diff-html"])
     end
 
     private
 
+    def display_html_config
+      @display_html_config ||= params["diff-html"] == "unescaped" || show_html_view_dropdown? ? :unescaped_html : :html
+    end
+
+    def unified_mode?
+      @unified_mode ||= params["diff-mode"] != "split"
+    end
+
     # Adds a unique ID prefix for the attribute div IDs to avoid duplicate IDs
     # in the DOM.
     def attribute_diff_id(id)
@@ -86,7 +117,7 @@ module Decidim
         data[:old_value].to_s,
         data[:new_value].to_s,
         allow_empty_diff: false,
-        format: format,
+        format:,
         include_plus_and_minus_in_html: true
       ).send(direction)
     end

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

@@ -0,0 +1 @@
+<%= render partial: "decidim/application/documents", formats: [:html], locals: { documents: } %>

data/app/cells/decidim/documents_panel_cell.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell is used to render the documents panel of a resource
+  # inside a tab of a show view
+  #
+  # The `model` must be a resource to get the documents from.and is expected to
+  # respond to documents method
+  #
+  # Example:
+  #
+  #   cell(
+  #     "decidim/documents_panel",
+  #     meeting
+  #   )
+  class DocumentsPanelCell < Decidim::ViewModel
+    include Decidim::AttachmentsHelper
+    include Cell::ViewModel::Partial
+    include ActiveSupport::NumberHelper
+    include ERB::Util
+
+    alias resource model
+
+    def show
+      return if documents.blank?
+
+      render
+    end
+
+    def documents
+      @documents ||= resource.try(:documents)
+    end
+  end
+end

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

@@ -0,0 +1,4 @@
+<div id="resource-<%= resource&.id %>-endorsement-block" class="flex gap-2">
+  <%= cell "decidim/endorsers_list_button", resource %>
+  <%= cell "decidim/endorsement_buttons", resource %>
+</div>

data/app/cells/decidim/endorsement_block_cell.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Decidim
+  class EndorsementBlockCell < Decidim::ViewModel
+    alias resource model
+  end
+end

data/app/cells/decidim/endorsement_buttons/button_content.erb

@@ -0,0 +1,2 @@
+<span><%= endorse_translated %></span>
+<%= endorse_icon %>

data/app/cells/decidim/endorsement_buttons/disabled_endorsements.erb

@@ -0,0 +1,3 @@
+<button type="button" class="<%= button_classes %>" disabled="true">
+  <%= render "button_content" %>
+</button>

data/app/cells/decidim/endorsement_buttons/select_identity_button.erb

@@ -1,9 +1,7 @@
-<button id="select-identity-button" type="button" name="button" class="button small compact light button--sc expanded secondary <%= "active" if fully_endorsed?(resource, current_user) %>">
-  <%= endorse_translated %>
-  <%= render_screen_reader_context_title %>
-</button>
+<div id="resource-<%= resource&.id %>-endorsement-button">
+  <button id="select-identity-button" type="button" name="button" class="<%= button_classes %>" data-dialog-open="user-identities" data-dialog-remote-url="<%= reveal_identities_url %>">
+    <%= render "button_content" %>
+  </button>
 
-<div class="reveal collapse"
-     id="user-identities"
-     data-reveal data-reveal-identities-url="<%= reveal_identities_url %>">
+  <%= decidim_modal id: "user-identities", class: "identities-modal", remote: true %>
 </div>

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

@@ -1,4 +1,17 @@
-<div class="button-group button-group--collapse button--nomargin small">
-  <%= render_endorsements_count %>
-  <%= render_endorsements_button %>
+<div id="resource-<%= resource&.id %>-endorsement-button">
+  <% path = resource.endorsed_by?(current_user) ? path_to_destroy_endorsement(resource) : path_to_create_endorsement(resource) %>
+  <% label = resource.endorsed_by?(current_user) ? t("decidim.endorsement_buttons_cell.already_endorsed") : endorse_translated %>
+  <% method = resource.endorsed_by?(current_user) ? :delete : :post %>
+  <%= action_authorized_button_to(
+        :endorse,
+        path,
+        resource:,
+        method:,
+        remote: true,
+        class: button_classes,
+        id: "endorsement-button"
+      ) do %>
+    <%= label %>
+    <%= endorse_icon %>
+  <% end %>
 </div>

data/app/cells/decidim/endorsement_buttons/verification_modal.erb

@@ -0,0 +1,5 @@
+<%= button_to(endorsement_path(resource),
+              data: { "dialog-open": "authorizationModal", "dialog-remote-url": modal_path(:endorse, resource) },
+              class: button_classes) do %>
+  <%= render "button_content" %>
+<% end %>

data/app/cells/decidim/endorsement_buttons_cell.rb

@@ -8,6 +8,7 @@ module Decidim
     include CellsHelper
     include EndorsableHelper
     include ResourceHelper
+    include IconHelper
     include Decidim::SanitizeHelper
 
     delegate :current_user, to: :controller, prefix: false
@@ -15,10 +16,6 @@ module Decidim
     delegate :current_component, to: :controller, prefix: false
     delegate :allowed_to?, to: :controller, prefix: false
 
-    def show
-      render
-    end
-
     # Renders the "Endorse" button.
     # Contains all the logic about how the button should be rendered
     # and which actions the button must trigger.
@@ -28,111 +25,18 @@ module Decidim
     # - if users are logged in
     # - if users can endorse with many identities (of their user_groups)
     # - if users require verification
-    def render_endorsements_button
-      if endorsements_blocked_or_user_can_not_participate?
-        render_disabled_endorsements_button
-      elsif !current_user
-        render_user_login_button
-      elsif current_user_and_allowed?
-        # Remove identities_cabin
-        if user_has_verified_groups?
-          render "select_identity_button"
-        else
-          render_user_identity_endorse_button
-        end
-      else # has current_user but is not allowed
-        render_verification_modal
-      end
-    end
-
-    # Renders the counter of endorsements that appears in m-cards.
-    def render_endorsements_count
-      content = icon("bullhorn", class: "icon--small", aria_label: t("decidim.endorsable.endorsements_count"), role: "img")
-      content += resource.endorsements_count.to_s
-      html_class = "button small compact button--shadow secondary"
-      html_class += " active" if fully_endorsed?(resource, current_user)
-      tag_params = { id: "resource-#{resource.id}-endorsements-count", class: html_class }
-      if resource.endorsements_count.positive?
-        link_to "#list-of-endorsements", tag_params do
-          content
-        end
-      else
-        content_tag(:div, tag_params) do
-          content
-        end
-      end
-    end
-
-    # Renders the endorsements button but disabled.
-    # To be used to let the user know that endorsements are enabled but are blocked or cant participate.
-    def render_disabled_endorsements_button
-      content_tag :span, class: "#{card_button_html_class} #{endorsement_button_classes(from_resourcess_list: false)} disabled", disabled: true, title: endorse_translated do
-        endorse_translated + render_screen_reader_context_title
-      end
-    end
-
-    def render_screen_reader_context_title
-      content_tag :span, class: "show-for-sr" do
-        decidim_html_escape(resource_title(resource))
-      end
-    end
-
-    # Returns the css classes used for proposal endorsement button in both proposals list and show pages
-    #
-    # from_resourcess_list - A boolean to indicate if the template is rendered from the list page of the resource.
-    #
-    # Returns a string with the value of the css classes.
-    def endorsement_button_classes(from_resourcess_list: false)
-      return "small" if from_resourcess_list
+    def show
+      return render :disabled_endorsements if endorsements_blocked?
+      return render unless current_user
+      return render :disabled_endorsements if user_can_not_participate?
+      return render :verification_modal unless endorse_allowed?
+      return render :select_identity_button if user_has_verified_groups?
 
-      "button small compact light button--sc expanded secondary"
+      render
     end
 
-    def card_button_html_class
-      "card__button button"
-    end
-
-    # Renders a button to endorse the given +resource+ with the personal identity of the user.
-    # To override the translation for both buttons: endorse and unendorse (use to be the name of the user/user_group).
-    #
-    # This button may have different behaviours:
-    # - If the user is not logged in, the button will open the signin/signup popup.
-    # - If the user is logged in, and the resource has not been endorsed, the button will allow to endorse.
-    # - If the user is logged in, and the resource has already been endorsed, the button will allow to UNendorse.
-    #
-    # Parameters:
-    #   resources  - The endorsable resource.
-    def render_user_identity_endorse_button
-      content_tag(:div, id: "resource-#{resource.id}-endorsement-button") do
-        if !current_user
-          render_user_login_button
-        elsif resource.endorsed_by?(current_user)
-          unendorse_label = t("decidim.endorsement_buttons_cell.already_endorsed")
-          destroy_endorsement_url = path_to_destroy_endorsement(resource)
-          action_authorized_button_to(
-            :endorse,
-            destroy_endorsement_url,
-            resource: resource,
-            method: :delete,
-            remote: true,
-            class: "button #{endorsement_button_classes} active",
-            id: "endorsement_button"
-          ) do
-            unendorse_label + render_screen_reader_context_title
-          end
-        else
-          action_authorized_button_to(
-            :endorse,
-            path_to_create_endorsement(resource),
-            resource: resource,
-            remote: true,
-            class: "button #{endorsement_button_classes}",
-            id: "endorsement_button"
-          ) do
-            endorse_translated + render_screen_reader_context_title
-          end
-        end
-      end
+    def button_classes
+      "button button__sm button__transparent-secondary"
     end
 
     # The resource being un/endorsed is the Cell's model.
@@ -144,53 +48,32 @@ module Decidim
       decidim.identities_endorsement_path(resource.to_gid.to_param)
     end
 
-    # produce the path to endorsements from the engine routes as the cell doesn't have access to routes
+    # 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)
     end
 
-    # produce the path to an endorsement from the engine routes as the cell doesn't have access to routes
+    # 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)
     end
 
-    def endorsement_identity_presenter(endorsement)
-      if endorsement.user_group
-        Decidim::UserGroupPresenter.new(endorsement.user_group)
-      else
-        Decidim::UserPresenter.new(endorsement.author)
-      end
+    def button_content
+      render
     end
 
-    #-----------------------------------------------------
-
     private
 
-    #-----------------------------------------------------
-
-    def render_user_login_button
-      action_authorized_button_to(:endorse,
-                                  path_to_create_endorsement(resource),
-                                  resource: resource,
-                                  class: "button #{endorsement_button_classes}") do
-        endorse_translated + render_screen_reader_context_title
-      end
-    end
-
-    def render_verification_modal
-      button_to(endorsement_path(resource),
-                data: { open: "authorizationModal", "open-url": modal_path(:endorse, resource) },
-                class: "#{card_button_html_class} #{endorsement_button_classes(from_resourcess_list: false)}") do
-        endorse_translated + render_screen_reader_context_title
-      end
+    def endorsements_blocked?
+      current_settings.endorsements_blocked?
     end
 
-    def endorsements_blocked_or_user_can_not_participate?
-      current_settings.endorsements_blocked? || !current_component.participatory_space.can_participate?(current_user)
+    def user_can_not_participate?
+      !current_component.participatory_space.can_participate?(current_user)
     end
 
-    def current_user_and_allowed?
-      current_user && allowed_to?(:create, :endorsement, resource: resource)
+    def endorse_allowed?
+      allowed_to?(:create, :endorsement, resource:)
     end
 
     def user_has_verified_groups?
@@ -198,7 +81,11 @@ module Decidim
     end
 
     def endorse_translated
-      @endorse_translated ||= t("decidim.endorsement_buttons_cell.endorse")
+      @endorse_translated ||= resource.endorsed_by?(current_user) ? t("decidim.endorsement_buttons_cell.already_endorsed") : t("decidim.endorsement_buttons_cell.endorse")
+    end
+
+    def endorse_icon
+      @endorse_icon ||= resource_type_icon(resource.endorsed_by?(current_user) ? "dislike" : "like")
     end
 
     def raw_model

data/app/cells/decidim/endorsers_list/full.erb

@@ -0,0 +1,6 @@
+<div id="dropdown-menu-endorsers-list" class="endorsers-list">
+  <div class="endorsers-list__text"><%= t("decidim.endorsers_list.endorsed_by") %></div>
+  <div class="endorsers-list__grid">
+    <%= render :full_endorsers_list %>
+  </div>
+</div>

data/app/cells/decidim/endorsers_list/full_endorsers_list.erb

@@ -0,0 +1,3 @@
+<% full_endorsers.each do |endorser| %>
+  <%= cell "decidim/author", endorser, layout: :avatar %>
+<% end %>

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

@@ -1,16 +1,11 @@
-<div id="list-of-endorsements" class="section">
-  <div class="row">
-    <div class="columns large-12">
-      <h3 class="section-heading"><%= t("decidim.proposals.proposals.show.endorsements_list") %></h3>
-    </div>
-    <div class="columns large-12">
-      <%= cell(
-        "decidim/collapsible_list",
-        endorsers,
-        cell_name: "decidim/author",
-        cell_options: { extra_classes: ["author-data--small"] },
-        hidden_elements_count_i18n_key: "decidim.proposals.proposals.show.hidden_endorsers_count"
-      ) %>
-    </div>
-  </div>
-</div>
+<% visible_endorsers.each do |visible_endorser| %>
+  <span class="endorsers-list__avatar">
+    <%= cell "decidim/author", visible_endorser, layout: :avatar, skip_profile_link: true %>
+  </span>
+<% end %>
+
+<% if full_endorsers.length > MAX_ITEMS_STACKED %>
+  <span class="endorsers-list__counter">
+    <%= "+" + (endorsers_count - MAX_ITEMS_STACKED).to_s %>
+  </span>
+<% end %>

data/app/cells/decidim/endorsers_list_button/content.erb

@@ -0,0 +1 @@
+<%= cell "decidim/endorsers_list", model %>

data/app/cells/decidim/endorsers_list_button_cell.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  class EndorsersListButtonCell < ButtonCell
+    private
+
+    def button_classes
+      "endorsers-list__trigger#{" hidden" if model.endorsements.blank?}"
+    end
+
+    def html_options
+      { id: "dropdown-trigger", data: { component: "dropdown", target: "dropdown-menu-endorsers-list" } }
+    end
+  end
+end

data/app/cells/decidim/endorsers_list_cell.rb

@@ -11,21 +11,41 @@ module Decidim
   class EndorsersListCell < Decidim::ViewModel
     include ApplicationHelper
 
+    MAX_ITEMS_STACKED = 3
+
     def show
-      return unless endorsers.any?
+      return render :full if full_list?
+
+      render
+    end
 
+    def full_endorsers_list
       render
     end
 
+    def endorsers_count
+      base_relation.count
+    end
+
     private
 
+    def full_list?
+      options[:layout] == :full
+    end
+
     # Finds the correct author for each endorsement.
     #
     # Returns an Array of presented Users/UserGroups
-    def endorsers
-      @endorsers ||= model.endorsements.for_listing
-                          .includes(:author, :user_group)
-                          .map { |identity| present(identity.normalized_author) }
+    def visible_endorsers
+      @visible_endorsers ||= base_relation.limit(MAX_ITEMS_STACKED).map { |identity| present(identity.normalized_author) }
+    end
+
+    def full_endorsers
+      @full_endorsers ||= base_relation.map { |identity| present(identity.normalized_author) }
+    end
+
+    def base_relation
+      @base_relation ||= model.endorsements.for_listing.includes(:author, :user_group)
     end
   end
 end