decidim-proposals 0.21.0 → 0.22.0

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

@@ -1,29 +1,31 @@
+<%= render partial: "decidim/shared/filter_form_help", locals: { skip_to_id: "collaborative_drafts" } %>
+
 <%= filter_form_for filter do |form| %>
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search") %>
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
-          <button type="submit" class="button button--muted">
-            <%= icon "magnifying-glass", aria_label: t(".search") %>
+          <button type="submit" class="button" aria-controls="collaborative_drafts">
+            <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
           </button>
         </div>
       </div>
     </div>
   </div>
 
-  <%= form.check_boxes_tree :state, filter_collaborative_drafts_state_values, legend_title: t(".state") %>
+  <%= form.check_boxes_tree :state, filter_collaborative_drafts_state_values, legend_title: t(".state"), "aria-controls": "collaborative_drafts" %>
 
   <% if linked_classes_for(Decidim::Proposals::CollaborativeDraft).any? %>
-    <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::CollaborativeDraft), :first, :last, legend_title: t(".related_to") %>
+    <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::CollaborativeDraft), :first, :last, { legend_title: t(".related_to") }, "aria-controls": "collaborative_drafts" %>
   <% end %>
 
   <% if current_participatory_space.has_subscopes? %>
-    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope") %>
+    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "collaborative_drafts" %>
   <% end %>
 
   <% if current_component.categories.any? %>
-    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category") %>
+    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "collaborative_drafts" %>
   <% end %>
 
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>

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

@@ -1,11 +1,11 @@
 <% if current_settings.creation_enabled %>
-  <%= action_authorized_link_to :create, new_collaborative_draft_path, class: "title-action__action button small hollow", data: { "redirect_url" => new_collaborative_draft_path } do %>
+  <%= action_authorized_link_to :create, new_collaborative_draft_path, class: "title-action__action button small", data: { "redirect_url" => new_collaborative_draft_path } do %>
     <%= t(".new_collaborative_draft") %>
-    <%= icon "plus" %>
+    <%= icon "plus", role: "img", "aria-hidden": true %>
   <% end %>
 <% else %>
-  <span class="title-action__action button small hollow disabled">
+  <span class="title-action__action button small disabled">
     <%= t(".new_collaborative_draft") %>
-    <%= icon "plus" %>
+    <%= icon "plus", role: "img", "aria-hidden": true %>
   </span>
 <% end %>

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

@@ -4,7 +4,7 @@
     <%= form.hidden_field :state, value: @collaborative_draft.state %>
     <%= form.hidden_field :requester_user_id, value: requester.id %>
     <%= button_tag type: "submit", data: { disable: true }, title: reject_request_button_label do %>
-      <%= icon "x", class: "icon--small muted ml-xs" %>
+      <%= icon "x", class: "icon--small muted ml-xs", aria_label: reject_request_button_label, role: "img" %>
     <% end %>
   <% end %>
 <% end %>

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

@@ -1,8 +1,8 @@
 <div class="columns large-3">
   <div class="m-bottom">
     <%= link_to :back do %>
-      <%= icon "chevron-left", class: "icon--small" %>
-      <%= wizard_aside_back_text %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+      <%= wizard_aside_back_text("collaborative_draft") %>
     <% end %>
   </div>
   <div class="section">
@@ -11,6 +11,8 @@
     </p>
   </div>
   <div class="show-for-large">
+    <div><%= proposal_wizard_steps_title %></div>
+    <div><%= proposal_wizard_current_step_of(@step) %></div>
     <%= proposal_wizard_stepper(@step) %>
   </div>
 </div>

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
+
 <div class="row">
   <%= render partial: "wizard_aside" %>
 

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
+
 <div class="row">
   <%= render partial: "wizard_aside" %>
 

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

@@ -1,6 +1,8 @@
+<% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
+
 <div class="row columns">
   <%= link_to :back, class: "muted-link" do %>
-    <%= icon "chevron-left", class: "icon--small" %>
+    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
     <%= t(".back") %>
   <% end %>
   <h2 class="section-heading"><%= t(".title") %></h2>

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(Decidim::Proposals::CollaborativeDraft.model_name.human(count: 2)) %>
+
 <%= render partial: "decidim/shared/component_announcement" %>
 
 <div class="row columns">
@@ -15,9 +17,9 @@
       <%= render partial: "filters" %>
     </div>
   </div>
-  <div id="collaborative_drafts" class="columns mediumlarge-8 large-9">
+  <div id="collaborative_drafts" class="columns mediumlarge-8 large-9" aria-live="polite">
     <%= render partial: "collaborative_drafts" %>
   </div>
 </div>
 <%= javascript_include_tag "decidim/filters" %>
-<%= javascript_include_tag "decidim/orders" %>
+<%= javascript_include_tag "decidim/results_listing" %>

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
+
 <div class="row">
   <%= render partial: "wizard_aside" %>
 
@@ -7,6 +9,8 @@
     <div class="card">
       <div class="card__content">
         <%= decidim_form_for(@form, url: compare_collaborative_drafts_path, method: :get) do |form| %>
