diff options
| -rw-r--r-- | mod/admin.php | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 5 | ||||
| -rwxr-xr-x | view/tpl/admin_users.tpl | 8 |
3 files changed, 12 insertions, 7 deletions
diff --git a/mod/admin.php b/mod/admin.php index fad03e34a..3608f6eda 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -563,7 +563,7 @@ function admin_page_users_post(&$a){ if (x($_POST,'page_users_delete')){ require_once("include/Contact.php"); foreach($users as $uid){ - user_remove($uid); + account_remove($uid,true); } notice( sprintf( tt("%s user deleted", "%s users deleted", count($users)), count($users)) ); } @@ -605,9 +605,9 @@ function admin_page_users(&$a){ check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't'); // delete user require_once("include/Contact.php"); - user_remove($uid); + account_remove($uid,true); - notice( sprintf(t("User '%s' deleted"), $user[0]['username']) . EOL); + notice( sprintf(t("User '%s' deleted"), $account[0]['account_email']) . EOL); }; break; case "block":{ check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't'); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f7d641e6b..8e15d1eaf 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3564,3 +3564,8 @@ text-decoration: none; .savedsearchdrop { opacity: 0; } + +.admin-icons { + color: $toolicon_colour; + margin-right: 10px; +}
\ No newline at end of file diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 770df7eba..b51fa3559 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -34,8 +34,8 @@ <td class="email">{{$u.email}}</td> <td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td> <td class="tools"> - <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='icon like'></span></a> - <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='icon dislike'></span></a> + <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><i class='icon-thumbs-up-alt admin-icons'></i></a> + <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><i class='icon-thumbs-down-alt admin-icons'></i></a> </td> </tr> {{/foreach}} @@ -71,8 +71,8 @@ <td class='service_class'>{{$u.account_service_class}}</td> <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td> <td class="tools"> - <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a> - <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a> + <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if $u.blocked==0}}dim{{/if}}'></i></a> + <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class='icon-remove admin-icons'></i></a> </td> </tr> {{/foreach}} |