aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-09-27 14:56:47 +0200
committerMario Vavti <mario@mariovavti.com>2018-09-27 14:56:47 +0200
commit6b23c3e1796b818ce893ed919f2e2bdd000c83fb (patch)
tree441348d1cbeb31e461af1090af713e73f88aae49 /include
parentbdf6289b323c26329087eb21911576239e0b6216 (diff)
downloadvolse-hubzilla-6b23c3e1796b818ce893ed919f2e2bdd000c83fb.tar.gz
volse-hubzilla-6b23c3e1796b818ce893ed919f2e2bdd000c83fb.tar.bz2
volse-hubzilla-6b23c3e1796b818ce893ed919f2e2bdd000c83fb.zip
implement conversation tools (settings/conversation), remove additional features from the settings menu and get rid of skill levels
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php1
-rw-r--r--include/features.php67
2 files changed, 30 insertions, 38 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 28a339479..dc3f45e45 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -888,6 +888,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
'$user' => App::$user,
'$threads' => $threads,
'$wait' => t('Loading...'),
+ '$conversation_tools' => t('Conversation Tools'),
'$dropping' => ($page_dropping?t('Delete Selected Items'):False),
));
diff --git a/include/features.php b/include/features.php
index 8dcf4517d..5584ba3e4 100644
--- a/include/features.php
+++ b/include/features.php
@@ -71,10 +71,36 @@ function get_features($filtered = true, $level = (-1)) {
$arr = [
- // Item tools
- 'tools' => [
+ 'calendar' => [
+
+ t('CalDAV'),
+
+ [
+ 'cal_first_day',
+ t('Start calendar week on Monday'),
+ t('Default is Sunday'),
+ false,
+ get_config('feature_lock','cal_first_day')
+ ]
+
+ ],
+
+ 'connections' => [
+
+ t('Connections'),
+
+ [
+ 'connfilter',
+ t('Connection Filtering'),
+ t('Filter incoming posts from connections based on keywords/content'),
+ false,
+ get_config('feature_lock','connfilter')
+ ]
+ ],
+
+ 'conversation' => [
- t('Post/Comment Tools'),
+ t('Conversation'),
[
'commtag',
@@ -82,7 +108,6 @@ function get_features($filtered = true, $level = (-1)) {
t('Ability to tag existing posts'),
false,
get_config('feature_lock','commtag'),
- feature_level('commtag',1),
],
[
@@ -91,7 +116,6 @@ function get_features($filtered = true, $level = (-1)) {
t('Add emoji reaction ability to posts'),
true,
get_config('feature_lock','emojis'),
- feature_level('emojis',1),
],
[
@@ -100,7 +124,6 @@ function get_features($filtered = true, $level = (-1)) {
t('Ability to file posts under folders'),
false,
get_config('feature_lock','filing'),
- feature_level('filing',2),
],
[
@@ -109,7 +132,6 @@ function get_features($filtered = true, $level = (-1)) {
t('Ability to dislike posts/comments'),
false,
get_config('feature_lock','dislike'),
- feature_level('dislike',1),
],
[
@@ -118,7 +140,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'),
- feature_level('star_posts',1),
],
[
@@ -127,40 +148,10 @@ function get_features($filtered = true, $level = (-1)) {
t('Provide a personal tag cloud on your channel page'),
false,
get_config('feature_lock','tagadelic'),
- feature_level('tagadelic',2),
- ],
- ],
-
-############################################
-############################################
-
- 'calendar' => [
-
- t('CalDAV'),
-
- [
- 'cal_first_day',
- t('Start calendar week on Monday'),
- t('Default is Sunday'),
- false,
- get_config('feature_lock','cal_first_day')
]
],
- 'connections' => [
-
- t('Connections'),
-
- [
- 'connfilter',
- t('Connection Filtering'),
- t('Filter incoming posts from connections based on keywords/content'),
- false,
- get_config('feature_lock','connfilter')
- ]
- ],
-
'directory' => [
t('Directory'),