diff --git a/mod/directory.php b/mod/directory.php index 930a575b6..8a5685c9a 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -73,14 +73,12 @@ function directory_content(&$a) { $order = " ORDER BY `name` ASC "; - $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", + $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", intval($a->pager['start']), intval($a->pager['itemspage']) ); if(count($r)) { - $tpl = get_markup_template('directory_item.tpl'); - if(in_array('small', $a->argv)) $photo = 'thumb'; else @@ -113,20 +111,60 @@ function directory_content(&$a) { if(strlen($rr['gender'])) $details .= '
' . t('Gender: ') . $rr['gender']; + if($rr['page-flags'] == PAGE_NORMAL) + $page_type = "Personal Profile"; + if($rr['page-flags'] == PAGE_SOAPBOX) + $page_type = "Fan Page"; + if($rr['page-flags'] == PAGE_COMMUNITY) + $page_type = "Community Forum"; + if($rr['page-flags'] == PAGE_FREELOVE) + $page_type = "Open Forum"; + if($rr['page-flags'] == PAGE_PRVGROUP) + $page_type = "Private Group"; + + $profile = $rr; + + if((x($profile,'address') == 1) + || (x($profile,'locality') == 1) + || (x($profile,'region') == 1) + || (x($profile,'postal-code') == 1) + || (x($profile,'country-name') == 1)) + $location = t('Location:'); + + $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False); + + $marital = ((x($profile,'marital') == 1) ? t('Status:') : False); + + $homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False); + + $about = ((x($profile,'about') == 1) ? t('About:') : False); + + $tpl = get_markup_template('directory_item.tpl'); + $entry = replace_macros($tpl,array( '$id' => $rr['id'], '$profile-link' => $profile_link, '$photo' => $a->get_cached_avatar_image($rr[$photo]), '$alt-text' => $rr['name'], '$name' => $rr['name'], - '$details' => $pdesc . $details - + '$details' => $pdesc . $details, + '$page-type' => $page_type, + '$profile' => $profile, + '$location' => template_escape($location), + '$gender' => $gender, + '$pdesc' => $pdesc, + '$marital' => $marital, + '$homepage' => $homepage, + '$about' => $about, )); $arr = array('contact' => $rr, 'entry' => $entry); call_hooks('directory_item', $arr); + + unset($profile); + unset($location); $o .= $entry; diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl index bc2af16c2..70d197955 100755 --- a/view/theme/diabook/directory_item.tpl +++ b/view/theme/diabook/directory_item.tpl @@ -3,9 +3,40 @@
- $alt-text + $alt-text
-
$name
+
+
$name
+
$page-type
+ {{ if $pdesc }}
$profile.pdesc
{{ endif }} +
+
+ {{ if $location }} +
$location
+
+ {{ if $profile.address }}
$profile.address
{{ endif }} + + $profile.locality{{ if $profile.locality }}, {{ endif }} + $profile.region + $profile.postal-code + + {{ if $profile.country-name }}$profile.country-name{{ endif }} +
+
+ {{ endif }} + + {{ if $gender }}
$gender
$profile.gender
{{ endif }} +
+
+ {{ if $marital }}
$marital
$profile.marital
{{ endif }} + + {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} +
+
+
+ {{ if $about }}
$about
$profile.about
{{ endif }} +
+
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 736817c7b..049fb7ba4 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -2732,6 +2732,30 @@ float: left; /* ============= */ /* = Directory = */ /* ============= */ +section .directory-item dl { + height: auto; + overflow: auto; +} +section .directory-item dt { + float: left; + margin-left: 0px; + text-align: right; + color: #999; +} +section .directory-item dd { + float: left; + margin-left: 5px; +} +.directory-profile-wrapper { + float: left; + max-height: 178px; + overflow: hidden; + width: 635px; +} +.directory-copy-wrapper { + float: left; + overflow: hidden; +} /* contacts menu */ .contact-photo-wrapper { position: relative; @@ -2773,7 +2797,7 @@ float: left; } .directory-item { float: left; - width: 200px; + width: 800px; height: 200px; } .directory-item .contact-photo { @@ -2784,14 +2808,38 @@ float: left; width: 175px; height: 175px; } +.directory-photo-wrapper { + float: left; + height: 200px; + width: 165px; +} .contact-name { - text-align: left; + font-size: 18px; font-weight: bold; - font-size: 12px; + margin-bottom: -3px; + text-align: left; } .contact-details { color: #999999; } +.page-type { + font-size: 10px; + font-style: italic; +} +.directory-detailscolumn-wrapper { + float: left; + width: 305px; + margin-right: 10px; +} +.directory-profile-wrapper dl { + margin-top: 3px; + margin-bottom: 3px; +} +.directory-profile-title { + font-weight: bold; + margin-bottom: 3px; + font-size: 14px; +} #side-bar-photos-albums li{ list-style-type: disc; }