decidim-proposals 0.27.6 → 0.28.0.rc4

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

@@ -1,128 +1,58 @@
-<% add_decidim_page_title(Decidim::Proposals::CollaborativeDraft.model_name.human(count: 2)) %>
+<% add_decidim_page_title(t("name", scope: "decidim.proposals.collaborative_drafts")) %>
 <% add_decidim_meta_tags({
-  description: present(@collaborative_draft).body,
-  title: present(@collaborative_draft).title,
-  url: collaborative_draft_url(@collaborative_draft.id)
-}) %>
+                           description: present(@collaborative_draft).body,
+                           title: present(@collaborative_draft).title,
+                           url: collaborative_draft_url(@collaborative_draft.id)
+                         }) %>
 
-<% if current_user.nil? || allowed_to?(:request_access, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
-  <div class="row">
-    <div class="columns">
-      <div class="callout secondary"><%= t(".info-message").html_safe %></div>
-    </div>
-  </div>
-<% end %>
+<%= append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
+<%= append_javascript_pack_tag "decidim_proposals" %>
 
-<div class="row column view-header">
-  <div class="m-bottom">
-    <%= link_to collaborative_drafts_path do %>
-      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-      <%= t(".back") %>
-    <% end %>
-  </div>
-
-  <h2 class="heading2">
-    <%= present(@collaborative_draft).title(links: true, html_escape: true) %>
-  </h2>
+<% content_for :aside do %>
+  <%= render partial: "collaborative_draft_aside" %>
+<% end %>
 
-  <%= cell("decidim/coauthorships", @collaborative_draft, has_actions: true, size: 3, context: { current_user: current_user }) %>
-</div>
+<%= render layout: "layouts/decidim/shared/layout_item", locals: { back_path: collaborative_drafts_path } do %>
 
-<div class="row">
-  <div class="columns mediumlarge-8 large-9">
-    <div class="section">
-      <%== cell("decidim/proposals/collaborative_draft_m", @collaborative_draft, full_badge: true).badge %>
+  <section class="layout-main__section layout-main__heading">
+    <%= cell("decidim/announcement", t("info-message", scope: "decidim.proposals.collaborative_drafts.show").html_safe) if current_user.nil? || allowed_to?(:request_access, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
 
-      <%= decidim_sanitize_editor present(@collaborative_draft).body(links: true) %>
+    <h1 class="h2 decorator"><%= present(@collaborative_draft).title(links: true, html_escape: true) %></h1>
 
-      <% if component_settings.geocoding_enabled? %>
+    <% if component_settings.geocoding_enabled? %>
+      <div class="static-map__container">
         <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @collaborative_draft } %>
-      <% end %>
-
-      <%= cell "decidim/tags", @collaborative_draft, context: { extra_classes: ["tags--collaborative-draft"] } %>
-    </div>
-  </div>
-
-  <div class="columns section view-side mediumlarge-4 large-3">
-    <% if allowed_to?(:publish, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
-      <div class="card text-center" id="collaborative_draft_publish">
-        <div class="card__content">
-          <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :publish %>
-          <div class="text-small">
-            <%= t("publish_info", scope:"decidim.proposals.collaborative_drafts.show") %>
-            <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :withdraw %>
-          </div>
-        </div>
       </div>
     <% end %>
 
-    <div class="card text-center">
-      <div class="card__content">
-        <% if @collaborative_draft.published? %>
-          <%= cell "decidim/proposals/collaborative_draft_link_to_proposal", @collaborative_draft %>
-        <% else %>
-          <div>
-            <%= resource_version_number(@collaborative_draft.versions_count, "text-large") %>
-            <div class="text-medium">
-              <%= resource_version_of(@collaborative_draft.versions_count) %>
-            </div>
-          </div>
+    <div class="layout-author">
+      <%= cell "decidim/coauthorships", @collaborative_draft %>
 
-          <div>
-            <span class="text-medium">
-              <%= link_to_other_resource_versions(collaborative_draft_versions_path(@collaborative_draft)) %>
-            </span>
-          </div>
-        <% end %>
-
-        <% if allowed_to?(:edit, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
-          <%= link_to t("edit", scope:"decidim.proposals.collaborative_drafts.show"), edit_collaborative_draft_path(@collaborative_draft), class: "button hollow expanded button--sc mt-s", id: "collaborative_draft_edit" %>
-        <% end %>
-
-        <%= render "request_access_form" %>
-
-        <% if @collaborative_draft.requesters.include? current_user %>
-          <button type="button" class="button expanded button--sc mt-s">
-            <%= t("requested_access", scope:"decidim.proposals.collaborative_drafts.show") %>
-          </button>
-        <% end %>
-      </div>
-
-      <div class="card__status">
-        <ul class="card-data">
-          <li class="card-data__item authors_status">
-            <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.authors") do %>
-              <%= icon("people", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.versions.group_by(&:whodunnit).size}" %>
-            <% end %>
-          </li>
+      <% if @collaborative_draft.state %>
+        <span class="<%= collaborative_drafts_state_class(@collaborative_draft.state) %> label">
+          <%= humanize_collaborative_draft_state(@collaborative_draft.state) %>
+        </span>
+      <% end %>
+    </div>
+  </section>
 
-          <li class="card-data__item versions_status">
-            <%= link_to collaborative_draft_versions_path(@collaborative_draft) do %>
-              <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.contributions") do %>
-                <%= icon("pencil", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.versions.count}" %>
-              <% end %>
-            <% end %>
-          </li>
-          <li class="card-data__item">
-            <%= link_to "#comments" do %>
-              <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.comments") do %>
-                <%= icon("comment-square", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.comments_count}" %>
-              <% end %>
-            <% end %>
-          </li>
-        </ul>
-      </div>
+  <section class="layout-main__section">
+    <div class="editor-content">
+      <%= decidim_sanitize_editor present(@collaborative_draft).body(links: true) %>
     </div>
+  </section>
 
-    <%= render partial: "collaborator_requests" %>
+  <%= attachments_for @collaborative_draft %>
 
-    <%= resource_reference(@collaborative_draft) %>
+  <%= render partial: "actions" %>
 
-    <%= render partial: "decidim/shared/share_modal" %>
-  </div>
-</div>
+  <% content_for :item_footer do %>
+    <%= comments_for @collaborative_draft %>
 
-<%= attachments_for @collaborative_draft %>
-<%= comments_for @collaborative_draft %>
+    <ul class="metadata__container layout-main__section" data-metadata-footer>
+      <%= content_tag :li, resource_reference(@collaborative_draft), class: "metadata__item" %>
+      <%= content_tag :li, resource_version(@collaborative_draft, versions_path: collaborative_draft_version_path(@collaborative_draft, @collaborative_draft.versions.count)), class: "metadata__item" %>
+    </ul>
+  <% end %>
 
-<%= cell("decidim/flag_modal", @collaborative_draft) %>
+<% end %>

data/app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb

@@ -3,13 +3,13 @@
     var $proposalVotesCount = $('#proposal-<%= proposal.id %>-votes-count');
 
     if($proposalVotesCount[0]) {
-      morphdom($proposalVotesCount[0], '<%= j(render partial: "decidim/proposals/proposals/votes_count", locals: { proposal: proposal, from_proposals_list: @from_proposals_list }).strip.html_safe %>');
+      morphdom($proposalVotesCount[0], '<%= j(render partial: "decidim/proposals/proposals/votes_count", locals: { proposal:, from_proposals_list: @from_proposals_list }).strip.html_safe %>');
     }
 
     var $proposalVoteButton = $('#proposal-<%= proposal.id %>-vote-button');
 
     if($proposalVoteButton[0]) {
-      morphdom($proposalVoteButton[0], '<%= j(render partial: "decidim/proposals/proposals/vote_button", locals: { proposal: proposal, from_proposals_list: @from_proposals_list }).strip.html_safe %>');
+      morphdom($proposalVoteButton[0], '<%= j(render partial: "decidim/proposals/proposals/vote_button", locals: { proposal:, from_proposals_list: @from_proposals_list }).strip.html_safe %>');
     }
   })();
 <% end %>

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

@@ -0,0 +1,13 @@
+<section class="layout-main__section layout-main__buttons" data-buttons>
+  <% if endorsements_enabled? %>
+    <%= endorsement_buttons_cell(@proposal) %>
+  <% end %>
+
+  <%= cell "decidim/comments_button", nil %>
+
+  <div class="ml-auto">
+    <%= cell "decidim/tags", @proposal %>
+  </div>
+</section>
+
+<%= cell "decidim/endorsers_list", @proposal, layout: :full %>

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

@@ -1,92 +1,53 @@
-<%= form_required_explanation %>
+<%= form.text_field :title, class: "js-hashtags", value: form_presenter.title %>
 
-<div class="field hashtags__container">
-  <%= form.text_field :title, class: "js-hashtags", value: form_presenter.title %>
-</div>
-
-<div class="field hashtags__container">
-  <%= text_editor_for_proposal_body(form) %>
-</div>
+<%= text_editor_for_proposal_body(form) %>
 
 <% if @form.component_automatic_hashtags.any? %>
-  <div class="field">
-    <%= form.label :automatic_hashtags %>
-    <div class="checkboxes hashtags">
-      <% @form.component_automatic_hashtags.each do |hashtag| %>
-        <label>
-          <%= check_box_tag "", "", { checked: true }, { disabled: true } %>#<%= hashtag %>
-        </label>
-      <% end %>
-    </div>
-  </div>
+  <%= field_set_tag form.label(:automatic_hashtags, nil, for: nil) do %>
+    <% @form.component_automatic_hashtags.each do |hashtag| %>
+      <%= form.check_box "", checked: true, disabled: true, label: "##{hashtag}", label_options: { class: "form__wrapper-checkbox-label" } %>
+    <% end %>
+  <% end %>
 <% end %>
 
 <% if @form.component_suggested_hashtags.any? %>
-  <div class="field">
-    <%= form.label :suggested_hashtags, nil, for: nil %>
-    <div class="checkboxes hashtags">
-      <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map { |hashtag| [hashtag.downcase, "##{hashtag}"] }, :first, :last do |option|
-        option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
-      end %>
-    </div>
-  </div>
+  <%= field_set_tag form.label(:suggested_hashtags, nil, for: nil) do %>
+    <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map { |hashtag| [hashtag.downcase, "##{hashtag}"] }, :first, :last, { legend_title: "hey ho" } do |option|
+          option.label(class: "form__wrapper-checkbox-label") { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
+        end %>
+  <% end %>
 <% end %>
 
 <% if @form.geocoding_enabled? %>
-  <div class="field">
-    <%= form.check_box :has_address, checked: form_has_address? %>
-  </div>
+  <%= form.geocoding_field :address, placeholder: t("decidim.proposals.proposals.placeholder.address") %>
 
-  <div class="field" id="address_input">
-    <%= form.geocoding_field :address, placeholder: t("decidim.proposals.proposals.placeholder.address") %>
-    <div class="map" id="address_map">
-      <%= render partial: "dynamic_map_instructions" %>
-      <%= dynamic_map_for proposal_preview_data_for_map(@proposal) %>
-    </div>
+  <div id="address_map" class="proposal__container">
+    <p class="help-text">
+      <%= t("instructions", scope: "decidim.proposals.proposals.dynamic_map_instructions") %> <%= t("description", scope: "decidim.proposals.proposals.dynamic_map_instructions") %>
+    </p>
+    <%= dynamic_map_for proposal_preview_data_for_map(@proposal) %>
   </div>
 <% end %>
 
 <% if @form.categories&.any? %>
-  <div class="field">
-    <%= form.categories_select :category_id, @form.categories, include_blank: t("decidim.proposals.proposals.edit.select_a_category") %>
-  </div>
+  <%= form.categories_select :category_id, @form.categories, include_blank: t("decidim.proposals.proposals.edit.select_a_category") %>
 <% end %>
 
 <% if current_component.has_subscopes? %>
-  <div class="field">
-    <%= scopes_picker_field form, :scope_id, root: current_component.scope %>
-  </div>
-<% end %>
-
-<% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
-  <div class="field">
-    <%= user_group_select_field form, :user_group_id %>
-  </div>
+  <%= scopes_select_field form, :scope_id, root: current_component.scope %>
 <% end %>
 
 <% if component_settings.attachments_allowed? && @proposal %>
-  <fieldset class="gallery__container photos_container">
-    <legend><%= t("gallery_legend", scope: "decidim.proposals.proposals.edit") %></legend>
-    <div class="row column">
-      <%= form.attachment :photos,
-        multiple: false,
-        label: t("decidim.proposals.proposals.edit.add_image"),
-        button_label: t("decidim.proposals.proposals.edit.add_image"),
-        button_edit_label: t("decidim.proposals.proposals.edit.edit_image"),
-        help_i18n_scope: "decidim.forms.file_help.image",
-        extension_allowlist: Decidim::OrganizationSettings.for(current_organization).upload_allowed_file_extensions_image %>
-    </div>
-  </fieldset>
+  <%= form.attachment :documents,
+                      multiple: true,
+                      label: t("decidim.proposals.proposals.edit.add_documents"),
+                      button_label: t("decidim.proposals.proposals.edit.add_documents"),
+                      button_edit_label: t("decidim.proposals.proposals.edit.edit_documents"),
+                      button_class: "button button__lg button__transparent-secondary w-full",
+                      help_i18n_scope: "decidim.forms.file_help.file",
+                      help_text: t("attachment_legend", scope: "decidim.proposals.proposals.edit") %>
+<% end %>
 
-  <fieldset class="attachments_container gallery__container documents_container">
-    <legend><%= t("attachment_legend", scope: "decidim.proposals.proposals.edit") %></legend>
-    <div class="row column">
-      <%= form.attachment :documents,
-        multiple: true,
-        label: t("decidim.proposals.proposals.edit.add_documents"),
-        button_label: t("decidim.proposals.proposals.edit.add_documents"),
-        button_edit_label: t("decidim.proposals.proposals.edit.edit_documents"),
-        help_i18n_scope: "decidim.forms.file_help.file" %>
-    </div>
-  </fieldset>
+<% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
+  <%= user_group_select_field form, :user_group_id %>
 <% end %>

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

@@ -1,35 +1,3 @@
-<div class="card card--action card--list">
-  <% resources.each do |proposal| %>
-    <div class="card--list__item">
-      <div class="card--list__text">
-        <%= link_to resource_locator(proposal).path do %>
-          <%= icon "proposals", class: "card--list__icon", remove_icon_class: true %>
-        <% end %>
-        <div>
-          <%= link_to resource_locator(proposal).path, class: "card__link" do %>
-            <h5 class="card--list__heading"><%== decidim_html_escape(present(proposal).title) %></h5>
-          <% end %>
-          <% present(proposal) do |proposal| %>
-            <div class="author">
-              <span class="author__avatar">
-                <%= image_tag proposal.author.avatar_url %>
-              </span>
-              <span class="author__name">
-                <strong><%= proposal.author.name %></strong>
-                <%= proposal.author.nickname %>
-              </span>
-            </div>
-          <% end %>
-        </div>
-      </div>
-      <% if !current_settings.try(:votes_hidden?) && !proposal.component.current_settings.votes_hidden? &&
-      proposal.component.current_settings.votes_enabled? %>
-        <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>
+<% resources.each do |proposal| %>
+  <%= cell "decidim/proposals/proposal_l", proposal, url_extra_params: { included_in: resource.to_gid } %>
+<% end %>

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

@@ -0,0 +1,40 @@
+<% if current_settings.votes_enabled? && (show_endorsements_card? || current_user) %>
+<section class="layout-aside__section">
+  <div class="proposal__aside-vote">
+    <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } unless @proposal.withdrawn? %>
+    <%= render partial: "votes_count", locals: { proposal: @proposal, from_proposals_list: false } %>
+  </div>
+</section>
+<% end %>
+
+<% if (@proposal.amendable? && allowed_to?(:edit, :proposal, proposal: @proposal)) || (amendments_enabled? && @proposal.amendable? && current_component.current_settings.amendment_creation_enabled && can_participate_in_private_space?) || amendments_enabled? && can_react_to_emendation?(@proposal) || @proposal.withdrawable_by?(current_user) %>
+<section class="layout-aside__section layout-aside__buttons">
+  <% if @proposal.amendable? && allowed_to?(:edit, :proposal, proposal: @proposal) %>
+    <%= link_to t("edit_proposal", scope: "decidim.proposals.proposals.show"), edit_proposal_path(@proposal), class: "button button__sm button__transparent-secondary w-full" %>
+  <% else %>
+    <%= amend_button_for @proposal %>
+  <% end %>
+
+  <% if amendments_enabled? && can_react_to_emendation?(@proposal) %>
+    <%= emendation_actions_for @proposal %>
+  <% end %>
+
+  <% if @proposal.withdrawable_by?(current_user) %>
+    <%= action_authorized_link_to :withdraw, withdraw_proposal_path(@proposal), method: :put, class: "button button__sm button__transparent-secondary w-full", title: t("withdraw_btn_hint", scope: "decidim.proposals.proposals.show" ), data: { confirm: t("withdraw_confirmation_html", scope: "decidim.proposals.proposals.show" ) } do %>
+      <span><%= t("withdraw_proposal", scope: "decidim.proposals.proposals.show") %></span>
+      <%= icon "pencil-line" %>
+    <% end %>
+  <% end %>
+</section>
+<% end %>
+
+<section class="layout-aside__section">
+  <%= cell "decidim/proposals/proposal_link_to_collaborative_draft", @proposal %>
+  <%= cell "decidim/proposals/proposal_link_to_rejected_emendation", @proposal %>
+</section>
+
+<section class="layout-aside__section actions__secondary">
+  <%= follow_button_for(@proposal) %>
+  <%= cell "decidim/share_button", nil %>
+  <%= cell "decidim/report_button", @proposal %>
+</section>

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

@@ -1,46 +1,25 @@
 <% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
-  <div class="callout warning">
-    <%= t("decidim.proposals.proposals.index.text_banner",
-          go_back_link: link_to(t("decidim.proposals.proposals.index.click_here"), proposals_path("filter[with_availability]" => nil)),
-          ).html_safe %>
-  </div>
+  <%= cell("decidim/announcement", t("decidim.proposals.proposals.index.text_banner",
+                                     go_back_link: link_to(t("decidim.proposals.proposals.index.click_here"), proposals_path("filter[with_availability]" => nil))
+  ).html_safe, callout_class: "warning [&>a]:text-secondary") %>
 <% end %>
 
-<div class="collection-sort-controls row small-up-1 medium-up-3 card-grid">
-  <div class="column">
-    <%= order_selector available_orders, i18n_scope: "decidim.proposals.proposals.orders" %>
-  </div>
+<% if @proposals.empty? %>
+  <%= cell("decidim/announcement", params[:filter].present? ? t(".empty_filters") : t(".empty")) %>
+<% else %>
+  <h2 class="h5 md:h3 decorator"><%= t("count", scope: "decidim.proposals.proposals.index", count: @proposals.total_count) %></h2>
 
-  <div class="column">
-    <%= render partial: "decidim/shared/results_per_page" %>
-  </div>
-</div>
+  <%= order_selector available_orders, i18n_scope: "decidim.proposals.proposals.orders" %>
 
-<div class="row small-up-1 medium-up-2 card-grid">
-  <%= render @proposals %>
-</div>
-
-<div class="row">
-  <div class="columns mediumlarge-8 large-9">
-    <% if @proposals.empty? %>
-      <div class="callout secondary">
-        <% if params[:filter].present? %>
-          <p><%= t(".empty_filters") %></p>
-        <% else %>
-          <p><%= t(".empty") %></p>
-        <% end %>
-      </div>
-    <% end %>
+  <div class="card__list-list">
+    <%= render @proposals %>
   </div>
-</div>
-<%= decidim_paginate @proposals %>
 
-<div class="row">
-  <div class="text-right">
-    <% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
-      <%= link_to t("decidim.proposals.proposals.index.see_all"), proposals_path("filter[with_availability]" => nil) %>
-    <% else %>
-      <%= link_to t("decidim.proposals.proposals.index.see_all_withdrawn"), proposals_path(filter: { with_availability: "withdrawn", with_any_state: [] }) %>
-    <% end %>
-  </div>
-</div>
+  <%= decidim_paginate @proposals %>
+<% end %>
+
+<% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
+  <%= link_to t("decidim.proposals.proposals.index.see_all"), proposals_path("filter[with_availability]" => nil), class: "button button__sm button__text-secondary" %>
+<% else %>
+  <%= link_to t("decidim.proposals.proposals.index.see_all_withdrawn"), proposals_path(filter: { with_availability: "withdrawn", with_any_state: [] }), class: "button button__sm button__text-secondary" %>
+<% end %>

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

@@ -0,0 +1,5 @@
+<%# NOTE: The pack_tag do not work as expected, when they are INSIDE the cell, therefore, we create a partial to do so %>
+<%= append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
+<%= append_javascript_pack_tag "decidim_proposals" %>
+
+<%= cell "decidim/proposals/proposals_picker", current_component, form:, field: %>

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

@@ -1,3 +1,3 @@
-<span id="remaining-votes-count" class="extra__suport-number">
-  <%= remaining_votes_count_for(current_user) %>
-</span>
+<div id="remaining-votes-count">
+  <%= t("votes", scope: "decidim.proposals.proposals.voting_rules.vote_limit", number: remaining_votes_count_for(current_user)) %>
+</div>

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

@@ -1,24 +1,24 @@
-<% if proposal.rejected? || proposal.withdrawn? %>
-  <div></div>
-<% else %>
+<% button_classes = "button button__lg button__secondary w-full" %>
+
+<% unless proposal.rejected? || proposal.withdrawn? %>
   <% if component_settings.participatory_texts_enabled? && from_proposals_list %>
-    <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_vote_button", locals: { proposal: proposal, from_proposals_list: true } %>
+    <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_vote_button", locals: { proposal:, from_proposals_list: true } %>
   <% else %>
-    <div id="proposal-<%= proposal.id %>-vote-button" class="button--vote-button">
+    <div id="proposal-<%= proposal.id %>-vote-button">
       <% if !current_user %>
         <% if current_settings.votes_blocked? %>
-          <%= 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), resource: proposal, 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:), resource: proposal, class: button_classes, disabled: true %>
         <% else %>
