decidim-core 0.24.3 → 0.25.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3951a2b1d212641b4f8d6d237c46f04a51acdba30baaf937d051ddc1a5a657b
-  data.tar.gz: 91ede7442a9ba6ccc60328bcea6384962e93ebffa195efca31a0ba27aae35eac
+  metadata.gz: 439b8a5979b3c9f5853b9cb3720dc06126e02b0ff35d035f805e55e949f2538d
+  data.tar.gz: 4254bb83ac96d7e010637444e314053530d795443141f35359a8fe4185db6d86
 SHA512:
-  metadata.gz: dd77e400d4d79c85b294f128a401f9408e2b8acf964cba301cf88cb53ca4305683bebf735e3e66092a3f7a66c774f9be3db6244eae9367b90c54e6a51ddfb4d5
-  data.tar.gz: 9fb9dede7ce22aebcb6d83fd83e076d1926cbaceefecc033fce2ff19d4837a759abb82dc67caf5438435d1e868df77c1481d0e59d28952f0a4942dfe1a4f0675
+  metadata.gz: 214ed5e5165e86efe8919bf98301c5cc2a6107299dc94aa30aa37fad64b6511276f8a81bf387527b7ecda013d064ad536d5a2db76fa2fdbc8818433b33ad369d
+  data.tar.gz: ab54e8cd03bf5c383f4993a52c491fb061b1a5422551640680aaa713c5960b6263446720d1c9f6e284bc03eefc41aba7619603ad444cfe3c7eb5558fc2901cf7

data/app/cells/decidim/activity_cell.rb

@@ -90,6 +90,14 @@ module Decidim
       "action-#{model.id}"
     end
 
+    def cache_hash
+      hash = []
+      hash << model.class.name.underscore
+      hash << model.cache_key_with_version
+
+      hash.join("/")
+    end
+
     private
 
     def published?

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

@@ -1,7 +1,7 @@
 <div class="row column">
   <%= content_tag :div, class: "callout announcement mb-sm #{callout_class} cell-announcement" do %>
     <% if has_title? %>
-      <p class="heading2"><%= clean_title %></p>
+      <p class="heading5"><%= clean_title %></p>
 
       <%= clean_body %>
     <% else %>

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

@@ -1,6 +1,6 @@
 <% if commentable? %>
-  <%= link_to "#{resource_locator(from_context).path}#comments", title: t("decidim.author.comments", count: from_context.comments.count) do %>
+  <%= link_to "#{resource_locator(from_context).path}#comments", title: t("decidim.author.comments", count: from_context.comments_count) do %>
     <%= icon "comment-square", class: "icon--small", role: "img", "aria-hidden": true %>
-    <%= from_context.comments.count %> <%= t("decidim.author.comments", count: from_context.comments.count) %>
+    <%= from_context.comments_count %> <%= t("decidim.author.comments", count: from_context.comments_count) %>
   <% end %>
 <% end %>

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

@@ -1,5 +1,5 @@
 <span class="author__avatar">
-  <%= image_tag model.avatar_url, alt: t("decidim.author.avatar") %>
+  <%= image_tag model.avatar_url, alt: t("decidim.author.avatar", name: decidim_sanitize(author_name)) %>
 </span>
 
 <% if model.deleted? %>
@@ -18,7 +18,7 @@
     data-allow-html="true"
     data-template-classes="light expanded"
     data-tip-text='<%= h render(:profile_minicard) %>'>
-    <%= author_name %>
+    <%= decidim_sanitize author_name %>
   </span>
 
   <% if model.badge.present? %>
@@ -28,7 +28,7 @@
   <% end %>
 <% else %>
   <span class="author__name">
-    <%= author_name %>
+    <%= decidim_sanitize author_name %>
   </span>
 
   <% if model.badge.present? %>

data/app/cells/decidim/author_cell.rb

@@ -7,6 +7,7 @@ module Decidim
   class AuthorCell < Decidim::ViewModel
     include LayoutHelper
     include CellsHelper
+    include Decidim::SanitizeHelper
     include ::Devise::Controllers::Helpers
     include ::Devise::Controllers::UrlHelpers
     include Messaging::ConversationHelper
@@ -92,7 +93,7 @@ module Decidim
     end
 
     def actionable?
