From 0257f410d57d13e044f6200d3a989e12d049ca2d Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 30 Jul 2018 17:19:22 +0200 Subject: [PATCH 1/2] mention if a user is blocked in the admin panel user overview --- mod/admin.php | 1 + view/templates/admin/users.tpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/admin.php b/mod/admin.php index b88bc723a..fae20f79b 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1881,6 +1881,7 @@ function admin_page_users(App $a) '$deny' => L10n::t('Deny'), '$delete' => L10n::t('Delete'), '$block' => L10n::t('Block'), + '$blocked' => L10n::t('User blocked'), '$unblock' => L10n::t('Unblock'), '$siteadmin' => L10n::t('Site admin'), '$accountexpired' => L10n::t('Account expired'), diff --git a/view/templates/admin/users.tpl b/view/templates/admin/users.tpl index a842d6e36..b2b0d615a 100644 --- a/view/templates/admin/users.tpl +++ b/view/templates/admin/users.tpl @@ -85,7 +85,7 @@ {{$u.register_date}} {{$u.login_date}} {{$u.lastitem_date}} - {{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}} + {{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}} {{if $u.blocked}}{{$blocked}}{{/if}} {{if $u.is_deletable}} From c63ad5afee6a15433e07b300c16ae7bdcadaaf9a Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 30 Jul 2018 17:32:35 +0200 Subject: [PATCH 2/2] vier theme was missing an icon for the block button --- view/theme/vier/css/font2.css | 1 + 1 file changed, 1 insertion(+) diff --git a/view/theme/vier/css/font2.css b/view/theme/vier/css/font2.css index 7d40e2f6d..9a048b298 100644 --- a/view/theme/vier/css/font2.css +++ b/view/theme/vier/css/font2.css @@ -335,6 +335,7 @@ li.icon.icon-large:before { .icon.drop:before { content: "\f014"; } .icon.drophide:before { content: "\f014"; } .icon.copy:before { content: "\f0c5"; } +.icon.block:before { content: "\f05e"; } .small-pencil:before, .savedsearchdrop:before { font-family: FontAwesome;