Merge branch 'showgroup-button' into better-navigation

diff --cc src/Content/Widget/VCard.php
index d5a565f9257cbb1f692acd9c683071b2d5780e5b,3e4f1e1d875dc00d0a84c60f8504f0b8e14878d0..0d78fed4a489016c113c5eb4a2e78abf99b93d0d
--- 1/src/Content/Widget/VCard.php
--- 2/src/Content/Widget/VCard.php
+++ b/src/Content/Widget/VCard.php
@@@ -119,8 -124,9 +124,10 @@@ class VCar
                        '$unfollow_link'    => $unfollow_link,
                        '$wallmessage'      => DI::l10n()->t('Message'),
                        '$wallmessage_link' => $wallmessage_link,
 -                      '$mentioning'       => DI::l10n()->t('Mention'),
 +                      '$mentioning'       => DI::l10n()->t('Mention'),
 +                      '$post2group'       => DI::l10n()->t('Post to group'),
+                       '$showgroup'        => DI::l10n()->t('Show group'),
+                       '$showgroup_link'   => $showgroup_link,
                ]);
        }
  }

diff --cc src/Model/Contact.php
index 02132c0f1d9a394d4614417e7f85b640b964ecb0,d9f870f561d8216f4dd2f2289dc095f845bc32ee..b6a30915327846449827c3a44903bc66c5ba23e4
--- 1/src/Model/Contact.php
--- 2/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@@ -1246,11 -1231,9 +1246,11 @@@ class Contac
                                'network'  => [DI::l10n()->t('Network Posts'), $posts_link, false],
                                'edit'     => [DI::l10n()->t('View Contact'), $contact_url, false],
                                'pm'       => [DI::l10n()->t('Send PM'), $pm_url, false],
-                               '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],
++                              'mention'  => [DI::l10n()->t('Mention'), DI::l10n()->t('Post to group'), $mention_url, false],
                                'group'    => [DI::l10n()->t('View group'), $group_link, $contact['forum'], true],
 +                              'self'     => [$self],
                        ];
  
                        if (!empty($contact['pending'])) {

diff --cc view/lang/de/strings.php
index e9c35e6669ed8186944bbb272734cda714a85fc8,a1cd1e97fa33c90a18b80e52b56777b562b8dbc3..90be1bd34c4b093367e3416e291c0285b838f8b5
--- 1/view/lang/de/strings.php
--- 2/view/lang/de/strings.php
+++ b/view/lang/de/strings.php
@@@ -2961,6 -2961,4 +2961,6 @@@ $a->strings['Connect Services'] = 'Verb
  $a->strings['Find Friends'] = 'Kontakte finden';
  $a->strings['Last users'] = 'Letzte Nutzer';
  $a->strings['Quick Start'] = 'Schnell-Start';
- 
 +$a->strings['Mention'] = 'Erwähne';
 +$a->strings['Post to group'] = 'In Gruppe posten';
+ $a->strings['View group'] = 'Zeige Gruppe';

diff --cc view/templates/hovercard.tpl
index 0fdcffaf24ea92435e98a4d498c12e73e5adb1e4,a820e5c550c1db923da7f35c9d43de6274236cd0..41236459a8cd0de1d8bc940e4ef15a3eaa41fac5
--- 1/view/templates/hovercard.tpl
--- 2/view/templates/hovercard.tpl
+++ b/view/templates/hovercard.tpl
@@@ -22,9 -22,9 +22,10 @@@
                                {{* @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 && !$profile.actions.self}}<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="{{$profile.actions.rel.0}}{{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.group.2==1}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.group.1}}" aria-label="{{$profile.actions.group.0}}" title="{{$profile.actions.group.0}}"><i class="fa fa-group" aria-hidden="true"></i></a>{{/if}}
                                        {{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}}
                                        {{if $profile.actions.edit}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.edit.1}}" aria-label="{{$profile.actions.edit.0}}" title="{{$profile.actions.edit.0}}"><i class="fa fa-user" aria-hidden="true"></i></a>{{/if}}
                                        {{if $profile.actions.follow}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.follow.1}}" aria-label="{{$profile.actions.follow.0}}" title="{{$profile.actions.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}

diff --cc view/theme/frio/templates/widget/vcard.tpl
index ecc47bea29387004056f587a4c4347cffb919415,41c48aa3905af6202b46587b41585eb33c3b9e1a..5266f5be4eb40996ecc0a815c96725f40362cfa2
--- 1/view/theme/frio/templates/widget/vcard.tpl
--- 2/view/theme/frio/templates/widget/vcard.tpl
+++ b/view/theme/frio/templates/widget/vcard.tpl
@@@ -56,14 -56,14 +56,22 @@@
                                        </button>
                                </div>
                        {{/if}}
 +                        {{if $contact.addr}}
 +                              <div id="mention-link-button">
 +                                      <button type="button" id="mention-link" class="btn btn-labeled btn-primary{{if !$always_open_compose}} modal-open{{/if}}" onclick="openWallMessage('compose/0?body={{if $contact.forum==1}}!{{else}}@{{/if}}{{$contact.addr}}')">
 +                                              <span class=""><i class="fa fa-pencil-square-o"></i></span>
 +                                              <span class="">{{if $contact.forum==1}}{{$post2group}}{{else}}{{$mentioning}}{{/if}}</span>
 +                                      </button>
 +                              </div>
 +                        {{/if}}
+                         {{if $contact.forum==1 || $contact.prv==1}}
+                               <div id="show-group-button">
+                                       <button type="button" id="show-group" class="btn btn-labeled btn-primary{{if !$always_open_compose}} modal-open{{/if}}" onclick="window.location.href='{{$showgroup_link}}'">
+                                               <span class=""><i class="fa fa-group"></i></span>
+                                               <span class="">{{$showgroup}}</span>
+                                       </button>
+                               </div>
+                         {{/if}}
                </div>
  
                <div class="clear"></div>