-          <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, class: "button #{vote_button_classes(from_proposals_list)}", data: { disable: true, "redirect-url": proposal_path(proposal) } do %>
+          <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list:), resource: proposal, class: button_classes, data: { disable: true, "redirect-url": proposal_path(proposal) } do %>
             <%= t("decidim.proposals.proposals.vote_button.vote") %>
-            <span class="show-for-sr"><%= decidim_html_escape(present(proposal).title) %></span>
+            <span class="sr-only"><%= decidim_html_escape(present(proposal).title) %></span>
           <% end %>
         <% end %>
       <% else %>
         <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
           <%= action_authorized_button_to(
             :vote,
-            proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list),
+            proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list:),
             resource: proposal,
             method: :delete,
             remote: true,
@@ -28,25 +28,24 @@
               replace: t("decidim.proposals.proposals.vote_button.already_voted_hover"),
               "redirect-url": proposal_path(proposal)
             },
-            class: "button #{vote_button_classes(from_proposals_list)} active light",
+            class: "#{button_classes} is-hover",
             id: "vote_button-#{proposal.id}"
           ) do %>
-            <%= icon("check", class: "icon--small") %>
             <%= t("decidim.proposals.proposals.vote_button.already_voted") %>
-            <span class="show-for-sr"><%= decidim_html_escape(present(proposal).title) %></span>
+            <span class="sr-only"><%= decidim_html_escape(present(proposal).title) %></span>
           <% end %>
         <% else %>
           <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
