harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

channels you are connected to are "connections". Get rid of "address book" which doesn't fit.

Browse Source
This commit is contained in:
friendica 2012-11-03 02:00:48 -07:00
parent a47a1d5eb9
commit 140f464e02
4 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -1767,7 +1767,7 @@ if(! function_exists('profile_tabs')){
$channel = $a->get_channel(); $channel = $a->get_channel();
if (is_null($nickname)) if (is_null($nickname))
$nickname = $a->channel['channel_address']; $nickname = $channel['channel_address'];
if(x($_GET,'tab')) if(x($_GET,'tab'))
$tab = notags(trim($_GET['tab'])); $tab = notags(trim($_GET['tab']));

4
include/contact_widgets.php
View File

@ -3,8 +3,8 @@
function follow_widget() { function follow_widget() {
return replace_macros(get_markup_template('follow.tpl'),array( return replace_macros(get_markup_template('follow.tpl'),array(
'$connect' => t('Add New Channel'), '$connect' => t('Add New Connection'),
'$desc' => t('Enter webbie (channel location)'), '$desc' => t('Enter the channel address'),
'$hint' => t('Example: bob@example.com, http://example.com/barbara'), '$hint' => t('Example: bob@example.com, http://example.com/barbara'),
'$follow' => t('Connect') '$follow' => t('Connect')
)); ));

2
include/nav.php
View File

@ -153,7 +153,7 @@ EOT;
$nav['settings'] = array('settings', t('Settings'),"", t('Account settings')); $nav['settings'] = array('settings', t('Settings'),"", t('Account settings'));
$nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/edit profiles')); $nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/edit profiles'));
$nav['contacts'] = array('abook', t('Address Book'),"", t('Manage/edit friends and channels')); $nav['contacts'] = array('connections', t('Connections'),"", t('Manage/edit friends and channels'));
} }
/** /**

52
mod/abook.php → mod/connections.php
View File

@ -6,7 +6,7 @@ require_once('include/contact_selectors.php');
require_once('include/group.php'); require_once('include/group.php');
require_once('include/contact_widgets.php'); require_once('include/contact_widgets.php');
function abook_init(&$a) { function connections_init(&$a) {
if(! local_user()) if(! local_user())
return; return;
@ -58,7 +58,7 @@ EOT;
} }
function abook_post(&$a) { function connections_post(&$a) {
if(! local_user()) if(! local_user())
return; return;
@ -132,11 +132,11 @@ function abook_post(&$a) {
function abook_content(&$a) { function connections_content(&$a) {
$sort_type = 0; $sort_type = 0;
$o = ''; $o = '';
nav_set_selected('abook'); nav_set_selected('connections');
if(! local_user()) { if(! local_user()) {
@ -215,14 +215,14 @@ EOT;
if(! count($orig_record)) { if(! count($orig_record)) {
notice( t('Could not access address book record.') . EOL); notice( t('Could not access address book record.') . EOL);
goaway($a->get_baseurl(true) . '/abook'); goaway($a->get_baseurl(true) . '/connections');
} }
if($cmd === 'update') { if($cmd === 'update') {
// pull feed and consume it, which should subscribe to the hub. // pull feed and consume it, which should subscribe to the hub.
proc_run('php',"include/poller.php","$contact_id"); proc_run('php',"include/poller.php","$contact_id");
goaway($a->get_baseurl(true) . '/abook/' . $contact_id); goaway($a->get_baseurl(true) . '/connections/' . $contact_id);
} }
@ -233,7 +233,7 @@ EOT;
: t('Channel has been blocked')) . EOL ); : t('Channel has been blocked')) . EOL );
else else
notice(t('Unable to set address book parameters.') . EOL); notice(t('Unable to set address book parameters.') . EOL);
goaway($a->get_baseurl(true) . '/abook/' . $contact_id); goaway($a->get_baseurl(true) . '/connections/' . $contact_id);
} }
if($cmd === 'ignore') { if($cmd === 'ignore') {
@ -243,7 +243,7 @@ EOT;
: t('Channel has been ignored')) . EOL ); : t('Channel has been ignored')) . EOL );
else else
notice(t('Unable to set address book parameters.') . EOL); notice(t('Unable to set address book parameters.') . EOL);
goaway($a->get_baseurl(true) . '/abook/' . $contact_id); goaway($a->get_baseurl(true) . '/connections/' . $contact_id);
} }
if($cmd === 'archive') { if($cmd === 'archive') {
@ -253,7 +253,7 @@ EOT;
: t('Channel has been archived')) . EOL ); : t('Channel has been archived')) . EOL );
else else
notice(t('Unable to set address book parameters.') . EOL); notice(t('Unable to set address book parameters.') . EOL);
goaway($a->get_baseurl(true) . '/abook/' . $contact_id); goaway($a->get_baseurl(true) . '/connections/' . $contact_id);
} }
if($cmd === 'hide') { if($cmd === 'hide') {
@ -263,7 +263,7 @@ EOT;
: t('Channel has been hidden')) . EOL ); : t('Channel has been hidden')) . EOL );
else else
notice(t('Unable to set address book parameters.') . EOL); notice(t('Unable to set address book parameters.') . EOL);
goaway($a->get_baseurl(true) . '/abook/' . $contact_id); goaway($a->get_baseurl(true) . '/connections/' . $contact_id);
} }
// FIXME // FIXME
@ -434,47 +434,47 @@ EOT;
'label' => t('Suggestions'), 'label' => t('Suggestions'),
'url' => $a->get_baseurl(true) . '/suggest', 'url' => $a->get_baseurl(true) . '/suggest',
'sel' => '', 'sel' => '',
'title' => t('Suggest new channels'), 'title' => t('Suggest new connections'),
), ),
array( array(
'label' => t('All Channels'), 'label' => t('All Connections'),
'url' => $a->get_baseurl(true) . '/channels/all', 'url' => $a->get_baseurl(true) . '/connections/all',
'sel' => ($all) ? 'active' : '', 'sel' => ($all) ? 'active' : '',
'title' => t('Show all channels'), 'title' => t('Show all connections'),
), ),
array( array(
'label' => t('Unblocked'), 'label' => t('Unblocked'),
'url' => $a->get_baseurl(true) . '/channels', 'url' => $a->get_baseurl(true) . '/connections',
'sel' => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored) && (! $archived)) ? 'active' : '', 'sel' => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored) && (! $archived)) ? 'active' : '',
'title' => t('Only show unblocked channels'), 'title' => t('Only show unblocked connections'),
), ),
array( array(
'label' => t('Blocked'), 'label' => t('Blocked'),
'url' => $a->get_baseurl(true) . '/channels/blocked', 'url' => $a->get_baseurl(true) . '/connections/blocked',
'sel' => ($blocked) ? 'active' : '', 'sel' => ($blocked) ? 'active' : '',
'title' => t('Only show blocked channels'), 'title' => t('Only show blocked connections'),
), ),
array( array(
'label' => t('Ignored'), 'label' => t('Ignored'),
'url' => $a->get_baseurl(true) . '/channels/ignored', 'url' => $a->get_baseurl(true) . '/connections/ignored',
'sel' => ($ignored) ? 'active' : '', 'sel' => ($ignored) ? 'active' : '',
'title' => t('Only show ignored channels'), 'title' => t('Only show ignored connections'),
), ),
array( array(
'label' => t('Archived'), 'label' => t('Archived'),
'url' => $a->get_baseurl(true) . '/channels/archived', 'url' => $a->get_baseurl(true) . '/connections/archived',
'sel' => ($archived) ? 'active' : '', 'sel' => ($archived) ? 'active' : '',
'title' => t('Only show archived channels'), 'title' => t('Only show archived connections'),
), ),
array( array(
'label' => t('Hidden'), 'label' => t('Hidden'),
'url' => $a->get_baseurl(true) . '/channels/hidden', 'url' => $a->get_baseurl(true) . '/connections/hidden',
'sel' => ($hidden) ? 'active' : '', 'sel' => ($hidden) ? 'active' : '',
'title' => t('Only show hidden channel s'), 'title' => t('Only show hidden connections'),
), ),
); );
@ -572,11 +572,11 @@ EOT;
$tpl = get_markup_template("contacts-template.tpl"); $tpl = get_markup_template("contacts-template.tpl");
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''), '$header' => t('Connnections') . (($nets) ? ' - ' . network_to_name($nets) : ''),
'$tabs' => $t, '$tabs' => $t,
'$total' => $total, '$total' => $total,
'$search' => $search_hdr, '$search' => $search_hdr,
'$desc' => t('Search your contacts'), '$desc' => t('Search your connnections'),
'$finding' => (($searching) ? t('Finding: ') . "'" . $search . "'" : ""), '$finding' => (($searching) ? t('Finding: ') . "'" . $search . "'" : ""),
'$submit' => t('Find'), '$submit' => t('Find'),
'$cmd' => $a->cmd, '$cmd' => $a->cmd,