decidim-core 0.21.0 → 0.22.0

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

@@ -1,7 +1,7 @@
 <section class="extended home-section" id="statistics">
   <div class="wrapper-home">
     <div class="row column text-center">
-      <h3 class="heading2"><%= t("decidim.pages.home.statistics.headline", organization: current_organization.name) %></h3>
+      <h3 class="heading3"><%= t("decidim.pages.home.statistics.headline", organization: current_organization.name) %></h3>
     </div>
     <div class="row">
       <div class="columns small-centered mediumlarge-10 large-8">

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

@@ -1,11 +1,11 @@
   <section class="extended subhero home-section">
     <div class="row">
       <div class="columns small-centered large-10">
-        <h2 class="heading3"><%= decidim_sanitize translated_attribute current_organization.description %></h2>
+        <h2 class="heading2"><%= decidim_sanitize translated_attribute(current_organization.description), strip_tags: true %></h2>
         <% unless current_user %>
-          <%= link_to decidim.new_user_registration_path, class: "button--sc link subhero-cta" do %>
+          <%= link_to decidim.new_user_registration_path, class: "button--sc link subhero-cta", title: t("decidim.pages.home.sub_hero.register_title") do %>
             <%= t("decidim.pages.home.sub_hero.register") %>
-            <%= icon "chevron-right", aria_hidden: true %>
+            <%= icon "chevron-right", aria_hidden: true, role: "img" %>
           <% end %>
         <% end %>
       </div>

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

@@ -5,23 +5,23 @@
     </h3>
   </div>
 
-  <div class="row" id="diff_view_unified_escaped">
-    <%= diff_unified(data, :html) %>
-  </div>
-
-  <div class="row hide" id="diff_view_unified_unescaped">
+  <div class="row diff_view diff_view_unified_unescaped<%= " hide" unless show_html_view_dropdown? %>" id="<%= attribute_diff_id("diff_view_unified_unescaped") %>">
     <%= diff_unified(data, :unescaped_html) %>
   </div>
 
-  <div class="row hide" id="diff_view_split_escaped">
-    <%= diff_split(data, "left", :html) %>
-
-    <%= diff_split(data, "right", :html) %>
+  <div class="row diff_view diff_view_unified_escaped<%= " hide" if show_html_view_dropdown? %>" id="<%= attribute_diff_id("diff_view_unified_escaped") %>">
+    <%= diff_unified(data, :html) %>
   </div>
 
-  <div class="row hide" id="diff_view_split_unescaped">
+  <div class="row diff_view diff_view_split_unescaped hide" id="<%= attribute_diff_id("diff_view_split_unescaped") %>">
     <%= diff_split(data, "left", :unescaped_html) %>
 
     <%= diff_split(data, "right", :unescaped_html) %>
   </div>
+
+  <div class="row diff_view diff_view_split_escaped hide" id="<%= attribute_diff_id("diff_view_split_escaped") %>">
+    <%= diff_split(data, "left", :html) %>
+
+    <%= diff_split(data, "right", :html) %>
+  </div>
 </div>

data/app/cells/decidim/diff_cell.rb

@@ -22,6 +22,12 @@ module Decidim
 
     private
 
+    # Adds a unique ID prefix for the attribute div IDs to avoid duplicate IDs
+    # in the DOM.
+    def attribute_diff_id(id)
+      "#{SecureRandom.uuid}_#{id}"
+    end
+
     # A PaperTrail::Version.
     def current_version
       model
@@ -34,7 +40,11 @@ module Decidim
 
     # DiffRenderer class for the current_version's item; falls back to `BaseDiffRenderer`.
     def diff_renderer_class
-      "#{current_version.item_type.deconstantize}::DiffRenderer".constantize
+      if current_version.item_type.deconstantize == "Decidim"
+        "#{current_version.item_type.pluralize}::DiffRenderer".constantize
+      else
+        "#{current_version.item_type.deconstantize}::DiffRenderer".constantize
+      end
     rescue NameError
       Decidim::BaseDiffRenderer
     end

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

@@ -0,0 +1,10 @@
+<%= javascript_include_tag "decidim/identity_selector_dialog" %>
+<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 class="reveal collapse"
+     id="user-identities"
+     data-reveal data-reveal-identities-url="<%= reveal_identities_url %>">
+</div>

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

@@ -0,0 +1,4 @@
+<div class="button-group button-group--collapse button--nomargin small">
+  <%= render_endorsements_count %>
+  <%= render_endorsements_button %>
+</div>

data/app/cells/decidim/endorsement_buttons_cell.rb

@@ -0,0 +1,208 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders the endrosement 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 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
+
+    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.
+    #
+    # It takes into account:
+    # - if endorsements are enabled
+    # - 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(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
+
+      "button small compact light button--sc expanded secondary"
+    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
+    end
+
+    # The resource being un/endorsed is the Cell's model.
+    def resource
+      model
+    end
+
+    def reveal_identities_url
+      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
+    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
+    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
+    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(false)}") do
+        endorse_translated + render_screen_reader_context_title
+      end
+    end
+
+    def endorsements_blocked_or_user_can_not_participate?
+      current_settings.endorsements_blocked? || !current_component.participatory_space.can_participate?(current_user)
+    end
+
+    def current_user_and_allowed?
+      current_user && allowed_to?(:create, :endorsement, resource: resource)
+    end
+
+    def user_has_verified_groups?
+      current_user && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any?
+    end
+
+    def endorse_translated
+      @endorse_translated ||= t("decidim.endorsement_buttons_cell.endorse")
+    end
+
+    def raw_model
+      model.try(:__getobj__) || model
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+<div id="list-of-endorsements" class="section">
+  <div class="row">
+    <div class="columns large-12">
+      <h4 class="section-heading"><%= t("decidim.proposals.proposals.show.endorsements_list") %></h4>
+    </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>

