decidim-core 0.23.3 → 0.24.1

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

@@ -1,11 +1,11 @@
 <div class="row column">
   <%= content_tag :div, class: "callout announcement mb-sm #{callout_class} cell-announcement" do %>
-    <% if announcement.class == Hash && announcement.key?(:title) %>
-      <span><%= decidim_sanitize translated_attribute announcement[:title] %></span>
+    <% if has_title? %>
+      <p class="heading2"><%= clean_title %></p>
 
-      <p><%= decidim_sanitize translated_attribute announcement[:body] %></p>
+      <%= clean_body %>
     <% else %>
-      <%= decidim_sanitize translated_attribute announcement %>
+      <%= clean_announcement %>
     <% end %>
   <% end %>
 </div>

data/app/cells/decidim/announcement_cell.rb

@@ -2,32 +2,67 @@
 
 module Decidim
   # This cell renders an announcement
-  # the `model` is spected to be a Hash with two keys:
-  #  `announcement` is mandatory, its the message to show
-  #  `callout_class` is optional, the css class modifier
+  #
+  # The `model` is expected to be a Hash with two keys:
+  #   - `body` is mandatory, its the message to show
+  #   - `title` is mandatory, a title to show
   #
   # {
-  #   announcement: { ... },
-  #   callout_class: "warning"
+  #   title: "...", # mandatory
+  #   body: "..." # mandatory
   # }
   #
+  # It can also receive a single value to show as text. It can either be a String
+  # or a value accepted by the `translated_attribute` method.
+  #
+  # As options, the cell accepts a Hash with these keys:
+  #   - `callout_class`: The Css class to apply. Default to `"secondary"`
+  #
   class AnnouncementCell < Decidim::ViewModel
     include Decidim::SanitizeHelper
 
     def show
-      return unless announcement.presence
+      return if clean_body.blank? && clean_announcement.blank?
 
       render :show
     end
 
     private
 
+    def has_title?
+      announcement.is_a?(Hash) && announcement.has_key?(:title)
+    end
+
     def callout_class
-      model[:callout_class] ||= "secondary"
+      options[:callout_class] ||= "secondary"
     end
 
     def announcement
-      model[:announcement]
+      model
+    end
+
+    def clean_title
+      clean(announcement[:title])
+    end
+
+    def body
+      return announcement.presence unless announcement.is_a?(Hash)
+
+      announcement[:body].presence
+    end
+
+    def clean_body
+      return unless body
+
+      Array(body).map { |paragraph| tag.p(clean(paragraph)) }.join("")
+    end
+
+    def clean_announcement
+      clean(announcement)
+    end
+
+    def clean(value)
+      decidim_sanitize(translated_attribute(value))
     end
   end
 end

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

@@ -0,0 +1,10 @@
+<% if user_flaggable? && model.try(:id) != current_user.try(:id) %>
+  <button type="button" class="link-alt" data-open="<%= current_user.present? ? "flagUserModal" : "loginModal" %>" title="<%= t("report", scope: "decidim.proposals.proposals.show") %>" aria-controls="<%= current_user.present? ? "flagUserModal" : "loginModal" %>" aria-haspopup="true" tabindex="0">
+    <%= icon "flag", aria_hidden: true, class: "icon--small", role: "img", "aria-hidden": true %>
+    <span class="show-for-sr">
+        <%= t("report", scope: "decidim.proposals.proposals.show") %>
+    </span>
+  </button>
+
+  <%= cell("decidim/flag_modal", model).flag_user %>
+<% end %>

data/app/cells/decidim/author/profile_minicard.erb

@@ -4,7 +4,7 @@
       <%= cell("decidim/user_profile", raw_model).user_data %>
     </div>
     <div class="card__text card--picture-offset">
-      <%= link_to t("decidim.profiles.show.view_full_profile"), profile_path %>
+      <%= text_link_to_current_or_new_conversation_with(model) %>
     </div>
   </div>
   <div class="ml-s">

data/app/cells/decidim/author_cell.rb

@@ -38,10 +38,18 @@ module Decidim
       render
     end
 
+    def flag_user_modal
+      render
+    end
+
     def flag
       render
     end
 
+    def flag_user
+      render unless current_user == model
+    end
+
     def withdraw
       render
     end
@@ -55,7 +63,7 @@ module Decidim
     def withdraw_path
       return decidim.withdraw_amend_path(from_context.amendment) if from_context.emendation?
 
-      from_context_path + "/withdraw"
+      "#{from_context_path}/withdraw"
     end
 
     def creation_date?

data/app/cells/decidim/card_m/top.erb

