diff --git a/app/views/proposals/_proposal.html.erb b/app/views/proposals/_proposal.html.erb index dc37934d5..46e6fd9ba 100644 --- a/app/views/proposals/_proposal.html.erb +++ b/app/views/proposals/_proposal.html.erb @@ -53,20 +53,22 @@
-
- <% if proposal.successfull? %> + <% if proposal.successfull? %> +

<%= t("proposal_ballots.successfull", voting: link_to(t("proposal_ballots.voting"), proposal_ballots_path)).html_safe %>

- <% elsif proposal.archived? %> +
+ <% elsif proposal.archived? %> +
<%= t("proposals.proposal.supports", count: proposal.total_votes) %>

<%= t("proposals.proposal.archived") %>

- <% else %> - <%= render 'votes', - { proposal: proposal, vote_url: vote_proposal_path(proposal, value: 'yes') } %> - <% end %> -
+
+ <% else %> + <%= render 'votes', + { proposal: proposal, vote_url: vote_proposal_path(proposal, value: 'yes') } %> + <% end %>
diff --git a/app/views/proposals/_votes.html.erb b/app/views/proposals/_votes.html.erb index e1927ec05..fb41357af 100644 --- a/app/views/proposals/_votes.html.erb +++ b/app/views/proposals/_votes.html.erb @@ -1,64 +1,66 @@ -
- - - <%= supports_percentage(proposal) %> / <%= t("proposals.proposal.total_percent") %> - -
+
+
+ + + <%= supports_percentage(proposal) %> / <%= t("proposals.proposal.total_percent") %> + +
- - <%= t("proposals.proposal.supports", count: proposal.total_votes) %>  - - "> - <%= t("proposals.proposal.supports_necessary", number: number_with_delimiter(Proposal.votes_needed_for_success)) %> - + + <%= t("proposals.proposal.supports", count: proposal.total_votes) %>  + + "> + <%= t("proposals.proposal.supports_necessary", number: number_with_delimiter(Proposal.votes_needed_for_success)) %> + + - -
- <% if voted_for?(@proposal_votes, proposal) %> -
- <%= t("proposals.proposal.already_supported") %> -
- <% elsif user_signed_in? && proposal.votable_by?(current_user) %> - <%= link_to vote_url, - class: "button button-support small expanded", - title: t('proposals.proposal.support_title'), method: "post", remote: true do %> - <%= t("proposals.proposal.support") %> +
+ <% if voted_for?(@proposal_votes, proposal) %> +
+ <%= t("proposals.proposal.already_supported") %> +
+ <% elsif user_signed_in? && proposal.votable_by?(current_user) %> + <%= link_to vote_url, + class: "button button-support small expanded", + title: t('proposals.proposal.support_title'), method: "post", remote: true do %> + <%= t("proposals.proposal.support") %> + <% end %> + <% else %> +
+ <%= t("proposals.proposal.support") %> +
<% end %> - <% else %> -
- <%= t("proposals.proposal.support") %> +
+ + <% if user_signed_in? && current_user.organization? %> + + <% elsif user_signed_in? && !proposal.votable_by?(current_user) %> +
+ +
+ <% elsif !user_signed_in? %> +
+ +
+ <% end %> + + <% if voted_for?(@proposal_votes, proposal) && setting['twitter_handle'] %> + <% end %>
- -<% if user_signed_in? && current_user.organization? %> - -<% elsif user_signed_in? && !proposal.votable_by?(current_user) %> -
- -
-<% elsif !user_signed_in? %> -
- -
-<% end %> - -<% if voted_for?(@proposal_votes, proposal) && setting['twitter_handle'] %> - -<% end %>