From 631eb4b2c213cf612e97f6a90ff1dbf1352eadad Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Sun, 16 Aug 2015 19:52:25 -0700
Subject: [PATCH] issue #386 - account and channel bulk edit checkboxes not
 visible and therefore not useable. Also change wording to remove the
 offensive 'user' designation.

---
 mod/admin.php                     | 14 +++++++-------
 view/css/mod_admin.css            |  7 ++++++-
 view/theme/redbasic/css/style.css |  4 ++--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/mod/admin.php b/mod/admin.php
index 74abc0b34..beb629396 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -680,7 +680,7 @@ function admin_page_users_post($a) {
 				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
 	if (x($_POST, 'page_users_delete')) {
@@ -688,7 +688,7 @@ function admin_page_users_post($a) {
 		foreach ($users as $uid){
 			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
 	if (x($_POST, 'page_users_approve')) {
@@ -736,7 +736,7 @@ function admin_page_users(&$a){
 				require_once('include/Contact.php');
 				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;
 			case 'block':
 				q("UPDATE account SET account_flags = ( account_flags | %d ) WHERE account_id = %d",
@@ -744,7 +744,7 @@ function admin_page_users(&$a){
 					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;
 			case 'unblock':
 				q("UPDATE account SET account_flags = ( account_flags & ~%d ) WHERE account_id = %d",
@@ -752,7 +752,7 @@ function admin_page_users(&$a){
 						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;
 		}
 
@@ -830,8 +830,8 @@ function admin_page_users(&$a){
 		'$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')),
 
-		'$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' => 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_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 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"),
 
diff --git a/view/css/mod_admin.css b/view/css/mod_admin.css
index f052175bb..9a7cb4bb3 100644
--- a/view/css/mod_admin.css
+++ b/view/css/mod_admin.css
@@ -61,7 +61,12 @@
 #adminpage table tr:hover { background-color: #bbc7d7; }
 #adminpage .selectall { text-align: right; }
 
+.checkbox {
+   width: 1.2em;
+   height: 1.2em;
+}
 
 .channels_ckbx, .pending_ckbx, .users_ckbx {
-	margin-top: -5px !important;
+	margin-top: 0px !important;
+	margin-left: 0px !important;
 }
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 046d8471b..702c7238e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2293,6 +2293,6 @@ nav .badge.mail-update:hover {
     background-color: #337AB7;
 }
 
-.channels_ckbx, .pending_ckbx, .users_ckbx {
+/*.channels_ckbx, .pending_ckbx, .users_ckbx {
 	margin-top: -5px !important;
-}
+}*/