diff options
| author | Mario <mario@mariovavti.com> | 2018-09-28 13:05:44 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-09-28 13:05:44 +0200 |
| commit | 27fef98a390b7dfb14c25c3ad7da456db670e607 (patch) | |
| tree | 8015b1acd1a069d59981d988799031413a8fc64b | |
| parent | 41108fc4d33d86f895492a4514acbe647ed30435 (diff) | |
| parent | d7a20821c3b5920715384e1256315fdddd4ba96b (diff) | |
| download | volse-hubzilla-27fef98a390b7dfb14c25c3ad7da456db670e607.tar.gz volse-hubzilla-27fef98a390b7dfb14c25c3ad7da456db670e607.tar.bz2 volse-hubzilla-27fef98a390b7dfb14c25c3ad7da456db670e607.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
| -rw-r--r-- | Zotlabs/Module/Settings/Channel_home.php | 43 | ||||
| -rw-r--r-- | Zotlabs/Widget/Settings_menu.php | 11 | ||||
| -rw-r--r-- | app/channel.apd | 4 | ||||
| -rw-r--r-- | include/features.php | 21 |
4 files changed, 64 insertions, 15 deletions
diff --git a/Zotlabs/Module/Settings/Channel_home.php b/Zotlabs/Module/Settings/Channel_home.php new file mode 100644 index 000000000..1d1cc370b --- /dev/null +++ b/Zotlabs/Module/Settings/Channel_home.php @@ -0,0 +1,43 @@ +<?php + +namespace Zotlabs\Module\Settings; + + +class Channel_home { + + function post() { + + $module = substr(strrchr(strtolower(static::class), '\\'), 1); + + check_form_security_token_redirectOnErr('/settings/' . $module, 'settings_' . $module); + + $features = get_module_features($module); + + process_module_features_post(local_channel(), $features, $_POST); + + build_sync_packet(); + return; + } + + function get() { + + $module = substr(strrchr(strtolower(static::class), '\\'), 1); + + $features = get_module_features($module); + $rpath = (($_GET['rpath']) ? $_GET['rpath'] : ''); + + $tpl = get_markup_template("settings_module.tpl"); + + $o .= replace_macros($tpl, array( + '$rpath' => $rpath, + '$action_url' => 'settings/' . $module, + '$form_security_token' => get_form_security_token('settings_' . $module), + '$title' => t('Channel Home Settings'), + '$features' => process_module_features_get(local_channel(), $features), + '$submit' => t('Submit') + )); + + return $o; + } + +} diff --git a/Zotlabs/Widget/Settings_menu.php b/Zotlabs/Widget/Settings_menu.php index 92f615452..238b8071e 100644 --- a/Zotlabs/Widget/Settings_menu.php +++ b/Zotlabs/Widget/Settings_menu.php @@ -45,11 +45,6 @@ class Settings_menu { ); - $tabs[] = array( - 'label' => t('Addon settings'), - 'url' => z_root().'/settings/featured', - 'selected' => ((argv(1) === 'featured') ? 'active' : ''), - ); $tabs[] = array( 'label' => t('Display settings'), @@ -57,6 +52,12 @@ class Settings_menu { 'selected' => ((argv(1) === 'display') ? 'active' : ''), ); + $tabs[] = array( + 'label' => t('Addon settings'), + 'url' => z_root().'/settings/featured', + 'selected' => ((argv(1) === 'featured') ? 'active' : ''), + ); + if($hublocs) { $tabs[] = array( 'label' => t('Manage locations'), diff --git a/app/channel.apd b/app/channel.apd index ab79e7047..f0f435ef5 100644 --- a/app/channel.apd +++ b/app/channel.apd @@ -1,5 +1,5 @@ -version: 1 -url: $baseurl/channel/$nick +version: 1.1 +url: $baseurl/channel/$nick, $baseurl/settings/channel_home requires: local_channel name: Channel Home photo: icon:home diff --git a/include/features.php b/include/features.php index d10046fd6..ccf3c5faf 100644 --- a/include/features.php +++ b/include/features.php @@ -85,6 +85,19 @@ function get_features($filtered = true, $level = (-1)) { ], + 'channel_home' => [ + + t('Channel Home'), + + [ + 'tagadelic', + t('Tag Cloud'), + t('Provide a personal tag cloud on your channel page'), + false, + get_config('feature_lock','tagadelic'), + ] + ], + 'connections' => [ t('Connections'), @@ -140,14 +153,6 @@ function get_features($filtered = true, $level = (-1)) { t('Ability to mark special posts with a star indicator'), false, get_config('feature_lock','star_posts'), - ], - - [ - 'tagadelic', - t('Tag Cloud'), - t('Provide a personal tag cloud on your channel page'), - false, - get_config('feature_lock','tagadelic'), ] ], |