aboutsummaryrefslogtreecommitdiffstats
path: root/mod/contacts.php
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-10-11 18:24:37 -0700
committerFriendika <info@friendika.com>2011-10-11 18:24:37 -0700
commit557a7d0cec31a36d12898429c479c71671833dfd (patch)
treeab1781533e91b63b86a2ef726c65092ad8009efb /mod/contacts.php
parentcaf18164f0f7bd336e61d4393dabf6d93c739879 (diff)
downloadvolse-hubzilla-557a7d0cec31a36d12898429c479c71671833dfd.tar.gz
volse-hubzilla-557a7d0cec31a36d12898429c479c71671833dfd.tar.bz2
volse-hubzilla-557a7d0cec31a36d12898429c479c71671833dfd.zip
stuff
- background the external network notifications (Facebook, Twitter, Statusnet) - add vimeo support - consolidate editor video options (insert video, regardless of source) - add "Connector Settings" page purely for configuring connectors - moved mailbox settings to Connectors - Move the "Connect/Follow" dialogue out of "find people" and move to top. - Add "Find People" dialogue - minor theme edits on duepuntozero and testbubble to make all this stuff work - A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.
Diffstat (limited to 'mod/contacts.php')
-rw-r--r--mod/contacts.php33
1 files changed, 20 insertions, 13 deletions
diff --git a/mod/contacts.php b/mod/contacts.php
index ea429d39f..d24873b8f 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -21,6 +21,16 @@ function contacts_init(&$a) {
require_once('include/group.php');
if(! x($a->page,'aside'))
$a->page['aside'] = '';
+
+ $a->page['aside'] .= replace_macros(get_markup_template('follow.tpl'),array(
+ '$connect' => t('Add New Contact'),
+ '$desc' => t('Enter address or web location'),
+ '$hint' => t('Example: bob@example.com, http://example.com/barbara'),
+ '$follow' => t('Connect')
+ ));
+
+
+
$a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
if(get_config('system','invitation_only')) {
@@ -32,22 +42,18 @@ function contacts_init(&$a) {
}
}
- $tpl = get_markup_template('follow.tpl');
-
- $findSimilarLink = '<div class="side-link" id="side-match-link"><a href="match" >'
- . t('Similar Interests') . '</a></div>';
+ $tpl = get_markup_template('peoplefind.tpl');
- $inv = '';
- if($a->config['register_policy'] != REGISTER_CLOSED) {
- $inv = '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
- }
-
+ $inv = (($a->config['register_policy'] != REGISTER_CLOSED) ? t('Invite Friends') : '');
+
$a->page['aside'] .= replace_macros($tpl,array(
+ '$findpeople' => t('Find People'),
+ '$desc' => t('Enter name or interest'),
'$label' => t('Connect/Follow'),
- '$hint' => t('Example: bob@example.com, http://example.com/barbara'),
- '$follow' => t('Follow'),
- '$findSimilar' => $findSimilarLink,
- '$inviteFriends' => $inv
+ '$hint' => t('Examples: Robert Morgenstein, Fishing'),
+ '$findthem' => t('Find'),
+ '$similar' => t('Similar Interests'),
+ '$inv' => $inv
));
@@ -351,6 +357,7 @@ function contacts_content(&$a) {
'$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ),
'$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections')),
'$search' => $search,
+ '$desc' => t('Search your contacts'),
'$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
'$submit' => t('Find'),
'$cmd' => $a->cmd