Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

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;
+	}
+
+}

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'),

app/channel.apd

@@ -1,5 +1,5 @@
-version: 1
+version: 1.1
-url: $baseurl/channel/$nick
+url: $baseurl/channel/$nick, $baseurl/settings/channel_home
 requires: local_channel
 name: Channel Home
 photo: icon:home

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'),
 			]
 
 		],