diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-25 20:14:07 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-25 20:14:07 -0700 |
| commit | 78e4b64c8bbc85082eb4b589a1ff5cd796d695c9 (patch) | |
| tree | 2c23035d4c2d7453611397ab075f875885db8925 /Zotlabs | |
| parent | d62f4908146f2bdfb396bff06f74afb62995e4a3 (diff) | |
| parent | 6aef5593d50c15f35b7d7d60fc12d91869c405b3 (diff) | |
| download | volse-hubzilla-78e4b64c8bbc85082eb4b589a1ff5cd796d695c9.tar.gz volse-hubzilla-78e4b64c8bbc85082eb4b589a1ff5cd796d695c9.tar.bz2 volse-hubzilla-78e4b64c8bbc85082eb4b589a1ff5cd796d695c9.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Connedit.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Module/Photos.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Module/Profiles.php | 1 |
3 files changed, 5 insertions, 2 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'), |