From c96b18359f89070838d87ac1d8eeb363c32b0e00 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Fri, 15 Aug 2014 13:17:38 +0200 Subject: [PATCH 1/3] .btn-xs 0.65 > 0.7rem --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 704c2c944..5a0e583d2 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2378,7 +2378,7 @@ blockquote { } .btn-xs { - font-size: 0.65rem; + font-size: 0.7rem; } .btn-default { From b88e1e98624510ceb5cc63a12d9f229213f2d5a1 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Fri, 15 Aug 2014 14:00:51 +0200 Subject: [PATCH 2/3] .btn.xs > 0.75rem (let's keep that as the min. scalable font size) --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5a0e583d2..889988d48 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2378,7 +2378,7 @@ blockquote { } .btn-xs { - font-size: 0.7rem; + font-size: 0.75rem; } .btn-default { From f36253b7a8f3cc628b985df1ab257ff03189727c Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Fri, 15 Aug 2014 14:56:17 +0200 Subject: [PATCH 3/3] Account deletion fix multi user deletion, add confirmation message --- include/Contact.php | 2 ++ mod/admin.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/Contact.php b/include/Contact.php index 47b1763cb..140f449af 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -185,6 +185,7 @@ function account_remove($account_id,$local = true,$unset_session=true) { $r = q("select * from account where account_id = %d limit 1", intval($account_id) ); + $account_email=$r[0]['account_email']; if(! $r) { logger('account_remove: No account with id: ' . $account_id); @@ -207,6 +208,7 @@ function account_remove($account_id,$local = true,$unset_session=true) { if ($unset_session) { unset($_SESSION['authenticated']); unset($_SESSION['uid']); + notice( sprintf(t("User '%s' deleted"),$account_email) . EOL); goaway(get_app()->get_baseurl()); } return $r; diff --git a/mod/admin.php b/mod/admin.php index 230ef3011..14657bd1a 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -639,7 +639,7 @@ function admin_page_users_post(&$a){ if (x($_POST,'page_users_delete')){ require_once("include/Contact.php"); foreach($users as $uid){ - account_remove($uid,true); + account_remove($uid,true,false); } notice( sprintf( tt("%s user deleted", "%s users deleted", count($users)), count($users)) ); }