From 63ee0daac51b8c04123479f2ac91e1762492896f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 15 Jan 2016 10:42:44 +0100 Subject: provide more contact infos and update some protocol type definitions --- mod/connections.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mod/connections.php') diff --git a/mod/connections.php b/mod/connections.php index 1635dcee0..08da4a790 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -231,7 +231,7 @@ function connections_content(&$a) { $status_str = ''; $status = array( - ((intval($rr['abook_pending'])) ? t('Pending') : ''), + ((intval($rr['abook_pending'])) ? t('Pending approval') : ''), ((intval($rr['abook_archived'])) ? t('Archived') : ''), ((intval($rr['abook_hidden'])) ? t('Hidden') : ''), ((intval($rr['abook_ignored'])) ? t('Ignored') : ''), @@ -262,6 +262,9 @@ function connections_content(&$a) { 'edit' => t('Edit'), 'delete' => t('Delete'), 'url' => chanlink_url($rr['xchan_url']), + 'webbie_label' => t('Channel address'), + 'webbie' => $rr['xchan_addr'], + 'network_label' => t('Network'), 'network' => network_to_name($rr['xchan_network']), 'public_forum' => ((intval($rr['xchan_pubforum'])) ? true : false), 'status_label' => t('Status'), -- cgit v1.2.3 From f4e1b2123aed39e3f863ee327b27cb0e7f17520c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 15 Jan 2016 11:28:05 +0100 Subject: add an approve button to /connections and get rid of the modal popup in /connedit. for quick approval (default collection and perms etc.) we now can use the approve button in /connections else click the edit button and make changes and approval from /connedit. hope thats any better... --- mod/connections.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'mod/connections.php') diff --git a/mod/connections.php b/mod/connections.php index 08da4a790..3297ae8f8 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -251,15 +251,11 @@ function connections_content(&$a) { 'edit_hover' => t('Edit connection'), 'delete_hover' => t('Delete connection'), 'id' => $rr['abook_id'], - 'alt_text' => $alt_text, - 'dir_icon' => $dir_icon, 'thumb' => $rr['xchan_photo_m'], 'name' => $rr['xchan_name'], - 'username' => $rr['xchan_name'], 'classes' => (intval($rr['abook_archived']) ? 'archived' : ''), 'link' => z_root() . '/connedit/' . $rr['abook_id'], 'deletelink' => z_root() . '/connedit/' . $rr['abook_id'] . '/drop', - 'edit' => t('Edit'), 'delete' => t('Delete'), 'url' => chanlink_url($rr['xchan_url']), 'webbie_label' => t('Channel address'), @@ -270,7 +266,9 @@ function connections_content(&$a) { 'status_label' => t('Status'), 'status' => $status_str, 'connected_label' => t('Connected'), - 'connected' => datetime_convert('UTC',date_default_timezone_get(),$rr['abook_created'], 'c') + 'connected' => datetime_convert('UTC',date_default_timezone_get(),$rr['abook_created'], 'c'), + 'approve_hover' => t('Approve connection'), + 'approve' => (($rr['abook_pending']) ? t('Approve') : false) ); } } -- cgit v1.2.3 From d36aa4fc89f99dc408e356347e74eead746f3e53 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 15 Jan 2016 12:08:04 +0100 Subject: provide a recent activity link in /connections --- mod/connections.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mod/connections.php') diff --git a/mod/connections.php b/mod/connections.php index 3297ae8f8..f43dec73e 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -255,7 +255,7 @@ function connections_content(&$a) { 'name' => $rr['xchan_name'], 'classes' => (intval($rr['abook_archived']) ? 'archived' : ''), 'link' => z_root() . '/connedit/' . $rr['abook_id'], - 'deletelink' => z_root() . '/connedit/' . $rr['abook_id'] . '/drop', + 'deletelink' => z_root() . '/connedit/' . intval($rr['abook_id']) . '/drop', 'delete' => t('Delete'), 'url' => chanlink_url($rr['xchan_url']), 'webbie_label' => t('Channel address'), @@ -268,7 +268,9 @@ function connections_content(&$a) { 'connected_label' => t('Connected'), 'connected' => datetime_convert('UTC',date_default_timezone_get(),$rr['abook_created'], 'c'), 'approve_hover' => t('Approve connection'), - 'approve' => (($rr['abook_pending']) ? t('Approve') : false) + 'approve' => (($rr['abook_pending']) ? t('Approve') : false), + 'recent_label' => t('Recent activity'), + 'recentlink' => z_root() . '/network/?f=&cid=' . intval($rr['abook_id']) ); } } -- cgit v1.2.3