Merge dir into template_rework

diff --git a/mod/directory.php b/mod/directory.php
index 6fd99256f0a80c06586c0f80b583ed150494526a..46c4f38ad3f8cdf94fbf1eb01355f481b68b71b1 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -6,6 +6,8 @@ function directory_init(&$a) {
        if(local_user()) {
                require_once('include/contact_widgets.php');
 
+               $a->page['aside'] .= follow_widget();
+
                $a->page['aside'] .= findpeople_widget();
 
        }
@@ -31,7 +33,7 @@ function directory_content(&$a) {
        require_once("mod/proxy.php");
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) || 
-                (get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) {
+               (get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) {
                notice( t('Public access denied.') . EOL);
                return;
        }
@@ -44,27 +46,12 @@ function directory_content(&$a) {
        else
                $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
-       $tpl = get_markup_template('directory_header.tpl');
-
-       $globaldir = '';
-       $gdirpath = get_config('system','directory');
-       if(strlen($gdirpath)) {
-               $globaldir = '<ul><li><div id="global-directory-link"><a href="'
-               . zrl($gdirpath,true) . '">' . t('Global Directory') . '</a></div></li></ul>';
+       $gdirpath = '';
+       $dirurl = get_config('system','directory');
+       if(strlen($dirurl)) {
+               $gdirpath = zrl($dirurl,true);
        }
 
-       $admin = '';
-
-       $o .= replace_macros($tpl, array(
-               '$search' => $search,
-               '$globaldir' => $globaldir,
-               '$desc' => t('Find on this site'),
-               '$admin' => $admin,
-               '$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
-               '$sitedir' => t('Site Directory'),
-               '$submit' => t('Find')
-       ));
-
        if($search) {
                $search = dbesc($search);
 
@@ -159,8 +146,6 @@ function directory_content(&$a) {
 
                        $about = ((x($profile,'about') == 1) ?  t('About:') : False);
 
-                       $tpl = get_markup_template('directory_item.tpl');
-
                        if($a->theme['template_engine'] === 'internal') {
                                $location_e = template_escape($location);
                        }
@@ -168,23 +153,23 @@ function directory_content(&$a) {
                                $location_e = $location;
                        }
 
-                       $entry = replace_macros($tpl,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'],
-                               '$name' => $rr['name'],
-                               '$details' => $pdesc . $details,
-                               '$page_type' => $page_type,
-                               '$profile' => $profile,
-                               '$location' => $location_e,
-                               '$gender'   => $gender,
-                               '$pdesc'        => $pdesc,
-                               '$marital'  => $marital,
-                               '$homepage' => $homepage,
-                               '$about' => $about,
-
-                       ));
+                       $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'],
+                               'name' => $rr['name'],
+                               'details' => $pdesc . $details,
+                               'page_type' => $page_type,
+                               'profile' => $profile,
+                               'location' => $location_e,
+                               'gender'   => $gender,
+                               'pdesc' => $pdesc,
+                               'marital'  => $marital,
+                               'homepage' => $homepage,
+                               'about' => $about,
+
+                       );
 
                        $arr = array('contact' => $rr, 'entry' => $entry);
 
@@ -193,12 +178,27 @@ function directory_content(&$a) {
                        unset($profile);
                        unset($location);
 
-                       $o .= $entry;
+                       if(! $arr['entry'])
+                               continue;
+
+                       $entries[] = $arr['entry'];
 
                }
 
-               $o .= "<div class=\"directory-end\" ></div>\r\n";
-               $o .= paginate($a);
+               $tpl = get_markup_template('directory_header.tpl');
+
+               $o .= replace_macros($tpl, array(
+                       '$search' => $search,
+                       '$globaldir' => t('Global Directory'),
+                       '$gdirpath' => $gdirpath,
+                       '$desc' => t('Find on this site'),
+                       '$entries' => $entries,
+                       '$finding' => t('Finding:'),
+                       '$findterm' => (strlen($search) ? $search : ""),
+                       '$title' => t('Site Directory'),
+                       '$submit' => t('Find'),
+                       '$paginate' => paginate($a),
+               ));
 
        }
        else

diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl
index 2274f2e1f8ecd0ed71389466c2c9488dd51912c8..eda887a898ee962115ad86b5be1f1851b257f964 100644 (file)
--- a/view/templates/directory_header.tpl
+++ b/view/templates/directory_header.tpl
@@ -1,17 +1,31 @@
 
-<h1>{{$sitedir}}</h1>
+{{include file="section_title.tpl"}}
 
-{{$globaldir}}
-{{$admin}}
+{{if $gdirpath}}
+       <ul>
+               <li><div id="global-directory-link"><a href="{{$gdirpath}}">{{$globaldir}}</a></div></li>
+       </ul>
+{{/if}}
 
-{{$finding}}
 
 <div id="directory-search-wrapper">
-<form id="directory-search-form" action="directory" method="get" >
-<span class="dirsearch-desc">{{$desc}}</span>
-<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="{{$search|escape:'html'}}" />
-<input type="submit" name="submit" id="directory-search-submit" value="{{$submit|escape:'html'}}" class="button" />
-</form>
+       <form id="directory-search-form" action="directory" method="get" >
+               <span class="dirsearch-desc">{{$desc}}</span>
+               <input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="{{$search|escape:'html'}}" />
+               <input type="submit" name="submit" id="directory-search-submit" value="{{$submit|escape:'html'}}" class="button" />
+       </form>
 </div>
+
+{{if $findterm}}
+       <h4>{{$finding}} '{{$findterm}}'</h4>
+{{/if}}
+
 <div id="directory-search-end"></div>
 
+{{foreach $entries as $entry}}
+       {{include file="directory_item.tpl"}}
+{{/foreach}}
+
+<div class="directory-end" ></div>
+
+{{$paginate}}

diff --git a/view/templates/directory_item.tpl b/view/templates/directory_item.tpl
index b43fcd28cf8393f9549503a60f3c0af938c3d32a..4dbe8a951f5ecee53886a023f0fc80513e55929e 100644 (file)
--- a/view/templates/directory_item.tpl
+++ b/view/templates/directory_item.tpl
@@ -1,12 +1,14 @@
 
 
-<div class="directory-item lframe" id="directory-item-{{$id}}" >
-       <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > 
-               <div class="contact-photo" id="directory-photo-{{$id}}" >
-                       <a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" ><img class="directory-photo-img" src="{{$photo}}" alt="{{$alt_text}}" title="{{$alt_text}}" /></a>
+<div class="directory-item lframe" id="directory-item-{{$entry.id}}" >
+       <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" > 
+               <div class="contact-photo" id="directory-photo-{{$entry.id}}" >
+                       <a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.id}}" >
+                               <img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alt_text}}" title="{{$entry.alt_text}}" />
+                       </a>
                </div>
        </div>
 
-       <div class="contact-name" id="directory-name-{{$id}}">{{$name}}</div>
-       <div class="contact-details">{{$details}}</div>
+       <div class="contact-name" id="directory-name-{{$entry.id}}">{{$entry.name}}</div>
+       <div class="contact-details">{{$entry.details}}</div>
 </div>