From 6a679d26ce1c2947e49c74f3b6a98a7ad770b325 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sat, 27 Dec 2014 13:36:05 +0100 Subject: Fix #771, add tooltips to mail and intros count in channel manager, always show counts (even when 0, makes it easier to understand what the icons are) --- mod/manage.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/manage.php b/mod/manage.php index 00c6db7f0..28fa8e658 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -49,7 +49,7 @@ function manage_content(&$a) { for($x = 0; $x < count($channels); $x ++) { $channels[$x]['link'] = 'manage/' . intval($channels[$x]['channel_id']); if($channels[$x]['channel_id'] == local_user()) - $selected_channel = $channels[$x]; + $selected_channel = &$channels[$x]; // Needs to be a reference! $channels[$x]['default'] = (($channels[$x]['channel_id'] == $account['account_default_channel']) ? "1" : ''); $channels[$x]['default_links'] = '1'; @@ -153,6 +153,8 @@ function manage_content(&$a) { '$msg_make_default' => t('Make Default'), '$links' => $links, '$all_channels' => $channels, + '$mail_format' => t('%d new messages'), + '$intros_format' => t('%d new introductions'), '$channel_usage_message' => $channel_usage_message, )); -- cgit v1.2.3 From 40a327b68fe1bb37bbc2fc6bc1c6d761ee564898 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sat, 27 Dec 2014 14:06:09 +0100 Subject: Allow quick access to mail and connections from Channel Manager --- mod/manage.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'mod') diff --git a/mod/manage.php b/mod/manage.php index 28fa8e658..21327a120 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -28,8 +28,13 @@ function manage_content(&$a) { if($change_channel) { $r = change_channel($change_channel); - if($r && $r['channel_startpage']) - goaway(z_root() . '/' . $r['channel_startpage']); + if((argc() > 2) && !(argv(2) === 'default')) { + goaway(z_root() . '/' . implode('/',array_slice($a->argv,2))); // Go to whatever is after /manage/, but with the new channel + } + else { + if($r && $r['channel_startpage']) + goaway(z_root() . '/' . $r['channel_startpage']); // If nothing extra is specified, go to the default page + } goaway(z_root()); } -- cgit v1.2.3