From cb1c6dd1e37ccbbea47867faf0142e5d2f653624 Mon Sep 17 00:00:00 2001
From: Devlon Duthie <duthied@gmail.com>
Date: Sun, 25 Sep 2011 13:20:19 -0500
Subject: really commiting files this time, still getting the hang of git. some
 images added, some classes added to groupidebar, contacts sidebar
 notification flags moved out of nav and into banner for testbubble the
 testbubble css tweaks

---
 mod/contacts.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'mod/contacts.php')

diff --git a/mod/contacts.php b/mod/contacts.php
index 307e9b15b..24613a994 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -36,15 +36,16 @@ function contacts_init(&$a) {
 	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>';
+	
 	$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
 	));
 
 
-- 
cgit v1.2.3


From 19963884c29b82b04cdda481837f783c19f172a6 Mon Sep 17 00:00:00 2001
From: Devlon Duthie <duthied@gmail.com>
Date: Sun, 25 Sep 2011 15:45:03 -0500
Subject: moved invite friends into 'find people' block misc. styling tweaks

---
 mod/contacts.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'mod/contacts.php')

diff --git a/mod/contacts.php b/mod/contacts.php
index 24613a994..6dda546d3 100644
--- 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,22 +31,26 @@ function contacts_init(&$a) {
 			. '</div>' . $inv;
 		}
 	}
-	elseif($a->config['register_policy'] != REGISTER_CLOSED)
-		$a->page['aside'] .= $inv;
 
 	$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'),
-		'$findSimilar' => $findSimilarLink
+		'$findSimilar' => $findSimilarLink,
+		'$inviteFriends' => $inv
 	));
 
-
+	
 
 }
 
-- 
cgit v1.2.3