Image filebrowser dialog links images to image page

[friendica.git] / mod / directory.php

diff --git a/mod/directory.php b/mod/directory.php
index d256c590aaf890102c8c4ec698055fff93a8fe0d..ad1d403f4d7d31ce9bf89dff014f48293265e702 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -6,10 +6,10 @@ function directory_init(&$a) {
        if(local_user()) {
                require_once('include/contact_widgets.php');
 
-               $a->page['aside'] .= follow_widget();
-
                $a->page['aside'] .= findpeople_widget();
 
+               $a->page['aside'] .= follow_widget();
+
        }
        else {
                unset($_SESSION['theme']);
@@ -152,12 +152,14 @@ function directory_content(&$a) {
                        else {
                                $location_e = $location;
                        }
+                       
+                       $photo_menu = array(array(t("View Profile"), zrl($profile_link)));
 
                        $entry = array(
                                'id' => $rr['id'],
-                               'profile_link' => $profile_link,
-                               'photo' => proxy_url($a->get_cached_avatar_image($rr[$photo]), false, PROXY_SIZE_THUMB),
-                               'alt_text' => $rr['name'],
+                               'url' => $profile_link,
+                               'thumb' => proxy_url($a->get_cached_avatar_image($rr[$photo]), false, PROXY_SIZE_THUMB),
+                               'img_hover' => $rr['name'],
                                'name' => $rr['name'],
                                'details' => $pdesc . $details,
                                'page_type' => $page_type,
@@ -168,6 +170,7 @@ function directory_content(&$a) {
                                'marital'  => $marital,
                                'homepage' => $homepage,
                                'about' => $about,
+                               'photo_menu' => $photo_menu,
 
                        );
 
@@ -192,15 +195,14 @@ function directory_content(&$a) {
                        '$globaldir' => t('Global Directory'),
                        '$gdirpath' => $gdirpath,
                        '$desc' => t('Find on this site'),
-                       '$entries' => $entries,
+                       '$contacts' => $entries,
                        '$finding' => t('Finding:'),
                        '$findterm' => (strlen($search) ? $search : ""),
                        '$title' => t('Site Directory'),
-                       '$submit' => t('Find')
+                       '$submit' => t('Find'),
+                       '$paginate' => paginate($a),
                ));
 
-               $o .= paginate($a);
-
        }
        else
                info( t("No entries \x28some entries may be hidden\x29.") . EOL);