decidim-proposals 0.19.0 → 0.22.0

data/app/assets/images/decidim/proposals/icon.svg

@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 35">
-  <path d="M17.5 35A17.5 17.5 0 1 1 35 17.5 17.52 17.52 0 0 1 17.5 35zm0-33.06A15.56 15.56 0 1 0 33.06 17.5 15.57 15.57 0 0 0 17.5 1.94zm9.5 13.7H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zm0 3.68H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zM22.26 23H8a1 1 0 0 1 0-1.94h14.26a1 1 0 0 1 0 1.94z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 35"><path d="M17.5 35A17.5 17.5 0 1 1 35 17.5 17.52 17.52 0 0 1 17.5 35zm0-33.06A15.56 15.56 0 1 0 33.06 17.5 15.57 15.57 0 0 0 17.5 1.94zm9.5 13.7H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zm0 3.68H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zM22.26 23H8a1 1 0 0 1 0-1.94h14.26a1 1 0 0 1 0 1.94z"/></svg>

data/app/assets/javascripts/decidim/proposals/admin/proposals.es6

@@ -4,18 +4,31 @@ $(document).ready(function () {
     return $('.table-list .js-check-all-proposal:checked').length
   }
 
+  let selectedProposalsNotPublishedAnswerCount = function() {
+    return $('.table-list [data-published-state=false] .js-check-all-proposal:checked').length
+  }
+
   window.selectedProposalsCountUpdate = function() {
-    if(selectedProposalsCount() == 0){
+    const selectedProposals = selectedProposalsCount();
+    const selectedProposalsNotPublishedAnswer = selectedProposalsNotPublishedAnswerCount();
+    if(selectedProposals == 0){
       $("#js-selected-proposals-count").text("")
     } else {
-      $("#js-selected-proposals-count").text(selectedProposalsCount());
+      $("#js-selected-proposals-count").text(selectedProposals);
     }
 
-    if(selectedProposalsCount() >= 2) {
+    if(selectedProposals >= 2) {
       $('button[data-action="merge-proposals"]').parent().show();
     } else {
       $('button[data-action="merge-proposals"]').parent().hide();
     }
+
+    if(selectedProposalsNotPublishedAnswer > 0) {
+      $('button[data-action="publish-answers"]').parent().show();
+      $('#js-form-publish-answers-number').text(selectedProposalsNotPublishedAnswer);
+    } else {
+      $('button[data-action="publish-answers"]').parent().hide();
+    }
   }
 
   let showBulkActionsButton = function() {
@@ -24,7 +37,7 @@ $(document).ready(function () {
     }
   }
 
-  let hideBulkActionsButton = function(force = false) {
+  window.hideBulkActionsButton = function(force = false) {
     if(selectedProposalsCount() == 0 || force == true){
       $("#js-bulk-actions-button").addClass('hide');
       $("#js-bulk-actions-dropdown").removeClass('is-open');
@@ -35,12 +48,12 @@ $(document).ready(function () {
     $("#js-other-actions-wrapper").removeClass('hide');
   }
 
-  let hideOtherActionsButtons = function() {
+  window.hideOtherActionsButtons = function() {
     $("#js-other-actions-wrapper").addClass('hide');
   }
 
   window.hideBulkActionForms = function() {
-    return $(".js-bulk-action-form").addClass('hide');
+    $(".js-bulk-action-form").addClass('hide');
   }
 
   if ($('.js-bulk-action-form').length) {
@@ -57,8 +70,8 @@ $(document).ready(function () {
         })
 
         $(`#js-${action}-actions`).removeClass('hide');
-        hideBulkActionsButton(true);
-        hideOtherActionsButtons();
+        window.hideBulkActionsButton(true);
+        window.hideOtherActionsButtons();
       }
     })
 
@@ -71,7 +84,7 @@ $(document).ready(function () {
         showBulkActionsButton();
       } else {
         $(".js-check-all-proposal").closest('tr').removeClass('selected');
-        hideBulkActionsButton();
+        window.hideBulkActionsButton();
       }
 
       selectedProposalsCountUpdate();
@@ -96,12 +109,12 @@ $(document).ready(function () {
         showBulkActionsButton();
         $(this).closest('tr').addClass('selected');
       } else {
-        hideBulkActionsButton();
+        window.hideBulkActionsButton();
         $(this).closest('tr').removeClass('selected');
       }
 
       if ($('.js-check-all-proposal:checked').length === 0) {
-        hideBulkActionsButton();
+        window.hideBulkActionsButton();
       }
 
       $('.js-bulk-action-form').find(".js-proposal-id-"+proposal_id).prop('checked', checked);

data/app/assets/javascripts/decidim/proposals/admin/proposals_form.js.es6

@@ -20,9 +20,4 @@ $(() => {
     toggleDisabledHiddenFields();
 
   }
-
-  $(document).on("closed.zf.callout", (event) => {
-    $(event.target).remove();
-  });
-
 });

data/app/assets/javascripts/decidim/proposals/admin/proposals_picker.js.es6

@@ -0,0 +1,35 @@
+$(() => {
+  const $content = $(".picker-content"),
+      pickerMore = $content.data("picker-more"),
+      pickerPath = $content.data("picker-path"),
+      toggleNoProposals = () => {
+        const showNoProposals = $("#proposals_list li:visible").length === 0
+        $("#no_proposals").toggle(showNoProposals)
+      }
+
+  let jqxhr = null
+
+  toggleNoProposals()
+
+  $(".data_picker-modal-content").on("change keyup", "#proposals_filter", (event) => {
+    const filter = event.target.value.toLowerCase()
+
+    if (pickerMore) {
+      if (jqxhr !== null) {
+        jqxhr.abort()
+      }
+
+      $content.html("<div class='loading-spinner'></div>")
+      jqxhr = $.get(`${pickerPath}?q=${filter}`, (data) => {
+        $content.html(data)
+        jqxhr = null
+        toggleNoProposals()
+      })
+    } else {
+      $("#proposals_list li").each((index, li) => {
+        $(li).toggle(li.textContent.toLowerCase().indexOf(filter) > -1)
+      })
+      toggleNoProposals()
+    }
+  })
+})

data/app/cells/decidim/proposals/collaborative_draft_link_to_proposal_cell.rb

@@ -23,7 +23,7 @@ module Decidim
       end
 
       def link_header
-        content_tag :strong, class: "text-large text-uppercase" do
+        content_tag :strong, class: "text-large" do
           t("final_proposal", scope: "decidim.proposals.collaborative_drafts.show")
         end
       end

data/app/cells/decidim/proposals/collaborative_draft_m/footer.erb

@@ -1,6 +1,6 @@
 <div class="card__footer">
   <div class="card__support">
     <div class="card__support__data"></div>
-    <%= link_to t("decidim.proposals.collaborative_drafts.collaborative_draft.view_collaborative_draft"), resource_path, class: "card__button button small secondary" %>
+    <%= link_to t("decidim.proposals.collaborative_drafts.collaborative_draft.view_collaborative_draft"), resource_path, class: "card__button button--sc light button small" %>
   </div>
 </div>

data/app/cells/decidim/proposals/collaborative_draft_m_cell.rb

@@ -23,7 +23,7 @@ module Decidim
       end
 
       def description
-        strip_tags(present(model).body).truncate(100, separator: /\s/)
+        decidim_sanitize(present(model).body.truncate(100, separator: /\s/))
       end
 
       def has_badge?

data/app/cells/decidim/proposals/cost_report/show.erb

@@ -0,0 +1,35 @@
+<div id="proposal-costs" class="card card--secondary" data-toggler=".expanded-text">
+  <div class="card__content">
+    <div class="mb-s">
+      <div class="data-title">
+        <h3 class="data-title__over">
+          <%= t("decidim.proposals.proposals.show.estimated_cost") %>
+        </h3>
+        <div>
+          <strong class="data-title__main">
+            <%= cost %>
+          </strong>
+        </div>
+        <div class="data-title__sub">
+          <%= execution_period %>
+        </div>
+      </div>
+    </div>
+    <div id="execution-cost-short" class="text-toggle__short">
+      <%= cost_report_short %>
+      <% if needs_text_toggle? %>
+      <button class="muted-link" data-toggle="proposal-costs">
+        <%= t("decidim.proposals.proposals.show.read_more") %>
+      </button>
+      <% end %>
+    </div>
+    <% if needs_text_toggle? %>
+    <div id="execution-cost-long" class="text-toggle__long">
+      <%= cost_report %>
+      <button class="muted-link" data-toggle="proposal-costs">
+        <%= t("decidim.proposals.proposals.show.read_less") %>
+      </button>
+    </div>
+    <% end %>
+  </div>
+</div>

data/app/cells/decidim/proposals/cost_report_cell.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Proposals
+    # This cell renders the cost report for a proposal.
+    class CostReportCell < Decidim::ViewModel
+      include ActionView::Helpers::NumberHelper
+      include Decidim::SanitizeHelper
+      include Decidim::LayoutHelper
+      include ProposalCellsHelper
+
+      private
+
+      def cost
+        number_to_currency(model.cost)
+      end
+
+      def cost_report
+        decidim_sanitize(translated_attribute(model.cost_report).html_safe)
+      end
+
+      def needs_text_toggle?
+        cost_report != cost_report_short
+      end
+
+      def cost_report_short
+        decidim_sanitize(
+          html_truncate(
+            translated_attribute(model.cost_report).html_safe,
+            length: 200
+          )
+        )
+      end
+
+      def execution_period
+        decidim_sanitize(translated_attribute(model.execution_period).html_safe)
+      end
+    end
+  end
+end

data/app/cells/decidim/proposals/highlighted_proposals_for_component/show.erb

@@ -1,7 +1,7 @@
 <section class="section row collapse highlighted_proposals">
-  <h4 class="section-heading">
+  <h3 class="section-heading">
     <%= translated_attribute(model.name) %>  <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_proposals.see_all", count: proposals_count) %></a>
-  </h4>
+  </h3>
 
   <%= cell(
     "decidim/collapsible_list",
@@ -14,6 +14,6 @@
   <%= link_to(
     t("decidim.participatory_spaces.highlighted_proposals.see_all", count: proposals_count),
     main_component_path(model),
-    class: "button button--sc light secondary button--right"
+    class: "button button--sc hollow button--right"
   ) %>
 </section>

data/app/cells/decidim/proposals/highlighted_proposals_for_component_cell.rb

@@ -23,7 +23,7 @@ module Decidim
       end
 
       def proposals_to_render
-        @proposals_to_render ||= proposals.limit(Decidim::Proposals.config.participatory_space_highlighted_proposals_limit)
+        @proposals_to_render ||= proposals.includes([:amendable, :category, :component, :scope]).limit(Decidim::Proposals.config.participatory_space_highlighted_proposals_limit)
       end
 
       def proposals_count

data/app/cells/decidim/proposals/irreversible_action_modal/show.erb

@@ -1,8 +1,8 @@
 <%= button_reveal_modal %>
 
-<div id="<%= modal_id %>" class="reveal" data-reveal aria-labelledby="<%= modal_title %>" aria-hidden="true" role="dialog">
+<div id="<%= modal_id %>" class="reveal" data-reveal aria-labelledby="<%= modal_id %>-title" aria-hidden="true" role="dialog">
   <div class="reveal__header">
-    <h3 class="reveal__title">
+    <h3 id="<%= modal_id %>-title" class="reveal__title">
       <%= modal_title %>
     </h3>
 

data/app/cells/decidim/proposals/irreversible_action_modal_cell.rb

@@ -29,7 +29,7 @@ module Decidim
       end
 
       def modal_id
-        "#{action}-irreversible-action-modal"
+        @modal_id ||= "#{SecureRandom.uuid}-#{action}-irreversible-action-modal"
       end
 
       def button_reveal_modal

data/app/cells/decidim/proposals/participatory_text_proposal/buttons.erb

@@ -14,7 +14,7 @@
     <% if component_settings.comments_enabled? %>
       <div class="button-group button-group--collapse row collapse comment-buttons">
         <% if current_settings.comments_blocked? %>
-          <%= content_tag :button, class: "column medium-4 button light secondary", title: t("endorse", scope: "decidim.proposals.participatory_text_proposal.buttons") do %>
+          <%= content_tag :button, class: "column medium-4 button light secondary" do %>
             <%= icon "comment-square", class: "icon--small", aria_label: t("comments", scope: "decidim.proposals.participatory_text_proposal.buttons"), role: "img" %>
             <%= model.comments.count %>
           <% end %>

data/app/cells/decidim/proposals/participatory_text_proposal_cell.rb

@@ -21,7 +21,7 @@ module Decidim
       def title
         case model.participatory_text_level
         when "section"
-          "<h5><strong class='text-uppercase'>#{section_title}</strong></h5>"
+          "<h5><strong>#{section_title}</strong></h5>"
         else
           "<h6><strong>#{section_title}</strong></h6>"
         end

data/app/cells/decidim/proposals/proposal_m/footer.erb

@@ -16,7 +16,10 @@
         <%= render partial: "decidim/proposals/proposals/vote_button.html", locals: { proposal: model, from_proposals_list: true } %>
       <% elsif has_footer? %>
         <div class="card__support__data"></div>
-        <%= link_to t("decidim.proposals.proposals.proposal.view_proposal"), resource_path, class: "card__button button--sc light button small secondary" %>
+        <%= link_to resource_path, class: "card__button button--sc light button small" do %>
+          <%= t("decidim.proposals.proposals.proposal.view_proposal") %>
+          <span class="show-for-sr"><%= title %></span>
+        <% end %>
       <% end %>
     </div>
   </div>

data/app/cells/decidim/proposals/proposal_m_cell.rb

@@ -14,12 +14,16 @@ module Decidim
 
       private
 
+      def preview?
+        options[:preview]
+      end
+
       def title
         decidim_html_escape(present(model).title)
       end
 
       def body
-        present(model).body
+        decidim_sanitize(present(model).body)
       end
 
       def has_state?
@@ -27,7 +31,7 @@ module Decidim
       end
 
       def has_badge?
-        answered? || withdrawn? || emendation?
+        published_state? || withdrawn?
       end
 
       def has_link_to_resource?
@@ -50,28 +54,40 @@ module Decidim
         state_classes.concat(["label", "proposal-status"]).join(" ")
       end
 
+      def base_statuses
+        @base_statuses ||= begin
+          if endorsements_visible?
+            [:endorsements_count, :comments_count]
+          else
+            [:comments_count]
+          end
+        end
+      end
+
       def statuses
-        return [:endorsements_count, :comments_count] if model.draft?
-        return [:creation_date, :endorsements_count, :comments_count] if !has_link_to_resource? || !can_be_followed?
+        return [] if preview?
+        return base_statuses if model.draft?
+        return [:creation_date] + base_statuses if !has_link_to_resource? || !can_be_followed?
 
-        [:creation_date, :follow, :endorsements_count, :comments_count]
+        [:creation_date, :follow] + base_statuses
       end
 
       def creation_date_status
-        l(model.published_at.to_date, format: :decidim_short)
+        explanation = content_tag(:strong, t("activemodel.attributes.common.created_at"))
+        "#{explanation}<br>#{l(model.published_at.to_date, format: :decidim_short)}"
       end
 
       def endorsements_count_status
         return endorsements_count unless has_link_to_resource?
 
-        link_to resource_path do
+        link_to resource_path, "aria-label" => "#{t("decidim.endorsable.endorsements_count")}: #{model.endorsements_count}", title: t("decidim.endorsable.endorsements_count") do
           endorsements_count
         end
       end
 
       def endorsements_count
-        with_tooltip t("decidim.proposals.models.proposal.fields.endorsements") do
-          icon("bullhorn", class: "icon--small") + " " + model.proposal_endorsements_count.to_s
+        with_tooltip t("decidim.endorsable.endorsements") do
+          icon("bullhorn", class: "icon--small") + " " + model.endorsements_count.to_s
         end
       end
 
@@ -94,6 +110,18 @@ module Decidim
       def can_be_followed?
         !model.withdrawn?
       end
+
+      def endorsements_visible?
+        model.component.current_settings.endorsements_enabled?
+      end
+
+      def has_image?
+        model.attachments.first.present? && model.attachments.first.file.content_type.start_with?("image") && model.component.settings.allow_card_image
+      end
+
+      def resource_image_path
+        model.attachments.first.url if has_image?
+      end
     end
   end
 end

data/app/cells/decidim/proposals/proposal_tags/show.erb

@@ -1,25 +1,33 @@
 <figure>
-  <figcaption class="text-uppercase">
-    <strong>
-      <%= t("filed_as", scope: "decidim.proposals.proposals.tags") %>
-    </strong>
-  </figcaption>
-
-  <ul>
+  <ul class="tags tags--proposal tags--list">
     <% if category.present? %>
       <li>
-        <%= link_to translated_attribute(category.name), resource_locator(model).index(filter: { category_id: category.id }) %>
+        <%= link_to resource_locator(model).index(filter: { category_id: [category.id.to_s] }), title: t("decidim.tags.filter_results_for_category", resource: translated_attribute(category.name)) do %>
+          <span class="show-for-sr"><%= t "decidim.tags.filter_results_for_category", resource: translated_attribute(category.name) %></span>
+          <span aria-hidden="true"><%= translated_attribute(category.name) %></span>
+        <% end %>
         <% if previous_category.present? && show_previous_category? %>
           &nbsp;
           <small class="text-small">
-            <%= t("changed_from", scope: "decidim.proposals.proposals.tags", previous_category: "#{previous_category.translated_name}").html_safe %>
+            <%= t("changed_from", scope: "decidim.proposals.proposals.tags", previous_name: "#{previous_category.translated_name}").html_safe %>
           </small>
         <% end %>
       </li>
     <% end %>
 
     <% if has_visible_scopes?(model) %>
-      <li><%= link_to translated_attribute(scope.name), resource_locator(model).index(filter: { scope_id: [scope.id] }) %></li>
+      <li>
+        <%= link_to resource_locator(model).index(filter: { scope_id: [scope.id] }), title: t("decidim.tags.filter_results_for_scope", resource: translated_attribute(scope.name)) do %>
+          <span class="show-for-sr"><%= t "decidim.tags.filter_results_for_scope", resource: translated_attribute(scope.name) %></span>
+          <span aria-hidden="true"><%= translated_attribute(scope.name) %></span>
+        <% end %>
+        <% if previous_scope.present? && show_previous_scope? %>
+          &nbsp;
+          <small class="text-small">
+            <%= t("changed_from", scope: "decidim.proposals.proposals.tags", previous_name: "#{translated_attribute(previous_scope.name)}").html_safe %>
+          </small>
+        <% end %>
+      </li>
     <% end %>
   </ul>
 </figure>