-      return false if options[:has_actions] == false
+      return options[:has_actions] if options.has_key?(:has_actions)
 
       withdrawable? || flaggable?
     end

data/app/cells/decidim/coauthorships_cell.rb

@@ -43,7 +43,7 @@ module Decidim
     def presenters_for_identities(coauthorable)
       coauthorable.identities.map do |identity|
         if identity.is_a?(Decidim::Organization)
-          "#{model.class.parent}::OfficialAuthorPresenter".constantize.new
+          "#{model.class.module_parent}::OfficialAuthorPresenter".constantize.new
         else
           present(identity)
         end
@@ -52,7 +52,7 @@ module Decidim
 
     def presenter_for_author(authorable)
       if official?
-        "#{model.class.parent}::OfficialAuthorPresenter".constantize.new
+        "#{model.class.module_parent}::OfficialAuthorPresenter".constantize.new
       else
         authorable.user_group&.presenter || authorable.author.presenter
       end

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

@@ -28,7 +28,7 @@ module Decidim
       end
 
       def background_image
-        model.images_container.background_image.big.url
+        model.images_container.attached_uploader(:background_image).path(variant: :big)
       end
     end
   end

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

@@ -16,7 +16,7 @@ module Decidim
       end
 
       def background_image
-        model.images_container.background_image.big.url
+        model.images_container.attached_uploader(:background_image).path(variant: :big)
       end
 
       private

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

@@ -1,5 +1,5 @@
 <section class="extended highligted-content-banner home-section"
-          style="background-image:url(<%= current_organization.highlighted_content_banner_image.url %>);">
+          style="background-image:url(<%= current_organization.attached_uploader(:highlighted_content_banner_image).path %>);">
   <div class="highligted-content-banner__container">
     <div class="row">
       <div class="columns large-10">

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

@@ -1,7 +1,7 @@
 <section class="extended home-section">
   <div class="wrapper-home">
     <div class="row column text-center">
-      <h3 class="heading3"><%= t("decidim.pages.home.extended.how_to_participate") %></h3>
+      <h2 class="heading3"><%= t("decidim.pages.home.extended.how_to_participate") %></h2>
     </div>
     <div class="row small-up-1 medium-up-3 home-bullets">
       <div class="column">
@@ -10,7 +10,7 @@
             <%= icon "meetings", role: "img", "aria-hidden": true %>
           </div>
           <div class="home-bullet__desc">
-            <h4 class="heading4"><%= t("decidim.pages.home.extended.meetings") %></h4>
+            <h3 class="heading4"><%= t("decidim.pages.home.extended.meetings") %></h3>
             <p><%= t("decidim.pages.home.extended.meetings_explanation") %></p>
           </div>
         </div>
@@ -21,7 +21,7 @@
             <%= icon "debates", role: "img", "aria-hidden": true %>
           </div>
           <div class="home-bullet__desc">
-            <h4 class="heading4"><%= t("decidim.pages.home.extended.debates") %></h4>
+            <h3 class="heading4"><%= t("decidim.pages.home.extended.debates") %></h3>
             <p><%= t("decidim.pages.home.extended.debates_explanation") %></p>
           </div>
         </div>
@@ -32,7 +32,7 @@
             <%= icon "proposals", role: "img", "aria-hidden": true %>
           </div>
           <div class="home-bullet__desc">
-            <h4 class="heading4"><%= t("decidim.pages.home.extended.proposals") %></h4>
+            <h3 class="heading4"><%= t("decidim.pages.home.extended.proposals") %></h3>
             <p><%= t("decidim.pages.home.extended.proposals_explanation") %></p>
           </div>
         </div>

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

@@ -5,9 +5,14 @@
     </div>
     <div class="row">
       <div class="columns small-centered mediumlarge-10 large-8">
-        <div class="home-pam">
-          <%= stats.highlighted %>
-          <%= stats.not_highlighted %>
+        <div class="home-stats">
+          <div class="home-stats__highlight">
+            <%= cell("decidim/statistics", stats.highlighted, heading: false, design: "homepage" ) %>
+          </div>
+
+          <div class="home-stats__lowlight">
+            <%= cell("decidim/statistics", stats.not_highlighted, heading: false, design: "homepage" ) %>
+          </div>
         </div>
       </div>
     </div>

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

