aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-05-02 01:54:59 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-05-02 01:54:59 -0400
commitb3680c0d266f06d2474cb45750b0486d246a8315 (patch)
tree9b9f482f611b6dd91866518387b79140c6567be7 /view
parentc96b40ab5fff900cf6cbec6f16f1b3e88116fe96 (diff)
parentbecdb1f5085f2561b8b0acebbdbf43e4a81d50da (diff)
downloadvolse-hubzilla-b3680c0d266f06d2474cb45750b0486d246a8315.tar.gz
volse-hubzilla-b3680c0d266f06d2474cb45750b0486d246a8315.tar.bz2
volse-hubzilla-b3680c0d266f06d2474cb45750b0486d246a8315.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: final touches - show friends in common with total strangers from different sites fix size cross fingers reduce the scope a bit add template fn not found really fat fingers today - though none of this has gone further than my own site another one typo first try common friends for visitors * master:
Diffstat (limited to 'view')
-rw-r--r--view/match.tpl2
-rw-r--r--view/remote_friends_common.tpl21
2 files changed, 22 insertions, 1 deletions
diff --git a/view/match.tpl b/view/match.tpl
index 5f2fc7a30..b052845ae 100644
--- a/view/match.tpl
+++ b/view/match.tpl
@@ -13,4 +13,4 @@
<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
{{ endif }}
-</div> \ No newline at end of file
+</div>
diff --git a/view/remote_friends_common.tpl b/view/remote_friends_common.tpl
new file mode 100644
index 000000000..a5a36b137
--- /dev/null
+++ b/view/remote_friends_common.tpl
@@ -0,0 +1,21 @@
+<div id="remote-friends-in-common" class="bigwidget">
+ <div id="rfic-desc">$desc</div>
+ {{ if $items }}
+ {{ for $items as $item }}
+ <div class="profile-match-wrapper">
+ <div class="profile-match-photo">
+ <a href="$item.url">
+ <img src="$item.photo" width="80" height="80" alt="$item.name" title="$item.name" />
+ </a>
+ </div>
+ <div class="profile-match-break"></div>
+ <div class="profile-match-name">
+ <a href="$itemurl" title="$item.name">$item.name</a>
+ </div>
+ <div class="profile-match-end"></div>
+ </div>
+ {{ endfor }}
+ {{ endif }}
+ <div id="rfic-end" class="clear"></div>
+</div>
+