@@ -1,7 +1,7 @@
 <div class="card__top">
   <% if render_space? %>
     <div class="card__content text-small">
-      <span class="muted"><%= searchable_resource_human_name(model.participatory_space.class) %>:</span>&nbsp;<%= link_to translated_attribute(model.participatory_space.title), Decidim::ResourceLocatorPresenter.new(model.participatory_space).path, class: "card__link text-ellipsis" %>
+      <span class="muted"><%= searchable_resource_human_name(model.participatory_space.class, count: 1) %>:</span>&nbsp;<%= link_to translated_attribute(model.participatory_space.title), Decidim::ResourceLocatorPresenter.new(model.participatory_space).path, class: "card__link text-ellipsis" %>
     </div>
   <% end %>
 </div>

data/app/cells/decidim/card_m_cell.rb

@@ -136,7 +136,7 @@ module Decidim
     end
 
     def render_comments_count
-      with_tooltip t("decidim.comments.comments") do
+      with_tooltip t("decidim.comments.comments_title") do
         render :comments_counter
       end
     end

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

@@ -0,0 +1,14 @@
+<section class="section">
+  <div class="expanded hero" style="background-image:url(<%= background_image %>);">
+    <div class="hero__container">
+      <div class="row">
+        <div class="columns small-centered medium-6 text-center">
+          <%= cta_button %>
+          <p class="text-highlight">
+            <%= translated_description %>
+          </p>
+        </div>
+      </div>
+    </div>
+  </div>
+</section>

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    class CtaCell < Decidim::ViewModel
+      include Decidim::SanitizeHelper
+
+      def show
+        return if button_url.blank?
+
+        render
+      end
+
+      def translated_button_text
+        @translated_button_text ||= translated_attribute(model.settings.button_text)
+      end
+
+      def translated_description
+        @translated_description ||= decidim_sanitize(translated_attribute(model.settings.description))
+      end
+
+      def button_url
+        @button_url ||= model.settings.button_url
+      end
+
+      def cta_button
+        link_to translated_button_text, button_url, class: "button button--sc medium-6", title: translated_button_text
+      end
+
+      def background_image
+        model.images_container.background_image.big.url
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+<% form.fields_for :settings, form.object.settings do |settings_fields| %>
+  <%= settings_fields.translated :text_field, :button_text, label: t("decidim.content_blocks.cta_settings_form.button_text") %>
+  <%= settings_fields.text_field :button_url, label: t("decidim.content_blocks.cta_settings_form.button_url") %>
+  <%= settings_fields.translated :text_field, :description, label: t("decidim.content_blocks.cta_settings_form.description") %>
+<% end %>
+
+<% form.fields_for :images, form.object.images do |images_fields| %>
+  <%= images_fields.upload :background_image, label: t("decidim.content_blocks.cta_settings_form.background_image") %>
+<% end %>

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    class CtaSettingsFormCell < Decidim::ViewModel
+      alias form model
+
+      def content_block
+        options[:content_block]
+      end
+    end
+  end
+end

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

@@ -18,6 +18,20 @@ module Decidim
       def background_image
         model.images_container.background_image.big.url
       end
+
+      private
+
+      # A MD5 hash of model attributes because is needed because
+      # the model doesn't respond to cache_key_with_version nor updated_at method
+      def cache_hash
+        hash = []
+        hash << "decidim/content_blocks/hero"
+        hash << Digest::MD5.hexdigest(model.attributes.to_s)
+        hash << current_organization.cache_key_with_version
+        hash << I18n.locale.to_s
+
+        hash.join("/")
+      end
     end
   end
 end

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

@@ -0,0 +1,4 @@
+<section class="section" id="<%= block_id %>">
+  <%= render :heading %>
+  <%= render :elements %>
+</section>

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    class HighlightedElementsCell < Decidim::ViewModel
+      include Decidim::CardHelper
+
+      def elements
+        @elements ||= case model.settings.order
+                      when "recent"
+                        base_relation.order_by_most_recent
+                      else
+                        base_relation.order_randomly(random_seed)
+                      end.limit(limit)
+      end
+
+      def base_relation
+        raise "Please, overwrite this method. Inheriting classes should define their own base relation"
+      end
+
+      def show
+        return if elements.blank?
+
+        render
+      end
+
+      def published_components
+        @published_components ||= if model.scope_name == "participatory_process_group_homepage"
+                                    group = Decidim::ParticipatoryProcessGroup.find(model.scoped_resource_id)
+                                    Decidim::Component.where(participatory_space: group.participatory_processes).published
+                                  else
+                                    Decidim::Component.none
+                                  end
+      end
+
+      def block_id
+        "#{model.scope_name}-#{model.manifest_name}".parameterize.gsub("_", "-")
+      end
+
+      private
+
+      def limit
+        4
+      end
+
+      def random_seed
+        rand * 2 - 1
+      end
+    end
+  end
+end

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

