aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-08-04 19:48:59 -0400
committerAndrew Manning <tamanning@zoho.com>2016-08-04 19:48:59 -0400
commitfaf1045ef5bc030212270d53c7efd8431ed0007c (patch)
treea6d88a480ab41b6b63cf76d2a7367182034fc36e
parent6a82ff871f56233756c2036d307e5cfffbfab325 (diff)
parent92862f93f31beb009247144bae5d8b0a58b562b5 (diff)
downloadvolse-hubzilla-faf1045ef5bc030212270d53c7efd8431ed0007c.tar.gz
volse-hubzilla-faf1045ef5bc030212270d53c7efd8431ed0007c.tar.bz2
volse-hubzilla-faf1045ef5bc030212270d53c7efd8431ed0007c.zip
Merge remote-tracking branch 'upstream/dev' into wiki
-rwxr-xr-xview/tpl/profile_advanced.tpl24
1 files changed, 13 insertions, 11 deletions
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index d0c9621f9..947bdd51c 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -1,17 +1,6 @@
<div id="profile-content-wrapper" class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="pull-right dropdown">
- {{if $profile.like_count}}
- <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button>
- {{if $profile.likers}}
- <ul class="dropdown-menu" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}"><img class="dropdown-menu-img-xs" src="{{$liker.photo}}" alt="{{$liker.name}}" /> {{$liker.name}}</a></li>{{/foreach}}</ul>
- {{/if}}
- {{/if}}
- {{if $profile.canlike}}
- <button type="button" class="btn btn-success btn-xs" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" >
- <i class="fa fa-thumbs-o-up" title="{{$profile.likethis}}"></i>
- </button>
- {{/if}}
{{if $editmenu.multi}}
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
<ul class="dropdown-menu" role="menu">
@@ -27,6 +16,19 @@
<a class="btn btn-primary btn-xs" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
{{/if}}
</div>
+ <div class="pull-right dropdown">
+ {{if $profile.like_count}}
+ <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button>
+ {{if $profile.likers}}
+ <ul class="dropdown-menu" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}"><img class="dropdown-menu-img-xs" src="{{$liker.photo}}" alt="{{$liker.name}}" /> {{$liker.name}}</a></li>{{/foreach}}</ul>
+ {{/if}}
+ {{/if}}
+ {{if $profile.canlike}}
+ <button type="button" class="btn btn-success btn-xs" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" >
+ <i class="fa fa-thumbs-o-up" title="{{$profile.likethis}}"></i>
+ </button>
+ {{/if}}
+ </div>
<h2>{{$title}}</h2>
<div class="clear"></div>
</div>