decidim-proposals 0.11.2 → 0.12.0.pre

data/app/models/decidim/proposals/proposal.rb

@@ -14,8 +14,12 @@ module Decidim
       include Decidim::HasAttachments
       include Decidim::Followable
       include Decidim::Proposals::CommentableProposal
+      include Decidim::Searchable
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::Fingerprintable
+
+      fingerprint fields: [:title, :body]
 
       component_manifest_name "proposals"
 
@@ -31,13 +35,22 @@ module Decidim
       scope :rejected, -> { where(state: "rejected") }
       scope :evaluating, -> { where(state: "evaluating") }
       scope :withdrawn, -> { where(state: "withdrawn") }
+      scope :except_rejected, -> { where.not(state: "rejected").or(where(state: nil)) }
       scope :except_withdrawn, -> { where.not(state: "withdrawn").or(where(state: nil)) }
       scope :published, -> { where.not(published_at: nil) }
 
+      searchable_fields(
+        scope_id: :decidim_scope_id,
+        participatory_space: { component: :participatory_space },
+        A: :title,
+        D: :body,
+        datetime: :published_at
+      )
+
       def self.order_randomly(seed)
         transaction do
           connection.execute("SELECT setseed(#{connection.quote(seed)})")
-          order("RANDOM()").load
+          order(Arel.sql("RANDOM()")).load
         end
       end
 
@@ -60,11 +73,18 @@ module Decidim
         endorsements.where(author: user, user_group: user_group).any?
       end
 
+      # Public: Checks if the proposal has been published or not.
+      #
+      # Returns Boolean.
+      def published?
+        published_at.present?
+      end
+
       # Public: Checks if the organization has given an answer for the proposal.
       #
       # Returns Boolean.
       def answered?
-        answered_at.present?
+        answered_at.present? && state.present?
       end
 
       # Public: Checks if the organization has accepted a proposal.

data/app/permissions/decidim/proposals/admin/permissions.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class Permissions < Decidim::DefaultPermissions
+        def permissions
+          # The public part needs to be implemented yet
+          return permission_action if permission_action.scope != :admin
+
+          if create_permission_action?
+            # There's no special condition to create proposal notes, only
+            # users with access to the admin section can do it.
+            allow! if permission_action.subject == :proposal_note
+
+            # Proposals can only be created from the admin when the
+            # corresponding setting is enabled.
+            toggle_allow(admin_creation_is_enabled?) if permission_action.subject == :proposal
+
+            # Proposals can only be answered from the admin when the
+            # corresponding setting is enabled.
+            toggle_allow(admin_proposal_answering_is_enabled?) if permission_action.subject == :proposal_answer
+          end
+
+          # Every user allowed by the space can update the category of the proposal
+          allow! if permission_action.subject == :proposal_category && permission_action.action == :update
+
+          # Every user allowed by the space can import proposals from another_component
+          allow! if permission_action.subject == :proposals && permission_action.action == :import
+
+          permission_action
+        end
+
+        private
+
+        def admin_creation_is_enabled?
+          current_settings.try(:creation_enabled?) &&
+            component_settings.try(:official_proposals_enabled)
+        end
+
+        def admin_proposal_answering_is_enabled?
+          current_settings.try(:proposal_answering_enabled) &&
+            component_settings.try(:proposal_answering_enabled)
+        end
+
+        def create_permission_action?
+          permission_action.action == :create
+        end
+      end
+    end
+  end
+end

