Merge viewcontact 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/mod/dirfind.php b/mod/dirfind.php
index 95f9bf53a8890052a264ae701d911dca765cee57..9e02a47e2075e98421c526f026440e345ebe3a6b 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -38,10 +38,6 @@ function dirfind_content(&$a, $prefix = "") {
 
        $o = '';
 
-       $o .= replace_macros(get_markup_template("section_title.tpl"),array(
-               '$title' => sprintf( t('People Search - %s'), $search)
-       ));
-
        if($search) {
 
                if ($local) {
@@ -121,7 +117,6 @@ function dirfind_content(&$a, $prefix = "") {
 
                        $id = 0;
 
-                       $tpl = get_markup_template('match.tpl');
                        foreach($j->results as $jj) {
 
                                // If We already know this contact then don't show the "connect" button
@@ -143,17 +138,27 @@ function dirfind_content(&$a, $prefix = "") {
 
                                $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
 
-                               $o .= replace_macros($tpl,array(
-                                       '$url' => zrl($jj->url),
-                                       '$name' => htmlentities($jj->name),
-                                       '$photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
-                                       '$tags' => $jj->tags,
-                                       '$conntxt' => $conntxt,
-                                       '$connlnk' => $connlnk,
-                                       '$photo_menu' => $photo_menu,
-                                       '$id' => ++$id,
-                               ));
+                               $entry = array(
+                                       'url' => zrl($jj->url),
+                                       'name' => htmlentities($jj->name),
+                                       'photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+                                       'tags' => $jj->tags,
+                                       'conntxt' => $conntxt,
+                                       'connlnk' => $connlnk,
+                                       'photo_menu' => $photo_menu,
+                                       'id' => ++$id,
+                               );
+                               $entries[] = $entry;
                        }
+
+               $tpl = get_markup_template('match.tpl');
+
+               $o .= replace_macros($tpl,array(
+                       'title' => sprintf( t('People Search - %s'), $search),
+                       '$entries' => $entries,
+                       '$paginate' => paginate($a),
+               ));
+
                }
                else {
                        info( t('No matches') . EOL);
@@ -161,7 +166,5 @@ function dirfind_content(&$a, $prefix = "") {
 
        }
 
-       $o .= '<div class="clear"></div>';
-       $o .= paginate($a);
        return $o;
 }

diff --git a/mod/match.php b/mod/match.php
index f31b0f67a44fd82cc2a1140a2581ce443a16aae7..380f6e74a44e58cc95ea168444af91c2f44c63c6 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -4,6 +4,15 @@ require_once('include/socgraph.php');
 require_once('include/contact_widgets.php');
 require_once('mod/proxy.php');
 
+/**
+ * @brief Controller for /match.
+ *
+ * It takes keywords from your profile and queries the directory server for
+ * matching keywords from other profiles.
+ *
+ * @param App &$a
+ * @return void|string
+ */
 function match_content(&$a) {
 
        $o = '';
@@ -15,10 +24,6 @@ function match_content(&$a) {
 
        $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
-       $o .= replace_macros(get_markup_template("section_title.tpl"),array(
-               '$title' => t('Profile Match')
-       ));
-
        $r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
                intval(local_user())
        );
@@ -27,7 +32,6 @@ function match_content(&$a) {
        if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
                notice( t('No keywords to match. Please add keywords to your default profile.') . EOL);
                return;
-
        }
 
        $params = array();
@@ -52,9 +56,6 @@ function match_content(&$a) {
 
                if(count($j->results)) {
 
-
-
-                       $tpl = get_markup_template('match.tpl');
                        foreach($j->results as $jj) {
                                $match_nurl = normalise_link($jj->url);
                                $match = q("SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
@@ -63,24 +64,33 @@ function match_content(&$a) {
                                if (!count($match)) {
                                        $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
                                        $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
-                                       $o .= replace_macros($tpl,array(
-                                               '$url' => zrl($jj->url),
-                                               '$name' => $jj->name,
-                                               '$photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
-                                               '$inttxt' => ' ' . t('is interested in:'),
-                                               '$conntxt' => t('Connect'),
-                                               '$connlnk' => $connlnk,
-                                               '$tags' => $jj->tags
-                                       ));
+                                       $entry = array(
+                                               'url' => zrl($jj->url),
+                                               'name' => $jj->name,
+                                               'photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+                                               'inttxt' => ' ' . t('is interested in:'),
+                                               'conntxt' => t('Connect'),
+                                               'connlnk' => $connlnk,
+                                               'tags' => $jj->tags
+                                       );
+                                       $entries[] = $entry;
                                }
                        }
-               } else {
+
+               $tpl = get_markup_template('match.tpl');
+
+               $o .= replace_macros($tpl,array(
+                       '$title' => t('Profile Match'),
+                       'entries' => $entries,
+                       '$paginate' => paginate($a),
+               ));
+
+               }
+               else {
                        info( t('No matches') . EOL);
                }
 
        }
 
-       $o .= cleardiv();
-       $o .= paginate($a);
        return $o;
 }

diff --git a/mod/suggest.php b/mod/suggest.php
index 8bf31ca8e591bf449d489064ad5ec84fa33c0d28..760bbf06ae5868166ffce247523cc25d7136c15f 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -65,11 +65,6 @@ function suggest_content(&$a) {
        $a->page['aside'] .= findpeople_widget();
 
 
-       $o .= replace_macros(get_markup_template("section_title.tpl"),array(
-               '$title' => t('Friend Suggestions')
-       ));
-
-
        $r = suggestion_query(local_user());
 
        if(! count($r)) {
@@ -77,25 +72,31 @@ function suggest_content(&$a) {
                return $o;
        }
 
-       $tpl = get_markup_template('suggest_friends.tpl');
-
        foreach($r as $rr) {
 
                $connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
 
-               $o .= replace_macros($tpl,array(
-                       '$url' => zrl($rr['url']),
-                       '$name' => $rr['name'],
-                       '$photo' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
-                       '$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'],
-                       '$ignid' => $rr['id'],
-                       '$conntxt' => t('Connect'),
-                       '$connlnk' => $connlnk,
-                       '$ignore' => t('Ignore/Hide')
-               ));
+               $entry = array(
+                       'url' => zrl($rr['url']),
+                       'url_clean' => $rr['url'],
+                       'name' => $rr['name'],
+                       'photo' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
+                       'ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'],
+                       'ignid' => $rr['id'],
+                       'conntxt' => t('Connect'),
+                       'connlnk' => $connlnk,
+                       'ignore' => t('Ignore/Hide')
+               );
+               $entries[] = $entry;
        }
 
-       $o .= cleardiv();
+       $tpl = get_markup_template('suggest_friends.tpl');
+
+       $o .= replace_macros($tpl,array(
+               '$title' => t('Friend Suggestions'),
+               '$entries' => $entries,
+       ));
+
 //     $o .= paginate($a);
        return $o;
 }

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>

diff --git a/view/templates/match.tpl b/view/templates/match.tpl
index 3ebabf1854ef3407ecbe24a02ada6a9a8720ca83..d269a253bcae481e492ba4e163fdc17ffaeef705 100644 (file)
--- a/view/templates/match.tpl
+++ b/view/templates/match.tpl
@@ -1,33 +1,40 @@
+{{include file="section_title.tpl"}}
+
+{{foreach $entries as $entry}}
+       <div class="profile-match-wrapper">
+               <div class="profile-match-photo" id="contact-entry-photo-{{$entry.id}}"
+                       onmouseover="if (typeof t{{$entry.id}} != 'undefined') clearTimeout(t{{$id}}); openMenu('contact-photo-menu-button-{{$entry.id}}')" 
+                       onmouseout="t{{$entry.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$entry.id}}\'); closeMenu(\'contact-photo-menu-{{$entry.id}}\');',200)" >
+                       <a href="{{$entry.url}}">
+                               <img width="80" height="80" src="{{$entry.photo}}" alt="{{$entry.name}}" title="{{$entry.name}}[{{$entry.tags}}]" />
+                       </a>
+                       {{if $entry.photo_menu}}
+                               <span onclick="openClose('contact-photo-menu-{{$entry.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$entry.id}}">menu</span>
+                               <div class="contact-photo-menu" id="contact-photo-menu-{{$entry.id}}">
+                                       <ul>
+                                               {{foreach $entry.photo_menu as $k=>$c}}
+                                               {{if $c.2}}
+                                               <li><a class="{{$k}}" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+                                               {{else}}
+                                               <li><a class="{{$k}}" href="{{$c.1}}">{{$c.0}}</a></li>
+                                               {{/if}}
+                                               {{/foreach}}
+                                       </ul>
+                               </div>
+                               {{/if}}
+               </div>
+               <div class="profile-match-break"></div>
+               <div class="profile-match-name">
+                       <a href="{{$entry.url}}" title="{{$entry.name}}[{{$entry.tags}}]">{{$entry.name}}</a>
+               </div>
+               <div class="profile-match-end"></div>
+               {{if $entry.connlnk}}
+               <div class="profile-match-connect"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}">{{$entry.conntxt}}</a></div>
+               {{/if}}
 
-<div class="profile-match-wrapper">
-       <div class="profile-match-photo" id="contact-entry-photo-{{$id}}"
-                onmouseover="if (typeof t{{$id}} != 'undefined') clearTimeout(t{{$id}}); openMenu('contact-photo-menu-button-{{$id}}')" 
-                onmouseout="t{{$id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$id}}\'); closeMenu(\'contact-photo-menu-{{$id}}\');',200)" >
-               <a href="{{$url}}">
-                       <img width="80" height="80" src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" />
-               </a>
-               {{if $photo_menu}}
-                        <span onclick="openClose('contact-photo-menu-{{$id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$id}}">menu</span>
-                        <div class="contact-photo-menu" id="contact-photo-menu-{{$id}}">
-                                <ul>
-                                        {{foreach $photo_menu as $k=>$c}}
-                                        {{if $c.2}}
-                                        <li><a class="{{$k}}" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
-                                        {{else}}
-                                        <li><a class="{{$k}}" href="{{$c.1}}">{{$c.0}}</a></li>
-                                        {{/if}}
-                                        {{/foreach}}
-                                </ul>
-                        </div>
-                        {{/if}}
-       </div>
-       <div class="profile-match-break"></div>
-       <div class="profile-match-name">
-               <a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
        </div>
-       <div class="profile-match-end"></div>
-       {{if $connlnk}}
-       <div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
-       {{/if}}
+{{/foreach}}
+
+<div class="clear"></div>
 
-</div>
+{{$paginate}}

diff --git a/view/templates/suggest_friends.tpl b/view/templates/suggest_friends.tpl
index a64c05dd83c186a4b5bb688d317293d1c250b2c4..e7c9c1ac00470bcb252406c07f4cd9c1971464b5 100644 (file)
--- a/view/templates/suggest_friends.tpl
+++ b/view/templates/suggest_friends.tpl
@@ -1,17 +1,23 @@
 
-<div class="profile-match-wrapper">
-       <a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>
-       <div class="profile-match-photo">
-               <a href="{{$url}}">
-                       <img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" />
-               </a>
-       </div>
-       <div class="profile-match-break"></div>
-       <div class="profile-match-name">
-               <a href="{{$url}}" title="{{$name}}">{{$name}}</a>
+{{include file="section_title.tpl"}}
+
+{{foreach $entries as $entry}}
+       <div class="profile-match-wrapper">
+               <a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>
+               <div class="profile-match-photo">
+                       <a href="{{$entry.url}}">
+                               <img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.url_clean}}]" />
+                       </a>
+               </div>
+               <div class="profile-match-break"></div>
+               <div class="profile-match-name">
+                       <a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a>
+               </div>
+               <div class="profile-match-end"></div>
+               {{if $entry.connlnk}}
+               <div class="profile-match-connect"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}">{{$entry.conntxt}}</a></div>
+               {{/if}}
        </div>
