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

Merge pull request #675 from AyuntamientoMadrid/avatar-bug

Browse Source 
Avatar bug
This commit is contained in:
Raimond Garcia
2015-11-09 11:16:44 +01:00
parent 8f60f0b6d3 cc5babe764
commit dc3ecf5fab
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,14 +14,13 @@
<% elsif comment.as_moderator? %>
<%= image_tag("moderator_avatar.png", size: 32, class: "moderator-avatar left") %>
<% else %>
<% if comment.user.organization? %>
<% if comment.user.hidden? || comment.user.erased? %>
<i class="icon-deleted user-deleted"></i>
<% elsif comment.user.organization? %>
<%= image_tag("collective_avatar.png", size: 32, class: "avatar left") %>
<% else %>
<%= avatar_image(comment.user, seed: comment.user_id, size: 32, class: "left") %>
<% end %>
<% if comment.user.hidden? || comment.user.erased? %>
<i class="icon-deleted user-deleted"></i>
<% end %>
<% end %>
<div class="comment-body">

3
app/views/shared/_author_info.html.erb
View File

@@ -1,11 +1,10 @@
<%= avatar_image(resource.author, seed: resource.author_id, size: 32, class: 'author-photo') %>
<% if resource.author.hidden? || resource.author.erased? %>
<i class="icon-deleted author-deleted"></i>
<span class="author">
<%= t("shared.author_info.author_deleted") %>
</span>
<% else %>
<%= avatar_image(resource.author, seed: resource.author_id, size: 32, class: 'author-photo') %>
<span class="author">
<%= link_to resource.author.name, user_path(resource.author) %>
</span>