data/app/permissions/decidim/proposals/permissions.rb

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class Permissions < Decidim::DefaultPermissions
+      def permissions
+        return permission_action unless user
+
+        # Delegate the admin permission checks to the admin permissions class
+        return Decidim::Proposals::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
+        return permission_action if permission_action.scope != :public
+
+        return permission_action if permission_action.subject != :proposal
+
+        case permission_action.action
+        when :create
+          can_create_proposal?
+        when :edit
+          can_edit_proposal?
+        when :withdraw
+          can_withdraw_proposal?
+        when :endorse
+          can_endorse_proposal?
+        when :unendorse
+          can_unendorse_proposal?
+        when :vote
+          can_vote_proposal?
+        when :unvote
+          can_unvote_proposal?
+        when :report
+          true
+        end
+
+        permission_action
+      end
+
+      private
+
+      def proposal
+        @proposal ||= context.fetch(:proposal, nil)
+      end
+
+      def voting_enabled?
+        return unless current_settings
+        current_settings.votes_enabled? && !current_settings.votes_blocked?
+      end
+
+      def vote_limit_enabled?
+        return unless component_settings
+        component_settings.vote_limit.present? && component_settings.vote_limit.positive?
+      end
+
+      def remaining_votes
+        return 1 unless vote_limit_enabled?
+
+        proposals = Proposal.where(component: component)
+        votes_count = ProposalVote.where(author: user, proposal: proposals).size
+        component_settings.vote_limit - votes_count
+      end
+
+      def can_create_proposal?
+        toggle_allow(authorized?(:create) && current_settings&.creation_enabled?)
+      end
+
+      def can_edit_proposal?
+        toggle_allow(proposal && proposal.editable_by?(user))
+      end
+
+      def can_withdraw_proposal?
+        toggle_allow(proposal && proposal.author == user)
+      end
+
+      def can_endorse_proposal?
+        is_allowed = proposal &&
+                     authorized?(:endorse) &&
+                     current_settings&.endorsements_enabled? &&
+                     !current_settings&.endorsements_blocked?
+
+        toggle_allow(is_allowed)
+      end
+
+      def can_unendorse_proposal?
+        is_allowed = proposal &&
+                     authorized?(:endorse) &&
+                     current_settings&.endorsements_enabled?
+
+        toggle_allow(is_allowed)
+      end
+
+      def can_vote_proposal?
+        is_allowed = proposal &&
+                     authorized?(:vote) &&
+                     voting_enabled? &&
+                     remaining_votes.positive?
+
+        toggle_allow(is_allowed)
+      end
+
+      def can_unvote_proposal?
+        is_allowed = proposal &&
+                     authorized?(:vote) &&
+                     voting_enabled?
+
+        toggle_allow(is_allowed)
+      end
+    end
+  end
+end

data/app/services/decidim/proposals/proposal_search.rb

@@ -56,6 +56,8 @@ module Decidim
           query.evaluating
         when "withdrawn"
           query.withdrawn
+        when "except_rejected"
+          query.except_rejected
         else # Assume 'not_withdrawn'
           query.except_withdrawn
         end

data/app/types/decidim/proposals/proposal_type.rb

@@ -7,11 +7,11 @@ module Decidim
       description "A proposal"
 
       interfaces [
-        Decidim::Comments::CommentableInterface,
-        Decidim::Core::AuthorableInterface,
-        Decidim::Core::CategorizableInterface,
-        Decidim::Core::ScopableInterface,
-        Decidim::Core::AttachableInterface
+        -> { Decidim::Comments::CommentableInterface },
+        -> { Decidim::Core::AuthorableInterface },
+        -> { Decidim::Core::CategorizableInterface },
+        -> { Decidim::Core::ScopableInterface },
+        -> { Decidim::Core::AttachableInterface }
       ]
 
       field :id, !types.ID

data/app/views/decidim/participatory_processes/participatory_process_groups/_proposal.html.erb

@@ -1,27 +1 @@
-<div class="column">
-  <article class="card card--proposal">
-    <div class="card__content">
-      <div class="card__header">
-        <%= link_to resource_locator(proposal).path do %>
-            <h5 class="card__title"><%= proposal.title %></h5>
-        <% end %>
-        <div class="card__author author-data author-data--small">
-          <%= render partial: "decidim/shared/author_reference", locals: { author: present(proposal).author } %>
-        </div>
-        <div class="tech-info tech-info--text-left">
-          <%= t(".creation_date", date: l(proposal.created_at, format: :decidim_short)) %>
-        </div>
-        <%= resource_reference(proposal, class: "tech-info--text-left") %>
-      </div>
-      <%= render partial: "decidim/proposals/proposals/proposal_badge", locals: { proposal: proposal } %>
-      <p><%= truncate(proposal.body, length: 100) %></p>
-      <%= render partial: "decidim/shared/tags", locals: { resource: proposal, tags_class_extra: "tags--proposal" } %>
-    </div>
-    <div class="card__footer">
-      <div class="card__support">
-        <div class="card__support__data"></div>
-        <%= link_to t(".view_proposal"), resource_locator(proposal).path, class: "card__button button small secondary" %>
-      </div>
-    </div>
-  </article>
-</div>
+<%= card_for proposal %>

data/app/views/decidim/participatory_spaces/_proposal.html.erb

