photo_menu: now the photo_menu does have at all places the same structure

diff --git a/mod/allfriends.php b/mod/allfriends.php
index 360b222b50dd647ad56d0febaff70c75129bffda..498b9d7dbf1cf62b0b61eff85aec17e8575ace5b 100644 (file)
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -61,8 +61,10 @@ function allfriends_content(&$a) {
                }
                else {
                        $connlnk = $a->get_baseurl() . '/follow/?url=' . $rr['url'];
-                       $photo_menu = array(array(t("View Profile"), zrl($rr['url'])));
-                       $photo_menu[] = array(t("Connect/Follow"), $connlnk);
+                       $photo_menu = array(
+                               'profile' => array(t("View Profile"), zrl($rr['url'])),
+                               'follow' => array(t("Connect/Follow"), $connlnk)
+                       );
                }
 
                $entry = array(

diff --git a/mod/directory.php b/mod/directory.php
index 625f6c95aca781eee24e1a3f895361f8c455e1b6..9050a050a60e7211d24544477ad91af7d630b3c6 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -159,7 +159,9 @@ function directory_content(&$a) {
                                $location_e = $location;
                        }
 
-                       $photo_menu = array(array(t("View Profile"), zrl($profile_link)));
+                       $photo_menu = array(
+                               'profile' => array(t("View Profile"), zrl($profile_link))
+                       );
 
                        $entry = array(
                                'id' => $rr['id'],

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 0d89f56f8280ae9cf5c3c483490b032415e61c80..f193a5c45c6786cac7ae9615d3cc52b6eee41605 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -196,8 +196,10 @@ function dirfind_content(&$a, $prefix = "") {
                                } else {
                                        $connlnk = $a->get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
                                        $conntxt = t('Connect');
-                                       $photo_menu = array(array(t("View Profile"), zrl($jj->url)));
-                                       $photo_menu[] = array(t("Connect/Follow"), $connlnk);
+                                       $photo_menu = array(
+                                               'profile' => array(t("View Profile"), zrl($jj->url)),
+                                               'follow' => array(t("Connect/Follow"), $connlnk)
+                                       );
                                }
 
                                $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);

diff --git a/mod/match.php b/mod/match.php
index 3b0367b4290e1efd02ccbd945eca34fb4e79bb4d..8341911577be4311375e31b5432bcc503b69e542 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -67,8 +67,10 @@ function match_content(&$a) {
                                if (!count($match)) {
                                        $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
                                        $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
-                                       $photo_menu = array(array(t("View Profile"), zrl($jj->url)));
-                                       $photo_menu[] = array(t("Connect/Follow"), $connlnk);
+                                       $photo_menu = array(
+                                               'profile' => array(t("View Profile"), zrl($jj->url)),
+                                               'follow' => array(t("Connect/Follow"), $connlnk)
+                                       );
 
                                        $contact_details = get_contact_details_by_url($jj->url, local_user());
 

diff --git a/mod/suggest.php b/mod/suggest.php
index bb8823d9ec8c8a1767ac9e4047c3d1c2ecab5d37..00033b2d246feba8b84f961dc4edf4a8587844aa 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -78,9 +78,12 @@ function suggest_content(&$a) {
 
                $connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
                $ignlnk = $a->get_baseurl() . '/suggest?ignore=' . $rr['id'];
-               $photo_menu = array(array(t("View Profile"), zrl($rr["url"])));
-               $photo_menu[] = array(t("Connect/Follow"), $connlnk);
-               $photo_menu[] = array(t('Ignore/Hide'), $ignlnk);
+               $photo_menu = array(
+                       'profile' => array(t("View Profile"), zrl($rr["url"])),
+                       'follow' => array(t("Connect/Follow"), $connlnk),
+                       'hide' => array(t('Ignore/Hide'), $ignlnk)
+               );
+
                $contact_details = get_contact_details_by_url($rr["url"], local_user(), $rr);
 
                $entry = array(

diff --git a/view/theme/frio/templates/contact_template.tpl b/view/theme/frio/templates/contact_template.tpl
index 4c2395fd03047fdd40c8681de08a2faaca883fc9..5e0e3ddef91de525451c13a9256e30c1af81a5e5 100644 (file)
--- a/view/theme/frio/templates/contact_template.tpl
+++ b/view/theme/frio/templates/contact_template.tpl
@@ -54,6 +54,7 @@
                                {{if $contact.photo_menu.edit}}<a class="contact-action-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0}}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
                                {{if $contact.photo_menu.drop}}<a class="contact-action-link" href="{{$contact.photo_menu.drop.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0}}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{{/if}}
                                {{if $contact.photo_menu.follow}}<a class="contact-action-link" href="{{$contact.photo_menu.follow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
+                               {{if $contact.photo_menu.hide}}<a class="contact-action-link" href="{{$contact.photo_menu.hide.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.hide.0}}"><i class="fa fa-times" aria-hidden="true"></i></a>{{/if}}
                        </div>
 
                        {{* The contact description (e.g. Name, Network, kind of connection and so on *}}