harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of html from mod_suggest

Browse Source
This commit is contained in:
friendica 2013-03-06 17:52:58 -08:00
parent b32b0102f7
commit 5a9dae78a2
5 changed files with 58 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
mod/suggest.php
View File

@ -18,7 +18,11 @@ function suggest_init(&$a) {
} }
function suggest_aside(&$a) {
$a->set_widget('follow', follow_widget());
$a->set_widget('findpeople', findpeople_widget());
}
function suggest_content(&$a) { function suggest_content(&$a) {
@ -31,37 +35,36 @@ function suggest_content(&$a) {
$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
$a->page['aside'] .= follow_widget();
$a->page['aside'] .= findpeople_widget();
$o .= '<h2>' . t('Friend Suggestions') . '</h2>';
$r = suggestion_query(local_user(),get_observer_hash()); $r = suggestion_query(local_user(),get_observer_hash());
if(! $r) { if(! $r) {
$o .= t('No suggestions available. If this is a new site, please try again in 24 hours.'); info( t('No suggestions available. If this is a new site, please try again in 24 hours.'));
return $o; return;
} }
$tpl = get_markup_template('suggest_friends.tpl'); $arr = array();
foreach($r as $rr) { foreach($r as $rr) {
$connlnk = $a->get_baseurl() . '/follow/?url=' . $rr['xchan_addr']; $connlnk = $a->get_baseurl() . '/follow/?url=' . $rr['xchan_addr'];
$o .= replace_macros($tpl,array( $arr[] = array(
'$url' => chanlink_url($rr['xchan_url']), 'url' => chanlink_url($rr['xchan_url']),
'$name' => $rr['xchan_name'], 'name' => $rr['xchan_name'],
'$photo' => $rr['xchan_photo_m'], 'photo' => $rr['xchan_photo_m'],
'$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['xchan_hash'], 'ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['xchan_hash'],
'$conntxt' => t('Connect'), 'conntxt' => t('Connect'),
'$connlnk' => $connlnk, 'connlnk' => $connlnk,
'$ignore' => t('Ignore/Hide') 'ignore' => t('Ignore/Hide')
)); );
} }
$o .= cleardiv();
// $o .= paginate($a); $o = replace_macros(get_markup_template('suggest_page.tpl'),array(
'$title' => t('Channel Suggestions'),
'$entries' => $arr
));
return $o; return $o;
} }

12
view/tpl/smarty3/suggest_friends.tpl
View File

@ -4,18 +4,18 @@
* *
*}} *}}
<div class="profile-match-wrapper"> <div class="profile-match-wrapper">
<a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide smalldrop profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a> <a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="icon drophide smalldrop profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>
<div class="profile-match-photo"> <div class="profile-match-photo">
<a href="{{$url}}"> <a href="{{$entry.url}}">
<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" /> <img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.url}}]" />
</a> </a>
</div> </div>
<div class="profile-match-break"></div> <div class="profile-match-break"></div>
<div class="profile-match-name"> <div class="profile-match-name">
<a href="{{$url}}" title="{{$name}}">{{$name}}</a> <a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a>
</div> </div>
<div class="profile-match-end"></div> <div class="profile-match-end"></div>
{{if $connlnk}} {{if $entry.connlnk}}
<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div> <div class="profile-match-connect"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}">{{$entry.conntxt}}</a></div>
{{/if}} {{/if}}
</div> </div>

14
view/tpl/smarty3/suggest_page.tpl Normal file
View File

@ -0,0 +1,14 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<h3>{{$title}}</h3>
{{if $entries}}
{{foreach $entries as $child}}
{{include file="suggest_friends.tpl" entry=$child}}
{{/foreach}}
{{/if}}
<div class="clear"></div>

12
view/tpl/suggest_friends.tpl
View File

@ -1,16 +1,16 @@
<div class="profile-match-wrapper"> <div class="profile-match-wrapper">
<a href="$ignlnk" title="$ignore" class="icon drophide smalldrop profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a> <a href="$entry.ignlnk" title="$entry.ignore" class="icon drophide smalldrop profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>
<div class="profile-match-photo"> <div class="profile-match-photo">
<a href="$url"> <a href="$entry.url">
<img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" /> <img src="$entry.photo" alt="$entry.name" width="80" height="80" title="$entry.name [$entry.url]" />
</a> </a>
</div> </div>
<div class="profile-match-break"></div> <div class="profile-match-break"></div>
<div class="profile-match-name"> <div class="profile-match-name">
<a href="$url" title="$name">$name</a> <a href="$entry.url" title="$entry.name">$entry.name</a>
</div> </div>
<div class="profile-match-end"></div> <div class="profile-match-end"></div>
{{ if $connlnk }} {{ if $entry.connlnk }}
<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div> <div class="profile-match-connect"><a href="$entry.connlnk" title="$entry.conntxt">$entry.conntxt</a></div>
{{ endif }} {{ endif }}
</div> </div>

9
view/tpl/suggest_page.tpl Normal file
View File

@ -0,0 +1,9 @@
<h3>$title</h3>
{{ if $entries }}
{{ for $entries as $child }}
{{ inc suggest_friends.tpl with $entry=$child }}{{ endinc }}
{{ endfor }}
{{ endif }}
<div class="clear"></div>