mirror of
https://github.com/friendica/friendica
synced 2024-12-22 23:20:16 +00:00
directory enhancements
This commit is contained in:
parent
03689fa6b0
commit
4a92de7563
2 changed files with 41 additions and 6 deletions
|
@ -10,22 +10,44 @@ function directory_content(&$a) {
|
|||
|
||||
));
|
||||
|
||||
$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `publish` = 1");
|
||||
$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `publish` = 1 ORDER BY `name` ASC");
|
||||
if(count($r)) {
|
||||
|
||||
$tpl = file_get_contents('view/directory_item.tpl');
|
||||
|
||||
foreach($r as $rr) {
|
||||
$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
|
||||
if(in_array('small', $a->argv))
|
||||
$photo = 'thumb';
|
||||
else
|
||||
$photo = 'photo';
|
||||
|
||||
foreach($r as $rr) {
|
||||
|
||||
$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
|
||||
$details = '';
|
||||
if(strlen($rr['locality']))
|
||||
$details .= $rr['locality'];
|
||||
if(strlen($rr['region'])) {
|
||||
if(strlen($rr['locality']))
|
||||
$details .= ', ';
|
||||
$details .= $rr['region'];
|
||||
}
|
||||
if(strlen($rr['country-name'])) {
|
||||
if(strlen($details))
|
||||
$details .= ', ';
|
||||
$details .= $rr['country-name'];
|
||||
}
|
||||
if(strlen($rr['dob']))
|
||||
$details .= '<br />Age: ' ; // . calculate age($rr['dob'])) ;
|
||||
if(strlen($rr['gender']))
|
||||
$details .= '<br />Gender: ' . $rr['gender'];
|
||||
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$id' => $rr['id'],
|
||||
'$profile-link' => $profile_link,
|
||||
'$photo' => $rr['photo'],
|
||||
'$photo' => $rr[$photo],
|
||||
'$alt-text' => $rr['name'],
|
||||
'$name' => $rr['name'],
|
||||
'$details' => $details // FIXME
|
||||
'$details' => $details
|
||||
|
||||
|
||||
));
|
||||
|
|
|
@ -472,9 +472,22 @@ input#dfrn-url {
|
|||
.directory-end {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.directory-name {
|
||||
text-align: center;
|
||||
}
|
||||
.directory-photo {
|
||||
margin-left: 25px;
|
||||
}
|
||||
.directory-details {
|
||||
font-size: 0.7em;
|
||||
text-align: center;
|
||||
margin-left: 5px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
.directory-item {
|
||||
float: left;
|
||||
width: 225px;
|
||||
height: 260px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue