decidim-core 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e969541fbe08a3dc578b73a0b5c1c3926dcdc9f16c8fa9e3b7b8a8a37101d505
-  data.tar.gz: 35e028a57a0d827008ef7045afb10269dd684f1643242ae1ae22deb0ff78e259
+  metadata.gz: aab7a2ae23c1348701c0e16ba32310cb9eb321255202fb5c24ea3f3a2d2b2685
+  data.tar.gz: d4e03e251ac0918d8ff0d891700aa3576e8a580739809c6ecd50d0f7816d90f6
 SHA512:
-  metadata.gz: 6f5ee9f5d4edba935fa625b43786bd984a04c1e6798a4aedbbb18442afcc9061782c24bf1d3fa779e8015e559909ffc3ff9ee9fb4bc646bbfa45ed8e76ce27de
-  data.tar.gz: e56a0fbd127732e8f41c7ec62e7aa1ce83d31703ab99e4799366327f1c93e7f26328b3c2ee9e912f9645ea57f0c25cde391c9d8f3467d835b0b0ff051d635903
+  metadata.gz: e8fb7afc6566dedbd3884b5deb0d32c98baab6c1c7a1be1fcddabfb657167b47912967e68e558e6f7c9edc40133be57ccbd8c3668b5e95d19e89e7bb47ac2788
+  data.tar.gz: cbb63221866026d46fae8a8a22d355469cb14cdb2460886fbfd54a292f253ed04777d23123f75cfadbf384bf1c28a889303e7d8e679ad485637374d04a091a03

data/app/assets/config/decidim_core_manifest.js

@@ -12,3 +12,6 @@
 // = link decidim/widget.js
 // = link decidim/impersonation.js
 // = link decidim/floating_help.js
+// = link decidim/extras/_social_share.css
+// = link decidim/social_share.js
+// = link decidim/represent_user_group.js

data/app/assets/javascripts/decidim/social_share.js

@@ -0,0 +1,2 @@
+// = require social-share-button
+// = require_self

data/app/assets/stylesheets/decidim/extras/_social_share.css.scss

@@ -0,0 +1,36 @@
+/*
+ *= require social-share-button
+ */
+
+$size: 45px;
+
+.share-link:hover{
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+.social-share-button{
+  display: inline-block;
+  vertical-align: top;
+
+  .ssb-icon{
+    margin-right: 5px;
+    background-size: $size $size;
+    height: $size;
+    width: $size;
+  }
+}
+
+a.ssb-icon.ssb-whatsapp_app{
+  display: none;
+}
+
+@media (hover: none) and (pointer: coarse){
+  a.ssb-icon.ssb-whatsapp_app{
+    display: inline-block;
+  }
+
+  a.ssb-icon.ssb-whatsapp_web{
+    display: none;
+  }
+}

data/app/assets/stylesheets/decidim/modules/_input-gallery.scss

@@ -0,0 +1,24 @@
+.gallery__container{
+  width: 100%;
+
+  .thumbnail{
+    max-height: 100px;
+  }
+
+  .gallery__item{
+    display: inline-block;
+    border: none;
+    margin-right: .5rem;
+    padding: 0;
+
+    .close-button{
+      right: 2px;
+      top: 2px;
+      width: 2rem;
+      height: 2rem;
+      background: rgba(var(--primary-rgb), .8);
+      color: $white;
+      border-radius: 50%;
+    }
+  }
+}

data/app/assets/stylesheets/decidim/modules/_navbar.scss

@@ -117,7 +117,7 @@ $navbar-active-shadow-medium: inset 0 4px 0 0 var(--primary);
   }
 
   .is-dropdown-submenu{
-    z-index: 2;
+    z-index: 701;
     text-align: left;
     padding: 0;
     background-color: $white;

data/app/cells/decidim/activities_cell.rb

@@ -13,13 +13,6 @@ module Decidim
     def show
       return if activities.blank?
 
-      activities.map do |activity|
-        activity.organization_lazy
-        activity.resource_lazy
-        activity.participatory_space_lazy
-        activity.component_lazy
-      end
-
       render
     end
 
@@ -34,7 +27,19 @@ module Decidim
     end
 
     def activities
-      model
+      @activities ||= last_activities.select do |activity|
+        activity.visible_for?(current_user)
+      end
+    end
+
+    def last_activities
+      @last_activities ||= model.map do |activity|
+        activity.organization_lazy
+        activity.resource_lazy
+        activity.participatory_space_lazy
+        activity.component_lazy
+        activity
+      end
     end
   end
 end

data/app/cells/decidim/activity_cell.rb

@@ -13,6 +13,7 @@ module Decidim
 
     def show
       return unless renderable?
+
       render
     end
 
@@ -72,10 +73,18 @@ module Decidim
       I18n.l(model.created_at, format: :short)
     end
 
+    def user
+      return resource.normalized_author if resource.respond_to?(:normalized_author)
+      return resource.author if resource.respond_to?(:author)
+
+      model.user_lazy if resource.respond_to?(:user)
+    end
+
     private
 
     def published?
       return true unless resource.respond_to?(:published?)
+
       resource.published?
     end
 
@@ -87,13 +96,18 @@ module Decidim
       model.organization_lazy
     end
 
-    def user
-      model.user_lazy
-    end
-
     def author
       return unless show_author? && user.is_a?(UserBaseEntity)
-      cell "decidim/author", UserPresenter.new(user)
+
+      presenter = if user.is_a?(Decidim::User)
+                    UserPresenter.new(user)
+                  elsif user.is_a?(Decidim::UserGroup)
+                    UserGroupPresenter.new(user)
+                  end
+
+      return unless presenter
+
+      cell "decidim/author", presenter
     end
 
     def participatory_space

data/app/cells/decidim/address/details.erb

@@ -1,7 +1,7 @@
 <% if model.respond_to? :location %>
-  <strong><%= translated_attribute model.location %></strong><br />
+  <strong><%= translated_attribute model.location %></strong><br>
 <% end %>
-<span><%= model.address %></span><br />
+<span><%= model.address %></span><br>
 <% if model.respond_to? :location_hints %>
   <span><%= translated_attribute model.location_hints %></span>
 <% end %>

data/app/cells/decidim/amendable/amenders_list/show.erb

@@ -1,4 +1,4 @@
-<div class="card extra">
+<div class="card extra amender-list">
   <div class="definition-data__item">
     <span class="definition-data__title">
       <%= t("amended_by", scope: "decidim.amendments.amendable") %>

data/app/cells/decidim/amendable/amenders_list_cell.rb

@@ -17,9 +17,13 @@ module Decidim::Amendable
       model
     end
 
+    def visible_amendments
+      amendable.visible_amendments_for(current_user).where.not(state: "draft")
+    end
+
     # Returns a UserPresenter array
     def amenders
-      @amenders ||= amendable.amendments.map { |amendment| present(amendment.amender) }.uniq
+      @amenders ||= visible_amendments.map { |amendment| present(amendment.amender) }.uniq
     end
 
     def options

data/app/cells/decidim/amendable/announcement_cell.rb

@@ -13,22 +13,35 @@ module Decidim::Amendable
 
     def announcement
       {
-        announcement: emendation_message,
+        announcement: emendation_message + promoted_message,
         callout_class: state_classes
       }
     end
 
     def emendation_message
-      t(model.emendation_state,
+      message(model.state, amendable_type, proposal_link, announcement_date)
+    end
+
+    def promoted_message
+      return "" unless model.amendment.promoted?
+
+      proposal = model.linked_promoted_resource
+      text = message(:promoted, amendable_type)
+      %(<br><strong>#{proposal_link(proposal, text)}</strong>)
+    end
+
+    def message(state, type, link = nil, date = nil)
+      t(state,
         scope: "decidim.amendments.emendation.announcement",
-        amendable_type: amendable_type,
-        amendable_link: amendable_link,
-        announcement_date: announcement_date)
+        amendable_type: type,
+        proposal_link: link,
+        date: date)
     end
 
-    def amendable_link
-      link_to resource_locator(model.amendable).path do
-        %(<strong>#{present(model.amendable).title}</strong>)
+    def proposal_link(resource = model.amendable, text = nil)
+      text ||= %(<strong>#{present(model.amendable).title}</strong>)
+      link_to resource_locator(resource).path do
+        text
       end
     end
 
@@ -41,7 +54,7 @@ module Decidim::Amendable
     end
 
     def state_classes
-      case model.emendation_state
+      case model.state
       when "accepted"
         "success"
       when "rejected"

data/app/cells/decidim/amendable/wizard_step_form_cell.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Amendable
+    # This cell functions as an intermediary cell that computes and passes the
+    # necessary information, as a Hash, to Decidim::WizardStepFormCell.
+    class WizardStepFormCell < Decidim::ViewModel
+      def show
+        cell("decidim/wizard_step_form", options_for_view)
+      end
+
+      private
+
+      # Returns the current step as Integer.
+      def current_step
+        @current_step ||= case params[:action].to_sym
+                          when :new, :create
+                            1
+                          when :compare_draft
+                            2
+                          when :edit_draft, :update_draft, :destroy_draft
+                            3
+                          when :preview_draft, :publish_draft
+                            4
+                          end
+      end
+
+      # Returns the translation for a given step.
+      def i18n_step(step_number)
+        t("decidim.amendments.wizard_step_form.steps.#{step_number}")
+      end
+
+      # Returns the name of the view we want to render, as Symbol.
+      def view
+        options[:view]
+      end
+
+      # Returns a Hash with all the data that will be needed in Decidim::WizardStepFormCell.
+      def options_for_view
+        common_options.merge(
+          send("#{view}_options")
+        )
+      end
+
+      # A Hash of data that is used in both :wizard_header and :wizard_aside views.
+      def common_options
+        {
+          view: view,
+          current_step: current_step,
+          total_steps: 4,
+          steps: {
+            "1": i18n_step(1),
+            "2": i18n_step(2),
+            "3": i18n_step(3),
+            "4": i18n_step(4)
+          }
+        }
+      end
+
+      # A Hash of data needed for the :wizard_aside view.
+      def wizard_aside_options
+        {
+          wizard_aside_back_url: wizard_aside_back_url
+        }
+      end
+
+      # A Hash of data needed for the :wizard_header view.
+      def wizard_header_options
+        {
+          wizard_header_title: wizard_header_title,
+          wizard_header_similar_resources_count: options[:similar_resources_count],
+          wizard_header_help_text: wizard_header_help_text
+        }
+      end
+
+      def amendable
+        @amendable ||= model
+      end
+
+      def amendment
+        @amendment ||= amendable.amendment
+      end
+
+      # Returns the link we want the back button to point to.
+      def wizard_aside_back_url
+        case current_step
+        when 1
+          Decidim::ResourceLocatorPresenter.new(amendable).path
+        when 3
+          Decidim::Core::Engine.routes.url_helpers.compare_draft_amend_path(amendment)
+        when 4
+          Decidim::Core::Engine.routes.url_helpers.edit_draft_amend_path(amendment)
+        end
+      end
+
+      # Returns the translation of the header title.
+      def wizard_header_title
+        key = case current_step
+              when 1
+                :new
+              when 2
+                :compare_draft
+              when 3
+                :edit_draft
+              when 4
+                :preview_draft
+              end
+
+        t("decidim.amendments.#{key}.title")
+      end
+
+      # Returns a Hash that will be passed to a Decidim::AnnouncementCell.
+      def wizard_header_help_text
+        attribute = amendable.component.settings.amendments_wizard_help_text
+        {
+          announcement: translated_attribute(attribute).presence
+        }
+      end
+    end
+  end
+end

data/app/cells/decidim/announcement_cell.rb

@@ -16,6 +16,7 @@ module Decidim
 
     def show
       return unless announcement.presence
+
       render :show
     end
 

data/app/cells/decidim/author_cell.rb

@@ -49,6 +49,8 @@ module Decidim
     end
 
     def withdraw_path
+      return decidim.withdraw_amend_path(from_context.amendment) if from_context.emendation?
+
       from_context_path + "/withdraw"
     end
 
@@ -57,6 +59,7 @@ module Decidim
       return unless from_context
       return unless proposals_controller? || collaborative_drafts_controller?
       return unless show_action?
+
       true
     end
 
@@ -72,6 +75,7 @@ module Decidim
 
     def commentable?
       return unless posts_controller?
+
       true
     end
 
@@ -82,6 +86,7 @@ module Decidim
     def actionable?
       return false if options[:has_actions] == false
       return true if user_author? && posts_controller?
+
       true if withdrawable? || flagable?
     end
 
@@ -90,6 +95,8 @@ module Decidim
     end
 
     def profile_path?
+      return false if options[:skip_profile_link] == true
+
       profile_path.present?
     end
 

data/app/cells/decidim/card_m_cell.rb

@@ -40,6 +40,7 @@ module Decidim
 
     def has_label?
       return true if model.respond_to?("emendation?") && model.emendation?
+
       context[:label].presence
     end
 
@@ -90,6 +91,7 @@ module Decidim
       classes = [base_card_class]
       classes = classes.concat(["card--stack"]).join(" ") if has_children?
       return classes unless has_state?
+
       classes.concat(state_classes).join(" ")
     end
 
@@ -141,7 +143,7 @@ module Decidim
     end
 
     def render_space?
-      context[:show_space].presence && model.respond_to?(:participatory_space)
+      context[:show_space].presence && model.respond_to?(:participatory_space) && model.participatory_space.present?
     end
 
     def render_top?