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

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2013-11-11 14:11:52 -08:00
commit 6ab8a6a17d
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/oembed.php
View File

@ -123,6 +123,7 @@ function oembed_format_object($j){
if ( $j->type!='rich' || !strpos($j->html,$embedurl) ){
$embedlink = (isset($j->title))?$j->title:$embedurl;
$ret .= "<a href='$embedurl' rel='oembed'>$embedlink</a>";
$ret .= "<br>";
if (isset($j->author_name)) $ret.=" by ".$j->author_name;
if (isset($j->provider_name)) $ret.=" on ".$j->provider_name;
} else {

18
view/tpl/peoplefind.tpl
View File

@ -1,16 +1,14 @@
<div id="peoplefind-sidebar" class="widget">
<h3>{{$findpeople}}</h3>
<div id="peoplefind-desc">{{$desc}}</div>
{{$desc}}
<form action="directory" method="post" />
<input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$findthem}}" />
<input class="icon-search" id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint}}" placeholder="&#xf002;"/>
<input id="side-peoplefind-submit" type="submit" name="submit" value="{{$findthem}}" />
</form>
{{if $similar}}
<div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div>
{{/if}}
<div class="side-link" id="side-suggest-link"><a href="suggest" >{{$suggest}}</a></div>
<div class="side-link" id="side-random-profile-link" ><a href="randprof" >{{$random}}</a></div>
{{if $inv}}
<div class="side-link" id="side-invite-link" ><a href="invite" >{{$inv}}</a></div>
{{/if}}
<br />
{{if $similar}}<a href="match" >{{$similar}}</a><br />{{/if}}
<a href="suggest" >{{$suggest}}</a><br />
<a href="randprof" >{{$random}}</a><br />
{{if $inv}}<a href="invite" >{{$inv}}</a>{{/if}}
</div>