From 1ccf836ebbc67a2eaf0a7c43a88c17235c94aef6 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 24 Jan 2016 18:33:02 -0800 Subject: regression: channel name missing on delegate section of manage page --- mod/manage.php | 1 + 1 file changed, 1 insertion(+) (limited to 'mod/manage.php') diff --git a/mod/manage.php b/mod/manage.php index b609ede44..0a0cfe921 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -148,6 +148,7 @@ function manage_content(&$a) { for($x = 0; $x < count($delegates); $x ++) { $delegates[$x]['link'] = 'magic?f=&dest=' . urlencode($delegates[$x]['xchan_url']) . '&delegate=' . urlencode($delegates[$x]['xchan_addr']); + $delegates[$x]['channel_name'] = $delegates[$x]['xchan_name']; } } else { -- cgit v1.2.3 From 9081ddb455993cef96e121cebb2f569ae63a50f3 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 24 Jan 2016 18:36:38 -0800 Subject: don't provide notification icons on manage page for delegated channels --- mod/manage.php | 1 + 1 file changed, 1 insertion(+) (limited to 'mod/manage.php') diff --git a/mod/manage.php b/mod/manage.php index 0a0cfe921..671003efd 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -149,6 +149,7 @@ function manage_content(&$a) { $delegates[$x]['link'] = 'magic?f=&dest=' . urlencode($delegates[$x]['xchan_url']) . '&delegate=' . urlencode($delegates[$x]['xchan_addr']); $delegates[$x]['channel_name'] = $delegates[$x]['xchan_name']; + $delegates[$x]['delegate'] = 1; } } else { -- cgit v1.2.3 From 97e1a6dfde7d8d8e23d463ab22f24011cbce0d8c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 22 Mar 2016 02:06:19 +0100 Subject: whip mod manage into shape --- mod/manage.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'mod/manage.php') diff --git a/mod/manage.php b/mod/manage.php index 671003efd..1f7c26cd8 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -134,9 +134,7 @@ function manage_content(&$a) { } } - $links = array( - array( 'new_channel', t('Create a new channel'), t('Create a new channel')) - ); + $create = array( 'new_channel', t('Create a new channel'), t('Create New')); $delegates = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and (abook_their_perms & %d) > 0", @@ -156,8 +154,6 @@ function manage_content(&$a) { $delegates = null; } - - $o = replace_macros(get_markup_template('channels.tpl'), array( '$header' => t('Channel Manager'), '$msg_selected' => t('Current Channel'), @@ -165,17 +161,16 @@ function manage_content(&$a) { '$desc' => t('Switch to one of your channels by selecting it.'), '$msg_default' => t('Default Channel'), '$msg_make_default' => t('Make Default'), - '$links' => $links, + '$create' => $create, '$all_channels' => $channels, '$mail_format' => t('%d new messages'), '$intros_format' => t('%d new introductions'), '$channel_usage_message' => $channel_usage_message, - '$delegate_header' => t('Delegated Channels'), + '$delegated_desc' => t('Delegated Channel'), '$delegates' => $delegates, )); - return $o; } -- cgit v1.2.3 From c6b89b99b9a98a5a25087190eeeee15365c7a853 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 22 Mar 2016 10:29:17 +0100 Subject: Add a link to /locs to channel manager --- mod/manage.php | 1 + 1 file changed, 1 insertion(+) (limited to 'mod/manage.php') diff --git a/mod/manage.php b/mod/manage.php index 1f7c26cd8..cb845befe 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -168,6 +168,7 @@ function manage_content(&$a) { '$channel_usage_message' => $channel_usage_message, '$delegated_desc' => t('Delegated Channel'), '$delegates' => $delegates, + '$locs' => t('Manage locations') )); -- cgit v1.2.3 From a50706317435d09cacb95cad0a6ccaf8ae5b5f6c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 26 Mar 2016 18:43:38 +0100 Subject: move link to /locs to settings menu if we have more than one location and some template work on locs --- mod/manage.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'mod/manage.php') diff --git a/mod/manage.php b/mod/manage.php index cb845befe..d769f0393 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -167,9 +167,7 @@ function manage_content(&$a) { '$intros_format' => t('%d new introductions'), '$channel_usage_message' => $channel_usage_message, '$delegated_desc' => t('Delegated Channel'), - '$delegates' => $delegates, - '$locs' => t('Manage locations') - + '$delegates' => $delegates )); return $o; -- cgit v1.2.3 From 9abd95fad3784a10fc48bc40f9b8a75d7d74edda Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 31 Mar 2016 16:06:03 -0700 Subject: static App --- mod/manage.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod/manage.php') diff --git a/mod/manage.php b/mod/manage.php index d769f0393..5ac3e6af8 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -29,7 +29,7 @@ function manage_content(&$a) { $r = change_channel($change_channel); 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 + goaway(z_root() . '/' . implode('/',array_slice(App::$argv,2))); // Go to whatever is after /manage/, but with the new channel } else { if($r && $r['channel_startpage']) @@ -45,7 +45,7 @@ function manage_content(&$a) { intval(get_account_id()) ); - $account = get_app()->get_account(); + $account = App::get_account(); if($r && count($r)) { $channels = $r; -- cgit v1.2.3