changes to fit to showgroup-button branch

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index a8ee936861ae2b87f11c315d582a056a42ccbc7d..7256706e0a9a07412e5c1795658781108fad5940 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1201,6 +1201,7 @@ class Contact
                $mention_url = 'compose/0?body=@' . $contact['addr'];
                $contact_url = 'contact/' . $contact['id'];
                $posts_link = 'contact/' . $contact['id'] . '/conversations';
+               $group_link = 'network/group/' . $contact['id'];
 
                $follow_link   = '';
                $unfollow_link = '';
@@ -1235,7 +1236,7 @@ class Contact
                                'mention'  => [DI::l10n()->t('Mention'), DI::l10n()->t('Post to group'), $mention_url, false],
                                'follow'   => [DI::l10n()->t('Connect/Follow'), $follow_link, true],
                                'unfollow' => [DI::l10n()->t('Unfollow'), $unfollow_link, true],
-                               'isgroup'  => [$contact['forum'], true],
+                               'group'    => [DI::l10n()->t('View group'), $group_link, $contact['forum'], true],
                        ];
 
                        if (!empty($contact['pending'])) {

diff --git a/view/templates/hovercard.tpl b/view/templates/hovercard.tpl
index 0162b8327eb0345fc221d0e6c244ffec83850619..66aba904f6ed432ebd908e60085bbe5cd395246c 100644 (file)
--- a/view/templates/hovercard.tpl
+++ b/view/templates/hovercard.tpl
@@ -22,7 +22,7 @@
                                {{* @todo we have two different photo menus one for contacts and one for items at the network stream. We currently use the contact photo menu, so the items options are missing We need to move them *}}
                                <div class="hover-card-actions-social">
                                        {{if $profile.actions.pm}}<a class="btn btn-labeled btn-primary btn-sm add-to-modal" href="{{$profile.actions.pm.1}}" aria-label="{{$profile.actions.pm.0}}"><i class="fa fa-envelope" aria-hidden="true" title="{{$profile.actions.pm.0}}"></i><span class="sr-only">{{$profile.actions.pm.0}}</span></a>{{/if}}
-                                       {{if $profile.addr}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.mention.2}}" aria-label="{{if $profile.forum==1}}{{$profile.actions.mention.1}}{{else}}{{$profile.actions.mention.0}}{{/if}}" title="{{if $profile.actions.isgroup.0==1}}{{$profile.actions.mention.1}}{{else}}{{$profile.actions.mention.0}}{{/if}}"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></a>{{/if}}
+                                       {{if $profile.addr}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.mention.2}}" aria-label="{{if $profile.actions.group.2==1}}{{$profile.actions.mention.1}}{{else}}{{$profile.actions.mention.0}}{{/if}}" title="{{if $profile.actions.group.2==1}}{{$profile.actions.mention.1}}{{else}}{{$profile.actions.mention.0}}{{/if}}"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></a>{{/if}}
                                </div>
                                <div class="hover-card-actions-connection">
                                        {{if $profile.actions.network}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.network.1}}" aria-label="{{$profile.actions.network.0}}" title="{{$profile.actions.network.0}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}