aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/contact_widgets.php8
-rw-r--r--view/pdl/mod_channel.pdl5
-rwxr-xr-xview/tpl/remote_friends_common.tpl36
3 files changed, 17 insertions, 32 deletions
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index e5bb696f8..a13f87573 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -143,7 +143,7 @@ function cardcategories_widget($baseurl,$selected = '') {
-function common_friends_visitor_widget($profile_uid,$cnt = 10) {
+function common_friends_visitor_widget($profile_uid,$cnt = 25) {
if(local_channel() == $profile_uid)
return;
@@ -161,14 +161,14 @@ function common_friends_visitor_widget($profile_uid,$cnt = 10) {
return;
$r = common_friends($profile_uid,$observer_hash,0,$cnt,true);
-
+
return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
- '$desc' => sprintf( t('Common connections: %d'), $t),
+ '$desc' => t('Common Connections'),
'$base' => z_root(),
'$uid' => $profile_uid,
'$cid' => $observer,
'$linkmore' => (($t > $cnt) ? 'true' : ''),
- '$more' => t('show more'),
+ '$more' => sprintf( t('View all %d common connections'), $t),
'$items' => $r
));
diff --git a/view/pdl/mod_channel.pdl b/view/pdl/mod_channel.pdl
index 967dd89b4..45ce31720 100644
--- a/view/pdl/mod_channel.pdl
+++ b/view/pdl/mod_channel.pdl
@@ -3,12 +3,9 @@
[/region]
[region=aside]
[widget=fullprofile][/widget]
+[widget=common_friends][/widget]
[widget=archive][var=wall]1[/var][/widget]
[widget=categories][/widget]
[widget=tagcloud_wall][var=limit]24[/var][/widget]
[/region]
-[region=content]
-[widget=common_friends][/widget]
-$content
-[/region]
diff --git a/view/tpl/remote_friends_common.tpl b/view/tpl/remote_friends_common.tpl
index 7ec1a2e6b..9e149b574 100755
--- a/view/tpl/remote_friends_common.tpl
+++ b/view/tpl/remote_friends_common.tpl
@@ -1,28 +1,16 @@
<div class="widget">
- <div class="panel">
- <div class="section-subtitle-wrapper" role="tab" id="common-friends-visitor">
- <h3><a data-toggle="collapse" href="#common-friends-collapse">{{$desc}}</a></h3>
- </div>
- <div id="common-friends-collapse" class="collapse" role="tabpanel" aria-labelledby="common-friends-visitor">
- {{if $items}}
- {{foreach $items as $item}}
- <div class="profile-match-wrapper">
- <div class="profile-match-photo">
- <a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}">
- <img src="{{$item.xchan_photo_m}}" width="80" height="80" alt="{{$item.xchan_name}}" title="{{$item.xchan_name}}" />
- </a>
- </div>
- <div class="profile-match-break"></div>
- <div class="profile-match-name">
- <a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}" title="{{$item.xchan_name}}">{{$item.xchan_name}}</a>
- </div>
- <div class="profile-match-end"></div>
- </div>
- {{/foreach}}
- {{/if}}
- <div id="rfic-end" class="clear"></div>
- {{if $linkmore}}<button class="btn btn-default"><a href="{{$base}}/common/{{$uid}}">{{$more}}</a></button>{{/if}}
+ <h3>{{$desc}}</h3>
+ {{if $linkmore}}
+ <a class="allcontact-link" href="{{$base}}/common/{{$uid}}">{{$more}}</a>
+ {{/if}}
+ {{if $items}}
+ <div class="contact-block-content">
+ {{foreach $items as $item}}
+ <div class="contact-block-div">
+ <a class="contact-block-link mpfriend" href="{{$base}}/chanview?f=&url={{$item.xchan_url}}"><img class="contact-block-img mpfriend" src="{{$item.xchan_photo_s}}"alt="{{$item.xchan_name}}" title="{{$item.xchan_name}} [{{$item.xchan_addr}}]" /></a>
</div>
+ {{/foreach}}
</div>
-</div>
+ {{/if}}
+<div>