diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index 6ca2d45b2..e93968f35 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -1,11 +1,12 @@ class VotesController < ApplicationController before_action :set_debate before_action :authenticate_user! - + respond_to :html, :js + def create register_vote notice = @debate.vote_registered? ? I18n.t("votes.notice_thanks") : I18n.t("votes.notice_already_registered") - redirect_to @debate, notice: notice + respond_with @debate end private diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 04d1e5354..79f82bf7f 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -10,28 +10,8 @@

<%= render 'shared/tags', debate: @debate %>

-
-
-
- <%= link_to debate_votes_path(@debate, value: 'yes'), :class => 'in-favor', method: "post" do %> - - <%= percentage('likes', @debate) %> - <% end %> -
- - - -
- <%= link_to debate_votes_path(@debate, value: 'no'), :class => 'against', method: "post" do %> - - <%= percentage('dislikes', @debate) %> - <% end %> -
-
- -
-

<%= pluralize(@debate.total_votes, t("debates.debate.vote"), t("debates.debate.votes")) %>

-
+
+ <%= render 'votes/vote' %>
diff --git a/app/views/votes/_vote.html.erb b/app/views/votes/_vote.html.erb new file mode 100644 index 000000000..95e32460a --- /dev/null +++ b/app/views/votes/_vote.html.erb @@ -0,0 +1,23 @@ +
+
+ <%= link_to debate_votes_path(@debate, value: 'yes'), class: 'in-favor', method: 'post', remote: true do %> + + <%= percentage('likes', @debate) %> + <% end %> +
+ + + +
+ <%= link_to debate_votes_path(@debate, value: 'no'), class: 'against', method: 'post', remote: true do %> + + <%= percentage('dislikes', @debate) %> + <% end %> +
+
+ +
+

+ <%= pluralize(@debate.total_votes, t("debates.debate.vote"), t("debates.debate.votes")) %> +

+
\ No newline at end of file diff --git a/app/views/votes/create.js.erb b/app/views/votes/create.js.erb new file mode 100644 index 000000000..55733e509 --- /dev/null +++ b/app/views/votes/create.js.erb @@ -0,0 +1 @@ +$("#votes").html("<%= j render('vote') %>"); \ No newline at end of file