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

merges master and fixes conflicts

Browse Source
This commit is contained in:
kikito
2015-08-20 18:50:10 +02:00
parent e7effbf77c 73f5c4e21e
commit ee881230ba
24 changed files with 358 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,21 +1,21 @@
<div class="row">
<div id="<%= dom_id(comment) %>" class="comment small-12 column">
<% if comment.hidden? %>
<% if comment.not_visible? %>
<%= t("debates.comment.deleted") %>
<% else %>
<%= avatar_image(comment.user, size: 32, class: 'left') %>
<!-- if comment.user.hidden?
<% if comment.user.hidden? %>
<i class="icon-deleted user-deleted"></i>
end -->
<% end %>
<div class="comment-body">
<div class="comment-info">
<!-- if comment.user.hidden?
<% if comment.user.hidden? %>
<span class="user-name"><%= t("debates.comment.user_deleted") %></span>
else -->
<% else %>
<span class="user-name"><%= comment.user.name %></span>
<% if comment.user.official? %>
&nbsp;&bullet;&nbsp;
@@ -23,7 +23,7 @@
<%= comment.user.official_position %>
</span>
<% end %>
<!-- end -->
<% end %>
<% if comment.user.verified_organization? %>
&nbsp;&bullet;&nbsp;
<span class="label round is-association">
@@ -75,7 +75,7 @@
<% end %>
<div class="comment-children">
<%= render comment.children.with_deleted.reorder('id DESC, lft') %>
<%= render comment.children.with_hidden.reorder('id DESC, lft') %>
</div>
</div>