+          <%= form_required_explanation %>
+
           <div class="field">
             <%= form.text_field :title %>
           </div>

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

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(Decidim::Proposals::CollaborativeDraft.model_name.human(count: 2)) %>
 <% add_decidim_meta_tags({
   description: present(@collaborative_draft).body,
   title: present(@collaborative_draft).title,
@@ -14,7 +15,7 @@
 
 <div class="row column view-header">
   <%= link_to collaborative_drafts_path do %>
-    <%= icon "chevron-left", class: "icon--small" %>
+    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
     <%= t(".back") %>
   <% end %>
 
@@ -26,15 +27,29 @@
 </div>
 
 <div class="row">
-  <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
+  <div class="columns mediumlarge-8 large-9">
+    <div class="section">
+      <%== cell("decidim/proposals/collaborative_draft_m", @collaborative_draft, full_badge: true).badge %>
+
+      <%= simple_format(present(@collaborative_draft).body(links: true, strip_tags: true), nil, sanitize: false) %>
+
+      <% if component_settings.geocoding_enabled? %>
+        <%= 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 %>
-          <small>
+          <div class="text-small">
             <%= t("publish_info", scope:"decidim.proposals.collaborative_drafts.show") %>
             <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :withdraw %>
-          </small>
+          </div>
         </div>
       </div>
     <% end %>
@@ -45,29 +60,27 @@
           <%= cell "decidim/proposals/collaborative_draft_link_to_proposal", @collaborative_draft %>
         <% else %>
           <div>
-            <strong class="text-large text-uppercase">
-              <%= t("version", scope:"decidim.proposals.collaborative_drafts.show", number: "#{@collaborative_draft.versions_count}") %>
-            </strong>
-            <small class="text-medium">
-              <%= t("of_versions", scope:"decidim.proposals.collaborative_drafts.show", number: "#{@collaborative_draft.versions_count}") %>
-            </small>
+            <%= resource_version_number(@collaborative_draft.versions_count, "text-large") %>
+            <div class="text-medium">
+              <%= resource_version_of(@collaborative_draft.versions_count) %>
+            </div>
           </div>
 
           <div>
             <span class="text-medium">
-              <%= link_to t("see_other_versions", scope:"decidim.proposals.collaborative_drafts.show"), collaborative_draft_versions_path(@collaborative_draft) %>
+              <%= 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 secondary hollow expanded button--sc mt-s", id: "collaborative_draft_edit" %>
+          <%= 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 secondary light expanded button--sc mt-s">
+          <button type="button" class="button expanded button--sc mt-s">
             <%= t("requested_access", scope:"decidim.proposals.collaborative_drafts.show") %>
           </button>
         <% end %>
@@ -77,21 +90,21 @@
         <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") + " " + "#{@collaborative_draft.versions.group_by(&:whodunnit).size}" %>
+              <%= icon("people", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.versions.group_by(&:whodunnit).size}" %>
             <% end %>
           </li>
 
           <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") + " " + "#{@collaborative_draft.versions.count}" %>
+                <%= 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") + " " + "#{@collaborative_draft.comments.count}" %>
+                <%= icon("comment-square", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.comments.count}" %>
               <% end %>
             <% end %>
           </li>
@@ -105,20 +118,6 @@
 
     <%= render partial: "decidim/shared/share_modal" %>
   </div>
-
-  <div class="columns mediumlarge-8 mediumlarge-pull-4">
-    <div class="section">
-      <%== cell("decidim/proposals/collaborative_draft_m", @collaborative_draft, full_badge: true).badge %>
-
-      <%= simple_format(present(@collaborative_draft).body(links: true, strip_tags: true), nil, sanitize: false) %>
-
-      <% if component_settings.geocoding_enabled? %>
-        <%= 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>
 
 <%= attachments_for @collaborative_draft %>

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

@@ -1,5 +1,7 @@
+<%= form_required_explanation %>
+
 <div class="field hashtags__container">
-  <%= form.text_field :title, class: "js-hashtags", hashtaggable: true, value: form_presenter.title %>
+  <%= form.text_field :title, class: "js-hashtags", value: form_presenter.title %>
 </div>
 
 <div class="field hashtags__container">
@@ -21,7 +23,7 @@
 
 <% if @form.component_suggested_hashtags.any? %>
   <div class="field">
-    <%= form.label :suggested_hashtags %>
+    <%= 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 }
@@ -42,7 +44,7 @@
 
 <% if @form.categories&.any? %>
   <div class="field">
-    <%= form.categories_select :category_id, @form.categories, prompt: t("decidim.proposals.proposals.edit.select_a_category") %>
+    <%= form.categories_select :category_id, @form.categories, include_blank: t("decidim.proposals.proposals.edit.select_a_category") %>
   </div>
 <% end %>
 

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

@@ -1,16 +0,0 @@
-<% fully_endorsed= fully_endorsed?(@proposal, current_user) %>
-<div class="row collapse buttons__row">
-  <% if endorsements_enabled? %>
-    <div class="column small-9 collapse">
-      <div class="button-group button-group--collapse button--nomargin small">
-        <%= render_endorsements_count_card_part(@proposal, fully_endorsed) %>
-        <%= render_endorsements_button_card_part(@proposal, fully_endorsed) %>
-      </div>
-    </div>
-  <% 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: t(".comments"), role: "img" %> <%= @proposal.comments.count %>
-    <% end %>
-  </div>
-</div>

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

@@ -1,11 +1,13 @@
+<%= render partial: "decidim/shared/filter_form_help", locals: { skip_to_id: "proposals" } %>
+
 <%= filter_form_for filter do |form| %>
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search") %>
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
-          <button type="submit" class="button button--muted">
-            <%= icon "magnifying-glass", aria_label: t(".search") %>
+          <button type="submit" class="button" aria-controls="proposals">
+            <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
           </button>
         </div>
       </div>
@@ -13,31 +15,31 @@
   </div>
 
   <% if component_settings.proposal_answering_enabled && current_settings.proposal_answering_enabled %>
-    <%= form.check_boxes_tree :state, filter_proposals_state_values, legend_title: t(".state") %>
+    <%= form.check_boxes_tree :state, filter_proposals_state_values, legend_title: t(".state"), "aria-controls": "proposals" %>
   <% end %>
 
   <% if current_participatory_space.has_subscopes? %>
-    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope") %>
+    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "proposals" %>
   <% end %>
 
   <% if current_component.categories.any? %>
-    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category") %>
+    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "proposals" %>
   <% end %>
 
   <% if component_settings.official_proposals_enabled %>
-    <%= form.check_boxes_tree :origin, filter_origin_values, legend_title: t(".origin") %>
+    <%= form.check_boxes_tree :origin, filter_origin_values, legend_title: t(".origin"), "aria-controls": "proposals" %>
   <% end %>
 
   <% if current_user %>
-    <%= form.collection_radio_buttons :activity, activity_filter_values, :first, :last, legend_title: t(".activity") %>
+    <%= form.collection_radio_buttons :activity, activity_filter_values, :first, :last, { legend_title: t(".activity") }, "aria-controls": "proposals" %>
   <% end %>
 
   <% if @proposals.only_emendations.any? %>
-    <%= form.collection_radio_buttons :type, filter_type_values, :first, :last, legend_title: t(".amendment_type") %>
+    <%= form.collection_radio_buttons :type, filter_type_values, :first, :last, { legend_title: t(".amendment_type") }, "aria-controls": "proposals" %>
   <% end %>
 
   <% if linked_classes_for(Decidim::Proposals::Proposal).any? %>
-    <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::Proposal), :first, :last, legend_title: t(".related_to") %>
+    <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::Proposal), :first, :last, { legend_title: t(".related_to") }, "aria-controls": "proposals" %>
   <% end %>
 
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>

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