data/app/cells/decidim/endorsers_list_cell.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  # This cell renders the list of endorsers.
+  #
+  # Example:
+  #
+  #    cell("decidim/endorsers_list", my_component)
+  class EndorsersListCell < Decidim::ViewModel
+    include ApplicationHelper
+
+    def show
+      return unless endorsers.any?
+
+      render
+    end
+
+    private
+
+    # Finds the correct author for each endorsement.
+    #
+    # Returns an Array of presented Users/UserGroups
+    def endorsers
+      @endorsers ||= model.endorsements.for_listing.map { |identity| present(identity.normalized_author) }
+    end
+  end
+end

data/app/cells/decidim/fingerprint_cell.rb

@@ -4,6 +4,7 @@ module Decidim
   class FingerprintCell < Decidim::ViewModel
     include ActionView::RecordIdentifier
     include Decidim::SanitizeHelper
+    include Decidim::ResourceHelper
 
     def show
       render

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

@@ -4,30 +4,36 @@
       <%= button_to decidim.follow_path, class: button_classes, params: { follow: { followable_gid: model.to_sgid.to_s, inline: inline? } }, data: { disable: true }, method: :delete, remote: true do %>
         <span class="icon-wrap">
           <%= icon "bell", icon_options %>
-          <%= model.followers.count %>
+          <span aria-hidden="true"><%= model.followers.count %></span>
+          <span class="show-for-sr"><%= t("decidim.followers.followers_count", count: model.followers.count) %></span>
         </span>
         <span class="text-wrap">
           <%= t("follows.destroy.button", scope: "decidim") %>
+          <%= render_screen_reader_title_for(model) %>
         </span>
       <% end %>
     <% else %>
       <%= button_to decidim.follow_path, class: button_classes, params: { follow: { followable_gid: model.to_sgid.to_s, inline: inline? } }, data: { disable: true }, remote: true do %>
         <span class="icon-wrap">
           <%= icon "bell", icon_options %>
-          <%= model.followers.count %>
+          <span aria-hidden="true"><%= model.followers.count %></span>
+          <span class="show-for-sr"><%= t("decidim.followers.followers_count", count: model.followers.count) %></span>
         </span>
         <span class="text-wrap">
           <% if current_user.follows?(model.try(:participatory_space)) %>
-            <%= t("follows.create.participatory_space", scope: "decidim") %>
+            <%= t("follows.create.participatory_space", resource_name: resource_title(model.participatory_space), scope: "decidim") %>
           <% else %>
             <%= t("follows.create.button", scope: "decidim") %>
+            <%= render_screen_reader_title_for(model) %>
           <% end %>
         </span>
       <% end %>
     <% end %>
   <% else %>
-    <%= button_to(
+    <%= action_authorized_button_to(
+      :follow,
       decidim.follow_path,
+      resource: model,
       class: button_classes,
       params: { follow: { followable_gid: model.to_sgid.to_s, inline: inline? } },
       data: { tooltip: true, disable_hover: false },
@@ -36,10 +42,12 @@
       remote: true) do %>
       <span class="icon-wrap">
         <%= icon "bell", icon_options %>
-        <%= model.followers.count %>
+        <span aria-hidden="true"><%= model.followers.count %></span>
+        <span class="show-for-sr"><%= t("decidim.followers.followers_count", count: model.followers.count) %></span>
       </span>
       <span class="text-wrap">
         <%= t("follows.create.button", scope: "decidim") %>
+        <%= render_screen_reader_title_for(model) %>
       </span>
     <% end %>
   <% end %>

data/app/cells/decidim/follow_button_cell.rb

@@ -4,6 +4,8 @@ module Decidim
   # This cell renders the button to follow the given resource.
   class FollowButtonCell < Decidim::ViewModel
     include LayoutHelper
+    include Decidim::SanitizeHelper
+    include Decidim::ResourceHelper
 
     def show
       return if model == current_user
@@ -14,16 +16,32 @@ module Decidim
     private
 
     def button_classes
-      return "card__button secondary text-uppercase follow-button mb-none" if inline?
-      return "button secondary hollow expanded button--icon button--sc" if large?
+      return "card__button secondary text-uppercase follow-button mb-none has-tip" if inline?
 
-      "button secondary hollow expanded small button--icon follow-button"
+      extra_classes = ""
+      extra_classes += " active" if current_user_follows?
+      extra_classes += begin
+        if large?
+          " button--sc"
+        else
+          " small"
+        end
+      end
+
+      "button expanded button--icon follow-button secondary hollow #{extra_classes}"
     end
 
     def icon_options
-      return { class: "icon--small" } if inline?
+      icon_base_options = { aria_hidden: true }
+      return icon_base_options.merge(class: "icon--small", role: "img", "aria-hidden": true) if inline?
+
+      icon_base_options
+    end
 
-      {}
+    def render_screen_reader_title_for(resource)
+      content_tag :span, class: "show-for-sr" do
+        decidim_html_escape(resource_title(resource))
+      end
     end
 
     # Checks whether the button will be shown inline or not. Inline buttons will
@@ -38,6 +56,12 @@ module Decidim
       options[:large]
     end
 
+    def current_user_follows?
+      return false unless current_user
+
+      current_user.follows?(model)
+    end
+
     def decidim
       Decidim::Core::Engine.routes.url_helpers
     end