diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-02-28 13:02:22 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-02-28 13:02:22 +0100 |
| commit | 029d155a07e4d2a0af82a19d3234cee50b57a085 (patch) | |
| tree | a91e5f30b26d718d405d7e85c179fab74c401a48 /Zotlabs | |
| parent | c92bc60cec7d2a50f483879731a50b55a651c64c (diff) | |
| parent | 6c60be9e8d57c26e92f704de0712def767ab8705 (diff) | |
| download | volse-hubzilla-029d155a07e4d2a0af82a19d3234cee50b57a085.tar.gz volse-hubzilla-029d155a07e4d2a0af82a19d3234cee50b57a085.tar.bz2 volse-hubzilla-029d155a07e4d2a0af82a19d3234cee50b57a085.zip | |
erge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Settings/Featured.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Widget/Settings_menu.php | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Zotlabs/Module/Settings/Featured.php b/Zotlabs/Module/Settings/Featured.php index 9c5a7b16c..1da139206 100644 --- a/Zotlabs/Module/Settings/Featured.php +++ b/Zotlabs/Module/Settings/Featured.php @@ -61,7 +61,8 @@ class Featured { $tpl = get_markup_template("settings_addons.tpl"); $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_featured"), - '$title' => t('Feature/Addon Settings'), + '$title' => t('Addon Settings'), + '$descrip' => t('Please save/submit changes to any panel before opening another.'), '$settings_addons' => $settings_addons )); return $o; diff --git a/Zotlabs/Widget/Settings_menu.php b/Zotlabs/Widget/Settings_menu.php index e15ed96a5..455fdcb9b 100644 --- a/Zotlabs/Widget/Settings_menu.php +++ b/Zotlabs/Widget/Settings_menu.php @@ -54,7 +54,7 @@ class Settings_menu { } $tabs[] = array( - 'label' => t('Feature/Addon settings'), + 'label' => t('Addon settings'), 'url' => z_root().'/settings/featured', 'selected' => ((argv(1) === 'featured') ? 'active' : ''), ); @@ -79,7 +79,7 @@ class Settings_menu { 'selected' => '' ); - if(get_account_techlevel() > 0) { + if(feature_enabled(local_channel(),'oauth_clients')) { $tabs[] = array( 'label' => t('Connected apps'), 'url' => z_root() . '/settings/oauth', @@ -87,7 +87,7 @@ class Settings_menu { ); } - if(get_account_techlevel() > 2) { + if(feature_enabled(local_channel(),'access_tokens')) { $tabs[] = array( 'label' => t('Guest Access Tokens'), 'url' => z_root() . '/settings/tokens', |