fixes conflicts with master [#25]

This commit is contained in:
rgarcia
2015-08-05 13:47:23 +02:00
48 changed files with 1036 additions and 2095 deletions

View File

@@ -1,25 +1,27 @@
<div class="small-12 column text-center">
<div id="in_favor" class="inline-block">
<%= link_to vote_debate_path(@debate, value: 'yes', partial: 'votes'),
class: 'in-favor', method: "post", remote: true do %>
<i class="fi-like"></i>
<span><%= percentage('likes', @debate) %></span>
<% end %>
</div>
<span class="divider"></span>
<div id="against" class="inline-block">
<%= link_to vote_debate_path(@debate, value: 'no', partial: 'votes'),
class: 'against', method: "post", remote: true do %>
<i class="fi-dislike"></i>
<span><%= percentage('dislikes', @debate) %></span>
<% end %>
</div>
</div>
<div class="small-12 column text-center">
<p class="total-votes">
<div class="small-12 column">
<p class="total-votes right">
<%= pluralize(@debate.total_votes, t("debates.debate.vote"), t("debates.debate.votes")) %>
</p>
</div>
<h3><%= t("votes.supports") %></h3>
<div class="text-center">
<div id="in_favor" class="inline-block">
<%= link_to vote_debate_path(@debate, value: 'yes', partial: 'votes'),
class: "like", title: t('votes.agree'), method: "post", remote: true do %>
<i class="icon-like"></i>
<span><%= percentage('likes', @debate) %></span>
<% end %>
</div>
<span class="divider"></span>
<div id="against" class="inline-block">
<%= link_to vote_debate_path(@debate, value: 'no', partial: 'votes'),
class: "unlike", title: t('votes.disagree'), method: "post", remote: true do %>
<i class="icon-unlike"></i>
<span><%= percentage('dislikes', @debate) %></span>
<% end %>
</div>
</div>
</div>