jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

template-rework: let common friends and allfriends use viewcontact_template.tpl

Browse source
This commit is contained in:
rabuzarus 2015-10-27 15:27:26 +01:00
parent 367699f785
commit 299c8b83ac
3 changed files with 42 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
mod/allfriends.php
View file

@ -12,10 +12,11 @@ function allfriends_content(&$a) {
if($a->argc > 1) if($a->argc > 1)
$cid = intval($a->argv[1]); $cid = intval($a->argv[1]);
if(! $cid) if(! $cid)
return; return;
$c = q("select name, url, photo from contact where id = %d and uid = %d limit 1", $c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($cid), intval($cid),
intval(local_user()) intval(local_user())
); );
@ -33,10 +34,6 @@ function allfriends_content(&$a) {
if(! count($c)) if(! count($c))
return; return;
$o .= replace_macros(get_markup_template("section_title.tpl"),array(
'$title' => sprintf( t('Friends of %s'), htmlentities($c[0]['name']))
));
$r = all_friends(local_user(),$cid); $r = all_friends(local_user(),$cid);
@ -45,19 +42,29 @@ function allfriends_content(&$a) {
return $o; return $o;
} }
$tpl = get_markup_template('common_friends.tpl'); $id = 0;
foreach($r as $rr) { foreach($r as $rr) {
$o .= replace_macros($tpl,array( $entry = array(
'$url' => $rr['url'], 'url' => $rr['url'],
'$name' => htmlentities($rr['name']), 'itemurl' => $rr['url'],
'$photo' => $rr['photo'], 'name' => htmlentities($rr['name']),
'$tags' => '' 'thumb' => $rr['photo'],
)); 'img_hover' => htmlentities($rr['name']),
'tags' => '',
'id' => ++$id,
);
$entries[] = $entry;
} }
$o .= cleardiv(); $tpl = get_markup_template('viewcontact_template.tpl');
$o .= replace_macros($tpl,array(
'$title' => sprintf( t('Friends of %s'), htmlentities($c[0]['name'])),
'$contacts' => $entries,
));
// $o .= paginate($a); // $o .= paginate($a);
return $o; return $o;
} }

39
mod/common.php
View file

@ -17,13 +17,13 @@ function common_content(&$a) {
return; return;
if($cmd === 'loc' && $cid) { if($cmd === 'loc' && $cid) {
$c = q("select name, url, photo from contact where id = %d and uid = %d limit 1", $c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($cid), intval($cid),
intval($uid) intval($uid)
); );
} }
else { else {
$c = q("select name, url, photo from contact where self = 1 and uid = %d limit 1", $c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval($uid) intval($uid)
); );
} }
@ -41,21 +41,16 @@ function common_content(&$a) {
if(! count($c)) if(! count($c))
return; return;
$o .= replace_macros(get_markup_template("section_title.tpl"),array(
'$title' => t('Common Friends')
));
if(! $cid) { if(! $cid) {
if(get_my_url()) { if(get_my_url()) {
$r = q("select id from contact where nurl = '%s' and uid = %d limit 1", $r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
dbesc(normalise_link(get_my_url())), dbesc(normalise_link(get_my_url())),
intval($profile_uid) intval($profile_uid)
); );
if(count($r)) if(count($r))
$cid = $r[0]['id']; $cid = $r[0]['id'];
else { else {
$r = q("select id from gcontact where nurl = '%s' limit 1", $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
dbesc(normalise_link(get_my_url())) dbesc(normalise_link(get_my_url()))
); );
if(count($r)) if(count($r))
@ -94,19 +89,29 @@ function common_content(&$a) {
return $o; return $o;
} }
$tpl = get_markup_template('common_friends.tpl'); $id = 0;
foreach($r as $rr) { foreach($r as $rr) {
$o .= replace_macros($tpl,array( $entry = array(
'$url' => $rr['url'], 'url' => $rr['url'],
'$name' => htmlentities($rr['name']), 'itemurl' => $rr['url'],
'$photo' => $rr['photo'], 'name' => htmlentities($rr['name']),
'$tags' => '' 'thumb' => $rr['photo'],
)); 'img_hover' => htmlentities($rr['name']),
'tags' => '',
'id' => ++$id,
);
$entries[] = $entry;
} }
$o .= cleardiv(); $tpl = get_markup_template('viewcontact_template.tpl');
$o .= replace_macros($tpl,array(
'$title' => t('Common Friends'),
'$contacts' => $entries,
));
// $o .= paginate($a); // $o .= paginate($a);
return $o; return $o;
} }

13
view/templates/common_friends.tpl
View file

@ -1,13 +0,0 @@
<div class="profile-match-wrapper">
<div class="profile-match-photo">
<a href="{{$url}}">
<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" />
</a>
</div>
<div class="profile-match-break"></div>
<div class="profile-match-name">
<a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
</div>
<div class="profile-match-end"></div>
</div>