@@ -2,7 +2,7 @@
     <div class="row">
       <div class="columns small-centered large-10">
         <h2 class="heading2">
-          <%= decidim_sanitize translated_attribute current_organization.description %>
+          <%= organization_description %>
         </h2>
         <% unless current_user %>
           <%= link_to decidim.new_user_registration_path, class: "button--sc link subhero-cta", title: t("decidim.pages.home.sub_hero.register_title") do %>

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

@@ -11,6 +11,16 @@ module Decidim
 
         render
       end
+
+      private
+
+      def organization_description
+        desc = decidim_sanitize(translated_attribute(current_organization.description))
+
+        # Strip the surrounding paragraph tag because it is not allowed within
+        # a <hN> element.
+        desc.gsub(%r{</p>\s+<p>}, "<br><br>").gsub(%r{<p>(((?!</p>).)*)</p>}mi, "\\1")
+      end
     end
   end
 end

data/app/cells/decidim/{date_cell.rb → date_range_cell.rb}

@@ -12,7 +12,7 @@ module Decidim
   #   end: model.end_time
   # }
   #
-  class DateCell < Decidim::ViewModel
+  class DateRangeCell < Decidim::ViewModel
     include Decidim::IconHelper
 
     def show

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

@@ -1,4 +1,3 @@
-<%= 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 %>

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

@@ -10,14 +10,17 @@
   <% else %>
     <p><%= t("decidim.shared.flag_modal.description") %></p>
     <%= decidim_form_for report_form, url: decidim.report_path(sgid: model.to_sgid.to_s), method: :post, html: { id: nil } do |f| %>
-      <%= f.collection_radio_buttons :reason, [
-        [:spam, t("decidim.shared.flag_modal.spam")],
-        [:offensive, t("decidim.shared.flag_modal.offensive")],
-        [:does_not_belong, t("decidim.shared.flag_modal.does_not_belong", organization_name: current_organization.name)]
-      ], :first, :last do |builder| %>
-        <%= builder.label { builder.radio_button(id: nil) + builder.text } %>
-      <% end %>
-      <%= f.text_area :details, rows: 4, id: nil %>
+      <fieldset>
+        <legend><%= t("decidim.shared.flag_modal.reason") %></legend>
+        <%= f.collection_radio_buttons :reason, [
+          [:spam, t("decidim.shared.flag_modal.spam")],
+          [:offensive, t("decidim.shared.flag_modal.offensive")],
+          [:does_not_belong, t("decidim.shared.flag_modal.does_not_belong", organization_name: current_organization.name)]
+        ], :first, :last do |builder| %>
+          <label><%= builder.radio_button(id: nil) + builder.text %></label>
+        <% end %>
+      </fieldset>
+      <%= f.text_area :details, rows: 4, id: "#{modal_id}_details", label_options: { for: "#{modal_id}_details" } %>
       <%= f.submit t("decidim.shared.flag_modal.report") %>
     <% end %>
   <% end %>

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

@@ -26,9 +26,9 @@
             <table>
               <tr>
                 <th>
-                  <% if organization.official_img_header? %>
+                  <% if organization.official_img_header.attached? %>
                     <%= link_to organization.official_url do %>
-                      <%= image_tag organization.official_img_header.url.to_s , alt: "", style: "max-height: 50px", class: "float-right" %>
+                      <%= image_tag organization.attached_uploader(:official_img_header).path, alt: "", style: "max-height: 50px", class: "float-right" %>
                     <% end %>
                   <% end %>
                 </th>

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

