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

applies hidden users styles commented

Browse Source
This commit is contained in:
Juanjo Bazán
2015-08-19 16:04:34 +02:00
committed by Juanjo Bazán
parent 2eccd30eff
commit d2ac8b7f43
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,25 +6,24 @@
<% else %> <% else %>
<%= avatar_image(comment.user, size: 32, class: 'left') %> <%= avatar_image(comment.user, size: 32, class: 'left') %>
<!-- if user deleted --> <!-- if comment.user.hidden?
<i class="icon-deleted user-deleted"></i> <i class="icon-deleted user-deleted"></i>
<!-- end --> end -->
<div class="comment-body"> <div class="comment-body">
<div class="comment-info"> <div class="comment-info">
<!-- if user deleted --> <!-- if comment.user.hidden?
<span class="user-name"><%= t("debates.comment.user_deleted") %></span> <span class="user-name"><%= t("debates.comment.user_deleted") %></span>
<!-- else --> else -->
<span class="user-name"><%= comment.user.name %></span> <span class="user-name"><%= comment.user.name %></span>
<% if comment.user.official? %>
&nbsp;&bullet;&nbsp;
<span class="label round level-<%= comment.user.official_level %>">
<%= comment.user.official_position %>
</span>
<% end %>
<!-- end --> <!-- end -->
&nbsp;&bullet;&nbsp;<%= time_ago_in_words(comment.created_at) %>
<% if comment.user.official? %>
&nbsp;&bullet;&nbsp;
<span class="label round level-<%= comment.user.official_level %>">
<%= comment.user.official_position %>
</span>
<% end %>
<% if comment.user.verified_organization? %> <% if comment.user.verified_organization? %>
&nbsp;&bullet;&nbsp; &nbsp;&bullet;&nbsp;
<span class="label round is-association"> <span class="label round is-association">
@@ -37,6 +36,7 @@
<%= t("debates.comment.author") %> <%= t("debates.comment.author") %>
</span> </span>
<% end %> <% end %>
&nbsp;&bullet;&nbsp;<%= time_ago_in_words(comment.created_at) %>
</div> </div>
<% if comment.user.official? %> <% if comment.user.official? %>

30
app/views/debates/show.html.erb
View File

@@ -14,22 +14,22 @@
<div class="debate-info"> <div class="debate-info">
<%= avatar_image(@debate.author, size: 32, class: 'author-photo') %> <%= avatar_image(@debate.author, size: 32, class: 'author-photo') %>
<!-- if user deleted --> <!-- if @debate.author.hidden? %>
<i class="icon-deleted author-deleted"></i> <i class="icon-deleted author-deleted"></i>
<span class="author"> <span class="author">
<%= t("debates.show.author_deleted") %> <%= t("debates.show.author_deleted") %>
</span>
<!-- else -->
<span class="author">
<%= @debate.author.name %>
</span>
<!-- end -->
<% if @debate.author.official? %>
&nbsp;&bullet;&nbsp;
<span class="label round level-<%= @debate.author.official_level %>">
<%= @debate.author.official_position %>
</span> </span>
<% end %> else -->
<span class="author">
<%= @debate.author.name %>
</span>
<% if @debate.author.official? %>
&nbsp;&bullet;&nbsp;
<span class="label round level-<%= @debate.author.official_level %>">
<%= @debate.author.official_position %>
</span>
<% end %>
<!-- end -->
<% if @debate.author.verified_organization? %> <% if @debate.author.verified_organization? %>
&nbsp;&bullet;&nbsp; &nbsp;&bullet;&nbsp;
<span class="label round is-association"> <span class="label round is-association">