MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add connect link to suggestion and matches

Browse source
This commit is contained in:
friendica 2011-12-18 01:44:46 -08:00
parent 974a52a16d
commit 5d6a098ce0
5 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mod/match.php
View file

@ -7,6 +7,8 @@ function match_content(&$a) {
if(! local_user()) if(! local_user())
return; return;
$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
$o .= '<h2>' . t('Profile Match') . '</h2>'; $o .= '<h2>' . t('Profile Match') . '</h2>';
$r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1", $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)) { if(count($j->results)) {
$tpl = get_markup_template('match.tpl'); $tpl = get_markup_template('match.tpl');
foreach($j->results as $jj) { foreach($j->results as $jj) {
$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$url' => $jj->url, '$url' => $jj->url,
'$name' => $jj->name, '$name' => $jj->name,
'$photo' => $jj->photo, '$photo' => $jj->photo,
'$conntxt' => t('Connect'),
'$connlnk' => $connlnk,
'$tags' => $jj->tags '$tags' => $jj->tags
)); ));
} }

4
mod/suggest.php
View file

@ -29,6 +29,8 @@ function suggest_content(&$a) {
return; return;
} }
$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
$a->page['aside'] .= follow_widget(); $a->page['aside'] .= follow_widget();
$a->page['aside'] .= findpeople_widget(); $a->page['aside'] .= findpeople_widget();
@ -47,7 +49,7 @@ function suggest_content(&$a) {
foreach($r as $rr) { 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( $o .= replace_macros($tpl,array(
'$url' => $rr['url'], '$url' => $rr['url'],

4
view/match.tpl
View file

@ -9,4 +9,8 @@
<a href="$url" title="$name[$tags]">$name</a> <a href="$url" title="$name[$tags]">$name</a>
</div> </div>
<div class="profile-match-end"></div> <div class="profile-match-end"></div>
{{ if $connlnk }}
<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
{{ endif }}
</div> </div>

2
view/suggest_friends.tpl
View file

@ -9,8 +9,8 @@
<div class="profile-match-name"> <div class="profile-match-name">
<a href="$url" title="$name">$name</a> <a href="$url" title="$name">$name</a>
</div> </div>
<div class="profile-match-end"></div>
{{ if $connlnk }} {{ if $connlnk }}
<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div> <div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
{{ endif }} {{ endif }}
<div class="profile-match-end"></div>
</div> </div>

5
view/theme/duepuntozero/style.css
View file

@ -2383,6 +2383,11 @@ aside input[type='text'] {
clear: both; clear: both;
} }
.profile-match-connect {
text-align: center;
font-weight: bold;
}
.profile-match-wrapper { .profile-match-wrapper {
float: left; float: left;
padding: 10px; padding: 10px;