harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue #386 - account and channel bulk edit checkboxes not visible and therefore not useable. Also change wording to remove the offensive 'user' designation.

Browse Source
This commit is contained in:
redmatrix 2015-08-16 19:52:25 -07:00
parent b3b566c907
commit 631eb4b2c2
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mod/admin.php
View File

@ -680,7 +680,7 @@ function admin_page_users_post($a) {
intval($users[$i]) intval($users[$i])
); );
} }
notice( sprintf( tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users)), count($users)) ); notice( sprintf( tt("%s account blocked/unblocked", "%s account blocked/unblocked", count($users)), count($users)) );
} }
// account delete button was submitted // account delete button was submitted
if (x($_POST, 'page_users_delete')) { if (x($_POST, 'page_users_delete')) {
@ -688,7 +688,7 @@ function admin_page_users_post($a) {
foreach ($users as $uid){ foreach ($users as $uid){
account_remove($uid, true, false); account_remove($uid, true, false);
} }
notice( sprintf( tt("%s user deleted", "%s users deleted", count($users)), count($users)) ); notice( sprintf( tt("%s account deleted", "%s accounts deleted", count($users)), count($users)) );
} }
// registration approved button was submitted // registration approved button was submitted
if (x($_POST, 'page_users_approve')) { if (x($_POST, 'page_users_approve')) {
@ -736,7 +736,7 @@ function admin_page_users(&$a){
require_once('include/Contact.php'); require_once('include/Contact.php');
account_remove($uid,true,false); account_remove($uid,true,false);
notice( sprintf(t("User '%s' deleted"), $account[0]['account_email']) . EOL); notice( sprintf(t("Account '%s' deleted"), $account[0]['account_email']) . EOL);
break; break;
case 'block': case 'block':
q("UPDATE account SET account_flags = ( account_flags | %d ) WHERE account_id = %d", q("UPDATE account SET account_flags = ( account_flags | %d ) WHERE account_id = %d",
@ -744,7 +744,7 @@ function admin_page_users(&$a){
intval($uid) intval($uid)
); );
notice( sprintf( t("User '%s' blocked") , $account[0]['account_email']) . EOL); notice( sprintf( t("Account '%s' blocked") , $account[0]['account_email']) . EOL);
break; break;
case 'unblock': case 'unblock':
q("UPDATE account SET account_flags = ( account_flags & ~%d ) WHERE account_id = %d", q("UPDATE account SET account_flags = ( account_flags & ~%d ) WHERE account_id = %d",
@ -752,7 +752,7 @@ function admin_page_users(&$a){
intval($uid) intval($uid)
); );
notice( sprintf( t("User '%s' unblocked"), $account[0]['account_email']) . EOL); notice( sprintf( t("Account '%s' unblocked"), $account[0]['account_email']) . EOL);
break; break;
} }
@ -830,8 +830,8 @@ function admin_page_users(&$a){
'$h_users' => t('Users'), '$h_users' => t('Users'),
'$th_users' => array( t('ID'), t('Email'), t('All Channels'), t('Register date'), t('Last login'), t('Expires'), t('Service Class')), '$th_users' => array( t('ID'), t('Email'), t('All Channels'), t('Register date'), t('Last login'), t('Expires'), t('Service Class')),
'$confirm_delete_multi' => t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'), '$confirm_delete_multi' => t('Selected accounts will be deleted!\n\nEverything these accounts had posted on this site will be permanently deleted!\n\nAre you sure?'),
'$confirm_delete' => t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'), '$confirm_delete' => t('The account {0} will be deleted!\n\nEverything this account has posted on this site will be permanently deleted!\n\nAre you sure?'),
'$form_security_token' => get_form_security_token("admin_users"), '$form_security_token' => get_form_security_token("admin_users"),

7
view/css/mod_admin.css
View File

@ -61,7 +61,12 @@
#adminpage table tr:hover { background-color: #bbc7d7; } #adminpage table tr:hover { background-color: #bbc7d7; }
#adminpage .selectall { text-align: right; } #adminpage .selectall { text-align: right; }
.checkbox {
width: 1.2em;
height: 1.2em;
}
.channels_ckbx, .pending_ckbx, .users_ckbx { .channels_ckbx, .pending_ckbx, .users_ckbx {
margin-top: -5px !important; margin-top: 0px !important;
margin-left: 0px !important;
} }

4
view/theme/redbasic/css/style.css
View File

@ -2293,6 +2293,6 @@ nav .badge.mail-update:hover {
background-color: #337AB7; background-color: #337AB7;
} }
.channels_ckbx, .pending_ckbx, .users_ckbx { /*.channels_ckbx, .pending_ckbx, .users_ckbx {
margin-top: -5px !important; margin-top: -5px !important;
} }*/