tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse Source
This commit is contained in:
Jenkins
2017-11-24 01:17:20 +00:00
parent faad820458 e84fecb7e9
commit 167fe2ab08
34 changed files with 490 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/views/admin/action_logs/_action_log.html.haml Normal file
View File

@@ -0,0 +1,15 @@
%li.log-entry
.log-entry__header
.log-entry__avatar
= image_tag action_log.account.avatar.url(:original), alt: '', width: 48, height: 48, class: 'avatar'
.log-entry__content
.log-entry__title
= t("admin.action_logs.actions.#{action_log.action}_#{action_log.target_type.underscore}", name: content_tag(:span, action_log.account.username, class: 'username'), target: content_tag(:span, log_target(action_log), class: 'target')).html_safe
.log-entry__timestamp
%time= l action_log.created_at
.spacer
.log-entry__icon
= fa_icon icon_for_log(action_log)
.log-entry__icon__overlay{ class: class_for_log_icon(action_log) }
.log-entry__extras
= log_extra_attributes relevant_log_changes(action_log)

7
app/views/admin/action_logs/index.html.haml Normal file
View File

@@ -0,0 +1,7 @@
- content_for :page_title do
= t('admin.action_logs.title')
%ul
= render @action_logs
= paginate @action_logs