From 5d6a098ce0bf14e372c297ed09c9f0452fa60ec7 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 18 Dec 2011 01:44:46 -0800
Subject: add connect link to suggestion and matches

---
 mod/match.php                     | 7 +++++++
 mod/suggest.php                   | 4 +++-
 view/match.tpl                    | 4 ++++
 view/suggest_friends.tpl          | 2 +-
 view/theme/duepuntozero/style.css | 5 +++++
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/mod/match.php b/mod/match.php
index c33bbd5c2..9324624c8 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -7,6 +7,8 @@ function match_content(&$a) {
 	if(! local_user())
 		return;
 
+	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+
 	$o .= '<h2>' . t('Profile Match') . '</h2>';
 
 	$r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
@@ -41,14 +43,19 @@ function match_content(&$a) {
 		}
 
 		if(count($j->results)) {
+
+
 			
 			$tpl = get_markup_template('match.tpl');
 			foreach($j->results as $jj) {
 				
+				$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
 				$o .= replace_macros($tpl,array(
 					'$url' => $jj->url,
 					'$name' => $jj->name,
 					'$photo' => $jj->photo,
+					'$conntxt' => t('Connect'),
+					'$connlnk' => $connlnk,
 					'$tags' => $jj->tags
 				));
 			}
diff --git a/mod/suggest.php b/mod/suggest.php
index bbffe8fb0..b8ca423c5 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -29,6 +29,8 @@ function suggest_content(&$a) {
 		return;
 	}
 
+	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+
 	$a->page['aside'] .= follow_widget();
 	$a->page['aside'] .= findpeople_widget();
 
@@ -47,7 +49,7 @@ function suggest_content(&$a) {
 
 	foreach($r as $rr) {
 
-		$connlink = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);			
+		$connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);			
 
 		$o .= replace_macros($tpl,array(
 			'$url' => $rr['url'],
diff --git a/view/match.tpl b/view/match.tpl
index 330245a2a..5f2fc7a30 100644
--- a/view/match.tpl
+++ b/view/match.tpl
@@ -9,4 +9,8 @@
 		<a href="$url" title="$name[$tags]">$name</a>
 	</div>
 	<div class="profile-match-end"></div>
+	{{ if $connlnk }}
+	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
+	{{ endif }}
+
 </div>
\ No newline at end of file
diff --git a/view/suggest_friends.tpl b/view/suggest_friends.tpl
index c66cdd65d..e97b5e8cc 100644
--- a/view/suggest_friends.tpl
+++ b/view/suggest_friends.tpl
@@ -9,8 +9,8 @@
 	<div class="profile-match-name">
 		<a href="$url" title="$name">$name</a>
 	</div>
+	<div class="profile-match-end"></div>
 	{{ if $connlnk }}
 	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
 	{{ endif }}
-	<div class="profile-match-end"></div>
 </div>
\ No newline at end of file
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 1127f1145..c6582d068 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2383,6 +2383,11 @@ aside input[type='text'] {
 	clear: both;
 }
 
+.profile-match-connect {
+	text-align: center;
+	font-weight: bold;
+}
+
 .profile-match-wrapper {
 	float: left;
 	padding: 10px;
-- 
cgit v1.2.3