consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes conflicts with master [#25]

Browse Source
This commit is contained in:
rgarcia
2015-08-05 13:47:23 +02:00
parent c2e7ff32b1 715ee61979
commit fa5b678b69
48 changed files with 1036 additions and 2095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/views/debates/_debate.html.erb
View File

@@ -1,16 +1,25 @@
<div id="debate-<%= debate.id %>" class="small-12 medium-6 large-4 column debate end">
<div class="debates-index">
<div id="debate-<%= debate.id %>" class="debate">
<div class="panel">
<i class="fi-comment-quotes left"></i>
<span class="label radius right"><%= t("debates.debate.debate") %></span>
<div class="row">
<div class="small-12 medium-9 column">
<div class="debate-content">
<span class="label left"><%= t("debates.debate.debate") %></span>
<i class="icon-quote-right"></i>
<h3><%= link_to debate.title, debate %></h3>
<p class="debate-info">
<i class="icon-chat-bubble-two"></i>&nbsp;<%= pluralize(debate.comment_threads.count, t("debates.debate.comment"), t("debates.debate.comments")) %>
</p>
<%= debate.description %>
<%= render "shared/tags", debate: debate %>
</div>
</div>
<h3><%= link_to debate.title, debate %></h3>
<p>Por <%= debate.author.name %> el <%= l debate.created_at.to_date %></p>
<p><%= sanitize(debate.description.html_safe) %></p>
<div id="<%= dom_id(debate) %>_votes" class="small-12 medium-3 column">
<%= render 'debates/votes_min', debate: debate %>
</div>
<p><%= render 'shared/tags', debate: debate %></p>
<div id="<%= dom_id(debate) %>_votes" class="row votes">
<%= render 'debates/votes_min', debate: debate %>
</div>
</div>
</div>
</div>