From a9d926886e6f8ed389031791799ffd352b8cb651 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 25 Apr 2016 10:00:50 +0200 Subject: make it more obvious what is behind the dropdowns --- Zotlabs/Module/Connedit.php | 5 +++-- Zotlabs/Module/Photos.php | 1 + Zotlabs/Module/Profiles.php | 1 + view/tpl/abook_edit.tpl | 24 ++++++++++++------------ view/tpl/photo_view.tpl | 2 +- view/tpl/profile_edit.tpl | 2 +- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 2b524096f..a1268510d 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -514,7 +514,7 @@ class Connedit extends \Zotlabs\Web\Controller { $contact_id = \App::$poi['abook_id']; $contact = \App::$poi; - $buttons = array( + $tools = array( 'view' => array( 'label' => t('View Profile'), @@ -711,7 +711,8 @@ class Connedit extends \Zotlabs\Web\Controller { '$notself' => (($self) ? '' : '1'), '$self' => (($self) ? '1' : ''), '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'), - '$buttons' => (($self) ? '' : $buttons), + '$tools_label' => t('Connection Tools'), + '$tools' => (($self) ? '' : $tools), '$lbl_slider' => t('Slide to adjust your degree of friendship'), '$lbl_rating' => t('Rating'), '$lbl_rating_label' => t('Slide to adjust your rating'), diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index 00a577847..ce350666f 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -1231,6 +1231,7 @@ class Photos extends \Zotlabs\Web\Controller { $o .= replace_macros($photo_tpl, array( '$id' => $ph[0]['id'], '$album' => $album_e, + '$tools_label' => t('Photo Tools'), '$tools' => $tools, '$lock' => $lockstate[1], '$photo' => $photo, diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php index 30ec337f8..72edf396f 100644 --- a/Zotlabs/Module/Profiles.php +++ b/Zotlabs/Module/Profiles.php @@ -691,6 +691,7 @@ class Profiles extends \Zotlabs\Web\Controller { '$submit' => t('Submit'), '$viewprof' => t('View this profile'), '$editvis' => t('Edit visibility'), + '$tools_label' => t('Profile Tools'), '$coverpic' => t('Change cover photo'), '$profpic' => t('Change profile photo'), '$cr_prof' => t('Create a new profile using these settings'), diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 4fa810cb4..74ba6072d 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -3,18 +3,18 @@ {{if $notself}}
{{/if}} @@ -22,11 +22,11 @@
{{if $notself}} - {{foreach $buttons as $b}} - {{if $b.info}} + {{foreach $tools as $tool}} + {{if $tool.info}}
- {{$b.info}} + {{$tool.info}}
{{/if}} diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 254733622..ca2b5e090 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -5,7 +5,7 @@ {{if $tools || $map || $edit}}
    {{if $tools}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index a02323e45..4908646b9 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -2,7 +2,7 @@