diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-08-04 08:10:13 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-08-04 08:10:13 +0200 |
| commit | 3783c1af3e750fbf880559fd6f2d69017d87b101 (patch) | |
| tree | f45b5574b152380879cce635cc1097e3759b7353 | |
| parent | 908e15bc9041f757217ba8d3635a8d83a5544c46 (diff) | |
| parent | 92862f93f31beb009247144bae5d8b0a58b562b5 (diff) | |
| download | volse-hubzilla-3783c1af3e750fbf880559fd6f2d69017d87b101.tar.gz volse-hubzilla-3783c1af3e750fbf880559fd6f2d69017d87b101.tar.bz2 volse-hubzilla-3783c1af3e750fbf880559fd6f2d69017d87b101.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
| -rw-r--r-- | Zotlabs/Module/Group.php | 2 | ||||
| -rwxr-xr-x | view/tpl/profile_advanced.tpl | 24 |
2 files changed, 14 insertions, 12 deletions
diff --git a/Zotlabs/Module/Group.php b/Zotlabs/Module/Group.php index 254ee6ef2..291566c6d 100644 --- a/Zotlabs/Module/Group.php +++ b/Zotlabs/Module/Group.php @@ -101,7 +101,7 @@ class Group extends \Zotlabs\Web\Controller { check_form_security_token_redirectOnErr('/group', 'group_drop', 't'); if(intval(argv(2))) { - $r = q("SELECT `name` FROM `groups` WHERE `id` = %d AND `uid` = %d LIMIT 1", + $r = q("SELECT `gname` FROM `groups` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval(argv(2)), intval(local_channel()) ); 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> {{$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> {{$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> |