decidim-core 0.19.1 → 0.23.0

data/app/cells/decidim/coauthorships_cell.rb

@@ -53,12 +53,8 @@ module Decidim
     def presenter_for_author(authorable)
       if official?
         "#{model.class.parent}::OfficialAuthorPresenter".constantize.new
-      elsif authorable.user_group
-        Decidim::UserGroupPresenter.new(authorable.user_group)
-      elsif authorable.author.is_a?(Decidim::User)
-        Decidim::UserPresenter.new(authorable.author)
-      elsif authorable.author.is_a?(Decidim::Meeting)
-        Decidim::MeetingPresenter.new(authorable.author)
+      else
+        authorable.user_group&.presenter || authorable.author.presenter
       end
     end
 

data/app/cells/decidim/collapsible_authors_cell.rb

@@ -27,7 +27,7 @@ module Decidim
     def actionable?
       return false if options[:has_actions] == false
 
-      true if withdrawable? || flagable?
+      true if withdrawable? || flaggable?
     end
   end
 end

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

@@ -7,12 +7,12 @@
         <%= card_for element, cell_options %>
       <% end %>
     <% end %>
-    <span class="collapsible-list__see-more">
+    <span class="card__text--paragraph collapsible-list__see-more">
       <%= t(hidden_elements_count_i18n_key, count: hidden_elements_count) %>
     </span>
     <span class="text-small">
-      <a class="collapsible-list__see-more" data-toggle="collapsible-list-<%= seed %>"><%= t("decidim.collapsible_list.see_more") %></a>
-      <a class="collapsible-list__see-less" data-toggle="collapsible-list-<%= seed %>"><%= t("decidim.collapsible_list.see_less") %></a>
+      <span class="collapsible-list__see-more" data-toggle="collapsible-list-<%= seed %>"><%= t("decidim.collapsible_list.see_more") %></span>
+      <span class="collapsible-list__see-less" data-toggle="collapsible-list-<%= seed %>"><%= t("decidim.collapsible_list.see_less") %></span>
     </span>
   </div>
 <% else %>

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

@@ -1,12 +1,12 @@
 <section class="footer__subhero extended subhero home-section">
   <div class="row">
     <div class="columns small-centered large-10">
-      <h2 class="heading3"><%= t("decidim.pages.home.footer_sub_hero.footer_sub_hero_headline", organization: current_organization.name) %></h2>
-      <h5 class="heading4"><%== t("decidim.pages.home.footer_sub_hero.footer_sub_hero_body") %></h5>
+      <h3 class="heading3"><%= t("decidim.pages.home.footer_sub_hero.footer_sub_hero_headline", organization: current_organization.name) %></h3>
+      <h4 class="heading4"><%== t("decidim.pages.home.footer_sub_hero.footer_sub_hero_body") %></h4>
       <% if current_organization.sign_up_enabled? && !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.footer_sub_hero.register") %>
-          <%= icon "chevron-right", aria_hidden: true %>
+          <%= icon "chevron-right", aria_hidden: true, role: "img" %>
         <% end %>
       <% end %>
     </div>

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

@@ -1,7 +1,7 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.translated :text_field, :welcome_text %>
+  <%= settings_fields.translated :text_field, :welcome_text, label: t(".welcome_text") %>
 <% end %>
 
 <% form.fields_for :images, form.object.images do |images_fields| %>
-  <%= images_fields.upload :background_image %>
+  <%= images_fields.upload :background_image, label: t(".background_image") %>
 <% end %>

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

@@ -1,16 +1,16 @@
 <section class="extended home-section">
   <div class="wrapper-home">
     <div class="row column text-center">
-      <h3 class="heading2"><%= t("decidim.pages.home.extended.how_to_participate") %></h3>
+      <h3 class="heading3"><%= t("decidim.pages.home.extended.how_to_participate") %></h3>
     </div>
     <div class="row small-up-1 medium-up-3 home-bullets">
       <div class="column">
         <div class="home-bullet">
           <div class="home-bullet__icon">
-            <%= icon "meetings" %>
+            <%= icon "meetings", role: "img", "aria-hidden": true %>
           </div>
           <div class="home-bullet__desc">
-            <h4 class="heading6"><%= t("decidim.pages.home.extended.meetings") %></h4>
+            <h4 class="heading4"><%= t("decidim.pages.home.extended.meetings") %></h4>
             <p><%= t("decidim.pages.home.extended.meetings_explanation") %></p>
           </div>
         </div>
@@ -18,10 +18,10 @@
       <div class="column">
         <div class="home-bullet">
           <div class="home-bullet__icon">
-            <%= icon "debates" %>
+            <%= icon "debates", role: "img", "aria-hidden": true %>
           </div>
           <div class="home-bullet__desc">
-            <h4 class="heading6"><%= t("decidim.pages.home.extended.debates") %></h4>
+            <h4 class="heading4"><%= t("decidim.pages.home.extended.debates") %></h4>
             <p><%= t("decidim.pages.home.extended.debates_explanation") %></p>
           </div>
         </div>
@@ -29,10 +29,10 @@
       <div class="column">
         <div class="home-bullet">
           <div class="home-bullet__icon">
