clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5530 from tobiasd/20180730-adminblocked 

enhance block users in admin panel
This commit is contained in:
Michael Vogel 2018-07-30 20:03:00 +02:00 committed by GitHub
parent 2b729366f2 c63ad5afee
commit 55c10a3fc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mod/admin.php
View File

@ -1881,6 +1881,7 @@ function admin_page_users(App $a)
'$deny' => L10n::t('Deny'), '$deny' => L10n::t('Deny'),
'$delete' => L10n::t('Delete'), '$delete' => L10n::t('Delete'),
'$block' => L10n::t('Block'), '$block' => L10n::t('Block'),
'$blocked' => L10n::t('User blocked'),
'$unblock' => L10n::t('Unblock'), '$unblock' => L10n::t('Unblock'),
'$siteadmin' => L10n::t('Site admin'), '$siteadmin' => L10n::t('Site admin'),
'$accountexpired' => L10n::t('Account expired'), '$accountexpired' => L10n::t('Account expired'),

2
view/templates/admin/users.tpl
View File

@ -85,7 +85,7 @@
<td class='register_date'>{{$u.register_date}}</td> <td class='register_date'>{{$u.register_date}}</td>
<td class='login_date'>{{$u.login_date}}</td> <td class='login_date'>{{$u.login_date}}</td>
<td class='lastitem_date'>{{$u.lastitem_date}}</td> <td class='lastitem_date'>{{$u.lastitem_date}}</td>
<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td> <td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}} {{if $u.blocked}}{{$blocked}}{{/if}}</td>
<td class="checkbox"> <td class="checkbox">
{{if $u.is_deletable}} {{if $u.is_deletable}}
<input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td> <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>

1
view/theme/vier/css/font2.css
View File

@ -335,6 +335,7 @@ li.icon.icon-large:before {
.icon.drop:before { content: "\f014"; } .icon.drop:before { content: "\f014"; }
.icon.drophide:before { content: "\f014"; } .icon.drophide:before { content: "\f014"; }
.icon.copy:before { content: "\f0c5"; } .icon.copy:before { content: "\f0c5"; }
.icon.block:before { content: "\f05e"; }
.small-pencil:before, .savedsearchdrop:before { .small-pencil:before, .savedsearchdrop:before {
font-family: FontAwesome; font-family: FontAwesome;