_vote_button.html.erb in decidim-proposals-0.7.0

- old
+ new
@@ -8,17 +8,19 @@
       <% 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 }, class: "card__button button #{vote_button_classes(from_proposals_list)} success" %>
       <% else %>
-        <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
-          <%= action_authorized_button_to :vote, t('.no_votes_remaining'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}", disabled: true %>
-        <% elsif current_settings.votes_blocked? %>
-          <button class="card__button button <%= vote_button_classes(from_proposals_list) %> disabled" disabled>
-            <%= t('.votes_blocked') %>
-          </button>
+        <% if proposal.maximum_votes_reached? %>
+          <%= content_tag :span, t('.maximum_votes_reached'), class: "card__button 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 }, class: "card__button button #{vote_button_classes(from_proposals_list)}" %>
+          <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
+            <%= content_tag :span, t('.no_votes_remaining'), class: "card__button button #{vote_button_classes(from_proposals_list)}", disabled: true %>
+          <% elsif current_settings.votes_blocked? %>
+            <%= content_tag :span, t('.votes_blocked'), class: "card__button 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 }, class: "card__button button #{vote_button_classes(from_proposals_list)}" %>
+          <% end %>
         <% end %>
       <% end %>
     <% end %>
   </div>
 <% end %>