diff --git a/app/controllers/management/proposals_controller.rb b/app/controllers/management/proposals_controller.rb index 6e0d535c9..7cf052a26 100644 --- a/app/controllers/management/proposals_controller.rb +++ b/app/controllers/management/proposals_controller.rb @@ -11,7 +11,7 @@ class Management::ProposalsController < Management::BaseController def vote @proposal.register_vote(current_user, 'yes') - redirect_to management_proposals_url, notice: "Succesfully voted" + set_proposal_votes(@proposal) end def print diff --git a/app/views/management/proposals/_proposal.html.erb b/app/views/management/proposals/_proposal.html.erb index f91fd2b4f..be7a2e6b2 100644 --- a/app/views/management/proposals/_proposal.html.erb +++ b/app/views/management/proposals/_proposal.html.erb @@ -1,35 +1 @@ -
-
-
- -
-
- <%= t("proposals.proposal.proposal") %> - -

<%= link_to proposal.title, "#" %>

- -

-   -  •  - <%= l proposal.created_at.to_date %> -  •  - - <%= proposal.try(:author).try(:name) %> - -

- -
-

<%= proposal.summary %>

-
-
- - <%= render "shared/tags", taggable: proposal, limit: 5 %> -
-
- -
- <%= render 'votes', proposal: proposal %> -
-
-
-
\ No newline at end of file +<%= render partial: 'proposals/proposal', locals: {proposal: proposal} %> \ No newline at end of file diff --git a/app/views/management/proposals/_votes.html.erb b/app/views/management/proposals/_votes.html.erb index ac0c93b09..922c3e383 100644 --- a/app/views/management/proposals/_votes.html.erb +++ b/app/views/management/proposals/_votes.html.erb @@ -1,31 +1,2 @@ -
- - <% if action_name == 'print' %> -
- - - <%= supports_percentage(proposal) %> / <%= t("proposals.proposal.total_percent") %> - -
- - - <%= t("proposals.proposal.supports", count: proposal.total_votes) %>  - - "> - <%= t("proposals.proposal.supports_necessary") %> - - - - <% else %> - -
- <%= link_to vote_management_proposal_path(proposal, value: 'yes'), - class: "button button-support tiny radius expand", - title: t('proposals.proposal.support_title'), method: "post" do %> - <%= t("proposals.proposal.support") %> - <% end %> -
- - <% end %> - -
+<%= render 'proposals/votes', + { proposal: proposal, vote_url: vote_management_proposal_path(proposal, value: 'yes') } %> \ No newline at end of file diff --git a/app/views/management/proposals/vote.js.erb b/app/views/management/proposals/vote.js.erb new file mode 100644 index 000000000..73b2507c2 --- /dev/null +++ b/app/views/management/proposals/vote.js.erb @@ -0,0 +1 @@ +<%= render template: 'proposals/vote' %> \ No newline at end of file diff --git a/app/views/proposals/_proposal.html.erb b/app/views/proposals/_proposal.html.erb index 575722805..c536c897f 100644 --- a/app/views/proposals/_proposal.html.erb +++ b/app/views/proposals/_proposal.html.erb @@ -47,7 +47,8 @@
- <%= render 'proposals/votes', proposal: proposal %> + <%= render 'votes', + { proposal: proposal, vote_url: vote_proposal_path(proposal, value: 'yes') } %>
diff --git a/app/views/proposals/_votes.html.erb b/app/views/proposals/_votes.html.erb index 965f61bf7..b7e7d12a0 100644 --- a/app/views/proposals/_votes.html.erb +++ b/app/views/proposals/_votes.html.erb @@ -22,7 +22,7 @@ <%= t("proposals.proposal.already_supported") %> <% else %> - <%= link_to vote_proposal_path(proposal, value: 'yes'), + <%= link_to vote_url, class: "button button-support tiny radius expand", title: t('proposals.proposal.support_title'), method: "post", remote: true do %> <%= t("proposals.proposal.support") %> diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 119968e4d..b72d7c7d5 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -97,7 +97,8 @@

<%= t("votes.supports") %>

- <%= render 'proposals/votes', proposal: @proposal %> + <%= render 'votes', + { proposal: @proposal, vote_url: vote_proposal_path(@proposal, value: 'yes') } %>