-            <%= content_tag :button, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
+            <%= content_tag :button, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: button_classes, disabled: true %>
           <% else %>
             <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
-              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: "button #{vote_button_classes(from_proposals_list)}", disabled: true %>
+              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: button_classes, disabled: true %>
             <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
-              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
+              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: button_classes, disabled: true %>
             <% else %>
-              <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, remote: true, data: { disable: true, "redirect-url": proposal_path(proposal) }, class: "button #{vote_button_classes(from_proposals_list)}" do %>
+              <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list:), resource: proposal, remote: true, data: { disable: true, "redirect-url": proposal_path(proposal) }, class: button_classes do %>
                 <%= t("decidim.proposals.proposals.vote_button.vote") %>
-                <span class="show-for-sr"><%= decidim_html_escape(present(proposal).title) %></span>
+                <span class="sr-only"><%= decidim_html_escape(present(proposal).title) %></span>
               <% end %>
             <% end %>
           <% end %>

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

@@ -1,18 +1,15 @@
 <% if !current_settings.votes_hidden? && current_component.participatory_space.can_participate?(current_user) %>
   <% if component_settings.participatory_texts_enabled? && from_proposals_list %>
-    <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_votes_count", locals: { proposal: proposal, from_proposals_list: true } %>
+    <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_votes_count", locals: { proposal:, from_proposals_list: true } %>
   <% else %>
     <% 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,
+      total:,
       units_name: "decidim.proposals.proposals.votes_count.count",
-      element_id: "proposal-#{proposal.id}-votes-count",
-      subtitle_text: subtitle_text,
-      small: from_proposals_list
+      element_id: "proposal-#{proposal.id}-votes-count"
     ) %>
   <% end %>
 <% end %>