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

fixing conflicts [#47] [#47]

Browse Source
This commit is contained in:
rgarcia
2015-07-30 18:18:28 +02:00
parent 59cea45c26
commit cd2d05e0c5
21 changed files with 312 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,18 @@
<div id="comment-<%= comment.id %>" class='comment' style="padding-bottom:30px">
<p><%= comment.user.name %></p>
<p>hace <%= time_ago_in_words(comment.created_at) %></p>
<p><%= comment.body %></p>
<div class="row">
<div id="comment-<%= comment.id %>" class="small-12 column comment">
<div style="margin-left:50px">
<%= render comment.children %>
</div>
<div style="margin-left:50px">
<%= render 'comments/form', parent: comment %>
</div>
<%= image_tag('user_default_2.jpg', class: 'user-photo left', size: '32x32') %>
<div class="comment-body">
<span class="comment-info">
<%= comment.user.name %>&nbsp;&bullet;&nbsp;<%= time_ago_in_words(comment.created_at) %>
</span>
<p><%= comment.body %></p>
<p class="reply"><%= render 'comments/form', parent: comment %></p>
</div>
<div class="comment-children">
<%= render comment.children %>
</div>
</div>
</div>