template rework: use viewcontact_template.tpl also for directory

diff --git a/mod/directory.php b/mod/directory.php
index 46c4f38ad3f8cdf94fbf1eb01355f481b68b71b1..8ed4c2200776ab49d43895dffd6e76a107e8b2ef 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -155,9 +155,9 @@ function directory_content(&$a) {
 
                        $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,
@@ -192,7 +192,7 @@ 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'),

diff --git a/view/templates/contact_template.tpl b/view/templates/contact_template.tpl
index 4e8c04297d0d2eac46d6270ee6fa959d0901859f..39502c91afa94b8a2f8c739131b0c9180d5d2688 100644 (file)
--- a/view/templates/contact_template.tpl
+++ b/view/templates/contact_template.tpl
@@ -1,3 +1,5 @@
+{{* todo: better layout and implement $contact.details and other variables *}}
+
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
        <div class="contact-entry-photo-wrapper" >

diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl
index eda887a898ee962115ad86b5be1f1851b257f964..46f17de40e06849636fe3761d4e04ece19a8c12c 100644 (file)
--- a/view/templates/directory_header.tpl
+++ b/view/templates/directory_header.tpl
@@ -22,8 +22,8 @@
 
 <div id="directory-search-end"></div>
 
-{{foreach $entries as $entry}}
-       {{include file="directory_item.tpl"}}
+{{foreach $contacts as $contact}}
+       {{include file="contact_template.tpl"}}
 {{/foreach}}
 
 <div class="directory-end" ></div>