diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-01-15 11:28:05 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-01-15 11:28:05 +0100 |
| commit | f4e1b2123aed39e3f863ee327b27cb0e7f17520c (patch) | |
| tree | f24802e587f07718fc9cf286ff09be6472eef79d /mod | |
| parent | 63ee0daac51b8c04123479f2ac91e1762492896f (diff) | |
| download | volse-hubzilla-f4e1b2123aed39e3f863ee327b27cb0e7f17520c.tar.gz volse-hubzilla-f4e1b2123aed39e3f863ee327b27cb0e7f17520c.tar.bz2 volse-hubzilla-f4e1b2123aed39e3f863ee327b27cb0e7f17520c.zip | |
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...
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/connections.php | 8 | ||||
| -rw-r--r-- | mod/connedit.php | 4 |
2 files changed, 3 insertions, 9 deletions
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) ); } } diff --git a/mod/connedit.php b/mod/connedit.php index bcf2d744b..cb785fc31 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -714,10 +714,6 @@ function connedit_content(&$a) { '$slide' => $slide, '$affinity' => $affinity, '$pending_label' => t('Connection Pending Approval'), - '$pending_modal_title' => t('Connection Request'), - '$pending_modal_body' => sprintf(t('(%s) would like to connect with you. Please approve this connection to allow communication.'), $contact['xchan_addr']), - '$pending_modal_approve' => t('Approve'), - '$pending_modal_dismiss' => t('Approve Later'), '$is_pending' => (intval($contact['abook_pending']) ? 1 : ''), '$unapproved' => $unapproved, '$inherited' => t('inherited'), |