aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-16 19:54:38 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-16 19:54:38 -0700
commitbe3a272a80182074e7417e33cc280b523779254b (patch)
tree2fd1ad8b9d5fb14b84828ffcb96efa14a34eb087
parent6a1d1867f0dccccaf567c689a701e62c7f3a9a6d (diff)
parent631eb4b2c213cf612e97f6a90ff1dbf1352eadad (diff)
downloadvolse-hubzilla-be3a272a80182074e7417e33cc280b523779254b.tar.gz
volse-hubzilla-be3a272a80182074e7417e33cc280b523779254b.tar.bz2
volse-hubzilla-be3a272a80182074e7417e33cc280b523779254b.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
-rw-r--r--mod/admin.php14
-rw-r--r--view/css/mod_admin.css7
-rw-r--r--view/theme/redbasic/css/style.css4
3 files changed, 15 insertions, 10 deletions
diff --git a/mod/admin.php b/mod/admin.php
index 794bac69b..89207e4fa 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -677,7 +677,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')) {
@@ -685,7 +685,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')) {
@@ -733,7 +733,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",
@@ -741,7 +741,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",
@@ -749,7 +749,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;
}
@@ -826,8 +826,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;
-}
+}*/