mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-31 13:40:20 +02:00
Code Issues Releases Wiki Activity

Merge upstream into master

Browse Source
This commit is contained in:
David Sevilla Martín
2018-02-12 08:36:37 -05:00
parent 88ab68af10
commit cd8d747985
11 changed files with 110 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/suspend/js/admin/src/main.js
View File

@@ -5,7 +5,7 @@ import PermissionGrid from 'flarum/components/PermissionGrid';
app.initializers.add('suspend', () => {
extend(PermissionGrid.prototype, 'moderateItems', items => {
items.add('suspendUsers', {
icon: 'ban',
icon: 'fas fa-ban',
label: app.translator.trans('flarum-suspend.admin.permissions.suspend_users_label'),
permission: 'user.suspend'
});

4
extensions/suspend/js/forum/src/main.js
View File

@@ -21,7 +21,7 @@ app.initializers.add('flarum-suspend', () => {
if (user.canSuspend()) {
items.add('suspend', Button.component({
children: app.translator.trans('flarum-suspend.forum.user_controls.suspend_button'),
icon: 'ban',
icon: 'fas fa-ban',
onclick: () => app.modal.show(new SuspendUserModal({user}))
}));
}
@@ -32,7 +32,7 @@ app.initializers.add('flarum-suspend', () => {
if (new Date() < until) {
items.add('suspended', Badge.component({
icon: 'ban',
icon: 'fas fa-ban',
type: 'suspended',
label: app.translator.trans('flarum-suspend.forum.user_badge.suspended_tooltip')
}));