@@ -1,27 +1 @@
-<div class="column">
-  <article class="card card--proposal">
-    <div class="card__content">
-      <div class="card__header">
-        <%= link_to resource_locator(proposal).path do %>
-            <h5 class="card__title"><%= proposal.title %></h5>
-        <% end %>
-        <div class="card__author author-data author-data--small">
-          <%= render partial: "decidim/shared/author_reference", locals: { author: present(proposal).author } %>
-        </div>
-        <div class="tech-info tech-info--text-left">
-          <%= t(".creation_date", date: l(proposal.created_at, format: :decidim_short)) %>
-        </div>
-        <%= resource_reference(proposal, class: "tech-info--text-left") %>
-      </div>
-      <%= render partial: "decidim/proposals/proposals/proposal_badge", locals: { proposal: proposal } %>
-      <p><%= truncate(proposal.body, length: 100) %></p>
-      <%= render partial: "decidim/shared/tags", locals: { resource: proposal, tags_class_extra: "tags--proposal" } %>
-    </div>
-    <div class="card__footer">
-      <div class="card__support">
-        <div class="card__support__data"></div>
-        <%= link_to t(".view_proposal"), resource_locator(proposal).path, class: "card__button button small secondary" %>
-      </div>
-    </div>
-  </article>
-</div>
+<%= card_for proposal %>

data/app/views/decidim/proposals/admin/proposal_notes/_proposal_notes.html.erb

@@ -21,7 +21,7 @@
                   </div>
                 </div>
                 <div class="comment__content">
-                  <%= note.body %>
+                  <%= simple_format note.body %>
                 </div>
               </article>
             </div>

data/app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb

@@ -2,10 +2,10 @@
   <%= bulk_actions_dropdown %>
 
   <div id="js-other-actions-wrapper">
-    <%= link_to t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposals_import_path, class: "button tiny button--simple" if can? :manage, current_component %>
+    <%= link_to t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposals_import_path, class: "button tiny button--simple" if allowed_to? :import, :proposals %>
 
