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

fix conflict

Browse Source
This commit is contained in:
Juanjo Bazán
2015-08-05 14:46:18 +02:00
parent 8d87a69e0f d23ce151a6
commit ae8068f5fd
28 changed files with 363 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/views/comments/_comment.html.erb
View File

@@ -7,14 +7,19 @@
<span class="comment-info">
<%= comment.user.name %>&nbsp;&bullet;&nbsp;<%= time_ago_in_words(comment.created_at) %>
</span>
<p><%= comment.body %></p>
<% if user_signed_in? %>
<p class="reply"><%= render 'comments/form', {parent: comment, toggeable: true} %></p>
<% end %>
</div>
<p><%= comment.body %></p>
<div class="comment-children">
<%= render comment.children %>
</div>
<span id="<%= dom_id(comment) %>_votes">
<%= render 'comments/votes', comment: comment %>
</span>
<% if user_signed_in? %>
<p class="reply"><%= render 'comments/form', {parent: comment, toggeable: true} %></p>
<% end %>
</div>
<div class="comment-children">
<%= render comment.children %>
</div>
</div>
</div>