@@ -1,11 +1 @@
-<div class="row column view-header">
-  <h2 class="heading2"><%= present(@proposal).title(links: true, html_escape: true) %></h2>
-  <% unless component_settings.participatory_texts_enabled? %>
-    <%= cell("decidim/coauthorships", @proposal) %>
-  <% end %>
-</div>
-<div class="row column">
-  <%= render_proposal_body(@proposal) %>
-</div>
-<br>
-<%= attachments_for(@proposal) %>
+<%= card_for @proposal, from: @proposal, preview: true %>

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

@@ -1,5 +1,5 @@
 <div class="column">
-  <article class="card card--proposal">
+  <div class="card card--proposal">
     <div class="card__content">
       <div class="card__header">
         <%= link_to proposal, target: "_blank" do %>
@@ -18,5 +18,5 @@
       <p><%= truncate(present(proposal).body(strip_tags: true), length: 100) %></p>
       <%= cell "decidim/tags", proposal, context: { extra_classes: ["tags--proposal"] } %>
     </div>
-  </article>
+  </div>
 </div>

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

@@ -11,4 +11,18 @@
 <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>
+</div>
 <%= decidim_paginate @proposals %>

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

@@ -9,7 +9,10 @@
         <% 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 %>
         <% else %>
-          <%= 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), resource: proposal, class: "button #{vote_button_classes(from_proposals_list)}", data: { disable: true, "redirect-url": proposal_path(proposal) } %>
+          <%= 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 %>
+            <%= t("decidim.proposals.proposals.vote_button.vote") %>
+            <span class="show-for-sr"><%= decidim_html_escape(present(proposal).title) %></span>
+          <% end %>
         <% end %>
       <% else %>
         <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
@@ -25,22 +28,26 @@
               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",
+            class: "button #{vote_button_classes(from_proposals_list)} active light",
             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>
           <% end %>
         <% else %>
           <% 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 %>
+            <%= content_tag :button, 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("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 #{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 %>
+              <%= content_tag :button, 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("decidim.proposals.proposals.vote_button.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)}" %>
+              <%= 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 %>
+                <%= t("decidim.proposals.proposals.vote_button.vote") %>
+                <span class="show-for-sr"><%= decidim_html_escape(present(proposal).title) %></span>
+              <% end %>
             <% end %>
           <% end %>
         <% end %>