From dd45daaad8637f72aa9d0f927f89e637783fdbf8 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 11 Mar 2013 02:19:25 +0000 Subject: [PATCH 1/3] Get rid of max-height - no longer breaks newer versions of chrome, but does break showmore. --- view/theme/redbasic/css/style.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c6490a573..b20b1434e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1090,8 +1090,7 @@ footer { } .wall-item-content img { - max-height: 95% !important; - max-width: 95% !important; + max-width: 95% !important; /* box-shadow: 8px 8px 8px #666; can't really have this because of smileys */ } @@ -3777,4 +3776,4 @@ ul.menu-popup { margin-top: 8px; } -.profile-match-connect { margin-top: 5px; } \ No newline at end of file +.profile-match-connect { margin-top: 5px; } From fbc5260995866c280fbc48bfb7899836f46136f4 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 12 Mar 2013 02:35:18 +0000 Subject: [PATCH 2/3] Get admin/users mostly working. Still need to associate channels with accounts. --- mod/admin.php | 20 +++++--------------- view/tpl/admin_users.tpl | 7 ++++--- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index aa3d7b294..e88936cf4 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -566,20 +566,9 @@ function admin_page_users(&$a){ // FIXME this is borked since there is no more user table - $users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date` - FROM - (SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid` - FROM `item` - WHERE `item`.`type` = 'wall' - GROUP BY `item`.`uid`) AS `lastitem` - RIGHT OUTER JOIN `user` ON `user`.`uid` = `lastitem`.`uid`, - `contact` - WHERE - `user`.`uid` = `contact`.`uid` - AND `user`.`verified` =1 - AND `contact`.`self` =1 - ORDER BY `contact`.`name` LIMIT %d, %d - ", +// $users = q("SELECT `account_email` FROM `account` +// ", + $users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_service_class` FROM `account`", intval($a->pager['start']), intval($a->pager['itemspage']) ); @@ -591,6 +580,7 @@ function admin_page_users(&$a){ t('Community/Celebrity Account'), t('Automatic Friend Account') ); + $e['page_flags'] = $accounts[$e['page-flags']]; $e['register_date'] = relative_date($e['register_date']); $e['login_date'] = relative_date($e['login_date']); @@ -617,7 +607,7 @@ function admin_page_users(&$a){ '$unblock' => t('Unblock'), '$h_users' => t('Users'), - '$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Account') ), + '$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Account'), 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?'), diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 727030f5d..b8822175c 100644 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -66,11 +66,12 @@ $u.nickname $u.name - $u.email - $u.register_date - $u.login_date + $u.account_email + $u.account_created + $u.account_lastlog $u.lastitem_date $u.page_flags + $u.account_service_class From b48c481b9cb1b1c06634139dc0e6c4c91b83d873 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 15 Mar 2013 15:25:39 +0000 Subject: [PATCH 3/3] Tidy up --- mod/admin.php | 9 ++++----- view/tpl/admin_users.tpl | 3 --- view/tpl/smarty3/admin_users.tpl | 10 ++++------ 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index e88936cf4..be8575e4e 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -564,10 +564,9 @@ function admin_page_users(&$a){ $a->set_pager_itemspage(100); } -// FIXME this is borked since there is no more user table - -// $users = q("SELECT `account_email` FROM `account` -// ", + +// WEe'll still need to link email addresses to admin/users/channels or some such, but this bit doesn't exist yet. +// That's where we need to be doing last post/channel flags/etc, not here. $users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_service_class` FROM `account`", intval($a->pager['start']), intval($a->pager['itemspage']) @@ -607,7 +606,7 @@ function admin_page_users(&$a){ '$unblock' => t('Unblock'), '$h_users' => t('Users'), - '$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Account'), t('Service Class')), + '$th_users' => array( t('Email'), t('Register date'), t('Last login'), 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?'), diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index b8822175c..6de504e2a 100644 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -65,12 +65,9 @@ {{ for $users as $u }} $u.nickname - $u.name $u.account_email $u.account_created $u.account_lastlog - $u.lastitem_date - $u.page_flags $u.account_service_class diff --git a/view/tpl/smarty3/admin_users.tpl b/view/tpl/smarty3/admin_users.tpl index 5448a08c4..136ce3c3e 100644 --- a/view/tpl/smarty3/admin_users.tpl +++ b/view/tpl/smarty3/admin_users.tpl @@ -70,12 +70,10 @@ {{foreach $users as $u}} {{$u.nickname}} - {{$u.name}} - {{$u.email}} - {{$u.register_date}} - {{$u.login_date}} - {{$u.lastitem_date}} - {{$u.page_flags}} + {{$u.account_email}} + {{$u.account_created}} + {{$u.account_lastlog}} + {{$u.account_service_class}}