-       <div class="profile-match-end"></div>
-       {{if $connlnk}}
-       <div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
-       {{/if}}
-</div>
\ No newline at end of file
+{{/foreach}}
+
+<div class="clear"></div>

diff --git a/view/theme/frost-mobile/templates/suggest_friends.tpl b/view/theme/frost-mobile/templates/suggest_friends.tpl
index e39cca6e59e7317732f02b50a944107c5dd7d915..a386f30d00888c43da93a8cfc677ef517f92a891 100644 (file)
--- a/view/theme/frost-mobile/templates/suggest_friends.tpl
+++ b/view/theme/frost-mobile/templates/suggest_friends.tpl
@@ -1,17 +1,23 @@
 
-<div class="profile-match-wrapper">
-       <div class="profile-match-photo">
-               <a href="{{$url}}">
-                       <img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" onError="this.src='../../../images/person-48.jpg';" />
-               </a>
-       </div>
-       <div class="profile-match-break"></div>
-       <div class="profile-match-name">
-               <a href="{{$url}}" title="{{$name}}">{{$name}}</a>
+{{include file="section_title.tpl"}}
+
+{{foreach $entries as $entry}}
+       <div class="profile-match-wrapper">
+               <div class="profile-match-photo">
+                       <a href="{{$entry.url}}">
+                               <img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.url_clean}}]" onError="this.src='../../../images/person-48.jpg';" />
+                       </a>
+               </div>
+               <div class="profile-match-break"></div>
+               <div class="profile-match-name">
+                       <a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a>
+               </div>
+               <div class="profile-match-end"></div>
+               {{if $entry.connlnk}}
+               <div class="profile-match-connect"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}">{{$entry.conntxt}}</a></div>
+               {{/if}}
+               <a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="icon drophide profile-match-ignore" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);" *}}onclick="return confirmDelete();" ></a>
        </div>
