[frio] Improve admin user list display

diff --git a/view/theme/frio/templates/admin/users/active.tpl b/view/theme/frio/templates/admin/users/active.tpl
index c2909088acb58166510ad25fc0c5373bd532ca43..c381cf0cf8c72bf59d966366f77a7d70b3483508 100644 (file)
--- a/view/theme/frio/templates/admin/users/active.tpl
+++ b/view/theme/frio/templates/admin/users/active.tpl
@@ -129,15 +129,9 @@
                                        </td>
                                        <td class="text-right">
                                {{if $u.is_deletable}}
-                                       {{if $u.blocked}}
-                                               <a href="{{$baseurl}}/admin/users/unblock/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$unblock}}">
-                                                       <i class="fa fa-circle-o" aria-hidden="true"></i>
-                                               </a>
-                                       {{else}}
                                                <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$block}}">
                                                        <i class="fa fa-ban" aria-hidden="true"></i>
                                                </a>
-                                       {{/if}}
                                                <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')">
                                                        <i class="fa fa-trash" aria-hidden="true"></i>
                                                </a>

diff --git a/view/theme/frio/templates/admin/users/blocked.tpl b/view/theme/frio/templates/admin/users/blocked.tpl
index 3b8055651822c66e797c038135e3276e610dac72..f53dc16b7c289f9f10b2abdbdcf2dba0aa33965d 100644 (file)
--- a/view/theme/frio/templates/admin/users/blocked.tpl
+++ b/view/theme/frio/templates/admin/users/blocked.tpl
@@ -86,6 +86,7 @@
                                                </i>
                                                {{/if}}
                                                {{if $u.is_admin}}<i class="fa fa-user-secret text-primary" title="{{$siteadmin}}"></i>{{/if}}
+                                               {{if $u.blocked}}<i class="fa fa-ban text-danger" title="{{$blocked}}"></i>{{/if}}
                                                {{if $u.account_expired}}<i class="fa fa-clock-o text-warning" title="{{$accountexpired}}"></i>{{/if}}
                                        </td>
                                {{/if}}

diff --git a/view/theme/frio/templates/admin/users/index.tpl b/view/theme/frio/templates/admin/users/index.tpl
index 41226eb44cc7364662cf46af5319ec69967ae142..e8ae271bb6f8da4d99f8a56b1e5074c0d0238403 100644 (file)
--- a/view/theme/frio/templates/admin/users/index.tpl
+++ b/view/theme/frio/templates/admin/users/index.tpl
@@ -87,6 +87,8 @@
                                                </i>
                                                {{/if}}
                                                {{if $u.is_admin}}<i class="fa fa-user-secret text-primary" title="{{$siteadmin}}"></i>{{/if}}
+                                               {{if $u.blocked}}<i class="fa fa-ban text-danger" title="{{$blocked}}"></i>{{/if}}
+                                               {{if $u.deleted}}<i class="fa fa-user-times" title="{{$h_deleted}}"></i>{{/if}}
                                                {{if $u.account_expired}}<i class="fa fa-clock-o text-warning" title="{{$accountexpired}}"></i>{{/if}}
                                        </td>
                                {{/if}}
@@ -131,7 +133,7 @@
                                {{if $u.is_deletable}}
                                        {{if $u.blocked}}
                                                <a href="{{$baseurl}}/admin/users/unblock/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$unblock}}">
-                                                       <i class="fa fa-circle-o" aria-hidden="true"></i>
+                                                       <i class="fa fa-check-circle-o" aria-hidden="true"></i>
                                                </a>
                                        {{else}}
                                                <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$block}}">