-    <% if can? :create, Decidim::Proposals::Proposal %>
-      <%= link_to t("actions.new", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposal_path, class: "button tiny button--simple" if can? :manage, current_component %>
+    <% if allowed_to? :create, :proposal %>
+      <%= link_to t("actions.new", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposal_path, class: "button tiny button--simple" %>
     <% end %>
 
     <%= export_dropdown %>

data/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb

@@ -40,7 +40,7 @@
     </td>
   <% end %>
 
-  <% if can? :create, Decidim::Proposals::ProposalNote %>
+  <% if allowed_to? :create, :proposal_note %>
     <td>
       <%= proposal.proposal_notes_count %>
     </td>
@@ -51,11 +51,11 @@
   </td>
 
   <td class="table-list__actions">
-    <% if can? :create, Decidim::Proposals::ProposalNote %>
+    <% if allowed_to? :create, :proposal_note %>
       <%= icon_link_to "chat", proposal_proposal_notes_path(proposal_id: proposal.id), t("actions.private_notes", scope: "decidim.proposals"), class: "action-icon--index-notes" %>
     <% end %>
 
-    <% if can? :update, proposal %>
+    <% if allowed_to? :create, :proposal_answer %>
      <%= icon_link_to "comment-square", edit_proposal_proposal_answer_path(proposal_id: proposal.id, id: proposal.id), t("actions.answer", scope: "decidim.proposals"), class: "action-icon--edit-answer" %>
    <% end %>
    <%= icon_link_to "eye", resource_locator(proposal).path, t("actions.preview", scope: "decidim.proposals.admin"), class: "action-icon--preview", target: :blank %>

data/app/views/decidim/proposals/admin/proposals/index.html.erb

@@ -48,7 +48,7 @@
               </th>
             <% end %>
 
-            <% if can? :create, Decidim::Proposals::ProposalNote %>
+            <% if allowed_to? :create, :proposal_note %>
               <th>
                 <%= sort_link(query, :proposal_notes_count, t("models.proposal.fields.notes", scope: "decidim.proposals") ) %>
               </th>

data/app/views/decidim/proposals/proposal_endorsements/_identity.html.erb

@@ -1,4 +1,5 @@
 <li class="<%= selected ? "selected" : "" %>" data-method="<%= http_method.to_s.upcase %>" data-url="<%= current_endorsement_url %>">
-  <%= render partial: "decidim/shared/author_reference", locals: { author: identity } %>
+  <%= card_for identity, context: {extra_classes: ["author-data--small"]} %>
+
   <%= icon("circle-check", class: "icon--big #{selected ? '' : 'invisible'}") %>
 </li>

data/app/views/decidim/proposals/proposal_widgets/show.html.erb

@@ -1,4 +1,4 @@
 <% content_for(:title, model.title) %>
 
-<%= render partial: "decidim/proposals/proposals/proposal_badge", locals: { proposal: model } %>
+<%== cell("decidim/proposals/proposal_m", model).badge %>
 <p><%= truncate(model.body, length: 100) %></p>

data/app/views/decidim/proposals/proposals/_endorsements_card_row.html.erb

@@ -4,7 +4,7 @@
     <div class="column small-9 collapse">
       <div class="button-group button-group--collapse button--nomargin small">
         <%= render partial: "endorsements_count", locals: { proposal: @proposal, fully_endorsed: fully_endorsed } %>
-        <% if current_settings.endorsements_blocked? %>
+        <% if current_settings.endorsements_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
           <%= content_tag :span, t(".endorse"), class: "card__button button #{endorsement_button_classes(false)} disabled", disabled: true, title: t(".endorse") %>
         <% elsif current_user %>
           <%= render partial: "endorsement_identities_cabin", locals: { proposal: @proposal, fully_endorsed: fully_endorsed } %>
@@ -16,7 +16,7 @@
   <% end %>
   <div class="column collapse <%= endorsements_enabled? ? "small-3" : "" %>">
     <%= link_to "#comments", class: "button small compact hollow secondary button--nomargin expanded" do %>
-        <%= icon "comment-square", class: "icon--small", aria_label: "Comentarios", role: "img" %> <%= @proposal.comments.count %>
+        <%= icon "comment-square", class: "icon--small", aria_label: t(".comments"), role: "img" %> <%= @proposal.comments.count %>
     <% end %>
   </div>
 </div>

data/app/views/decidim/proposals/proposals/_filters.html.erb

@@ -17,7 +17,7 @@
   <% end %>
 
   <% if component_settings.proposal_answering_enabled && current_settings.proposal_answering_enabled %>
-    <%= form.collection_radio_buttons :state, [["all", t(".all")], ["accepted", t(".accepted")], ["rejected", t(".rejected")], ["evaluating", t(".evaluating")]], :first, :last, legend_title: t(".state") %>
+    <%= form.collection_radio_buttons :state, [["except_rejected", t(".except_rejected")], ["accepted", t(".accepted")], ["evaluating", t(".evaluating")], ["rejected", t(".rejected")], ["all", t(".all")]], :first, :last, legend_title: t(".state") %>
   <% end %>
 
   <% if linked_classes_for(Decidim::Proposals::Proposal).any? %>

data/app/views/decidim/proposals/proposals/_linked_proposals.html.erb

@@ -1,6 +1,5 @@
 <div class="card card--action card--list">
   <% resources.each do |proposal| %>
-    <% next unless proposal.component.published? %>
     <div class="card--list__item">
       <div class="card--list__text">
         <%= link_to resource_locator(proposal).path do %>
@@ -23,11 +22,13 @@
           <% end %>
         </div>
       </div>
-      <div class="card--list__data">
-        <span class="card--list__data__number">
-          <%= proposal.votes.size %>
-        </span> <%= t(".proposal_votes", count: proposal.votes.size) %>
-      </div>
+      <% if !current_settings.try(:votes_hidden?) && !proposal.component.current_settings.votes_hidden? %>
+        <div class="card--list__data">
+          <span class="card--list__data__number">
+            <%= proposal.votes.size %>
+          </span> <%= t(".proposal_votes", count: proposal.votes.size) %>
+        </div>
+      <% end %>
     </div>
   <% end %>
 </div>

data/app/views/decidim/proposals/proposals/_proposal.html.erb

@@ -1,32 +1 @@
-<div class="column">
-  <article class="card card--proposal">
-    <div class="card__content">
-      <div class="card__header">
-        <%= link_to proposal do %>
-          <h5 class="card__title"><%= proposal.title %></h5>
-        <% end %>
-        <div class="card__author">
-          <%= render partial: "decidim/shared/author_reference", locals: { author: present(proposal).author } %>
-        </div>
-        <div class="tech-info tech-info--text-left">
-          <%= t(".creation_date", date: l(proposal.created_at, format: :decidim_short)) %>
-        </div>
-        <%= resource_reference(proposal, class: "tech-info--text-left") %>
-      </div>
-      <%= render partial: "proposal_badge", locals: { proposal: proposal } %>
-      <p><%= truncate(proposal.body, length: 100) %></p>
-      <%= render partial: "decidim/shared/tags", locals: { resource: proposal, tags_class_extra: "tags--proposal" } %>
-    </div>
-    <div class="card__footer">
-      <div class="card__support">
-        <% if current_settings.votes_enabled? && !proposal.draft? %>
-          <%= render partial: "votes_count", locals: { proposal: proposal, from_proposals_list: true } %>
-          <%= render partial: "vote_button", locals: { proposal: proposal, from_proposals_list: true } %>
-        <% else %>
-          <div class="card__support__data"></div>
-          <%= link_to t(".view_proposal"), proposal, class: "card__button button small secondary" %>
-        <% end %>
-      </div>
-    </div>
-  </article>
-</div>
+<%= card_for proposal, from: proposal, context: { current_user: current_user } %>

data/app/views/decidim/proposals/proposals/_proposal_preview.html.erb

@@ -1,36 +1 @@
-<article class="card card--proposal">
-  <div class="card__content">
-    <div class="card__header">
-      <%= link_to proposal, class: "card__link" do %>
-        <h5 class="card__title"><%= proposal.title %></h5>
-      <% end %>
-      <div class="card__author author-data author-data--small">
-        <%= render partial: "decidim/shared/author_reference", locals: { author: present(proposal).author } %>
-      </div>
-    </div>
-    <p><%= truncate(proposal.body, length: 100) %></p>
-    <%= render partial: "decidim/shared/tags", locals: { resource: proposal, tags_class_extra: "tags--proposal" } %>
-  </div>
-  <div class="card__status">
-    <ul class="card-data">
-      <li class="card-data__item">
-        <%= render partial: "proposal_badge", locals: { proposal: proposal } %>
-      </li>
-      <li class="card-data__item">
-        <%= l(proposal.created_at, format: :decidim_short) %>
-      </li>
-      <li class="card-data__item">
-        <a href="#comments">
-          <%= icon "bullhorn", class: "icon--small", role: "img" %>
-          0
-        </a>
-      </li>
-      <li class="card-data__item">
-        <a href="#comments">
-          <%= icon "comment-square", class: "icon--small", role: "img" %>
-            0
-        </a>
-      </li>
-    </ul>
-  </div>
-</article>
+<%= card_for proposal, size: :m, context: { current_user: current_user } %>

data/app/views/decidim/proposals/proposals/_proposal_similar.html.erb

@@ -5,17 +5,18 @@
         <%= link_to proposal, target: "_blank" do %>
           <h5 class="card__title"><%= proposal.title %></h5>
         <% end %>
-        <div class="card__author author-data author-data--small">
-          <%= render partial: "decidim/shared/author_reference", locals: { author: present(proposal).author } %>
-        </div>
+        <%= cell "decidim/author", present(proposal).author, context: {extra_classes: ["author-data--small"]} %>
+
         <div class="tech-info tech-info--text-left">
           <%= t("decidim.proposals.proposals.proposal.creation_date", date: l(proposal.created_at, format: :decidim_short)) %>
         </div>
         <%= resource_reference(proposal, class: "tech-info--text-left") %>
       </div>
-      <%= render partial: "decidim/proposals/proposals/proposal_badge", locals: { proposal: proposal } %>
+
+      <%== cell("decidim/proposals/proposal_m", proposal).badge %>
+
       <p><%= truncate(proposal.body, length: 100) %></p>
-      <%= render partial: "decidim/shared/tags", locals: { resource: proposal, tags_class_extra: "tags--proposal" } %>
+      <%= cell "decidim/tags", proposal, context: {extra_classes: ["tags--proposal"]} %>
     </div>
   </article>
 </div>

data/app/views/decidim/proposals/proposals/_vote_button.html.erb

@@ -1,24 +1,42 @@
-<% unless proposal.rejected? %>
+<% if proposal.rejected? %>
+  <div></div>
+<% else %>
   <div id="proposal-<%= proposal.id %>-vote-button">
     <% if !current_user %>
       <% if current_settings.votes_blocked? %>
-        <%= action_authorized_button_to :vote, t(".votes_blocked"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
+        <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.votes_blocked"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
       <% else %>
-        <%= action_authorized_button_to :vote, t(".vote"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), class: "button #{vote_button_classes(from_proposals_list)}", data: { disable: true, "redirect-url": proposal_path(proposal) } %>
+        <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.vote"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), class: "button #{vote_button_classes(from_proposals_list)}", data: { disable: true, "redirect-url": proposal_path(proposal) } %>
       <% end %>
     <% else %>
       <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
-        <%= action_authorized_button_to :vote, t(".already_voted"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), method: :delete, remote: true, data: { disable: true, original: t(".already_voted"), replace: t(".already_voted_hover"), "redirect-url": proposal_path(proposal) }, class: "button #{vote_button_classes(from_proposals_list)} success", id: "vote_button" %>
+        <%= action_authorized_button_to(
+          :vote,
+          proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list),
+          method: :delete,
+          remote: true,
+          data: {
+            disable: true,
+            original: t("decidim.proposals.proposals.vote_button.already_voted"),
+            replace: t("decidim.proposals.proposals.vote_button.already_voted_hover"),
+            "redirect-url": proposal_path(proposal)
+          },
+          class: "button #{vote_button_classes(from_proposals_list)} success light",
+          id: "vote_button"
+        ) do %>
+          <%= icon("check", class: "icon--small") %>
+          <%= t("decidim.proposals.proposals.vote_button.already_voted") %>
+        <% end %>
       <% else %>
-        <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold %>
-          <%= content_tag :span, t(".maximum_votes_reached"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
+        <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
+          <%= content_tag :span, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
         <% else %>
           <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
-            <%= content_tag :span, t(".no_votes_remaining"), class: "button #{vote_button_classes(from_proposals_list)}", disabled: true %>
-          <% elsif current_settings.votes_blocked? %>
-            <%= content_tag :span, t(".votes_blocked"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
+            <%= content_tag :span, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: "button #{vote_button_classes(from_proposals_list)}", disabled: true %>
+          <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
+            <%= content_tag :span, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
           <% else %>
-            <%= action_authorized_button_to :vote, t(".vote"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true, "redirect-url": proposal_path(proposal) }, class: "button #{vote_button_classes(from_proposals_list)}" %>
+            <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.vote"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true, "redirect-url": proposal_path(proposal) }, class: "button #{vote_button_classes(from_proposals_list)}" %>
           <% end %>
         <% end %>
       <% end %>

data/app/views/decidim/proposals/proposals/_votes_count.html.erb

@@ -1,28 +1,14 @@
-<div id="proposal-<%= proposal.id %>-votes-count" class="card__support__data">
-  <% if !current_settings.votes_hidden? %>
-    <% progress ||= proposal.proposal_votes_count || 0 %>
-    <% total ||= proposal.maximum_votes || 0 %>
-    <% percent = (progress.to_f/total) * 100 %>
-    <% vertical ||= from_proposals_list %>
-    <div class="progress__bar<%= (!vertical) ? " progress__bar--vertical" : "" %>">
-      <div class="progress__bar__title">
-        <span class="progress__bar__number"><%= progress %></span><%= "/#{total}" if total != 0 %>
-        <span class="progress__bar__text"><%= t(".count", count: proposal.proposal_votes_count) %></span>
-      </div>
-      <% if total != 0 %>
-        <div class="progress progress__bar__bar" role="progressbar" tabindex="0" aria-valuenow="<%= percent %>" aria-valuemin="0" aria-valuetext="<%= percent %> percent" aria-valuemax="100">
-          <div class="progress-meter progress__bar__bar--complete" style="width: <%= percent %>%"></div>
-          <div class="progress__bar__bar--incomplete" style="width:calc(100% - <%= percent %>%);"></div>
-        </div>
-        <div class="progress__bar__subtitle">
-          <% if progress >= total %>
-            <%= t(".most_popular_proposal") %>
-          <% else %>
-            <%= t(".need_more_votes") %>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
-
-  <% end %>
-</div>
+<% if !current_settings.votes_hidden? && current_component.participatory_space.can_participate?(current_user) %>
+  <% progress ||= proposal.proposal_votes_count || 0 %>
+  <% total ||= proposal.maximum_votes || 0 %>
+  <% subtitle_text = progress >= total ? t("decidim.proposals.proposals.votes_count.most_popular_proposal") : t("decidim.proposals.proposals.votes_count.need_more_votes") %>
+  <%= cell(
+    "decidim/progress_bar",
+    progress,
+    total: total,
+    units_name: "decidim.proposals.proposals.votes_count.count",
+    element_id: "proposal-#{proposal.id}-votes-count",
+    subtitle_text: subtitle_text,
+    small: from_proposals_list
+  ) %>
+<% end %>