-       <div class="profile-match-end"></div>
-       {{if $connlnk}}
-       <div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
-       {{/if}}
-       <a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);" *}}onclick="return confirmDelete();" ></a>
-</div>
+{{/foreach}}
+
+<div class="clear"></div>

diff --git a/view/theme/frost/templates/suggest_friends.tpl b/view/theme/frost/templates/suggest_friends.tpl
index e39cca6e59e7317732f02b50a944107c5dd7d915..a386f30d00888c43da93a8cfc677ef517f92a891 100644 (file)
--- a/view/theme/frost/templates/suggest_friends.tpl
+++ b/view/theme/frost/templates/suggest_friends.tpl
@@ -1,17 +1,23 @@
 
-<div class="profile-match-wrapper">
-       <div class="profile-match-photo">
-               <a href="{{$url}}">
-                       <img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" onError="this.src='../../../images/person-48.jpg';" />
-               </a>
-       </div>
-       <div class="profile-match-break"></div>
-       <div class="profile-match-name">
-               <a href="{{$url}}" title="{{$name}}">{{$name}}</a>
+{{include file="section_title.tpl"}}
+
+{{foreach $entries as $entry}}
+       <div class="profile-match-wrapper">
+               <div class="profile-match-photo">
+                       <a href="{{$entry.url}}">
+                               <img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.url_clean}}]" onError="this.src='../../../images/person-48.jpg';" />
+                       </a>
+               </div>
+               <div class="profile-match-break"></div>
+               <div class="profile-match-name">
+                       <a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a>
+               </div>
+               <div class="profile-match-end"></div>
+               {{if $entry.connlnk}}
+               <div class="profile-match-connect"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}">{{$entry.conntxt}}</a></div>
+               {{/if}}
+               <a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="icon drophide profile-match-ignore" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);" *}}onclick="return confirmDelete();" ></a>
        </div>
-       <div class="profile-match-end"></div>
-       {{if $connlnk}}
-       <div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
-       {{/if}}
-       <a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);" *}}onclick="return confirmDelete();" ></a>
-</div>
+{{/foreach}}
+
+<div class="clear"></div>