@@ -0,0 +1,3 @@
+<% form.fields_for :settings, form.object.settings do |settings_fields| %>
+  <%= settings_fields.select :order, order_options, prompt: "", label: label %>
+<% end %>

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    class HighlightedElementsSettingsFormCell < Decidim::ViewModel
+      alias form model
+
+      def order_options
+        available_sorts.map do |sort_key|
+          [
+            I18n.t("decidim.content_blocks.highlighted_elements_settings_form.orders.#{sort_key}"),
+            sort_key
+          ]
+        end
+      end
+
+      def label
+        I18n.t("decidim.content_blocks.highlighted_elements_settings_form.orders.label")
+      end
+
+      private
+
+      def available_sorts
+        %w(random recent)
+      end
+    end
+  end
+end

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

@@ -44,6 +44,17 @@ module Decidim
 
       private
 
+      # A MD5 hash of model attributes because is needed because
+      # it ensures the cache version value will always be the same size
+      def cache_hash
+        hash = []
+        hash << "decidim/content_blocks/last_activity"
+        hash << Digest::MD5.hexdigest(valid_activities.map(&:cache_key_with_version).to_s)
+        hash << I18n.locale.to_s
+
+        hash.join("/")
+      end
+
       def activities
         @activities ||= HomeActivitySearch.new(
           organization: current_organization,

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

@@ -3,12 +3,6 @@
 module Decidim
   module ContentBlocks
     class MetricsCell < Decidim::ViewModel
-      def show
-        return unless current_organization.show_statistics?
-
-        render
-      end
-
       def metrics
         @metrics ||= MetricChartsPresenter.new(organization: current_organization)
       end

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

@@ -3,12 +3,6 @@
 module Decidim
   module ContentBlocks
     class StatsCell < Decidim::ViewModel
-      def show
-        return unless current_organization.show_statistics?
-
-        render
-      end
-
       def stats
         @stats ||= HomeStatsPresenter.new(organization: current_organization)
       end

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

@@ -0,0 +1,31 @@
+<div class="extra__date-container">
+  <% if same_day? %>
+    <div class="extra__date">
+      <%= l start_time, format: "%d" %>
+      <span class="extra__month"><%= l start_time, format: "%B#{ " %Y" if show_year?}" %></span>
+    </div>
+    <div class="extra__time">
+      <%= l start_time, format: "%H:%M" %> - <%= l end_time, format: "%H:%M" %>
+    </div>
+  <% else %>
+    <div>
+      <div class="extra__date">
+        <%= l start_time, format: "%d" %>
+        <span class="extra__month"><%= l start_time, format: "%B#{ " %Y" if show_year?}" %></span>
+      </div>
+      <div class="extra__time">
+        <%= l start_time, format: "%H:%M" %>
+      </div>
+    </div>
+    <%= icon "arrow-thin-right" %>
+    <div>
+      <div class="extra__date">
+        <%= l end_time, format: "%d" %>
+        <span class="extra__month"><%= l end_time, format: "%B#{ " %Y" if show_year?}" %></span>
+      </div>
+      <div class="extra__time">
+        <%= l end_time, format: "%H:%M" %>
+      </div>
+    </div>
+  <% end %>
+</div>

data/app/cells/decidim/date_cell.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders a date or a date range
+  # the `model` is expected to be an hash with two keys:
+  #  `start` is the starting datetime
+  #  `end` is the ending datetime
+  # both are optional
+  #
+  # {
+  #   start: model.start_time,
+  #   end: model.end_time
+  # }
+  #
+  class DateCell < Decidim::ViewModel
+    include Decidim::IconHelper
+
+    def show
+      return unless start_time && end_time
+
+      render :show
+    end
+
+    private
+
+    def start_time
+      model[:start]
+    end
+
+    def end_time
+      model[:end]
+    end
+
+    def same_day?
+      start_time.beginning_of_day == end_time.beginning_of_day
+    end
+
+    def same_year?
+      start_time.beginning_of_year == end_time.beginning_of_year
+    end
+
+    def show_year?
+      !same_year? || !current_year?(start_time) || !current_year?(end_time)
+    end
+
+    def current_year?(time)
+      time.year == Time.zone.now.year
+    end
+  end
+end