-            <%= icon "proposals" %>
+            <%= icon "proposals", role: "img", "aria-hidden": true %>
           </div>
           <div class="home-bullet__desc">
-            <h4 class="heading6"><%= t("decidim.pages.home.extended.proposals") %></h4>
+            <h4 class="heading4"><%= t("decidim.pages.home.extended.proposals") %></h4>
             <p><%= t("decidim.pages.home.extended.proposals_explanation") %></p>
           </div>
         </div>
@@ -41,7 +41,7 @@
     <div class="row">
       <div class="columns small-centered small-10
                 smallmedium-8 medium-6 large-4">
-        <%= link_to t("decidim.pages.home.extended.more_info"), decidim.page_path("faq"), class: "button expanded hollow button--sc" %>
+        <%= link_to t("decidim.pages.home.extended.more_info", resource_name: translated_attribute(current_organization.name, current_organization)), decidim.page_path("faq"), class: "button expanded hollow button--sc" %>
       </div>
     </div>
   </div>

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

@@ -30,7 +30,7 @@ module Decidim
         valid_activities_count = 0
         @valid_activities = []
 
-        activities.each do |activity|
+        activities.includes([:user]).each do |activity|
           break if valid_activities_count == activities_to_show
 
           if activity.visible_for?(current_user)

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,13 +5,23 @@
     </h3>
   </div>
 
-  <div class="row" id="diff_unified">
-    <%= diff_unified(data) %>
+  <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_split">
-    <%= diff_split(data, "left") %>
+  <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 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") %>
+    <%= diff_split(data, "right", :html) %>
   </div>
 </div>

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

@@ -0,0 +1,31 @@
+<% 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>
+        <li class="is-dropdown-submenu-parent">
+          <a id="diff-view-selected">
+            <%= t("versions.dropdown.option_unescaped") %>
+          </a>
+
+          <ul class="menu">
+            <li>
+              <%= link_to "#unescaped-html", class: "diff-view-html", id:"unescaped-html" do %>
+                <%= t("versions.dropdown.option_unescaped") %>
+              <% end %>
+            </li>
+
+            <li>
+              <%= link_to "#escaped-html", class: "diff-view-html", id:"escaped-html" do %>
+                <%= t("versions.dropdown.option_escaped") %>
+              <% end %>
+            </li>
+          </ul>
+        </li>
+      </ul>
+    </div>
+  </div>
+<% end %>

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

@@ -5,7 +5,7 @@
 
   <div class="card">
     <div class="diff-data">
-      <%= output_split_diff(data, direction) %>
+      <%= output_split_diff(data, direction, format) %>
     </div>
   </div>
 </div>

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

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

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

@@ -1,4 +1,5 @@
 <%= render :diff_mode_dropdown %>
+<%= render :diff_mode_html %>
 
 <% diff_data.each do |data| %>
   <%= attribute(data) %>

data/app/cells/decidim/diff_cell.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "decidim/diffy_extension"
+
 module Decidim
   # This cell renders the diff between `:old_data` and `:new_data`.
   class DiffCell < Decidim::ViewModel
@@ -10,24 +12,39 @@ module Decidim
       render locals: { data: data }
     end
 
-    def diff_unified(data)
-      render locals: { data: data }
+    def diff_unified(data, format)
+      render locals: { data: data, format: format }
     end
 
-    def diff_split(data, direction)
-      render locals: { data: data, direction: direction }
+    def diff_split(data, direction, format)
+      render locals: { data: data, direction: direction, format: format }
     end
 
     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
     end
 
+    # The item associated with the current_version.
+    def item
+      current_version.item
+    end
+
     # 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
@@ -50,15 +67,13 @@ module Decidim
     # changes between lines.
     #
     # Returns an HTML-safe string.
-    def output_unified_diff(data)
-      return unless data && data[:new_value].present?
-
+    def output_unified_diff(data, format)
       Diffy::Diff.new(
         data[:old_value].to_s,
-        data[:new_value],
+        data[:new_value].to_s,
         allow_empty_diff: false,
         include_plus_and_minus_in_html: true
-      ).to_s(:html).html_safe
+      ).to_s(format)
     end
 
     # Outputs the diff as HTML with side-by-side changes between lines.
@@ -66,16 +81,20 @@ module Decidim
     # The left side represents deletions while the right side represents insertions.
     #
     # Returns an HTML-safe string.
-    def output_split_diff(data, direction)
-      return unless direction && data && data[:new_value].present?
-
+    def output_split_diff(data, direction, format)
       Diffy::SplitDiff.new(
-        data[:old_value],
-        data[:new_value],
+        data[:old_value].to_s,
+        data[:new_value].to_s,
         allow_empty_diff: false,
-        format: :html,
+        format: format,
         include_plus_and_minus_in_html: true
       ).send(direction)
     end
+
+    # Gives the option to view HTML unescaped for better user experience.
+    # Official means created from admin (where rich text editor is enabled).
+    def show_html_view_dropdown?
+      item.try(:official?) || current_organization.rich_text_editor_in_public_views?
+    end
   end
 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