consul/nairobi
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-09-10 17:47:40 +02:00
parent 2d3015703d cb072848f3
commit 43bdfb940e
34 changed files with 262 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/comments/_actions.html.erb
View File

@@ -4,13 +4,13 @@
<span class='js-moderation-actions'>
<% if can? :hide, comment %>
<span class="divider">&nbsp;&bullet;&nbsp;</span>
<span class="divider">&nbsp;&bull;&nbsp;</span>
<%= link_to t("admin.actions.hide").capitalize, hide_moderation_comment_path(comment),
method: :put, remote: true, data: { confirm: t('admin.actions.confirm') } %>
<% end %>
<% if can? :hide, comment.user %>
<span class="divider">&nbsp;&bullet;&nbsp;</span>
<span class="divider">&nbsp;&bull;&nbsp;</span>
<%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(comment.user_id, debate_id: @debate.id),
method: :put, data: { confirm: t('admin.actions.confirm') } %>
<% end %>

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

@@ -38,20 +38,20 @@
<% else %>
<span class="user-name"><%= comment.user.name %></span>
<% if comment.user.official? %>
&nbsp;&bullet;&nbsp;
&nbsp;&bull;&nbsp;
<span class="label round level-<%= comment.user.official_level %>">
<%= comment.user.official_position %>
</span>
<% end %>
<% end %>
<% if comment.user.verified_organization? %>
&nbsp;&bullet;&nbsp;
&nbsp;&bull;&nbsp;
<span class="label round is-association">
<%= t("shared.collective") %>
</span>
<% end %>
<% if comment.user_id == @commentable.author_id %>
&nbsp;&bullet;&nbsp;
&nbsp;&bull;&nbsp;
<span class="label round is-author">
<%= t("debates.comment.author") %>
</span>
@@ -59,7 +59,7 @@
<% end %>
&nbsp;&bullet;&nbsp;<time><%= l comment.created_at.to_datetime, format: :datetime %></time>
&nbsp;&bull;&nbsp;<time><%= l comment.created_at.to_datetime, format: :datetime %></time>
</div>
<% if comment.as_administrator? %>