Merge pull request #3 from fabrixxm/master

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index 307e9b15bce6899d835bb137605b8569698cf9bc..ea429d39fe15384b90f445f129bd84ba35393b0e 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -23,8 +23,6 @@ function contacts_init(&$a) {
                $a->page['aside'] = '';
        $a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
 
-       $inv = '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
-
        if(get_config('system','invitation_only')) {
                $x = get_pconfig(local_user(),'system','invites_remaining');
                if($x || is_site_admin()) {
@@ -33,21 +31,26 @@ function contacts_init(&$a) {
                        . '</div>' . $inv;
                }
        }
-       elseif($a->config['register_policy'] != REGISTER_CLOSED)
-               $a->page['aside'] .= $inv;
-
-
-       $a->page['aside'] .= '<div class="side-link" id="side-match-link"><a href="match" >' 
-               . t('Find People With Shared Interests') . '</a></div>';
 
        $tpl = get_markup_template('follow.tpl');
+       
+       $findSimilarLink = '<div class="side-link" id="side-match-link"><a href="match" >' 
+               . t('Similar Interests') . '</a></div>';
+       
+       $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>';
+       }
+               
        $a->page['aside'] .= replace_macros($tpl,array(
                '$label' => t('Connect/Follow'),
                '$hint' => t('Example: bob@example.com, http://example.com/barbara'),
-               '$follow' => t('Follow')
+               '$follow' => t('Follow'),
+               '$findSimilar' => $findSimilarLink,
+               '$inviteFriends' => $inv
        ));
 
-
+       
 
 }
 
@@ -114,7 +117,7 @@ function contacts_content(&$a) {
 
        $sort_type = 0;
        $o = '';
-       $o .= '<script> $(document).ready(function() { $(\'#nav-contacts-link\').addClass(\'nav-selected\'); });</script>';
+       nav_set_selected('contacts');
 
        $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;