@@ -34,9 +34,9 @@ table.button table td {
             <table>
               <tr>
                 <th>
-                  <% if organization.official_img_header? %>
+                  <% if organization.official_img_header.attached? %>
                     <%= link_to organization.official_url do %>
-                      <%= image_tag organization.official_img_header.url.to_s , alt: "", style: "max-height: 50px", class: "float-right" %>
+                      <%= image_tag organization.attached_uploader(:official_img_header).url(host: organization.host), alt: "", style: "max-height: 50px", class: "float-right" %>
                     <% end %>
                   <% end %>
                 </th>

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

@@ -42,7 +42,7 @@ module Decidim
       end
 
       def has_main_image?
-        main_image_url.present?
+        newsletter.template.images_container.main_image.attached?
       end
 
       def main_image
@@ -50,7 +50,7 @@ module Decidim
       end
 
       def main_image_url
-        newsletter.template.images_container.main_image.url
+        newsletter.template.images_container.attached_uploader(:main_image).url(host: organization.host)
       end
 
       def organization_primary_color

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

@@ -44,6 +44,4 @@
   <% end %>
 </div>
 
-<%= javascript_include_tag "decidim/notifications" %>
-
 <%= decidim_paginate notifications %>

data/app/cells/decidim/profile/invalid.erb

@@ -0,0 +1,9 @@
+<div class="wrapper">
+  <div class="row">
+    <h1 class="heading1 page-title">
+      <div class="text-center">
+        <p><%= t("decidim.profile.deleted") %></p>
+      </div>
+    </h1>
+  </div>
+</div>

data/app/cells/decidim/profile_cell.rb

@@ -11,11 +11,10 @@ module Decidim
     delegate :current_organization, :current_user, :user_groups_enabled?, to: :controller
 
     def show
-      if profile_holder.blocked? && current_user_logged_in?
-        render :inaccessible
-      else
-        render :show
-      end
+      return render :invalid if profile_holder.blank?
+      return render :inaccessible if profile_holder.blocked? && current_user_logged_in?
+
+      render :show
     end
 
     def profile_holder

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

@@ -0,0 +1,4 @@
+<label class="represent-user-group">
+  <%= check_box_tag :public_participation %>
+  <%= checkbox_text %>
+</label>

data/app/cells/decidim/public_participation_cell.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell is intended to be used on forms.
+  class PublicParticipationCell < Decidim::ViewModel
+    private
+
+    def checkbox_text
+      I18n.t("public_participation", scope: "decidim.shared.public_participation")
+    end
+  end
+end

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

@@ -9,4 +9,3 @@
                   include_blank: include_blank_text,
                   label: false) %>
 </div>
-<%= javascript_include_tag "decidim/represent_user_group" %>

data/app/cells/decidim/statistic/homepage.erb

@@ -0,0 +1,9 @@
+<div class="home-stats__data <%= stat_dom_class %>">
+  <h4 class="home-stats__title">
+    <%= stat_title %>
+  </h4>
+
+  <span class="home-stats__number">
+    <%= stat_number %>
+  </span>
+</div>

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

@@ -0,0 +1,9 @@
+<div class="statistic__data <%= stat_dom_class %>">
+  <span class="statistic__number">
+    <%= stat_number %>
+  </span>
+
+  <h4 class="statistic__title">
+    <%= stat_title %>
+  </h4>
+</div>

data/app/cells/decidim/statistic_cell.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders a Statistic of a Resource
+  class StatisticCell < Decidim::ViewModel
+    include ActionView::Helpers::NumberHelper
+
+    private
+
+    def stat_number
+      number_with_delimiter(model[:stat_number])
+    end
+
+    def stat_dom_class
+      model[:stat_title]
+    end
+
+    def stat_title
+      t(model[:stat_title], scope: "decidim.statistics")
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+<section class="row section-statistics">
+  <div class="columns <%= wrapper_class %>">
+    <div class="row column">
+      <% if heading? %>
+        <h3 class="section-heading">
+          <%= stats_heading %>
+        </h3>
+      <% end %>
+
+      <div class="statistics-cell">
+        <% if stats.present? %>
+          <%= cell("decidim/statistic", collection: stats, design: design) %>
+        <% else %>
+          <span class="muted"><%= no_stats %></span>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</section>

data/app/cells/decidim/statistics_cell.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders the Statistics of a Resource
+  class StatisticsCell < Decidim::ViewModel
+    private
+
+    def stats
+      @stats ||= model
+    end
+
+    def stats_heading
+      t("decidim.statistics.headline")
+    end
+
+    def no_stats
+      t("decidim.statistics.no_stats")
+    end
+
+    def heading?
+      if options[:heading].nil?
+        true
+      else
+        options[:heading]
+      end
+    end
+
+    def design
+      options[:design].presence || "default"
+    end
+
+    def wrapper_class
+      "large-8" if design == "default"
+    end
+  end
+end